Use 48x48 icons for the toolbar

With KDE, one might scale icons up to 48x48, and with non-KDE, the theme default
might be larger than 22x22 as well. So we use the larger icons (which will be scaled down
to the correct size anyway).

diff --git a/icons/oxygen.qrc b/icons/oxygen.qrc
index 489dabd..6ab29bf 100644 (file)
--- a/icons/oxygen.qrc
+++ b/icons/oxygen.qrc
@@ -3,6 +3,19 @@
     <file>oxygen/48x48/apps/quassel_inactive.png</file>
     <file>oxygen/48x48/apps/quassel.png</file>
     <file>oxygen/48x48/status/dialog-information.png</file>
     <file>oxygen/48x48/apps/quassel_inactive.png</file>
     <file>oxygen/48x48/apps/quassel.png</file>
     <file>oxygen/48x48/status/dialog-information.png</file>

+    <file>oxygen/48x48/actions/irc-unvoice.png</file>
+    <file>oxygen/48x48/actions/irc-remove-operator.png</file>
+    <file>oxygen/48x48/actions/network-disconnect.png</file>
+    <file>oxygen/48x48/actions/irc-voice.png</file>
+    <file>oxygen/48x48/actions/im-kick-user.png</file>
+    <file>oxygen/48x48/actions/im-ban-user.png</file>
+    <file>oxygen/48x48/actions/irc-join-channel.png</file>
+    <file>oxygen/48x48/actions/irc-operator.png</file>
+    <file>oxygen/48x48/actions/mail-message-new.png</file>
+    <file>oxygen/48x48/actions/network-connect.png</file>
+    <file>oxygen/48x48/actions/im-ban-kick-user.png</file>
+    <file>oxygen/48x48/actions/im-user.png</file>
+    <file>oxygen/48x48/actions/irc-close-channel.png</file>

     <file>oxygen/48x48/animations/quassel_tray-fade-on-8.png</file>
     <file>oxygen/48x48/animations/quassel_tray-fade-on-13.png</file>
     <file>oxygen/48x48/animations/quassel_tray-alert-4.png</file>
     <file>oxygen/48x48/animations/quassel_tray-fade-on-8.png</file>
     <file>oxygen/48x48/animations/quassel_tray-fade-on-13.png</file>
     <file>oxygen/48x48/animations/quassel_tray-alert-4.png</file>


@@ -154,23 +167,12 @@
     <file>oxygen/22x22/status/dialog-error.png</file>
     <file>oxygen/22x22/status/dialog-warning.png</file>
     <file>oxygen/22x22/actions/edit-rename.png</file>
     <file>oxygen/22x22/status/dialog-error.png</file>
     <file>oxygen/22x22/status/dialog-warning.png</file>
     <file>oxygen/22x22/actions/edit-rename.png</file>

-    <file>oxygen/22x22/actions/irc-unvoice.png</file>

     <file>oxygen/22x22/actions/list-remove-user.png</file>
     <file>oxygen/22x22/actions/list-remove-user.png</file>

-    <file>oxygen/22x22/actions/irc-remove-operator.png</file>

     <file>oxygen/22x22/actions/network-disconnect.png</file>
     <file>oxygen/22x22/actions/edit-clear-locationbar-rtl.png</file>
     <file>oxygen/22x22/actions/network-disconnect.png</file>
     <file>oxygen/22x22/actions/edit-clear-locationbar-rtl.png</file>

-    <file>oxygen/22x22/actions/irc-voice.png</file>
-    <file>oxygen/22x22/actions/im-kick-user.png</file>
-    <file>oxygen/22x22/actions/im-ban-user.png</file>
-    <file>oxygen/22x22/actions/irc-join-channel.png</file>
-    <file>oxygen/22x22/actions/irc-operator.png</file>
-    <file>oxygen/22x22/actions/mail-message-new.png</file>

     <file>oxygen/22x22/actions/list-add-user.png</file>
     <file>oxygen/22x22/actions/network-connect.png</file>
     <file>oxygen/22x22/actions/list-add-user.png</file>
     <file>oxygen/22x22/actions/network-connect.png</file>

