kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Icon themes support for draft tray and snap

Browse Source
This commit is contained in:
triplus
2019-02-17 23:44:20 +01:00
committed by Yorik van Havre
parent 5d8cd9dba4
commit 062206bee2
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -418,7 +418,7 @@ class DraftToolBar:
if hide:
button.hide()
if icon:
button.setIcon(QtGui.QIcon(':/icons/'+icon+'.svg'))
button.setIcon(QtGui.QIcon.fromTheme(icon, QtGui.QIcon(':/icons/'+icon+'.svg')))
button.setIconSize(QtCore.QSize(isize, isize))
if checkable:
button.setCheckable(True)
@@ -1987,7 +1987,8 @@ class DraftToolBar:
if value == None:
self.autogroup = None
self.autoGroupButton.setText("None")
self.autoGroupButton.setIcon(QtGui.QIcon(':/icons/Draft_AutoGroup_off.svg'))
self.autoGroupButton.setIcon(QtGui.QIcon.fromTheme('Draft_AutoGroup_off',
QtGui.QIcon(':/icons/Draft_AutoGroup_off.svg')))
self.autoGroupButton.setToolTip(translate("draft", "Autogroup off"))
self.autoGroupButton.setDown(False)
else:
@@ -1995,13 +1996,15 @@ class DraftToolBar:
if obj:
self.autogroup = value
self.autoGroupButton.setText(obj.Label)
self.autoGroupButton.setIcon(QtGui.QIcon(':/icons/Draft_AutoGroup_on.svg'))
self.autoGroupButton.setIcon(QtGui.QIcon.fromTheme('Draft_AutoGroup_on',
QtGui.QIcon(':/icons/Draft_AutoGroup_on.svg')))
self.autoGroupButton.setToolTip(translate("draft", "Autogroup: ")+obj.Label)
self.autoGroupButton.setDown(False)
else:
self.autogroup = None
self.autoGroupButton.setText("None")
self.autoGroupButton.setIcon(QtGui.QIcon(':/icons/Draft_AutoGroup_off.svg'))
self.autoGroupButton.setIcon(QtGui.QIcon.fromTheme('Draft_AutoGroup_off',
QtGui.QIcon(':/icons/Draft_AutoGroup_off.svg')))
self.autoGroupButton.setToolTip(translate("draft", "Autogroup off"))
self.autoGroupButton.setDown(False)

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

@@ -1253,7 +1253,7 @@ class Snapper:
self.toolbarButtons = []
# grid button
self.gridbutton = QtGui.QAction(mw)
self.gridbutton.setIcon(QtGui.QIcon(":/icons/Draft_Grid.svg"))
self.gridbutton.setIcon(QtGui.QIcon.fromTheme("Draft_Grid", 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"))
self.gridbutton.setObjectName("GridButton")
@@ -1262,7 +1262,7 @@ class Snapper:
self.toolbar.addAction(self.gridbutton)
# master button
self.masterbutton = QtGui.QAction(mw)
self.masterbutton.setIcon(QtGui.QIcon(":/icons/Snap_Lock.svg"))
self.masterbutton.setIcon(QtGui.QIcon.fromTheme("Snap_Lock", 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"))
self.masterbutton.setObjectName("SnapButtonMain")
@@ -1274,7 +1274,7 @@ class Snapper:
for c,i in self.cursors.items():
if i:
b = QtGui.QAction(mw)
b.setIcon(QtGui.QIcon(i))
b.setIcon(QtGui.QIcon.fromTheme(i.replace(':/icons/', '').replace('.svg', ''), QtGui.QIcon(i)))
if c == "passive":
b.setText(QtCore.QCoreApplication.translate("Draft_Snap_Near","Nearest"))
b.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_Near","Nearest"))
@@ -1291,7 +1291,7 @@ class Snapper:
# adding non-snap button
for n in ["Dimensions","WorkingPlane"]:
b = QtGui.QAction(mw)
b.setIcon(QtGui.QIcon(":/icons/Snap_"+n+".svg"))
b.setIcon(QtGui.QIcon.fromTheme("Snap_" + n, QtGui.QIcon(":/icons/Snap_"+n+".svg")))
b.setText(QtCore.QCoreApplication.translate("Draft_Snap_"+n,n))
b.setToolTip(QtCore.QCoreApplication.translate("Draft_Snap_"+n,n))
b.setObjectName("SnapButton"+n)