From 4a8e1f1fca3268a78122303920756efd63e869d9 Mon Sep 17 00:00:00 2001 From: Trevor SANDY Date: Fri, 2 Oct 2020 13:19:10 +0200 Subject: [PATCH] Restore override option to parseMessage #417 --- 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/utilities/ci/secure/.secrets.tar.enc | Bin 10256 -> 10256 bytes builds/utilities/version.info | 2 +- mainApp/docs/README.txt | 2 +- mainApp/docs/RELEASE_NOTES.html | 2 +- mainApp/lpub.cpp | 4 ++-- mainApp/lpub.h | 3 ++- mainApp/lpub_preferences.cpp | 16 +++++++++------- mainApp/lpub_preferences.h | 7 ++++++- mainApp/org.trevorsandy.lpub3d.appdata.xml | 2 +- 13 files changed, 30 insertions(+), 22 deletions(-) diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD index 3e061a780..0918297d7 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 - 2020 by Trevor SANDY pkgname=lpub3d -pkgver=2.4.0.1978 +pkgver=2.4.0.1979 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 aadea3fe8..b425ae354 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.0.1978) debian; urgency=medium +lpub3d (2.4.0.1979) debian; urgency=medium - * LPub3D version 2.4.0.1.1978_20201002 for Linux + * LPub3D version 2.4.0.1.1979_20201002 for Linux - -- Trevor SANDY Fri, 02 Oct 2020 13:18:26 +0200 + -- Trevor SANDY Fri, 02 Oct 2020 13:19:11 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index f70e95cfb..a7944fa11 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.0.1978 +Version: 2.4.0.1979 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 b993f909f..ded7546cb 100644 --- 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.0.1978 +Version: 2.4.0.1979 Release: %{?dist} URL: https://trevorsandy.github.io/lpub3d Vendor: Trevor SANDY @@ -728,5 +728,5 @@ update-mime-database /usr/share/mime >/dev/null || true update-desktop-database || true %endif -* Fri Oct 02 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1978 +* Fri Oct 02 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1979 - LPub3D Linux package (rpm) release diff --git a/builds/utilities/ci/secure/.secrets.tar.enc b/builds/utilities/ci/secure/.secrets.tar.enc index 9d21768521174d5f9b907f9bc6e012545b7842ce..6d54d833e0143eddc788ea8f1c48502de4a442b9 100644 GIT binary patch literal 10256 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 W1wXnMW>WdmsVlPe<|w#K2Kg4cyAJ*U diff --git a/builds/utilities/version.info b/builds/utilities/version.info index 3729b9e19..188afa059 100755 --- a/builds/utilities/version.info +++ b/builds/utilities/version.info @@ -1 +1 @@ -2 4 0 1 1978 868f418 +2 4 0 1 1979 44df377 diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt index 11d82a5d7..44ccce0b5 100755 --- a/mainApp/docs/README.txt +++ b/mainApp/docs/README.txt @@ -1,4 +1,4 @@ -LPub3D 2.4.0.1.1978 (02 10 2020 13:18:26) +LPub3D 2.4.0.1.1979 (02 10 2020 13:19:11) Features, enhancements, fixes and changes ------------ diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html index e8f20611e..605657871 100644 --- a/mainApp/docs/RELEASE_NOTES.html +++ b/mainApp/docs/RELEASE_NOTES.html @@ -9,7 +9,7 @@
-

LPub3D 2.4.0.1.1978 (02 10 2020 13:18:26)

+

LPub3D 2.4.0.1.1979 (02 10 2020 13:19:11)


