diff --git a/src/Mod/Sketcher/Gui/Command.cpp b/src/Mod/Sketcher/Gui/Command.cpp index c3514f5646..082e69ad46 100644 --- a/src/Mod/Sketcher/Gui/Command.cpp +++ b/src/Mod/Sketcher/Gui/Command.cpp @@ -1736,8 +1736,6 @@ protected: Gui::Action* createAction() override; private: - void updateIcon(); - ParameterGrp::handle getParameterPath() { return App::GetApplication().GetParameterGroupByPath( @@ -1777,28 +1775,6 @@ void CmdRenderingOrder::OnChange(Base::Subject& rCaller, const char if (strcmp(sReason, "TopRenderGeometryId") == 0) { TopElement = static_cast(getParameterPath()->GetInt("TopRenderGeometryId", 1)); - - updateIcon(); - } -} - -void CmdRenderingOrder::updateIcon() -{ - static QIcon normal = Gui::BitmapFactory().iconFromTheme("Sketcher_RenderingOrder_Normal"); - static QIcon construction = - Gui::BitmapFactory().iconFromTheme("Sketcher_RenderingOrder_Construction"); - static QIcon external = Gui::BitmapFactory().iconFromTheme("Sketcher_RenderingOrder_External"); - - if (auto* pcAction = qobject_cast(getAction())) { - if (TopElement == ElementType::Normal) { - pcAction->setIcon(normal); - } - else if (TopElement == ElementType::Construction) { - pcAction->setIcon(construction); - } - else if (TopElement == ElementType::External) { - pcAction->setIcon(external); - } } } @@ -1824,9 +1800,6 @@ Gui::Action* CmdRenderingOrder::createAction() roa->updateWidget(); }); - // set the right pixmap - updateIcon(); - return pcAction; } diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index b1254dad88..8a8d79a217 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -110,9 +110,6 @@ icons/general/Sketcher_ValidateSketch.svg icons/general/Sketcher_ViewSection.svg icons/general/Sketcher_ViewSketch.svg - icons/general/Sketcher_RenderingOrder_Construction.svg - icons/general/Sketcher_RenderingOrder_External.svg - icons/general/Sketcher_RenderingOrder_Normal.svg icons/geometry/Sketcher_AlterFillet.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_RenderingOrder_Construction.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_RenderingOrder_Construction.svg deleted file mode 100644 index d6481992b5..0000000000 --- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_RenderingOrder_Construction.svg +++ /dev/null @@ -1,488 +0,0 @@ - - - - Sketcher_ReorientSketch - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Sketcher_ReorientSketch - - - [vocx] - - - Sketcher_MergeSketch - 2020-09-25 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ReorientSketch.svg - - - CC-BY-SA 4.0 - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - A coordinate axis system with three axes (red, blue, green) and three gray planes, next to a red sketch (square and circle). It was created from the 'MergeSketch' and 'Std_CoordinateSystem' icons. - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_RenderingOrder_External.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_RenderingOrder_External.svg deleted file mode 100644 index 9f766b7d2e..0000000000 --- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_RenderingOrder_External.svg +++ /dev/null @@ -1,489 +0,0 @@ - - - - Sketcher_ReorientSketch - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Sketcher_ReorientSketch - - - [vocx] - - - Sketcher_MergeSketch - 2020-09-25 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ReorientSketch.svg - - - CC-BY-SA 4.0 - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - A coordinate axis system with three axes (red, blue, green) and three gray planes, next to a red sketch (square and circle). It was created from the 'MergeSketch' and 'Std_CoordinateSystem' icons. - - - - - - - - - - - - - - - - - - diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_RenderingOrder_Normal.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_RenderingOrder_Normal.svg deleted file mode 100644 index 1912cc661d..0000000000 --- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_RenderingOrder_Normal.svg +++ /dev/null @@ -1,488 +0,0 @@ - - - - Sketcher_ReorientSketch - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Sketcher_ReorientSketch - - - [vocx] - - - Sketcher_MergeSketch - 2020-09-25 - https://www.freecad.org/wiki/index.php?title=Artwork - - - FreeCAD - - - FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ReorientSketch.svg - - - CC-BY-SA 4.0 - - - https://www.gnu.org/copyleft/lesser.html - - - [agryson] Alexander Gryson - - - A coordinate axis system with three axes (red, blue, green) and three gray planes, next to a red sketch (square and circle). It was created from the 'MergeSketch' and 'Std_CoordinateSystem' icons. - - - - - - - - - - - - - - - - - -