From 68e79751575fecd6cb0ad17bd00e636a7ac09345 Mon Sep 17 00:00:00 2001 From: triplus Date: Sun, 17 Feb 2019 23:44:20 +0100 Subject: [PATCH] Icon themes support for draft tray and snap --- src/Mod/Draft/DraftGui.py | 11 +++++++---- src/Mod/Draft/DraftSnap.py | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py index f3e1caf67d..1579033455 100644 --- a/src/Mod/Draft/DraftGui.py +++ b/src/Mod/Draft/DraftGui.py @@ -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) diff --git a/src/Mod/Draft/DraftSnap.py b/src/Mod/Draft/DraftSnap.py index f963671bfc..d2b9b6755d 100644 --- a/src/Mod/Draft/DraftSnap.py +++ b/src/Mod/Draft/DraftSnap.py @@ -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)