From 09ef7d7baa84cd4334e824ff8a1e472da0c4e6e9 Mon Sep 17 00:00:00 2001
From: Flavio Tarsetti <flavio.tarsetti@idiap.ch>
Date: Wed, 27 Nov 2019 01:00:37 +0100
Subject: [PATCH] [resources/widgets][toolchaineditor] refactored resources
 loading

---
 beat/editor/widgets/toolchaineditor.py              |   8 ++++----
 editor.qrc                                          |   4 ++++
 {beat/editor/widgets => resources}/analyzer.drawio  |   0
 .../analyzer_icon.png => resources/analyzer.png     | Bin
 {beat/editor/widgets => resources}/block.drawio     |   0
 .../widgets/block_icon.png => resources/block.png   | Bin
 {beat/editor/widgets => resources}/dataset.drawio   |   0
 .../dataset_icon.png => resources/dataset.png       | Bin
 {beat/editor/widgets => resources}/loop.drawio      |   0
 .../widgets/loop_icon.png => resources/loop.png     | Bin
 10 files changed, 8 insertions(+), 4 deletions(-)
 rename {beat/editor/widgets => resources}/analyzer.drawio (100%)
 rename beat/editor/widgets/analyzer_icon.png => resources/analyzer.png (100%)
 rename {beat/editor/widgets => resources}/block.drawio (100%)
 rename beat/editor/widgets/block_icon.png => resources/block.png (100%)
 rename {beat/editor/widgets => resources}/dataset.drawio (100%)
 rename beat/editor/widgets/dataset_icon.png => resources/dataset.png (100%)
 rename {beat/editor/widgets => resources}/loop.drawio (100%)
 rename beat/editor/widgets/loop_icon.png => resources/loop.png (100%)

diff --git a/beat/editor/widgets/toolchaineditor.py b/beat/editor/widgets/toolchaineditor.py
index 007f1e9..8ac30a7 100644
--- a/beat/editor/widgets/toolchaineditor.py
+++ b/beat/editor/widgets/toolchaineditor.py
@@ -1435,22 +1435,22 @@ class Toolchain(QWidget):
 
         self.loop_button = QPushButton()
         self.loop_button.setToolTip("Loop")
-        self.loop_button.setIcon(QIcon("beat/editor/widgets/loop_icon.png"))
+        self.loop_button.setIcon(QIcon(":/resources/loop"))
         self.loop_button.clicked.connect(self.add_loop_block)
 
         self.dataset_button = QPushButton()
         self.dataset_button.setToolTip("Dataset")
-        self.dataset_button.setIcon(QIcon("beat/editor/widgets/dataset_icon.png"))
+        self.dataset_button.setIcon(QIcon(":/resources/dataset"))
         self.dataset_edit_menu = QMenu(self)
 
         self.block_button = QPushButton()
         self.block_button.setToolTip("Block")
-        self.block_button.setIcon(QIcon("beat/editor/widgets/block_icon.png"))
+        self.block_button.setIcon(QIcon(":/resources/block"))
         self.block_edit_menu = QMenu(self)
 
         self.analyzer_button = QPushButton()
         self.analyzer_button.setToolTip("Analyzer")
-        self.analyzer_button.setIcon(QIcon("beat/editor/widgets/analyzer_icon.png"))
+        self.analyzer_button.setIcon(QIcon(":/resources/analyzer"))
         self.analyzer_edit_menu = QMenu(self)
 
         self.toolbar.addWidget(self.dataset_button)
diff --git a/editor.qrc b/editor.qrc
index 671e86f..e8814ff 100644
--- a/editor.qrc
+++ b/editor.qrc
@@ -3,5 +3,9 @@
     <file alias="remap">resources/remap.png</file>
     <file alias="docker">resources/icons8-docker-50.png</file>
     <file alias="remote">resources/icons8-cloud-development-50.png</file>
+    <file alias="dataset">resources/dataset.png</file>
+    <file alias="block">resources/block.png</file>
+    <file alias="loop">resources/loop.png</file>
+    <file alias="analyzer">resources/analyzer.png</file>
 </qresource>
 </RCC>
diff --git a/beat/editor/widgets/analyzer.drawio b/resources/analyzer.drawio
similarity index 100%
rename from beat/editor/widgets/analyzer.drawio
rename to resources/analyzer.drawio
diff --git a/beat/editor/widgets/analyzer_icon.png b/resources/analyzer.png
similarity index 100%
rename from beat/editor/widgets/analyzer_icon.png
rename to resources/analyzer.png
diff --git a/beat/editor/widgets/block.drawio b/resources/block.drawio
similarity index 100%
rename from beat/editor/widgets/block.drawio
rename to resources/block.drawio
diff --git a/beat/editor/widgets/block_icon.png b/resources/block.png
similarity index 100%
rename from beat/editor/widgets/block_icon.png
rename to resources/block.png
diff --git a/beat/editor/widgets/dataset.drawio b/resources/dataset.drawio
similarity index 100%
rename from beat/editor/widgets/dataset.drawio
rename to resources/dataset.drawio
diff --git a/beat/editor/widgets/dataset_icon.png b/resources/dataset.png
similarity index 100%
rename from beat/editor/widgets/dataset_icon.png
rename to resources/dataset.png
diff --git a/beat/editor/widgets/loop.drawio b/resources/loop.drawio
similarity index 100%
rename from beat/editor/widgets/loop.drawio
rename to resources/loop.drawio
diff --git a/beat/editor/widgets/loop_icon.png b/resources/loop.png
similarity index 100%
rename from beat/editor/widgets/loop_icon.png
rename to resources/loop.png
-- 
2.21.0