Merge resource files

- move config editor files into resources
- merge both qrc files into one

Change-Id: I3089b0e1c7784683964d3e0b6e87c8a5cbd62ad2
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30593
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>

.pylintrc

@@ -9,7 +9,7 @@
 
 # Add <file or directory> to the black list. It should be a base name, not a
 # path. You may set this option multiple times.
-ignore = .git
+ignore = .git,resources_qt5.py,resources_qt6.py
 
 # Pickle collected data for later comparisons.
 persistent=yes

frappy/gui/cfg_editor/ui/icons/cfg-editor.qrc

@@ -1,20 +0,0 @@
-<RCC>
-  <qresource>
-    <file>delete.png</file>
-    <file>duplicate.png</file>
-    <file>add_comment.png</file>
-    <file>add_interface.png</file>
-    <file>add_module.png</file>
-    <file>add_parameter.png</file>
-    <file>add_property.png</file>
-    <file>comment.png</file>
-    <file>interface.png</file>
-    <file>module.png</file>
-    <file>parameter.png</file>
-    <file>property.png</file>
-    <file>edit.png</file>
-    <file>new.png</file>
-    <file>open.png</file>
-    <file>save.png</file>
-  </qresource>
-</RCC>

frappy/gui/cfg_editor/ui/mainwindow.ui

@@ -37,9 +37,9 @@
          <string>New</string>
         </property>
         <property name="icon">
-         <iconset resource="icons/cfg-editor.qrc">
-          <normaloff>:/new.png</normaloff>
-          <normalon>:/new.png</normalon>:/new.png</iconset>
+         <iconset resource="../../../../resources/frappy-gui.qrc">
+          <normaloff>:/cfg_editor/new.png</normaloff>
+          <normalon>:/cfg_editor/new.png</normalon>:/cfg_editor/new.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -70,9 +70,9 @@
          <string>Open</string>
         </property>
         <property name="icon">
-         <iconset resource="icons/cfg-editor.qrc">
-          <normaloff>:/open.png</normaloff>
-          <normalon>:/open.png</normalon>:/open.png</iconset>
+         <iconset resource="../../../../resources/frappy-gui.qrc">
+          <normaloff>:/cfg_editor/open.png</normaloff>
+          <normalon>:/cfg_editor/open.png</normalon>:/cfg_editor/open.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -103,9 +103,9 @@
          <string>Save</string>
         </property>
         <property name="icon">
-         <iconset resource="icons/cfg-editor.qrc">
-          <normaloff>:/save.png</normaloff>
-          <normalon>:/save.png</normalon>:/save.png</iconset>
+         <iconset resource="../../../../resources/frappy-gui.qrc">
+          <normaloff>:/cfg_editor/save.png</normaloff>
+          <normalon>:/cfg_editor/save.png</normalon>:/cfg_editor/save.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -143,9 +143,9 @@
          <string>Add interface</string>
         </property>
         <property name="icon">
-         <iconset resource="icons/cfg-editor.qrc">
-          <normaloff>:/add_interface.png</normaloff>
-          <normalon>:/add_interface.png</normalon>:/add_interface.png</iconset>
+         <iconset resource="../../../../resources/frappy-gui.qrc">
+          <normaloff>:/cfg_editor/add_interface.png</normaloff>
+          <normalon>:/cfg_editor/add_interface.png</normalon>:/cfg_editor/add_interface.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -176,9 +176,9 @@
          <string>Add module</string>
         </property>
         <property name="icon">
-         <iconset resource="icons/cfg-editor.qrc">
-          <normaloff>:/add_module.png</normaloff>
-          <normalon>:/add_module.png</normalon>:/add_module.png</iconset>
+         <iconset resource="../../../../resources/frappy-gui.qrc">
+          <normaloff>:/cfg_editor/add_module.png</normaloff>
+          <normalon>:/cfg_editor/add_module.png</normalon>:/cfg_editor/add_module.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -209,9 +209,9 @@
          <string>Add parameter</string>
         </property>
         <property name="icon">
