X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FFileDialog.cpp;h=51e49917cfa136191b709c7eedac2ebbb212d21a;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=c6e8b85c8da0a8cc57a413b2b04ccf133e4a032f;hpb=a98f82c292c7047478e3362449ab21aa35e03375;p=lyx.git

diff --git a/src/frontends/qt4/FileDialog.cpp b/src/frontends/qt4/FileDialog.cpp
index c6e8b85c8d..51e49917cf 100644
--- a/src/frontends/qt4/FileDialog.cpp
+++ b/src/frontends/qt4/FileDialog.cpp
@@ -17,11 +17,13 @@
 #include "qt_helpers.h"
 
 #include "support/debug.h"
-#include "support/FileFilterList.h"
 #include "support/FileName.h"
+#include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/os.h"
 
+#include <string>
+
 /** when this is defined, the code will use
  * QFileDialog::getOpenFileName and friends to create filedialogs.
  * Effects:
@@ -29,25 +31,21 @@
  *   parameters);
  * - with Qt/Mac or Qt/Win, the dialogs native to the environment are used.
  * - with Qt/Win and Qt <= 4.3.0, there was a number of bugs with our own
- *   file dialog (http://bugzilla.lyx.org/show_bug.cgi?id=3907).
+ *   file dialog (http://www.lyx.org/trac/ticket/3907).
  *
  * Therefore there is a tradeoff in enabling or disabling this (JMarc)
  */
-#if defined(Q_WS_MACX) || (defined(Q_WS_WIN) && !defined(Q_CYGWIN_WIN))
+#if defined(Q_WS_MACX) || (defined(Q_WS_WIN) && !defined(Q_OS_CYGWIN))
 #define USE_NATIVE_FILEDIALOG 1
 #endif
 
 #ifdef USE_NATIVE_FILEDIALOG
 #include <QApplication>
