Skip to content

Commit

Permalink
Fade and highlight - refactor fade and highlight parts behaviour #710
Browse files Browse the repository at this point in the history
  • Loading branch information
trevorsandy committed May 8, 2023
1 parent 7aed90e commit 5a4444d
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion builds/linux/obs/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions builds/linux/obs/alldeps/debian/changelog
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> Mon, 08 May 2023 15:04:44 +0200
-- Trevor SANDY <[email protected]> Mon, 08 May 2023 15:05:09 +0200
2 changes: 1 addition & 1 deletion builds/linux/obs/alldeps/debian/lpub3d.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
Homepage: https://trevorsandy.github.io/lpub3d/
Standards-Version: 3.9.7
Expand Down
4 changes: 2 additions & 2 deletions builds/linux/obs/alldeps/lpub3d.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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: <B_CNT>%{?dist}
URL: https://trevorsandy.github.io/lpub3d
Vendor: Trevor SANDY
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions builds/linux/obs/debian/changelog
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> Mon, 08 May 2023 15:04:45 +0200
-- Trevor SANDY <[email protected]> Mon, 08 May 2023 15:05:10 +0200
2 changes: 1 addition & 1 deletion builds/linux/obs/debian/lpub3d.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
Homepage: https://trevorsandy.github.io/lpub3d/
Standards-Version: 3.9.7
Expand Down
4 changes: 2 additions & 2 deletions builds/linux/obs/lpub3d.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion builds/utilities/version.info
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2 4 6 207 3318 eb1dac058
2 4 6 208 3319 7aed90eec
6 changes: 3 additions & 3 deletions gitversion.pri
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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 ~~~")
}

Expand Down Expand Up @@ -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/\./" "
}
Expand Down
3 changes: 2 additions & 1 deletion mainApp/docs/README.txt
Original file line number Diff line number Diff line change
@@ -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
------------
Expand All @@ -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
Expand Down
9 changes: 5 additions & 4 deletions mainApp/docs/RELEASE_NOTES.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<table class="tg">
<tr>
<th class="tg-0pky">
<h4><a id="LPub3D_0"></a>LPub3D 2.4.6.207.3318 (08 05 2023 15:04:45)</h4>
<h4><a id="LPub3D_0"></a>LPub3D 2.4.6.208.3319 (08 05 2023 15:05:10)</h4>
<hr>
<p>
<span class="tg-1pky">LPub3D Official release.</span><br>
Expand All @@ -30,9 +30,10 @@ <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.207.3318 (08 05 2023 15:04:45)</h4>
<h4><a id="Features_enhancements_fixes_and_changes_7"></a>Features, enhancements, fixes and changes</h4>
</th>
</tr>
<tr><td class="tg-buh4"><a href="https://github.com/trevorsandy/lpub3d/issues/698">Enhancement - Add view load status dialogue menu action #698</a></td></tr>
<tr><td class="tg-0lax"><a href="https://github.com/trevorsandy/lpub3d/issues/704">Enhancement - Insert display model - enable part and submodel lines #704</a></td></tr>
<tr><td class="tg-buh4"><a href="https://github.com/trevorsandy/lpub3d/issues/700">Enhancement - On startup, set theme based on Windows system theme #700</a></td></tr>
<tr><td class="tg-0lax"><a href="https://github.com/trevorsandy/lpub3d/issues/698">Enhancement - Add view load status dialogue menu action #698</a></td></tr>
<tr><td class="tg-buh4"><a href="https://github.com/trevorsandy/lpub3d/issues/704">Enhancement - Insert display model - enable part and submodel lines #704</a></td></tr>
<tr><td class="tg-0lax"><a href="https://github.com/trevorsandy/lpub3d/issues/700">Enhancement - On startup, set theme based on Windows system theme #700</a></td></tr>
<tr><td class="tg-buh4"><a href="https://github.com/trevorsandy/lpub3d/issues/710">Enhancement - Refactor fade and highlight parts behaviour #710</a></td></tr>
<tr><td class="tg-0lax"><a href="https://github.com/trevorsandy/lpub3d/issues/709">Enhancement - Update LDView renderer to version 4.5 #709</a></td></tr>
<tr><td class="tg-buh4"><a href="https://github.com/trevorsandy/lpub3d/issues/681">Change - Add open parameter file folder to configuration menu actions #681</a></td></tr>
<tr><td class="tg-0lax"><a href="https://github.com/trevorsandy/lpub3d/issues/679">Change - Enable Bill of material progress status #679</a></td></tr>
Expand Down
4 changes: 2 additions & 2 deletions mainApp/extras/LPub3D_Npp_UDL.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5a4444d

Please sign in to comment.