Preferences configuration

trevorsandy · Sep 20, 2020 · 528f4bb · 528f4bb
1 parent f8dfa3b
commit 528f4bb
Show file tree

Hide file tree

Showing 12 changed files with 83 additions and 54 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.1921
+pkgver=2.4.0.1922
 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.1921) debian; urgency=medium
+lpub3d (2.4.0.1922) debian; urgency=medium
 
-  * LPub3D version 2.4.0.1.1921_20200920 for Linux
+  * LPub3D version 2.4.0.1.1922_20200920 for Linux
 
- -- Trevor SANDY <[email protected]>  Sun, 20 Sep 2020 11:56:31 +0200
+ -- Trevor SANDY <[email protected]>  Sun, 20 Sep 2020 11:57: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.1921
+Version: 2.4.0.1922
 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.1921
+Version: 2.4.0.1922
 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.1921
+* Sun Sep 20 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1922
 - 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 1921 197c54c
+2 4 0 1 1922 f8dfa3b
diff --git a/lclib/common/lc_profile.cpp b/lclib/common/lc_profile.cpp
@@ -147,8 +147,8 @@ static lcProfileEntry gProfileEntries[LC_NUM_PROFILE_KEYS] =
 /*** LPub3D Mod end ***/
 
 /*** LPub3D Mod - Update Default Camera ***/
-	lcProfileEntry("Settings", "DefaultCameraProperties", 0),                                  //LC_PROFILE_DEFAULT_CAMERA_PROPERTIES                   /*** LPub3D Mod - Update Default Camera ***/
-	lcProfileEntry("Settings", "DefaultDistanceFactor", 5.0f),                                 //LC_PROFILE_DEFAULT_DISTANCE_FACTOR                     /*** LPub3D Mod - Update Default Camera ***/
+	lcProfileEntry("Settings", "DefaultCameraProperties", 1),                                  //LC_PROFILE_DEFAULT_CAMERA_PROPERTIES                   /*** LPub3D Mod - Update Default Camera ***/
+	lcProfileEntry("Settings", "DefaultDistanceFactor", 7.0f),                                 //LC_PROFILE_DEFAULT_DISTANCE_FACTOR                     /*** LPub3D Mod - Update Default Camera ***/
 	lcProfileEntry("Settings", "DefaultCameraPosition", 1250.0f),                              //LC_PROFILE_CAMERA_DEFAULT_POSITION                     /*** LPub3D Mod - Update Default Camera ***/
 	lcProfileEntry("Settings", "DefaultCameraFieldOfView", 30.0f),                             //LC_PROFILE_CAMERA_FOV                                  /*** LPub3D Mod - Update Default Camera ***/
 	lcProfileEntry("Settings", "DefaultCameraNearPlane", 25.0f),                               //LC_PROFILE_CAMERA_NEAR_PLANE                           /*** LPub3D Mod - Update Default Camera ***/
@@ -175,8 +175,8 @@ static lcProfileEntry gProfileEntries[LC_NUM_PROFILE_KEYS] =
 
 /*** LPub3D Mod - preview widget ***/
 	lcProfileEntry("Settings", "ActivePreviewColor", LC_RGBA(69, 69, 69, 255)),                // LC_PROFILE_ACTIVE_PREVIEW_COLOR                      /*** LPub3D Mod - preview widget ***/
