Add bulk close options (#1024)

* Add bulk close options

* Consolidate save prompt

---------

Co-authored-by: dail8859 <dail8859@yahoo.com>

Author: dst1213

src/dialogs/MainWindow.cpp

@@ -1165,33 +1165,28 @@ void MainWindow::openFileList(const QStringList &fileNames)
 
 bool MainWindow::checkEditorsBeforeClose(const QVector<ScintillaNext *> &editors)
 {
-    for (ScintillaNext *editor : editors) {
-        if (!editor->isSavedToDisk()) {
-            // Switch to it
-            dockedEditor->switchToEditor(editor);
+    QVector<ScintillaNext *> unsaved;
+    for (auto *e : editors) {
+        if (!e->isSavedToDisk()) unsaved.append(e);
+    }
 
-            // Ask the user what to do
-            QString message = tr("Save file <b>%1</b>?").arg(editor->getName());
-            auto reply = QMessageBox::question(this, tr("Save File"), message, QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Save);
+    if (unsaved.isEmpty()) return true;
 
-            if (reply == QMessageBox::Cancel) {
-                // Stop checking and let the caller know
-                return false;
-            }
-            else if (reply == QMessageBox::Save) {
-                bool didFileGetSaved = saveFile(editor);
+    // Focus the user's attention on the first unsaved file
+    dockedEditor->switchToEditor(unsaved.first());
 
-                // The user might have canceled the save file dialog so just stop now
-                if (didFileGetSaved == false) {
-                    // Stop checking and let the caller know
-                    return false;
-                }
-            }
-        }
-    }
+    // Single point of interaction
+    UserSaveAction action = promptForSave(unsaved);
 
-    // Everything is fine
-    return true;
+    switch (action) {
+        case UserSaveAction::DiscardAll:
+            return true;
+        case UserSaveAction::SaveAll:
+            return saveAllEditors(unsaved);
+        case UserSaveAction::Cancel:
+        default:
+            return false;
+    }
 }
 
 void MainWindow::openFileDialog()
@@ -1255,30 +1250,11 @@ void MainWindow::closeFile(ScintillaNext *editor)
         return;
     }
 
-    if(editor->isSavedToDisk()) {
-        editor->close();
+    if (!checkEditorsBeforeClose({editor})) {
+        return;
     }
-    else {
-        // The user needs be asked what to do about this file, so switch to it
-        dockedEditor->switchToEditor(editor);
 
-        QString message = tr("Save file <b>%1</b>?").arg(editor->getName());
-        auto reply = QMessageBox::question(this, tr("Save File"), message, QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Save);
-
-        if (reply == QMessageBox::Cancel) {
-            return;
-        }
-
-        if (reply == QMessageBox::Save) {
-            bool didFileGetSaved = saveFile(editor);
-
-            // The user might have canceled the save file dialog so just stop now
-            if (didFileGetSaved == false)
-                return;
-        }
-
-        editor->close();
-    }
+    editor->close();
 
     // If the last document was closed, figure out what to do next
     if (editorCount() == 0) {
@@ -1453,11 +1429,20 @@ bool MainWindow::saveCopyAs(const QString &fileName)
     }
 }
 
-void MainWindow::saveAll()
+bool MainWindow::saveAll()
 {
-    for (ScintillaNext *editor : editors()) {
-        saveFile(editor);
+    return saveAllEditors(editors());
+}
+
+bool MainWindow::saveAllEditors(const QVector<ScintillaNext *> &editors)
+{
+    for (ScintillaNext *editor : editors) {
+        if (!saveFile(editor)){
+            return false;
+        }
     }
+
+    return true;
 }
 
 void MainWindow::exportAsFormat(Converter *converter, const QString &filter)
@@ -1961,6 +1946,31 @@ void MainWindow::showEditorZoomLevelIndicator()
     FadingIndicator::showText(currentEditor(), tr("Zoom: %1%").arg(zoomLevel * 10 + 100));
 }
 
+MainWindow::UserSaveAction MainWindow::promptForSave(const QVector<ScintillaNext *> &editors)
+{
+    const int count = editors.count();
+    QMessageBox msgBox(this);
+    msgBox.setWindowTitle(tr("Save File"));
+    msgBox.setIcon(QMessageBox::Question);
+
+    // Using pluralization for the main text
+    QString text = (count == 1)
+                       ? tr("Save changes to <b>%1</b>?").arg(editors.first()->getName())
+                       : tr("There are %n files with unsaved changes. Save them?", "", count);
+    msgBox.setText(text);
+
+    auto *saveBtn = msgBox.addButton(count > 1 ? tr("Save All") : tr("Save"), QMessageBox::AcceptRole);
+    auto *discardBtn = msgBox.addButton(count > 1 ? tr("Discard All") : tr("Discard"), QMessageBox::DestructiveRole);
+    msgBox.addButton(QMessageBox::Cancel);
+
+    msgBox.setDefaultButton(saveBtn);
+    msgBox.exec();
+
+    if (msgBox.clickedButton() == saveBtn)    return UserSaveAction::SaveAll;
+    if (msgBox.clickedButton() == discardBtn) return UserSaveAction::DiscardAll;
+    return UserSaveAction::Cancel;
+}
+
 void MainWindow::saveSettings() const
 {
     qInfo(Q_FUNC_INFO);

src/dialogs/MainWindow.h

@@ -87,7 +87,8 @@ public slots:
 
     bool saveCopyAsDialog();
     bool saveCopyAs(const QString &fileName);
-    void saveAll();
+    bool saveAll();
+    bool saveAllEditors(const QVector<ScintillaNext *> &editors);
 
     void exportAsFormat(Converter *converter, const QString &filter);
     void copyAsFormat(Converter *converter, const QString &mimeType);
@@ -161,6 +162,9 @@ private slots:
     void showSaveErrorMessage(ScintillaNext *editor, QFileDevice::FileError error);
     void showEditorZoomLevelIndicator();
 
+    enum class UserSaveAction { SaveAll, DiscardAll, Cancel };
+    UserSaveAction promptForSave(const QVector<ScintillaNext *> &editors);
+
     void saveSettings() const;
     void restoreSettings();