Fade and highlight - remove previous and current from labels #710

trevorsandy · May 8, 2023 · 3ff6017 · 3ff6017
1 parent c64fb48
commit 3ff6017
Show file tree

Hide file tree

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

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 - 2023 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.6.3342
+pkgver=2.4.6.3343
 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.6.3342) debian; urgency=medium
+lpub3d (2.4.6.3343) debian; urgency=medium
 
-  * LPub3D version 2.4.6.231.3342_20230508 for Linux
+  * LPub3D version 2.4.6.232.3343_20230508 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:15:39 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:16:04 +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.6.3342
+Version: 2.4.6.3343
 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
@@ -120,7 +120,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3342
+Version: 2.4.6.3343
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -797,7 +797,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3342
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3343
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670

diff --git a/builds/linux/obs/debian/changelog b/builds/linux/obs/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.6.3342) debian; urgency=medium
+lpub3d (2.4.6.3343) debian; urgency=medium
 
-  * LPub3D version 2.4.6.231.3342_20230508 for Linux
+  * LPub3D version 2.4.6.232.3343_20230508 for Linux
 
- -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:15:40 +0200
+ -- Trevor SANDY <[email protected]>  Mon, 08 May 2023 15:16:05 +0200
diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.6.3342
+Version: 2.4.6.3343
 Maintainer: Trevor SANDY <[email protected]>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

diff --git a/builds/linux/obs/lpub3d.spec b/builds/linux/obs/lpub3d.spec
@@ -82,7 +82,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3342
+Version: 2.4.6.3343
 Release: 1%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -313,7 +313,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3342
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3343
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670

diff --git a/builds/utilities/version.info b/builds/utilities/version.info
@@ -1 +1 @@
-2 4 6 231 3342 0138bed1e
+2 4 6 232 3343 c64fb48f7
diff --git a/gitversion.pri b/gitversion.pri
@@ -41,7 +41,7 @@ equals(GIT_DIR, undefined) {
 
     # Check if we do not have a valid version number (i.e. no version tag found)
     isEmpty(GIT_VERSION) {
-        GIT_REVISION = 231
+        GIT_REVISION = 232
         GIT_SHA      = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE)
         GIT_COMMIT   = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         GIT_VERSION  = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA}
@@ -69,7 +69,7 @@ equals(GIT_DIR, undefined) {
         # Get commit count
         GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         isEmpty(GIT_COMMIT) {
-            GIT_COMMIT = 3342
+            GIT_COMMIT = 3343
             message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~")
         }
 
@@ -117,7 +117,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) {
             GIT_VERSION = $$cat($$GIT_VER_FILE, lines)
         } else {
             message("~~~ ERROR! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~")
-            GIT_VERSION = $${VERSION}.231.3342.0138bed1e
+            GIT_VERSION = $${VERSION}.232.3343.c64fb48f7
             message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }

diff --git a/lclib/common/lc_commands.cpp b/lclib/common/lc_commands.cpp
@@ -1228,7 +1228,7 @@ const lcCommand gCommands[] =
 	// LC_VIEW_FADE_PREVIOUS_STEPS
 	{
 		QT_TRANSLATE_NOOP("Action", "View.FadePreviousSteps"),
-		QT_TRANSLATE_NOOP("Menu", "Fade Previous Steps"),
+		QT_TRANSLATE_NOOP("Menu", "Fade Steps"),
 		QT_TRANSLATE_NOOP("Status", "Toggle fading previous model steps"),
 		""
 	},

diff --git a/lclib/common/project.cpp b/lclib/common/project.cpp
@@ -44,7 +44,7 @@ lcHTMLExportOptions::lcHTMLExportOptions(const Project* Project)
 /*** LPub3D Mod - HTML Highlight New Parts ***/
 	HtmlHighlightNewParts = gApplication->mPreferences.mHighlightNewParts;
 /*** LPub3D Mod end ***/
-/*** LPub3D Mod - HTML Fade Previous Steps ***/
+/*** LPub3D Mod - HTML Fade Steps ***/
 	HtmlFadeSteps = gApplication->mPreferences.mFadeSteps;
 /*** LPub3D Mod end ***/
 }
