/***************************************************************************
- * Copyright (C) 2005-2018 by the Quassel Project *
+ * Copyright (C) 2005-2019 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#pragma once
+#include <memory>
+
#include <QList>
#include <QPointer>
#include "coreconnection.h"
#include "highlightrulemanager.h"
#include "quassel.h"
+#include "singleton.h"
#include "types.h"
class Message;
struct NetworkInfo;
-class Client : public QObject
+class Client : public QObject, public Singleton<Client>
{
Q_OBJECT
RemoteCore
};
- static bool instanceExists();
- static Client *instance();
- static void destroy();
- static void init(AbstractUi *);
+ Client(std::unique_ptr<AbstractUi>, QObject *parent = nullptr);
+ ~Client() override;
+
static AbstractUi *mainUi();
static QList<NetworkId> networkIds();
emit showIgnoreList(ignoreRule);
}
-#if QT_VERSION < 0x050000
- static void logMessage(QtMsgType type, const char *msg);
-#else
- static void logMessage(QtMsgType, const QMessageLogContext&, const QString&);
-#endif
- static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
-
- void displayChannelList(NetworkId networkId) {
- emit showChannelList(networkId);
+ /**
+ * Request to show the channel list dialog for the network, optionally searching by channel name
+ *
+ * @see Client::showChannelList()
+ *
+ * @param networkId Network ID for associated network
+ * @param channelFilters Partial channel name to search for, or empty to show all
+ * @param listImmediately If true, immediately list channels, otherwise just show dialog
+ */
+ void displayChannelList(NetworkId networkId, const QString &channelFilters = {},
+ bool listImmediately = false)
+ {
+ emit showChannelList(networkId, channelFilters, listImmediately);
}
signals:
void requestNetworkStates();
void showConfigWizard(const QVariantMap &coredata);
- void showChannelList(NetworkId networkId);
+
+ /**
+ * Request to show the channel list dialog for the network, optionally searching by channel name
+ *
+ * @see MainWin::showChannelList()
+ *
+ * @param networkId Network ID for associated network
+ * @param channelFilters Partial channel name to search for, or empty to show all
+ * @param listImmediately If true, immediately list channels, otherwise just show dialog
+ */
+ void showChannelList(NetworkId networkId, const QString &channelFilters = {},
+ bool listImmediately = false);
+
void showIgnoreList(QString ignoreRule);
void connected();
void requestCreateNetwork(const NetworkInfo &info, const QStringList &persistentChannels = QStringList());
void requestRemoveNetwork(NetworkId);
- void logUpdated(const QString &msg);
-
//! Emitted when a buffer has been marked as read
/** This is currently triggered by setting lastSeenMsg, either local or remote,
* or by bringing the window to front.
//! Emitted when database schema upgrade starts or ends (only mono client)
void dbUpgradeInProgress(bool inProgress);
+ //! Emitted before an exit request is handled
+ void exitRequested(const QString &reason);
+
public slots:
void disconnectFromCore();
void markBufferAsRead(BufferId id);
void onDbUpgradeInProgress(bool inProgress);
+ void onExitRequested(int exitCode, const QString &reason);
private slots:
void setSyncedToCore();
void sendBufferedUserInput();
private:
- Client(QObject *parent = 0);
- virtual ~Client();
- void init();
-
void requestInitialBacklog();
/**
static void addNetwork(Network *);
- static QPointer<Client> instanceptr;
-
SignalProxy *_signalProxy;
- AbstractUi *_mainUi;
+ std::unique_ptr<AbstractUi> _mainUi;
NetworkModel *_networkModel;
BufferModel *_bufferModel;
BufferSyncer *_bufferSyncer;
bool _connected;
- QString _debugLogBuffer;
- QTextStream _debugLog;
-
QList<QPair<BufferInfo, QString> > _userInputBuffer;
friend class CoreConnection;