From 9588c3f029335b55b2e1ab4ea440c64486f5445d Mon Sep 17 00:00:00 2001 From: Trevor SANDY Date: Fri, 2 Oct 2020 01:33:15 +0200 Subject: [PATCH] Add option to enable ok, cancel button 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 | 6 +++--- mainApp/lpub.h | 2 +- mainApp/lpub_preferences.cpp | 4 ++-- mainApp/lpub_preferences.h | 2 +- mainApp/nativeviewer.cpp | 2 +- mainApp/org.trevorsandy.lpub3d.appdata.xml | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD index de71786e4..27ab5c364 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.1964 +pkgver=2.4.0.1965 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 aab0090b0..88d70d8a9 100644 --- a/builds/linux/obs/alldeps/debian/changelog +++ b/builds/linux/obs/alldeps/debian/changelog @@ -1,5 +1,5 @@ -lpub3d (2.4.0.1964) debian; urgency=medium +lpub3d (2.4.0.1965) debian; urgency=medium - * LPub3D version 2.4.0.1.1964_20201002 for Linux + * LPub3D version 2.4.0.1.1965_20201002 for Linux - -- Trevor SANDY Fri, 02 Oct 2020 01:32:26 +0200 + -- Trevor SANDY Fri, 02 Oct 2020 01:33:16 +0200 diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc index e56841177..c5bdc9cf5 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.1964 +Version: 2.4.0.1965 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 19793bb8f..2e72479b0 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.1964 +Version: 2.4.0.1965 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.1964 +* Fri Oct 02 2020 - trevor.dot.sandy.at.gmail.dot.com 2.4.0.1965 - LPub3D Linux package (rpm) release diff --git a/builds/utilities/ci/secure/.secrets.tar.enc b/builds/utilities/ci/secure/.secrets.tar.enc index 4a717b592c11c97057b1f33bb933f659029dd732..d755df63d1610928802bc14037bb854bb4ce6958 100644 GIT binary patch literal 10256 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 WnRVIr;sXKz5UYOy_ykyoUBB&~f%{AV literal 10256 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 -

LPub3D 2.4.0.1.1964 (02 10 2020 01:32:26)

+

LPub3D 2.4.0.1.1965 (02 10 2020 01:33:16)


LPub3D Continuous release.
diff --git a/mainApp/lpub.cpp b/mainApp/lpub.cpp index d00aac522..24622f03b 100644 --- a/mainApp/lpub.cpp +++ b/mainApp/lpub.cpp @@ -5444,7 +5444,7 @@ void Gui::showLine(const Where &topOfStep, int type) } } -void Gui::parseError(const QString message, const Where &here, Preferences::MsgKey msgKey, bool override) +void Gui::parseError(const QString message, const Where &here, Preferences::MsgKey msgKey, bool option) { if (parsedMessages.contains(here)) return; @@ -5463,11 +5463,11 @@ void Gui::parseError(const QString message, const Where &here, Preferences::MsgK if (subFileSize(here.modelName) < Preferences::editorLinesPerPage || Preferences::editorBufferedPaging) showLine(here, LINE_ERROR); bool okToShowMessage = Preferences::getShowMessagePreference(msgKey); - if (okToShowMessage || override) { + if (okToShowMessage) { 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]); + Preferences::showMessage(msgID, parseMessage, keyType[msgID.msgKey][0], keyType[msgID.msgKey][1], option); } if (writingToTmp) emit progressPermMessageSig(QString("Writing submodel [Parse Error%1") diff --git a/mainApp/lpub.h b/mainApp/lpub.h index f078701ab..64b9dfee1 100644 --- a/mainApp/lpub.h +++ b/mainApp/lpub.h @@ -1165,7 +1165,7 @@ public slots: void parseError(const QString errorMsg, const Where &here, Preferences::MsgKey msgKey = Preferences::ParseErrors, - bool override = false); + bool option = false); void statusMessage(LogType logType, QString message); void statusBarMsg(QString msg); diff --git a/mainApp/lpub_preferences.cpp b/mainApp/lpub_preferences.cpp index e089f6d12..dc7f741c7 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) +int Preferences::showMessage(Preferences::MsgID msgID, const QString &message, const QString &title, const QString &type, bool option) { foreach (QString messageNotShown, messagesNotShown) if (messageNotShown.startsWith(msgID.toString())) @@ -3272,7 +3272,7 @@ int Preferences::showMessage(Preferences::MsgID msgID, const QString &message, box.setWindowTitle(QString("%1 %2").arg(VER_PRODUCTNAME_STR).arg(title)); box.setText(message); box.setIcon(QMessageBox::Icon::Warning); - box.setStandardButtons (QMessageBox::Ok | QMessageBox::Cancel); + 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); diff --git a/mainApp/lpub_preferences.h b/mainApp/lpub_preferences.h index 8f15d6b7e..c056e90e6 100644 --- a/mainApp/lpub_preferences.h +++ b/mainApp/lpub_preferences.h @@ -127,7 +127,7 @@ class Preferences static void setBlenderVersionPreference(QString); static void setDebugLogging(bool); - static int showMessage(Preferences::MsgID, const QString &message, const QString &title = "", const QString &type = ""); + static int showMessage(Preferences::MsgID, const QString &message, const QString &title = "", const QString &type = "", bool option = false); static QString lpub3dAppName; static QString ldrawLibPath; diff --git a/mainApp/nativeviewer.cpp b/mainApp/nativeviewer.cpp index f0357c493..ec26b2521 100644 --- a/mainApp/nativeviewer.cpp +++ b/mainApp/nativeviewer.cpp @@ -2627,7 +2627,7 @@ void Gui::deleteBuildModification() QString title = "Build Modification"; Preferences::MsgID msgID(Preferences::BuildModErrors, Where(model,line).nameToString()); - switch (Preferences::showMessage(msgID, text, title, type)) + switch (Preferences::showMessage(msgID, text, title, type, true /*option*/)) { default: case QMessageBox::Cancel: diff --git a/mainApp/org.trevorsandy.lpub3d.appdata.xml b/mainApp/org.trevorsandy.lpub3d.appdata.xml index 949621df8..5d42e4171 100644 --- a/mainApp/org.trevorsandy.lpub3d.appdata.xml +++ b/mainApp/org.trevorsandy.lpub3d.appdata.xml @@ -68,7 +68,7 @@ lpub3d24 - +

LPub3D Linux AppImage package