From 08f031d6cad7fab0ee43f094e10c06b6a0c4d845 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Thu, 18 Jul 2013 16:04:34 -0300 Subject: [PATCH] Draft: Small interface cleanup --- src/Mod/Arch/InitGui.py | 6 ++++-- src/Mod/Draft/DraftTools.py | 18 ++---------------- src/Mod/Draft/InitGui.py | 6 ++++-- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py index 4cf4ece7a..b0b18e9ba 100644 --- a/src/Mod/Arch/InitGui.py +++ b/src/Mod/Arch/InitGui.py @@ -87,11 +87,12 @@ class ArchWorkbench(Workbench): "Draft_Trimex", "Draft_Upgrade", "Draft_Downgrade", "Draft_Scale", "Draft_Drawing","Draft_Edit","Draft_WireToBSpline","Draft_AddPoint", "Draft_DelPoint","Draft_Shape2DView","Draft_Draft2Sketch","Draft_Array", - "Draft_Clone","Draft_Heal"] + "Draft_Clone"] self.draftcontexttools = ["Draft_ApplyStyle","Draft_ToggleDisplayMode","Draft_AddToGroup", - "Draft_SelectGroup","Draft_SelectPlane","Draft_ToggleSnap", + "Draft_SelectGroup","Draft_SelectPlane", "Draft_ShowSnapBar","Draft_ToggleGrid","Draft_UndoLine", "Draft_FinishLine","Draft_CloseLine"] + self.draftutils = ["Draft_Heal"] self.snapList = ['Draft_Snap_Lock','Draft_Snap_Midpoint','Draft_Snap_Perpendicular', 'Draft_Snap_Grid','Draft_Snap_Intersection','Draft_Snap_Parallel', 'Draft_Snap_Endpoint','Draft_Snap_Angle','Draft_Snap_Center', @@ -105,6 +106,7 @@ class ArchWorkbench(Workbench): self.appendMenu(str(translate("arch","&Architecture")),self.archtools) self.appendMenu(str(translate("arch","&Draft")),self.drafttools+self.draftmodtools) self.appendMenu([str(translate("arch","&Draft")),str(translate("arch","Context Tools"))],self.draftcontexttools) + self.appendMenu([str(translate("arch","&Draft")),str(translate("arch","Utilities"))],self.draftutils) self.appendMenu([str(translate("arch","&Draft")),str(translate("arch","Snapping"))],self.snapList) FreeCADGui.addIconPath(":/icons") FreeCADGui.addLanguagePath(":/translations") diff --git a/src/Mod/Draft/DraftTools.py b/src/Mod/Draft/DraftTools.py index fe67b50f9..25b63953f 100644 --- a/src/Mod/Draft/DraftTools.py +++ b/src/Mod/Draft/DraftTools.py @@ -2718,7 +2718,7 @@ class Trimex(Modifier): "trims the actual object" if self.extrudeMode: delta = self.extrude(self.shift,real=True) - print "delta",delta + #print "delta",delta self.doc.openTransaction("Extrude") obj = Draft.extrude(self.obj,delta) self.doc.commitTransaction() @@ -3630,19 +3630,6 @@ class Point: todo.delayCommit(commitlist) FreeCADGui.Snapper.off() -class ToggleSnap(): - "The ToggleSnap FreeCAD command definition" - - def GetResources(self): - return {'Pixmap' : 'Snap_Lock', - 'Accel' : "Shift+S", - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_ToggleSnap", "Toggle snap"), - 'ToolTip' : QtCore.QT_TRANSLATE_NOOP("Draft_ToggleSnap", "Toggles Draft snap on or off")} - - def Activated(self): - if hasattr(FreeCADGui,"Snapper"): - FreeCADGui.Snapper.toggle() - class ShowSnapBar(): "The ShowSnapBar FreeCAD command definition" @@ -3723,12 +3710,12 @@ class Heal(): class Draft_Snap_Lock(): def GetResources(self): return {'Pixmap' : 'Snap_Lock', + 'Accel' : "Shift+S", 'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Snap_Lock", "Toggle On/Off"), 'ToolTip' : QtCore.QT_TRANSLATE_NOOP("Draft_Snap_Lock", "Activates/deactivates all snap tools at once")} def Activated(self): if hasattr(FreeCADGui,"Snapper"): if hasattr(FreeCADGui.Snapper,"masterbutton"): - print FreeCADGui.Snapper.masterbutton FreeCADGui.Snapper.masterbutton.toggle() class Draft_Snap_Midpoint(): @@ -3911,7 +3898,6 @@ FreeCADGui.addCommand('Draft_ToggleDisplayMode',ToggleDisplayMode()) FreeCADGui.addCommand('Draft_AddToGroup',AddToGroup()) FreeCADGui.addCommand('Draft_SelectGroup',SelectGroup()) FreeCADGui.addCommand('Draft_Shape2DView',Shape2DView()) -FreeCADGui.addCommand('Draft_ToggleSnap',ToggleSnap()) FreeCADGui.addCommand('Draft_ShowSnapBar',ShowSnapBar()) FreeCADGui.addCommand('Draft_ToggleGrid',ToggleGrid()) diff --git a/src/Mod/Draft/InitGui.py b/src/Mod/Draft/InitGui.py index a54152db1..544b93f25 100644 --- a/src/Mod/Draft/InitGui.py +++ b/src/Mod/Draft/InitGui.py @@ -112,11 +112,12 @@ class DraftWorkbench (Workbench): "Draft_Trimex", "Draft_Upgrade", "Draft_Downgrade", "Draft_Scale", "Draft_Drawing","Draft_Edit","Draft_WireToBSpline","Draft_AddPoint", "Draft_DelPoint","Draft_Shape2DView","Draft_Draft2Sketch","Draft_Array", - "Draft_Clone","Draft_Heal"] + "Draft_Clone"] self.treecmdList = ["Draft_ApplyStyle","Draft_ToggleDisplayMode","Draft_AddToGroup", - "Draft_SelectGroup","Draft_SelectPlane","Draft_ToggleSnap", + "Draft_SelectGroup","Draft_SelectPlane", "Draft_ShowSnapBar","Draft_ToggleGrid"] self.lineList = ["Draft_UndoLine","Draft_FinishLine","Draft_CloseLine"] + self.utils = ["Draft_Heal"] self.snapList = ['Draft_Snap_Lock','Draft_Snap_Midpoint','Draft_Snap_Perpendicular', 'Draft_Snap_Grid','Draft_Snap_Intersection','Draft_Snap_Parallel', 'Draft_Snap_Endpoint','Draft_Snap_Angle','Draft_Snap_Center', @@ -125,6 +126,7 @@ class DraftWorkbench (Workbench): self.appendToolbar(QT_TRANSLATE_NOOP("Workbench","Draft modification tools"),self.modList) self.appendMenu(str(translate("draft","&Draft")),self.cmdList+self.modList) self.appendMenu([str(translate("draft","&Draft")),str(translate("draft","Context tools"))],self.treecmdList) + self.appendMenu([str(translate("draft","&Draft")),str(translate("draft","Utilities"))],self.utils) self.appendMenu([str(translate("draft","&Draft")),str(translate("draft","Wire tools"))],self.lineList) self.appendMenu([str(translate("draft","&Draft")),str(translate("draft","Snapping"))],self.snapList) if hasattr(FreeCADGui,"draftToolBar"):