X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=7642c3e6bbf3e09e37e21f2d1ee4d39275b022f3;hp=c3172a7f9e446d7f90b32f4fc51026b27dd82a0a;hb=92fc8c5b119111a35ab8423c3cbde5b2a022badf;hpb=93605206bc40e06446efabc71e155a3216dbb0b9 diff --git a/src/client/client.h b/src/client/client.h index c3172a7f..7642c3e6 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -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 * @@ -20,14 +20,20 @@ #pragma once +#include "client-export.h" + +#include + #include #include #include "bufferinfo.h" +#include "coreinfo.h" #include "coreaccount.h" #include "coreconnection.h" #include "highlightrulemanager.h" #include "quassel.h" +#include "singleton.h" #include "types.h" class Message; @@ -62,7 +68,7 @@ class TransferModel; struct NetworkInfo; -class Client : public QObject +class CLIENT_EXPORT Client : public QObject, public Singleton { Q_OBJECT @@ -72,10 +78,9 @@ public: RemoteCore }; - static bool instanceExists(); - static Client *instance(); - static void destroy(); - static void init(AbstractUi *); + Client(std::unique_ptr, QObject *parent = nullptr); + ~Client() override; + static AbstractUi *mainUi(); static QList networkIds(); @@ -115,6 +120,7 @@ public: static inline ClientAliasManager *aliasManager() { return instance()->_aliasManager; } static inline ClientBacklogManager *backlogManager() { return instance()->_backlogManager; } + static inline CoreInfo *coreInfo() { return instance()->_coreInfo; } static inline DccConfig *dccConfig() { return instance()->_dccConfig; } static inline ClientIrcListHelper *ircListHelper() { return instance()->_ircListHelper; } static inline ClientBufferViewManager *bufferViewManager() { return instance()->_bufferViewManager; } @@ -147,6 +153,17 @@ public: static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2); static void purgeKnownBufferIds(); + /** + * Requests client to resynchronize the CoreInfo object for legacy (pre-0.13) cores + * + * This provides compatibility with updating core information for legacy cores, and can be + * removed after protocol break. + * + * NOTE: On legacy (pre-0.13) cores, any existing connected signals will be destroyed and must + * be re-added after calling this, in addition to checking for existing data in coreInfo(). + */ + static void refreshLegacyCoreInfo(); + static void changePassword(const QString &oldPassword, const QString &newPassword); static void kickClient(int peerId); @@ -154,28 +171,55 @@ public: 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 disconnected(); void coreConnectionStateChanged(bool); + /** + * Signals that core information has been resynchronized, removing existing signal handlers + * + * Whenever this is emitted, one should re-add any handlers for CoreInfo::coreDataChanged() and + * apply any existing information in the coreInfo() object. + * + * Only emitted on legacy (pre-0.13) cores. Generally, one should use the + * CoreInfo::coreDataChanged() signal too. + */ + void coreInfoResynchronized(); + //! The identity with the given ID has been newly created in core and client. /** \param id The ID of the newly created identity. */ @@ -200,8 +244,6 @@ signals: 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. @@ -215,6 +257,12 @@ signals: void requestKickClient(int peerId); void passwordChanged(bool success); + //! 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(); @@ -224,6 +272,9 @@ public slots: void markBufferAsRead(BufferId id); + void onDbUpgradeInProgress(bool inProgress); + void onExitRequested(int exitCode, const QString &reason); + private slots: void setSyncedToCore(); void setDisconnectedFromCore(); @@ -245,18 +296,23 @@ private slots: void sendBufferedUserInput(); private: - Client(QObject *parent = 0); - virtual ~Client(); - void init(); - void requestInitialBacklog(); - static void addNetwork(Network *); + /** + * Deletes and resynchronizes the CoreInfo object for legacy (pre-0.13) cores + * + * This provides compatibility with updating core information for legacy cores, and can be + * removed after protocol break. + * + * NOTE: On legacy (pre-0.13) cores, any existing connected signals will be destroyed and must + * be re-added after calling this, in addition to checking for existing data in coreInfo(). + */ + void requestLegacyCoreInfo(); - static QPointer instanceptr; + static void addNetwork(Network *); SignalProxy *_signalProxy; - AbstractUi *_mainUi; + std::unique_ptr _mainUi; NetworkModel *_networkModel; BufferModel *_bufferModel; BufferSyncer *_bufferSyncer; @@ -264,6 +320,7 @@ private: ClientBacklogManager *_backlogManager; ClientBufferViewManager *_bufferViewManager; BufferViewOverlay *_bufferViewOverlay; + CoreInfo *_coreInfo; DccConfig *_dccConfig; ClientIrcListHelper *_ircListHelper; ClientUserInputHandler *_inputHandler; @@ -286,9 +343,6 @@ private: bool _connected; - QString _debugLogBuffer; - QTextStream _debugLog; - QList > _userInputBuffer; friend class CoreConnection;