Add tray icon for highlight; move tray icons to hicolor

App-specific icons should be in the hicolor theme, in order to be always available.
The new highlight tray icon is just a blend of our app icon and an view-pim-mail
from Oxygen. This is supposed to be temporary until someone creates a better one.

diff --git a/icons/hicolor.qrc b/icons/hicolor.qrc
index 423d91c..c7a65cb 100644 (file)
--- a/icons/hicolor.qrc
+++ b/icons/hicolor.qrc
@@ -6,5 +6,15 @@
     <file>hicolor/48x48/apps/quassel.png</file>
     <file>hicolor/64x64/apps/quassel.png</file>
     <file>hicolor/128x128/apps/quassel.png</file>
+    <file>hicolor/16x16/status/quassel_message.png</file>
+    <file>hicolor/22x22/status/quassel_message.png</file>
+    <file>hicolor/32x32/status/quassel_message.png</file>
+    <file>hicolor/48x48/status/quassel_message.png</file>
+    <file>hicolor/16x16/status/quassel_inactive.png</file>
+    <file>hicolor/22x22/status/quassel_inactive.png</file>
+    <file>hicolor/32x32/status/quassel_inactive.png</file>
+    <file>hicolor/48x48/status/quassel_inactive.png</file>
+    <file>hicolor/64x64/status/quassel_inactive.png</file>
+    <file>hicolor/128x128/status/quassel_inactive.png</file>
   </qresource>
 </RCC>

diff --git a/icons/oxygen/128x128/apps/quassel_inactive.png b/icons/hicolor/128x128/status/quassel_inactive.png
similarity index 100%
rename from icons/oxygen/128x128/apps/quassel_inactive.png
rename to icons/hicolor/128x128/status/quassel_inactive.png

diff --git a/icons/oxygen/16x16/apps/quassel_inactive.png b/icons/hicolor/16x16/status/quassel_inactive.png
similarity index 100%
rename from icons/oxygen/16x16/apps/quassel_inactive.png
rename to icons/hicolor/16x16/status/quassel_inactive.png

diff --git a/icons/hicolor/16x16/status/quassel_message.png b/icons/hicolor/16x16/status/quassel_message.png
new file mode 100644 (file)
index 0000000..22584c4
Binary files /dev/null and b/icons/hicolor/16x16/status/quassel_message.png differ

diff --git a/icons/oxygen/22x22/apps/quassel_inactive.png b/icons/hicolor/22x22/status/quassel_inactive.png
similarity index 100%
rename from icons/oxygen/22x22/apps/quassel_inactive.png
rename to icons/hicolor/22x22/status/quassel_inactive.png

diff --git a/icons/hicolor/22x22/status/quassel_message.png b/icons/hicolor/22x22/status/quassel_message.png
new file mode 100644 (file)
index 0000000..910b1e1
Binary files /dev/null and b/icons/hicolor/22x22/status/quassel_message.png differ

diff --git a/icons/oxygen/32x32/apps/quassel_inactive.png b/icons/hicolor/32x32/status/quassel_inactive.png
similarity index 100%
rename from icons/oxygen/32x32/apps/quassel_inactive.png
rename to icons/hicolor/32x32/status/quassel_inactive.png

diff --git a/icons/hicolor/32x32/status/quassel_message.png b/icons/hicolor/32x32/status/quassel_message.png
new file mode 100644 (file)
index 0000000..8b5dae7
Binary files /dev/null and b/icons/hicolor/32x32/status/quassel_message.png differ

diff --git a/icons/oxygen/48x48/apps/quassel_inactive.png b/icons/hicolor/48x48/status/quassel_inactive.png
similarity index 100%
rename from icons/oxygen/48x48/apps/quassel_inactive.png
rename to icons/hicolor/48x48/status/quassel_inactive.png

diff --git a/icons/hicolor/48x48/status/quassel_message.png b/icons/hicolor/48x48/status/quassel_message.png
new file mode 100644 (file)
index 0000000..14b8f9f
Binary files /dev/null and b/icons/hicolor/48x48/status/quassel_message.png differ

diff --git a/icons/oxygen/64x64/apps/quassel_inactive.png b/icons/hicolor/64x64/status/quassel_inactive.png
similarity index 100%
rename from icons/oxygen/64x64/apps/quassel_inactive.png
rename to icons/hicolor/64x64/status/quassel_inactive.png

diff --git a/icons/import/blacklisted-icons b/icons/import/blacklisted-icons
index 5301063..97940c8 100644 (file)
--- a/icons/import/blacklisted-icons
+++ b/icons/import/blacklisted-icons
@@ -1,3 +1,3 @@
-quassel_inactive
+quassel-inactive
 irc-channel-active
 irc-channel-inactive

diff --git a/icons/oxygen.qrc b/icons/oxygen.qrc
index 7eb59f0..fd0cb2f 100644 (file)
--- a/icons/oxygen.qrc
+++ b/icons/oxygen.qrc
@@ -1,6 +1,5 @@
 <RCC>
   <qresource prefix="/icons">
-    <file alias="oxygen/48x48/apps/quassel_inactive.png">oxygen/48x48/apps/quassel_inactive.png</file>
     <file alias="oxygen/48x48/animations/quassel_tray-fade-on-8.png">oxygen/48x48/animations/quassel_tray-fade-on-8.png</file>
     <file alias="oxygen/48x48/animations/quassel_tray-fade-on-13.png">oxygen/48x48/animations/quassel_tray-fade-on-13.png</file>
     <file alias="oxygen/48x48/animations/quassel_tray-alert-4.png">oxygen/48x48/animations/quassel_tray-alert-4.png</file>
