X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fcontextmenuactionprovider.cpp;h=79c9d19b0bd2df1f71e9d8389825d7cf4fd15c5e;hp=3eefc1685c351ba2ebcd48eef5e8f50abe79d73a;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=9d54503555534a2c554f09a33df6afa33d6308ec diff --git a/src/uisupport/contextmenuactionprovider.cpp b/src/uisupport/contextmenuactionprovider.cpp index 3eefc168..79c9d19b 100644 --- a/src/uisupport/contextmenuactionprovider.cpp +++ b/src/uisupport/contextmenuactionprovider.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2014 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,32 +18,32 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include "contextmenuactionprovider.h" + #include #include #include #include -#include "contextmenuactionprovider.h" - #include "buffermodel.h" #include "buffersettings.h" -#include "iconloader.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, SmallIcon("network-connect"), tr("Connect")); - registerAction(NetworkDisconnect, SmallIcon("network-disconnect"), tr("Disconnect")); + registerAction(NetworkConnect, icon::get("network-connect"), tr("Connect")); + registerAction(NetworkDisconnect, icon::get("network-disconnect"), tr("Disconnect")); - registerAction(BufferJoin, SmallIcon("irc-join-channel"), tr("Join")); - registerAction(BufferPart, SmallIcon("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")); + registerAction(HideJoinPartQuit, tr("Joins/Parts/Quits")); registerAction(HideJoin, tr("Joins"), true); registerAction(HidePart, tr("Parts"), true); registerAction(HideQuit, tr("Quits"), true); @@ -54,7 +54,7 @@ ContextMenuActionProvider::ContextMenuActionProvider(QObject *parent) : NetworkM registerAction(HideApplyToAll, tr("Set as Default...")); registerAction(HideUseDefaults, tr("Use Defaults...")); - registerAction(JoinChannel, SmallIcon("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")); @@ -76,22 +76,25 @@ ContextMenuActionProvider::ContextMenuActionProvider(QObject *parent) : NetworkM registerAction(NickIgnoreToggleEnabled3, "Enable", true); registerAction(NickIgnoreToggleEnabled4, "Enable", true); - registerAction(NickOp, SmallIcon("irc-operator"), tr("Give Operator Status")); - registerAction(NickDeop, SmallIcon("irc-remove-operator"), tr("Take Operator Status")); - registerAction(NickHalfop, SmallIcon("irc-voice"), tr("Give Half-Operator Status")); - registerAction(NickDehalfop, SmallIcon("irc-unvoice"), tr("Take Half-Operator Status")); - registerAction(NickVoice, SmallIcon("irc-voice"), tr("Give Voice")); - registerAction(NickDevoice, SmallIcon("irc-unvoice"), tr("Take Voice")); - registerAction(NickKick, SmallIcon("im-kick-user"), tr("Kick From Channel")); - registerAction(NickBan, SmallIcon("im-ban-user"), tr("Ban From Channel")); - registerAction(NickKickBan, SmallIcon("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(); + auto *hideEventsMenu = new QMenu(); + hideEventsMenu->addAction(action(HideJoinPartQuit)); + hideEventsMenu->addSeparator(); hideEventsMenu->addAction(action(HideJoin)); hideEventsMenu->addAction(action(HidePart)); hideEventsMenu->addAction(action(HideQuit)); @@ -102,18 +105,18 @@ 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(); + auto *nickCtcpMenu = new QMenu(); nickCtcpMenu->addAction(action(NickCtcpPing)); 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(); + auto *nickModeMenu = new QMenu(); nickModeMenu->addAction(action(NickOp)); nickModeMenu->addAction(action(NickDeop)); // this is where the halfops will be placed if available @@ -125,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); + auto *ignoreMenu = new QMenu(); + _nickIgnoreMenuAction = new Action(tr("Ignore"), nullptr); _nickIgnoreMenuAction->setMenu(ignoreMenu); // These are disabled actions used as descriptions @@ -168,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); } @@ -188,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); } @@ -282,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(); @@ -343,7 +348,7 @@ void ContextMenuActionProvider::addIrcUserActions(QMenu *menu, const QModelIndex addAction(_nickModeMenuAction, menu, itemType == NetworkModel::IrcUserItemType); addAction(_nickCtcpMenuAction, menu); - IrcUser *ircUser = qobject_cast(index.data(NetworkModel::IrcUserRole).value()); + auto *ircUser = qobject_cast(index.data(NetworkModel::IrcUserRole).value()); if (ircUser) { Network *network = ircUser->network(); // only show entries for usermode +h if server supports it @@ -503,7 +508,7 @@ void ContextMenuActionProvider::addIgnoreMenu(QMenu *menu, const QString &hostma ignoreMenu->addAction(_ignoreDescriptions.at(1)); while (ruleIter != ignoreMap.constEnd()) { if (counter < 5) { - ActionType type = static_cast(NickIgnoreToggleEnabled0 + counter*0x100000); + auto type = static_cast(NickIgnoreToggleEnabled0 + counter*0x100000); Action *act = action(type); act->setText(ruleIter.key()); act->setProperty("ignoreRule", ruleIter.key()); @@ -511,7 +516,7 @@ void ContextMenuActionProvider::addIgnoreMenu(QMenu *menu, const QString &hostma ignoreMenu->addAction(act); } counter++; - ruleIter++; + ++ruleIter; } if (counter) ignoreMenu->addSeparator();