Commit 543e547e authored by -f's avatar -f

Sankore 1159

parent b2646904
...@@ -963,8 +963,9 @@ void UBDocumentController::importFile() ...@@ -963,8 +963,9 @@ void UBDocumentController::importFile()
if (group) if (group)
{ {
QString defaultPath = UBSettings::settings()->lastImportFilePath->get().toString(); QString defaultPath = UBSettings::settings()->lastImportFilePath->get().toString();
QString filePath = QFileDialog::getOpenFileName(mParentWidget, tr("Open Supported File"), if(defaultPath.isDetached())
defaultPath, docManager->importFileFilter()); defaultPath = UBSettings::settings()->userDocumentDirectory();
QString filePath = QFileDialog::getOpenFileName(mParentWidget, tr("Open Supported File"), defaultPath, docManager->importFileFilter());
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
QApplication::processEvents(); QApplication::processEvents();
......
...@@ -49,7 +49,7 @@ XPDFRenderer::XPDFRenderer(const QString &filename, bool importingFile) ...@@ -49,7 +49,7 @@ XPDFRenderer::XPDFRenderer(const QString &filename, bool importingFile)
globalParams->setupBaseFonts(QFile::encodeName(UBPlatformUtils::applicationResourcesDirectory() + "/" + "fonts").data()); globalParams->setupBaseFonts(QFile::encodeName(UBPlatformUtils::applicationResourcesDirectory() + "/" + "fonts").data());
} }
mDocument = new PDFDoc(new GString(filename.toUtf8().data()), 0, 0, 0); // the filename GString is deleted on PDFDoc desctruction mDocument = new PDFDoc(new GString(filename.toLocal8Bit()), 0, 0, 0); // the filename GString is deleted on PDFDoc desctruction
sInstancesCount.ref(); sInstancesCount.ref();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment