Merge remote-tracking branch 'features/properpaint' into 2.3.2-staging

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

diff --git a/src/frontends/qt4/FileDialog.cpp b/src/frontends/qt4/FileDialog.cpp
index 0df24ebbd0937aea2b642f4e48d1aed3a36d68a0..f1156348d4497349ea5fe8710c09f4cf7c0b6c1e 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_OS_MAC) || defined(Q_OS_WIN)
 #define USE_NATIVE_FILEDIALOG 1
 #endif
 
@@ -55,8 +55,8 @@ public:
 };
 
 
-FileDialog::FileDialog(QString const & t, FuncCode s)
-       : private_(new FileDialog::Private), title_(t), success_(s)
+FileDialog::FileDialog(QString const & t)
+       : private_(new FileDialog::Private), title_(t)
 {}
 
 
@@ -81,7 +81,8 @@ void FileDialog::setButton2(QString const & label, QString const & dir)
 
 
 FileDialog::Result FileDialog::save(QString const & path,
-       QStringList const & filters, QString const & suggested)
+       QStringList const & filters, QString const & suggested,
+       QString * selectedFilter)
 {
        LYXERR(Debug::GUI, "Select with path \"" << path
                           << "\", mask \"" << filters.join(";;")
@@ -92,21 +93,21 @@ FileDialog::Result FileDialog::save(QString const & path,
 
 #ifdef USE_NATIVE_FILEDIALOG
        QString const startsWith = makeAbsPath(suggested, path);
-       QString const name = 
+       QString const name =
                QFileDialog::getSaveFileName(qApp->focusWidget(),
-            title_, startsWith, filters.join(";;"),
-                        0, QFileDialog::DontConfirmOverwrite);
+               title_, startsWith, filters.join(";;"),
+               selectedFilter, 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
        dlg.setFileMode(QFileDialog::AnyFile);
-#endif
        dlg.setAcceptMode(QFileDialog::AcceptSave);
        dlg.setConfirmOverwrite(false);
+       if (selectedFilter != 0 && !selectedFilter->isEmpty())
+               dlg.selectNameFilter(*selectedFilter);
 
        if (!suggested.isEmpty())
                dlg.selectFile(suggested);
@@ -118,12 +119,21 @@ FileDialog::Result FileDialog::save(QString const & path,
                result.second = internalPath(dlg.selectedFiles()[0]);
        else
                result.first = FileDialog::Later;
+       if (selectedFilter != 0)
+               *selectedFilter = dlg.selectedNameFilter();
        dlg.hide();
 #endif
        return result;
 }
 
 
+FileDialog::Result FileDialog::save(QString const & path,
+       QStringList const & filters, QString const & suggested)
+{
+       return save(path, filters, suggested, 0);
+}
+
+
 FileDialog::Result FileDialog::open(QString const & path,
        QStringList const & filters, QString const & suggested)
 {
@@ -170,7 +180,7 @@ FileDialog::Result FileDialog::opendir(QString const & path,
 
 #ifdef USE_NATIVE_FILEDIALOG
        QString const startsWith = toqstr(makeAbsPath(fromqstr(suggested),
-               fromqstr(path)).absFilename());
+               fromqstr(path)).absFileName());
        QString const dir = QFileDialog::getExistingDirectory(qApp->focusWidget(),
                title_, startsWith);
        if (dir.isNull())