Icon themes support for draft tray and snap

FreeCAD · Feb 18, 2019 · 68e7975 · 68e7975
1 parent 90c80f8
commit 68e7975
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
@@ -418,7 +418,7 @@ def _pushbutton (self,name, layout, hide=True, icon=None, width=66, checkable=Fa
         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,21 +1987,24 @@ def setAutoGroup(self,value=None):
         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:
             obj = FreeCAD.ActiveDocument.getObject(value)
             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
@@ -1253,7 +1253,7 @@ def makeSnapToolBar(self):
         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 @@ def makeSnapToolBar(self):
         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 @@ def makeSnapToolBar(self):
         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 @@ def makeSnapToolBar(self):
         # 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)