From 2834075d6abcd36b9e585512faa717c3aca31a8a Mon Sep 17 00:00:00 2001 From: donovaly Date: Wed, 10 Feb 2021 02:41:21 +0100 Subject: [PATCH] [PD] rename icons to match Wiki files For the What#s this feature we need to have a uniform naming of the features and its icons. For some PD icons this is not the case and since we are in feature freeze, this is the right time to address this. (I see the same is already done for Mesh.) --- src/Mod/PartDesign/Gui/Command.cpp | 24 +++++----- src/Mod/PartDesign/Gui/CommandPrimitive.cpp | 32 +++++++------- .../PartDesign/Gui/Resources/PartDesign.qrc | 44 +++++++++---------- ...ive_Box.svg => PartDesign_AdditiveBox.svg} | 0 ...e_Cone.svg => PartDesign_AdditiveCone.svg} | 0 ...er.svg => PartDesign_AdditiveCylinder.svg} | 0 ...d.svg => PartDesign_AdditiveEllipsoid.svg} | 0 ...Helix.svg => PartDesign_AdditiveHelix.svg} | 0 ...e_Loft.svg => PartDesign_AdditiveLoft.svg} | 0 ...e_Pipe.svg => PartDesign_AdditivePipe.svg} | 0 ...Prism.svg => PartDesign_AdditivePrism.svg} | 0 ...here.svg => PartDesign_AdditiveSphere.svg} | 0 ...Torus.svg => PartDesign_AdditiveTorus.svg} | 0 ...Wedge.svg => PartDesign_AdditiveWedge.svg} | 0 ..._Box.svg => PartDesign_SubtractiveBox.svg} | 0 ...one.svg => PartDesign_SubtractiveCone.svg} | 0 ...svg => PartDesign_SubtractiveCylinder.svg} | 0 ...vg => PartDesign_SubtractiveEllipsoid.svg} | 0 ...ix.svg => PartDesign_SubtractiveHelix.svg} | 0 ...oft.svg => PartDesign_SubtractiveLoft.svg} | 0 ...ipe.svg => PartDesign_SubtractivePipe.svg} | 0 ...sm.svg => PartDesign_SubtractivePrism.svg} | 0 ...e.svg => PartDesign_SubtractiveSphere.svg} | 0 ...us.svg => PartDesign_SubtractiveTorus.svg} | 0 ...ge.svg => PartDesign_SubtractiveWedge.svg} | 0 .../PartDesign/Gui/TaskHelixParameters.cpp | 2 +- src/Mod/PartDesign/Gui/TaskLoftParameters.cpp | 2 +- src/Mod/PartDesign/Gui/TaskPipeParameters.cpp | 6 +-- 28 files changed, 55 insertions(+), 55 deletions(-) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Additive_Box.svg => PartDesign_AdditiveBox.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Additive_Cone.svg => PartDesign_AdditiveCone.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Additive_Cylinder.svg => PartDesign_AdditiveCylinder.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Additive_Ellipsoid.svg => PartDesign_AdditiveEllipsoid.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Additive_Helix.svg => PartDesign_AdditiveHelix.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Additive_Loft.svg => PartDesign_AdditiveLoft.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Additive_Pipe.svg => PartDesign_AdditivePipe.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Additive_Prism.svg => PartDesign_AdditivePrism.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Additive_Sphere.svg => PartDesign_AdditiveSphere.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Additive_Torus.svg => PartDesign_AdditiveTorus.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Additive_Wedge.svg => PartDesign_AdditiveWedge.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Subtractive_Box.svg => PartDesign_SubtractiveBox.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Subtractive_Cone.svg => PartDesign_SubtractiveCone.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Subtractive_Cylinder.svg => PartDesign_SubtractiveCylinder.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Subtractive_Ellipsoid.svg => PartDesign_SubtractiveEllipsoid.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Subtractive_Helix.svg => PartDesign_SubtractiveHelix.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Subtractive_Loft.svg => PartDesign_SubtractiveLoft.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Subtractive_Pipe.svg => PartDesign_SubtractivePipe.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Subtractive_Prism.svg => PartDesign_SubtractivePrism.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Subtractive_Sphere.svg => PartDesign_SubtractiveSphere.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Subtractive_Torus.svg => PartDesign_SubtractiveTorus.svg} (100%) rename src/Mod/PartDesign/Gui/Resources/icons/{PartDesign_Subtractive_Wedge.svg => PartDesign_SubtractiveWedge.svg} (100%) diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 547821c59b..f732f2fc02 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -1480,7 +1480,7 @@ bool CmdPartDesignGroove::isActive(void) } //=========================================================================== -// PartDesign_Additive_Pipe +// PartDesign_AdditivePipe //=========================================================================== DEF_STD_CMD_A(CmdPartDesignAdditivePipe) @@ -1493,7 +1493,7 @@ CmdPartDesignAdditivePipe::CmdPartDesignAdditivePipe() sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a path or to other profiles"); sWhatsThis = "PartDesign_AdditivePipe"; sStatusTip = sToolTipText; - sPixmap = "PartDesign_Additive_Pipe"; + sPixmap = "PartDesign_AdditivePipe"; } void CmdPartDesignAdditivePipe::activated(int iMsg) @@ -1530,7 +1530,7 @@ bool CmdPartDesignAdditivePipe::isActive(void) //=========================================================================== -// PartDesign_Subtractive_Pipe +// PartDesign_SubtractivePipe //=========================================================================== DEF_STD_CMD_A(CmdPartDesignSubtractivePipe) @@ -1543,7 +1543,7 @@ CmdPartDesignSubtractivePipe::CmdPartDesignSubtractivePipe() sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a path or to other profiles and remove it from the body"); sWhatsThis = "PartDesign_SubtractivePipe"; sStatusTip = sToolTipText; - sPixmap = "PartDesign_Subtractive_Pipe"; + sPixmap = "PartDesign_SubtractivePipe"; } void CmdPartDesignSubtractivePipe::activated(int iMsg) @@ -1580,7 +1580,7 @@ bool CmdPartDesignSubtractivePipe::isActive(void) //=========================================================================== -// PartDesign_Additive_Loft +// PartDesign_AdditiveLoft //=========================================================================== DEF_STD_CMD_A(CmdPartDesignAdditiveLoft) @@ -1593,7 +1593,7 @@ CmdPartDesignAdditiveLoft::CmdPartDesignAdditiveLoft() sToolTipText = QT_TR_NOOP("Loft a selected profile through other profile sections"); sWhatsThis = "PartDesign_AdditiveLoft"; sStatusTip = sToolTipText; - sPixmap = "PartDesign_Additive_Loft"; + sPixmap = "PartDesign_AdditiveLoft"; } void CmdPartDesignAdditiveLoft::activated(int iMsg) @@ -1630,7 +1630,7 @@ bool CmdPartDesignAdditiveLoft::isActive(void) //=========================================================================== -// PartDesign_Subtractive_Loft +// PartDesign_SubtractiveLoft //=========================================================================== DEF_STD_CMD_A(CmdPartDesignSubtractiveLoft) @@ -1643,7 +1643,7 @@ CmdPartDesignSubtractiveLoft::CmdPartDesignSubtractiveLoft() sToolTipText = QT_TR_NOOP("Loft a selected profile through other profile sections and remove it from the body"); sWhatsThis = "PartDesign_SubtractiveLoft"; sStatusTip = sToolTipText; - sPixmap = "PartDesign_Subtractive_Loft"; + sPixmap = "PartDesign_SubtractiveLoft"; } void CmdPartDesignSubtractiveLoft::activated(int iMsg) @@ -1679,7 +1679,7 @@ bool CmdPartDesignSubtractiveLoft::isActive(void) } //=========================================================================== -// PartDesign_Additive_Helix +// PartDesign_AdditiveHelix //=========================================================================== DEF_STD_CMD_A(CmdPartDesignAdditiveHelix) @@ -1692,7 +1692,7 @@ CmdPartDesignAdditiveHelix::CmdPartDesignAdditiveHelix() sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a helix"); sWhatsThis = "PartDesign_AdditiveHelix"; sStatusTip = sToolTipText; - sPixmap = "PartDesign_Additive_Helix"; + sPixmap = "PartDesign_AdditiveHelix"; } void CmdPartDesignAdditiveHelix::activated(int iMsg) @@ -1736,7 +1736,7 @@ bool CmdPartDesignAdditiveHelix::isActive(void) //=========================================================================== -// PartDesign_Subtractive_Helix +// PartDesign_SubtractiveHelix //=========================================================================== DEF_STD_CMD_A(CmdPartDesignSubtractiveHelix) @@ -1749,7 +1749,7 @@ CmdPartDesignSubtractiveHelix::CmdPartDesignSubtractiveHelix() sToolTipText = QT_TR_NOOP("Sweep a selected sketch along a helix and remove it from the body"); sWhatsThis = "PartDesign_SubtractiveHelix"; sStatusTip = sToolTipText; - sPixmap = "PartDesign_Subtractive_Helix"; + sPixmap = "PartDesign_SubtractiveHelix"; } void CmdPartDesignSubtractiveHelix::activated(int iMsg) diff --git a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp index ac8d964cb2..22ba6540b7 100644 --- a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp +++ b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp @@ -140,35 +140,35 @@ Gui::Action * CmdPrimtiveCompAdditive::createAction(void) applyCommandData(this->className(), pcAction); QAction* p1 = pcAction->addAction(QString()); - p1->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Box")); + p1->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_AdditiveBox")); p1->setObjectName(QString::fromLatin1("PartDesign_AdditiveBox")); p1->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveBox")); QAction* p2 = pcAction->addAction(QString()); - p2->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Cylinder")); + p2->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_AdditiveCylinder")); p2->setObjectName(QString::fromLatin1("PartDesign_AdditiveCylinder")); p2->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveCylinder")); QAction* p3 = pcAction->addAction(QString()); - p3->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Sphere")); + p3->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_AdditiveSphere")); p3->setObjectName(QString::fromLatin1("PartDesign_AdditiveSphere")); p3->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveSphere")); QAction* p4 = pcAction->addAction(QString()); - p4->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Cone")); + p4->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_AdditiveCone")); p4->setObjectName(QString::fromLatin1("PartDesign_AdditiveCone")); p4->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveCone")); QAction* p5 = pcAction->addAction(QString()); - p5->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Ellipsoid")); + p5->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_AdditiveEllipsoid")); p5->setObjectName(QString::fromLatin1("PartDesign_AdditiveEllipsoid")); p5->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveEllipsoid")); QAction* p6 = pcAction->addAction(QString()); - p6->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Torus")); + p6->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_AdditiveTorus")); p6->setObjectName(QString::fromLatin1("PartDesign_AdditiveTorus")); p6->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveTorus")); QAction* p7 = pcAction->addAction(QString()); - p7->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Prism")); + p7->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_AdditivePrism")); p7->setObjectName(QString::fromLatin1("PartDesign_AdditivePrism")); p7->setWhatsThis(QString::fromLatin1("PartDesign_AdditivePrism")); QAction* p8 = pcAction->addAction(QString()); - p8->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Additive_Wedge")); + p8->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_AdditiveWedge")); p8->setObjectName(QString::fromLatin1("PartDesign_AdditiveWedge")); p8->setWhatsThis(QString::fromLatin1("PartDesign_AdditiveWedge")); @@ -296,35 +296,35 @@ Gui::Action * CmdPrimtiveCompSubtractive::createAction(void) applyCommandData(this->className(), pcAction); QAction* p1 = pcAction->addAction(QString()); - p1->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Box")); + p1->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_SubtractiveBox")); p1->setObjectName(QString::fromLatin1("PartDesign_SubtractiveBox")); p1->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveBox")); QAction* p2 = pcAction->addAction(QString()); - p2->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Cylinder")); + p2->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_SubtractiveCylinder")); p2->setObjectName(QString::fromLatin1("PartDesign_SubtractiveCylinder")); p2->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveCylinder")); QAction* p3 = pcAction->addAction(QString()); - p3->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Sphere")); + p3->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_SubtractiveSphere")); p3->setObjectName(QString::fromLatin1("PartDesign_SubtractiveSphere")); p3->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveSphere")); QAction* p4 = pcAction->addAction(QString()); - p4->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Cone")); + p4->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_SubtractiveCone")); p4->setObjectName(QString::fromLatin1("PartDesign_SubtractiveCone")); p4->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveCone")); QAction* p5 = pcAction->addAction(QString()); - p5->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Ellipsoid")); + p5->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_SubtractiveEllipsoid")); p5->setObjectName(QString::fromLatin1("PartDesign_SubtractiveEllipsoid")); p5->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveEllipsoid")); QAction* p6 = pcAction->addAction(QString()); - p6->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Torus")); + p6->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_SubtractiveTorus")); p6->setObjectName(QString::fromLatin1("PartDesign_SubtractiveTorus")); p6->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveTorus")); QAction* p7 = pcAction->addAction(QString()); - p7->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Prism")); + p7->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_SubtractivePrism")); p7->setObjectName(QString::fromLatin1("PartDesign_SubtractivePrism")); p7->setWhatsThis(QString::fromLatin1("PartDesign_SubtractivePrism")); QAction* p8 = pcAction->addAction(QString()); - p8->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_Subtractive_Wedge")); + p8->setIcon(Gui::BitmapFactory().iconFromTheme("PartDesign_SubtractiveWedge")); p8->setObjectName(QString::fromLatin1("PartDesign_SubtractiveWedge")); p8->setWhatsThis(QString::fromLatin1("PartDesign_SubtractiveWedge")); diff --git a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc index bb55317411..44bab7e0e1 100644 --- a/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc +++ b/src/Mod/PartDesign/Gui/Resources/PartDesign.qrc @@ -1,16 +1,16 @@ - icons/PartDesign_Additive_Box.svg - icons/PartDesign_Additive_Cone.svg - icons/PartDesign_Additive_Cylinder.svg - icons/PartDesign_Additive_Ellipsoid.svg - icons/PartDesign_Additive_Loft.svg - icons/PartDesign_Additive_Pipe.svg - icons/PartDesign_Additive_Helix.svg - icons/PartDesign_Additive_Prism.svg - icons/PartDesign_Additive_Sphere.svg - icons/PartDesign_Additive_Torus.svg - icons/PartDesign_Additive_Wedge.svg + icons/PartDesign_AdditiveBox.svg + icons/PartDesign_AdditiveCone.svg + icons/PartDesign_AdditiveCylinder.svg + icons/PartDesign_AdditiveEllipsoid.svg + icons/PartDesign_AdditiveLoft.svg + icons/PartDesign_AdditivePipe.svg + icons/PartDesign_AdditiveHelix.svg + icons/PartDesign_AdditivePrism.svg + icons/PartDesign_AdditiveSphere.svg + icons/PartDesign_AdditiveTorus.svg + icons/PartDesign_AdditiveWedge.svg icons/PartDesign_BaseFeature.svg icons/PartDesign_Body.svg icons/PartDesign_Body.svg @@ -45,17 +45,17 @@ icons/PartDesign_ShapeBinder.svg icons/PartDesign_Sprocket.svg icons/PartDesign_SubShapeBinder.svg - icons/PartDesign_Subtractive_Box.svg - icons/PartDesign_Subtractive_Cone.svg - icons/PartDesign_Subtractive_Cylinder.svg - icons/PartDesign_Subtractive_Ellipsoid.svg - icons/PartDesign_Subtractive_Loft.svg - icons/PartDesign_Subtractive_Pipe.svg - icons/PartDesign_Subtractive_Helix.svg - icons/PartDesign_Subtractive_Prism.svg - icons/PartDesign_Subtractive_Sphere.svg - icons/PartDesign_Subtractive_Torus.svg - icons/PartDesign_Subtractive_Wedge.svg + icons/PartDesign_SubtractiveBox.svg + icons/PartDesign_SubtractiveCone.svg + icons/PartDesign_SubtractiveCylinder.svg + icons/PartDesign_SubtractiveEllipsoid.svg + icons/PartDesign_SubtractiveLoft.svg + icons/PartDesign_SubtractivePipe.svg + icons/PartDesign_SubtractiveHelix.svg + icons/PartDesign_SubtractivePrism.svg + icons/PartDesign_SubtractiveSphere.svg + icons/PartDesign_SubtractiveTorus.svg + icons/PartDesign_SubtractiveWedge.svg icons/PartDesign_Thickness.svg icons/PartDesignWorkbench.svg icons/Tree_PartDesign_Pad.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Box.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveBox.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Box.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveBox.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Cone.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveCone.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Cone.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveCone.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Cylinder.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveCylinder.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Cylinder.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveCylinder.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Ellipsoid.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveEllipsoid.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Ellipsoid.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveEllipsoid.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Helix.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveHelix.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Helix.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveHelix.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Loft.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveLoft.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Loft.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveLoft.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Pipe.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditivePipe.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Pipe.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditivePipe.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Prism.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditivePrism.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Prism.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditivePrism.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Sphere.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveSphere.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Sphere.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveSphere.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Torus.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveTorus.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Torus.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveTorus.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Wedge.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveWedge.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Additive_Wedge.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_AdditiveWedge.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Box.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveBox.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Box.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveBox.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Cone.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveCone.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Cone.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveCone.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Cylinder.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveCylinder.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Cylinder.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveCylinder.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Ellipsoid.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveEllipsoid.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Ellipsoid.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveEllipsoid.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Helix.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveHelix.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Helix.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveHelix.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Loft.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveLoft.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Loft.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveLoft.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Pipe.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractivePipe.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Pipe.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractivePipe.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Prism.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractivePrism.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Prism.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractivePrism.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Sphere.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveSphere.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Sphere.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveSphere.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Torus.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveTorus.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Torus.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveTorus.svg diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Wedge.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveWedge.svg similarity index 100% rename from src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Subtractive_Wedge.svg rename to src/Mod/PartDesign/Gui/Resources/icons/PartDesign_SubtractiveWedge.svg diff --git a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp index ca17897522..48a01cb7d2 100644 --- a/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskHelixParameters.cpp @@ -61,7 +61,7 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskHelixParameters */ TaskHelixParameters::TaskHelixParameters(PartDesignGui::ViewProviderHelix *HelixView, QWidget *parent) - : TaskSketchBasedParameters(HelixView, parent, "PartDesign_Additive_Helix", tr("Helix parameters")), + : TaskSketchBasedParameters(HelixView, parent, "PartDesign_AdditiveHelix", tr("Helix parameters")), ui (new Ui_TaskHelixParameters) { // we need a separate container widget to add all controls to diff --git a/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp b/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp index 33040229c1..36cab259a2 100644 --- a/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLoftParameters.cpp @@ -56,7 +56,7 @@ using namespace Gui; /* TRANSLATOR PartDesignGui::TaskLoftParameters */ TaskLoftParameters::TaskLoftParameters(ViewProviderLoft *LoftView,bool /*newObj*/, QWidget *parent) - : TaskSketchBasedParameters(LoftView, parent, "PartDesign_Additive_Loft", tr("Loft parameters")) + : TaskSketchBasedParameters(LoftView, parent, "PartDesign_AdditiveLoft", tr("Loft parameters")) , ui(new Ui_TaskLoftParameters) { // we need a separate container widget to add all controls to diff --git a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp index 2789b33289..bcc848aa35 100644 --- a/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPipeParameters.cpp @@ -72,7 +72,7 @@ using namespace Gui; //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TaskPipeParameters::TaskPipeParameters(ViewProviderPipe *PipeView, bool /*newObj*/, QWidget *parent) - : TaskSketchBasedParameters(PipeView, parent, "PartDesign_Additive_Pipe", tr("Pipe parameters")) + : TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", tr("Pipe parameters")) , ui(new Ui_TaskPipeParameters) { // we need a separate container widget to add all controls to @@ -443,7 +443,7 @@ void TaskPipeParameters::exitSelectionMode() { //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TaskPipeOrientation::TaskPipeOrientation(ViewProviderPipe* PipeView, bool /*newObj*/, QWidget* parent) - : TaskSketchBasedParameters(PipeView, parent, "PartDesign_Additive_Pipe", tr("Section orientation")), + : TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", tr("Section orientation")), ui(new Ui_TaskPipeOrientation) { // we need a separate container widget to add all controls to @@ -770,7 +770,7 @@ void TaskPipeOrientation::updateUI(int idx) { // Task Scaling //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TaskPipeScaling::TaskPipeScaling(ViewProviderPipe* PipeView, bool /*newObj*/, QWidget* parent) - : TaskSketchBasedParameters(PipeView, parent, "PartDesign_Additive_Pipe", tr("Section transformation")), + : TaskSketchBasedParameters(PipeView, parent, "PartDesign_AdditivePipe", tr("Section transformation")), ui(new Ui_TaskPipeScaling) { // we need a separate container widget to add all controls to