X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcontextmenuactionprovider.cpp;h=6ef38684cb4c8bbe4e9541288d5a8d8bd4898cfd;hp=62d7aac1c97f7d50b18e2e35e7b287733887e288;hb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;hpb=b49c64970b6237fc95f8ca88c8bb6bcf04c251d7 diff --git a/src/uisupport/contextmenuactionprovider.cpp b/src/uisupport/contextmenuactionprovider.cpp index 62d7aac1..6ef38684 100644 --- a/src/uisupport/contextmenuactionprovider.cpp +++ b/src/uisupport/contextmenuactionprovider.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,29 +18,28 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include "contextmenuactionprovider.h" + #include #include #include #include -#include "contextmenuactionprovider.h" - #include "buffermodel.h" #include "buffersettings.h" -#include "clientidentity.h" -#include "network.h" -#include "util.h" #include "client.h" #include "clientignorelistmanager.h" +#include "icon.h" +#include "network.h" +#include "util.h" ContextMenuActionProvider::ContextMenuActionProvider(QObject *parent) : NetworkModelController(parent) { - registerAction(NetworkConnect, QIcon::fromTheme("network-connect"), tr("Connect")); - registerAction(NetworkDisconnect, QIcon::fromTheme("network-disconnect"), tr("Disconnect")); + registerAction(NetworkConnect, icon::get("network-connect"), tr("Connect")); + registerAction(NetworkDisconnect, icon::get("network-disconnect"), tr("Disconnect")); - registerAction(BufferJoin, QIcon::fromTheme("irc-join-channel"), tr("Join")); - registerAction(BufferPart, QIcon::fromTheme("irc-close-channel"), tr("Part")); + registerAction(BufferJoin, icon::get("irc-join-channel"), tr("Join")); + registerAction(BufferPart, icon::get("irc-close-channel"), tr("Part")); registerAction(BufferRemove, tr("Delete Chat(s)...")); registerAction(BufferSwitchTo, tr("Go to Chat")); @@ -55,7 +54,7 @@ ContextMenuActionProvider::ContextMenuActionProvider(QObject *parent) : NetworkM registerAction(HideApplyToAll, tr("Set as Default...")); registerAction(HideUseDefaults, tr("Use Defaults...")); - registerAction(JoinChannel, QIcon::fromTheme("irc-join-channel"), tr("Join Channel...")); + registerAction(JoinChannel, icon::get("irc-join-channel"), tr("Join Channel...")); registerAction(NickQuery, tr("Start Query")); registerAction(NickSwitchTo, tr("Show Query")); @@ -77,19 +76,20 @@ ContextMenuActionProvider::ContextMenuActionProvider(QObject *parent) : NetworkM registerAction(NickIgnoreToggleEnabled3, "Enable", true); registerAction(NickIgnoreToggleEnabled4, "Enable", true); - registerAction(NickOp, QIcon::fromTheme("irc-operator"), tr("Give Operator Status")); - registerAction(NickDeop, QIcon::fromTheme("irc-remove-operator"), tr("Take Operator Status")); - registerAction(NickHalfop, QIcon::fromTheme("irc-voice"), tr("Give Half-Operator Status")); - registerAction(NickDehalfop, QIcon::fromTheme("irc-unvoice"), tr("Take Half-Operator Status")); - registerAction(NickVoice, QIcon::fromTheme("irc-voice"), tr("Give Voice")); - registerAction(NickDevoice, QIcon::fromTheme("irc-unvoice"), tr("Take Voice")); - registerAction(NickKick, QIcon::fromTheme("im-kick-user"), tr("Kick From Channel")); - registerAction(NickBan, QIcon::fromTheme("im-ban-user"), tr("Ban From Channel")); - registerAction(NickKickBan, QIcon::fromTheme("im-ban-kick-user"), tr("Kick && Ban")); + registerAction(NickOp, icon::get("irc-operator"), tr("Give Operator Status")); + registerAction(NickDeop, icon::get("irc-remove-operator"), tr("Take Operator Status")); + registerAction(NickHalfop, icon::get("irc-voice"), tr("Give Half-Operator Status")); + registerAction(NickDehalfop, icon::get("irc-unvoice"), tr("Take Half-Operator Status")); + registerAction(NickVoice, icon::get("irc-voice"), tr("Give Voice")); + registerAction(NickDevoice, icon::get("irc-unvoice"), tr("Take Voice")); + registerAction(NickKick, icon::get("im-kick-user"), tr("Kick From Channel")); + registerAction(NickBan, icon::get("im-ban-user"), tr("Ban From Channel")); + registerAction(NickKickBan, icon::get("im-ban-kick-user"), tr("Kick && Ban")); registerAction(HideBufferTemporarily, tr("Hide Chat(s) Temporarily")); registerAction(HideBufferPermanently, tr("Hide Chat(s) Permanently")); registerAction(ShowChannelList, tr("Show Channel List")); + registerAction(ShowNetworkConfig, tr("Configure")); registerAction(ShowIgnoreList, tr("Show Ignore List")); QMenu *hideEventsMenu = new QMenu(); @@ -105,7 +105,7 @@ ContextMenuActionProvider::ContextMenuActionProvider(QObject *parent) : NetworkM hideEventsMenu->addSeparator(); hideEventsMenu->addAction(action(HideApplyToAll)); hideEventsMenu->addAction(action(HideUseDefaults)); - _hideEventsMenuAction = new Action(tr("Hide Events"), 0); + _hideEventsMenuAction = new Action(tr("Hide Events"), nullptr); _hideEventsMenuAction->setMenu(hideEventsMenu); QMenu *nickCtcpMenu = new QMenu(); @@ -113,7 +113,7 @@ ContextMenuActionProvider::ContextMenuActionProvider(QObject *parent) : NetworkM nickCtcpMenu->addAction(action(NickCtcpVersion)); nickCtcpMenu->addAction(action(NickCtcpTime)); nickCtcpMenu->addAction(action(NickCtcpClientinfo)); - _nickCtcpMenuAction = new Action(tr("CTCP"), 0); + _nickCtcpMenuAction = new Action(tr("CTCP"), nullptr); _nickCtcpMenuAction->setMenu(nickCtcpMenu); QMenu *nickModeMenu = new QMenu(); @@ -128,11 +128,11 @@ ContextMenuActionProvider::ContextMenuActionProvider(QObject *parent) : NetworkM nickModeMenu->addAction(action(NickKick)); nickModeMenu->addAction(action(NickBan)); nickModeMenu->addAction(action(NickKickBan)); - _nickModeMenuAction = new Action(tr("Actions"), 0); + _nickModeMenuAction = new Action(tr("Actions"), nullptr); _nickModeMenuAction->setMenu(nickModeMenu); QMenu *ignoreMenu = new QMenu(); - _nickIgnoreMenuAction = new Action(tr("Ignore"), 0); + _nickIgnoreMenuAction = new Action(tr("Ignore"), nullptr); _nickIgnoreMenuAction->setMenu(ignoreMenu); // These are disabled actions used as descriptions @@ -171,7 +171,7 @@ void ContextMenuActionProvider::addActions(QMenu *menu, const QModelIndex &index { if (!index.isValid()) return; - addActions(menu, QList() << index, 0, QString(), receiver, method, isCustomBufferView); + addActions(menu, QList() << index, nullptr, QString(), receiver, method, isCustomBufferView); } @@ -191,7 +191,7 @@ void ContextMenuActionProvider::addActions(QMenu *menu, MessageFilter *filter, B void ContextMenuActionProvider::addActions(QMenu *menu, const QList &indexList, QObject *receiver, const char *method, bool isCustomBufferView) { - addActions(menu, indexList, 0, QString(), receiver, method, isCustomBufferView); + addActions(menu, indexList, nullptr, QString(), receiver, method, isCustomBufferView); } @@ -285,6 +285,8 @@ void ContextMenuActionProvider::addNetworkItemActions(QMenu *menu, const QModelI if (!network) return; + addAction(ShowNetworkConfig, menu, index); + menu->addSeparator(); addAction(NetworkConnect, menu, network->connectionState() == Network::Disconnected); addAction(NetworkDisconnect, menu, network->connectionState() != Network::Disconnected); menu->addSeparator();