From 7f7cb6601e52650714358e84c077bf394d295809 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 2 Aug 2018 17:48:02 +0200
Subject: [PATCH] Move generic resources to top level

---
 gui/base.qrc                                |   8 ++++++++
 gui/ice40/nextpnr.qrc                       |   8 --------
 gui/{ice40 => }/resources/control_pause.png | Bin
 gui/{ice40 => }/resources/control_play.png  | Bin
 gui/{ice40 => }/resources/control_stop.png  | Bin
 gui/{ice40 => }/resources/open_json.png     | Bin
 gui/{ice40 => }/resources/pack.png          | Bin
 gui/{ice40 => }/resources/place.png         | Bin
 gui/{ice40 => }/resources/route.png         | Bin
 gui/{ice40 => }/resources/time_add.png      | Bin
 10 files changed, 8 insertions(+), 8 deletions(-)
 rename gui/{ice40 => }/resources/control_pause.png (100%)
 rename gui/{ice40 => }/resources/control_play.png (100%)
 rename gui/{ice40 => }/resources/control_stop.png (100%)
 rename gui/{ice40 => }/resources/open_json.png (100%)
 rename gui/{ice40 => }/resources/pack.png (100%)
 rename gui/{ice40 => }/resources/place.png (100%)
 rename gui/{ice40 => }/resources/route.png (100%)
 rename gui/{ice40 => }/resources/time_add.png (100%)

diff --git a/gui/base.qrc b/gui/base.qrc
index 7b3fa55c..8f58f585 100644
--- a/gui/base.qrc
+++ b/gui/base.qrc
@@ -14,5 +14,13 @@
         <file>resources/zoom_out.png</file>
         <file>resources/shape_handles.png</file>
         <file>resources/shape_square.png</file>
+        <file>resources/control_play.png</file>
+        <file>resources/control_pause.png</file>
+        <file>resources/control_stop.png</file>
+        <file>resources/pack.png</file>
+        <file>resources/place.png</file>
+        <file>resources/route.png</file>
+        <file>resources/time_add.png</file>
+        <file>resources/open_json.png</file>
     </qresource>
 </RCC>
diff --git a/gui/ice40/nextpnr.qrc b/gui/ice40/nextpnr.qrc
index 3c86057d..8eca1e09 100644
--- a/gui/ice40/nextpnr.qrc
+++ b/gui/ice40/nextpnr.qrc
@@ -1,14 +1,6 @@
 <RCC>
     <qresource prefix="/icons">
-        <file>resources/control_play.png</file>
-        <file>resources/control_pause.png</file>
-        <file>resources/control_stop.png</file>
-        <file>resources/pack.png</file>
-        <file>resources/place.png</file>
-        <file>resources/route.png</file>
-        <file>resources/time_add.png</file>
         <file>resources/open_pcf.png</file>
         <file>resources/save_asc.png</file>
-        <file>resources/open_json.png</file>
     </qresource>
 </RCC>
diff --git a/gui/ice40/resources/control_pause.png b/gui/resources/control_pause.png
similarity index 100%
rename from gui/ice40/resources/control_pause.png
rename to gui/resources/control_pause.png
diff --git a/gui/ice40/resources/control_play.png b/gui/resources/control_play.png
similarity index 100%
rename from gui/ice40/resources/control_play.png
rename to gui/resources/control_play.png
diff --git a/gui/ice40/resources/control_stop.png b/gui/resources/control_stop.png
similarity index 100%
rename from gui/ice40/resources/control_stop.png
rename to gui/resources/control_stop.png
diff --git a/gui/ice40/resources/open_json.png b/gui/resources/open_json.png
similarity index 100%
rename from gui/ice40/resources/open_json.png
rename to gui/resources/open_json.png
diff --git a/gui/ice40/resources/pack.png b/gui/resources/pack.png
similarity index 100%
rename from gui/ice40/resources/pack.png
rename to gui/resources/pack.png
diff --git a/gui/ice40/resources/place.png b/gui/resources/place.png
similarity index 100%
rename from gui/ice40/resources/place.png
rename to gui/resources/place.png
diff --git a/gui/ice40/resources/route.png b/gui/resources/route.png
similarity index 100%
rename from gui/ice40/resources/route.png
rename to gui/resources/route.png
diff --git a/gui/ice40/resources/time_add.png b/gui/resources/time_add.png
similarity index 100%
rename from gui/ice40/resources/time_add.png
rename to gui/resources/time_add.png