projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qa: Remove lots of superfluous semicolons
[quassel.git]
/
src
/
uisupport
/
networkmodelcontroller.cpp
diff --git
a/src/uisupport/networkmodelcontroller.cpp
b/src/uisupport/networkmodelcontroller.cpp
index
16243ef
..
94dd8d9
100644
(file)
--- a/
src/uisupport/networkmodelcontroller.cpp
+++ b/
src/uisupport/networkmodelcontroller.cpp
@@
-18,6
+18,8
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "networkmodelcontroller.h"
+
#include <QComboBox>
#include <QDialogButtonBox>
#include <QGridLayout>
#include <QComboBox>
#include <QDialogButtonBox>
#include <QGridLayout>
@@
-28,15
+30,14
@@
#include <QMessageBox>
#include <QPushButton>
#include <QMessageBox>
#include <QPushButton>
-#include "networkmodelcontroller.h"
-
#include "buffermodel.h"
#include "buffersettings.h"
#include "buffermodel.h"
#include "buffersettings.h"
+#include "client.h"
#include "clientidentity.h"
#include "clientidentity.h"
+#include "clientignorelistmanager.h"
+#include "icon.h"
#include "network.h"
#include "util.h"
#include "network.h"
#include "util.h"
-#include "clientignorelistmanager.h"
-#include "client.h"
NetworkModelController::NetworkModelController(QObject *parent)
: QObject(parent),
NetworkModelController::NetworkModelController(QObject *parent)
: QObject(parent),
@@
-362,7
+363,7
@@
void NetworkModelController::handleHideAction(ActionType type, QAction *action)
return;
case HideApplyToAll:
BufferSettings().setMessageFilter(filter);
return;
case HideApplyToAll:
BufferSettings().setMessageFilter(filter);
- [[clang::fallthrough]];
+ // fallthrough
case HideUseDefaults:
if (_messageFilter)
BufferSettings(_messageFilter->idString()).removeFilter();
case HideUseDefaults:
if (_messageFilter)
BufferSettings(_messageFilter->idString()).removeFilter();
@@
-411,8
+412,14
@@
void NetworkModelController::handleGeneralAction(ActionType type, QAction *actio
break;
}
case ShowChannelList:
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())
if (networkId.isValid())
- emit show
ChannelList
(networkId);
+ emit show
NetworkConfig
(networkId);
break;
case ShowIgnoreList:
if (networkId.isValid())
break;
case ShowIgnoreList:
if (networkId.isValid())
@@
-545,7
+552,7
@@
void NetworkModelController::handleNickAction(ActionType type, QAction *action)
NetworkModelController::JoinDlg::JoinDlg(const QModelIndex &index, QWidget *parent) : QDialog(parent)
{
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);
setWindowTitle(tr("Join Channel"));
QGridLayout *layout = new QGridLayout(this);