From fe547195bf1c4bece2eddb795b7078c333b83a38 Mon Sep 17 00:00:00 2001 From: luz paz Date: Mon, 30 Nov 2020 07:53:38 -0500 Subject: [PATCH] Path: Change filenames in the rest of the Path code Reflects changes in * PathOpGui.SetupOperation() * GetResources() * sPIxmap * pixmap * *.UI files Also contains minor translation context renames (these were edits made near to original intent of this commit) --- src/Mod/Path/Gui/Command.cpp | 8 ++++---- .../Path/Gui/Resources/panels/PageBaseGeometryEdit.ui | 2 +- src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui | 2 +- src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui | 2 +- src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui | 8 ++++---- src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui | 10 +++++----- .../Path/Gui/Resources/panels/ToolBitLibraryEdit.ui | 4 ++-- src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui | 2 +- src/Mod/Path/Gui/Resources/panels/ToolLibraryEditor.ui | 6 +++--- src/Mod/Path/Gui/TaskDlgPathCompound.cpp | 2 +- src/Mod/Path/Gui/ViewProviderArea.cpp | 4 ++-- src/Mod/Path/Gui/ViewProviderPath.cpp | 2 +- src/Mod/Path/Gui/ViewProviderPathCompound.cpp | 2 +- src/Mod/Path/Gui/ViewProviderPathShape.cpp | 2 +- src/Mod/Path/PathCommands.py | 6 +++--- src/Mod/Path/PathScripts/PathAdaptiveGui.py | 10 +++++++--- src/Mod/Path/PathScripts/PathArray.py | 2 +- src/Mod/Path/PathScripts/PathCollision.py | 2 +- src/Mod/Path/PathScripts/PathComment.py | 4 ++-- src/Mod/Path/PathScripts/PathCopy.py | 4 ++-- src/Mod/Path/PathScripts/PathDeburrGui.py | 2 +- src/Mod/Path/PathScripts/PathDressupAxisMap.py | 2 +- src/Mod/Path/PathScripts/PathDressupDogbone.py | 2 +- src/Mod/Path/PathScripts/PathDressupDragknife.py | 2 +- src/Mod/Path/PathScripts/PathDressupLeadInOut.py | 2 +- src/Mod/Path/PathScripts/PathDressupPathBoundaryGui.py | 2 +- src/Mod/Path/PathScripts/PathDressupRampEntry.py | 2 +- src/Mod/Path/PathScripts/PathDressupTagGui.py | 2 +- src/Mod/Path/PathScripts/PathDressupZCorrect.py | 2 +- src/Mod/Path/PathScripts/PathDrillingGui.py | 6 +++--- src/Mod/Path/PathScripts/PathEngraveGui.py | 2 +- src/Mod/Path/PathScripts/PathFixture.py | 4 ++-- src/Mod/Path/PathScripts/PathHelixGui.py | 6 +++--- src/Mod/Path/PathScripts/PathHop.py | 4 ++-- src/Mod/Path/PathScripts/PathIconViewProvider.py | 2 +- src/Mod/Path/PathScripts/PathInspect.py | 2 +- src/Mod/Path/PathScripts/PathJobCmd.py | 4 ++-- src/Mod/Path/PathScripts/PathJobGui.py | 2 +- src/Mod/Path/PathScripts/PathMillFaceGui.py | 6 +++--- src/Mod/Path/PathScripts/PathOpGui.py | 10 +++++----- src/Mod/Path/PathScripts/PathPlane.py | 4 ++-- src/Mod/Path/PathScripts/PathPocketGui.py | 6 +++--- src/Mod/Path/PathScripts/PathPocketShapeGui.py | 6 +++--- src/Mod/Path/PathScripts/PathPost.py | 2 +- src/Mod/Path/PathScripts/PathProbeGui.py | 2 +- src/Mod/Path/PathScripts/PathProfileContourGui.py | 6 +++--- src/Mod/Path/PathScripts/PathProfileEdgesGui.py | 6 +++--- src/Mod/Path/PathScripts/PathProfileFacesGui.py | 6 +++--- src/Mod/Path/PathScripts/PathProfileGui.py | 6 +++--- src/Mod/Path/PathScripts/PathSanity.py | 2 +- src/Mod/Path/PathScripts/PathSetupSheetGui.py | 2 +- src/Mod/Path/PathScripts/PathSimpleCopy.py | 2 +- src/Mod/Path/PathScripts/PathSimulatorGui.py | 2 +- src/Mod/Path/PathScripts/PathSlotGui.py | 6 +++--- src/Mod/Path/PathScripts/PathStop.py | 4 ++-- src/Mod/Path/PathScripts/PathSurfaceGui.py | 6 +++--- src/Mod/Path/PathScripts/PathToolBitCmd.py | 6 +++--- src/Mod/Path/PathScripts/PathToolBitGui.py | 2 +- src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py | 6 +++--- src/Mod/Path/PathScripts/PathToolBitLibraryGui.py | 2 +- src/Mod/Path/PathScripts/PathToolControllerGui.py | 4 ++-- src/Mod/Path/PathScripts/PathToolLibraryEditor.py | 4 ++-- src/Mod/Path/PathScripts/PathVcarveGui.py | 9 ++++++--- src/Mod/Path/PathScripts/PathWaterlineGui.py | 6 +++--- src/Mod/Path/PathScripts/post/gcode_pre.py | 6 +++++- 65 files changed, 137 insertions(+), 126 deletions(-) diff --git a/src/Mod/Path/Gui/Command.cpp b/src/Mod/Path/Gui/Command.cpp index 12f45b4114..af6bcbc266 100644 --- a/src/Mod/Path/Gui/Command.cpp +++ b/src/Mod/Path/Gui/Command.cpp @@ -57,7 +57,7 @@ CmdPathArea::CmdPathArea() sToolTipText = QT_TR_NOOP("Creates a feature area from selected objects"); sWhatsThis = "Path_Area"; sStatusTip = sToolTipText; - sPixmap = "Path-Area"; + sPixmap = "Path_Area"; } void CmdPathArea::activated(int iMsg) @@ -139,7 +139,7 @@ CmdPathAreaWorkplane::CmdPathAreaWorkplane() sToolTipText = QT_TR_NOOP("Select a workplane for a FeatureArea"); sWhatsThis = "Path_Area_Workplane"; sStatusTip = sToolTipText; - sPixmap = "Path-Area-Workplane"; + sPixmap = "Path_Area_Workplane"; } void CmdPathAreaWorkplane::activated(int iMsg) @@ -229,7 +229,7 @@ CmdPathCompound::CmdPathCompound() sToolTipText = QT_TR_NOOP("Creates a compound from selected paths"); sWhatsThis = "Path_Compound"; sStatusTip = sToolTipText; - sPixmap = "Path-Compound"; + sPixmap = "Path_Compound"; } void CmdPathCompound::activated(int iMsg) @@ -281,7 +281,7 @@ CmdPathShape::CmdPathShape() sToolTipText = QT_TR_NOOP("Creates a path from a selected shape"); sWhatsThis = "Path_Shape"; sStatusTip = sToolTipText; - sPixmap = "Path-Shape"; + sPixmap = "Path_Shape"; } void CmdPathShape::activated(int iMsg) diff --git a/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui index a259de2e73..3ea92feef0 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageBaseGeometryEdit.ui @@ -21,7 +21,7 @@ - :/icons/Path-BaseGeometry.svg:/icons/Path-BaseGeometry.svg + :/icons/Path_BaseGeometry.svg:/icons/Path_BaseGeometry.svg diff --git a/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui index 5ba53f4379..89f005b3d5 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageDepthsEdit.ui @@ -18,7 +18,7 @@ - :/icons/Path-Depths.svg:/icons/Path-Depths.svg + :/icons/Path_Depths.svg:/icons/Path_Depths.svg diff --git a/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui index ddccdd7db9..38305e2f20 100644 --- a/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PageHeightsEdit.ui @@ -15,7 +15,7 @@ - :/icons/Path-Heights.svg:/icons/Path-Heights.svg + :/icons/Path_Heights.svg:/icons/Path_Heights.svg diff --git a/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui b/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui index ebc6873b10..945a0a2f6d 100644 --- a/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/SurfaceEdit.ui @@ -39,7 +39,7 @@ - :/icons/Path-BaseGeometry.svg:/icons/Path-BaseGeometry.svg + :/icons/Path_BaseGeometry.svg:/icons/Path_BaseGeometry.svg Base Geometry @@ -117,7 +117,7 @@ - :/icons/Path-Depths.svg:/icons/Path-Depths.svg + :/icons/Path_Depths.svg:/icons/Path_Depths.svg Depths @@ -192,7 +192,7 @@ - :/icons/Path-Heights.svg:/icons/Path-Heights.svg + :/icons/Path_Heights.svg:/icons/Path_Heights.svg Heights @@ -242,7 +242,7 @@ - :/icons/Path-OperationB.svg:/icons/Path-OperationB.svg + :/icons/Path_OperationB.svg:/icons/Path_OperationB.svg Operation diff --git a/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui b/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui index fd144229cf..ce3a6c362d 100644 --- a/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui +++ b/src/Mod/Path/Gui/Resources/panels/TaskPathSimulator.ui @@ -39,7 +39,7 @@ - :/icons/Path-BStop.svg:/icons/Path-BStop.svg + :/icons/Path_BStop.svg:/icons/Path_BStop.svg @@ -59,7 +59,7 @@ - :/icons/Path-BPlay.svg:/icons/Path-BPlay.svg + :/icons/Path_BPlay.svg:/icons/Path_BPlay.svg @@ -79,7 +79,7 @@ - :/icons/Path-BPause.svg:/icons/Path-BPause.svg + :/icons/Path_BPause.svg:/icons/Path_BPause.svg @@ -99,7 +99,7 @@ - :/icons/Path-BStep.svg:/icons/Path-BStep.svg + :/icons/Path_BStep.svg:/icons/Path_BStep.svg @@ -119,7 +119,7 @@ - :/icons/Path-BFastForward.svg:/icons/Path-BFastForward.svg + :/icons/Path_BFastForward.svg:/icons/Path_BFastForward.svg diff --git a/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui b/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui index f97deb479e..70650bf817 100644 --- a/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui @@ -36,7 +36,7 @@ - :/icons/Path-ToolBit.svg:/icons/Path-ToolBit.svg + :/icons/Path_ToolBit.svg:/icons/Path_ToolBit.svg @@ -56,7 +56,7 @@ - :/icons/Path-ToolDuplicate.svg:/icons/Path-ToolDuplicate.svg + :/icons/Path_ToolDuplicate.svg:/icons/Path_ToolDuplicate.svg diff --git a/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui b/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui index 32e87cb8fb..8def8f45d3 100644 --- a/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui +++ b/src/Mod/Path/Gui/Resources/panels/ToolBitSelector.ui @@ -57,7 +57,7 @@ - :/icons/Path-ToolTable.svg:/icons/Path-ToolTable.svg + :/icons/Path_ToolTable.svg:/icons/Path_ToolTable.svg diff --git a/src/Mod/Path/Gui/Resources/panels/ToolLibraryEditor.ui b/src/Mod/Path/Gui/Resources/panels/ToolLibraryEditor.ui index 52aa6afeda..a818f0bfe7 100644 --- a/src/Mod/Path/Gui/Resources/panels/ToolLibraryEditor.ui +++ b/src/Mod/Path/Gui/Resources/panels/ToolLibraryEditor.ui @@ -235,7 +235,7 @@ - :/icons/Path-ToolController.svg:/icons/Path-ToolController.svg + :/icons/Path_ToolController.svg:/icons/Path_ToolController.svg @@ -292,7 +292,7 @@ - :/icons/Path-ToolDuplicate.svg:/icons/Path-ToolDuplicate.svg + :/icons/Path_ToolDuplicate.svg:/icons/Path_ToolDuplicate.svg @@ -372,7 +372,7 @@ - :/icons/Path-LengthOffset.svg:/icons/Path-LengthOffset.svg + :/icons/Path_LengthOffset.svg:/icons/Path_LengthOffset.svg diff --git a/src/Mod/Path/Gui/TaskDlgPathCompound.cpp b/src/Mod/Path/Gui/TaskDlgPathCompound.cpp index 66d9d35bb3..b8e48cc13c 100644 --- a/src/Mod/Path/Gui/TaskDlgPathCompound.cpp +++ b/src/Mod/Path/Gui/TaskDlgPathCompound.cpp @@ -53,7 +53,7 @@ using namespace Gui; //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ TaskWidgetPathCompound::TaskWidgetPathCompound(ViewProviderPathCompound *CompoundView,QWidget *parent) - : TaskBox(Gui::BitmapFactory().pixmap("Path-Compound"),tr("Compound paths"),true, parent) + : TaskBox(Gui::BitmapFactory().pixmap("Path_Compound"),tr("Compound paths"),true, parent) { // we need a separate container widget to add all controls to proxy = new QWidget(this); diff --git a/src/Mod/Path/Gui/ViewProviderArea.cpp b/src/Mod/Path/Gui/ViewProviderArea.cpp index 9044b745f2..33af8945fd 100644 --- a/src/Mod/Path/Gui/ViewProviderArea.cpp +++ b/src/Mod/Path/Gui/ViewProviderArea.cpp @@ -35,7 +35,7 @@ PROPERTY_SOURCE(PathGui::ViewProviderArea, PartGui::ViewProviderPlaneParametric) ViewProviderArea::ViewProviderArea() { - sPixmap = "Path-Area.svg"; + sPixmap = "Path_Area.svg"; } ViewProviderArea::~ViewProviderArea() @@ -119,7 +119,7 @@ PROPERTY_SOURCE(PathGui::ViewProviderAreaView, PartGui::ViewProviderPlaneParamet ViewProviderAreaView::ViewProviderAreaView() { - sPixmap = "Path-Area-View.svg"; + sPixmap = "Path_Area_View.svg"; } ViewProviderAreaView::~ViewProviderAreaView() diff --git a/src/Mod/Path/Gui/ViewProviderPath.cpp b/src/Mod/Path/Gui/ViewProviderPath.cpp index d3c12a8a45..75793330e8 100644 --- a/src/Mod/Path/Gui/ViewProviderPath.cpp +++ b/src/Mod/Path/Gui/ViewProviderPath.cpp @@ -717,7 +717,7 @@ void ViewProviderPath::recomputeBoundingBox() QIcon ViewProviderPath::getIcon() const { - return Gui::BitmapFactory().pixmap("Path-Toolpath"); + return Gui::BitmapFactory().pixmap("Path_Toolpath"); } // Python object ----------------------------------------------------------------------- diff --git a/src/Mod/Path/Gui/ViewProviderPathCompound.cpp b/src/Mod/Path/Gui/ViewProviderPathCompound.cpp index 9782e6fe5a..ee908a97cd 100644 --- a/src/Mod/Path/Gui/ViewProviderPathCompound.cpp +++ b/src/Mod/Path/Gui/ViewProviderPathCompound.cpp @@ -82,7 +82,7 @@ void ViewProviderPathCompound::dropObject(App::DocumentObject* obj) QIcon ViewProviderPathCompound::getIcon() const { - return Gui::BitmapFactory().pixmap("Path-Compound"); + return Gui::BitmapFactory().pixmap("Path_Compound"); } // Python object ----------------------------------------------------------------------- diff --git a/src/Mod/Path/Gui/ViewProviderPathShape.cpp b/src/Mod/Path/Gui/ViewProviderPathShape.cpp index 3b3b83d954..c0cbecf4b1 100644 --- a/src/Mod/Path/Gui/ViewProviderPathShape.cpp +++ b/src/Mod/Path/Gui/ViewProviderPathShape.cpp @@ -39,7 +39,7 @@ PROPERTY_SOURCE(PathGui::ViewProviderPathShape, PathGui::ViewProviderPath) QIcon ViewProviderPathShape::getIcon() const { - return Gui::BitmapFactory().pixmap("Path-Shape"); + return Gui::BitmapFactory().pixmap("Path_Shape"); } std::vector ViewProviderPathShape::claimChildren(void) const diff --git a/src/Mod/Path/PathCommands.py b/src/Mod/Path/PathCommands.py index a8248984cd..e5a7d83d4c 100644 --- a/src/Mod/Path/PathCommands.py +++ b/src/Mod/Path/PathCommands.py @@ -52,7 +52,7 @@ class _CommandSelectLoop: self.active = False def GetResources(self): - return {'Pixmap': 'Path-SelectLoop', + return {'Pixmap': 'Path_SelectLoop', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_SelectLoop", "Finish Selecting Loop"), 'Accel': "P, L", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_SelectLoop", "Complete loop selection from two edges"), @@ -130,7 +130,7 @@ if FreeCAD.GuiUp: class _ToggleOperation: "command definition to toggle Operation Active state" def GetResources(self): - return {'Pixmap': 'Path-OpActive', + return {'Pixmap': 'Path_OpActive', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_OpActiveToggle", "Toggle the Active State of the Operation"), 'Accel': "P, X", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_OpActiveToggle", "Toggle the Active State of the Operation"), @@ -163,7 +163,7 @@ if FreeCAD.GuiUp: class _CopyOperation: "the Path Copy Operation command definition" def GetResources(self): - return {'Pixmap': 'Path-OpCopy', + return {'Pixmap': 'Path_OpCopy', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_OperationCopy", "Copy the operation in the job"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_OperationCopy", "Copy the operation in the job"), 'CmdType': "ForEdit"} diff --git a/src/Mod/Path/PathScripts/PathAdaptiveGui.py b/src/Mod/Path/PathScripts/PathAdaptiveGui.py index 837da2e902..4f8843ef9f 100644 --- a/src/Mod/Path/PathScripts/PathAdaptiveGui.py +++ b/src/Mod/Path/PathScripts/PathAdaptiveGui.py @@ -214,6 +214,10 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): obj.setEditorMode('Stopped', 2) # hide this property -Command = PathOpGui.SetupOperation('Adaptive', PathAdaptive.Create, TaskPanelOpPage, - 'Path-Adaptive', QtCore.QT_TRANSLATE_NOOP("PathAdaptive", "Adaptive"), - QtCore.QT_TRANSLATE_NOOP("PathPocket", "Adaptive clearing and profiling")) +Command = PathOpGui.SetupOperation('Adaptive', + PathAdaptive.Create, + TaskPanelOpPage, + 'Path_Adaptive', + QtCore.QT_TRANSLATE_NOOP("Path_Adaptive", "Adaptive"), + QtCore.QT_TRANSLATE_NOOP("Path_Pocket", "Adaptive clearing and profiling") + ) diff --git a/src/Mod/Path/PathScripts/PathArray.py b/src/Mod/Path/PathScripts/PathArray.py index c617e27d2b..e33ca1a33d 100644 --- a/src/Mod/Path/PathScripts/PathArray.py +++ b/src/Mod/Path/PathScripts/PathArray.py @@ -235,7 +235,7 @@ class ViewProviderArray: class CommandPathArray: def GetResources(self): - return {'Pixmap': 'Path-Array', + return {'Pixmap': 'Path_Array', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Array", "Array"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Array", "Creates an array from a selected path")} diff --git a/src/Mod/Path/PathScripts/PathCollision.py b/src/Mod/Path/PathScripts/PathCollision.py index d5f6b25d16..260dbd2b48 100644 --- a/src/Mod/Path/PathScripts/PathCollision.py +++ b/src/Mod/Path/PathScripts/PathCollision.py @@ -66,7 +66,7 @@ class _ViewProviderCollisionSim: return True def getIcon(self): - return ":/icons/Path-Contour.svg" + return ":/icons/Path_Contour.svg" def __getstate__(self): return None diff --git a/src/Mod/Path/PathScripts/PathComment.py b/src/Mod/Path/PathScripts/PathComment.py index 2340050a4b..d949abf97d 100644 --- a/src/Mod/Path/PathScripts/PathComment.py +++ b/src/Mod/Path/PathScripts/PathComment.py @@ -78,7 +78,7 @@ class _ViewProviderComment: return None def getIcon(self): # optional - return ":/icons/Path-Comment.svg" + return ":/icons/Path_Comment.svg" def onChanged(self, vobj, prop): # optional # pylint: disable=unused-argument @@ -97,7 +97,7 @@ class _ViewProviderComment: class CommandPathComment: def GetResources(self): - return {'Pixmap': 'Path-Comment', + return {'Pixmap': 'Path_Comment', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Comment", "Comment"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Comment", "Add a Comment to your CNC program")} diff --git a/src/Mod/Path/PathScripts/PathCopy.py b/src/Mod/Path/PathScripts/PathCopy.py index 7ec152a1ad..fb20a73ebf 100644 --- a/src/Mod/Path/PathScripts/PathCopy.py +++ b/src/Mod/Path/PathScripts/PathCopy.py @@ -63,7 +63,7 @@ class ViewProviderPathCopy: return def getIcon(self): - return ":/icons/Path-Copy.svg" + return ":/icons/Path_Copy.svg" def __getstate__(self): return None @@ -75,7 +75,7 @@ class ViewProviderPathCopy: class CommandPathCopy: def GetResources(self): - return {'Pixmap': 'Path-Copy', + return {'Pixmap': 'Path_Copy', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Copy", "Copy"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Copy", "Creates a linked copy of another path")} diff --git a/src/Mod/Path/PathScripts/PathDeburrGui.py b/src/Mod/Path/PathScripts/PathDeburrGui.py index dceac18676..1b0a0da690 100644 --- a/src/Mod/Path/PathScripts/PathDeburrGui.py +++ b/src/Mod/Path/PathScripts/PathDeburrGui.py @@ -135,7 +135,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): Command = PathOpGui.SetupOperation('Deburr', PathDeburr.Create, TaskPanelOpPage, - 'Path-Deburr', + 'Path_Deburr', QtCore.QT_TRANSLATE_NOOP("PathDeburr", "Deburr"), QtCore.QT_TRANSLATE_NOOP("PathDeburr", "Creates a Deburr Path along Edges or around Faces"), PathDeburr.SetupProperties) diff --git a/src/Mod/Path/PathScripts/PathDressupAxisMap.py b/src/Mod/Path/PathScripts/PathDressupAxisMap.py index 8d1aa89781..085d2b3b81 100644 --- a/src/Mod/Path/PathScripts/PathDressupAxisMap.py +++ b/src/Mod/Path/PathScripts/PathDressupAxisMap.py @@ -241,7 +241,7 @@ class CommandPathDressup: # pylint: disable=no-init def GetResources(self): - return {'Pixmap': 'Path-Dressup', + return {'Pixmap': 'Path_Dressup', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_DressupAxisMap", "Axis Map Dress-up"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_DressupAxisMap", "Remap one axis to another.")} diff --git a/src/Mod/Path/PathScripts/PathDressupDogbone.py b/src/Mod/Path/PathScripts/PathDressupDogbone.py index 629bde66fe..25d0fdabc7 100644 --- a/src/Mod/Path/PathScripts/PathDressupDogbone.py +++ b/src/Mod/Path/PathScripts/PathDressupDogbone.py @@ -1078,7 +1078,7 @@ class CommandDressupDogbone: # pylint: disable=no-init def GetResources(self): - return {'Pixmap': 'Path-Dressup', + return {'Pixmap': 'Path_Dressup', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_DressupDogbone", "Dogbone Dress-up"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_DressupDogbone", "Creates a Dogbone Dress-up object from a selected path")} diff --git a/src/Mod/Path/PathScripts/PathDressupDragknife.py b/src/Mod/Path/PathScripts/PathDressupDragknife.py index 248b597527..8b0fea27c7 100644 --- a/src/Mod/Path/PathScripts/PathDressupDragknife.py +++ b/src/Mod/Path/PathScripts/PathDressupDragknife.py @@ -537,7 +537,7 @@ class CommandDressupDragknife: # pylint: disable=no-init def GetResources(self): - return {'Pixmap': 'Path-Dressup', + return {'Pixmap': 'Path_Dressup', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_DressupDragKnife", "DragKnife Dress-up"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_DressupDragKnife", "Modifies a path to add dragknife corner actions")} diff --git a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py index bd91cb2f8f..6f7c161db1 100644 --- a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py +++ b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py @@ -508,7 +508,7 @@ class CommandPathDressupLeadInOut: # pylint: disable=no-init def GetResources(self): - return {'Pixmap': 'Path-Dressup', + return {'Pixmap': 'Path_Dressup', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_DressupLeadInOut", "LeadInOut Dressup"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_DressupLeadInOut", "Creates a Cutter Radius Compensation G41/G42 Entry Dressup object from a selected path")} diff --git a/src/Mod/Path/PathScripts/PathDressupPathBoundaryGui.py b/src/Mod/Path/PathScripts/PathDressupPathBoundaryGui.py index 806bb21dc7..34cffb1d68 100644 --- a/src/Mod/Path/PathScripts/PathDressupPathBoundaryGui.py +++ b/src/Mod/Path/PathScripts/PathDressupPathBoundaryGui.py @@ -238,7 +238,7 @@ class CommandPathDressupPathBoundary: # pylint: disable=no-init def GetResources(self): - return {'Pixmap': 'Path-Dressup', + return {'Pixmap': 'Path_Dressup', 'MenuText': QtCore.QT_TRANSLATE_NOOP('Path_DressupPathBoundary', 'Boundary Dress-up'), 'ToolTip': QtCore.QT_TRANSLATE_NOOP('Path_DressupPathBoundary', 'Creates a Path Boundary Dress-up object from a selected path')} diff --git a/src/Mod/Path/PathScripts/PathDressupRampEntry.py b/src/Mod/Path/PathScripts/PathDressupRampEntry.py index 76fae738f8..9fa7d0c040 100644 --- a/src/Mod/Path/PathScripts/PathDressupRampEntry.py +++ b/src/Mod/Path/PathScripts/PathDressupRampEntry.py @@ -679,7 +679,7 @@ class CommandPathDressupRampEntry: # pylint: disable=no-init def GetResources(self): - return {'Pixmap': 'Path-Dressup', + return {'Pixmap': 'Path_Dressup', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_DressupRampEntry", "RampEntry Dress-up"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_DressupRampEntry", "Creates a Ramp Entry Dress-up object from a selected path")} diff --git a/src/Mod/Path/PathScripts/PathDressupTagGui.py b/src/Mod/Path/PathScripts/PathDressupTagGui.py index daca299e41..0a6c01dc6b 100644 --- a/src/Mod/Path/PathScripts/PathDressupTagGui.py +++ b/src/Mod/Path/PathScripts/PathDressupTagGui.py @@ -535,7 +535,7 @@ class CommandPathDressupTag: # pylint: disable=no-init def GetResources(self): - return {'Pixmap': 'Path-Dressup', + return {'Pixmap': 'Path_Dressup', 'MenuText': QtCore.QT_TRANSLATE_NOOP('Path_DressupTag', 'Tag Dress-up'), 'ToolTip': QtCore.QT_TRANSLATE_NOOP('Path_DressupTag', 'Creates a Tag Dress-up object from a selected path')} diff --git a/src/Mod/Path/PathScripts/PathDressupZCorrect.py b/src/Mod/Path/PathScripts/PathDressupZCorrect.py index 9f585a58fe..347ad0a229 100644 --- a/src/Mod/Path/PathScripts/PathDressupZCorrect.py +++ b/src/Mod/Path/PathScripts/PathDressupZCorrect.py @@ -300,7 +300,7 @@ class ViewProviderDressup: class CommandPathDressup: def GetResources(self): - return {'Pixmap': 'Path-Dressup', + return {'Pixmap': 'Path_Dressup', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_DressupZCorrect", "Z Depth Correction Dress-up"), 'Accel': "", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_DressupZCorrect", "Use Probe Map to correct Z depth")} diff --git a/src/Mod/Path/PathScripts/PathDrillingGui.py b/src/Mod/Path/PathScripts/PathDrillingGui.py index 3a5663a023..534d44e1a8 100644 --- a/src/Mod/Path/PathScripts/PathDrillingGui.py +++ b/src/Mod/Path/PathScripts/PathDrillingGui.py @@ -148,9 +148,9 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): Command = PathOpGui.SetupOperation('Drilling', PathDrilling.Create, TaskPanelOpPage, - 'Path-Drilling', - QtCore.QT_TRANSLATE_NOOP("PathDrilling", "Drilling"), - QtCore.QT_TRANSLATE_NOOP("PathDrilling", "Creates a Path Drilling object from a features of a base object"), + 'Path_Drilling', + QtCore.QT_TRANSLATE_NOOP("Path_Drilling", "Drilling"), + QtCore.QT_TRANSLATE_NOOP("Path_Drilling", "Creates a Path Drilling object from a features of a base object"), PathDrilling.SetupProperties) FreeCAD.Console.PrintLog("Loading PathDrillingGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathEngraveGui.py b/src/Mod/Path/PathScripts/PathEngraveGui.py index 0527ac9297..95d5ce9dc5 100644 --- a/src/Mod/Path/PathScripts/PathEngraveGui.py +++ b/src/Mod/Path/PathScripts/PathEngraveGui.py @@ -144,7 +144,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): Command = PathOpGui.SetupOperation('Engrave', PathEngrave.Create, TaskPanelOpPage, - 'Path-Engrave', + 'Path_Engrave', QtCore.QT_TRANSLATE_NOOP("PathEngrave", "Engrave"), QtCore.QT_TRANSLATE_NOOP("PathEngrave", "Creates an Engraving Path around a Draft ShapeString"), PathEngrave.SetupProperties) diff --git a/src/Mod/Path/PathScripts/PathFixture.py b/src/Mod/Path/PathScripts/PathFixture.py index f85c5d5d32..b841e94445 100644 --- a/src/Mod/Path/PathScripts/PathFixture.py +++ b/src/Mod/Path/PathScripts/PathFixture.py @@ -80,7 +80,7 @@ class _ViewProviderFixture: return None def getIcon(self): # optional - return ":/icons/Path-Datums.svg" + return ":/icons/Path_Datums.svg" def onChanged(self, vobj, prop): # optional # pylint: disable=unused-argument @@ -111,7 +111,7 @@ class _ViewProviderFixture: class CommandPathFixture: def GetResources(self): - return {'Pixmap': 'Path-Datums', + return {'Pixmap': 'Path_Datums', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Fixture", "Fixture"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Fixture", "Creates a Fixture Offset object")} diff --git a/src/Mod/Path/PathScripts/PathHelixGui.py b/src/Mod/Path/PathScripts/PathHelixGui.py index 659bf8a211..141cce33d9 100644 --- a/src/Mod/Path/PathScripts/PathHelixGui.py +++ b/src/Mod/Path/PathScripts/PathHelixGui.py @@ -86,9 +86,9 @@ class TaskPanelOpPage(PathCircularHoleBaseGui.TaskPanelOpPage): Command = PathOpGui.SetupOperation('Helix', PathHelix.Create, TaskPanelOpPage, - 'Path-Helix', - QtCore.QT_TRANSLATE_NOOP("PathHelix", "Helix"), - QtCore.QT_TRANSLATE_NOOP("PathHelix", "Creates a Path Helix object from a features of a base object"), + 'Path_Helix', + QtCore.QT_TRANSLATE_NOOP("Path_Helix", "Helix"), + QtCore.QT_TRANSLATE_NOOP("Path_Helix", "Creates a Path Helix object from a features of a base object"), PathHelix.SetupProperties) FreeCAD.Console.PrintLog("Loading PathHelixGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathHop.py b/src/Mod/Path/PathScripts/PathHop.py index bd95b84b93..d2d2a7750a 100644 --- a/src/Mod/Path/PathScripts/PathHop.py +++ b/src/Mod/Path/PathScripts/PathHop.py @@ -78,7 +78,7 @@ class ViewProviderPathHop: self.Object = vobj.Object def getIcon(self): - return ":/icons/Path-Hop.svg" + return ":/icons/Path_Hop.svg" def __getstate__(self): return None @@ -90,7 +90,7 @@ class ViewProviderPathHop: class CommandPathHop: def GetResources(self): - return {'Pixmap': 'Path-Hop', + return {'Pixmap': 'Path_Hop', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Hop", "Hop"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Hop", "Creates a Path Hop object")} diff --git a/src/Mod/Path/PathScripts/PathIconViewProvider.py b/src/Mod/Path/PathScripts/PathIconViewProvider.py index c4a017bcdd..8a61b6a407 100644 --- a/src/Mod/Path/PathScripts/PathIconViewProvider.py +++ b/src/Mod/Path/PathScripts/PathIconViewProvider.py @@ -62,7 +62,7 @@ class ViewProvider(object): self.editCallback = state['editCallback'] def getIcon(self): - return ":/icons/Path-{}.svg".format(self.icon) + return ":/icons/Path_{}.svg".format(self.icon) def onEdit(self, callback): self.editModule = callback.__module__ diff --git a/src/Mod/Path/PathScripts/PathInspect.py b/src/Mod/Path/PathScripts/PathInspect.py index 7b46e9587f..615b01b50b 100644 --- a/src/Mod/Path/PathScripts/PathInspect.py +++ b/src/Mod/Path/PathScripts/PathInspect.py @@ -225,7 +225,7 @@ def show(obj): class CommandPathInspect: def GetResources(self): - return {'Pixmap': 'Path-Inspect', + return {'Pixmap': 'Path_Inspect', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Inspect", "Inspect G-code"), 'Accel': "P, I", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Inspect", "Inspects the G-code contents of a path")} diff --git a/src/Mod/Path/PathScripts/PathJobCmd.py b/src/Mod/Path/PathScripts/PathJobCmd.py index 4c5a2e54bf..ef92826533 100644 --- a/src/Mod/Path/PathScripts/PathJobCmd.py +++ b/src/Mod/Path/PathScripts/PathJobCmd.py @@ -50,7 +50,7 @@ class CommandJobCreate: pass def GetResources(self): - return {'Pixmap': 'Path-Job', + return {'Pixmap': 'Path_Job', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Job", "Job"), 'Accel': "P, J", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Job", "Creates a Path Job object")} @@ -91,7 +91,7 @@ class CommandJobTemplateExport: pass def GetResources(self): - return {'Pixmap': 'Path-ExportTemplate', + return {'Pixmap': 'Path_ExportTemplate', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Job", "Export Template"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Job", "Exports Path Job as a template to be used for other jobs")} diff --git a/src/Mod/Path/PathScripts/PathJobGui.py b/src/Mod/Path/PathScripts/PathJobGui.py index 8e6781a2a2..a85c437fdf 100644 --- a/src/Mod/Path/PathScripts/PathJobGui.py +++ b/src/Mod/Path/PathScripts/PathJobGui.py @@ -207,7 +207,7 @@ class ViewProvider: self.unsetEdit(None, None) def getIcon(self): - return ":/icons/Path-Job.svg" + return ":/icons/Path_Job.svg" def claimChildren(self): children = self.obj.ToolController diff --git a/src/Mod/Path/PathScripts/PathMillFaceGui.py b/src/Mod/Path/PathScripts/PathMillFaceGui.py index e926172a8c..104b7f9e09 100644 --- a/src/Mod/Path/PathScripts/PathMillFaceGui.py +++ b/src/Mod/Path/PathScripts/PathMillFaceGui.py @@ -42,9 +42,9 @@ class TaskPanelOpPage(PathPocketBaseGui.TaskPanelOpPage): Command = PathOpGui.SetupOperation('MillFace', PathMillFace.Create, TaskPanelOpPage, - 'Path-Face', - QtCore.QT_TRANSLATE_NOOP("PathFace", "Face"), - QtCore.QT_TRANSLATE_NOOP("PathFace", "Create a Facing Operation from a model or face"), + 'Path_Face', + QtCore.QT_TRANSLATE_NOOP("Path_Face", "Face"), + QtCore.QT_TRANSLATE_NOOP("Path_Face", "Create a Facing Operation from a model or face"), PathMillFace.SetupProperties) FreeCAD.Console.PrintLog("Loading PathMillFaceGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathOpGui.py b/src/Mod/Path/PathScripts/PathOpGui.py index 20e7dc678e..b1643ed119 100644 --- a/src/Mod/Path/PathScripts/PathOpGui.py +++ b/src/Mod/Path/PathScripts/PathOpGui.py @@ -159,7 +159,7 @@ class ViewProvider(object): if self.Object.Active: return self.OpIcon else: - return ":/icons/Path-OpActive.svg" + return ":/icons/Path_OpActive.svg" def getTaskPanelOpPage(self, obj): '''getTaskPanelOpPage(obj) ... use the stored information to instantiate the receiver op's page controller.''' @@ -440,7 +440,7 @@ class TaskPanelBaseGeometryPage(TaskPanelPage): super(TaskPanelBaseGeometryPage, self).__init__(obj, features) self.panelTitle = 'Base Geometry' - self.OpIcon = ":/icons/Path-BaseGeometry.svg" + self.OpIcon = ":/icons/Path_BaseGeometry.svg" self.setIcon(self.OpIcon) def getForm(self): @@ -764,7 +764,7 @@ class TaskPanelHeightsPage(TaskPanelPage): self.clearanceHeight = None self.safeHeight = None self.panelTitle = 'Heights' - self.OpIcon = ":/icons/Path-Heights.svg" + self.OpIcon = ":/icons/Path_Heights.svg" self.setIcon(self.OpIcon) def getForm(self): @@ -808,7 +808,7 @@ class TaskPanelDepthsPage(TaskPanelPage): self.finishDepth = None self.stepDown = None self.panelTitle = 'Depths' - self.OpIcon = ":/icons/Path-Depths.svg" + self.OpIcon = ":/icons/Path_Depths.svg" self.setIcon(self.OpIcon) def getForm(self): @@ -1234,7 +1234,7 @@ class CommandSetStartPoint: # pylint: disable=no-init def GetResources(self): - return {'Pixmap': 'Path-StartPoint', + return {'Pixmap': 'Path_StartPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path", "Pick Start Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path", "Pick Start Point")} diff --git a/src/Mod/Path/PathScripts/PathPlane.py b/src/Mod/Path/PathScripts/PathPlane.py index 42c5822da2..1f2bddd210 100644 --- a/src/Mod/Path/PathScripts/PathPlane.py +++ b/src/Mod/Path/PathScripts/PathPlane.py @@ -75,7 +75,7 @@ class _ViewProviderPlane: return None def getIcon(self): # optional - return ":/icons/Path-Plane.svg" + return ":/icons/Path_Plane.svg" def onChanged(self, vobj, prop): # optional # pylint: disable=unused-argument @@ -106,7 +106,7 @@ class _ViewProviderPlane: class CommandPathPlane: def GetResources(self): - return {'Pixmap': 'Path-Plane', + return {'Pixmap': 'Path_Plane', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Plane", "Selection Plane"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Plane", "Create a Selection Plane object")} diff --git a/src/Mod/Path/PathScripts/PathPocketGui.py b/src/Mod/Path/PathScripts/PathPocketGui.py index 78f183b20d..a452e5a838 100644 --- a/src/Mod/Path/PathScripts/PathPocketGui.py +++ b/src/Mod/Path/PathScripts/PathPocketGui.py @@ -42,9 +42,9 @@ class TaskPanelOpPage(PathPocketBaseGui.TaskPanelOpPage): Command = PathOpGui.SetupOperation('Pocket 3D', PathPocket.Create, TaskPanelOpPage, - 'Path-3DPocket', - QtCore.QT_TRANSLATE_NOOP("PathPocket", "3D Pocket"), - QtCore.QT_TRANSLATE_NOOP("PathPocket", "Creates a Path 3D Pocket object from a face or faces"), + 'Path_3DPocket', + QtCore.QT_TRANSLATE_NOOP("Path_Pocket", "3D Pocket"), + QtCore.QT_TRANSLATE_NOOP("Path_Pocket", "Creates a Path 3D Pocket object from a face or faces"), PathPocket.SetupProperties) FreeCAD.Console.PrintLog("Loading PathPocketGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathPocketShapeGui.py b/src/Mod/Path/PathScripts/PathPocketShapeGui.py index 282267736a..53bc26c336 100644 --- a/src/Mod/Path/PathScripts/PathPocketShapeGui.py +++ b/src/Mod/Path/PathScripts/PathPocketShapeGui.py @@ -479,9 +479,9 @@ class TaskPanelOpPage(PathPocketBaseGui.TaskPanelOpPage): Command = PathOpGui.SetupOperation('Pocket Shape', PathPocketShape.Create, TaskPanelOpPage, - 'Path-Pocket', - QtCore.QT_TRANSLATE_NOOP("PathPocket", "Pocket Shape"), - QtCore.QT_TRANSLATE_NOOP("PathPocket", "Creates a Path Pocket object from a face or faces"), + 'Path_Pocket', + QtCore.QT_TRANSLATE_NOOP("Path_Pocket", "Pocket Shape"), + QtCore.QT_TRANSLATE_NOOP("Path_Pocket", "Creates a Path Pocket object from a face or faces"), PathPocketShape.SetupProperties) FreeCAD.Console.PrintLog("Loading PathPocketShapeGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathPost.py b/src/Mod/Path/PathScripts/PathPost.py index c984fafa1d..ab5ba76845 100644 --- a/src/Mod/Path/PathScripts/PathPost.py +++ b/src/Mod/Path/PathScripts/PathPost.py @@ -176,7 +176,7 @@ class CommandPathPost: return dlg.exec_() def GetResources(self): - return {'Pixmap': 'Path-Post', + return {'Pixmap': 'Path_Post', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Post", "Post Process"), 'Accel': "P, P", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Post", "Post Process the selected Job")} diff --git a/src/Mod/Path/PathScripts/PathProbeGui.py b/src/Mod/Path/PathScripts/PathProbeGui.py index 55809a92b7..a00ec913e8 100644 --- a/src/Mod/Path/PathScripts/PathProbeGui.py +++ b/src/Mod/Path/PathScripts/PathProbeGui.py @@ -84,7 +84,7 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): Command = PathOpGui.SetupOperation('Probe', PathProbe.Create, TaskPanelOpPage, - 'Path-Probe', + 'Path_Probe', QtCore.QT_TRANSLATE_NOOP("Probe", "Probe"), QtCore.QT_TRANSLATE_NOOP("Probe", "Create a Probing Grid from a job stock"), PathProbe.SetupProperties) diff --git a/src/Mod/Path/PathScripts/PathProfileContourGui.py b/src/Mod/Path/PathScripts/PathProfileContourGui.py index 02640d721c..465ac16cab 100644 --- a/src/Mod/Path/PathScripts/PathProfileContourGui.py +++ b/src/Mod/Path/PathScripts/PathProfileContourGui.py @@ -44,9 +44,9 @@ class TaskPanelOpPage(PathProfileGui.TaskPanelOpPage): Command = PathOpGui.SetupOperation('Profile', PathProfile.Create, TaskPanelOpPage, - 'Path-Contour', - QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile"), - QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile entire model, selected face(s) or selected edge(s)"), + 'Path_Contour', + QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Profile"), + QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Profile entire model, selected face(s) or selected edge(s)"), PathProfile.SetupProperties) FreeCAD.Console.PrintLog("Loading PathProfileContourGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathProfileEdgesGui.py b/src/Mod/Path/PathScripts/PathProfileEdgesGui.py index 26bc7b0c48..e893e65ef0 100644 --- a/src/Mod/Path/PathScripts/PathProfileEdgesGui.py +++ b/src/Mod/Path/PathScripts/PathProfileEdgesGui.py @@ -44,9 +44,9 @@ class TaskPanelOpPage(PathProfileGui.TaskPanelOpPage): Command = PathOpGui.SetupOperation('Profile', PathProfile.Create, TaskPanelOpPage, - 'Path-Contour', - QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile"), - QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile entire model, selected face(s) or selected edge(s)"), + 'Path_Contour', + QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Profile"), + QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Profile entire model, selected face(s) or selected edge(s)"), PathProfile.SetupProperties) FreeCAD.Console.PrintLog("Loading PathProfileEdgesGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathProfileFacesGui.py b/src/Mod/Path/PathScripts/PathProfileFacesGui.py index 40f66eb5ad..69bfdbf459 100644 --- a/src/Mod/Path/PathScripts/PathProfileFacesGui.py +++ b/src/Mod/Path/PathScripts/PathProfileFacesGui.py @@ -44,9 +44,9 @@ class TaskPanelOpPage(PathProfileGui.TaskPanelOpPage): Command = PathOpGui.SetupOperation('Profile', PathProfile.Create, TaskPanelOpPage, - 'Path-Contour', - QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile"), - QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile entire model, selected face(s) or selected edge(s)"), + 'Path_Contour', + QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Profile"), + QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Profile entire model, selected face(s) or selected edge(s)"), PathProfile.SetupProperties) FreeCAD.Console.PrintLog("Loading PathProfileFacesGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathProfileGui.py b/src/Mod/Path/PathScripts/PathProfileGui.py index ff7b6d807f..a7f77d7062 100644 --- a/src/Mod/Path/PathScripts/PathProfileGui.py +++ b/src/Mod/Path/PathScripts/PathProfileGui.py @@ -157,9 +157,9 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): Command = PathOpGui.SetupOperation('Profile', PathProfile.Create, TaskPanelOpPage, - 'Path-Contour', - QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile"), - QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile entire model, selected face(s) or selected edge(s)"), + 'Path_Contour', + QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Profile"), + QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Profile entire model, selected face(s) or selected edge(s)"), PathProfile.SetupProperties) FreeCAD.Console.PrintLog("Loading PathProfileFacesGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathSanity.py b/src/Mod/Path/PathScripts/PathSanity.py index 57230465e7..f69465c4e1 100644 --- a/src/Mod/Path/PathScripts/PathSanity.py +++ b/src/Mod/Path/PathScripts/PathSanity.py @@ -97,7 +97,7 @@ class CommandPathSanity: return filepath + os.sep def GetResources(self): - return {'Pixmap': 'Path-Sanity', + return {'Pixmap': 'Path_Sanity', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Sanity", "Check the path job for common errors"), 'Accel': "P, S", diff --git a/src/Mod/Path/PathScripts/PathSetupSheetGui.py b/src/Mod/Path/PathScripts/PathSetupSheetGui.py index 2d2257e808..7b06816ed7 100644 --- a/src/Mod/Path/PathScripts/PathSetupSheetGui.py +++ b/src/Mod/Path/PathScripts/PathSetupSheetGui.py @@ -67,7 +67,7 @@ class ViewProvider: self.obj = vobj.Object def getIcon(self): - return ":/icons/Path-SetupSheet.svg" + return ":/icons/Path_SetupSheet.svg" def __getstate__(self): return None diff --git a/src/Mod/Path/PathScripts/PathSimpleCopy.py b/src/Mod/Path/PathScripts/PathSimpleCopy.py index 276648d0de..2901166801 100644 --- a/src/Mod/Path/PathScripts/PathSimpleCopy.py +++ b/src/Mod/Path/PathScripts/PathSimpleCopy.py @@ -36,7 +36,7 @@ def translate(context, text, disambig=None): class CommandPathSimpleCopy: def GetResources(self): - return {'Pixmap': 'Path-SimpleCopy', + return {'Pixmap': 'Path_SimpleCopy', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_SimpleCopy", "Simple Copy"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_SimpleCopy", "Creates a non-parametric copy of another path")} diff --git a/src/Mod/Path/PathScripts/PathSimulatorGui.py b/src/Mod/Path/PathScripts/PathSimulatorGui.py index b1dd8aeedc..086db6b145 100644 --- a/src/Mod/Path/PathScripts/PathSimulatorGui.py +++ b/src/Mod/Path/PathScripts/PathSimulatorGui.py @@ -539,7 +539,7 @@ class PathSimulation: class CommandPathSimulate: def GetResources(self): - return {'Pixmap': 'Path-Simulator', + return {'Pixmap': 'Path_Simulator', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Simulator", "CAM Simulator"), 'Accel': "P, M", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Simulator", "Simulate Path G-Code on stock")} diff --git a/src/Mod/Path/PathScripts/PathSlotGui.py b/src/Mod/Path/PathScripts/PathSlotGui.py index 9db6c704b7..397ec14fdf 100644 --- a/src/Mod/Path/PathScripts/PathSlotGui.py +++ b/src/Mod/Path/PathScripts/PathSlotGui.py @@ -238,9 +238,9 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): Command = PathOpGui.SetupOperation('Slot', PathSlot.Create, TaskPanelOpPage, - 'Path-Slot', - QtCore.QT_TRANSLATE_NOOP("Slot", "Slot"), - QtCore.QT_TRANSLATE_NOOP("Slot", "Create a Slot operation from selected geometry or custom points."), + 'Path_Slot', + QtCore.QT_TRANSLATE_NOOP("Path_Slot", "Slot"), + QtCore.QT_TRANSLATE_NOOP("Path_Slot", "Create a Slot operation from selected geometry or custom points."), PathSlot.SetupProperties) FreeCAD.Console.PrintLog("Loading PathSlotGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathStop.py b/src/Mod/Path/PathScripts/PathStop.py index e669bd7577..fdfe80572e 100644 --- a/src/Mod/Path/PathScripts/PathStop.py +++ b/src/Mod/Path/PathScripts/PathStop.py @@ -82,7 +82,7 @@ class _ViewProviderStop: return None def getIcon(self): # optional - return ":/icons/Path-Stop.svg" + return ":/icons/Path_Stop.svg" def onChanged(self, vobj, prop): # optional # pylint: disable=unused-argument @@ -101,7 +101,7 @@ class _ViewProviderStop: class CommandPathStop: def GetResources(self): - return {'Pixmap': 'Path-Stop', + return {'Pixmap': 'Path_Stop', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Stop", "Stop"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Stop", "Add Optional or Mandatory Stop to the program")} diff --git a/src/Mod/Path/PathScripts/PathSurfaceGui.py b/src/Mod/Path/PathScripts/PathSurfaceGui.py index 07f83703cc..038a670c52 100644 --- a/src/Mod/Path/PathScripts/PathSurfaceGui.py +++ b/src/Mod/Path/PathScripts/PathSurfaceGui.py @@ -226,9 +226,9 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): Command = PathOpGui.SetupOperation('Surface', PathSurface.Create, TaskPanelOpPage, - 'Path-3DSurface', - QtCore.QT_TRANSLATE_NOOP("Surface", "3D Surface"), - QtCore.QT_TRANSLATE_NOOP("Surface", "Create a 3D Surface Operation from a model"), + 'Path_3DSurface', + QtCore.QT_TRANSLATE_NOOP("Path_Surface", "3D Surface"), + QtCore.QT_TRANSLATE_NOOP("Path_Surface", "Create a 3D Surface Operation from a model"), PathSurface.SetupProperties) FreeCAD.Console.PrintLog("Loading PathSurfaceGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathToolBitCmd.py b/src/Mod/Path/PathScripts/PathToolBitCmd.py index f968cc748a..31df9d5ba2 100644 --- a/src/Mod/Path/PathScripts/PathToolBitCmd.py +++ b/src/Mod/Path/PathScripts/PathToolBitCmd.py @@ -36,7 +36,7 @@ class CommandToolBitCreate: pass def GetResources(self): - return {'Pixmap': 'Path-ToolBit', + return {'Pixmap': 'Path_ToolBit', 'MenuText': QtCore.QT_TRANSLATE_NOOP("PathToolBit", "Create Tool"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathToolBit", "Creates a new ToolBit object")} @@ -60,7 +60,7 @@ class CommandToolBitSave: menuTxt = QtCore.QT_TRANSLATE_NOOP("PathToolBit", "Save Tool as...") else: menuTxt = QtCore.QT_TRANSLATE_NOOP("PathToolBit", "Save Tool") - return {'Pixmap': 'Path-ToolBit', + return {'Pixmap': 'Path_ToolBit', 'MenuText': menuTxt, 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathToolBit", "Save an existing ToolBit object to a file")} @@ -109,7 +109,7 @@ class CommandToolBitLoad: pass def GetResources(self): - return {'Pixmap': 'Path-ToolBit', + return {'Pixmap': 'Path_ToolBit', 'MenuText': QtCore.QT_TRANSLATE_NOOP("PathToolBit", "Load Tool"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathToolBit", "Load an existing ToolBit object from a file")} diff --git a/src/Mod/Path/PathScripts/PathToolBitGui.py b/src/Mod/Path/PathScripts/PathToolBitGui.py index 21a755f2ce..2bd4f4203c 100644 --- a/src/Mod/Path/PathScripts/PathToolBitGui.py +++ b/src/Mod/Path/PathScripts/PathToolBitGui.py @@ -69,7 +69,7 @@ class ViewProvider(object): pixmap = QtGui.QPixmap() pixmap.loadFromData(png, 'PNG') return QtGui.QIcon(pixmap) - return ':/icons/Path-ToolBit.svg' + return ':/icons/Path_ToolBit.svg' def __getstate__(self): return None diff --git a/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py b/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py index 3d18989ee5..6c3d82b834 100644 --- a/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py +++ b/src/Mod/Path/PathScripts/PathToolBitLibraryCmd.py @@ -35,7 +35,7 @@ class CommandToolBitSelectorOpen: pass def GetResources(self): - return {'Pixmap': 'Path-ToolTable', + return {'Pixmap': 'Path_ToolTable', 'MenuText': QtCore.QT_TRANSLATE_NOOP("PathToolBitLibrary", "ToolBit Dock"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathToolBitLibrary", "Toggle the Toolbit Dock"), 'Accel': "P, T", @@ -65,7 +65,7 @@ class CommandToolBitLibraryOpen: pass def GetResources(self): - return {'Pixmap': 'Path-ToolTable', + return {'Pixmap': 'Path_ToolTable', 'MenuText': QtCore.QT_TRANSLATE_NOOP("PathToolBitLibrary", "ToolBit Library editor"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathToolBitLibrary", "Open an editor to manage ToolBit libraries"), 'CmdType': "ForEdit"} @@ -93,7 +93,7 @@ class CommandToolBitLibraryOpen: # pass # def GetResources(self): -# return {'Pixmap': 'Path-ToolTable', +# return {'Pixmap': 'Path_ToolTable', # 'MenuText': QtCore.QT_TRANSLATE_NOOP("PathToolBitLibrary", "Load ToolBit Library"), # 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathToolBitLibrary", "Load an entire ToolBit library or part of it into a job")} diff --git a/src/Mod/Path/PathScripts/PathToolBitLibraryGui.py b/src/Mod/Path/PathScripts/PathToolBitLibraryGui.py index a0a52f0de3..1aab219524 100644 --- a/src/Mod/Path/PathScripts/PathToolBitLibraryGui.py +++ b/src/Mod/Path/PathScripts/PathToolBitLibraryGui.py @@ -210,7 +210,7 @@ class ModelFactory(object): libItem = QtGui.QStandardItem(fn) libItem.setToolTip(loc) libItem.setData(libFile, _PathRole) - libItem.setIcon(QtGui.QPixmap(':/icons/Path-ToolTable.svg')) + libItem.setIcon(QtGui.QPixmap(':/icons/Path_ToolTable.svg')) model.appendRow(libItem) PathLog.debug('model rows: {}'.format(model.rowCount())) diff --git a/src/Mod/Path/PathScripts/PathToolControllerGui.py b/src/Mod/Path/PathScripts/PathToolControllerGui.py index 54daefa5ca..34224a3535 100644 --- a/src/Mod/Path/PathScripts/PathToolControllerGui.py +++ b/src/Mod/Path/PathScripts/PathToolControllerGui.py @@ -67,7 +67,7 @@ class ViewProvider: return None def getIcon(self): - return ":/icons/Path-ToolController.svg" + return ":/icons/Path_ToolController.svg" def onChanged(self, vobj, prop): # pylint: disable=unused-argument @@ -141,7 +141,7 @@ class CommandPathToolController(object): # pylint: disable=no-init def GetResources(self): - return {'Pixmap': 'Path-LengthOffset', + return {'Pixmap': 'Path_LengthOffset', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_ToolController", "Add Tool Controller to the Job"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_ToolController", "Add Tool Controller")} diff --git a/src/Mod/Path/PathScripts/PathToolLibraryEditor.py b/src/Mod/Path/PathScripts/PathToolLibraryEditor.py index 83c8dbfcfe..dd37954687 100644 --- a/src/Mod/Path/PathScripts/PathToolLibraryEditor.py +++ b/src/Mod/Path/PathScripts/PathToolLibraryEditor.py @@ -314,7 +314,7 @@ class EditorPanel(): listWidgetItem = QtGui.QListWidgetItem() listItem = ToolTableListWidgetItem(self.TLM) listItem.setTableName(table.Name) - listItem.setIcon(QtGui.QPixmap(':/icons/Path-ToolTable.svg')) + listItem.setIcon(QtGui.QPixmap(':/icons/Path_ToolTable.svg')) listItem.toolMoved.connect(self.reloadReset) listWidgetItem.setSizeHint(QtCore.QSize(0,40)) self.form.TableList.addItem(listWidgetItem) @@ -449,7 +449,7 @@ class CommandToolLibraryEdit(): cb() def GetResources(self): - return {'Pixmap' : 'Path-ToolTable', + return {'Pixmap' : 'Path_ToolTable', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_ToolTable","Tool Manager"), 'Accel': "P, T", 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_ToolTable","Tool Manager")} diff --git a/src/Mod/Path/PathScripts/PathVcarveGui.py b/src/Mod/Path/PathScripts/PathVcarveGui.py index 60910d5d9a..5254a78a22 100644 --- a/src/Mod/Path/PathScripts/PathVcarveGui.py +++ b/src/Mod/Path/PathScripts/PathVcarveGui.py @@ -146,9 +146,12 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): return TaskPanelBaseGeometryPage(obj, features) -Command = PathOpGui.SetupOperation('Vcarve', PathVcarve.Create, TaskPanelOpPage, - 'Path-Vcarve', QtCore.QT_TRANSLATE_NOOP("PathVcarve", "Vcarve"), - QtCore.QT_TRANSLATE_NOOP("PathVcarve", "Creates a medial line engraving path"), +Command = PathOpGui.SetupOperation('Vcarve', + PathVcarve.Create, + TaskPanelOpPage, + 'Path_Vcarve', + QtCore.QT_TRANSLATE_NOOP("Path_Vcarve", "Vcarve"), + QtCore.QT_TRANSLATE_NOOP("Path_Vcarve", "Creates a medial line engraving path"), PathVcarve.SetupProperties) FreeCAD.Console.PrintLog("Loading PathVcarveGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathWaterlineGui.py b/src/Mod/Path/PathScripts/PathWaterlineGui.py index 2fe16a6ff1..07958536fd 100644 --- a/src/Mod/Path/PathScripts/PathWaterlineGui.py +++ b/src/Mod/Path/PathScripts/PathWaterlineGui.py @@ -145,9 +145,9 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): Command = PathOpGui.SetupOperation('Waterline', PathWaterline.Create, TaskPanelOpPage, - 'Path-Waterline', - QtCore.QT_TRANSLATE_NOOP("Waterline", "Waterline"), - QtCore.QT_TRANSLATE_NOOP("Waterline", "Create a Waterline Operation from a model"), + 'Path_Waterline', + QtCore.QT_TRANSLATE_NOOP("Path_Waterline", "Waterline"), + QtCore.QT_TRANSLATE_NOOP("Path_Waterline", "Create a Waterline Operation from a model"), PathWaterline.SetupProperties) FreeCAD.Console.PrintLog("Loading PathWaterlineGui... done\n") diff --git a/src/Mod/Path/PathScripts/post/gcode_pre.py b/src/Mod/Path/PathScripts/post/gcode_pre.py index 648f57f7e8..7b54be39ed 100644 --- a/src/Mod/Path/PathScripts/post/gcode_pre.py +++ b/src/Mod/Path/PathScripts/post/gcode_pre.py @@ -112,7 +112,11 @@ def insert(filename, docname): # Create a custom and viewobject obj = PathCustom.Create("Custom") - res = PathOpGui.CommandResources('Custom', PathCustom.Create, PathCustomGui.TaskPanelOpPage, 'Path-Custom', 'Path-Custom', '', '') + res = PathOpGui.CommandResources('Custom', + PathCustom.Create, PathCustomGui.TaskPanelOpPage, + 'Path_Custom', + 'Path_Custom', '', '' + ) obj.ViewObject.Proxy = PathOpGui.ViewProvider(obj.ViewObject, res) obj.ViewObject.Proxy.setDeleteObjectsOnReject(False)