From 9177eae0bb1bec35b9c28e60eebce00083b8fa43 Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Tue, 6 Oct 2020 19:51:41 -0500 Subject: [PATCH] Part: move icons to measure subdirectory The path to the icons is added to `AppPartGui.cpp` using `Gui::BitmapFactory().addPath()`, so the icons are found automatically in their new directories. --- src/Mod/Part/Gui/AppPartGui.cpp | 1 + src/Mod/Part/Gui/Command.cpp | 13 +++++++------ src/Mod/Part/Gui/Resources/Part.qrc | 16 +++++++++------- .../icons/{ => measure}/Part_Measure_Angular.svg | 0 .../icons/{ => measure}/Part_Measure_Linear.svg | 0 .../icons/{ => measure}/Part_Measure_Refresh.svg | 0 .../{ => measure}/Part_Measure_Step_Active.svg | 0 .../{ => measure}/Part_Measure_Step_Done.svg | 0 .../Part_Measure_Toggle_3D.svg} | 0 .../{ => measure}/Part_Measure_Toggle_Delta.svg | 0 src/Mod/Part/Gui/TaskDimension.cpp | 4 ++-- src/Mod/Part/Gui/Workbench.cpp | 4 ++-- 12 files changed, 21 insertions(+), 17 deletions(-) rename src/Mod/Part/Gui/Resources/icons/{ => measure}/Part_Measure_Angular.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => measure}/Part_Measure_Linear.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => measure}/Part_Measure_Refresh.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => measure}/Part_Measure_Step_Active.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{ => measure}/Part_Measure_Step_Done.svg (100%) rename src/Mod/Part/Gui/Resources/icons/{Part_Measure_Toggle_3d.svg => measure/Part_Measure_Toggle_3D.svg} (100%) rename src/Mod/Part/Gui/Resources/icons/{ => measure}/Part_Measure_Toggle_Delta.svg (100%) diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp index 60886c58c71a..d70d22776145 100644 --- a/src/Mod/Part/Gui/AppPartGui.cpp +++ b/src/Mod/Part/Gui/AppPartGui.cpp @@ -127,6 +127,7 @@ PyMOD_INIT_FUNC(PartGui) Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/booleans")); Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/create")); + Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/measure")); Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/parametric")); Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/tools")); diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp index a180b7e4f666..c756a88b5384 100644 --- a/src/Mod/Part/Gui/Command.cpp +++ b/src/Mod/Part/Gui/Command.cpp @@ -2337,21 +2337,22 @@ bool CmdMeasureToggleAll::isActive(void) } //=========================================================================== -// Part_Measure_Toggle_3d +// Part_Measure_Toggle_3D //=========================================================================== DEF_STD_CMD_A(CmdMeasureToggle3d) CmdMeasureToggle3d::CmdMeasureToggle3d() - : Command("Part_Measure_Toggle_3d") + : Command("Part_Measure_Toggle_3D") { sAppModule = "Part"; sGroup = QT_TR_NOOP("Part"); - sMenuText = QT_TR_NOOP("Toggle 3d"); - sToolTipText = QT_TR_NOOP("Toggle 3d"); - sWhatsThis = "Part_Measure_Toggle_3d"; + sMenuText = QT_TR_NOOP("Toggle 3D"); + sToolTipText = QT_TR_NOOP("Toggle on and off " + "the dimensions on the 3D view"); + sWhatsThis = "Part_Measure_Toggle_3D"; sStatusTip = sToolTipText; - sPixmap = "Part_Measure_Toggle_3d"; + sPixmap = "Part_Measure_Toggle_3D"; } void CmdMeasureToggle3d::activated(int iMsg) diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc index 217f6728fe74..955aa4c6f596 100644 --- a/src/Mod/Part/Gui/Resources/Part.qrc +++ b/src/Mod/Part/Gui/Resources/Part.qrc @@ -30,6 +30,15 @@ icons/create/Part_Torus.svg icons/create/Part_Tube.svg + + icons/measure/Part_Measure_Angular.svg + icons/measure/Part_Measure_Linear.svg + icons/measure/Part_Measure_Refresh.svg + icons/measure/Part_Measure_Step_Active.svg + icons/measure/Part_Measure_Step_Done.svg + icons/measure/Part_Measure_Toggle_3D.svg + icons/measure/Part_Measure_Toggle_Delta.svg + icons/parametric/Part_Box_Parametric.svg icons/parametric/Part_Circle_Parametric.svg @@ -72,13 +81,6 @@ icons/Part_Feature.svg icons/Part_FeatureImport.svg icons/Part_Import.svg - icons/Part_Measure_Angular.svg - icons/Part_Measure_Linear.svg - icons/Part_Measure_Refresh.svg - icons/Part_Measure_Step_Active.svg - icons/Part_Measure_Step_Done.svg - icons/Part_Measure_Toggle_3d.svg - icons/Part_Measure_Toggle_Delta.svg icons/Part_Points_from_Mesh.svg icons/Part_Refine_Shape.svg icons/Part_Reverse_Shape.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Angular.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Angular.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Angular.svg rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Angular.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Linear.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Linear.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Linear.svg rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Linear.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Refresh.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Refresh.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Refresh.svg rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Refresh.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Step_Active.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Step_Active.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Step_Active.svg rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Step_Active.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Step_Done.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Step_Done.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Step_Done.svg rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Step_Done.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Toggle_3d.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Toggle_3D.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Toggle_3d.svg rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Toggle_3D.svg diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Measure_Toggle_Delta.svg b/src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Toggle_Delta.svg similarity index 100% rename from src/Mod/Part/Gui/Resources/icons/Part_Measure_Toggle_Delta.svg rename to src/Mod/Part/Gui/Resources/icons/measure/Part_Measure_Toggle_Delta.svg diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp index 1447796a93c6..2c9e4595d998 100644 --- a/src/Mod/Part/Gui/TaskDimension.cpp +++ b/src/Mod/Part/Gui/TaskDimension.cpp @@ -1457,8 +1457,8 @@ PartGui::DimensionControl::DimensionControl(QWidget* parent): QWidget(parent) QObject::tr("Reset Dialog"), this); commandLayout->addWidget(resetButton); - QPushButton *toggle3dButton = new QPushButton(Gui::BitmapFactory().pixmap("Part_Measure_Toggle_3d"), - QObject::tr("Toggle 3d"), this); + QPushButton *toggle3dButton = new QPushButton(Gui::BitmapFactory().pixmap("Part_Measure_Toggle_3D"), + QObject::tr("Toggle 3D"), this); QObject::connect(toggle3dButton, SIGNAL(clicked(bool)), this, SLOT(toggle3dSlot(bool))); commandLayout->addWidget(toggle3dButton); diff --git a/src/Mod/Part/Gui/Workbench.cpp b/src/Mod/Part/Gui/Workbench.cpp index 89d21570be6b..33687de77cbc 100644 --- a/src/Mod/Part/Gui/Workbench.cpp +++ b/src/Mod/Part/Gui/Workbench.cpp @@ -154,7 +154,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Part_Measure_Refresh" << "Part_Measure_Clear_All" << "Part_Measure_Toggle_All" - << "Part_Measure_Toggle_3d" + << "Part_Measure_Toggle_3D" << "Part_Measure_Toggle_Delta"; // leave this for 0.14 until #0000477 is fixed @@ -223,7 +223,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const << "Part_Measure_Refresh" << "Part_Measure_Clear_All" << "Part_Measure_Toggle_All" - << "Part_Measure_Toggle_3d" + << "Part_Measure_Toggle_3D" << "Part_Measure_Toggle_Delta"; return root;