Merge branch 'upstream'

diff --git a/src/icons/quassel-icons.qrc b/src/icons/quassel-icons.qrc
index 7b2f0ec..557600e 100644 (file)
--- 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/128x128/apps/quassel.png b/src/icons/quassel/128x128/apps/quassel.png
new file mode 100644 (file)
index 0000000..1cd5a04
Binary files /dev/null and b/src/icons/quassel/128x128/apps/quassel.png differ

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/16x16/apps/quassel.png b/src/icons/quassel/16x16/apps/quassel.png
new file mode 100644 (file)
index 0000000..03d13f8
Binary files /dev/null and b/src/icons/quassel/16x16/apps/quassel.png differ

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/24x24/apps/quassel.png b/src/icons/quassel/24x24/apps/quassel.png
new file mode 100644 (file)
index 0000000..65e53a2
Binary files /dev/null and b/src/icons/quassel/24x24/apps/quassel.png differ

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/256x256/apps/quassel.png b/src/icons/quassel/256x256/apps/quassel.png
new file mode 100644 (file)
index 0000000..90375cc
Binary files /dev/null and b/src/icons/quassel/256x256/apps/quassel.png differ

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/32x32/apps/quassel.png b/src/icons/quassel/32x32/apps/quassel.png
new file mode 100644 (file)
index 0000000..33b8502
Binary files /dev/null and b/src/icons/quassel/32x32/apps/quassel.png differ

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/48x48/apps/quassel.png b/src/icons/quassel/48x48/apps/quassel.png
new file mode 100644 (file)
index 0000000..941a0d8
Binary files /dev/null and b/src/icons/quassel/48x48/apps/quassel.png differ

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/512x512/apps/quassel.png b/src/icons/quassel/512x512/apps/quassel.png
new file mode 100644 (file)
index 0000000..22dce11
Binary files /dev/null and b/src/icons/quassel/512x512/apps/quassel.png differ

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/64x64/apps/quassel.png b/src/icons/quassel/64x64/apps/quassel.png
new file mode 100644 (file)
index 0000000..ae73b8c
Binary files /dev/null and b/src/icons/quassel/64x64/apps/quassel.png differ

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/96x96/apps/quassel.png b/src/icons/quassel/96x96/apps/quassel.png
new file mode 100644 (file)
index 0000000..4b68972
Binary files /dev/null and b/src/icons/quassel/96x96/apps/quassel.png differ

diff --git a/src/qtui/ui/aboutdlg.ui b/src/qtui/ui/aboutdlg.ui
index 0d13cb7..96841a7 100644 (file)
--- a/src/qtui/ui/aboutdlg.ui
+++ b/src/qtui/ui/aboutdlg.ui
@@ -36,7 +36,7 @@
            <string/>
           </property>
           <property name="pixmap" >
-           <pixmap resource="../../icons/quassel-icons.qrc" >:/quassel/connected/64.png</pixmap>
+           <pixmap resource="../../icons/quassel-icons.qrc" >:/quassel/64x64/apps/quassel.png</pixmap>
           </property>
           <property name="scaledContents" >
            <bool>false</bool>