From dbebdc3d0ce67549cb72f4632c93ef6571bfcb51 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Mon, 20 Feb 2012 01:51:12 +0100 Subject: [PATCH] Rename the icons for inactive and alerted to conform with icon naming spec Dashes are used for level separation, so icon theme engines like Plasma's know to look into quassel.svgz if asked to provide the quassel-message icon. This fallback mechanism doesn't work when using quassel_mnessage instead, and thus breaks the rather new Air desktop theme. --- .../{quassel_inactive.png => quassel-inactive.png} | Bin .../{quassel_message.png => quassel-message.png} | Bin .../{quassel_inactive.png => quassel-inactive.png} | Bin .../{quassel_message.png => quassel-message.png} | Bin .../{quassel_inactive.png => quassel-inactive.png} | Bin .../{quassel_message.png => quassel-message.png} | Bin .../{quassel_inactive.png => quassel-inactive.png} | Bin .../{quassel_message.png => quassel-message.png} | Bin .../{quassel_inactive.png => quassel-inactive.png} | Bin .../{quassel_message.png => quassel-message.png} | Bin .../{quassel_inactive.png => quassel-inactive.png} | Bin .../{quassel_message.png => quassel-message.png} | Bin icons/import/blacklisted-icons | 4 ++-- src/qtui/mainwin.cpp | 2 +- src/qtui/statusnotifieritem.cpp | 4 ++-- src/qtui/systemtray.cpp | 4 ++-- 16 files changed, 7 insertions(+), 7 deletions(-) rename icons/hicolor/128x128/status/{quassel_inactive.png => quassel-inactive.png} (100%) rename icons/hicolor/128x128/status/{quassel_message.png => quassel-message.png} (100%) rename icons/hicolor/16x16/status/{quassel_inactive.png => quassel-inactive.png} (100%) rename icons/hicolor/16x16/status/{quassel_message.png => quassel-message.png} (100%) rename icons/hicolor/22x22/status/{quassel_inactive.png => quassel-inactive.png} (100%) rename icons/hicolor/22x22/status/{quassel_message.png => quassel-message.png} (100%) rename icons/hicolor/32x32/status/{quassel_inactive.png => quassel-inactive.png} (100%) rename icons/hicolor/32x32/status/{quassel_message.png => quassel-message.png} (100%) rename icons/hicolor/48x48/status/{quassel_inactive.png => quassel-inactive.png} (100%) rename icons/hicolor/48x48/status/{quassel_message.png => quassel-message.png} (100%) rename icons/hicolor/64x64/status/{quassel_inactive.png => quassel-inactive.png} (100%) rename icons/hicolor/64x64/status/{quassel_message.png => quassel-message.png} (100%) diff --git a/icons/hicolor/128x128/status/quassel_inactive.png b/icons/hicolor/128x128/status/quassel-inactive.png similarity index 100% rename from icons/hicolor/128x128/status/quassel_inactive.png rename to icons/hicolor/128x128/status/quassel-inactive.png diff --git a/icons/hicolor/128x128/status/quassel_message.png b/icons/hicolor/128x128/status/quassel-message.png similarity index 100% rename from icons/hicolor/128x128/status/quassel_message.png rename to icons/hicolor/128x128/status/quassel-message.png diff --git a/icons/hicolor/16x16/status/quassel_inactive.png b/icons/hicolor/16x16/status/quassel-inactive.png similarity index 100% rename from icons/hicolor/16x16/status/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 similarity index 100% rename from icons/hicolor/16x16/status/quassel_message.png rename to icons/hicolor/16x16/status/quassel-message.png diff --git a/icons/hicolor/22x22/status/quassel_inactive.png b/icons/hicolor/22x22/status/quassel-inactive.png similarity index 100% rename from icons/hicolor/22x22/status/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 similarity index 100% rename from icons/hicolor/22x22/status/quassel_message.png rename to icons/hicolor/22x22/status/quassel-message.png diff --git a/icons/hicolor/32x32/status/quassel_inactive.png b/icons/hicolor/32x32/status/quassel-inactive.png similarity index 100% rename from icons/hicolor/32x32/status/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 similarity index 100% rename from icons/hicolor/32x32/status/quassel_message.png rename to icons/hicolor/32x32/status/quassel-message.png diff --git a/icons/hicolor/48x48/status/quassel_inactive.png b/icons/hicolor/48x48/status/quassel-inactive.png similarity index 100% rename from icons/hicolor/48x48/status/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 similarity index 100% rename from icons/hicolor/48x48/status/quassel_message.png rename to icons/hicolor/48x48/status/quassel-message.png diff --git a/icons/hicolor/64x64/status/quassel_inactive.png b/icons/hicolor/64x64/status/quassel-inactive.png similarity index 100% rename from icons/hicolor/64x64/status/quassel_inactive.png rename to icons/hicolor/64x64/status/quassel-inactive.png diff --git a/icons/hicolor/64x64/status/quassel_message.png b/icons/hicolor/64x64/status/quassel-message.png similarity index 100% rename from icons/hicolor/64x64/status/quassel_message.png rename to icons/hicolor/64x64/status/quassel-message.png diff --git a/icons/import/blacklisted-icons b/icons/import/blacklisted-icons index ec6bf2d9..d72687fc 100644 --- a/icons/import/blacklisted-icons +++ b/icons/import/blacklisted-icons @@ -1,4 +1,4 @@ -quassel_inactive -quassel_message +quassel-inactive +quassel-message irc-channel-active irc-channel-inactive diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 00407efa..648f2bc1 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -304,7 +304,7 @@ void MainWin::updateIcon() { if(Client::isConnected()) icon = DesktopIcon("quassel", size); else - icon = DesktopIcon("quassel_inactive", size); + icon = DesktopIcon("quassel-inactive", size); setWindowIcon(icon); qApp->setWindowIcon(icon); } diff --git a/src/qtui/statusnotifieritem.cpp b/src/qtui/statusnotifieritem.cpp index ce3d3d88..ff397034 100644 --- a/src/qtui/statusnotifieritem.cpp +++ b/src/qtui/statusnotifieritem.cpp @@ -222,14 +222,14 @@ QString StatusNotifierItem::title() const { QString StatusNotifierItem::iconName() const { if(state() == Passive) - return QString("quassel_inactive"); + return QString("quassel-inactive"); else return QString("quassel"); } QString StatusNotifierItem::attentionIconName() const { if(animationEnabled()) - return QString("quassel_message"); + return QString("quassel-message"); else return QString("quassel"); } diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp index 83cb8d97..59d54721 100644 --- a/src/qtui/systemtray.cpp +++ b/src/qtui/systemtray.cpp @@ -39,9 +39,9 @@ SystemTray::SystemTray(QWidget *parent) _mode(Invalid), _state(Passive), _shouldBeVisible(true), - _passiveIcon(DesktopIcon("quassel_inactive")), + _passiveIcon(DesktopIcon("quassel-inactive")), _activeIcon(DesktopIcon("quassel")), - _needsAttentionIcon(DesktopIcon("quassel_message")), + _needsAttentionIcon(DesktopIcon("quassel-message")), _trayMenu(0), _associatedWidget(parent) { -- 2.20.1