-#include "support/filetools.h"
-
-using lyx::support::makeAbsPath;
 #endif
 
 namespace lyx {
 
-using support::FileFilterList;
-using support::os::internal_path;
+using namespace support;
 
 
 class FileDialog::Private {
@@ -83,26 +81,25 @@ void FileDialog::setButton2(QString const & label, QString const & dir)
 
 
 FileDialog::Result FileDialog::save(QString const & path,
-					  FileFilterList const & filters,
-					  QString const & suggested)
+	QStringList const & filters, QString const & suggested)
 {
-	LYXERR(Debug::GUI, "Select with path \"" << fromqstr(path)
-			   << "\", mask \"" << to_utf8(filters.as_string())
-			   << "\", suggested \"" << fromqstr(suggested) << '"');
+	LYXERR(Debug::GUI, "Select with path \"" << path
+			   << "\", mask \"" << filters.join(";;")
+			   << "\", suggested \"" << suggested << '"');
+
 	FileDialog::Result result;
 	result.first = FileDialog::Chosen;
 
 #ifdef USE_NATIVE_FILEDIALOG
-	QString const startsWith = toqstr(
-		makeAbsPath(fromqstr(suggested), fromqstr(path)).absFilename());
+	QString const startsWith = makeAbsPath(suggested, path);
 	QString const name = 
 		QFileDialog::getSaveFileName(qApp->focusWidget(),
-					     title_, 
-					     startsWith, 
-					     toqstr(filters.as_string()),
-					     0, 
-					     QFileDialog::DontConfirmOverwrite);
-	result.second = toqstr(internal_path(fromqstr(name)));
+	     title_, startsWith, filters.join(";;"),
+			 0, QFileDialog::DontConfirmOverwrite);
+	if (name.isNull())
+		result.first = FileDialog::Later;
+	else
+		result.second = toqstr(os::internal_path(fromqstr(name)));
 #else
 	LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
 #if QT_VERSION != 0x040203
@@ -119,6 +116,8 @@ FileDialog::Result FileDialog::save(QString const & path,
 	LYXERR(Debug::GUI, "result " << res);
 	if (res == QDialog::Accepted)
 		result.second = internalPath(dlg.selectedFiles()[0]);
+	else
+		result.first = FileDialog::Later;
 	dlg.hide();
 #endif
 	return result;
@@ -126,21 +125,22 @@ FileDialog::Result FileDialog::save(QString const & path,
 
 
 FileDialog::Result FileDialog::open(QString const & path,
-					  FileFilterList const & filters,
-					  QString const & suggested)
+	QStringList const & filters, QString const & suggested)
 {
-	LYXERR(Debug::GUI, "Select with path \"" << fromqstr(path)
-			   << "\", mask \"" << filters.as_string()
-			   << "\", suggested \"" << fromqstr(suggested) << '"');
+	LYXERR(Debug::GUI, "Select with path \"" << path
+			   << "\", mask \"" << filters.join(";;")
+			   << "\", suggested \"" << suggested << '"');
 	FileDialog::Result result;
 	result.first = FileDialog::Chosen;
 
 #ifdef USE_NATIVE_FILEDIALOG
-	QString const startsWith = toqstr(
-		makeAbsPath(fromqstr(suggested), fromqstr(path)).absFilename());
-	result.second = internalPath(
-		QFileDialog::getOpenFileName(qApp->focusWidget(),
-		title_, startsWith, toqstr(filters.as_string()) ));
+	QString const startsWith = makeAbsPath(suggested, path);
+	QString const file = QFileDialog::getOpenFileName(qApp->focusWidget(),
+		title_, startsWith, filters.join(";;"));
+	if (file.isNull())
+		result.first = FileDialog::Later;
+	else
+		result.second = internalPath(file);
 #else
 	LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
 
@@ -152,6 +152,8 @@ FileDialog::Result FileDialog::open(QString const & path,
 	LYXERR(Debug::GUI, "result " << res);
 	if (res == QDialog::Accepted)
 		result.second = internalPath(dlg.selectedFiles()[0]);
+	else
+		result.first = FileDialog::Later;
 	dlg.hide();
 #endif
 	return result;
@@ -159,23 +161,25 @@ FileDialog::Result FileDialog::open(QString const & path,
 
 
 FileDialog::Result FileDialog::opendir(QString const & path,
-					    QString const & suggested)
+	QString const & suggested)
 {
-	LYXERR(Debug::GUI, "Select with path \"" << fromqstr(path)
-			   << "\", suggested \"" << fromqstr(suggested) << '"');
+	LYXERR(Debug::GUI, "Select with path \"" << path
+			   << "\", suggested \"" << suggested << '"');
 	FileDialog::Result result;
 	result.first = FileDialog::Chosen;
 
 #ifdef USE_NATIVE_FILEDIALOG
-	QString const startsWith = toqstr(
-		makeAbsPath(fromqstr(suggested), fromqstr(path)).absFilename());
-	result.second = toqstr(internal_path(fromqstr(
-		QFileDialog::getExistingDirectory(qApp->focusWidget(),
-		title_, startsWith))));
+	QString const startsWith = toqstr(makeAbsPath(fromqstr(suggested),
+		fromqstr(path)).absFilename());
+	QString const dir = QFileDialog::getExistingDirectory(qApp->focusWidget(),
+		title_, startsWith);
+	if (dir.isNull())
+		result.first = FileDialog::Later;
+	else
+		result.second = toqstr(os::internal_path(fromqstr(dir)));
 #else
-	FileFilterList const filter(_("Directories"));
-
-	LyXFileDialog dlg(title_, path, filter, private_->b1, private_->b2);
+	LyXFileDialog dlg(title_, path, QStringList(qt_("Directories")),
+		private_->b1, private_->b2);
 
 	dlg.setFileMode(QFileDialog::DirectoryOnly);
 
@@ -187,6 +191,8 @@ FileDialog::Result FileDialog::opendir(QString const & path,
 	LYXERR(Debug::GUI, "result " << res);
 	if (res == QDialog::Accepted)
 		result.second = internalPath(dlg.selectedFiles()[0]);
+	else
+		result.first = FileDialog::Later;
 	dlg.hide();
 #endif
 	return result;