#1192, implemented git warning dialog

pbek · Apr 23, 2019 · 8601aac · 8601aac
1 parent cb03a2b
commit 8601aac
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # QOwnNotes Changelog
 
 ## 19.4.5
+- you now will get a warning dialog if your git client couldn't be executed when
+  a git command is issued (for [#1192](https://github.com/pbek/QOwnNotes/issues/1192))
+    - you will be able to turn off that dialog
 - more checksum generation improvements for the AUR and added checksum support
   to the build processes of Launchpad Snap, Slackware and Gentoo
   (for [#1175](https://github.com/pbek/QOwnNotes/issues/1175))

diff --git a/src/utils/git.cpp b/src/utils/git.cpp
@@ -18,6 +18,7 @@
 #include <QtCore/QSettings>
 #include "git.h"
 #include "misc.h"
+#include "gui.h"
 
 
 /**
@@ -56,7 +57,8 @@ void Utils::Git::commitCurrentNoteFolder() {
  * @param process
  * @return
  */
-bool Utils::Git::executeCommand(QString command, QProcess *process) {
+bool Utils::Git::executeCommand(QString command, QProcess *process,
+                                bool withErrorDialog) {
     if (process == Q_NULLPTR) {
         process = new QProcess();
     }
@@ -65,6 +67,14 @@ bool Utils::Git::executeCommand(QString command, QProcess *process) {
 
     if (!process->waitForFinished()) {
         qWarning() << "Command '" + command + "' failed";
+
+        if (withErrorDialog) {
+            Utils::Gui::warning(
+                    Q_NULLPTR, QObject::tr("Command failed!"),
+                    QObject::tr("The command <code>%1</code> failed!").arg(
+                            command), "command-failed");
+        }
+
         return false;
     }
 
@@ -90,8 +100,10 @@ bool Utils::Git::executeCommand(QString command, QProcess *process) {
  * @param process
  * @return
  */
-bool Utils::Git::executeGitCommand(QString arguments, QProcess *process) {
-    return executeCommand("\""+ gitCommand() + "\" " + arguments, process);
+bool Utils::Git::executeGitCommand(QString arguments, QProcess *process,
+        bool withErrorDialog) {
+    return executeCommand("\"" + gitCommand() + "\" " + arguments, process,
+                          withErrorDialog);
 }
 
 /**

diff --git a/src/utils/git.h b/src/utils/git.h
@@ -19,9 +19,11 @@
 namespace Utils {
     namespace Git {
         void commitCurrentNoteFolder();
-        bool executeCommand(QString command, QProcess *process = Q_NULLPTR);
+        bool executeCommand(QString command, QProcess *process = Q_NULLPTR,
+                            bool withErrorDialog = false);
         bool executeGitCommand(QString arguments,
-                               QProcess *process = Q_NULLPTR);
+                               QProcess *process = Q_NULLPTR,
+                               bool withErrorDialog = true);
         QString gitCommand();
         void showLog(QString filePath);
         bool hasLogCommand();

diff --git a/src/utils/gui.cpp b/src/utils/gui.cpp
@@ -189,6 +189,27 @@ QMessageBox::StandardButton Utils::Gui::question(
                           identifier, buttons, defaultButton);
 }
 
+/**
+ * Shows a warning message box with a checkbox to override the message box in
+ * the future
+ *
+ * @param parent
+ * @param title
+ * @param text
+ * @param identifier
+ * @param buttons
+ * @param defaultButton
+ * @return
+ */
+QMessageBox::StandardButton Utils::Gui::warning(
+        QWidget *parent, const QString &title, const QString &text,
+        const QString &identifier,
+        QMessageBox::StandardButtons buttons,
+        QMessageBox::StandardButton defaultButton) {
+    return showMessageBox(parent, QMessageBox::Icon::Warning, title, text,
+                          identifier, buttons, defaultButton);
+}
+
 /**
  * Shows a message box with a checkbox to override the message box in the future
  *

diff --git a/src/utils/gui.h b/src/utils/gui.h
@@ -62,7 +62,7 @@ namespace Utils {
                 QWidget *parent, const QString &title, const QString &text,
                 const QString &identifier = "default",
                 QMessageBox::StandardButtons buttons = QMessageBox::Ok,
-                QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
+                QMessageBox::StandardButton defaultButton = QMessageBox::Ok);
 
         QMessageBox::StandardButton question(
                 QWidget *parent, const QString &title, const QString &text,
@@ -71,6 +71,13 @@ namespace Utils {
                 QMessageBox::StandardButtons(QMessageBox::Yes | QMessageBox::No),
                 QMessageBox::StandardButton defaultButton = QMessageBox::NoButton);
 
+        QMessageBox::StandardButton warning(
+                QWidget *parent, const QString &title, const QString &text,
+                const QString &identifier = "default",
+                QMessageBox::StandardButtons buttons =
+                QMessageBox::StandardButtons(QMessageBox::Ok),
+                QMessageBox::StandardButton defaultButton = QMessageBox::Ok);
+
         bool userDataInTreeWidgetExists(QTreeWidget *treeWidget,
                                         QVariant userData,
                                         int column = 0);