@@ -73,7 +73,7 @@ void lcHTMLExportOptions::SaveDefaults()
 /*** LPub3D Mod - HTML Highlight New Parts ***/
 	gApplication->mPreferences.mHighlightNewParts = HtmlHighlightNewParts;
 /*** LPub3D Mod end ***/
-/*** LPub3D Mod - HTML Fade Previous Steps ***/
+/*** LPub3D Mod - HTML Fade Steps ***/
 	gApplication->mPreferences.mFadeSteps = HtmlFadeSteps;
 /*** LPub3D Mod end ***/
 }

diff --git a/lclib/common/project.h b/lclib/common/project.h
@@ -32,7 +32,7 @@ class lcHTMLExportOptions
 /*** LPub3D Mod - HTML Highlight New Parts ***/
 	bool HtmlHighlightNewParts;
 /*** LPub3D Mod end ***/
-/*** LPub3D Mod - HTML Fade Previous Steps ***/
+/*** LPub3D Mod - HTML Fade Steps ***/
 	bool HtmlFadeSteps;
 /*** LPub3D Mod end ***/
 };

diff --git a/lclib/qt/lc_qhtmldialog.cpp b/lclib/qt/lc_qhtmldialog.cpp
@@ -33,7 +33,7 @@ lcQHTMLDialog::lcQHTMLDialog(QWidget* Parent, lcHTMLExportOptions* Options)
 /*** LPub3D Mod end ***/
 	ui->partsAfterEachStep->setChecked(mOptions->PartsListStep);
 	ui->partsAtTheEnd->setChecked(mOptions->PartsListEnd);
-/*** LPub3D Mod - HTML Fade Previous Steps ***/
+/*** LPub3D Mod - HTML Fade Steps ***/
 	ui->FadeSteps->setChecked(mOptions->HtmlFadeSteps);
 /*** LPub3D Mod end ***/
 }
@@ -68,7 +68,7 @@ void lcQHTMLDialog::accept()
 /*** LPub3D Mod end ***/
 	mOptions->PartsListStep = ui->partsAfterEachStep->isChecked();
 	mOptions->PartsListEnd = ui->partsAtTheEnd->isChecked();
-/*** LPub3D Mod - HTML Fade Previous Steps ***/
+/*** LPub3D Mod - HTML Fade Steps ***/
 	mOptions->HtmlFadeSteps = ui->FadeSteps->isChecked();
 /*** LPub3D Mod end ***/
 

diff --git a/lclib/qt/lc_qhtmldialog.ui b/lclib/qt/lc_qhtmldialog.ui
@@ -166,7 +166,7 @@
       <item row="6" column="0">
        <widget class="QCheckBox" name="FadeSteps">
         <property name="text">
-         <string>Fade Previous Steps</string>
+         <string>Fade Steps</string>
         </property>
        </widget>
       </item>

diff --git a/mainApp/commandline.cpp b/mainApp/commandline.cpp
@@ -567,7 +567,7 @@ int LPub::processCommandLine()
   if (fadeSteps && fadeSteps != Preferences::enableFadeSteps)
   {
       Preferences::enableFadeSteps = fadeSteps;
-      message = tr("Fade Previous Steps set to ON.");
+      message = tr("Fade Steps set to ON.");
       emit messageSig(LOG_INFO,message);
       if (fadeStepsColour.isEmpty())
       {
@@ -646,7 +646,7 @@ int LPub::processCommandLine()
   if (highlightStep && highlightStep != Preferences::enableHighlightStep)
   {
       Preferences::enableHighlightStep = highlightStep;
-      message = tr("Highlight Current Step set to ON.");
+      message = tr("Highlight Step set to ON.");
       emit messageSig(LOG_INFO,message);
   }
 

diff --git a/mainApp/commonmenus.cpp b/mainApp/commonmenus.cpp
@@ -7923,7 +7923,7 @@ void CommonMenus::setWhatsThis()
 #endif
                 )
         },
