Refactor meta line parsing notification #419

trevorsandy · Sep 20, 2020 · c223b59 · c223b59
1 parent 030098f
commit c223b59
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 37 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.1929
+pkgver=2.4.0.1930
 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.1929) debian; urgency=medium
+lpub3d (2.4.0.1930) debian; urgency=medium
 
-  * LPub3D version 2.4.0.1.1929_20200920 for Linux
+  * LPub3D version 2.4.0.1.1930_20200920 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sun, 20 Sep 2020 12:01:53 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sun, 20 Sep 2020 12:02:31 +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.1929
+Version: 2.4.0.1930
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 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.1929
+Version: 2.4.0.1930
 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
 
-* Sun Sep 20 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1929
+* Sun Sep 20 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1930
 - 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 1929 489106b
+2 4 0 1 1930 030098f
diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.0.1.1929 (20 09 2020 12:01:53)
+LPub3D 2.4.0.1.1930 (20 09 2020 12:02:31)
 
 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.1929 (20 09 2020 12:01:53)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.0.1.1930 (20 09 2020 12:02:31)</h4>
         <hr>
           <p>
              LPub3D Continuous release.<br>

diff --git a/mainApp/lpub_preferences.cpp b/mainApp/lpub_preferences.cpp
@@ -4253,9 +4253,9 @@ bool Preferences::getPreferences()
             Settings.setValue(QString("%1/%2").arg(SETTINGS,"EnableFadeSteps"),enableFadeSteps);
         }
 
-        if (lineParseErrors != dialog->lineParseErrors())
+        if (lineParseErrors != dialog->showLineParseErrors())
         {
-            lineParseErrors = dialog->lineParseErrors();
+            lineParseErrors = dialog->showLineParseErrors();
             Settings.setValue(QString("%1/%2").arg(MESSAGES,"ShowLineParseErrors"),lineParseErrors);
         }
 

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.1929" date="2020-09-20">
+        <release version="2.4.0.1930" date="2020-09-20">
             <description>
                 <p>LPub3D Linux AppImage package</p>
             </description>

diff --git a/mainApp/preferencesdialog.cpp b/mainApp/preferencesdialog.cpp
@@ -375,15 +375,11 @@ PreferencesDialog::PreferencesDialog(QWidget *_parent) :
   m_updater->setChangelogOnly(DEFS_URL, true);
   m_updater->checkForUpdates (DEFS_URL);
 
-  // options
-  lineParseErrorsChkBox = new QCheckBox(_parent);
-  lineParseErrorsChkBox->setChecked(          Preferences::lineParseErrors);
-  showBuildModErrorsChkBox = new QCheckBox(_parent);
-  showBuildModErrorsChkBox->setChecked(   Preferences::showBuildModErrors);
-  showIncludeFileErrorsChkBox = new QCheckBox(_parent);
-  showIncludeFileErrorsChkBox->setChecked(   Preferences::showIncludeFileErrors);
-  showAnnotationMessagesChkBox = new QCheckBox(_parent);
-  showAnnotationMessagesChkBox->setChecked(   Preferences::showAnnotationMessages);
+  // show message options
+  mShowLineParseErrors    = Preferences::lineParseErrors;
+  mShowBuildModErrors     = Preferences::showBuildModErrors;
+  mShowIncludeFileErrors  = Preferences::showIncludeFileErrors;
+  mShowAnnotationMessages = Preferences::showAnnotationMessages;
 
 #ifdef Q_OS_MACOS
   resize(640, 835);
@@ -936,6 +932,7 @@ void PreferencesDialog::on_optionsButton_clicked(bool checked)
     Q_UNUSED(checked)
     // options dialogue
     QDialog *dialog = new QDialog();
+    dialog->setWindowTitle("Parse Messages");
     QFormLayout *form = new QFormLayout(dialog);
     form->addRow(new QLabel("Message Options"));
 
