X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fnetworkmodelcontroller.cpp;h=94dd8d9ac4490500a77da506a943cde2c0cc7bea;hp=aaccc05f380a1d39d724eb8591c2ab1de3367858;hb=00e1a9c29e792ba4d65dba21b7ba04131bcb13bc;hpb=aebc2f7d1808b4ead2e0370f064ae3935c585840 diff --git a/src/uisupport/networkmodelcontroller.cpp b/src/uisupport/networkmodelcontroller.cpp index aaccc05f..94dd8d9a 100644 --- a/src/uisupport/networkmodelcontroller.cpp +++ b/src/uisupport/networkmodelcontroller.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 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,6 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include "networkmodelcontroller.h" + #include #include #include @@ -28,15 +30,14 @@ #include #include -#include "networkmodelcontroller.h" - #include "buffermodel.h" #include "buffersettings.h" +#include "client.h" #include "clientidentity.h" +#include "clientignorelistmanager.h" +#include "icon.h" #include "network.h" #include "util.h" -#include "clientignorelistmanager.h" -#include "client.h" NetworkModelController::NetworkModelController(QObject *parent) : QObject(parent), @@ -362,6 +363,7 @@ void NetworkModelController::handleHideAction(ActionType type, QAction *action) return; case HideApplyToAll: BufferSettings().setMessageFilter(filter); + // fallthrough case HideUseDefaults: if (_messageFilter) BufferSettings(_messageFilter->idString()).removeFilter(); @@ -410,8 +412,14 @@ void NetworkModelController::handleGeneralAction(ActionType type, QAction *actio break; } case ShowChannelList: + if (networkId.isValid()) { + // Don't immediately list channels, allowing customization of filter first + emit showChannelList(networkId, {}, false); + } + break; + case ShowNetworkConfig: if (networkId.isValid()) - emit showChannelList(networkId); + emit showNetworkConfig(networkId); break; case ShowIgnoreList: if (networkId.isValid()) @@ -544,7 +552,7 @@ void NetworkModelController::handleNickAction(ActionType type, QAction *action) NetworkModelController::JoinDlg::JoinDlg(const QModelIndex &index, QWidget *parent) : QDialog(parent) { - setWindowIcon(QIcon::fromTheme("irc-join-channel")); + setWindowIcon(icon::get("irc-join-channel")); setWindowTitle(tr("Join Channel")); QGridLayout *layout = new QGridLayout(this);