From 581dee4d481e09205dc37dad0295ca95a621fcd3 Mon Sep 17 00:00:00 2001 From: PaddleStroke Date: Thu, 28 Mar 2024 12:04:32 +0100 Subject: [PATCH] Sketcher: Fixes #13181 --- src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp | 2 ++ src/Mod/Sketcher/Gui/CommandCreateGeo.cpp | 16 ++++++++-------- src/Mod/Sketcher/Gui/Resources/Sketcher.qrc | 4 ++-- ...her_CreatePeriodicBSplineByInterpolation.svg} | 0 ...atePeriodicBSplineByInterpolation_Constr.svg} | 0 5 files changed, 12 insertions(+), 10 deletions(-) rename src/Mod/Sketcher/Gui/Resources/icons/geometry/{Sketcher_Create_Periodic_BSplineByInterpolation.svg => Sketcher_CreatePeriodicBSplineByInterpolation.svg} (100%) rename src/Mod/Sketcher/Gui/Resources/icons/geometry/{Sketcher_Create_Periodic_BSplineByInterpolation_Constr.svg => Sketcher_CreatePeriodicBSplineByInterpolation_Constr.svg} (100%) diff --git a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp index d59d02b761..f7153afbe9 100644 --- a/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp +++ b/src/Mod/Sketcher/Gui/CommandAlterGeometry.cpp @@ -111,6 +111,8 @@ CmdSketcherToggleConstruction::CmdSketcherToggleConstruction() rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CompCreateRegularPolygon"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateBSpline"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreatePeriodicBSpline"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreateBSplineByInterpolation"); + rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CreatePeriodicBSplineByInterpolation"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CompCreateBSpline"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_CarbonCopy"); rcCmdMgr.addCommandMode("ToggleConstruction", "Sketcher_ToggleConstruction"); diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp index 2b66c0874d..8325d0dd04 100644 --- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp +++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp @@ -1049,9 +1049,9 @@ CmdSketcherCreatePeriodicBSplineByInterpolation::CmdSketcherCreatePeriodicBSplin sMenuText = QT_TR_NOOP("Create periodic B-spline by knots"); sToolTipText = QT_TR_NOOP("Create a periodic B-spline by knots, i.e. by interpolation, in the sketch."); - sWhatsThis = "Sketcher_Create_Periodic_BSplineByInterpolation"; + sWhatsThis = "Sketcher_CreatePeriodicBSplineByInterpolation"; sStatusTip = sToolTipText; - sPixmap = "Sketcher_Create_Periodic_BSplineByInterpolation"; + sPixmap = "Sketcher_CreatePeriodicBSplineByInterpolation"; sAccel = "G, B, O"; eType = ForEdit; } @@ -1139,7 +1139,7 @@ Gui::Action* CmdSketcherCompCreateBSpline::createAction() QAction* periodicbsplinebyknot = pcAction->addAction(QString()); periodicbsplinebyknot->setIcon( - Gui::BitmapFactory().iconFromTheme("Sketcher_Create_Periodic_BSplineByInterpolation")); + Gui::BitmapFactory().iconFromTheme("Sketcher_CreatePeriodicBSplineByInterpolation")); _pcAction = pcAction; languageChange(); @@ -1168,7 +1168,7 @@ void CmdSketcherCompCreateBSpline::updateAction(int mode) a[2]->setIcon( Gui::BitmapFactory().iconFromTheme("Sketcher_CreateBSplineByInterpolation")); a[3]->setIcon(Gui::BitmapFactory().iconFromTheme( - "Sketcher_Create_Periodic_BSplineByInterpolation")); + "Sketcher_CreatePeriodicBSplineByInterpolation")); getAction()->setIcon(a[index]->icon()); break; case GeometryCreationMode::Construction: @@ -1178,7 +1178,7 @@ void CmdSketcherCompCreateBSpline::updateAction(int mode) a[2]->setIcon( Gui::BitmapFactory().iconFromTheme("Sketcher_CreateBSplineByInterpolation_Constr")); a[3]->setIcon(Gui::BitmapFactory().iconFromTheme( - "Sketcher_Create_Periodic_BSplineByInterpolation_Constr")); + "Sketcher_CreatePeriodicBSplineByInterpolation_Constr")); getAction()->setIcon(a[index]->icon()); break; } @@ -1219,13 +1219,13 @@ void CmdSketcherCompCreateBSpline::languageChange() "Create a B-spline by knots")); QAction* periodicbsplinebyknot = a[3]; periodicbsplinebyknot->setText( - QApplication::translate("Sketcher_Create_Periodic_BSplineByInterpolation", + QApplication::translate("Sketcher_CreatePeriodicBSplineByInterpolation", "Periodic B-spline by knots")); periodicbsplinebyknot->setToolTip( - QApplication::translate("Sketcher_Create_Periodic_BSplineByInterpolation", + QApplication::translate("Sketcher_CreatePeriodicBSplineByInterpolation", "Create a periodic B-spline by knots")); periodicbsplinebyknot->setStatusTip( - QApplication::translate("Sketcher_Create_Periodic_BSplineByInterpolation", + QApplication::translate("Sketcher_CreatePeriodicBSplineByInterpolation", "Create a periodic B-spline by knots")); } diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc index 343967f816..4821e66fbb 100644 --- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc +++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc @@ -138,8 +138,8 @@ icons/geometry/Sketcher_CreateBSpline_Constr.svg icons/geometry/Sketcher_CreateBSplineByInterpolation.svg icons/geometry/Sketcher_CreateBSplineByInterpolation_Constr.svg - icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation.svg - icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation_Constr.svg + icons/geometry/Sketcher_CreatePeriodicBSplineByInterpolation.svg + icons/geometry/Sketcher_CreatePeriodicBSplineByInterpolation_Constr.svg icons/geometry/Sketcher_CreateChamfer.svg icons/geometry/Sketcher_CreateCircle.svg icons/geometry/Sketcher_CreateCircle_Constr.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePeriodicBSplineByInterpolation.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation.svg rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePeriodicBSplineByInterpolation.svg diff --git a/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePeriodicBSplineByInterpolation_Constr.svg similarity index 100% rename from src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation_Constr.svg rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePeriodicBSplineByInterpolation_Constr.svg