/***************************************************************************
- * Copyright (C) 2005-2012 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 *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include <QIcon>
#include <QInputDialog>
#include <QMenu>
#include <QMessageBox>
#include "buffermodel.h"
#include "buffersettings.h"
-#include "iconloader.h"
#include "clientidentity.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, QIcon::fromTheme("network-connect"), tr("Connect"));
+ registerAction(NetworkDisconnect, QIcon::fromTheme("network-disconnect"), tr("Disconnect"));
- registerAction(BufferJoin, SmallIcon("irc-join-channel"), tr("Join"));
- registerAction(BufferPart, SmallIcon("irc-close-channel"), tr("Part"));
+ registerAction(BufferJoin, QIcon::fromTheme("irc-join-channel"), tr("Join"));
+ registerAction(BufferPart, QIcon::fromTheme("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);
registerAction(HideApplyToAll, tr("Set as Default..."));
registerAction(HideUseDefaults, tr("Use Defaults..."));
- registerAction(JoinChannel, SmallIcon("irc-join-channel"), tr("Join Channel..."));
+ registerAction(JoinChannel, QIcon::fromTheme("irc-join-channel"), tr("Join Channel..."));
registerAction(NickQuery, tr("Start Query"));
registerAction(NickSwitchTo, tr("Show Query"));
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, 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(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();
+ hideEventsMenu->addAction(action(HideJoinPartQuit));
+ hideEventsMenu->addSeparator();
hideEventsMenu->addAction(action(HideJoin));
hideEventsMenu->addAction(action(HidePart));
hideEventsMenu->addAction(action(HideQuit));
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();
ignoreMenu->addAction(act);
}
counter++;
- ruleIter++;
+ ++ruleIter;
}
if (counter)
ignoreMenu->addSeparator();