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

Draft: adapt icon sizes from preferences settings - fixes #1783

Browse Source
This commit is contained in:
Yorik van Havre 2014-12-31 21:23:24 -02:00
parent 845849fa91
commit 2680395ede
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Mod/Draft/DraftGui.py
View File

@ -276,14 +276,17 @@ class DraftToolBar:
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
def _pushbutton (self,name, layout, hide=True, icon=None, width=66, checkable=False): def _pushbutton (self,name, layout, hide=True, icon=None, width=66, checkable=False):
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General")
bsize = p.GetInt("ToolbarIconSize",24)+2
isize = p.GetInt("ToolbarIconSize",24)/3*2
button = QtGui.QPushButton(self.baseWidget) button = QtGui.QPushButton(self.baseWidget)
button.setObjectName(name) button.setObjectName(name)
button.setMaximumSize(QtCore.QSize(width,26)) button.setMaximumSize(QtCore.QSize(width,bsize))
if hide: if hide:
button.hide() button.hide()
if icon: if icon:
button.setIcon(QtGui.QIcon(':/icons/'+icon+'.svg')) button.setIcon(QtGui.QIcon(':/icons/'+icon+'.svg'))
button.setIconSize(QtCore.QSize(16, 16)) button.setIconSize(QtCore.QSize(isize, isize))
if checkable: if checkable:
button.setCheckable(True) button.setCheckable(True)
button.setChecked(False) button.setChecked(False)
@ -298,20 +301,24 @@ class DraftToolBar:
return label return label
def _lineedit (self,name, layout, hide=True, width=None): def _lineedit (self,name, layout, hide=True, width=None):
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General")
bsize = p.GetInt("ToolbarIconSize",24)-2
lineedit = DraftLineEdit(self.baseWidget) lineedit = DraftLineEdit(self.baseWidget)
lineedit.setObjectName(name) lineedit.setObjectName(name)
if hide: lineedit.hide() if hide: lineedit.hide()
if not width: width = 800 if not width: width = 800
lineedit.setMaximumSize(QtCore.QSize(width,22)) lineedit.setMaximumSize(QtCore.QSize(width,bsize))
layout.addWidget(lineedit) layout.addWidget(lineedit)
return lineedit return lineedit
def _inputfield (self,name, layout, hide=True, width=None): def _inputfield (self,name, layout, hide=True, width=None):
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General")
bsize = p.GetInt("ToolbarIconSize",24)-2
inputfield = self.uiloader.createWidget("Gui::InputField") inputfield = self.uiloader.createWidget("Gui::InputField")
inputfield.setObjectName(name) inputfield.setObjectName(name)
if hide: inputfield.hide() if hide: inputfield.hide()
if not width: width = 800 if not width: width = 800
inputfield.setMaximumSize(QtCore.QSize(width,22)) inputfield.setMaximumSize(QtCore.QSize(width,bsize))
layout.addWidget(inputfield) layout.addWidget(inputfield)
return inputfield return inputfield

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

@ -1067,14 +1067,17 @@ class Snapper:
def makeSnapToolBar(self): def makeSnapToolBar(self):
"builds the Snap toolbar" "builds the Snap toolbar"
p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/General")
bsize = p.GetInt("ToolbarIconSize",24)+2
isize = p.GetInt("ToolbarIconSize",24)/3*2
self.toolbar = QtGui.QToolBar(None) self.toolbar = QtGui.QToolBar(None)
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 = []
self.masterbutton = QtGui.QPushButton(None) self.masterbutton = QtGui.QPushButton(None)
self.masterbutton.setIcon(QtGui.QIcon(":/icons/Snap_Lock.svg")) self.masterbutton.setIcon(QtGui.QIcon(":/icons/Snap_Lock.svg"))
self.masterbutton.setIconSize(QtCore.QSize(16, 16)) self.masterbutton.setIconSize(QtCore.QSize(isize, isize))
self.masterbutton.setMaximumSize(QtCore.QSize(26,26)) self.masterbutton.setMaximumSize(QtCore.QSize(bsize,bsize))
self.masterbutton.setToolTip("Snap On/Off") self.masterbutton.setToolTip("Snap On/Off")
self.masterbutton.setObjectName("SnapButtonMain") self.masterbutton.setObjectName("SnapButtonMain")
self.masterbutton.setCheckable(True) self.masterbutton.setCheckable(True)
@ -1085,8 +1088,8 @@ class Snapper:
if i: if i:
b = QtGui.QPushButton(None) b = QtGui.QPushButton(None)
b.setIcon(QtGui.QIcon(i)) b.setIcon(QtGui.QIcon(i))
b.setIconSize(QtCore.QSize(16, 16)) b.setIconSize(QtCore.QSize(isize, isize))
b.setMaximumSize(QtCore.QSize(26,26)) b.setMaximumSize(QtCore.QSize(bsize,bsize))
b.setToolTip(c) b.setToolTip(c)
b.setObjectName("SnapButton"+c) b.setObjectName("SnapButton"+c)
b.setCheckable(True) b.setCheckable(True)
@ -1098,8 +1101,8 @@ class Snapper:
for n in ["Dimensions","WorkingPlane"]: for n in ["Dimensions","WorkingPlane"]:
b = QtGui.QPushButton(None) b = QtGui.QPushButton(None)
b.setIcon(QtGui.QIcon(":/icons/Snap_"+n+".svg")) b.setIcon(QtGui.QIcon(":/icons/Snap_"+n+".svg"))
b.setIconSize(QtCore.QSize(16, 16)) b.setIconSize(QtCore.QSize(isize, isize))
b.setMaximumSize(QtCore.QSize(26,26)) b.setMaximumSize(QtCore.QSize(bsize,bsize))
b.setToolTip(n) b.setToolTip(n)
b.setObjectName("SnapButton"+n) b.setObjectName("SnapButton"+n)
b.setCheckable(True) b.setCheckable(True)