Refactor enableLineTypeIndexes #417

trevorsandy · Sep 20, 2020 · 12e976a · 12e976a
1 parent fcf85b6
commit 12e976a
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 17 deletions.
diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: July 23, 2019
 #  Copyright (c) 2017 - 2020 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.0.1815
+pkgver=2.4.0.1816
 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.1815) debian; urgency=medium
+lpub3d (2.4.0.1816) debian; urgency=medium
 
-  * LPub3D version 2.4.0.1.1815_20200920 for Linux
+  * LPub3D version 2.4.0.1.1816_20200920 for Linux
 
- -- Trevor SANDY <[email protected]>  Sun, 20 Sep 2020 10:45:48 +0200
+ -- Trevor SANDY <[email protected]>  Sun, 20 Sep 2020 10:46:28 +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.1815
+Version: 2.4.0.1816
 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.1815
+Version: 2.4.0.1816
 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.1815
+* Sun Sep 20 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1816
 - 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 1815 8839916
+2 4 0 1 1816 fcf85b6
diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.0.1.1815 (20 09 2020 10:45:48)
+LPub3D 2.4.0.1.1816 (20 09 2020 10:46:28)
 
 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.1815 (20 09 2020 10:45:48)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.0.1.1816 (20 09 2020 10:46:28)</h4>
         <hr>
           <p>
              LPub3D Continuous release.<br>

diff --git a/mainApp/lpub_preferences.cpp b/mainApp/lpub_preferences.cpp
@@ -245,7 +245,6 @@ bool    Preferences::customSceneRulerTickColor  = false;
 bool    Preferences::customSceneRulerTrackingColor = false;
 bool    Preferences::customSceneGuideColor      = false;
 bool    Preferences::debugLogging               = false;
-bool    Preferences::enableLineTypeIndexes      = true;
 bool    Preferences::blenderIs28OrLater         = true;
 bool    Preferences::defaultBlendFile           = false;
 bool    Preferences::useSystemEditor            = false;

diff --git a/mainApp/lpub_preferences.h b/mainApp/lpub_preferences.h
@@ -295,7 +295,6 @@ class Preferences
     static bool    customSceneRulerTrackingColor;
     static bool    customSceneGuideColor;
     static bool    debugLogging;
-    static bool    enableLineTypeIndexes;
     static bool    useSystemEditor;
 
 #ifdef Q_OS_MAC

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

diff --git a/mainApp/traverse.cpp b/mainApp/traverse.cpp
@@ -87,6 +87,7 @@ static QString PositionNames[] =
  * ldraw file held in the the ldr string
  *
  ********************************************/
+static bool enableLineTypeIndexes;
 
 static void remove_group(
     QStringList  in,     // csiParts
@@ -103,7 +104,7 @@ static void remove_group(
   QRegExp grpRx;
 
   if (in.size() != tin.size()) {
-      Preferences::enableLineTypeIndexes = false;
+      enableLineTypeIndexes = false;
       QString message(QString("CSI part list size [%1] does not match line index size [%2]. Line type indexes disabled.")
                               .arg(in.size()).arg(tin.size()));
       emit gui->messageSig(LOG_NOTICE, message);
@@ -202,7 +203,7 @@ static void remove_parttype(
   model = model.toLower();
 
   if (in.size() != tin.size()) {
-      Preferences::enableLineTypeIndexes = false;
+      enableLineTypeIndexes = false;
       QString message(QString("CSI part list size [%1] does not match line index size [%2]. Line type indexes disabled.")
                               .arg(in.size()).arg(tin.size()));
       emit gui->messageSig(LOG_NOTICE, message);
@@ -245,7 +246,7 @@ static void remove_partname(
   name = name.toLower();
 
   if (in.size() != tin.size()) {
-      Preferences::enableLineTypeIndexes = false;
+      enableLineTypeIndexes = false;
       QString message(QString("CSI part list size [%1] does not match line index size [%2]. Line type indexes disabled.")
                               .arg(in.size()).arg(tin.size()));
       emit gui->messageSig(LOG_NOTICE, message);
@@ -3491,7 +3492,7 @@ void Gui::drawPage(
   savePrevStepPosition = 0;
   saveContStepNum = 1;
 
-  Preferences::enableLineTypeIndexes = true;
+  enableLineTypeIndexes = true;
 
   PgSizeData pageSize;
   if (exporting()) {