From d904a3c1bc12205a598bae9f343f2ccc09946e38 Mon Sep 17 00:00:00 2001
From: Marius Kittler <mkittler@suse.de>
Date: Tue, 20 Nov 2018 18:06:52 +0100
Subject: [PATCH] Quick GUI: Allow to retry opening/saving

---
 qml/main.qml            |  9 ++++++++-
 quickgui/controller.cpp | 15 ++++++++-------
 quickgui/controller.h   |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/qml/main.qml b/qml/main.qml
index 62f0fd6..aff3eee 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -286,7 +286,14 @@ Kirigami.ApplicationWindow {
             }
         }
         onFileError: {
-            showPassiveNotification(errorMessage)
+            if (retryAction.length === 0) {
+                showPassiveNotification(errorMessage)
+            } else {
+                showPassiveNotification(errorMessage, 2500, qsTr("Retry"),
+                                        function () {
+                                            nativeInterface[retryAction]()
+                                        })
+            }
         }
         onPasswordRequired: {
             enterPasswordDialog.askForExistingPassword(
diff --git a/quickgui/controller.cpp b/quickgui/controller.cpp
index a8d364a..c74a903 100644
--- a/quickgui/controller.cpp
+++ b/quickgui/controller.cpp
@@ -135,10 +135,10 @@ void Controller::load(const QString &filePath)
         } else {
             // clear password since the password which has been provided likely wasn't correct
             clearPassword();
-            emit fileError(tr("A crypto error occured when opening the file: ") + QString::fromLocal8Bit(e.what()));
+            emit fileError(tr("A crypto error occured when opening the file: ") + QString::fromLocal8Bit(e.what()), QStringLiteral("load"));
         }
     } catch (const runtime_error &e) {
-        emit fileError(tr("A parsing error occured when opening the file: ") + QString::fromLocal8Bit(e.what()));
+        emit fileError(tr("A parsing error occured when opening the file: ") + QString::fromLocal8Bit(e.what()), QStringLiteral("load"));
     } catch (...) {
         emitIoError(tr("loading"));
     }
@@ -211,9 +211,9 @@ void Controller::save()
 #endif
         emit fileSaved();
     } catch (const CryptoException &e) {
-        emit fileError(tr("A crypto error occured when saving the file: ") + QString::fromLocal8Bit(e.what()));
+        emit fileError(tr("A crypto error occured when saving the file: ") + QString::fromLocal8Bit(e.what()), QStringLiteral("save"));
     } catch (const runtime_error &e) {
-        emit fileError(tr("An internal error occured when saving the file: ") + QString::fromLocal8Bit(e.what()));
+        emit fileError(tr("An internal error occured when saving the file: ") + QString::fromLocal8Bit(e.what()), QStringLiteral("save"));
     } catch (...) {
         emitIoError(tr("saving"));
     }
@@ -408,11 +408,12 @@ void Controller::emitIoError(const QString &when)
 {
     try {
         const auto *const msg = catchIoFailure();
-        emit fileError(tr("An IO error occured when %1 the file %2: ").arg(when, m_filePath) + QString::fromLocal8Bit(msg));
+        emit fileError(tr("An IO error occured when %1 the file %2: ").arg(when, m_filePath) + QString::fromLocal8Bit(msg), QStringLiteral("load"));
     } catch (const exception &e) {
-        emit fileError(tr("An unknown exception occured when %1 the file %2: ").arg(when, m_filePath) + QString::fromLocal8Bit(e.what()));
+        emit fileError(tr("An unknown exception occured when %1 the file %2: ").arg(when, m_filePath) + QString::fromLocal8Bit(e.what()),
+            QStringLiteral("load"));
     } catch (...) {
-        emit fileError(tr("An unknown error occured when %1 the file %2.").arg(when, m_filePath));
+        emit fileError(tr("An unknown error occured when %1 the file %2.").arg(when, m_filePath), QStringLiteral("load"));
     }
 }
 
diff --git a/quickgui/controller.h b/quickgui/controller.h
index b27553c..b1282ff 100644
--- a/quickgui/controller.h
+++ b/quickgui/controller.h
@@ -95,7 +95,7 @@ signals:
     void passwordRequired(const QString &filePath);
     void windowTitleChanged(const QString &windowTitle);
     void fileOpenChanged(bool fileOpen);
-    void fileError(const QString &errorMessage);
+    void fileError(const QString &errorMessage, const QString &retryAction = QString());
     void fileSaved();
     void entryModelChanged();
     void entryFilterModelChanged();