Fade and highlight - refactor set from command calls #710

trevorsandy · Jun 21, 2023 · ba81fbd · ba81fbd
1 parent be5d5fc
commit ba81fbd
Show file tree

Hide file tree

Showing 15 changed files with 58 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -64,7 +64,7 @@ LEGO® is a trademark of the LEGO Group of companies which does not sponsor, aut
 [gh-comm-since-url]:   https://github.com/trevorsandy/lpub3d/releases/tag/continuous "Revisions since v2.4.6"
 
 [gh-maintained-badge]: https://img.shields.io/maintenance/yes/2023.svg?logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgdmlld0JveD0iMTIgMTIgNDAgNDAiPjxwYXRoIGZpbGw9IiNmZmYiIGQ9Ik0zMiwxMy40Yy0xMC41LDAtMTksOC41LTE5LDE5YzAsOC40LDUuNSwxNS41LDEzLDE4YzEsMC4yLDEuMy0wLjQsMS4zLTAuOWMwLTAuNSwwLTEuNywwLTMuMiBjLTUuMywxLjEtNi40LTIuNi02LjQtMi42QzIwLDQxLjYsMTguOCw0MSwxOC44LDQxYy0xLjctMS4yLDAuMS0xLjEsMC4xLTEuMWMxLjksMC4xLDIuOSwyLDIuOSwyYzEuNywyLjksNC41LDIuMSw1LjUsMS42IGMwLjItMS4yLDAuNy0yLjEsMS4yLTIuNmMtNC4yLTAuNS04LjctMi4xLTguNy05LjRjMC0yLjEsMC43LTMuNywyLTUuMWMtMC4yLTAuNS0wLjgtMi40LDAuMi01YzAsMCwxLjYtMC41LDUuMiwyIGMxLjUtMC40LDMuMS0wLjcsNC44LTAuN2MxLjYsMCwzLjMsMC4yLDQuNywwLjdjMy42LTIuNCw1LjItMiw1LjItMmMxLDIuNiwwLjQsNC42LDAuMiw1YzEuMiwxLjMsMiwzLDIsNS4xYzAsNy4zLTQuNSw4LjktOC43LDkuNCBjMC43LDAuNiwxLjMsMS43LDEuMywzLjVjMCwyLjYsMCw0LjYsMCw1LjJjMCwwLjUsMC40LDEuMSwxLjMsMC45YzcuNS0yLjYsMTMtOS43LDEzLTE4LjFDNTEsMjEuOSw0Mi41LDEzLjQsMzIsMTMuNHoiLz48L3N2Zz4=
-[gh-maintained-url]:   https://github.com/trevorsandy/lpub3d/projects/1 "Last edited 19-06-2023"
+[gh-maintained-url]:   https://github.com/trevorsandy/lpub3d/projects/1 "Last edited 21-06-2023"
 
 [sf-dw-badge]:         https://img.shields.io/sourceforge/dw/lpub3d.svg?logo=data:image/svg+xml;base64,PCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAyMDAxMDkwNC8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9UUi8yMDAxL1JFQy1TVkctMjAwMTA5MDQvRFREL3N2ZzEwLmR0ZCI+PHN2ZyB2ZXJzaW9uPSIxLjAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjMzMHB4IiBoZWlnaHQ9IjMzMHB4IiB2aWV3Qm94PSIwIDAgMzMwMCAzMzAwIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCBtZWV0Ij48ZyBpZD0ibGF5ZXIxMDEiIGZpbGw9IiNmZmYiIHN0cm9rZT0ibm9uZSI+IDxwYXRoIGQ9Ik0xNTI4IDMwMTkgYy0xMCAtNSAtMTggLTIwIC0xOCAtMzIgMCAtMTYgMTczIC0xOTUgNjA3IC02MjkgNTYyIC01NjIgNjA2IC02MDkgNjA1IC02MzkgLTEgLTI5IC00OSAtODEgLTQ4MSAtNTEzIC0zMjMgLTMyMyAtNDgxIC00ODggLTQ4MSAtNTAyIDAgLTIzIDE5OCAtMjI0IDIyMSAtMjI0IDE5IDAgMTIzOSAxMjIxIDEyMzkgMTI0MCAwIDggLTI5MSAzMDYgLTY0NyA2NjIgbC02NDggNjQ4IC0xOTAgMCBjLTExMCAwIC0xOTcgLTUgLTIwNyAtMTF6Ii8+IDxwYXRoIGQ9Ik02ODIgMjIwNiBjLTQwMSAtNDAwIC02MTMgLTYxOSAtNjExIC02MjkgNCAtMTggMTI2MiAtMTI4MiAxMjkxIC0xMjk4IDIzIC0xMyAzNzUgLTEyIDM5OSAxIDEwIDYgMTkgMjEgMTkgMzMgMCAxNSAtMTcyIDE5NCAtNjA0IDYyNyAtMzMzIDMzMyAtNjA1IDYxMiAtNjA2IDYyMCAtMiA4IC0yIDI0IC0xIDM1IDEgMTIgMTkzIDIxMiA0ODEgNTAwIDMwOCAzMDggNDgwIDQ4NyA0ODAgNTAwIDAgMjMgLTE5NyAyMjUgLTIyMCAyMjUgLTggMCAtMjkxIC0yNzYgLTYyOCAtNjE0eiIvPiA8cGF0aCBkPSJNMTU5MiAyMjM5IGMtMTM5IC0yMyAtMjY5IC0xMjMgLTMzNiAtMjYwIC00NiAtOTUgLTYwIC0xNjkgLTUyIC0yODkgMTAgLTE2MiA1MSAtMjU4IDE4NiAtNDMxIDEwOCAtMTM4IDEzOCAtMTk2IDE1MyAtMjg4IDEyIC04MyAyNiAtOTAgNzMgLTM4IDgxIDg2IDEzNyAxODYgMTc5IDMxNyA0MCAxMjYgNTUgMjE2IDY2IDQwMCA2IDkxIDE2IDE3NiAyMiAxOTAgMTggMzcgNTEgMzcgNzYgMSA0OCAtNjYgNTUgLTEwNiA1NSAtMjg0IDAgLTEwOSA0IC0xNjYgMTEgLTE2NCAxNiA1IDUzIDkxIDgwIDE4NCA5MSAzMTIgLTg3IDYyMCAtMzgxIDY2MyAtMzggNSAtNzEgOSAtNzQgOSAtMyAtMSAtMjkgLTUgLTU4IC0xMHoiLz4gPC9nPjwvc3ZnPg==
 [sf-dw-badge-url]:     https://sourceforge.net/projects/lpub3d

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.3474
+pkgver=2.4.6.3475
 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.3474
