diff --git a/src/Mod/Draft/Resources/Draft.qrc b/src/Mod/Draft/Resources/Draft.qrc index 707c86174e..2fae0bb91d 100644 --- a/src/Mod/Draft/Resources/Draft.qrc +++ b/src/Mod/Draft/Resources/Draft.qrc @@ -1,5 +1,5 @@ - + icons/Draft_2DShapeView.svg icons/Draft_AddConstruction.svg icons/Draft_AddPoint.svg @@ -44,6 +44,7 @@ icons/Draft_Finish.svg icons/Draft_FlipDimension.svg icons/Draft_Grid.svg + icons/Draft_Hatch.svg icons/Draft_Heal.svg icons/Draft_Join.svg icons/Draft_Label.svg @@ -57,6 +58,7 @@ icons/Draft_N-Curve.svg icons/Draft_N-Linear.svg icons/Draft_N-Polygon.svg + icons/Draft_NewLayer.svg icons/Draft_Offset.svg icons/Draft_PathArray.svg icons/Draft_PathLinkArray.svg @@ -78,6 +80,21 @@ icons/Draft_ShapeString_tree.svg icons/Draft_Slope.svg icons/Draft_Snap.svg + icons/Draft_Snap_Angle.svg + icons/Draft_Snap_Center.svg + icons/Draft_Snap_Dimensions.svg + icons/Draft_Snap_Endpoint.svg + icons/Draft_Snap_Extension.svg + icons/Draft_Snap_Grid.svg + icons/Draft_Snap_Intersection.svg + icons/Draft_Snap_Lock.svg + icons/Draft_Snap_Midpoint.svg + icons/Draft_Snap_Near.svg + icons/Draft_Snap_Ortho.svg + icons/Draft_Snap_Parallel.svg + icons/Draft_Snap_Perpendicular.svg + icons/Draft_Snap_Special.svg + icons/Draft_Snap_WorkingPlane.svg icons/Draft_Split.svg icons/Draft_Stretch.svg icons/Draft_SubelementHighlight.svg @@ -91,23 +108,6 @@ icons/Draft_WireToBSpline.svg icons/DraftWorkbench.svg icons/preferences-draft.svg - icons/Snap_Angle.svg - icons/Snap_Center.svg - icons/Snap_Dimensions.svg - icons/Snap_Endpoint.svg - icons/Snap_Extension.svg - icons/Snap_Grid.svg - icons/Snap_Intersection.svg - icons/Snap_Lock.svg - icons/Snap_Midpoint.svg - icons/Snap_Near.svg - icons/Snap_Ortho.svg - icons/Snap_Parallel.svg - icons/Snap_Perpendicular.svg - icons/Snap_Special.svg - icons/Snap_WorkingPlane.svg - icons/Draft_NewLayer.svg - icons/Draft_Hatch.svg patterns/aluminium.svg patterns/brick01.svg patterns/concrete.svg @@ -190,4 +190,4 @@ ui/TaskPanel_SetStyle.ui ui/dialogHatch.ui - + diff --git a/src/Mod/Draft/Resources/icons/Snap_Angle.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Angle.svg similarity index 99% rename from src/Mod/Draft/Resources/icons/Snap_Angle.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Angle.svg index 7174231d7b..0db033bfcd 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Angle.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Angle.svg @@ -528,7 +528,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Angle.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Angle.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Center.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Center.svg similarity index 98% rename from src/Mod/Draft/Resources/icons/Snap_Center.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Center.svg index a394ec45c0..3180394974 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Center.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Center.svg @@ -161,7 +161,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Center.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Center.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Dimensions.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Dimensions.svg similarity index 99% rename from src/Mod/Draft/Resources/icons/Snap_Dimensions.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Dimensions.svg index 89e7429135..be6ed59238 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Dimensions.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Dimensions.svg @@ -329,7 +329,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Dimensions.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Dimensions.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Endpoint.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Endpoint.svg similarity index 98% rename from src/Mod/Draft/Resources/icons/Snap_Endpoint.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Endpoint.svg index 72b52f96c8..9866fda523 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Endpoint.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Endpoint.svg @@ -115,7 +115,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Endpoint.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Endpoint.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Extension.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Extension.svg similarity index 99% rename from src/Mod/Draft/Resources/icons/Snap_Extension.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Extension.svg index 6c5c48484b..a12324dcc5 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Extension.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Extension.svg @@ -399,7 +399,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Extension.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Extension.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Grid.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Grid.svg similarity index 98% rename from src/Mod/Draft/Resources/icons/Snap_Grid.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Grid.svg index 7f440e698c..b40c06c454 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Grid.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Grid.svg @@ -170,7 +170,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Grid.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Grid.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Intersection.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Intersection.svg similarity index 97% rename from src/Mod/Draft/Resources/icons/Snap_Intersection.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Intersection.svg index ee68de1cfe..10b698c8f3 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Intersection.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Intersection.svg @@ -127,7 +127,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Intersection.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Intersection.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Lock.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Lock.svg similarity index 98% rename from src/Mod/Draft/Resources/icons/Snap_Lock.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Lock.svg index 557cfef70b..baa8000eda 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Lock.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Lock.svg @@ -171,7 +171,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Lock.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Lock.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Midpoint.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Midpoint.svg similarity index 98% rename from src/Mod/Draft/Resources/icons/Snap_Midpoint.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Midpoint.svg index 3156291c7e..b301929c43 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Midpoint.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Midpoint.svg @@ -126,7 +126,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Midpoint.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Midpoint.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Near.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Near.svg similarity index 98% rename from src/Mod/Draft/Resources/icons/Snap_Near.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Near.svg index 1a4bf6cece..f4572c545a 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Near.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Near.svg @@ -126,7 +126,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Near.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Near.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Ortho.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Ortho.svg similarity index 98% rename from src/Mod/Draft/Resources/icons/Snap_Ortho.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Ortho.svg index dbf9c2ef60..545bee6d06 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Ortho.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Ortho.svg @@ -222,7 +222,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Ortho.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Ortho.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Parallel.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Parallel.svg similarity index 98% rename from src/Mod/Draft/Resources/icons/Snap_Parallel.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Parallel.svg index 115852cfc8..4e089feb3c 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Parallel.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Parallel.svg @@ -150,7 +150,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Parallel.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Parallel.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Perpendicular.svg similarity index 97% rename from src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Perpendicular.svg index cb96b0e358..c3c94e18d4 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Perpendicular.svg @@ -95,7 +95,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Perpendicular.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_Special.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_Special.svg similarity index 98% rename from src/Mod/Draft/Resources/icons/Snap_Special.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_Special.svg index 9aeb411fe7..77bf519ecd 100644 --- a/src/Mod/Draft/Resources/icons/Snap_Special.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_Special.svg @@ -160,7 +160,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_Special.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_Special.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg b/src/Mod/Draft/Resources/icons/Draft_Snap_WorkingPlane.svg similarity index 98% rename from src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg rename to src/Mod/Draft/Resources/icons/Draft_Snap_WorkingPlane.svg index db2d87b251..93ab95072b 100644 --- a/src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg +++ b/src/Mod/Draft/Resources/icons/Draft_Snap_WorkingPlane.svg @@ -153,7 +153,7 @@ FreeCAD - FreeCAD/src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg + FreeCAD/src/Mod/Draft/Resources/icons/Draft_Snap_WorkingPlane.svg http://www.freecadweb.org/wiki/index.php?title=Artwork diff --git a/src/Mod/Draft/draftguitools/gui_snapper.py b/src/Mod/Draft/draftguitools/gui_snapper.py index 2960f24f9e..de27eaa534 100644 --- a/src/Mod/Draft/draftguitools/gui_snapper.py +++ b/src/Mod/Draft/draftguitools/gui_snapper.py @@ -175,18 +175,18 @@ class Snapper: ('special', 'dot')]) self.cursors = \ - coll.OrderedDict([('passive', ':/icons/Snap_Near.svg'), - ('extension', ':/icons/Snap_Extension.svg'), - ('parallel', ':/icons/Snap_Parallel.svg'), - ('grid', ':/icons/Snap_Grid.svg'), - ('endpoint', ':/icons/Snap_Endpoint.svg'), - ('midpoint', ':/icons/Snap_Midpoint.svg'), - ('perpendicular', ':/icons/Snap_Perpendicular.svg'), - ('angle', ':/icons/Snap_Angle.svg'), - ('center', ':/icons/Snap_Center.svg'), - ('ortho', ':/icons/Snap_Ortho.svg'), - ('intersection', ':/icons/Snap_Intersection.svg'), - ('special', ':/icons/Snap_Special.svg')]) + coll.OrderedDict([('passive', ':/icons/Draft_Snap_Near.svg'), + ('extension', ':/icons/Draft_Snap_Extension.svg'), + ('parallel', ':/icons/Draft_Snap_Parallel.svg'), + ('grid', ':/icons/Draft_Snap_Grid.svg'), + ('endpoint', ':/icons/Draft_Snap_Endpoint.svg'), + ('midpoint', ':/icons/Draft_Snap_Midpoint.svg'), + ('perpendicular', ':/icons/Draft_Snap_Perpendicular.svg'), + ('angle', ':/icons/Draft_Snap_Angle.svg'), + ('center', ':/icons/Draft_Snap_Center.svg'), + ('ortho', ':/icons/Draft_Snap_Ortho.svg'), + ('intersection', ':/icons/Draft_Snap_Intersection.svg'), + ('special', ':/icons/Draft_Snap_Special.svg')]) def init_active_snaps(self): diff --git a/src/Mod/Draft/draftguitools/gui_snaps.py b/src/Mod/Draft/draftguitools/gui_snaps.py index 561f9df7d1..a5b6182189 100644 --- a/src/Mod/Draft/draftguitools/gui_snaps.py +++ b/src/Mod/Draft/draftguitools/gui_snaps.py @@ -43,30 +43,25 @@ from draftutils.translate import translate class Draft_Snap_Base(): """Base Class inherited by all Draft Snap commands.""" - def __init__(self, command_name="None"): - self.command_name = command_name - def Activated(self, status=0): - # _log("GuiCommand: {}".format(self.command_name)) + # _log("GuiCommand: {}".format(self.__class__.__name__)) + if hasattr(Gui, "Snapper"): - Gui.Snapper.toggle_snap(self.command_name[11:], bool(status)) + Gui.Snapper.toggle_snap(self.__class__.__name__[11:], bool(status)) def IsActive(self): return hasattr(Gui, "Snapper") and Gui.Snapper.isEnabled("Lock") def isChecked(self): """Return true if the given snap is active in Snapper.""" - return hasattr(Gui, "Snapper") and self.command_name[11:] in Gui.Snapper.active_snaps + return hasattr(Gui, "Snapper") and self.__class__.__name__[11:] in Gui.Snapper.active_snaps class Draft_Snap_Lock(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Lock tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Lock") - def GetResources(self): - return {"Pixmap": "Snap_Lock", + return {"Pixmap": "Draft_Snap_Lock", "Accel": "Shift+S", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Lock", "Snap Lock"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Lock", "Enables or disables snapping globally."), @@ -82,11 +77,8 @@ Gui.addCommand("Draft_Snap_Lock", Draft_Snap_Lock()) class Draft_Snap_Midpoint(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Midpoint tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Midpoint") - def GetResources(self): - return {"Pixmap": "Snap_Midpoint", + return {"Pixmap": "Draft_Snap_Midpoint", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Midpoint", "Snap Midpoint"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Midpoint", "Snaps to the midpoint of edges."), "CmdType": "NoTransaction", @@ -99,11 +91,8 @@ Gui.addCommand("Draft_Snap_Midpoint", Draft_Snap_Midpoint()) class Draft_Snap_Perpendicular(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Perpendicular tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Perpendicular") - def GetResources(self): - return {"Pixmap": "Snap_Perpendicular", + return {"Pixmap": "Draft_Snap_Perpendicular", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Perpendicular", "Snap Perpendicular"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Perpendicular", "Snaps to the perpendicular points on faces and edges."), "CmdType": "NoTransaction", @@ -116,11 +105,8 @@ Gui.addCommand("Draft_Snap_Perpendicular", Draft_Snap_Perpendicular()) class Draft_Snap_Grid(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Grid tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Grid") - def GetResources(self): - return {"Pixmap": "Snap_Grid", + return {"Pixmap": "Draft_Snap_Grid", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Grid", "Snap Grid"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Grid", "Snaps to the intersections of grid lines."), "CmdType": "NoTransaction", @@ -133,11 +119,8 @@ Gui.addCommand("Draft_Snap_Grid", Draft_Snap_Grid()) class Draft_Snap_Intersection(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Intersection tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Intersection") - def GetResources(self): - return {"Pixmap": "Snap_Intersection", + return {"Pixmap": "Draft_Snap_Intersection", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Intersection", "Snap Intersection"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Intersection", "Snaps to the intersection of two edges."), "CmdType": "NoTransaction", @@ -150,11 +133,8 @@ Gui.addCommand("Draft_Snap_Intersection", Draft_Snap_Intersection()) class Draft_Snap_Parallel(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Parallel tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Parallel") - def GetResources(self): - return {"Pixmap": "Snap_Parallel", + return {"Pixmap": "Draft_Snap_Parallel", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Parallel", "Snap Parallel"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Parallel", "Snaps to an imaginary line parallel to straight edges."), "CmdType": "NoTransaction", @@ -167,11 +147,8 @@ Gui.addCommand("Draft_Snap_Parallel", Draft_Snap_Parallel()) class Draft_Snap_Endpoint(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Endpoint tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Endpoint") - def GetResources(self): - return {"Pixmap": "Snap_Endpoint", + return {"Pixmap": "Draft_Snap_Endpoint", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Endpoint", "Snap Endpoint"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Endpoint", "Snaps to the endpoints of edges."), "CmdType": "NoTransaction", @@ -184,11 +161,8 @@ Gui.addCommand("Draft_Snap_Endpoint", Draft_Snap_Endpoint()) class Draft_Snap_Angle(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Angle tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Angle") - def GetResources(self): - return {"Pixmap": "Snap_Angle", + return {"Pixmap": "Draft_Snap_Angle", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Angle", "Snap Angle"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Angle", "Snaps to the special cardinal points on circular edges, at multiples of 30° and 45°."), "CmdType": "NoTransaction", @@ -201,11 +175,8 @@ Gui.addCommand("Draft_Snap_Angle", Draft_Snap_Angle()) class Draft_Snap_Center(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Center tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Center") - def GetResources(self): - return {"Pixmap": "Snap_Center", + return {"Pixmap": "Draft_Snap_Center", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Center", "Snap Center"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Center", "Snaps to the center point of faces and circular edges, and to the Placement point of Working Plane Proxies and Building Parts."), "CmdType": "NoTransaction", @@ -218,11 +189,8 @@ Gui.addCommand("Draft_Snap_Center", Draft_Snap_Center()) class Draft_Snap_Extension(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Extension tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Extension") - def GetResources(self): - return {"Pixmap": "Snap_Extension", + return {"Pixmap": "Draft_Snap_Extension", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Extension", "Snap Extension"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Extension", "Snaps to an imaginary line that extends beyond the endpoints of straight edges."), "CmdType": "NoTransaction", @@ -235,11 +203,8 @@ Gui.addCommand("Draft_Snap_Extension", Draft_Snap_Extension()) class Draft_Snap_Near(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Near tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Near") - def GetResources(self): - return {"Pixmap": "Snap_Near", + return {"Pixmap": "Draft_Snap_Near", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Near", "Snap Near"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Near", "Snaps to the nearest point on faces and edges."), "CmdType": "NoTransaction", @@ -252,11 +217,8 @@ Gui.addCommand("Draft_Snap_Near", Draft_Snap_Near()) class Draft_Snap_Ortho(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Ortho tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Ortho") - def GetResources(self): - return {"Pixmap": "Snap_Ortho", + return {"Pixmap": "Draft_Snap_Ortho", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Ortho", "Snap Ortho"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Ortho", "Snaps to imaginary lines that cross the previous point at multiples of 45°."), "CmdType": "NoTransaction", @@ -269,11 +231,8 @@ Gui.addCommand("Draft_Snap_Ortho", Draft_Snap_Ortho()) class Draft_Snap_Special(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Special tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Special") - def GetResources(self): - return {"Pixmap": "Snap_Special", + return {"Pixmap": "Draft_Snap_Special", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Special", "Snap Special"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Special", "Snaps to special points defined by the object."), "CmdType": "NoTransaction", @@ -286,11 +245,8 @@ Gui.addCommand("Draft_Snap_Special", Draft_Snap_Special()) class Draft_Snap_Dimensions(Draft_Snap_Base): """GuiCommand for the Draft_Snap_Dimensions tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_Dimensions") - def GetResources(self): - return {"Pixmap": "Snap_Dimensions", + return {"Pixmap": "Draft_Snap_Dimensions", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_Dimensions", "Snap Dimensions"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_Dimensions", "Shows temporary X and Y dimensions."), "CmdType": "NoTransaction", @@ -303,11 +259,8 @@ Gui.addCommand("Draft_Snap_Dimensions", Draft_Snap_Dimensions()) class Draft_Snap_WorkingPlane(Draft_Snap_Base): """GuiCommand for the Draft_Snap_WorkingPlane tool.""" - def __init__(self): - super().__init__(command_name="Draft_Snap_WorkingPlane") - def GetResources(self): - return {"Pixmap": "Snap_WorkingPlane", + return {"Pixmap": "Draft_Snap_WorkingPlane", "MenuText": QT_TRANSLATE_NOOP("Draft_Snap_WorkingPlane", "Snap Working Plane"), "ToolTip": QT_TRANSLATE_NOOP("Draft_Snap_WorkingPlane", "Projects snap points onto the current working plane."), "CmdType": "NoTransaction", @@ -320,9 +273,6 @@ Gui.addCommand("Draft_Snap_WorkingPlane", Draft_Snap_WorkingPlane()) class ShowSnapBar(Draft_Snap_Base): """GuiCommand for the Draft_ShowSnapBar tool.""" - def __init__(self): - super().__init__(command_name="Draft_ShowSnapBar") - def GetResources(self): return {"Pixmap": "Draft_Snap", "MenuText": QT_TRANSLATE_NOOP("Draft_ShowSnapBar", "Show snap toolbar"),