suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QToolButton for Draft Snap, not QPushButton

Browse Source
This commit is contained in:
Alexander Gryson 2016-12-04 23:52:23 +01:00 committed by Yorik van Havre
parent 232ad83fe5
commit 5e0357b31e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/Draft/DraftSnap.py
View File

@ -1106,22 +1106,21 @@ class Snapper:
bsize = p.GetInt("ToolbarIconSize",24)+2 bsize = p.GetInt("ToolbarIconSize",24)+2
isize = p.GetInt("ToolbarIconSize",24)/3*2 isize = p.GetInt("ToolbarIconSize",24)/3*2
self.toolbar = QtGui.QToolBar(None) self.toolbar = QtGui.QToolBar(None)
self.toolbar.setIconSize(QtCore.QSize(isize, isize))
self.toolbar.setObjectName("Draft Snap") self.toolbar.setObjectName("Draft Snap")
self.toolbar.setWindowTitle(QtCore.QCoreApplication.translate("Workbench", "Draft Snap")) self.toolbar.setWindowTitle(QtCore.QCoreApplication.translate("Workbench", "Draft Snap"))
self.toolbarButtons = [] self.toolbarButtons = []
# grid button # grid button
gridbutton = QtGui.QPushButton(None) gridbutton = QtGui.QToolButton(None)
gridbutton.setIcon(QtGui.QIcon(":/icons/Draft_Grid.svg")) gridbutton.setIcon(QtGui.QIcon(":/icons/Draft_Grid.svg"))
gridbutton.setIconSize(QtCore.QSize(isize, isize))
gridbutton.setMaximumSize(QtCore.QSize(bsize,bsize)) gridbutton.setMaximumSize(QtCore.QSize(bsize,bsize))
gridbutton.setToolTip(QtCore.QCoreApplication.translate("Draft_ToggleGrid","Toggles the Draft grid on/off")) gridbutton.setToolTip(QtCore.QCoreApplication.translate("Draft_ToggleGrid","Toggles the Draft grid on/off"))
gridbutton.setObjectName("GridButton") gridbutton.setObjectName("GridButton")
QtCore.QObject.connect(gridbutton,QtCore.SIGNAL("clicked()"),self.toggleGrid) QtCore.QObject.connect(gridbutton,QtCore.SIGNAL("clicked()"),self.toggleGrid)
self.toolbar.addWidget(gridbutton) self.toolbar.addWidget(gridbutton)
# master button # master button
self.masterbutton = QtGui.QPushButton(None) self.masterbutton = QtGui.QToolButton(None)
self.masterbutton.setIcon(QtGui.QIcon(":/icons/Snap_Lock.svg")) self.masterbutton.setIcon(QtGui.QIcon(":/icons/Snap_Lock.svg"))
self.masterbutton.setIconSize(QtCore.QSize(isize, isize))
self.masterbutton.setMaximumSize(QtCore.QSize(bsize,bsize)) self.masterbutton.setMaximumSize(QtCore.QSize(bsize,bsize))
self.masterbutton.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_Lock","Toggle On/Off")) self.masterbutton.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_Lock","Toggle On/Off"))
self.masterbutton.setObjectName("SnapButtonMain") self.masterbutton.setObjectName("SnapButtonMain")
@ -1131,9 +1130,8 @@ class Snapper:
self.toolbar.addWidget(self.masterbutton) self.toolbar.addWidget(self.masterbutton)
for c,i in self.cursors.items(): for c,i in self.cursors.items():
if i: if i:
b = QtGui.QPushButton(None) b = QtGui.QToolButton(None)
b.setIcon(QtGui.QIcon(i)) b.setIcon(QtGui.QIcon(i))
b.setIconSize(QtCore.QSize(isize, isize))
b.setMaximumSize(QtCore.QSize(bsize,bsize)) b.setMaximumSize(QtCore.QSize(bsize,bsize))
if c == "passive": if c == "passive":
b.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_Near","Nearest")) b.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_Near","Nearest"))
@ -1147,9 +1145,8 @@ class Snapper:
QtCore.QObject.connect(b,QtCore.SIGNAL("toggled(bool)"),self.saveSnapModes) QtCore.QObject.connect(b,QtCore.SIGNAL("toggled(bool)"),self.saveSnapModes)
# adding non-snap button # adding non-snap button
for n in ["Dimensions","WorkingPlane"]: for n in ["Dimensions","WorkingPlane"]:
b = QtGui.QPushButton(None) b = QtGui.QToolButton(None)
b.setIcon(QtGui.QIcon(":/icons/Snap_"+n+".svg")) b.setIcon(QtGui.QIcon(":/icons/Snap_"+n+".svg"))
b.setIconSize(QtCore.QSize(isize, isize))
b.setMaximumSize(QtCore.QSize(bsize,bsize)) b.setMaximumSize(QtCore.QSize(bsize,bsize))
b.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_"+n,n)) b.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_"+n,n))
b.setObjectName("SnapButton"+n) b.setObjectName("SnapButton"+n)