-    <file>oxygen/22x22/actions/im-ban-kick-user.png</file>

     <file>oxygen/22x22/actions/dialog-close.png</file>
     <file>oxygen/22x22/actions/dialog-close.png</file>

-    <file>oxygen/22x22/actions/im-user.png</file>
-    <file>oxygen/22x22/actions/irc-close-channel.png</file>

     <file>oxygen/22x22/animations/quassel_tray-fade-on-8.png</file>
     <file>oxygen/22x22/animations/quassel_tray-fade-on-13.png</file>
     <file>oxygen/22x22/animations/quassel_tray-alert-4.png</file>
     <file>oxygen/22x22/animations/quassel_tray-fade-on-8.png</file>
     <file>oxygen/22x22/animations/quassel_tray-fade-on-13.png</file>
     <file>oxygen/22x22/animations/quassel_tray-alert-4.png</file>


@@ -218,7 +220,6 @@
     <file>oxygen/16x16/actions/edit-rename.png</file>
     <file>oxygen/16x16/actions/document-open.png</file>
     <file>oxygen/16x16/actions/go-up.png</file>
     <file>oxygen/16x16/actions/edit-rename.png</file>
     <file>oxygen/16x16/actions/document-open.png</file>
     <file>oxygen/16x16/actions/go-up.png</file>

-    <file>oxygen/16x16/actions/format-list-unordered.png</file>

     <file>oxygen/16x16/actions/document-encrypt.png</file>
     <file>oxygen/16x16/actions/irc-unvoice.png</file>
     <file>oxygen/16x16/actions/configure.png</file>
     <file>oxygen/16x16/actions/document-encrypt.png</file>
     <file>oxygen/16x16/actions/irc-unvoice.png</file>
     <file>oxygen/16x16/actions/configure.png</file>


@@ -252,7 +253,6 @@
     <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>
     <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>

-    <file>oxygen/16x16/actions/view-refresh.png</file>

     <file>oxygen/16x16/animations/quassel_tray-fade-on-8.png</file>
     <file>oxygen/16x16/animations/quassel_tray-fade-on-13.png</file>
     <file>oxygen/16x16/animations/quassel_tray-alert-4.png</file>
     <file>oxygen/16x16/animations/quassel_tray-fade-on-8.png</file>
     <file>oxygen/16x16/animations/quassel_tray-fade-on-13.png</file>
     <file>oxygen/16x16/animations/quassel_tray-alert-4.png</file>

diff --git a/icons/oxygen/16x16/actions/format-list-unordered.png b/icons/oxygen/16x16/actions/format-list-unordered.png
deleted file mode 100644 (file)
index 076bf18..0000000
Binary files a/icons/oxygen/16x16/actions/format-list-unordered.png and /dev/null differ

diff --git a/icons/oxygen/16x16/actions/view-refresh.png b/icons/oxygen/16x16/actions/view-refresh.png
deleted file mode 100644 (file)
index 86b6f82..0000000
Binary files a/icons/oxygen/16x16/actions/view-refresh.png and /dev/null differ

diff --git a/icons/oxygen/22x22/actions/im-ban-kick-user.png b/icons/oxygen/22x22/actions/im-ban-kick-user.png
deleted file mode 100644 (file)
index 180582c..0000000
Binary files a/icons/oxygen/22x22/actions/im-ban-kick-user.png and /dev/null differ

diff --git a/icons/oxygen/22x22/actions/im-ban-user.png b/icons/oxygen/22x22/actions/im-ban-user.png
deleted file mode 100644 (file)
index 3771291..0000000
Binary files a/icons/oxygen/22x22/actions/im-ban-user.png and /dev/null differ

