Fix Icon fallback issue

and make the connect/disconnect to core buttons 'themeable'
and fix some wrong inactive icon fallback in code

diff --git a/icons/hicolor.qrc b/icons/hicolor.qrc
index d2e7cca..b074d12 100644 (file)
--- a/icons/hicolor.qrc
+++ b/icons/hicolor.qrc
@@ -7,23 +7,24 @@
     <file alias="quassel-32.png">hicolor/32x32/apps/quassel.png</file>
     <file alias="quassel-64.png">hicolor/64x64/apps/quassel.png</file>
     <file alias="quassel-128.png">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 alias="quassel-message.png">hicolor/48x48/status/quassel-message.png</file>
-    <file>hicolor/64x64/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/16x16/actions/quassel-disconnect.png</file>
-    <file>hicolor/22x22/actions/quassel-disconnect.png</file>
-    <file>hicolor/32x32/actions/quassel-disconnect.png</file>
-    <file alias="quassel-disconnect.png">hicolor/48x48/actions/quassel-disconnect.png</file>
-    <file>hicolor/64x64/actions/quassel-disconnect.png</file>
-    <file>hicolor/128x128/actions/quassel-disconnect.png</file>
-    <file alias="quassel-inactive.png">hicolor/48x48/status/quassel-inactive.png</file>
-    <file alias="quassel-inactive-64.png">hicolor/64x64/status/quassel-inactive.png</file>
-    <file alias="quassel-inactive-128.png">hicolor/128x128/status/quassel-inactive.png</file>
+    <file>hicolor/16x16/status/message-quassel.png</file>
+    <file>hicolor/22x22/status/message-quassel.png</file>
+    <file>hicolor/32x32/status/message-quassel.png</file>
+    <file alias="message-quassel.png">hicolor/48x48/status/message-quassel.png</file>
+    <file>hicolor/64x64/status/message-quassel.png</file>
+    <file>hicolor/16x16/status/inactive-quassel.png</file>
+    <file>hicolor/22x22/status/inactive-quassel.png</file>
+    <file>hicolor/32x32/status/inactive-quassel.png</file>
+    <file>hicolor/16x16/actions/disconnect-quassel.png</file>
+    <file>hicolor/22x22/actions/disconnect-quassel.png</file>
+    <file>hicolor/32x32/actions/disconnect-quassel.png</file>
+    <file alias="connect-quassel.png">hicolor/48x48/apps/quassel.png</file>
+    <file alias="disconnect-quassel.png">hicolor/48x48/actions/disconnect-quassel.png</file>
+    <file>hicolor/64x64/actions/disconnect-quassel.png</file>
+    <file>hicolor/128x128/actions/disconnect-quassel.png</file>
+    <file alias="inactive-quassel.png">hicolor/48x48/status/inactive-quassel.png</file>
+    <file alias="inactive-quassel-64.png">hicolor/64x64/status/inactive-quassel.png</file>
+    <file alias="inactive-quassel-128.png">hicolor/128x128/status/inactive-quassel.png</file>
     <file alias="irc-channel-joined.png">hicolor/16x16/status/irc-channel-joined.png</file>
     <file alias="irc-channel-parted.png">hicolor/16x16/status/irc-channel-parted.png</file>
     <file alias="im-user.png">hicolor/16x16/actions/im-user.png</file>

diff --git a/icons/hicolor/128x128/actions/quassel-disconnect.png b/icons/hicolor/128x128/actions/disconnect-quassel.png
similarity index 100%
rename from icons/hicolor/128x128/actions/quassel-disconnect.png
rename to icons/hicolor/128x128/actions/disconnect-quassel.png

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

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

diff --git a/icons/hicolor/16x16/actions/quassel-disconnect.png b/icons/hicolor/16x16/actions/disconnect-quassel.png
similarity index 100%
rename from icons/hicolor/16x16/actions/quassel-disconnect.png
rename to icons/hicolor/16x16/actions/disconnect-quassel.png

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

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

diff --git a/icons/hicolor/22x22/actions/quassel-disconnect.png b/icons/hicolor/22x22/actions/disconnect-quassel.png
similarity index 100%
rename from icons/hicolor/22x22/actions/quassel-disconnect.png
rename to icons/hicolor/22x22/actions/disconnect-quassel.png

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

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

diff --git a/icons/hicolor/32x32/actions/quassel-disconnect.png b/icons/hicolor/32x32/actions/disconnect-quassel.png
similarity index 100%
rename from icons/hicolor/32x32/actions/quassel-disconnect.png
rename to icons/hicolor/32x32/actions/disconnect-quassel.png

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

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