+pkgver=2.4.6.3475
 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.3474) debian; urgency=medium
+lpub3d (2.4.6.3475) debian; urgency=medium
 
-  * LPub3D version 2.4.6.363.3474_20230619 for Linux
+  * LPub3D version 2.4.6.364.3475_20230621 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 19 Jun 2023 17:57:34 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Wed, 21 Jun 2023 12:25: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.6.3474
+Version: 2.4.6.3475
 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
@@ -1,7 +1,7 @@
 #
 # spec file for LPub3D package
 #
-# Last Update: June 19, 2023
+# Last Update: June 21, 2023
 # Copyright © 2017 - 2023 Trevor SANDY
 # Using RPM Spec file examples by Thomas Baumgart, Peter Bartfai and others
 # This file and all modifications and additions to the pristine
@@ -120,7 +120,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3474
+Version: 2.4.6.3475
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -797,7 +797,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3474
+* Wed Jun 21 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3475
 - 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.3474) debian; urgency=medium
+lpub3d (2.4.6.3475) debian; urgency=medium
 
-  * LPub3D version 2.4.6.363.3474_20230619 for Linux
+  * LPub3D version 2.4.6.364.3475_20230621 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 19 Jun 2023 17:57:35 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Wed, 21 Jun 2023 12:25:12 +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.3474
+Version: 2.4.6.3475
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 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.3474
+Version: 2.4.6.3475
 Release: 1%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -313,7 +313,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Mon Jun 19 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3474
+* Wed Jun 21 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3475
 - 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 363 3474 ce1ec9669
+2 4 6 364 3475 be5d5fc5a
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 = 363
+        GIT_REVISION = 364
         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 = 3474
+            GIT_COMMIT = 3475
             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}.363.3474.ce1ec9669
+            GIT_VERSION = $${VERSION}.364.3475.be5d5fc5a
             message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.6.363.3474 (19 06 2023 17:57:35)
+LPub3D 2.4.6.364.3475 (21 06 2023 12:25:12)
 
 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.363.3474 (19 06 2023 17:57:35)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.364.3475 (21 06 2023 12:25:12)</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.363.3474
-;; Last Update.: Mon, 19 Jun 2023 17:57:35 +0200
+;; Version.....: 2.4.6.364.3475
+;; Last Update.: Wed, 21 Jun 2023 12:25:12 +0200
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2023 by Trevor SANDY

diff --git a/mainApp/lpub_object.cpp b/mainApp/lpub_object.cpp
@@ -640,19 +640,21 @@ bool LPub::setFadeStepsFromCommand()
     if (!nativeRenderer) {
       emit lpub->messageSig(LOG_WARNING,tr("LPUB_FADE command IGNORED.<br>"
                                            "LPUB_FADE command requires preferred render RENDERER_NATIVE.<br>"
-                                           "PREFERRED_RENDERER command must precede LPUB_FADE."),true/*Show Dialog*/);
+                                           "PREFERRED_RENDERER command must precede LPUB_FADE."),true);
       lpubFade = false;
     }
   }
 