LPub3D Continuous release.
diff --git a/mainApp/lpub.cpp b/mainApp/lpub.cpp index 07cb890c3..cd750553a 100644 --- a/mainApp/lpub.cpp +++ b/mainApp/lpub.cpp @@ -5430,7 +5430,7 @@ void Gui::showLine(const Where &topOfStep, int type) } } -void Gui::parseError(const QString message, const Where &here, Preferences::MsgKey msgKey, bool option) +void Gui::parseError(const QString message, const Where &here, Preferences::MsgKey msgKey, bool option, bool override) { if (parsedMessages.contains(here)) return; @@ -5453,7 +5453,7 @@ void Gui::parseError(const QString message, const Where &here, Preferences::MsgK Where messageLine = here; messageLine.setModelIndex(getSubmodelIndex(messageLine.modelName)); Preferences::MsgID msgID(msgKey,messageLine.indexToString()); - Preferences::showMessage(msgID, parseMessage, keyType[msgID.msgKey][0], keyType[msgID.msgKey][1], option); + Preferences::showMessage(msgID, parseMessage, keyType[msgKey][0], keyType[msgKey][1], option, override); } if (writingToTmp) emit progressPermMessageSig(QString("Writing submodel [Parse Error%1") diff --git a/mainApp/lpub.h b/mainApp/lpub.h index cd9bf444e..f226ea31b 100644 --- a/mainApp/lpub.h +++ b/mainApp/lpub.h @@ -1167,7 +1167,8 @@ public slots: void parseError(const QString errorMsg, const Where &here, Preferences::MsgKey msgKey = Preferences::ParseErrors, - bool option = false); + bool option = false, + bool override = false); void statusMessage(LogType logType, QString message); void statusBarMsg(QString msg); diff --git a/mainApp/lpub_preferences.cpp b/mainApp/lpub_preferences.cpp index dc7f741c7..4b67bae69 100644 --- a/mainApp/lpub_preferences.cpp +++ b/mainApp/lpub_preferences.cpp @@ -3259,7 +3259,7 @@ bool Preferences::getShowMessagePreference(MsgKey key) return result; } -int Preferences::showMessage(Preferences::MsgID msgID, const QString &message, const QString &title, const QString &type, bool option) +int Preferences::showMessage(Preferences::MsgID msgID, const QString &message, const QString &title, const QString &type, bool option, bool override) { foreach (QString messageNotShown, messagesNotShown) if (messageNotShown.startsWith(msgID.toString())) @@ -3274,12 +3274,14 @@ int Preferences::showMessage(Preferences::MsgID msgID, const QString &message, box.setIcon(QMessageBox::Icon::Warning); box.setStandardButtons (option ? QMessageBox::Ok | QMessageBox::Cancel : QMessageBox::Ok); box.setDefaultButton (QMessageBox::Cancel); - QCheckBox *cb = new QCheckBox(QString("Do not show this %1 again.").arg(type)); - box.setCheckBox(cb); - QObject::connect(cb, &QCheckBox::stateChanged, [&message, &msgID](int state) { - if (static_cast(state) == Qt::CheckState::Checked) - messagesNotShown.append(QString(msgID.toString() + "|" + message)); - }); + if (!override) { + QCheckBox *cb = new QCheckBox(QString("Do not show this %1 again.").arg(type)); + box.setCheckBox(cb); + QObject::connect(cb, &QCheckBox::stateChanged, [&message, &msgID](int state) { + if (static_cast(state) == Qt::CheckState::Checked) + messagesNotShown.append(QString(msgID.toString() + "|" + message)); + }); + } box.adjustSize(); return box.exec(); } diff --git a/mainApp/lpub_preferences.h b/mainApp/lpub_preferences.h index c056e90e6..d018df115 100644 --- a/mainApp/lpub_preferences.h +++ b/mainApp/lpub_preferences.h @@ -127,7 +127,12 @@ class Preferences static void setBlenderVersionPreference(QString); static void setDebugLogging(bool); - static int showMessage(Preferences::MsgID, const QString &message, const QString &title = "", const QString &type = "", bool option = false); + static int showMessage(Preferences::MsgID, + const QString &message, + const QString &title = "", + const QString &type = "", + bool option = false, + bool override = false); static QString lpub3dAppName; static QString ldrawLibPath; diff --git a/mainApp/org.trevorsandy.lpub3d.appdata.xml b/mainApp/org.trevorsandy.lpub3d.appdata.xml index 323b4c72b..bfd43f086 100644 --- a/mainApp/org.trevorsandy.lpub3d.appdata.xml +++ b/mainApp/org.trevorsandy.lpub3d.appdata.xml @@ -68,7 +68,7 @@ lpub3d24 - +

LPub3D Linux AppImage package