From d4c60abf703bc4a5dd4078c2e2b45d59aa6be4e3 Mon Sep 17 00:00:00 2001 From: Uwe Date: Thu, 28 Jul 2022 02:35:38 +0200 Subject: [PATCH] [Sketcher] fix icon name - fix a FIXME, Sketcher_CreateEllipse depicts already the right thing, it just has to be renamed --- src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 11 +++++------ src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 4 ++-- ...Ellipse.svg => Sketcher_CreateEllipseByCenter.svg} | 0 ....svg => Sketcher_CreateEllipseByCenter_Constr.svg} | 0 4 files changed, 7 insertions(+), 8 deletions(-) rename src/Mod/Sketcher/Gui/Resources/icons/geometry/{Sketcher_CreateEllipse.svg => Sketcher_CreateEllipseByCenter.svg} (100%) rename src/Mod/Sketcher/Gui/Resources/icons/geometry/{Sketcher_CreateEllipse_Constr.svg => Sketcher_CreateEllipseByCenter_Constr.svg} (100%) diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 7fc6292432..d3276f60ab 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -591,12 +591,12 @@ CmdSketcherCreateEllipseByCenter::CmdSketcherCreateEllipseByCenter() sToolTipText = QT_TR_NOOP("Create an ellipse by center in the sketch"); sWhatsThis = "Sketcher_CreateEllipseByCenter"; sStatusTip = sToolTipText; - sPixmap = "Sketcher_CreateEllipse"; //FIXME: icon link + sPixmap = "Sketcher_CreateEllipseByCenter"; sAccel = "G, E, E"; eType = ForEdit; } -CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateEllipseByCenter,"Sketcher_CreateEllipse") //FIXME: icon link +CONSTRUCTION_UPDATE_ACTION(CmdSketcherCreateEllipseByCenter, "Sketcher_CreateEllipseByCenter") void CmdSketcherCreateEllipseByCenter::activated(int iMsg) { @@ -784,8 +784,7 @@ Gui::Action * CmdSketcherCompCreateConic::createAction(void) applyCommandData(this->className(), pcAction); QAction* ellipseByCenter = pcAction->addAction(QString()); - ellipseByCenter->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse")); - /// @todo replace with correct icon + ellipseByCenter->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipseByCenter")); QAction* ellipseBy3Points = pcAction->addAction(QString()); ellipseBy3Points->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_3points")); @@ -819,7 +818,7 @@ void CmdSketcherCompCreateConic::updateAction(int mode) int index = pcAction->property("defaultAction").toInt(); switch (mode) { case Normal: - a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse")); + a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipseByCenter")); a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_3points")); a[2]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateElliptical_Arc")); a[3]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateHyperbolic_Arc")); @@ -827,7 +826,7 @@ void CmdSketcherCompCreateConic::updateAction(int mode) getAction()->setIcon(a[index]->icon()); break; case Construction: - a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_Constr")); + a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipseByCenter_Constr")); a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_3points_Constr")); a[2]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateElliptical_Arc_Constr")); a[3]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateHyperbolic_Arc_Constr")); diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index c4063a78a9..0b0ded17d2 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -123,10 +123,10 @@ icons/geometry/Sketcher_CreateBSpline_Constr.svg icons/geometry/Sketcher_CreateCircle.svg icons/geometry/Sketcher_CreateCircle_Constr.svg - icons/geometry/Sketcher_CreateEllipse.svg icons/geometry/Sketcher_CreateEllipse_3points.svg icons/geometry/Sketcher_CreateEllipse_3points_Constr.svg - icons/geometry/Sketcher_CreateEllipse_Constr.svg + icons/geometry/Sketcher_CreateEllipseByCenter.svg + icons/geometry/Sketcher_CreateEllipseByCenter_Constr.svg icons/geometry/Sketcher_CreateElliptical_Arc.svg icons/geometry/Sketcher_CreateElliptical_Arc_Constr.svg icons/geometry/Sketcher_CreateFillet.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipseByCenter.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse.svg rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipseByCenter.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipseByCenter_Constr.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse_Constr.svg rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipseByCenter_Constr.svg