+  bool configureFadeSteps = lpubFade || (!lpubFade && !nativeRenderer);
+
   if (!Preferences::enableFadeSteps) {
     result.clear();
     fadeRx.setPattern("FADE_STEPS ENABLED\\s*(GLOBAL)?\\s*TRUE");
     Preferences::enableFadeSteps = Gui::stepContains(topLevelModel,fadeRx,result,1);
     if (Preferences::enableFadeSteps) {
       if (result != QLatin1String("GLOBAL")) {
-        emit lpub->messageSig(LOG_WARNING,tr("Top level FADE_STEPS set to ENABLED but missing GLOBAL qualifier."),true/*Show Dialog*/);
-      } else if (lpubFade && !Preferences::finalModelEnabled) {
+        emit lpub->messageSig(LOG_WARNING,tr("Top level FADE_STEPS set to ENABLED but missing GLOBAL qualifier."),true);
+      } else if (configureFadeSteps && !Preferences::finalModelEnabled) {
         result.clear();
         topLevelModel = top;
         fadeRx.setPattern("FINAL_MODEL_ENABLED\\s*(GLOBAL)?\\s*(?:TRUE|FALSE)");
@@ -661,37 +663,36 @@ bool LPub::setFadeStepsFromCommand()
           emit lpub->messageSig(LOG_INFO, tr("Display Final Model is Enabled"));
         }
         if (result != QLatin1String("GLOBAL")) {
-          emit lpub->messageSig(LOG_WARNING,tr("FINAL_MODEL_ENABLED command should have GLOBAL qualifier."),true/*Show Dialog*/);
+          emit lpub->messageSig(LOG_WARNING,tr("FINAL_MODEL_ENABLED command should have GLOBAL qualifier."),true);
         }
       }
     }
   }
 
   result.clear();
   topLevelModel = top;
-  bool setupFadeSteps = lpubFade || (!lpubFade && !nativeRenderer);
-  if (setupFadeSteps) {
+  bool setupFadeSteps = false;
+  if (configureFadeSteps) {
     fadeRx.setPattern("FADE_STEPS SETUP\\s*(GLOBAL)?\\s*TRUE");
     setupFadeSteps = Gui::stepContains(topLevelModel,fadeRx,result,1);
     if (setupFadeSteps && result != QLatin1String("GLOBAL"))
-      emit lpub->messageSig(LOG_WARNING,tr("Top level FADE_STEPS SETUP command missing GLOBAL qualifier."),true/*Show Dialog*/);
-    if (setupFadeSteps) {
-      if (Preferences::enableFadeSteps) {
-        emit lpub->messageSig(LOG_WARNING,tr("Command FADE_STEPS SETUP %1 encountered but<br>FADE_STEPS %1 is ENABLED.<br><br>"
-                                             "Command FADE_STEPS SETUP %1 will be IGNORED.").arg(result),true/*Show Dialog*/);
-        setupFadeSteps = false;
-      }
+      emit lpub->messageSig(LOG_WARNING,tr("Top level FADE_STEPS SETUP command missing GLOBAL qualifier."),true);
+    if (setupFadeSteps && Preferences::enableFadeSteps) {
+      emit lpub->messageSig(LOG_WARNING,tr("Command FADE_STEPS SETUP %1 encountered but<br>FADE_STEPS %1 is ENABLED.<br><br>"
+                                           "Command FADE_STEPS SETUP %1 will be IGNORED.").arg(result),true);
+      setupFadeSteps = false;
+
     }
   }
 
+  if (!Preferences::enableFadeSteps && !setupFadeSteps)
+    return false;
+
   if (Preferences::enableFadeSteps != Preferences::initEnableFadeSteps)
     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 Steps Setup is ENABLED."));
-
-  if (!Preferences::enableFadeSteps && !setupFadeSteps)
-    return false;
+    emit lpub->messageSig(LOG_INFO_STATUS,tr("Fade Steps Setup is ENABLED."));
 
   result.clear();
   topLevelModel = top;
@@ -727,7 +728,7 @@ bool LPub::setFadeStepsFromCommand()
                                         .arg(QString(Preferences::validFadeStepsColour).replace("_"," ")));
   }
 
-  return lpubFade /*setupFadeSteps || Preferences::enableFadeSteps*/;
+  return true /*setupFadeSteps || Preferences::enableFadeSteps*/;
 }
 
 bool LPub::setHighlightStepFromCommand()
