Use shiny new user icons for query buffers

diff --git a/icons/import/extra-icons b/icons/import/extra-icons
index e6e004a..5e3956d 100644 (file)
--- a/icons/import/extra-icons
+++ b/icons/import/extra-icons
@@ -1 +1 @@
-quassel 8 16 22 32 48 64 128
+quassel 16 22 32 48 64 128

diff --git a/icons/oxygen.qrc b/icons/oxygen.qrc
index a1064e5..3debfd8 100644 (file)
--- a/icons/oxygen.qrc
+++ b/icons/oxygen.qrc
@@ -18,9 +18,6 @@
     <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-away-extended.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/view-sidetree.png</file>
     <file>oxygen/16x16/status/security-high.png</file>
     <file>oxygen/16x16/devices/network-wired.png</file>
     <file>oxygen/16x16/actions/view-sidetree.png</file>


@@ -43,12 +40,15 @@
     <file>oxygen/16x16/actions/zoom-out.png</file>
     <file>oxygen/16x16/actions/application-exit.png</file>
     <file>oxygen/16x16/actions/go-down.png</file>
     <file>oxygen/16x16/actions/zoom-out.png</file>
     <file>oxygen/16x16/actions/application-exit.png</file>
     <file>oxygen/16x16/actions/go-down.png</file>

+    <file>oxygen/16x16/actions/im-user-away.png</file>

     <file>oxygen/16x16/actions/go-next.png</file>
     <file>oxygen/16x16/actions/network-connect.png</file>
     <file>oxygen/16x16/actions/media-playback-start.png</file>
     <file>oxygen/16x16/actions/dialog-cancel.png</file>
     <file>oxygen/16x16/actions/go-next.png</file>
     <file>oxygen/16x16/actions/network-connect.png</file>
     <file>oxygen/16x16/actions/media-playback-start.png</file>
     <file>oxygen/16x16/actions/dialog-cancel.png</file>

+    <file>oxygen/16x16/actions/im-user.png</file>

     <file>oxygen/16x16/actions/list-remove.png</file>
     <file>oxygen/16x16/actions/zoom-original.png</file>
     <file>oxygen/16x16/actions/edit-copy.png</file>
     <file>oxygen/16x16/actions/list-remove.png</file>
     <file>oxygen/16x16/actions/zoom-original.png</file>
     <file>oxygen/16x16/actions/edit-copy.png</file>

+    <file>oxygen/16x16/actions/im-user-offline.png</file>

   </qresource>
 </RCC>
   </qresource>
 </RCC>

diff --git a/icons/oxygen/16x16/status/user-away-extended.png b/icons/oxygen/16x16/status/user-away-extended.png
deleted file mode 100644 (file)
index 77de063..0000000
Binary files a/icons/oxygen/16x16/status/user-away-extended.png and /dev/null 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/user-away-extended.svgz b/icons/oxygen/scalable/status/user-away-extended.svgz
deleted file mode 100644 (file)
index f94b81a..0000000
Binary files a/icons/oxygen/scalable/status/user-away-extended.svgz and /dev/null 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/src/uisupport/bufferviewfilter.cpp b/src/uisupport/bufferviewfilter.cpp
index 1778490..f45d58a 100644 (file)
--- a/src/uisupport/bufferviewfilter.cpp
+++ b/src/uisupport/bufferviewfilter.cpp
@@ -44,9 +44,9 @@ BufferViewFilter::BufferViewFilter(QAbstractItemModel *model, BufferViewConfig *
   : QSortFilterProxyModel(model),
     _config(0),
     _sortOrder(Qt::AscendingOrder),
   : QSortFilterProxyModel(model),
     _config(0),
     _sortOrder(Qt::AscendingOrder),

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

     _editMode(false),
     _enableEditMode(tr("Edit Mode"), this)
 {
     _editMode(false),
     _enableEditMode(tr("Edit Mode"), this)
 {