Revert refactoring of showNotSavedDialog()

houmain · Jan 15, 2023 · e1b4c9d · e1b4c9d
1 parent baeda3f
commit e1b4c9d
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/src/FileDialog.cpp b/src/FileDialog.cpp
@@ -244,7 +244,7 @@ bool FileDialog::exec(Options options, QString currentFileName,
     return true;
 }
 
-bool showNotSavedDialog(QWidget *parent, const QString& fileName)
+int showNotSavedDialog(QWidget *parent, const QString &fileName)
 {
     auto dialog = QMessageBox(parent);
     dialog.setIcon(QMessageBox::Question);
@@ -255,7 +255,7 @@ bool showNotSavedDialog(QWidget *parent, const QString& fileName)
     dialog.addButton(parent->tr("&Don't Save"), QMessageBox::RejectRole);
     dialog.addButton(QMessageBox::Cancel);
     dialog.setDefaultButton(QMessageBox::Save);
-    return (dialog.exec() == QMessageBox::Save);
+    return dialog.exec();
 }
 
 bool showSavingFailedMessage(QWidget *parent, const QString &fileName)
@@ -267,7 +267,7 @@ bool showSavingFailedMessage(QWidget *parent, const QString &fileName)
     text += parent->tr("Is the path writeable");
     if (FileDialog::isTextureFileName(fileName))
         text += parent->tr(" and does the file format support the texture format");
-    text += "?";
+    text += "?<br>";
     dialog.setText(text);
     dialog.addButton(QMessageBox::Retry);
     dialog.addButton(QMessageBox::Cancel);
@@ -278,7 +278,8 @@ void showCopyingSessionFailedMessage(QWidget *parent)
 {
     auto dialog = QMessageBox(parent);
     dialog.setIcon(QMessageBox::Warning);
-    dialog.setText(parent->tr("<h3>Copying session files failed.</h3>"));
+    dialog.setText(parent->tr("<h3>Copying session files failed.</h3>"
+        "Not all files in session could be copied.<br>"));
     dialog.addButton(QMessageBox::Ok);
     dialog.exec();
 }
diff --git a/src/FileDialog.h b/src/FileDialog.h
@@ -56,7 +56,7 @@ class FileDialog final : public QObject
     bool mAsBinaryFile{ };
 };
 
-bool showNotSavedDialog(QWidget *parent, const QString &fileName);
+int showNotSavedDialog(QWidget *parent, const QString &fileName);
 bool showSavingFailedMessage(QWidget *parent, const QString &fileName);
 void showCopyingSessionFailedMessage(QWidget *parent);
 

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -843,7 +843,10 @@ bool MainWindow::closeSession()
         return false;
 
     if (mSessionEditor->isModified()) {
-        if (!showNotSavedDialog(this, mSessionEditor->fileName()) ||
+        const auto ret = showNotSavedDialog(this, mSessionEditor->fileName());
+        if (ret == QMessageBox::Cancel)
+            return false;
+        if (ret == QMessageBox::Save &&
             !saveSession())
             return false;
     }

diff --git a/src/editors/EditorManager.cpp b/src/editors/EditorManager.cpp
@@ -680,7 +680,10 @@ bool EditorManager::promptSaveDock(QDockWidget *dock)
     if (dock->isWindowModified()) {
         autoRaise(dock->widget());
 
-        if (!showNotSavedDialog(this, editor->fileName()) ||
+        const auto ret = showNotSavedDialog(this, editor->fileName());
+        if (ret == QMessageBox::Cancel)
+            return false;
+        if (ret == QMessageBox::Save &&
             !saveDock(dock))
             return false;
     }