@@ -744,19 +745,21 @@ bool LPub::setHighlightStepFromCommand()
     if (!nativeRenderer) {
       emit lpub->messageSig(LOG_WARNING,tr("LPUB_HIGHLIGHT command IGNORED.<br>"
                                            "LPUB_HIGHLIGHT command requires preferred render RENDERER_NATIVE.<br>"
-                                           "PREFERRED_RENDERER command must precede LPUB_HIGHLIGHT."),true/*Show Dialog*/);
+                                           "PREFERRED_RENDERER command must precede LPUB_HIGHLIGHT."),true);
       lpubHighlight = false;
     }
   }
 
+  bool configureHighlightStep = lpubHighlight || (!lpubHighlight && !nativeRenderer);
+
   if (!Preferences::enableHighlightStep) {
     result.clear();
     highlightRx.setPattern("HIGHLIGHT_STEP ENABLED\\s*(GLOBAL)?\\s*TRUE");
     Preferences::enableHighlightStep = Gui::stepContains(topLevelModel,highlightRx,result,1);
     if (Preferences::enableHighlightStep) {
       if (result != QLatin1String("GLOBAL")) {
-        emit lpub->messageSig(LOG_WARNING,tr("Top level HIGHLIGHT_STEP set to ENABLED but missing GLOBAL qualifier."),true/*Show Dialog*/);
-      } else if (lpubHighlight && !Preferences::finalModelEnabled) {
+        emit lpub->messageSig(LOG_WARNING,tr("Top level HIGHLIGHT_STEP set to ENABLED but missing GLOBAL qualifier."),true);
+      } else if (configureHighlightStep && !Preferences::finalModelEnabled) {
         result.clear();
         topLevelModel = top;
         highlightRx.setPattern("FINAL_MODEL_ENABLED\\s*(GLOBAL)?\\s*(?:TRUE|FALSE)");
@@ -765,38 +768,38 @@ bool LPub::setHighlightStepFromCommand()
           emit lpub->messageSig(LOG_INFO,tr("Display Final Model is Enabled"));
         }
         if (result != QLatin1String("GLOBAL")) {
-          emit lpub->messageSig(LOG_WARNING,tr("FINAL_MODEL_ENABLED command should have GLOBAL qualifier."),true/*Show Dialog*/);
+          emit lpub->messageSig(LOG_WARNING,tr("FINAL_MODEL_ENABLED command should have GLOBAL qualifier."),true);
         }
       }
     }
   }
 
   result.clear();
   topLevelModel = top;
-  bool setupHighlightStep = lpubHighlight || (!lpubHighlight && !nativeRenderer);
-  if (setupHighlightStep) {
+  bool setupHighlightStep = false;
+  if (configureHighlightStep) {
     highlightRx.setPattern("HIGHLIGHT_STEP SETUP\\s*(GLOBAL)?\\s*TRUE");
     setupHighlightStep = Gui::stepContains(topLevelModel,highlightRx,result,1);
     if (setupHighlightStep && result != QLatin1String("GLOBAL")) {
-      emit lpub->messageSig(LOG_WARNING,tr("Top level HIGHLIGHT_STEP SETUP command missing GLOBAL qualifier."),true/*Show Dialog*/);
+      emit lpub->messageSig(LOG_WARNING,tr("Top level HIGHLIGHT_STEP SETUP command missing GLOBAL qualifier."),true);
     }
     if (setupHighlightStep) {
       if (Preferences::enableHighlightStep) {
         emit lpub->messageSig(LOG_WARNING,tr("Command HIGHLIGHT_STEP SETUP %1 encountered but<br>HIGHLIGHT_STEP %1 is ENABLED.<br><br>"
-                                             "Command HIGHLIGHT_STEP SETUP %1 will be IGNORED.").arg(result),true/*Show Dialog*/);
+                                             "Command HIGHLIGHT_STEP SETUP %1 will be IGNORED.").arg(result),true);
         setupHighlightStep = false;
       }
     }
   }
 
+  if (!Preferences::enableHighlightStep && !setupHighlightStep)
+    return false;
+
   if (Preferences::enableHighlightStep != Preferences::initEnableHighlightStep)
     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 Step Setup is ENABLED."));
-
-  if (!Preferences::enableHighlightStep && !setupHighlightStep)
-    return false;
+    emit lpub->messageSig(LOG_INFO_STATUS,tr("Highlight Step Setup is ENABLED."));
 
   result.clear();
   topLevelModel = top;
@@ -813,7 +816,7 @@ bool LPub::setHighlightStepFromCommand()
                                         .arg(Preferences::highlightStepColour));
   }
 
-  return lpubHighlight /*setupHighlightStep || Preferences::enableHighlightStep*/;
+  return true /*setupHighlightStep || Preferences::enableHighlightStep*/;
 }
 
 bool LPub::setPreferredRendererFromCommand(const QString &preferredRenderer)