diff --git a/icons/oxygen/22x22/actions/im-kick-user.png b/icons/oxygen/22x22/actions/im-kick-user.png
deleted file mode 100644 (file)
index f9f0eec..0000000
Binary files a/icons/oxygen/22x22/actions/im-kick-user.png and /dev/null differ

diff --git a/icons/oxygen/22x22/actions/im-user.png b/icons/oxygen/22x22/actions/im-user.png
deleted file mode 100644 (file)
index 69de2e4..0000000
Binary files a/icons/oxygen/22x22/actions/im-user.png and /dev/null differ

diff --git a/icons/oxygen/22x22/actions/irc-close-channel.png b/icons/oxygen/22x22/actions/irc-close-channel.png
deleted file mode 100644 (file)
index 7a62ed2..0000000
Binary files a/icons/oxygen/22x22/actions/irc-close-channel.png and /dev/null differ

diff --git a/icons/oxygen/22x22/actions/irc-join-channel.png b/icons/oxygen/22x22/actions/irc-join-channel.png
deleted file mode 100644 (file)
index 557e2f1..0000000
Binary files a/icons/oxygen/22x22/actions/irc-join-channel.png and /dev/null differ

diff --git a/icons/oxygen/22x22/actions/irc-operator.png b/icons/oxygen/22x22/actions/irc-operator.png
deleted file mode 100644 (file)
index a3707c4..0000000
Binary files a/icons/oxygen/22x22/actions/irc-operator.png and /dev/null differ

diff --git a/icons/oxygen/22x22/actions/irc-remove-operator.png b/icons/oxygen/22x22/actions/irc-remove-operator.png
deleted file mode 100644 (file)
index a8ea364..0000000
Binary files a/icons/oxygen/22x22/actions/irc-remove-operator.png and /dev/null differ

diff --git a/icons/oxygen/22x22/actions/irc-unvoice.png b/icons/oxygen/22x22/actions/irc-unvoice.png
deleted file mode 100644 (file)
index abfe3f9..0000000
Binary files a/icons/oxygen/22x22/actions/irc-unvoice.png and /dev/null differ

diff --git a/icons/oxygen/22x22/actions/irc-voice.png b/icons/oxygen/22x22/actions/irc-voice.png
deleted file mode 100644 (file)
index 5bb2ebe..0000000
Binary files a/icons/oxygen/22x22/actions/irc-voice.png and /dev/null differ

diff --git a/icons/oxygen/22x22/actions/mail-message-new.png b/icons/oxygen/22x22/actions/mail-message-new.png
deleted file mode 100644 (file)
index 2c34106..0000000
Binary files a/icons/oxygen/22x22/actions/mail-message-new.png and /dev/null differ

diff --git a/icons/oxygen/48x48/actions/im-ban-kick-user.png b/icons/oxygen/48x48/actions/im-ban-kick-user.png
new file mode 100644 (file)
index 0000000..d4cdcdb
Binary files /dev/null and b/icons/oxygen/48x48/actions/im-ban-kick-user.png differ

diff --git a/icons/oxygen/48x48/actions/im-ban-user.png b/icons/oxygen/48x48/actions/im-ban-user.png
new file mode 100644 (file)
index 0000000..f20a842
Binary files /dev/null and b/icons/oxygen/48x48/actions/im-ban-user.png differ

diff --git a/icons/oxygen/48x48/actions/im-kick-user.png b/icons/oxygen/48x48/actions/im-kick-user.png
new file mode 100644 (file)
index 0000000..4528a02
Binary files /dev/null and b/icons/oxygen/48x48/actions/im-kick-user.png differ

diff --git a/icons/oxygen/48x48/actions/im-user.png b/icons/oxygen/48x48/actions/im-user.png
new file mode 100644 (file)
index 0000000..d8d1938
Binary files /dev/null and b/icons/oxygen/48x48/actions/im-user.png differ

