Insert display model - command editor menu items #704

trevorsandy · Apr 22, 2023 · 6433633 · 6433633
1 parent d33dd44
commit 6433633
Show file tree

Hide file tree

Showing 16 changed files with 49 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.3282
+pkgver=2.4.6.3283
 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.3282
+pkgver=2.4.6.3283
 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.3282) debian; urgency=medium
+lpub3d (2.4.6.3283) debian; urgency=medium
 
-  * LPub3D version 2.4.6.171.3282_20230422 for Linux
+  * LPub3D version 2.4.6.172.3283_20230422 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:47:43 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:48:05 +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.3282
+Version: 2.4.6.3283
 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.3282
+Version: 2.4.6.3283
 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.3282
+* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3283
 - 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.3282) debian; urgency=medium
+lpub3d (2.4.6.3283) debian; urgency=medium
 
-  * LPub3D version 2.4.6.171.3282_20230422 for Linux
+  * LPub3D version 2.4.6.172.3283_20230422 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:47:45 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 22 Apr 2023 03:48:06 +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.3282
+Version: 2.4.6.3283
 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.3282
+Version: 2.4.6.3283
 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.3282
+* Sat Apr 22 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3283
 - 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 171 3282 c4a25e118
+2 4 6 172 3283 d33dd44ca
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 = 171
+        GIT_REVISION = 172
         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 = 3282
+            GIT_COMMIT = 3283
             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}.171.3282.c4a25e118
+            GIT_VERSION = $${VERSION}.172.3283.d33dd44ca
             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.171.3282 (22 04 2023 03:47:45)
+LPub3D 2.4.6.172.3283 (22 04 2023 03:48:06)
 
 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.171.3282 (22 04 2023 03:47:45)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.172.3283 (22 04 2023 03:48:06)</h4>
         <hr>
           <p>
              <span class="tg-1pky">LPub3D Official release.</span><br>

diff --git a/mainApp/editwindow.cpp b/mainApp/editwindow.cpp
@@ -245,6 +245,7 @@ void EditWindow::previewLine()
 
     if (Preferences.mPreviewPosition != lcPreviewPosition::Floating && !modelFileEdit()) {
         gMainWindow->PreviewPiece(partType, colorCode, false);
+        lpub->raisePreviewDockWindow();
         return;
     } else {
         lcPreview *Preview = new lcPreview();
@@ -980,6 +981,7 @@ bool EditWindow::setValidPartLine()
     bool colorOk = false;
     bool isSubstitute = false;
     bool isSubstituteAlt = false;
+    bool isDisplayType = lpub->currentStep->displayStep != DT_DEFAULT;
     bool isPliControlFile = modelFileEdit() && fileName == Preferences::pliControlFile;
 
     toolsToolBar->setEnabled(false);
@@ -991,7 +993,9 @@ bool EditWindow::setValidPartLine()
         editColorAct->setText(tr("Edit Color"));
         editPartAct->setText(tr("Edit Part"));
         if (isPliControlFile)
-            substitutePartAct->setVisible(false);
+            substitutePartAct->setEnabled(false);
+        else if (isDisplayType)
+            substitutePartAct->setEnabled(false);
         else
             substitutePartAct->setText(tr("Substitute Part"));
     }
@@ -1104,7 +1108,7 @@ bool EditWindow::setValidPartLine()
 
         const QString actionText = tr("Substitute  %1...").arg(elidedPartType);
 
-        if (!isPliControlFile) {
+        if (!isPliControlFile && !isDisplayType) {
             if (isSubstitute || isSubstituteAlt) {
                 removeSubstitutePartAct->setText(tr("Remove %1").arg(actionText));
                 removeSubstitutePartAct->setData(QString("%1|%2").arg(subPartKey).arg(isSubstitute ? sRemove : sRemoveAlt));
@@ -1131,7 +1135,7 @@ bool EditWindow::setValidPartLine()
 
         if (numOpenWithPrograms)
             openWithToolbarAct->setEnabled(true);
-    }
+    } // !isReadOnly
 
     return true;
 }
@@ -1142,6 +1146,7 @@ void EditWindow::showContextMenu(const QPoint &pt)
 
     if (!fileName.isEmpty()) {
         bool isPliControlFile = modelFileEdit() && fileName == Preferences::pliControlFile;
+        bool isDisplayType = lpub->currentStep->displayStep != DT_DEFAULT;
         if (_subFileListPending) {
             emit getSubFileListSig();
             while (_subFileListPending)
@@ -1182,7 +1187,7 @@ void EditWindow::showContextMenu(const QPoint &pt)
         if (setValidPartLine()) {
             toolsMenu->addAction(editColorAct);
             toolsMenu->addAction(editPartAct);
-            if (!isPliControlFile)
+            if (!isPliControlFile && !isDisplayType)
                 toolsMenu->addAction(substitutePartAct);
             if (modelFileEdit())
                 toolsMenu->addAction(previewLineAct);
@@ -2294,6 +2299,8 @@ void EditWindow::displayFile(
   if (!Preferences::modeGUI)
       return;
 
+  disableActions();
+
   reloaded        = _fileName == fileName;
   fileName        = _fileName;
   lineCount       = 0;

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.171.3282
-;; Last Update.: Sat, 22 Apr 2023 03:47:45 +0200
+;; Version.....: 2.4.6.172.3283
+;; Last Update.: Sat, 22 Apr 2023 03:48:06 +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
@@ -1880,3 +1880,15 @@ void LPub::saveVisualEditorTransformSettings()
     mRelativeTransform = gMainWindow->GetRelativeTransform();
     mSeparateTransform = gMainWindow->GetSeparateTransform();
 }
+
+void LPub::raiseVisualEditDockWindow()
+{
+    gui->RaiseVisualEditDockWindow();
+}
+
+void LPub::raisePreviewDockWindow()
+{
+    gui->RaisePreviewDockWindow();
+}
+
+
diff --git a/mainApp/lpub_object.h b/mainApp/lpub_object.h
@@ -243,6 +243,10 @@ public slots:
   void updaterCancelled();
   void updateChangelog(const QString &);
 
+  /// Raise visual editor windows
+  void raiseVisualEditDockWindow();
+  void raisePreviewDockWindow();
+
   /// Visual Editor viewpoint latitude longitude
 private slots:
   void latReset(bool);