From c19efe08421763291f752d7426a4670e28f662a1 Mon Sep 17 00:00:00 2001
From: Uwe <donovaly@users.noreply.github.com>
Date: Sun, 19 Feb 2023 00:00:03 +0100
Subject: [PATCH] [Material] fix bugs with missing icons

- at the moment you get several warnings about missing icons when starting the Material editor
  The reason is that they are not registered in CMake

- also remove icon from Material icon editor. As it is a child of FreeCAD it should have the same FreeCAD icon as all other FreeCAD widgets.

- also fix warning about too short variable name
---
 src/Mod/Material/CMakeLists.txt    | 15 ++++++++++++++-
 src/Mod/Material/MaterialEditor.py | 27 ++++++++++++---------------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/Mod/Material/CMakeLists.txt b/src/Mod/Material/CMakeLists.txt
index 78cc71a895..890cb645bb 100644
--- a/src/Mod/Material/CMakeLists.txt
+++ b/src/Mod/Material/CMakeLists.txt
@@ -17,6 +17,10 @@ SET (MaterialTools_Files
     materialtools/__init__.py
     materialtools/cardutils.py
 )
+SET (Material_Icon_Files
+    Resources/icons/preview-rendered.svg
+    Resources/icons/preview-vector.svg
+)
 
 # collect all the material cards:
 #FILE( GLOB MaterialLib_Files ./StandardMaterial/*.FCMat ./StandardMaterial/*.txt  )
@@ -169,13 +173,22 @@ ADD_CUSTOM_TARGET(MaterialToolsLib ALL
     SOURCES ${MaterialTools_Files}
 )
 
+ADD_CUSTOM_TARGET(MaterialIconsLib ALL
+    SOURCES ${Material_Icon_Files}
+)
+
 fc_target_copy_resource(MaterialToolsLib
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}/Mod/Material
     ${MaterialTools_Files})
+    
+fc_target_copy_resource(MaterialIconsLib
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/Mod/Material
+    ${Material_Icon_Files})
 
 INSTALL(FILES ${MaterialTools_Files} DESTINATION Mod/Material/materialtools)
-
+INSTALL(FILES ${Material_Icon_Files} DESTINATION Mod/Material/Resources/icons)
 
 IF (BUILD_GUI)
     fc_target_copy_resource(Material
diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py
index e677af962c..ac91203369 100644
--- a/src/Mod/Material/MaterialEditor.py
+++ b/src/Mod/Material/MaterialEditor.py
@@ -55,13 +55,11 @@ class MaterialEditor:
         self.cards = {}
         self.icons = {}
         self.card_path = card_path
+        filePath = os.path.dirname(__file__) + os.sep
+        self.iconPath = (filePath + "Resources" + os.sep + "Icons" + os.sep)
 
         # load the UI file from the same directory as this script
-        self.widget = FreeCADGui.PySideUic.loadUi(
-            os.path.dirname(__file__) + os.sep + "materials-editor.ui"
-        )
-
-        self.widget.setWindowIcon(QtGui.QIcon(":/icons/preview-rendered.svg"))
+        self.widget = FreeCADGui.PySideUic.loadUi(filePath + "materials-editor.ui")      
 
         # restore size and position
         p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Material")
@@ -81,11 +79,11 @@ class MaterialEditor:
         treeView = widget.treeView
 
         # create preview svg slots
-        self.widget.PreviewRender = QtSvg.QSvgWidget(":/icons/preview-rendered.svg")
+        self.widget.PreviewRender = QtSvg.QSvgWidget(self.iconPath + "preview-rendered.svg")
         self.widget.PreviewRender.setMaximumWidth(64)
         self.widget.PreviewRender.setMinimumHeight(64)
         self.widget.topLayout.addWidget(self.widget.PreviewRender)
-        self.widget.PreviewVector = QtSvg.QSvgWidget(":/icons/preview-vector.svg")
+        self.widget.PreviewVector = QtSvg.QSvgWidget(self.iconPath + "preview-vector.svg")
         self.widget.PreviewVector.setMaximumWidth(64)
         self.widget.PreviewVector.setMinimumHeight(64)
         self.widget.topLayout.addWidget(self.widget.PreviewVector)
@@ -118,14 +116,14 @@ class MaterialEditor:
         self.implementModel()
 
         # update the editor with the contents of the property, if we have one
-        d = None
+        matProperty = None
         if self.prop and self.obj:
-            d = FreeCAD.ActiveDocument.getObject(self.obj).getPropertyByName(self.prop)
+            matProperty = FreeCAD.ActiveDocument.getObject(self.obj).getPropertyByName(self.prop)
         elif self.material:
-            d = self.material
+            matProperty = self.material
 
-        if d:
-            self.updateMatParamsInTree(d)
+        if matProperty:
+            self.updateMatParamsInTree(matProperty)
             self.widget.ComboMaterial.setCurrentIndex(0)
             # set after tree params to the none material
 
@@ -218,7 +216,6 @@ class MaterialEditor:
             self.customprops.append(k)
 
     def chooseMaterial(self, index):
-
         if index < 0:
             return
         self.card_path = self.widget.ComboMaterial.itemData(index)
@@ -473,7 +470,7 @@ class MaterialEditor:
         if "SectionColor" in mat:
             sectioncol = mat["SectionColor"]
         if diffcol or highlightcol:
-            fd = QtCore.QFile(":/icons/preview-rendered.svg")
+            fd = QtCore.QFile(self.iconPath + "preview-rendered.svg")
             if fd.open(QtCore.QIODevice.ReadOnly | QtCore.QIODevice.Text):
                 svg = QtCore.QTextStream(fd).readAll()
                 fd.close()
@@ -484,7 +481,7 @@ class MaterialEditor:
                     svg = svg.replace("#fffffe", self.getColorHash(highlightcol, val=255))
                 self.widget.PreviewRender.load(QtCore.QByteArray(bytes(svg, encoding="utf8")))
         if diffcol or sectioncol:
-            fd = QtCore.QFile(":/icons/preview-vector.svg")
+            fd = QtCore.QFile(self.iconPath + "preview-vector.svg")
             if fd.open(QtCore.QIODevice.ReadOnly | QtCore.QIODevice.Text):
                 svg = QtCore.QTextStream(fd).readAll()
                 fd.close()