* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / FileDialog.cpp

diff --git a/src/frontends/qt4/FileDialog.cpp b/src/frontends/qt4/FileDialog.cpp
index 91b5a71b464c12f9049bfb10824239f300dcdccb..51e49917cfa136191b709c7eedac2ebbb212d21a 100644 (file)
--- a/src/frontends/qt4/FileDialog.cpp
+++ b/src/frontends/qt4/FileDialog.cpp
@@ -31,11 +31,11 @@
  *   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
 
@@ -96,7 +96,10 @@ FileDialog::Result FileDialog::save(QString const & path,
                QFileDialog::getSaveFileName(qApp->focusWidget(),
             title_, startsWith, filters.join(";;"),
                         0, QFileDialog::DontConfirmOverwrite);
-       result.second = toqstr(os::internal_path(fromqstr(name)));
+       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
@@ -113,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;
@@ -132,7 +137,10 @@ FileDialog::Result FileDialog::open(QString const & path,
        QString const startsWith = makeAbsPath(suggested, path);
        QString const file = QFileDialog::getOpenFileName(qApp->focusWidget(),
                title_, startsWith, filters.join(";;"));
-       result.second = internalPath(file);
+       if (file.isNull())
+               result.first = FileDialog::Later;
+       else
+               result.second = internalPath(file);
 #else
        LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
 
@@ -144,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;
@@ -161,9 +171,12 @@ FileDialog::Result FileDialog::opendir(QString const & path,
 #ifdef USE_NATIVE_FILEDIALOG
        QString const startsWith = toqstr(makeAbsPath(fromqstr(suggested),
                fromqstr(path)).absFilename());
-       result.second = toqstr(os::internal_path(fromqstr(
-               QFileDialog::getExistingDirectory(qApp->focusWidget(),
-               title_, startsWith))));
+       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
        LyXFileDialog dlg(title_, path, QStringList(qt_("Directories")),
                private_->b1, private_->b2);
@@ -178,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;