diff --git a/icons/oxygen/48x48/actions/irc-close-channel.png b/icons/oxygen/48x48/actions/irc-close-channel.png
new file mode 100644 (file)
index 0000000..d3dafb4
Binary files /dev/null and b/icons/oxygen/48x48/actions/irc-close-channel.png differ

diff --git a/icons/oxygen/48x48/actions/irc-join-channel.png b/icons/oxygen/48x48/actions/irc-join-channel.png
new file mode 100644 (file)
index 0000000..ab08151
Binary files /dev/null and b/icons/oxygen/48x48/actions/irc-join-channel.png differ

diff --git a/icons/oxygen/48x48/actions/irc-operator.png b/icons/oxygen/48x48/actions/irc-operator.png
new file mode 100644 (file)
index 0000000..dd93c58
Binary files /dev/null and b/icons/oxygen/48x48/actions/irc-operator.png differ

diff --git a/icons/oxygen/48x48/actions/irc-remove-operator.png b/icons/oxygen/48x48/actions/irc-remove-operator.png
new file mode 100644 (file)
index 0000000..19d0145
Binary files /dev/null and b/icons/oxygen/48x48/actions/irc-remove-operator.png differ

diff --git a/icons/oxygen/48x48/actions/irc-unvoice.png b/icons/oxygen/48x48/actions/irc-unvoice.png
new file mode 100644 (file)
index 0000000..0f65e00
Binary files /dev/null and b/icons/oxygen/48x48/actions/irc-unvoice.png differ

diff --git a/icons/oxygen/48x48/actions/irc-voice.png b/icons/oxygen/48x48/actions/irc-voice.png
new file mode 100644 (file)
index 0000000..8e49789
Binary files /dev/null and b/icons/oxygen/48x48/actions/irc-voice.png differ

diff --git a/icons/oxygen/48x48/actions/mail-message-new.png b/icons/oxygen/48x48/actions/mail-message-new.png
new file mode 100644 (file)
index 0000000..9e423fc
Binary files /dev/null and b/icons/oxygen/48x48/actions/mail-message-new.png differ

diff --git a/icons/oxygen/48x48/actions/network-connect.png b/icons/oxygen/48x48/actions/network-connect.png
new file mode 100644 (file)
index 0000000..c81a854
Binary files /dev/null and b/icons/oxygen/48x48/actions/network-connect.png differ

diff --git a/icons/oxygen/48x48/actions/network-disconnect.png b/icons/oxygen/48x48/actions/network-disconnect.png
new file mode 100644 (file)
index 0000000..84c6dfe
Binary files /dev/null and b/icons/oxygen/48x48/actions/network-disconnect.png differ

diff --git a/icons/oxygen/scalable/actions/view-refresh.svgz b/icons/oxygen/scalable/actions/view-refresh.svgz
deleted file mode 100644 (file)
index da4d02b..0000000
Binary files a/icons/oxygen/scalable/actions/view-refresh.svgz and /dev/null differ