-         <iconset resource="icons/cfg-editor.qrc">
-          <normaloff>:/add_parameter.png</normaloff>
-          <normalon>:/add_parameter.png</normalon>:/add_parameter.png</iconset>
+         <iconset resource="../../../../resources/frappy-gui.qrc">
+          <normaloff>:/cfg_editor/add_parameter.png</normaloff>
+          <normalon>:/cfg_editor/add_parameter.png</normalon>:/cfg_editor/add_parameter.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -243,7 +243,7 @@
         </property>
         <property name="icon">
          <iconset>
-          <normalon>:/add_property.png</normalon>
+          <normalon>:/cfg_editor/add_property.png</normalon>
          </iconset>
         </property>
         <property name="iconSize">
@@ -275,8 +275,8 @@
          <string>Add comment</string>
         </property>
         <property name="icon">
-         <iconset resource="icons/cfg-editor.qrc">
-          <normaloff>:/add_comment.png</normaloff>:/add_comment.png</iconset>
+         <iconset resource="../../../../resources/frappy-gui.qrc">
+          <normaloff>:/cfg_editor/add_comment.png</normaloff>:/cfg_editor/add_comment.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -322,9 +322,9 @@
          <string>Duplicate</string>
         </property>
         <property name="icon">
-         <iconset resource="icons/cfg-editor.qrc">
-          <normaloff>:/duplicate.png</normaloff>
-          <normalon>:/duplicate.png</normalon>:/duplicate.png</iconset>
+         <iconset resource="../../../../resources/frappy-gui.qrc">
+          <normaloff>:/cfg_editor/duplicate.png</normaloff>
+          <normalon>:/cfg_editor/duplicate.png</normalon>:/cfg_editor/duplicate.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -355,9 +355,9 @@
          <string>Delete</string>
         </property>
         <property name="icon">
-         <iconset resource="icons/cfg-editor.qrc">
-          <normaloff>:/delete.png</normaloff>
-          <normalon>:/delete.png</normalon>:/delete.png</iconset>
+         <iconset resource="../../../../resources/frappy-gui.qrc">
+          <normaloff>:/cfg_editor/delete.png</normaloff>
+          <normalon>:/cfg_editor/delete.png</normalon>:/cfg_editor/delete.png</iconset>
         </property>
         <property name="iconSize">
          <size>
@@ -409,7 +409,7 @@
      <x>0</x>
      <y>0</y>
      <width>977</width>
-     <height>26</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -448,9 +448,9 @@
   <widget class="QStatusBar" name="statusbar"/>
   <action name="actionNew">
    <property name="icon">
-    <iconset resource="icons/cfg-editor.qrc">
-     <normaloff>:/new.png</normaloff>
-     <normalon>:/new.png</normalon>:/new.png</iconset>
+    <iconset resource="../../../../resources/frappy-gui.qrc">
+     <normaloff>:/cfg_editor/new.png</normaloff>
+     <normalon>:/cfg_editor/new.png</normalon>:/cfg_editor/new.png</iconset>
    </property>
    <property name="text">
     <string>&amp;New</string>
@@ -464,9 +464,9 @@
   </action>
   <action name="actionOpen">
    <property name="icon">
-    <iconset resource="icons/cfg-editor.qrc">
-     <normaloff>:/open.png</normaloff>
-     <normalon>:/open.png</normalon>:/open.png</iconset>
+    <iconset resource="../../../../resources/frappy-gui.qrc">
+     <normaloff>:/cfg_editor/open.png</normaloff>
+     <normalon>:/cfg_editor/open.png</normalon>:/cfg_editor/open.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Open ...</string>
@@ -477,9 +477,9 @@
   </action>
   <action name="actionSave">
    <property name="icon">
-    <iconset resource="icons/cfg-editor.qrc">
-     <normaloff>:/save.png</normaloff>
-     <normalon>:/save.png</normalon>:/save.png</iconset>
+    <iconset resource="../../../../resources/frappy-gui.qrc">
+     <normaloff>:/cfg_editor/save.png</normaloff>
+     <normalon>:/cfg_editor/save.png</normalon>:/cfg_editor/save.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Save</string>
@@ -562,7 +562,7 @@
   </action>
  </widget>
  <resources>
