From 04e9d8b2eb741052d53d6f5aa484d93b17a21099 Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 26 Jun 2008 22:24:17 +0200
Subject: [PATCH] Rename and move our own icons to match icon naming/location
 standards

---
 src/icons/quassel-icons.qrc                   |  53 +++++++++---------
 .../128.png => 128x128/apps/quassel.png}      | Bin
 .../apps/quassel_disconnected.png}            | Bin
 .../apps/quassel_newmessage.png}              | Bin
 .../16.png => 16x16/apps/quassel.png}         | Bin
 .../apps/quassel_disconnected.png}            | Bin
 .../apps/quassel_newmessage.png}              | Bin
 .../24.png => 24x24/apps/quassel.png}         | Bin
 .../apps/quassel_disconnected.png}            | Bin
 .../apps/quassel_newmessage.png}              | Bin
 .../256.png => 256x256/apps/quassel.png}      | Bin
 .../apps/quassel_disconnected.png}            | Bin
 .../apps/quassel_newmessage.png}              | Bin
 .../32.png => 32x32/apps/quassel.png}         | Bin
 .../apps/quassel_disconnected.png}            | Bin
 .../apps/quassel_newmessage.png}              | Bin
 .../48.png => 48x48/apps/quassel.png}         | Bin
 .../apps/quassel_disconnected.png}            | Bin
 .../apps/quassel_newmessage.png}              | Bin
 .../512.png => 512x512/apps/quassel.png}      | Bin
 .../apps/quassel_disconnected.png}            | Bin
 .../apps/quassel_newmessage.png}              | Bin
 .../64.png => 64x64/apps/quassel.png}         | Bin
 .../apps/quassel_disconnected.png}            | Bin
 .../apps/quassel_newmessage.png}              | Bin
 .../96.png => 96x96/apps/quassel.png}         | Bin
 26 files changed, 25 insertions(+), 28 deletions(-)
 rename src/icons/quassel/{connected/128.png => 128x128/apps/quassel.png} (100%)
 rename src/icons/quassel/{disconnected/128.png => 128x128/apps/quassel_disconnected.png} (100%)
 rename src/icons/quassel/{newmessage/128.png => 128x128/apps/quassel_newmessage.png} (100%)
 rename src/icons/quassel/{connected/16.png => 16x16/apps/quassel.png} (100%)
 rename src/icons/quassel/{disconnected/16.png => 16x16/apps/quassel_disconnected.png} (100%)
 rename src/icons/quassel/{newmessage/16.png => 16x16/apps/quassel_newmessage.png} (100%)
 rename src/icons/quassel/{connected/24.png => 24x24/apps/quassel.png} (100%)
 rename src/icons/quassel/{disconnected/24.png => 24x24/apps/quassel_disconnected.png} (100%)
 rename src/icons/quassel/{newmessage/24.png => 24x24/apps/quassel_newmessage.png} (100%)
 rename src/icons/quassel/{connected/256.png => 256x256/apps/quassel.png} (100%)
 rename src/icons/quassel/{disconnected/256.png => 256x256/apps/quassel_disconnected.png} (100%)
 rename src/icons/quassel/{newmessage/256.png => 256x256/apps/quassel_newmessage.png} (100%)
 rename src/icons/quassel/{connected/32.png => 32x32/apps/quassel.png} (100%)
 rename src/icons/quassel/{disconnected/32.png => 32x32/apps/quassel_disconnected.png} (100%)
 rename src/icons/quassel/{newmessage/32.png => 32x32/apps/quassel_newmessage.png} (100%)
 rename src/icons/quassel/{connected/48.png => 48x48/apps/quassel.png} (100%)
 rename src/icons/quassel/{disconnected/48.png => 48x48/apps/quassel_disconnected.png} (100%)
 rename src/icons/quassel/{newmessage/48.png => 48x48/apps/quassel_newmessage.png} (100%)
 rename src/icons/quassel/{connected/512.png => 512x512/apps/quassel.png} (100%)
 rename src/icons/quassel/{disconnected/512.png => 512x512/apps/quassel_disconnected.png} (100%)
 rename src/icons/quassel/{newmessage/512.png => 512x512/apps/quassel_newmessage.png} (100%)
 rename src/icons/quassel/{connected/64.png => 64x64/apps/quassel.png} (100%)
 rename src/icons/quassel/{disconnected/64.png => 64x64/apps/quassel_disconnected.png} (100%)
 rename src/icons/quassel/{newmessage/64.png => 64x64/apps/quassel_newmessage.png} (100%)
 rename src/icons/quassel/{connected/96.png => 96x96/apps/quassel.png} (100%)

diff --git a/src/icons/quassel-icons.qrc b/src/icons/quassel-icons.qrc
index 7b2f0ec7..557600ea 100644
--- a/src/icons/quassel-icons.qrc
+++ b/src/icons/quassel-icons.qrc
@@ -1,32 +1,29 @@
 <RCC>
   <qresource>
