From: Manuel Nickschas Date: Tue, 14 Jul 2009 20:51:19 +0000 (+0200) Subject: Use 48x48 icons for the toolbar X-Git-Tag: 0.5-rc1~164 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=d4f83534f995dcc59ee50c57bb18521452310ba0 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 489dabd2..6ab29bf7 100644 --- a/icons/oxygen.qrc +++ b/icons/oxygen.qrc @@ -3,6 +3,19 @@ oxygen/48x48/apps/quassel_inactive.png oxygen/48x48/apps/quassel.png oxygen/48x48/status/dialog-information.png + oxygen/48x48/actions/irc-unvoice.png + oxygen/48x48/actions/irc-remove-operator.png + oxygen/48x48/actions/network-disconnect.png + oxygen/48x48/actions/irc-voice.png + oxygen/48x48/actions/im-kick-user.png + oxygen/48x48/actions/im-ban-user.png + oxygen/48x48/actions/irc-join-channel.png + oxygen/48x48/actions/irc-operator.png + oxygen/48x48/actions/mail-message-new.png + oxygen/48x48/actions/network-connect.png + oxygen/48x48/actions/im-ban-kick-user.png + oxygen/48x48/actions/im-user.png + oxygen/48x48/actions/irc-close-channel.png oxygen/48x48/animations/quassel_tray-fade-on-8.png oxygen/48x48/animations/quassel_tray-fade-on-13.png oxygen/48x48/animations/quassel_tray-alert-4.png @@ -154,23 +167,12 @@ oxygen/22x22/status/dialog-error.png oxygen/22x22/status/dialog-warning.png oxygen/22x22/actions/edit-rename.png - oxygen/22x22/actions/irc-unvoice.png oxygen/22x22/actions/list-remove-user.png - oxygen/22x22/actions/irc-remove-operator.png oxygen/22x22/actions/network-disconnect.png oxygen/22x22/actions/edit-clear-locationbar-rtl.png - oxygen/22x22/actions/irc-voice.png - oxygen/22x22/actions/im-kick-user.png - oxygen/22x22/actions/im-ban-user.png - oxygen/22x22/actions/irc-join-channel.png - oxygen/22x22/actions/irc-operator.png - oxygen/22x22/actions/mail-message-new.png oxygen/22x22/actions/list-add-user.png oxygen/22x22/actions/network-connect.png - oxygen/22x22/actions/im-ban-kick-user.png oxygen/22x22/actions/dialog-close.png - oxygen/22x22/actions/im-user.png - oxygen/22x22/actions/irc-close-channel.png oxygen/22x22/animations/quassel_tray-fade-on-8.png oxygen/22x22/animations/quassel_tray-fade-on-13.png oxygen/22x22/animations/quassel_tray-alert-4.png @@ -218,7 +220,6 @@ oxygen/16x16/actions/edit-rename.png oxygen/16x16/actions/document-open.png oxygen/16x16/actions/go-up.png - oxygen/16x16/actions/format-list-unordered.png oxygen/16x16/actions/document-encrypt.png oxygen/16x16/actions/irc-unvoice.png oxygen/16x16/actions/configure.png @@ -252,7 +253,6 @@ oxygen/16x16/actions/zoom-original.png oxygen/16x16/actions/edit-copy.png oxygen/16x16/actions/im-user-offline.png - oxygen/16x16/actions/view-refresh.png oxygen/16x16/animations/quassel_tray-fade-on-8.png oxygen/16x16/animations/quassel_tray-fade-on-13.png oxygen/16x16/animations/quassel_tray-alert-4.png diff --git a/icons/oxygen/16x16/actions/format-list-unordered.png b/icons/oxygen/16x16/actions/format-list-unordered.png deleted file mode 100644 index 076bf18a..00000000 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 index 86b6f82c..00000000 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 index 180582c0..00000000 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 index 37712914..00000000 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 index f9f0eec9..00000000 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 index 69de2e48..00000000 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 index 7a62ed21..00000000 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 index 557e2f10..00000000 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 index a3707c49..00000000 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 index a8ea3644..00000000 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 index abfe3f9d..00000000 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 index 5bb2ebe5..00000000 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 index 2c34106e..00000000 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 index 00000000..d4cdcdb2 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 index 00000000..f20a842a 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 index 00000000..4528a023 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 index 00000000..d8d19386 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 index 00000000..d3dafb4c 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 index 00000000..ab08151e 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 index 00000000..dd93c58a 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 index 00000000..19d0145b 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 index 00000000..0f65e002 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 index 00000000..8e497898 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 index 00000000..9e423fc4 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 index 00000000..c81a854d 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 index 00000000..84c6dfee 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 index da4d02b3..00000000 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 43cb41d7..89ad738d 100644 --- a/src/uisupport/toolbaractionprovider.cpp +++ b/src/uisupport/toolbaractionprovider.cpp @@ -28,25 +28,22 @@ 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);