linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge resource files

Browse Source 
- 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>
This commit is contained in:
Alexander Zaft
2023-03-07 08:28:37 +01:00
parent e820e1a822
commit 1b38a989d8
27 changed files with 13682 additions and 13703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frappy/gui/qt.py
View File

@@ -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