Insert display model - update csi item context menu #704

trevorsandy · Apr 22, 2023 · 17f1f6c · 17f1f6c
1 parent 0adec41
commit 17f1f6c
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 26 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.3278
+pkgver=2.4.6.3279
 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.3278
+pkgver=2.4.6.3279
 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.3278) debian; urgency=medium
+lpub3d (2.4.6.3279) debian; urgency=medium
 
-  * LPub3D version 2.4.6.167.3278_20230422 for Linux
+  * LPub3D version 2.4.6.168.3279_20230422 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:46:16 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:46:38 +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.3278
+Version: 2.4.6.3279
 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
@@ -120,7 +120,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3278
+Version: 2.4.6.3279
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -797,7 +797,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3278
+* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3279
 - 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.3278) debian; urgency=medium
+lpub3d (2.4.6.3279) debian; urgency=medium
 
-  * LPub3D version 2.4.6.167.3278_20230422 for Linux
+  * LPub3D version 2.4.6.168.3279_20230422 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:46:17 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:46:40 +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.3278
+Version: 2.4.6.3279
 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.3278
+Version: 2.4.6.3279
 Release: 1%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -313,7 +313,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3278
+* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3279
 - 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 167 3278 7184601bc
+2 4 6 168 3279 0adec41a7
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 = 167
+        GIT_REVISION = 168
         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 = 3278
+            GIT_COMMIT = 3279
             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}.167.3278.7184601bc
+            GIT_VERSION = $${VERSION}.168.3279.0adec41a7
             message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }

diff --git a/mainApp/csiitem.cpp b/mainApp/csiitem.cpp
@@ -299,7 +299,6 @@ void CsiItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 {
     QMenu menu;
     const QString name    = tr("Assembly");
-    QString whatsThis     = QString();
     bool dividerDetected  = false;
     bool offerStepDivider = false;
     bool fullContextMenu  = step->displayStep == DT_DEFAULT;
@@ -462,6 +461,8 @@ void CsiItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     commonMenus.addAction(scaleAction,menu,name);
 
     QAction *marginsAction             = lpub->getAct("marginAction.1");
+
+    QString whatsThis;
     switch (parentRelativeType)
     {
       case SingleStepType:
@@ -537,7 +538,16 @@ void CsiItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
     }
 
     QAction *noStepAction              = lpub->getAct("noStepAction.1");
-    noStepAction->setText(tr("Do Not Show This %1").arg(fullContextMenu ? tr("Step") : tr("Final Model")));
+    QString display                    = fullContextMenu ? tr("Step") :
+                                         step->displayStep == DT_MODEL_DEFAULT
+                                         ? tr("Display Model")
+                                         : step->displayStep == DT_MODEL_CUSTOM
+                                             ? tr("Custom Model")
+                                             : step->displayStep == DT_MODEL_FINAL
+                                                 ? tr("Final Model")
+                                                 : tr("Page");
+
+    noStepAction->setText(tr("Do Not Show This %1").arg(display));
     commonMenus.addAction(noStepAction,menu);
 
     QAction *previewCsiAction          = lpub->getAct("previewPartAction.1");
@@ -593,12 +603,14 @@ void CsiItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *event)
 #endif
 
     QAction *viewCSIFileAction         = lpub->getAct("viewCSIFileAction.1");
-    viewCSIFileAction->setText(tr("View Step %1 Assembly File") .arg(step->stepNumber.number));
+    viewCSIFileAction->setText(tr("View %1 Assembly File")
+                                   .arg(step->displayStep >= DT_MODEL_DEFAULT ? display : tr("%1 %2").arg(display).arg(step->stepNumber.number)));
     commonMenus.addAction(viewCSIFileAction,menu);
 
 #ifdef QT_DEBUG_MODE
     QAction *view3DViewerFileAction    = lpub->getAct("view3DViewerFileAction.1");
-    view3DViewerFileAction->setText(tr("View Step %1 Assembly Visual Editor File") .arg(step->stepNumber.number));
+    view3DViewerFileAction->setText(tr("View %1 Assembly Visual Editor File")
+                                        .arg(step->displayStep >= DT_MODEL_DEFAULT ? display : tr("%1 %2").arg(display).arg(step->stepNumber.number)));
     commonMenus.addAction(view3DViewerFileAction,menu);
 #endif
 

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.6.167.3278 (22 04 2023 03:46:17)
+LPub3D 2.4.6.168.3279 (22 04 2023 03:46:40)
 
 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.167.3278 (22 04 2023 03:46:17)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.168.3279 (22 04 2023 03:46:40)</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.167.3278
-;; Last Update.: Sat, 22 Apr 2023 03:46:17 +0200
+;; Version.....: 2.4.6.168.3279
+;; Last Update.: Sat, 22 Apr 2023 03:46:40 +0200
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2023 by Trevor SANDY