From 5a4444dff0f7e9cd2b653ed48d81a03199d84ebe Mon Sep 17 00:00:00 2001 From: Trevor SANDY Date: Mon, 8 May 2023 15:05:09 +0200 Subject: [PATCH] Fade and highlight - refactor fade and highlight parts behaviour #710 --- builds/linux/obs/PKGBUILD | 2 +- builds/linux/obs/alldeps/PKGBUILD | 2 +- builds/linux/obs/alldeps/debian/changelog | 6 +++--- builds/linux/obs/alldeps/debian/lpub3d.dsc | 2 +- builds/linux/obs/alldeps/lpub3d.spec | 4 ++-- builds/linux/obs/debian/changelog | 6 +++--- builds/linux/obs/debian/lpub3d.dsc | 2 +- builds/linux/obs/lpub3d.spec | 4 ++-- builds/utilities/version.info | 2 +- gitversion.pri | 6 +++--- mainApp/docs/README.txt | 3 ++- mainApp/docs/RELEASE_NOTES.html | 9 +++++---- mainApp/extras/LPub3D_Npp_UDL.xml | 4 ++-- 13 files changed, 27 insertions(+), 25 deletions(-) diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD index 43d2d023f..7c18b5e32 100755 --- 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.3318 +pkgver=2.4.6.3319 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 index 8d8a0bac2..aa1b33a48 100644 --- 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.3318 +pkgver=2.4.6.3319 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 index b2c77373e..8ca97059a 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3318) debian; urgency=medium +lpub3d (2.4.6.3319) debian; urgency=medium - * LPub3D version 2.4.6.207.3318_20230508 for Linux + * LPub3D version 2.4.6.208.3319_20230508 for Linux - -- Trevor SANDY Mon, 08 May 2023 15:04:44 +0200 + -- Trevor SANDY Mon, 08 May 2023 15:05:09 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index fa54468c7..d9054f6e5 100644 --- 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.3318 +Version: 2.4.6.3319 Maintainer: Trevor SANDY 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 index e2eda56f5..2499f00cd 100644 --- 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.3318 +Version: 2.4.6.3319 Release: %{?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.3318 +* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3319 - 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 index 0b1b4dc43..8aafe559a 100644 --- a/builds/linux/obs/debian/changelog +++ b/builds/linux/obs/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3318) debian; urgency=medium +lpub3d (2.4.6.3319) debian; urgency=medium - * LPub3D version 2.4.6.207.3318_20230508 for Linux + * LPub3D version 2.4.6.208.3319_20230508 for Linux - -- Trevor SANDY Mon, 08 May 2023 15:04:45 +0200 + -- Trevor SANDY Mon, 08 May 2023 15:05:10 +0200 diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc index 046bfed8c..0771235de 100755 --- 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.3318 +Version: 2.4.6.3319 Maintainer: Trevor SANDY 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 index 433ee50c8..f25d80252 100755 --- 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.3318 +Version: 2.4.6.3319 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.3318 +* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3319 - 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 index 797242134..9dac5d203 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 6 207 3318 eb1dac058 +2 4 6 208 3319 7aed90eec diff --git a/gitversion.pri b/gitversion.pri index 2c50e861d..6059850f6 100644 --- 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 = 207 + GIT_REVISION = 208 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 = 3318 + GIT_COMMIT = 3319 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}.207.3318.eb1dac058 + GIT_VERSION = $${VERSION}.208.3319.7aed90eec 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 index 9f8ebeda5..cea67c413 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.6.207.3318 (08 05 2023 15:04:45) +LPub3D 2.4.6.208.3319 (08 05 2023 15:05:10) Features, enhancements, fixes and changes ------------ @@ -16,6 +16,7 @@ Revisions: - Enhancement - Add view load status dialogue menu action #698 - Enhancement - Insert display model - enable part and submodel lines #704 - Enhancement - On startup, set theme based on Windows system theme #700 +- Enhancement - Refactor fade and highlight parts behaviour #710 - Enhancement - Update LDView renderer to version 4.5 #709 - Change - Add open parameter file folder to configuration menu actions #681 - Change - Enable Bill of material progress status #679 diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index 1c1b263ca..e7a999fce 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -18,7 +18,7 @@ - - - + + + + diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml index 2b582e211..c00e0befe 100644 --- 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.207.3318 -;; Last Update.: Mon, 08 May 2023 15:04:45 +0200 +;; Version.....: 2.4.6.208.3319 +;; Last Update.: Mon, 08 May 2023 15:05:10 +0200 ;; License.....: GPLv3 ;; Homepage....: https://trevorsandy.github.io/lpub3d ;; Copyright (C) 2021 - 2023 by Trevor SANDY
-

LPub3D 2.4.6.207.3318 (08 05 2023 15:04:45)

+

LPub3D 2.4.6.208.3319 (08 05 2023 15:05:10)

LPub3D Official release.
@@ -30,9 +30,10 @@

LPub3D 2.4.6.207.3318 (08 05 2023 15:04:45)

Features, enhancements, fixes and changes
Enhancement - Add view load status dialogue menu action #698
Enhancement - Insert display model - enable part and submodel lines #704
Enhancement - On startup, set theme based on Windows system theme #700
Enhancement - Add view load status dialogue menu action #698
Enhancement - Insert display model - enable part and submodel lines #704
Enhancement - On startup, set theme based on Windows system theme #700
Enhancement - Refactor fade and highlight parts behaviour #710
Enhancement - Update LDView renderer to version 4.5 #709
Change - Add open parameter file folder to configuration menu actions #681
Change - Enable Bill of material progress status #679