-  <include location="icons/cfg-editor.qrc"/>
+  <include location="../../../../resources/frappy-gui.qrc"/>
  </resources>
  <connections>
   <connection>

frappy/gui/cfg_editor/utils.py

@@ -39,8 +39,8 @@ def loadUi(widget, uiname, subdir='ui'):
     uic.loadUi(path.join(uipath, subdir, uiname), widget)
 
 
-def setIcon(widget, icon_name, subdir='ui', icondir='icons'):
-    widget.setIcon(QIcon(path.join(uipath, subdir, icondir, icon_name)))
+def setIcon(widget, icon_name):
+    widget.setIcon(QIcon(':/cfg_editor/%s' % icon_name))
     widget.setIconSize(QSize(60, 60))
 
 
@@ -57,12 +57,12 @@ def set_name_edit_style(invalid, name_edit, button_box=None):
             button_box.button(QDialogButtonBox.StandardButton.Ok).setEnabled(True)
 
 
-def setTreeIcon(widget, icon_name, subdir='ui', icondir='icons'):
-    widget.setIcon(0, QIcon(path.join(uipath, subdir, icondir, icon_name)))
+def setTreeIcon(widget, icon_name):
+    widget.setIcon(0, QIcon(':/cfg_editor/%s' % icon_name))
 
 
-def setActionIcon(widget, icon_name, subdir='ui', icondir='icons'):
-    widget.setIcon(QIcon(path.join(uipath, subdir, icondir, icon_name)))
+def setActionIcon(widget, icon_name):
+    widget.setIcon(QIcon(':/cfg_editor/%s' % icon_name))
 
 
 def get_subtree_nodes(tree_widget_item):

frappy/gui/qt.py

@@ -47,7 +47,6 @@ try:
         QToolButton, QTreeView, QTreeWidget, QTreeWidgetItem, QVBoxLayout, \
         QWidget
 
-    import frappy.gui.cfg_editor.icon_rc_qt6
     import frappy.gui.resources_qt6
 
 except ImportError as e:
@@ -67,5 +66,4 @@ except ImportError as e:
         QTabWidget, QTextEdit, QToolButton, QTreeView, QTreeWidget, \
         QTreeWidgetItem, QVBoxLayout, QWidget
 
-    import frappy.gui.cfg_editor.icon_rc_qt5
     import frappy.gui.resources_qt5

resources/frappy-gui.qrc

@@ -9,6 +9,25 @@
     <file alias="white">leds/simplewhite.png</file>
     <file alias="yellow">leds/simpleyellow.png</file>
   </qresource>
+  <qresource prefix="cfg_editor">
+    <file alias="add_comment.png">cfg_editor/icons/add_comment.png</file>
+    <file alias="add_interface.png">cfg_editor/icons/add_interface.png</file>
+    <file alias="add_module.png">cfg_editor/icons/add_module.png</file>
+    <file alias="add_parameter.png">cfg_editor/icons/add_parameter.png</file>
+    <file alias="add_property.png">cfg_editor/icons/add_property.png</file>
+    <file alias="comment.png">cfg_editor/icons/comment.png</file>
+    <file alias="delete.png">cfg_editor/icons/delete.png</file>
+    <file alias="duplicate.png">cfg_editor/icons/duplicate.png</file>
+    <file alias="edit.png">cfg_editor/icons/edit.png</file>
+    <file alias="empty.png">cfg_editor/icons/empty.png</file>
+    <file alias="interface.png">cfg_editor/icons/interface.png</file>
+    <file alias="module.png">cfg_editor/icons/module.png</file>
+    <file alias="new.png">cfg_editor/icons/new.png</file>
+    <file alias="open.png">cfg_editor/icons/open.png</file>
+    <file alias="parameter.png">cfg_editor/icons/parameter.png</file>
+    <file alias="property.png">cfg_editor/icons/property.png</file>
+    <file alias="save.png">cfg_editor/icons/save.png</file>
+  </qresource>
   <qresource prefix="icons">
     <file alias="stop">icons/cross-circle.png</file>
     <file alias="trash">icons/bin.png</file>