-    <!-- regular version -->
-    <file>quassel/connected/16.png</file>
-    <file>quassel/connected/24.png</file>
-    <file>quassel/connected/32.png</file>
-    <file>quassel/connected/48.png</file>
-    <file>quassel/connected/64.png</file>
-    <file>quassel/connected/96.png</file>
-    <file alias="icons/quassel-icon.png">quassel/connected/128.png</file>
-    <file>quassel/connected/256.png</file>
-    <file>quassel/connected/512.png</file>
-    <!-- offline version -->
-    <file>quassel/disconnected/16.png</file>
-    <file>quassel/disconnected/24.png</file>
-    <file>quassel/disconnected/32.png</file>
-    <file>quassel/disconnected/48.png</file>
-    <file>quassel/disconnected/64.png</file>
-    <file alias="icons/quassel-icon-offline.png">quassel/disconnected/128.png</file>
-    <file>quassel/disconnected/256.png</file>
-    <file>quassel/disconnected/512.png</file>
-    <!-- new message version -->
-    <file>quassel/newmessage/16.png</file>
-    <file>quassel/newmessage/24.png</file>
-    <file>quassel/newmessage/32.png</file>
-    <file>quassel/newmessage/48.png</file>
-    <file>quassel/newmessage/64.png</file>
-    <file alias="icons/quassel-icon-active.png">quassel/newmessage/128.png</file>
-    <file>quassel/newmessage/256.png</file>
-    <file>quassel/newmessage/512.png</file>
+    <file>quassel/256x256/apps/quassel.png</file>
+    <file>quassel/256x256/apps/quassel_disconnected.png</file>
+    <file>quassel/256x256/apps/quassel_newmessage.png</file>
+    <file>quassel/512x512/apps/quassel.png</file>
+    <file>quassel/512x512/apps/quassel_disconnected.png</file>
+    <file>quassel/512x512/apps/quassel_newmessage.png</file>
+    <file>quassel/96x96/apps/quassel.png</file>
+    <file alias="icons/quassel-icon.png">quassel/128x128/apps/quassel.png</file>
+    <file alias="icons/quassel-icon-offline.png">quassel/128x128/apps/quassel_disconnected.png</file>
+    <file alias="icons/quassel-icon-active.png">quassel/128x128/apps/quassel_newmessage.png</file>
+    <file>quassel/64x64/apps/quassel.png</file>
+    <file>quassel/64x64/apps/quassel_disconnected.png</file>
+    <file>quassel/64x64/apps/quassel_newmessage.png</file>
+    <file>quassel/48x48/apps/quassel.png</file>
+    <file>quassel/48x48/apps/quassel_disconnected.png</file>
+    <file>quassel/48x48/apps/quassel_newmessage.png</file>
+    <file>quassel/32x32/apps/quassel.png</file>
+    <file>quassel/32x32/apps/quassel_disconnected.png</file>
+    <file>quassel/32x32/apps/quassel_newmessage.png</file>
+    <file>quassel/16x16/apps/quassel_disconnected.png</file>
+    <file>quassel/16x16/apps/quassel.png</file>
+    <file>quassel/16x16/apps/quassel_newmessage.png</file>
+    <file>quassel/24x24/apps/quassel_disconnected.png</file>
+    <file>quassel/24x24/apps/quassel_newmessage.png</file>
+    <file>quassel/24x24/apps/quassel.png</file>
   </qresource>
 </RCC>
