Deuglify channel state icons

Thanks to Daniel "billie" Pielmeier for providing suitable icons!

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

diff --git a/icons/oxygen.qrc b/icons/oxygen.qrc
index fddc092..14a5e90 100644 (file)
--- a/icons/oxygen.qrc
+++ b/icons/oxygen.qrc
@@ -210,8 +210,8 @@
     <file>oxygen/16x16/apps/quassel.png</file>
     <file>oxygen/16x16/status/security-low.png</file>
     <file>oxygen/16x16/status/user-away.png</file>
-    <file>oxygen/16x16/status/user-online.png</file>
-    <file>oxygen/16x16/status/user-offline.png</file>
+    <file>oxygen/16x16/status/irc-channel-inactive.png</file>
+    <file>oxygen/16x16/status/irc-channel-active.png</file>
     <file>oxygen/16x16/status/security-high.png</file>
     <file>oxygen/16x16/devices/network-wired.png</file>
     <file>oxygen/16x16/actions/edit-delete.png</file>

diff --git a/icons/oxygen/16x16/status/irc-channel-active.png b/icons/oxygen/16x16/status/irc-channel-active.png
new file mode 100644 (file)
index 0000000..f131712
Binary files /dev/null and b/icons/oxygen/16x16/status/irc-channel-active.png differ

diff --git a/icons/oxygen/16x16/status/irc-channel-inactive.png b/icons/oxygen/16x16/status/irc-channel-inactive.png
new file mode 100644 (file)
index 0000000..0c9ffa1
Binary files /dev/null and b/icons/oxygen/16x16/status/irc-channel-inactive.png differ

diff --git a/icons/oxygen/16x16/status/user-offline.png b/icons/oxygen/16x16/status/user-offline.png
deleted file mode 100644 (file)
index fd50901..0000000
Binary files a/icons/oxygen/16x16/status/user-offline.png and /dev/null differ

diff --git a/icons/oxygen/16x16/status/user-online.png b/icons/oxygen/16x16/status/user-online.png
deleted file mode 100644 (file)
index 1221e13..0000000
Binary files a/icons/oxygen/16x16/status/user-online.png and /dev/null differ

diff --git a/icons/oxygen/scalable/status/irc-channel-active.svgz b/icons/oxygen/scalable/status/irc-channel-active.svgz
new file mode 100644 (file)
index 0000000..31c5326
Binary files /dev/null and b/icons/oxygen/scalable/status/irc-channel-active.svgz differ

diff --git a/icons/oxygen/scalable/status/irc-channel-inactive.svgz b/icons/oxygen/scalable/status/irc-channel-inactive.svgz
new file mode 100644 (file)
index 0000000..ab0429c
Binary files /dev/null and b/icons/oxygen/scalable/status/irc-channel-inactive.svgz differ

diff --git a/icons/oxygen/scalable/status/user-offline.svgz b/icons/oxygen/scalable/status/user-offline.svgz
deleted file mode 100644 (file)
index ceb4cbc..0000000
Binary files a/icons/oxygen/scalable/status/user-offline.svgz and /dev/null differ

diff --git a/icons/oxygen/scalable/status/user-online.svgz b/icons/oxygen/scalable/status/user-online.svgz
deleted file mode 100644 (file)
index 0e790d0..0000000
Binary files a/icons/oxygen/scalable/status/user-online.svgz and /dev/null differ

diff --git a/icons/oxygen_quassel/16x16/status/irc-channel-active.png b/icons/oxygen_quassel/16x16/status/irc-channel-active.png
new file mode 100644 (file)
index 0000000..f131712
Binary files /dev/null and b/icons/oxygen_quassel/16x16/status/irc-channel-active.png differ

diff --git a/icons/oxygen_quassel/16x16/status/irc-channel-inactive.png b/icons/oxygen_quassel/16x16/status/irc-channel-inactive.png
new file mode 100644 (file)
index 0000000..0c9ffa1
Binary files /dev/null and b/icons/oxygen_quassel/16x16/status/irc-channel-inactive.png differ

diff --git a/icons/oxygen_quassel/scalable/status/irc-channel-active.svgz b/icons/oxygen_quassel/scalable/status/irc-channel-active.svgz
new file mode 100644 (file)
index 0000000..31c5326
Binary files /dev/null and b/icons/oxygen_quassel/scalable/status/irc-channel-active.svgz differ

diff --git a/icons/oxygen_quassel/scalable/status/irc-channel-inactive.svgz b/icons/oxygen_quassel/scalable/status/irc-channel-inactive.svgz
new file mode 100644 (file)
index 0000000..ab0429c
Binary files /dev/null and b/icons/oxygen_quassel/scalable/status/irc-channel-inactive.svgz differ

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index ae296ad..cd89a9f 100644 (file)
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -45,8 +45,8 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *
   : QSortFilterProxyModel(model),
     _config(0),
     _sortOrder(Qt::AscendingOrder),
-    _channelJoinedIcon(SmallIcon("user-online")),
-    _channelPartedIcon(SmallIcon("user-offline")),
+    _channelJoinedIcon(SmallIcon("irc-channel-active")),
+    _channelPartedIcon(SmallIcon("irc-channel-inactive")),
     _userOfflineIcon(SmallIcon("im-user-offline")),
     _userAwayIcon(SmallIcon("im-user-away")),
     _userOnlineIcon(SmallIcon("im-user")),