Fix handling of the add branch textfield in GuiBranches

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

diff --git a/src/frontends/qt4/FileDialog.cpp b/src/frontends/qt4/FileDialog.cpp
index 6b45eca578099107998bb81d71bdfb7f903f3e97..ca27df9f271021a814640a2c8a4af518b8efb554 100644 (file)
--- a/src/frontends/qt4/FileDialog.cpp
+++ b/src/frontends/qt4/FileDialog.cpp
@@ -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(";;")
@@ -94,8 +95,8 @@ FileDialog::Result FileDialog::save(QString const & path,
        QString const startsWith = makeAbsPath(suggested, path);
        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
@@ -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)
 {