Change bufferview icons

diff --git a/icons/import/blacklisted-icons b/icons/import/blacklisted-icons
index 5dceaf6..3840f85 100644 (file)
--- a/icons/import/blacklisted-icons
+++ b/icons/import/blacklisted-icons
@@ -1,4 +1 @@
-quassel_disconnected
-quassel_newmessage
-
-
+quassel_inactive

diff --git a/icons/oxygen.qrc b/icons/oxygen.qrc
index e48cae3..fddc092 100644 (file)
--- a/icons/oxygen.qrc
+++ b/icons/oxygen.qrc
@@ -210,6 +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/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/security-high.png</file>
     <file>oxygen/16x16/devices/network-wired.png</file>
     <file>oxygen/16x16/actions/edit-delete.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/user-offline.png b/icons/oxygen/16x16/status/user-offline.png
new file mode 100644 (file)
index 0000000..fd50901
Binary files /dev/null and b/icons/oxygen/16x16/status/user-offline.png differ

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

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

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

diff --git a/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 91d910c..ae296ad 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),
   : QSortFilterProxyModel(model),
     _config(0),
     _sortOrder(Qt::AscendingOrder),

-    _channelJoinedIcon(SmallIcon("irc-join-channel")),
-    _channelPartedIcon(SmallIcon("irc-close-channel")),
+    _channelJoinedIcon(SmallIcon("user-online")),
+    _channelPartedIcon(SmallIcon("user-offline")),

     _userOfflineIcon(SmallIcon("im-user-offline")),
     _userAwayIcon(SmallIcon("im-user-away")),
     _userOnlineIcon(SmallIcon("im-user")),
     _userOfflineIcon(SmallIcon("im-user-offline")),
     _userAwayIcon(SmallIcon("im-user-away")),
     _userOnlineIcon(SmallIcon("im-user")),