diff --git a/icons/hicolor/48x48/actions/quassel-disconnect.png b/icons/hicolor/48x48/actions/disconnect-quassel.png
similarity index 100%
rename from icons/hicolor/48x48/actions/quassel-disconnect.png
rename to icons/hicolor/48x48/actions/disconnect-quassel.png

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

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

diff --git a/icons/hicolor/64x64/actions/quassel-disconnect.png b/icons/hicolor/64x64/actions/disconnect-quassel.png
similarity index 100%
rename from icons/hicolor/64x64/actions/quassel-disconnect.png
rename to icons/hicolor/64x64/actions/disconnect-quassel.png

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

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

diff --git a/icons/hicolor/scalable/action/quassel-disconnect.svg b/icons/hicolor/scalable/action/disconnect-quassel.svg
similarity index 100%
rename from icons/hicolor/scalable/action/quassel-disconnect.svg
rename to icons/hicolor/scalable/action/disconnect-quassel.svg

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index cdaf51d..9e7a70a 100644 (file)
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -378,7 +378,7 @@ void MainWin::updateIcon()
     if (Client::isConnected())
         icon = QIcon::fromTheme("quassel", QIcon(":/icons/quassel-128.png"));
     else
-        icon = QIcon::fromTheme("quassel-inactive", QIcon(":/icons/quassel-128.png"));
+        icon = QIcon::fromTheme("inactive-quassel", QIcon(":/icons/inactive-quassel.png"));
     setWindowIcon(icon);
     qApp->setWindowIcon(icon);
 }
@@ -388,9 +388,9 @@ void MainWin::setupActions()
 {
     ActionCollection *coll = QtUi::actionCollection("General", tr("General"));
     // File
-    coll->addAction("ConnectCore", new Action(QIcon(":/icons/quassel-128.png"), tr("&Connect to Core..."), coll,
+    coll->addAction("ConnectCore", new Action(QIcon::fromTheme("connect-quassel", QIcon(":/icons/connect-quassel.png")), tr("&Connect to Core..."), coll,
             this, SLOT(showCoreConnectionDlg())));
-    coll->addAction("DisconnectCore", new Action(QIcon(":/icons/quassel-disconnect.png"), tr("&Disconnect from Core"), coll,
+    coll->addAction("DisconnectCore", new Action(QIcon::fromTheme("disconnect-quassel", QIcon(":/icons/disconnect-quassel.png")), tr("&Disconnect from Core"), coll,
             Client::instance(), SLOT(disconnectFromCore())));
     coll->addAction("ChangePassword", new Action(QIcon::fromTheme("dialog-password"), tr("Change &Password..."), coll,
             this, SLOT(showPasswordChangeDlg())));

diff --git a/src/qtui/statusnotifieritem.cpp b/src/qtui/statusnotifieritem.cpp
index 9f6f8d7..0a4f36e 100644 (file)
--- a/src/qtui/statusnotifieritem.cpp
+++ b/src/qtui/statusnotifieritem.cpp
@@ -242,7 +242,7 @@ QString StatusNotifierItem::title() const
 QString StatusNotifierItem::iconName() const
 {
     if (state() == Passive)
-        return QString("quassel-inactive");
+        return QString("inactive-quassel");
     else
         return QString("quassel");
 }
@@ -251,7 +251,7 @@ QString StatusNotifierItem::iconName() const
 QString StatusNotifierItem::attentionIconName() const
 {
     if (animationEnabled())
-        return QString("quassel-message");
+        return QString("message-quassel");
     else
         return QString("quassel");
 }

diff --git a/src/qtui/systemtray.cpp b/src/qtui/systemtray.cpp
index 949523e..54c6024 100644 (file)
--- 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(QIcon::fromTheme("quassel-inactive", QIcon(":/icons/quassel-inactive.png"))),
+    _passiveIcon(QIcon::fromTheme("inactive-quassel", QIcon(":/icons/inactive-quassel.png"))),
     _activeIcon(QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png"))),
-    _needsAttentionIcon(QIcon::fromTheme("quassel-message", QIcon(":/icons/quassel-message.png"))),
+    _needsAttentionIcon(QIcon::fromTheme("message-quassel", QIcon(":/icons/message-quassel.png"))),
     _trayMenu(0),
     _associatedWidget(parent)
 {