Update highlighted lines #417

trevorsandy · Mar 12, 2021 · a8195ed · a8195ed
1 parent f057fc0
commit a8195ed
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 35 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.1.2040
+pkgver=2.4.1.2041
 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.1.2040) debian; urgency=medium
+lpub3d (2.4.1.2041) debian; urgency=medium
 
-  * LPub3D version 2.4.1.1.2040_20210312 for Linux
+  * LPub3D version 2.4.1.1.2041_20210312 for Linux
 
- -- Trevor SANDY <[email protected]>  Fri, 12 Mar 2021 06:35:50 +0100
+ -- Trevor SANDY <[email protected]>  Fri, 12 Mar 2021 06:36:28 +0100
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.1.2040
+Version: 2.4.1.2041
 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.1.2040
+Version: 2.4.1.2041
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -731,5 +731,5 @@ update-mime-database /usr/share/mime >/dev/null || true
 update-desktop-database || true
 %endif
 
-* Fri Mar 12 2021 - trevor.dot.sandy.at.gmail.dot.com 2.4.1.2040
+* Fri Mar 12 2021 - trevor.dot.sandy.at.gmail.dot.com 2.4.1.2041
 - 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 1 1 2040 3d27411
+2 4 1 1 2041 f057fc0
diff --git a/lclib/qt/lc_qpropertiestree.cpp b/lclib/qt/lc_qpropertiestree.cpp
@@ -1472,30 +1472,8 @@ void lcQPropertiesTree::SetPiece(const lcArray<lcObject*>& Selection, lcObject*
 		ColorIndex = Piece->mColorIndex;
 		Info = Piece->mPieceInfo;
 /*** LPub3D Mod - preview widget ***/
-		if (Preferences.mPreviewEnabled && Preferences.mPreviewPosition != lcPreviewPosition::Floating)
+		if (Preferences.mPreviewEnabled && Preferences.mPreviewPosition == lcPreviewPosition::Dockable)
 		{
-			// Show last selected piece if mulitple pieces selected
-			int LastPieceIdx = -1;
-			for (int ObjectIdx = 0; ObjectIdx < Selection.GetSize(); ObjectIdx++)
-			{
-				lcObject* Object = Selection[ObjectIdx];
-				if (Object->IsPiece())
-					LastPieceIdx = ObjectIdx;
-			}
-			if (LastPieceIdx > -1)
-			{
-				lcPiece* SelectedPiece = (lcPiece*)Selection[LastPieceIdx];
-				if (SelectedPiece)
-				{
-					if (Info != SelectedPiece->mPieceInfo)
-					{
-						Show = SelectedPiece->GetStepShow();
-						Hide = SelectedPiece->GetStepHide();
-						ColorIndex = SelectedPiece->mColorIndex;
-						Info = SelectedPiece->mPieceInfo;
-					}
-				}
-			}
 			quint32 ColorCode = lcGetColorCode(ColorIndex);
 			PreviewSelection(Info->mFileName, ColorCode);
 		}
@@ -1521,7 +1499,7 @@ void lcQPropertiesTree::SetPiece(const lcArray<lcObject*>& Selection, lcObject*
 				ColorIndex = SelectedPiece->mColorIndex;
 				Info = SelectedPiece->mPieceInfo;
 /*** LPub3D Mod - preview widget ***/
-				if (Preferences.mPreviewEnabled && Preferences.mPreviewPosition != lcPreviewPosition::Floating)
+				if (Preferences.mPreviewEnabled && Preferences.mPreviewPosition == lcPreviewPosition::Dockable)
 				{
 					quint32 ColorCode = lcGetColorCode(ColorIndex);
 					PreviewSelection(Info->mFileName, ColorCode);

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.1.1.2040 (12 03 2021 06:35:50)
+LPub3D 2.4.1.1.2041 (12 03 2021 06:36:28)
 
 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.1.1.2040 (12 03 2021 06:35:50)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.1.1.2041 (12 03 2021 06:36:28)</h4>
         <hr>
           <p>
              LPub3D Official release.<br>

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.1.2040" date="2021-03-12">
+        <release version="2.4.1.2041" date="2021-03-12">
             <description>
                 <p>LPub3D Linux AppImage package</p>
             </description>