Fix readability

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

diff --git a/src/frontends/qt/FileDialog.cpp b/src/frontends/qt/FileDialog.cpp
index 1491939a9903c3c81a622a59a258a7ad5d8437bd..be9953967506eef9cb77145a09d027fa40060a46 100644 (file)
--- a/src/frontends/qt/FileDialog.cpp
+++ b/src/frontends/qt/FileDialog.cpp
@@ -133,21 +133,40 @@ FileDialog::Result FileDialog::save(QString const & path,
 
 FileDialog::Result FileDialog::open(QString const & path,
        QStringList const & filters, QString const & suggested)
+{
+       FileDialog::Result result;
+       FileDialog::Results results = openMulti(path, filters, suggested, false);
+       result.first = results.first;
+       if (result.first != FileDialog::Later)
+               result.second = results.second.at(0);
+       return result;
+}
+
+
+FileDialog::Results FileDialog::openMulti(QString const & path,
+       QStringList const & filters, QString const & suggested, bool multi)
 {
        LYXERR(Debug::GUI, "Select with path \"" << path
                           << "\", mask \"" << filters.join(";;")
                           << "\", suggested \"" << suggested << '"');
-       FileDialog::Result result;
-       result.first = FileDialog::Chosen;
+       FileDialog::Results results;
+       results.first = FileDialog::Chosen;
 
        if (lyxrc.use_native_filedialog) {
                QString const startsWith = makeAbsPath(suggested, path);
-               QString const file = QFileDialog::getOpenFileName(qApp->focusWidget(),
-                               title_, startsWith, filters.join(";;"));
-               if (file.isNull())
-                       result.first = FileDialog::Later;
+               QStringList files;
+               if (multi)
+                       files = QFileDialog::getOpenFileNames(qApp->focusWidget(),
+                                       title_, startsWith, filters.join(";;"));
                else
-                       result.second = internalPath(file);
+                       files << QFileDialog::getOpenFileName(qApp->focusWidget(),
+                                       title_, startsWith, filters.join(";;"));
+               if (files.isEmpty())
+                       results.first = FileDialog::Later;
+               else {
+                       for (const auto& file : files)
+                               results.second << internalPath(file);
+               }
        } else {
                LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
 
@@ -158,12 +177,12 @@ FileDialog::Result FileDialog::open(QString const & path,
                int res = dlg.exec();
                LYXERR(Debug::GUI, "result " << res);
                if (res == QDialog::Accepted)
-                       result.second = internalPath(dlg.selectedFiles()[0]);
+                       results.second << internalPath(dlg.selectedFiles()[0]);
                else
-                       result.first = FileDialog::Later;
+                       results.first = FileDialog::Later;
                dlg.hide();
        }
-       return result;
+       return results;
 }