From 8e1aa2536babfb1d16ff8fee68560256f9b1333f Mon Sep 17 00:00:00 2001 From: Trevor SANDY Date: Mon, 8 May 2023 15:06:45 +0200 Subject: [PATCH] Fade and highlight - rename visual editor mLPubMeta to LPubMeta #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 +++--- lclib/common/lc_model.cpp | 18 +++++++++--------- mainApp/docs/README.txt | 2 +- mainApp/docs/RELEASE_NOTES.html | 2 +- mainApp/extras/LPub3D_Npp_UDL.xml | 4 ++-- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD index 2bdb91baa..2039dbcf8 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.3322 +pkgver=2.4.6.3323 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 8e305e944..80ec08aae 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.3322 +pkgver=2.4.6.3323 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 6106b3c2b..fc886dcd9 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3322) debian; urgency=medium +lpub3d (2.4.6.3323) debian; urgency=medium - * LPub3D version 2.4.6.211.3322_20230508 for Linux + * LPub3D version 2.4.6.212.3323_20230508 for Linux - -- Trevor SANDY Mon, 08 May 2023 15:06:22 +0200 + -- Trevor SANDY Mon, 08 May 2023 15:06:45 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index 8dbfe1864..40fe0eb01 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.3322 +Version: 2.4.6.3323 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 c4884f311..30120cca0 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.3322 +Version: 2.4.6.3323 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.3322 +* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3323 - 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 f80215784..6061fc87e 100644 --- a/builds/linux/obs/debian/changelog +++ b/builds/linux/obs/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3322) debian; urgency=medium +lpub3d (2.4.6.3323) debian; urgency=medium - * LPub3D version 2.4.6.211.3322_20230508 for Linux + * LPub3D version 2.4.6.212.3323_20230508 for Linux - -- Trevor SANDY Mon, 08 May 2023 15:06:23 +0200 + -- Trevor SANDY Mon, 08 May 2023 15:06:46 +0200 diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc index 1be900d63..f0a1eda68 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.3322 +Version: 2.4.6.3323 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 c13daada3..2aa34da98 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.3322 +Version: 2.4.6.3323 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.3322 +* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3323 - 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 540bda4e2..583182735 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 6 211 3322 e29413f52 +2 4 6 212 3323 7c0becc72 diff --git a/gitversion.pri b/gitversion.pri index 36b6c9509..2c34adcd6 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 = 211 + GIT_REVISION = 212 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 = 3322 + GIT_COMMIT = 3323 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}.211.3322.e29413f52 + GIT_VERSION = $${VERSION}.212.3323.7c0becc72 message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~") GIT_VERSION ~= s/\./" " } diff --git a/lclib/common/lc_model.cpp b/lclib/common/lc_model.cpp index 4b34e08e9..609f52f34 100644 --- a/lclib/common/lc_model.cpp +++ b/lclib/common/lc_model.cpp @@ -522,9 +522,9 @@ void lcModel::LoadLDraw(QIODevice& Device, Project* Project) mProperties.mComments.clear(); /*** LPub3D Mod - LPUB meta command ***/ - bool mLPubMeta = true; + bool LPubMeta = true; - auto ViewerMetaCommandLine = [] (QTextStream &Stream, bool &mLPubMeta) + auto ViewerMetaCommandLine = [] (QTextStream &Stream, bool &LPubMeta) { qint64 savePosition = Stream.pos(); QString Token; @@ -533,16 +533,16 @@ void lcModel::LoadLDraw(QIODevice& Device, Project* Project) if (Token == QLatin1String("!LPUB")) { Stream >> Token; - retValue = mLPubMeta = Token == QLatin1String("MODEL") || - Token == QLatin1String("PIECE") || + retValue = LPubMeta = Token == QLatin1String("MODEL") || + Token == QLatin1String("PIECE") || Token == QLatin1String("CAMERA") || - Token == QLatin1String("LIGHT") || - Token == QLatin1String("GROUP") || + Token == QLatin1String("LIGHT") || + Token == QLatin1String("GROUP") || Token == QLatin1String("SYNTH"); } else if (Token == QLatin1String("!LEOCAD")) { - mLPubMeta = false; + LPubMeta = false; retValue = true; } @@ -639,7 +639,7 @@ void lcModel::LoadLDraw(QIODevice& Device, Project* Project) continue; } /*** LPub3D Mod - LPUB meta command ***/ - if (!ViewerMetaCommandLine(LineStream, mLPubMeta)) + if (!ViewerMetaCommandLine(LineStream, LPubMeta)) { mFileLines.append(OriginalLine); continue; @@ -674,7 +674,7 @@ void lcModel::LoadLDraw(QIODevice& Device, Project* Project) { /*** LPub3D Mod - enable lights ***/ if (!Light) - Light = new lcLight(0.0f, 0.0f, 0.0f, mLPubMeta); + Light = new lcLight(0.0f, 0.0f, 0.0f, LPubMeta); if (Light->ParseLDrawLine(LineStream)) { diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt index 2b83cf605..bd7d29c81 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.6.211.3322 (08 05 2023 15:06:23) +LPub3D 2.4.6.212.3323 (08 05 2023 15:06:46) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index 5ed89806a..1e3261802 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -18,7 +18,7 @@
-

LPub3D 2.4.6.211.3322 (08 05 2023 15:06:23)

+

LPub3D 2.4.6.212.3323 (08 05 2023 15:06:46)

LPub3D Official release.
diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml index 6275e54e4..d1ed75b73 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.211.3322 -;; Last Update.: Mon, 08 May 2023 15:06:23 +0200 +;; Version.....: 2.4.6.212.3323 +;; Last Update.: Mon, 08 May 2023 15:06:46 +0200 ;; License.....: GPLv3 ;; Homepage....: https://trevorsandy.github.io/lpub3d ;; Copyright (C) 2021 - 2023 by Trevor SANDY