From 6c0a2dd4e6e51989e5ebe9e857b17931af58d9de Mon Sep 17 00:00:00 2001
From: 0penBrain <48731257+0penBrain@users.noreply.github.com>
Date: Wed, 13 Oct 2021 14:23:29 +0200
Subject: [PATCH 1/2] [Gui] UserEditMode : new (better) icons for modes + SVG
file naming improvement
Icons are provided by @bitacovir
---
src/Gui/CommandStd.cpp | 6 +-
src/Gui/Icons/EditModeColor.svg | 243 --------
src/Gui/Icons/EditModeCutting.svg | 496 ---------------
src/Gui/Icons/EditModeDefault.svg | 396 ------------
src/Gui/Icons/EditModeTransform.svg | 231 -------
src/Gui/Icons/Std_UserEditModeColor.svg | 581 +++++++++++++++++
src/Gui/Icons/Std_UserEditModeCutting.svg | 657 ++++++++++++++++++++
src/Gui/Icons/Std_UserEditModeDefault.svg | 308 +++++++++
src/Gui/Icons/Std_UserEditModeTransform.svg | 352 +++++++++++
src/Gui/Icons/resource.qrc | 8 +-
10 files changed, 1905 insertions(+), 1373 deletions(-)
delete mode 100644 src/Gui/Icons/EditModeColor.svg
delete mode 100644 src/Gui/Icons/EditModeCutting.svg
delete mode 100644 src/Gui/Icons/EditModeDefault.svg
delete mode 100644 src/Gui/Icons/EditModeTransform.svg
create mode 100644 src/Gui/Icons/Std_UserEditModeColor.svg
create mode 100644 src/Gui/Icons/Std_UserEditModeCutting.svg
create mode 100644 src/Gui/Icons/Std_UserEditModeDefault.svg
create mode 100644 src/Gui/Icons/Std_UserEditModeTransform.svg
diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp
index c8aca1bc45..b593258ce2 100644
--- a/src/Gui/CommandStd.cpp
+++ b/src/Gui/CommandStd.cpp
@@ -840,7 +840,7 @@ StdCmdUserEditMode::StdCmdUserEditMode()
sToolTipText = QT_TR_NOOP("Defines behavior when editing an object from tree");
sStatusTip = QT_TR_NOOP("Defines behavior when editing an object from tree");
sWhatsThis = "Std_UserEditMode";
- sPixmap = "EditModeDefault";
+ sPixmap = "Std_UserEditModeDefault";
eType = ForEdit;
this->getGuiApplication()->signalUserEditModeChanged.connect(boost::bind(&StdCmdUserEditMode::updateIcon, this, bp::_1));
@@ -857,8 +857,8 @@ Gui::Action * StdCmdUserEditMode::createAction(void)
QAction* act = pcAction->addAction(QString());
auto modeName = QString::fromStdString(uem.second);
act->setCheckable(true);
- act->setIcon(BitmapFactory().iconFromTheme(qPrintable(QString::fromLatin1("EditMode")+modeName)));
- act->setObjectName(QString::fromLatin1("Std_EditMode")+modeName);
+ act->setIcon(BitmapFactory().iconFromTheme(qPrintable(QString::fromLatin1("Std_UserEditMode")+modeName)));
+ act->setObjectName(QString::fromLatin1("Std_UserEditMode")+modeName);
act->setWhatsThis(QString::fromLatin1(getWhatsThis()));
if (uem.first == 0) {
diff --git a/src/Gui/Icons/EditModeColor.svg b/src/Gui/Icons/EditModeColor.svg
deleted file mode 100644
index 07d832dc28..0000000000
--- a/src/Gui/Icons/EditModeColor.svg
+++ /dev/null
@@ -1,243 +0,0 @@
-
-
-
-
diff --git a/src/Gui/Icons/EditModeCutting.svg b/src/Gui/Icons/EditModeCutting.svg
deleted file mode 100644
index fb051257b8..0000000000
--- a/src/Gui/Icons/EditModeCutting.svg
+++ /dev/null
@@ -1,496 +0,0 @@
-
-
-
diff --git a/src/Gui/Icons/EditModeDefault.svg b/src/Gui/Icons/EditModeDefault.svg
deleted file mode 100644
index a6183e8b0a..0000000000
--- a/src/Gui/Icons/EditModeDefault.svg
+++ /dev/null
@@ -1,396 +0,0 @@
-
-
-
diff --git a/src/Gui/Icons/EditModeTransform.svg b/src/Gui/Icons/EditModeTransform.svg
deleted file mode 100644
index 135ac9736e..0000000000
--- a/src/Gui/Icons/EditModeTransform.svg
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
diff --git a/src/Gui/Icons/Std_UserEditModeColor.svg b/src/Gui/Icons/Std_UserEditModeColor.svg
new file mode 100644
index 0000000000..17743f881e
--- /dev/null
+++ b/src/Gui/Icons/Std_UserEditModeColor.svg
@@ -0,0 +1,581 @@
+
+
diff --git a/src/Gui/Icons/Std_UserEditModeCutting.svg b/src/Gui/Icons/Std_UserEditModeCutting.svg
new file mode 100644
index 0000000000..202b72828c
--- /dev/null
+++ b/src/Gui/Icons/Std_UserEditModeCutting.svg
@@ -0,0 +1,657 @@
+
+
diff --git a/src/Gui/Icons/Std_UserEditModeDefault.svg b/src/Gui/Icons/Std_UserEditModeDefault.svg
new file mode 100644
index 0000000000..85c4113fb9
--- /dev/null
+++ b/src/Gui/Icons/Std_UserEditModeDefault.svg
@@ -0,0 +1,308 @@
+
+
diff --git a/src/Gui/Icons/Std_UserEditModeTransform.svg b/src/Gui/Icons/Std_UserEditModeTransform.svg
new file mode 100644
index 0000000000..903389d8de
--- /dev/null
+++ b/src/Gui/Icons/Std_UserEditModeTransform.svg
@@ -0,0 +1,352 @@
+
+
diff --git a/src/Gui/Icons/resource.qrc b/src/Gui/Icons/resource.qrc
index 541582a33a..ae75da821e 100644
--- a/src/Gui/Icons/resource.qrc
+++ b/src/Gui/Icons/resource.qrc
@@ -241,10 +241,10 @@
document-package.svg
Std_Alignment.svg
Std_DuplicateSelection.svg
- EditModeDefault.svg
- EditModeTransform.svg
- EditModeCutting.svg
- EditModeColor.svg
+ Std_UserEditModeDefault.svg
+ Std_UserEditModeTransform.svg
+ Std_UserEditModeCutting.svg
+ Std_UserEditModeColor.svg
From ecc8505636fca0ad971e1736141078258965865f Mon Sep 17 00:00:00 2001
From: 0penBrain <48731257+0penBrain@users.noreply.github.com>
Date: Wed, 13 Oct 2021 14:58:05 +0200
Subject: [PATCH 2/2] [Gui] UserEditMode : last used mode is remembered between
sessions
---
src/Gui/CommandStd.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/Gui/CommandStd.cpp b/src/Gui/CommandStd.cpp
index b593258ce2..acb60bb89a 100644
--- a/src/Gui/CommandStd.cpp
+++ b/src/Gui/CommandStd.cpp
@@ -868,6 +868,11 @@ Gui::Action * StdCmdUserEditMode::createAction(void)
}
_pcAction = pcAction;
+
+ int lastMode = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/General")->
+ GetInt("UserEditMode", 0);
+ Gui::Application::Instance->setUserEditMode(lastMode);
+
languageChange();
return pcAction;
}
@@ -901,6 +906,8 @@ void StdCmdUserEditMode::updateIcon(int mode)
void StdCmdUserEditMode::activated(int iMsg)
{
+ App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/General")->
+ SetInt("UserEditMode", iMsg);
Gui::Application::Instance->setUserEditMode(iMsg);
}