Restore override option to parseMessage #417

trevorsandy · Oct 2, 2020 · 4a8e1f1 · 4a8e1f1
1 parent 44df377
commit 4a8e1f1
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 22 deletions.
diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: July 19, 2020
 #  Copyright (c) 2017 - 2020 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.0.1978
+pkgver=2.4.0.1979
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"

diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.0.1978) debian; urgency=medium
+lpub3d (2.4.0.1979) debian; urgency=medium
 
-  * LPub3D version 2.4.0.1.1978_20201002 for Linux
+  * LPub3D version 2.4.0.1.1979_20201002 for Linux
 
- -- Trevor SANDY <[email protected]>  Fri, 02 Oct 2020 13:18:26 +0200
+ -- Trevor SANDY <[email protected]>  Fri, 02 Oct 2020 13:19:11 +0200
diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.0.1978
+Version: 2.4.0.1979
 Maintainer: Trevor SANDY <[email protected]>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec
@@ -116,7 +116,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.0.1978
+Version: 2.4.0.1979
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -728,5 +728,5 @@ update-mime-database /usr/share/mime >/dev/null || true
 update-desktop-database || true
 %endif
 
-* Fri Oct 02 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1978
+* Fri Oct 02 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1979
 - LPub3D Linux package (rpm) release
diff --git a/builds/utilities/ci/secure/.secrets.tar.enc b/builds/utilities/ci/secure/.secrets.tar.enc
diff --git a/builds/utilities/version.info b/builds/utilities/version.info
@@ -1 +1 @@
-2 4 0 1 1978 868f418
+2 4 0 1 1979 44df377
diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.0.1.1978 (02 10 2020 13:18:26)
+LPub3D 2.4.0.1.1979 (02 10 2020 13:19:11)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -9,7 +9,7 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.4.0.1.1978 (02 10 2020 13:18:26)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.0.1.1979 (02 10 2020 13:19:11)</h4>
         <hr>
           <p>
              LPub3D Continuous release.<br>

diff --git a/mainApp/lpub.cpp b/mainApp/lpub.cpp
@@ -5430,7 +5430,7 @@ void Gui::showLine(const Where &topOfStep, int type)
     }
 }
 
-void Gui::parseError(const QString message, const Where &here, Preferences::MsgKey msgKey, bool option)
+void Gui::parseError(const QString message, const Where &here, Preferences::MsgKey msgKey, bool option, bool override)
 {
     if (parsedMessages.contains(here))
         return;
@@ -5453,7 +5453,7 @@ void Gui::parseError(const QString message, const Where &here, Preferences::MsgK
             Where messageLine = here;
             messageLine.setModelIndex(getSubmodelIndex(messageLine.modelName));
             Preferences::MsgID msgID(msgKey,messageLine.indexToString());
-            Preferences::showMessage(msgID, parseMessage, keyType[msgID.msgKey][0], keyType[msgID.msgKey][1], option);
+            Preferences::showMessage(msgID, parseMessage, keyType[msgKey][0], keyType[msgKey][1], option, override);
         }
         if (writingToTmp)
             emit progressPermMessageSig(QString("Writing submodel [Parse Error%1")

diff --git a/mainApp/lpub.h b/mainApp/lpub.h
@@ -1167,7 +1167,8 @@ public slots:
   void parseError(const QString errorMsg,
                   const Where &here,
                   Preferences::MsgKey msgKey = Preferences::ParseErrors,
-                  bool option = false);
+                  bool option = false,
+                  bool override = false);
 
   void statusMessage(LogType logType, QString message);
   void statusBarMsg(QString msg);

diff --git a/mainApp/lpub_preferences.cpp b/mainApp/lpub_preferences.cpp
@@ -3259,7 +3259,7 @@ bool Preferences::getShowMessagePreference(MsgKey key)
     return result;
 }
 
-int  Preferences::showMessage(Preferences::MsgID msgID, const QString &message, const QString &title, const QString &type, bool option)
+int  Preferences::showMessage(Preferences::MsgID msgID, const QString &message, const QString &title, const QString &type, bool option, bool override)
 {
     foreach (QString messageNotShown, messagesNotShown)
         if (messageNotShown.startsWith(msgID.toString()))
@@ -3274,12 +3274,14 @@ int  Preferences::showMessage(Preferences::MsgID msgID, const QString &message,
     box.setIcon(QMessageBox::Icon::Warning);
     box.setStandardButtons (option ? QMessageBox::Ok | QMessageBox::Cancel : QMessageBox::Ok);
     box.setDefaultButton   (QMessageBox::Cancel);
-    QCheckBox *cb = new QCheckBox(QString("Do not show this %1 again.").arg(type));
-    box.setCheckBox(cb);
-    QObject::connect(cb, &QCheckBox::stateChanged, [&message, &msgID](int state) {
-        if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked)
-            messagesNotShown.append(QString(msgID.toString() + "|" + message));
-    });
+    if (!override) {
+        QCheckBox *cb = new QCheckBox(QString("Do not show this %1 again.").arg(type));
+        box.setCheckBox(cb);
+        QObject::connect(cb, &QCheckBox::stateChanged, [&message, &msgID](int state) {
+            if (static_cast<Qt::CheckState>(state) == Qt::CheckState::Checked)
+                messagesNotShown.append(QString(msgID.toString() + "|" + message));
+        });
+    }
     box.adjustSize();
     return box.exec();
 }

diff --git a/mainApp/lpub_preferences.h b/mainApp/lpub_preferences.h
@@ -127,7 +127,12 @@ class Preferences
     static void setBlenderVersionPreference(QString);
     static void setDebugLogging(bool); 
 
-    static int showMessage(Preferences::MsgID, const QString &message, const QString &title = "", const QString &type = "", bool option = false);
+    static int showMessage(Preferences::MsgID,
+                           const QString &message,
+                           const QString &title = "",
+                           const QString &type = "",
+                           bool option = false,
+                           bool override = false);
 
     static QString lpub3dAppName;
     static QString ldrawLibPath;

diff --git a/mainApp/org.trevorsandy.lpub3d.appdata.xml b/mainApp/org.trevorsandy.lpub3d.appdata.xml
@@ -68,7 +68,7 @@
         <binary>lpub3d24</binary>
     </provides>
     <releases>
-        <release version="2.4.0.1978" date="2020-10-02">
+        <release version="2.4.0.1979" date="2020-10-02">
             <description>
                 <p>LPub3D Linux AppImage package</p>
             </description>