From 543e547e126a7f6f7dd04ba73d38bbf758416c0d Mon Sep 17 00:00:00 2001
From: -f <claudio@open-sankore.org>
Date: Mon, 24 Feb 2014 11:04:27 +0100
Subject: [PATCH] Sankore 1159
---
src/document/UBDocumentController.cpp | 5 +++--
src/pdf/XPDFRenderer.cpp | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp
index 498aeb79..decc2811 100644
--- a/src/document/UBDocumentController.cpp
+++ b/src/document/UBDocumentController.cpp
@@ -963,8 +963,9 @@ void UBDocumentController::importFile()
if (group)
{
QString defaultPath = UBSettings::settings()->lastImportFilePath->get().toString();
- QString filePath = QFileDialog::getOpenFileName(mParentWidget, tr("Open Supported File"),
- defaultPath, docManager->importFileFilter());
+ if(defaultPath.isDetached())
+ defaultPath = UBSettings::settings()->userDocumentDirectory();
+ QString filePath = QFileDialog::getOpenFileName(mParentWidget, tr("Open Supported File"), defaultPath, docManager->importFileFilter());
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
QApplication::processEvents();
diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp
index 82d7077a..f6040675 100644
--- a/src/pdf/XPDFRenderer.cpp
+++ b/src/pdf/XPDFRenderer.cpp
@@ -49,7 +49,7 @@ XPDFRenderer::XPDFRenderer(const QString &filename, bool importingFile)
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();
}
--
2.18.1