diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD index c39a85ec1..8570650c0 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.3350 +pkgver=2.4.6.3351 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 816cf7ba0..649795674 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.3350 +pkgver=2.4.6.3351 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 6ec964623..1c0cce38a 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3350) debian; urgency=medium +lpub3d (2.4.6.3351) debian; urgency=medium - * LPub3D version 2.4.6.239.3350_20230508 for Linux + * LPub3D version 2.4.6.240.3351_20230508 for Linux - -- Trevor SANDY Mon, 08 May 2023 15:18:51 +0200 + -- Trevor SANDY Mon, 08 May 2023 15:19:14 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index 64d72b086..c847d0e77 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.3350 +Version: 2.4.6.3351 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 3074c235c..95249f339 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.3350 +Version: 2.4.6.3351 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.3350 +* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3351 - 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 d4a9d93f6..bd23a8fb2 100644 --- a/builds/linux/obs/debian/changelog +++ b/builds/linux/obs/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.6.3350) debian; urgency=medium +lpub3d (2.4.6.3351) debian; urgency=medium - * LPub3D version 2.4.6.239.3350_20230508 for Linux + * LPub3D version 2.4.6.240.3351_20230508 for Linux - -- Trevor SANDY Mon, 08 May 2023 15:18:52 +0200 + -- Trevor SANDY Mon, 08 May 2023 15:19:15 +0200 diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc index 6725f81a9..ddd30c063 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.3350 +Version: 2.4.6.3351 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 e3e6db033..b389d0222 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.3350 +Version: 2.4.6.3351 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.3350 +* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3351 - 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 b638664b8..ec1b9e91c 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 6 239 3350 119699881 +2 4 6 240 3351 ad2a69be2 diff --git a/gitversion.pri b/gitversion.pri index 455b6c911..4430ff8fa 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 = 239 + GIT_REVISION = 240 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 = 3350 + GIT_COMMIT = 3351 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}.239.3350.119699881 + GIT_VERSION = $${VERSION}.240.3351.ad2a69be2 message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~") GIT_VERSION ~= s/\./" " } diff --git a/mainApp/blenderpreferences.cpp b/mainApp/blenderpreferences.cpp index ddd75bc3b..e88b98c8d 100644 --- a/mainApp/blenderpreferences.cpp +++ b/mainApp/blenderpreferences.cpp @@ -341,12 +341,10 @@ void BlenderPreferences::getRenderSettings( blenderImportMMActBox->setChecked(importModule.endsWith(" MM")); } } else { - if (Preferences::displayTheme == THEME_DARK) { - const QString themeColor = Preferences::themeColors[THEME_DARK_DECORATE_LPUB3D_QUOTED_TEXT]; - blenderVersionLabel->setStyleSheet("QLabel { color : " + themeColor + "; }"); - } else { - blenderVersionLabel->setStyleSheet("QLabel { color : blue; }"); - } + const QString colour = Preferences::displayTheme == THEME_DARK + ? Preferences::themeColors[THEME_DARK_DECORATE_LPUB3D_QUOTED_TEXT] + : QLatin1String("blue"); + blenderVersionLabel->setStyleSheet(QString("QLabel { color : %1; }").arg(colour)); blenderVersionLabel->setText(tr("Blender not configured")); blenderVersionEdit->setVisible(mBlenderConfigured); // set default LDraw import module @@ -1452,7 +1450,10 @@ void BlenderPreferences::configureBlender() if (blenderFile.isEmpty()) { blenderVersion.clear(); mBlenderConfigured = false; - blenderVersionLabel->setStyleSheet("QLabel { color : blue; }"); + const QString colour = Preferences::displayTheme == THEME_DARK + ? Preferences::themeColors[THEME_DARK_DECORATE_LPUB3D_QUOTED_TEXT] + : QLatin1String("blue"); + blenderVersionLabel->setStyleSheet(QString("QLabel { color : %1; }").arg(colour)); blenderVersionLabel->setText(tr("Blender not configured")); blenderVersionEdit->setVisible(mBlenderConfigured); blenderAddonUpdateButton->setEnabled(mBlenderConfigured); @@ -1579,10 +1580,7 @@ void BlenderPreferences::configureBlender() mBlenderConfigured = true; mBlenderAddonUpdate = !mBlenderConfigured; blenderVersionLabel->setText(tr("Blender Version")); - if (Preferences::displayTheme == THEME_DARK) - blenderVersionLabel->setStyleSheet("QLabel { color : white ; }"); - else - blenderVersionLabel->setStyleSheet("QLabel { color : black; }"); + blenderVersionLabel->setStyleSheet(QString("QLabel { color : %1; }").arg(Preferences::displayTheme == THEME_DARK ? QLatin1String("white") : QLatin1String("black"))); blenderVersionEdit->setText(blenderVersion); blenderVersionEdit->setToolTip(tr("Display the Blender and %1 Render addon version").arg(VER_PRODUCTNAME_STR)); blenderVersionEdit->setVisible(mBlenderConfigured); @@ -1804,7 +1802,11 @@ void BlenderPreferences::statusUpdate(bool ok, const QString &message) pathLineEditList[LBL_BLENDER_PATH]->text() = QString(); Preferences::setBlenderImportModule(QString()); label = ! message.isEmpty() ? message : tr("Blender not configured"); - colour = message.startsWith("Error:", Qt::CaseInsensitive) ? "red" : "blue"; + colour = message.startsWith("Error:", Qt::CaseInsensitive) + ? QLatin1String("red") + : Preferences::displayTheme == THEME_DARK + ? Preferences::themeColors[THEME_DARK_DECORATE_LPUB3D_QUOTED_TEXT] + : QLatin1String("blue"); mDialogCancelled = true; } blenderVersionLabel->setText(label); @@ -1991,10 +1993,7 @@ void BlenderPreferences::showResult() mBlenderConfigured = true; mBlenderAddonUpdate = !mBlenderConfigured; blenderVersionLabel->setText(tr("Blender Version")); - if (Preferences::displayTheme == THEME_DARK) - blenderVersionLabel->setStyleSheet("QLabel { color : white ; }"); - else - blenderVersionLabel->setStyleSheet("QLabel { color : black; }"); + blenderVersionLabel->setStyleSheet(QString("QLabel { color : %1; }").arg(Preferences::displayTheme == THEME_DARK ? QLatin1String("white") : QLatin1String("black"))); blenderVersionEdit->setText(blenderVersion); blenderVersionEdit->setToolTip(tr("Display the Blender and %1 Render addon version").arg(VER_PRODUCTNAME_STR)); blenderVersionEdit->setVisible(mBlenderConfigured); diff --git a/mainApp/blenderpreferences.h b/mainApp/blenderpreferences.h index dd052bb3d..b594a03bc 100644 --- a/mainApp/blenderpreferences.h +++ b/mainApp/blenderpreferences.h @@ -68,6 +68,7 @@ class BlenderPreferences : public QWidget protected: bool settingsModified(int &width, int &height, double &renderPercentage); + QString readStdErr(bool &hasError) const; void initLDrawImport(); void initLDrawImportMM(); @@ -92,7 +93,6 @@ public slots: bool promptCancel(); void showResult(); void getStandardOutput(); - QString readStdErr(bool &hasError) const; void statusUpdate(bool ok = false, const QString &message = QString()); private: diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt index 2595706c7..a5f616d87 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.6.239.3350 (08 05 2023 15:18:52) +LPub3D 2.4.6.240.3351 (08 05 2023 15:19:15) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index 36d0f78b3..3868f8f9a 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -18,7 +18,7 @@
-

LPub3D 2.4.6.239.3350 (08 05 2023 15:18:52)

+

LPub3D 2.4.6.240.3351 (08 05 2023 15:19:15)

LPub3D Official release.
diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml index 98b9840fd..5793a1050 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.239.3350 -;; Last Update.: Mon, 08 May 2023 15:18:52 +0200 +;; Version.....: 2.4.6.240.3351 +;; Last Update.: Mon, 08 May 2023 15:19:15 +0200 ;; License.....: GPLv3 ;; Homepage....: https://trevorsandy.github.io/lpub3d ;; Copyright (C) 2021 - 2023 by Trevor SANDY