From: Manuel Nickschas Date: Sun, 31 Jan 2010 17:20:12 +0000 (+0100) Subject: Add tray icon for highlight; move tray icons to hicolor X-Git-Tag: 0.6-beta1~47 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=4ab319d585f1cace630e2e7cf917d8d83528038c 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 423d91c4..c7a65cbb 100644 --- a/icons/hicolor.qrc +++ b/icons/hicolor.qrc @@ -6,5 +6,15 @@ hicolor/48x48/apps/quassel.png hicolor/64x64/apps/quassel.png hicolor/128x128/apps/quassel.png + hicolor/16x16/status/quassel_message.png + hicolor/22x22/status/quassel_message.png + hicolor/32x32/status/quassel_message.png + hicolor/48x48/status/quassel_message.png + hicolor/16x16/status/quassel_inactive.png + hicolor/22x22/status/quassel_inactive.png + hicolor/32x32/status/quassel_inactive.png + hicolor/48x48/status/quassel_inactive.png + hicolor/64x64/status/quassel_inactive.png + hicolor/128x128/status/quassel_inactive.png 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 index 00000000..22584c44 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 index 00000000..910b1e12 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 index 00000000..8b5dae7f 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 index 00000000..14b8f9f2 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 53010633..97940c8c 100644 --- 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 7eb59f08..fd0cb2f0 100644 --- a/icons/oxygen.qrc +++ b/icons/oxygen.qrc @@ -1,6 +1,5 @@ - oxygen/48x48/apps/quassel_inactive.png oxygen/48x48/animations/quassel_tray-fade-on-8.png oxygen/48x48/animations/quassel_tray-fade-on-13.png oxygen/48x48/animations/quassel_tray-alert-4.png @@ -36,7 +35,6 @@ oxygen/48x48/animations/quassel_tray-fade-off-10.png oxygen/48x48/animations/quassel_tray-fade-on-9.png oxygen/48x48/animations/quassel_tray-fade-on-10.png - oxygen/128x128/apps/quassel_inactive.png oxygen/128x128/animations/quassel_tray-fade-on-8.png oxygen/128x128/animations/quassel_tray-fade-on-13.png oxygen/128x128/animations/quassel_tray-alert-4.png @@ -72,7 +70,6 @@ oxygen/128x128/animations/quassel_tray-fade-off-10.png oxygen/128x128/animations/quassel_tray-fade-on-9.png oxygen/128x128/animations/quassel_tray-fade-on-10.png - oxygen/32x32/apps/quassel_inactive.png oxygen/32x32/animations/quassel_tray-fade-on-8.png oxygen/32x32/animations/quassel_tray-fade-on-13.png oxygen/32x32/animations/quassel_tray-alert-4.png @@ -108,7 +105,6 @@ oxygen/32x32/animations/quassel_tray-fade-off-10.png oxygen/32x32/animations/quassel_tray-fade-on-9.png oxygen/32x32/animations/quassel_tray-fade-on-10.png - oxygen/64x64/apps/quassel_inactive.png oxygen/64x64/animations/quassel_tray-fade-on-8.png oxygen/64x64/animations/quassel_tray-fade-on-13.png oxygen/64x64/animations/quassel_tray-alert-4.png @@ -144,7 +140,6 @@ oxygen/64x64/animations/quassel_tray-fade-off-10.png oxygen/64x64/animations/quassel_tray-fade-on-9.png oxygen/64x64/animations/quassel_tray-fade-on-10.png - oxygen/22x22/apps/quassel_inactive.png oxygen/22x22/animations/quassel_tray-fade-on-8.png oxygen/22x22/animations/quassel_tray-fade-on-13.png oxygen/22x22/animations/quassel_tray-alert-4.png @@ -180,7 +175,6 @@ oxygen/22x22/animations/quassel_tray-fade-off-10.png oxygen/22x22/animations/quassel_tray-fade-on-9.png oxygen/22x22/animations/quassel_tray-fade-on-10.png - oxygen/16x16/apps/quassel_inactive.png oxygen/16x16/status/irc-channel-inactive.png oxygen/16x16/status/irc-channel-active.png oxygen/16x16/animations/quassel_tray-fade-on-8.png