@@ -36,7 +35,6 @@
     <file alias="oxygen/48x48/animations/quassel_tray-fade-off-10.png">oxygen/48x48/animations/quassel_tray-fade-off-10.png</file>
     <file alias="oxygen/48x48/animations/quassel_tray-fade-on-9.png">oxygen/48x48/animations/quassel_tray-fade-on-9.png</file>
     <file alias="oxygen/48x48/animations/quassel_tray-fade-on-10.png">oxygen/48x48/animations/quassel_tray-fade-on-10.png</file>
-    <file alias="oxygen/128x128/apps/quassel_inactive.png">oxygen/128x128/apps/quassel_inactive.png</file>
     <file alias="oxygen/128x128/animations/quassel_tray-fade-on-8.png">oxygen/128x128/animations/quassel_tray-fade-on-8.png</file>
     <file alias="oxygen/128x128/animations/quassel_tray-fade-on-13.png">oxygen/128x128/animations/quassel_tray-fade-on-13.png</file>
     <file alias="oxygen/128x128/animations/quassel_tray-alert-4.png">oxygen/128x128/animations/quassel_tray-alert-4.png</file>
@@ -72,7 +70,6 @@
     <file alias="oxygen/128x128/animations/quassel_tray-fade-off-10.png">oxygen/128x128/animations/quassel_tray-fade-off-10.png</file>
     <file alias="oxygen/128x128/animations/quassel_tray-fade-on-9.png">oxygen/128x128/animations/quassel_tray-fade-on-9.png</file>
     <file alias="oxygen/128x128/animations/quassel_tray-fade-on-10.png">oxygen/128x128/animations/quassel_tray-fade-on-10.png</file>
-    <file alias="oxygen/32x32/apps/quassel_inactive.png">oxygen/32x32/apps/quassel_inactive.png</file>
     <file alias="oxygen/32x32/animations/quassel_tray-fade-on-8.png">oxygen/32x32/animations/quassel_tray-fade-on-8.png</file>
     <file alias="oxygen/32x32/animations/quassel_tray-fade-on-13.png">oxygen/32x32/animations/quassel_tray-fade-on-13.png</file>
     <file alias="oxygen/32x32/animations/quassel_tray-alert-4.png">oxygen/32x32/animations/quassel_tray-alert-4.png</file>
@@ -108,7 +105,6 @@
     <file alias="oxygen/32x32/animations/quassel_tray-fade-off-10.png">oxygen/32x32/animations/quassel_tray-fade-off-10.png</file>
     <file alias="oxygen/32x32/animations/quassel_tray-fade-on-9.png">oxygen/32x32/animations/quassel_tray-fade-on-9.png</file>
     <file alias="oxygen/32x32/animations/quassel_tray-fade-on-10.png">oxygen/32x32/animations/quassel_tray-fade-on-10.png</file>
-    <file alias="oxygen/64x64/apps/quassel_inactive.png">oxygen/64x64/apps/quassel_inactive.png</file>
     <file alias="oxygen/64x64/animations/quassel_tray-fade-on-8.png">oxygen/64x64/animations/quassel_tray-fade-on-8.png</file>
     <file alias="oxygen/64x64/animations/quassel_tray-fade-on-13.png">oxygen/64x64/animations/quassel_tray-fade-on-13.png</file>
     <file alias="oxygen/64x64/animations/quassel_tray-alert-4.png">oxygen/64x64/animations/quassel_tray-alert-4.png</file>
@@ -144,7 +140,6 @@
     <file alias="oxygen/64x64/animations/quassel_tray-fade-off-10.png">oxygen/64x64/animations/quassel_tray-fade-off-10.png</file>
     <file alias="oxygen/64x64/animations/quassel_tray-fade-on-9.png">oxygen/64x64/animations/quassel_tray-fade-on-9.png</file>
     <file alias="oxygen/64x64/animations/quassel_tray-fade-on-10.png">oxygen/64x64/animations/quassel_tray-fade-on-10.png</file>
-    <file alias="oxygen/22x22/apps/quassel_inactive.png">oxygen/22x22/apps/quassel_inactive.png</file>
     <file alias="oxygen/22x22/animations/quassel_tray-fade-on-8.png">oxygen/22x22/animations/quassel_tray-fade-on-8.png</file>
     <file alias="oxygen/22x22/animations/quassel_tray-fade-on-13.png">oxygen/22x22/animations/quassel_tray-fade-on-13.png</file>
     <file alias="oxygen/22x22/animations/quassel_tray-alert-4.png">oxygen/22x22/animations/quassel_tray-alert-4.png</file>
@@ -180,7 +175,6 @@
     <file alias="oxygen/22x22/animations/quassel_tray-fade-off-10.png">oxygen/22x22/animations/quassel_tray-fade-off-10.png</file>
     <file alias="oxygen/22x22/animations/quassel_tray-fade-on-9.png">oxygen/22x22/animations/quassel_tray-fade-on-9.png</file>
     <file alias="oxygen/22x22/animations/quassel_tray-fade-on-10.png">oxygen/22x22/animations/quassel_tray-fade-on-10.png</file>
-    <file alias="oxygen/16x16/apps/quassel_inactive.png">oxygen/16x16/apps/quassel_inactive.png</file>
     <file alias="oxygen/16x16/status/irc-channel-inactive.png">oxygen/16x16/status/irc-channel-inactive.png</file>
     <file alias="oxygen/16x16/status/irc-channel-active.png">oxygen/16x16/status/irc-channel-active.png</file>
     <file alias="oxygen/16x16/animations/quassel_tray-fade-on-8.png">oxygen/16x16/animations/quassel_tray-fade-on-8.png</file>