diff --git a/src/icons/quassel/connected/128.png b/src/icons/quassel/128x128/apps/quassel.png
similarity index 100%
rename from src/icons/quassel/connected/128.png
rename to src/icons/quassel/128x128/apps/quassel.png
diff --git a/src/icons/quassel/disconnected/128.png b/src/icons/quassel/128x128/apps/quassel_disconnected.png
similarity index 100%
rename from src/icons/quassel/disconnected/128.png
rename to src/icons/quassel/128x128/apps/quassel_disconnected.png
diff --git a/src/icons/quassel/newmessage/128.png b/src/icons/quassel/128x128/apps/quassel_newmessage.png
similarity index 100%
rename from src/icons/quassel/newmessage/128.png
rename to src/icons/quassel/128x128/apps/quassel_newmessage.png
diff --git a/src/icons/quassel/connected/16.png b/src/icons/quassel/16x16/apps/quassel.png
similarity index 100%
rename from src/icons/quassel/connected/16.png
rename to src/icons/quassel/16x16/apps/quassel.png
diff --git a/src/icons/quassel/disconnected/16.png b/src/icons/quassel/16x16/apps/quassel_disconnected.png
similarity index 100%
rename from src/icons/quassel/disconnected/16.png
rename to src/icons/quassel/16x16/apps/quassel_disconnected.png
diff --git a/src/icons/quassel/newmessage/16.png b/src/icons/quassel/16x16/apps/quassel_newmessage.png
similarity index 100%
rename from src/icons/quassel/newmessage/16.png
rename to src/icons/quassel/16x16/apps/quassel_newmessage.png
diff --git a/src/icons/quassel/connected/24.png b/src/icons/quassel/24x24/apps/quassel.png
similarity index 100%
rename from src/icons/quassel/connected/24.png
rename to src/icons/quassel/24x24/apps/quassel.png
diff --git a/src/icons/quassel/disconnected/24.png b/src/icons/quassel/24x24/apps/quassel_disconnected.png
similarity index 100%
rename from src/icons/quassel/disconnected/24.png
rename to src/icons/quassel/24x24/apps/quassel_disconnected.png
diff --git a/src/icons/quassel/newmessage/24.png b/src/icons/quassel/24x24/apps/quassel_newmessage.png
similarity index 100%
rename from src/icons/quassel/newmessage/24.png
rename to src/icons/quassel/24x24/apps/quassel_newmessage.png
diff --git a/src/icons/quassel/connected/256.png b/src/icons/quassel/256x256/apps/quassel.png
similarity index 100%
rename from src/icons/quassel/connected/256.png
rename to src/icons/quassel/256x256/apps/quassel.png
diff --git a/src/icons/quassel/disconnected/256.png b/src/icons/quassel/256x256/apps/quassel_disconnected.png
similarity index 100%
rename from src/icons/quassel/disconnected/256.png
rename to src/icons/quassel/256x256/apps/quassel_disconnected.png
diff --git a/src/icons/quassel/newmessage/256.png b/src/icons/quassel/256x256/apps/quassel_newmessage.png
similarity index 100%
rename from src/icons/quassel/newmessage/256.png
rename to src/icons/quassel/256x256/apps/quassel_newmessage.png
diff --git a/src/icons/quassel/connected/32.png b/src/icons/quassel/32x32/apps/quassel.png
similarity index 100%
rename from src/icons/quassel/connected/32.png
rename to src/icons/quassel/32x32/apps/quassel.png
diff --git a/src/icons/quassel/disconnected/32.png b/src/icons/quassel/32x32/apps/quassel_disconnected.png
similarity index 100%
rename from src/icons/quassel/disconnected/32.png
rename to src/icons/quassel/32x32/apps/quassel_disconnected.png
diff --git a/src/icons/quassel/newmessage/32.png b/src/icons/quassel/32x32/apps/quassel_newmessage.png
similarity index 100%
rename from src/icons/quassel/newmessage/32.png
rename to src/icons/quassel/32x32/apps/quassel_newmessage.png
diff --git a/src/icons/quassel/connected/48.png b/src/icons/quassel/48x48/apps/quassel.png
similarity index 100%
rename from src/icons/quassel/connected/48.png
rename to src/icons/quassel/48x48/apps/quassel.png
diff --git a/src/icons/quassel/disconnected/48.png b/src/icons/quassel/48x48/apps/quassel_disconnected.png
similarity index 100%
rename from src/icons/quassel/disconnected/48.png
rename to src/icons/quassel/48x48/apps/quassel_disconnected.png
diff --git a/src/icons/quassel/newmessage/48.png b/src/icons/quassel/48x48/apps/quassel_newmessage.png
similarity index 100%
rename from src/icons/quassel/newmessage/48.png
rename to src/icons/quassel/48x48/apps/quassel_newmessage.png
diff --git a/src/icons/quassel/connected/512.png b/src/icons/quassel/512x512/apps/quassel.png
similarity index 100%
rename from src/icons/quassel/connected/512.png
rename to src/icons/quassel/512x512/apps/quassel.png
diff --git a/src/icons/quassel/disconnected/512.png b/src/icons/quassel/512x512/apps/quassel_disconnected.png
similarity index 100%
rename from src/icons/quassel/disconnected/512.png
rename to src/icons/quassel/512x512/apps/quassel_disconnected.png
diff --git a/src/icons/quassel/newmessage/512.png b/src/icons/quassel/512x512/apps/quassel_newmessage.png
similarity index 100%
rename from src/icons/quassel/newmessage/512.png
rename to src/icons/quassel/512x512/apps/quassel_newmessage.png
diff --git a/src/icons/quassel/connected/64.png b/src/icons/quassel/64x64/apps/quassel.png
similarity index 100%
rename from src/icons/quassel/connected/64.png
rename to src/icons/quassel/64x64/apps/quassel.png
diff --git a/src/icons/quassel/disconnected/64.png b/src/icons/quassel/64x64/apps/quassel_disconnected.png
similarity index 100%
rename from src/icons/quassel/disconnected/64.png
rename to src/icons/quassel/64x64/apps/quassel_disconnected.png
diff --git a/src/icons/quassel/newmessage/64.png b/src/icons/quassel/64x64/apps/quassel_newmessage.png
similarity index 100%
rename from src/icons/quassel/newmessage/64.png
rename to src/icons/quassel/64x64/apps/quassel_newmessage.png
diff --git a/src/icons/quassel/connected/96.png b/src/icons/quassel/96x96/apps/quassel.png
similarity index 100%
rename from src/icons/quassel/connected/96.png
rename to src/icons/quassel/96x96/apps/quassel.png
-- 
2.20.1