From 706be3fbd7dea2e6cf05caae84cb43c2b9b25234 Mon Sep 17 00:00:00 2001 From: triplus Date: Thu, 11 Jan 2018 09:39:10 +0100 Subject: [PATCH] Reusability of snap toolbar commands - Improved reusability of snap toolbar commands. - Ability to change draft snap toolbar icon size from preferences. Without the need to restart FreeCAD after. --- src/Mod/Draft/DraftSnap.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Mod/Draft/DraftSnap.py b/src/Mod/Draft/DraftSnap.py index ecafe60196..08c198c528 100644 --- a/src/Mod/Draft/DraftSnap.py +++ b/src/Mod/Draft/DraftSnap.py @@ -1177,12 +1177,14 @@ class Snapper: def makeSnapToolBar(self): "builds the Snap toolbar" - self.toolbar = QtGui.QToolBar(None) + mw = FreeCADGui.getMainWindow() + self.toolbar = QtGui.QToolBar(mw) + mw.addToolBar(QtCore.Qt.TopToolBarArea, self.toolbar) self.toolbar.setObjectName("Draft Snap") self.toolbar.setWindowTitle(QtCore.QCoreApplication.translate("Workbench", "Draft Snap")) self.toolbarButtons = [] # grid button - self.gridbutton = QtGui.QAction(None) + self.gridbutton = QtGui.QAction(mw) self.gridbutton.setIcon(QtGui.QIcon(":/icons/Draft_Grid.svg")) self.gridbutton.setText(QtCore.QCoreApplication.translate("Draft_ToggleGrid","Grid")) self.gridbutton.setToolTip(QtCore.QCoreApplication.translate("Draft_ToggleGrid","Toggles the Draft grid On/Off")) @@ -1191,7 +1193,7 @@ class Snapper: QtCore.QObject.connect(self.gridbutton,QtCore.SIGNAL("triggered()"),self.toggleGrid) self.toolbar.addAction(self.gridbutton) # master button - self.masterbutton = QtGui.QAction(None) + self.masterbutton = QtGui.QAction(mw) self.masterbutton.setIcon(QtGui.QIcon(":/icons/Snap_Lock.svg")) self.masterbutton.setText(QtCore.QCoreApplication.translate("Draft_Snap_Lock","Lock")) self.masterbutton.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_Lock","Toggle On/Off")) @@ -1203,7 +1205,7 @@ class Snapper: self.toolbar.addAction(self.masterbutton) for c,i in self.cursors.items(): if i: - b = QtGui.QAction(None) + b = QtGui.QAction(mw) b.setIcon(QtGui.QIcon(i)) if c == "passive": b.setText(QtCore.QCoreApplication.translate("Draft_Snap_Near","Nearest")) @@ -1220,7 +1222,7 @@ class Snapper: QtCore.QObject.connect(b,QtCore.SIGNAL("toggled(bool)"),self.saveSnapModes) # adding non-snap button for n in ["Dimensions","WorkingPlane"]: - b = QtGui.QAction(None) + b = QtGui.QAction(mw) b.setIcon(QtGui.QIcon(":/icons/Snap_"+n+".svg")) b.setText(QtCore.QCoreApplication.translate("Draft_Snap_"+n,n)) b.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_"+n,n))