-        // WT_GUI_FADE_PREVIOUS_STEPS
+        // WT_GUI_FADE_STEPS
         {
             QObject::tr(
             "  Turn on or off fade previous steps or step parts globally.\n\n"
@@ -7969,7 +7969,7 @@ void CommonMenus::setWhatsThis()
             .arg(QLatin1String(VER_PRODUCTNAME_STR))
             .arg(
 #ifdef QT_DEBUG_MODE
-                 QLatin1String("\n\n  WT_GUI_FADE_PREVIOUS_STEPS")
+                 QLatin1String("\n\n  WT_GUI_FADE_STEPS")
 #else
                  ""
 #endif

diff --git a/mainApp/commonmenus.h b/mainApp/commonmenus.h
@@ -365,7 +365,7 @@ enum WT_Type
     WT_GUI_PREFERRED_RENDERER,
     WT_GUI_DOCUMENT_RESOLUTION,
     WT_GUI_ASSEM_ANNOTATION_TYPE,
-    WT_GUI_FADE_PREVIOUS_STEPS,
+    WT_GUI_FADE_STEPS,
     WT_GUI_HIGHLIGHT_CURRENT_STEP,
     WT_GUI_FINAL_FADE_HIGHLIGHT_MODEL_STEP,
     WT_GUI_SEPARATOR,

diff --git a/mainApp/csiitem.cpp b/mainApp/csiitem.cpp
@@ -716,7 +716,7 @@ void CsiItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
                       bottomOfStep,
                       &step->csiStepMeta.fadeSteps);
     } else if (selectedAction == setHighlightStepAction) {
-        setHighlightStep(tr("Highlight Current Step %1").arg(name),
+        setHighlightStep(tr("Highlight Step %1").arg(name),
                          topOfStep,
                          bottomOfStep,
                          &step->csiStepMeta.highlightStep);

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.6.231.3342 (08 05 2023 15:15:41)
+LPub3D 2.4.6.232.3343 (08 05 2023 15:16:05)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -18,7 +18,7 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.231.3342 (08 05 2023 15:15:41)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.232.3343 (08 05 2023 15:16:05)</h4>
         <hr>
           <p>
              <span class="tg-1pky">LPub3D Official release.</span><br>

diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml
@@ -14,8 +14,8 @@
 ;;
 ;; Author......: Trevor SANDY
 ;; Name........: LPub3D_Npp_UDL.xml
-;; Version.....: 2.4.6.231.3342
-;; Last Update.: Mon, 08 May 2023 15:15:40 +0200
+;; Version.....: 2.4.6.232.3343
+;; Last Update.: Mon, 08 May 2023 15:16:05 +0200
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2023 by Trevor SANDY

diff --git a/mainApp/fadestepglobals.cpp b/mainApp/fadestepglobals.cpp
@@ -79,7 +79,7 @@ GlobalFadeStepDialog::GlobalFadeStepDialog(
   layout->addWidget(&sw);
   setLayout(layout);
 
-  QGroupBox *box = new QGroupBox(tr("Fade Previous Steps"));
+  QGroupBox *box = new QGroupBox(tr("Fade Steps"));
   box->setToolTip(tr("Enable fade previous steps"));
   layout->addWidget(box);
   fadeStepsChild = new FadeStepsGui(fadeStepsMeta,box);

diff --git a/mainApp/highlightstepglobals.cpp b/mainApp/highlightstepglobals.cpp
@@ -81,7 +81,7 @@ GlobalHighlightStepDialog::GlobalHighlightStepDialog(
   layout->addWidget(&sw);
   setLayout(layout);
 
-  QGroupBox *box = new QGroupBox(tr("Highlight Current Step"));
+  QGroupBox *box = new QGroupBox(tr("Highlight Step"));
   box->setToolTip(tr("Enable highlight current step"));
   layout->addWidget(box);
   highlightStepChild = new HighlightStepGui(highlightStepMeta,box);

diff --git a/mainApp/lpub.cpp b/mainApp/lpub.cpp
@@ -6353,10 +6353,10 @@ void Gui::createActions()
         lpub->actions.insert(povrayRendererArgumentsAction->objectName(), Action(QStringLiteral("SharedContext.Add Povray Renderer Arguments"), povrayRendererArgumentsAction));
 
         QAction *highlightStepAction = commonMenus.highlightStepMenu(*contextMenu,name);
-        lpub->actions.insert(highlightStepAction->objectName(), Action(QStringLiteral("SharedContext.Highlight Current Step"), highlightStepAction));
+        lpub->actions.insert(highlightStepAction->objectName(), Action(QStringLiteral("SharedContext.Highlight Step"), highlightStepAction));
 
         QAction *fadeStepsAction = commonMenus.fadeStepsMenu(*contextMenu,name);
-        lpub->actions.insert(fadeStepsAction->objectName(), Action(QStringLiteral("SharedContext.Fade Previous Steps"), fadeStepsAction));
+        lpub->actions.insert(fadeStepsAction->objectName(), Action(QStringLiteral("SharedContext.Fade Steps"), fadeStepsAction));
 
         QAction *preferredRendererAction = commonMenus.preferredRendererMenu(*contextMenu,name);
         lpub->actions.insert(preferredRendererAction->objectName(), Action(QStringLiteral("SharedContext.Change Renderer"), preferredRendererAction));

diff --git a/mainApp/lpub_object.cpp b/mainApp/lpub_object.cpp
@@ -684,10 +684,10 @@ bool LPub::setFadeStepsFromCommand()
   }
 
   if (Preferences::enableFadeSteps != Preferences::initEnableFadeSteps)
-    emit lpub->messageSig(LOG_INFO_STATUS,tr("Fade Previous Steps is %1 - Set from meta command.")
+    emit lpub->messageSig(LOG_INFO_STATUS,tr("Fade Steps is %1 - Set from meta command.")
                                             .arg(Preferences::enableFadeSteps ? "ON" : "OFF"));
   if (setupFadeSteps)
-     emit lpub->messageSig(LOG_INFO_STATUS,tr("Fade Previous Steps Setup is ENABLED."));
+     emit lpub->messageSig(LOG_INFO_STATUS,tr("Fade Steps Setup is ENABLED."));
 
   if (!Preferences::enableFadeSteps && !setupFadeSteps)
     return false;
@@ -788,10 +788,10 @@ bool LPub::setHighlightStepFromCommand()
   }
 
   if (Preferences::enableHighlightStep != Preferences::initEnableHighlightStep)
-    emit lpub->messageSig(LOG_INFO_STATUS,tr("Highlight Current Step is %1 - Set from meta command.")
+    emit lpub->messageSig(LOG_INFO_STATUS,tr("Highlight Step is %1 - Set from meta command.")
                                              .arg(Preferences::enableHighlightStep ? "ON" : "OFF"));
   if (setupHighlightStep)
-     emit lpub->messageSig(LOG_INFO_STATUS,tr("Highlight Current Step Setup is ENABLED."));
+     emit lpub->messageSig(LOG_INFO_STATUS,tr("Highlight Step Setup is ENABLED."));
 
   if (!Preferences::enableHighlightStep && !setupHighlightStep)
     return false;

diff --git a/mainApp/lpub_preferences.cpp b/mainApp/lpub_preferences.cpp
@@ -6157,9 +6157,9 @@ bool Preferences::getPreferences()
 
             suspendFileDisplay = restartApplication || reloadFile || reloadPage;
 
-            emit lpub->messageSig(LOG_INFO,QMessageBox::tr("Fade Previous Steps is %1.")
+            emit lpub->messageSig(LOG_INFO,QMessageBox::tr("Fade Steps is %1.")
                                   .arg(dialog->enableFadeSteps() ? On : Off));
-            emit lpub->messageSig(LOG_INFO,QMessageBox::tr("Highlight Current Step is %1.")
+            emit lpub->messageSig(LOG_INFO,QMessageBox::tr("Highlight Step is %1.")
                                   .arg(dialog->enableHighlightStep() ? On : Off));
 
             if (dialog->enableFadeSteps() && !LDrawColourParts::ldrawColorPartsIsLoaded()) {