diff --git a/src/uisupport/toolbaractionprovider.cpp b/src/uisupport/toolbaractionprovider.cpp
index 43cb41d..89ad738 100644 (file)
--- a/src/uisupport/toolbaractionprovider.cpp
+++ b/src/uisupport/toolbaractionprovider.cpp
@@ -28,25 +28,22 @@
 ToolBarActionProvider::ToolBarActionProvider(QObject *parent)
 : NetworkModelController(parent)
 {
 ToolBarActionProvider::ToolBarActionProvider(QObject *parent)
 : NetworkModelController(parent)
 {

-  registerAction(NetworkConnectAll, MainBarIcon("network-connect"), tr("Connect"))->setToolTip(tr("Connect to IRC"));
-  registerAction(NetworkDisconnectAll, MainBarIcon("network-disconnect"), tr("Disconnect"))->setToolTip(tr("Disconnect from IRC"));
-
-  registerAction(BufferPart, MainBarIcon("irc-close-channel"), tr("Part"))->setToolTip(tr("Leave currently selected channel"));
-  registerAction(JoinChannel, MainBarIcon("irc-join-channel"), tr("Join"))->setToolTip(tr("Join a channel"));
-
-  registerAction(NickQuery, MainBarIcon("mail-message-new"), tr("Query"))->setToolTip(tr("Start a private conversation")); // fix icon
-  registerAction(NickWhois, MainBarIcon("im-user"), tr("Whois"))->setToolTip(tr("Request user information")); // fix icon
-
-  registerAction(NickOp, MainBarIcon("irc-operator"), tr("Op"))->setToolTip(tr("Give operator privileges to user"));
-  registerAction(NickDeop, MainBarIcon("irc-remove-operator"), tr("Deop"))->setToolTip(tr("Take operator privileges from user"));
-  registerAction(NickVoice, MainBarIcon("irc-voice"), tr("Voice"))->setToolTip(tr("Give voice to user"));
-  registerAction(NickDevoice, MainBarIcon("irc-unvoice"), tr("Devoice"))->setToolTip(tr("Take voice from user"));
-  registerAction(NickKick, MainBarIcon("im-kick-user"), tr("Kick"))->setToolTip(tr("Remove user from channel"));
-  registerAction(NickBan, MainBarIcon("im-ban-user"), tr("Ban"))->setToolTip(tr("Ban user from channel"));
-  registerAction(NickKickBan, MainBarIcon("im-ban-kick-user"), tr("Kick/Ban"))->setToolTip(tr("Remove and ban user from channel"));
-
-  //registerAction(ShowChannelList, SmallIcon("format-list-unordered"), tr("Show Channel List"));
-  //registerAction(ShowIgnoreList, tr("Show Ignore List"));
+  registerAction(NetworkConnectAll, DesktopIcon("network-connect"), tr("Connect"))->setToolTip(tr("Connect to IRC"));
+  registerAction(NetworkDisconnectAll, DesktopIcon("network-disconnect"), tr("Disconnect"))->setToolTip(tr("Disconnect from IRC"));
+
+  registerAction(BufferPart, DesktopIcon("irc-close-channel"), tr("Part"))->setToolTip(tr("Leave currently selected channel"));
+  registerAction(JoinChannel, DesktopIcon("irc-join-channel"), tr("Join"))->setToolTip(tr("Join a channel"));
+
+  registerAction(NickQuery, DesktopIcon("mail-message-new"), tr("Query"))->setToolTip(tr("Start a private conversation")); // fix icon
+  registerAction(NickWhois, DesktopIcon("im-user"), tr("Whois"))->setToolTip(tr("Request user information")); // fix icon
+
+  registerAction(NickOp, DesktopIcon("irc-operator"), tr("Op"))->setToolTip(tr("Give operator privileges to user"));
+  registerAction(NickDeop, DesktopIcon("irc-remove-operator"), tr("Deop"))->setToolTip(tr("Take operator privileges from user"));
+  registerAction(NickVoice, DesktopIcon("irc-voice"), tr("Voice"))->setToolTip(tr("Give voice to user"));
+  registerAction(NickDevoice, DesktopIcon("irc-unvoice"), tr("Devoice"))->setToolTip(tr("Take voice from user"));
+  registerAction(NickKick, DesktopIcon("im-kick-user"), tr("Kick"))->setToolTip(tr("Remove user from channel"));
+  registerAction(NickBan, DesktopIcon("im-ban-user"), tr("Ban"))->setToolTip(tr("Ban user from channel"));
+  registerAction(NickKickBan, DesktopIcon("im-ban-kick-user"), tr("Kick/Ban"))->setToolTip(tr("Remove and ban user from channel"));

 
   _networksConnectMenu = new QMenu();
   _networksConnectMenu->setSeparatorsCollapsible(false);
 
   _networksConnectMenu = new QMenu();
   _networksConnectMenu->setSeparatorsCollapsible(false);