@@ -981,13 +978,13 @@ void PreferencesDialog::on_optionsButton_clicked(bool checked)
     form->addRow(&buttonBox);
     QObject::connect(&buttonBox, SIGNAL(accepted()), dialog, SLOT(accept()));
     QObject::connect(&buttonBox, SIGNAL(rejected()), dialog, SLOT(reject()));
-    dialog->setMinimumWidth(250);
+    dialog->setMinimumSize(200,200);
 
     if (dialog->exec() == QDialog::Accepted) {
-        lineParseErrorsChkBox->setChecked(parseErrorChkBox->isChecked());
-        showBuildModErrorsChkBox->setChecked(buildModErrorChkBox->isChecked());
-        showIncludeFileErrorsChkBox->setChecked(includeFileErrorChkBox->isChecked());
-        showAnnotationMessagesChkBox->setChecked(annotationMessageChkBox->isChecked());
+        mShowLineParseErrors    = parseErrorChkBox->isChecked();
+        mShowBuildModErrors     = buildModErrorChkBox->isChecked();
+        mShowIncludeFileErrors  = includeFileErrorChkBox->isChecked();
+        mShowAnnotationMessages = annotationMessageChkBox->isChecked();
     }
 }
 
@@ -1323,24 +1320,24 @@ int PreferencesDialog::pageDisplayPause()
   return ui.pageDisplayPauseSpin->value();
 }
 
-bool PreferencesDialog::lineParseErrors()
+bool PreferencesDialog::showLineParseErrors()
 {
- return lineParseErrorsChkBox->isChecked();
+ return mShowLineParseErrors;
 }
 
 bool PreferencesDialog::showBuildModErrors()
 {
- return showBuildModErrorsChkBox->isChecked();
+ return mShowBuildModErrors;
 }
 
 bool PreferencesDialog::showIncludeFileErrors()
 {
- return showIncludeFileErrorsChkBox->isChecked();
+ return mShowIncludeFileErrors;
 }
 
 bool PreferencesDialog::showAnnotationMessages()
 {
- return showAnnotationMessagesChkBox->isChecked();
+ return mShowAnnotationMessages;
 }
 
 bool PreferencesDialog::includeLogLevel()

diff --git a/mainApp/preferencesdialog.h b/mainApp/preferencesdialog.h
@@ -93,7 +93,7 @@ class PreferencesDialog : public QDialog
     bool          includeFileName();
     bool          includeFunction();
     bool          includeAllLogAttrib();
-    bool          lineParseErrors();
+    bool          showLineParseErrors();
     bool          showBuildModErrors();
     bool          showIncludeFileErrors();
     bool          showAnnotationMessages();
@@ -188,10 +188,10 @@ class PreferencesDialog : public QDialog
 
     QWidget       *parent;
 
-    QCheckBox     *lineParseErrorsChkBox;
-    QCheckBox     *showBuildModErrorsChkBox;
-    QCheckBox     *showIncludeFileErrorsChkBox;
-    QCheckBox     *showAnnotationMessagesChkBox;
+    bool mShowLineParseErrors;
+    bool mShowBuildModErrors;
+    bool mShowIncludeFileErrors;
+    bool mShowAnnotationMessages;
 
     QSimpleUpdater  *m_updater;
     static QString   DEFS_URL;

diff --git a/mainApp/traverse.cpp b/mainApp/traverse.cpp
@@ -3030,6 +3030,7 @@ int Gui::findPage(
                 }
               noStep2 = noStep;
               noStep = false;
+              emit messageSig(LOG_STATUS, QString("Parsing remaining modle file pages..."));
               break;
 
             case CalloutBeginRc:
@@ -3296,6 +3297,7 @@ int Gui::findPage(
       ++opts.pageNum;
       topOfPages.append(opts.current); // TopOfStep (Last Step)
       ++stepPageNum;
+      emit messageSig(LOG_STATUS, QString("Parsing remaining modle file pages..."));
     }  // Last Step in Submodel
   return 0;
 }