-	lcProfileEntry("Settings", "ViewSpherePreviewSize", 100),                                  // LC_PROFILE_VIEW_SPHERE_PREVIEW_SIZE                  /*** LPub3D Mod - preview widget ***/
-	lcProfileEntry("Settings", "ViewSpherePreviewLocation", (int)lcViewSphereLocation::BottomLeft), // LC_PROFILE_VIEW_SPHERE_PREVIEW_LOCATION         /*** LPub3D Mod - preview widget ***/
+    lcProfileEntry("Settings", "ViewSpherePreviewSize", 75),                                  // LC_PROFILE_VIEW_SPHERE_PREVIEW_SIZE                  /*** LPub3D Mod - preview widget ***/
+	lcProfileEntry("Settings", "ViewSpherePreviewLocation", (int)lcViewSphereLocation::TopRight), // LC_PROFILE_VIEW_SPHERE_PREVIEW_LOCATION         /*** LPub3D Mod - preview widget ***/
 /*** LPub3D Mod end ***/
 };
 

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.0.1.1921 (20 09 2020 11:56:31)
+LPub3D 2.4.0.1.1922 (20 09 2020 11:57: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.1921 (20 09 2020 11:56:31)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.0.1.1922 (20 09 2020 11:57:11)</h4>
         <hr>
           <p>
              LPub3D Continuous release.<br>

diff --git a/mainApp/lpub_preferences.cpp b/mainApp/lpub_preferences.cpp
@@ -165,7 +165,7 @@ QString Preferences::sceneGuideColor            = THEME_GUIDE_PEN_DEFAULT;
 
 bool    Preferences::usingDefaultLibrary        = true;
 bool    Preferences::portableDistribution       = false;
-bool    Preferences::perspectiveProjection      = false;
+bool    Preferences::perspectiveProjection      = true;
 bool    Preferences::saveOnRedraw               = true;
 bool    Preferences::saveOnUpdate               = true;
 
@@ -244,7 +244,7 @@ bool    Preferences::showAnnotationMessages     = true;
 bool    Preferences::showSaveOnRedraw           = true;
 bool    Preferences::showSaveOnUpdate           = true;
 bool    Preferences::suppressStdOutToLog        = false;
-bool    Preferences::archivePartsOnLaunch       = true;
+bool    Preferences::archivePartsOnLaunch       = false;
 bool    Preferences::highlightFirstStep         = false;
 
 bool    Preferences::customSceneBackgroundColor = false;
@@ -1071,8 +1071,7 @@ void Preferences::lpub3dLibPreferences(bool force)
     // check if archive parts on launch enabled 
     QString const archivePartsOnLaunchKey("ArchivePartsOnLaunch"); 
     if ( ! Settings.contains(QString("%1/%2").arg(SETTINGS,archivePartsOnLaunchKey))) { 
-        QVariant uValue(true); 
-        archivePartsOnLaunch = true; 
+        QVariant uValue(archivePartsOnLaunch);
         Settings.setValue(QString("%1/%2").arg(SETTINGS,archivePartsOnLaunchKey),uValue); 
     } else {
         archivePartsOnLaunch = Settings.value(QString("%1/%2").arg(SETTINGS,archivePartsOnLaunchKey)).toBool();

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

diff --git a/mainApp/preferences.ui b/mainApp/preferences.ui
@@ -49,7 +49,7 @@
       </size>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tabGeneral">
       <attribute name="title">
@@ -2830,80 +2830,110 @@ p, li { white-space: pre-wrap; }
  </widget>
  <tabstops>
   <tabstop>preferencesTabWidget</tabstop>
-  <tabstop>fadeStepBox</tabstop>
-  <tabstop>fadeStepsUseColourBox</tabstop>
-  <tabstop>fadeStepsColoursCombo</tabstop>
   <tabstop>ldrawLibPathEdit</tabstop>
   <tabstop>browseLDraw</tabstop>
   <tabstop>altLDConfigBox</tabstop>
   <tabstop>altLDConfigPath</tabstop>
-  <tabstop>imageMattingChk</tabstop>
+  <tabstop>browseAltLDConfig</tabstop>
+  <tabstop>loadLastOpenedFileCheck</tabstop>
+  <tabstop>ldrawFilesLoadMsgsCombo</tabstop>
+  <tabstop>extendedSubfileSearchCheck</tabstop>
+  <tabstop>saveOnUpdateChkBox</tabstop>
+  <tabstop>saveOnRedrawChkBox</tabstop>
+  <tabstop>fadeStepBox</tabstop>
+  <tabstop>fadeStepsUseColourBox</tabstop>
+  <tabstop>fadeStepsColoursCombo</tabstop>
   <tabstop>fadeStepsOpacitySlider</tabstop>
   <tabstop>highlightStepBox</tabstop>
-  <tabstop>highlightStepLineWidthSpin</tabstop>
+  <tabstop>highlightFirstStepBox</tabstop>
   <tabstop>highlightStepBtn</tabstop>
-  <tabstop>browseAltLDConfig</tabstop>
+  <tabstop>highlightStepLineWidthSpin</tabstop>
+  <tabstop>imageMattingChk</tabstop>
   <tabstop>pliControlBox</tabstop>
   <tabstop>pliControlEdit</tabstop>
   <tabstop>browsePli</tabstop>
   <tabstop>Centimeters</tabstop>
   <tabstop>Inches</tabstop>
+  <tabstop>applyCALocallyRadio</tabstop>
+  <tabstop>applyCARendererRadio</tabstop>
+  <tabstop>optionsButton</tabstop>
+  <tabstop>preferredRenderer</tabstop>
+  <tabstop>projectionCombo</tabstop>
+  <tabstop>rendererTimeout</tabstop>
+  <tabstop>ldviewBox</tabstop>
+  <tabstop>ldviewSingleCall_Chk</tabstop>
+  <tabstop>ldviewSnaphsotsList_Chk</tabstop>
+  <tabstop>ldvPreferencesBtn</tabstop>
+  <tabstop>ldviewPath</tabstop>
+  <tabstop>browseLDView</tabstop>
+  <tabstop>ldgliteBox</tabstop>
+  <tabstop>ldglitePath</tabstop>
+  <tabstop>browseLDGLite</tabstop>
   <tabstop>POVRayBox</tabstop>
-  <tabstop>lgeoPath</tabstop>
+  <tabstop>povrayRenderQualityCombo</tabstop>
+  <tabstop>povrayAutoCropBox</tabstop>
+  <tabstop>povrayDisplay_Chk</tabstop>
+  <tabstop>povrayPath</tabstop>
+  <tabstop>browsePOVRAY</tabstop>
   <tabstop>povGenNativeRadio</tabstop>
   <tabstop>povGenLDViewRadio</tabstop>
   <tabstop>ldvPoVFileGenOptBtn</tabstop>
   <tabstop>ldvPoVFileGenPrefBtn</tabstop>
-  <tabstop>ldgliteBox</tabstop>
-  <tabstop>browseLDGLite</tabstop>
-  <tabstop>ldglitePath</tabstop>
-  <tabstop>ldviewBox</tabstop>
-  <tabstop>ldvPreferencesBtn</tabstop>
-  <tabstop>ldviewSingleCall_Chk</tabstop>
-  <tabstop>preferredRenderer</tabstop>
-  <tabstop>rendererTimeout</tabstop>
-  <tabstop>publishLogoBox</tabstop>
-  <tabstop>publishLogoPath</tabstop>
-  <tabstop>browsePublishLogo</tabstop>
-  <tabstop>publishDescriptionEdit</tabstop>
+  <tabstop>lgeoBox</tabstop>
+  <tabstop>lgeoPath</tabstop>
+  <tabstop>browseLGEO</tabstop>
+  <tabstop>archiveLSynthPartsBox</tabstop>
+  <tabstop>addLSynthSearchDirBox</tabstop>
   <tabstop>pageDisplayPauseSpin</tabstop>
   <tabstop>doNotShowPageProcessDlgChk</tabstop>
+  <tabstop>publishTOC_Chk</tabstop>
+  <tabstop>displayAllAttributes_Chk</tabstop>
+  <tabstop>generateCoverPages_Chk</tabstop>
   <tabstop>authorName_Edit</tabstop>
   <tabstop>publishURL_Edit</tabstop>
   <tabstop>publishEmail_Edit</tabstop>
-  <tabstop>displayAllAttributes_Chk</tabstop>
-  <tabstop>generateCoverPages_Chk</tabstop>
+  <tabstop>publishLogoBox</tabstop>
+  <tabstop>publishLogoPath</tabstop>
+  <tabstop>browsePublishLogo</tabstop>
+  <tabstop>publishDescriptionEdit</tabstop>
+  <tabstop>themeCombo</tabstop>
+  <tabstop>themeAutoRestartBox</tabstop>
+  <tabstop>sceneBackgroundColorButton</tabstop>
+  <tabstop>sceneRulerTickColorButton</tabstop>
+  <tabstop>sceneGuideColorButton</tabstop>
+  <tabstop>sceneGridColorButton</tabstop>
+  <tabstop>sceneRulerTrackingColorButton</tabstop>
+  <tabstop>resetSceneColorsButton</tabstop>
   <tabstop>loggingGrpBox</tabstop>
   <tabstop>logPathEdit</tabstop>
   <tabstop>includeLogLevelBox</tabstop>
-  <tabstop>includeTimestampBox</tabstop>
   <tabstop>includeLineNumberBox</tabstop>
-  <tabstop>includeFileNameBox</tabstop>
   <tabstop>includeFunctionBox</tabstop>
+  <tabstop>includeTimestampBox</tabstop>
+  <tabstop>includeFileNameBox</tabstop>
   <tabstop>includeAllLogAttribBox</tabstop>
   <tabstop>logLevelGrpBox</tabstop>
   <tabstop>logLevelCombo</tabstop>
   <tabstop>logLevelsGrpBox</tabstop>
   <tabstop>fatalLevelBox</tabstop>
-  <tabstop>noticeLevelBox</tabstop>
   <tabstop>errorLevelBox</tabstop>
-  <tabstop>traceLevelBox</tabstop>
   <tabstop>statusLevelBox</tabstop>
-  <tabstop>debugLevelBox</tabstop>
   <tabstop>infoLevelBox</tabstop>
+  <tabstop>noticeLevelBox</tabstop>
+  <tabstop>traceLevelBox</tabstop>
+  <tabstop>debugLevelBox</tabstop>
   <tabstop>allLogLevelsBox</tabstop>
-  <tabstop>themeCombo</tabstop>
-  <tabstop>themeAutoRestartBox</tabstop>
-  <tabstop>changeLog_txbr</tabstop>
-  <tabstop>showUpdateNotifications_Chk</tabstop>
-  <tabstop>checkForUpdates_btn</tabstop>
-  <tabstop>showAllNotificstions_Chk</tabstop>
-  <tabstop>enableDownloader_Chk</tabstop>
   <tabstop>checkUpdateFrequency_Combo</tabstop>
   <tabstop>moduleVersion_Combo</tabstop>
+  <tabstop>showAllNotificstions_Chk</tabstop>
+  <tabstop>enableDownloader_Chk</tabstop>
+  <tabstop>showDownloadRedirects_Chk</tabstop>
+  <tabstop>showUpdateNotifications_Chk</tabstop>
+  <tabstop>checkForUpdates_btn</tabstop>
+  <tabstop>changeLog_txbr</tabstop>
+  <tabstop>lineEditIniFile</tabstop>
   <tabstop>textEditSearchDirs</tabstop>
   <tabstop>pushButtonReset</tabstop>
-  <tabstop>lineEditIniFile</tabstop>
  </tabstops>
  <resources>
   <include location="lpub3d.qrc"/>