X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=7850b0fc644f8c479f4178f5bdb9e3f9370129fc;hp=8c707f343039bec6e4aeaf21b65ffa7216437d3e;hb=37110ceaa070167b4f40ed449ac9ea130503a792;hpb=e50ae7a06fc4e5d3a911c361d30953410deab609 diff --git a/src/client/client.h b/src/client/client.h index 8c707f34..7850b0fc 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 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,15 +18,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef CLIENT_H_ -#define CLIENT_H_ +#pragma once #include #include #include "bufferinfo.h" +#include "coreinfo.h" #include "coreaccount.h" #include "coreconnection.h" +#include "highlightrulemanager.h" #include "quassel.h" #include "types.h" @@ -53,10 +54,12 @@ class ClientTransferManager; class ClientUserInputHandler; class CoreAccountModel; class CoreConnection; +class DccConfig; class IrcUser; class IrcChannel; class NetworkConfig; class SignalProxy; +class TransferModel; struct NetworkInfo; @@ -113,20 +116,24 @@ 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; } static inline BufferViewOverlay *bufferViewOverlay() { return instance()->_bufferViewOverlay; } static inline ClientUserInputHandler *inputHandler() { return instance()->_inputHandler; } static inline NetworkConfig *networkConfig() { return instance()->_networkConfig; } static inline ClientIgnoreListManager *ignoreListManager() { return instance()->_ignoreListManager; } + static inline HighlightRuleManager *highlightRuleManager() { return instance()->_highlightRuleManager; } static inline ClientTransferManager *transferManager() { return instance()->_transferManager; } + static inline TransferModel *transferModel() { return instance()->_transferModel; } + + static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } static inline CoreAccountModel *coreAccountModel() { return instance()->_coreAccountModel; } static inline CoreConnection *coreConnection() { return instance()->_coreConnection; } static inline CoreAccount currentCoreAccount() { return coreConnection()->currentAccount(); } - static inline Quassel::Features coreFeatures() { return _coreFeatures; } - - static void setCoreFeatures(Quassel::Features features); + static bool isCoreFeatureEnabled(Quassel::Feature feature); static bool isConnected(); static bool internalCore(); @@ -142,22 +149,50 @@ public: static void mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2); static void purgeKnownBufferIds(); -#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; } + /** + * 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); + + void displayIgnoreList(QString ignoreRule) { + emit showIgnoreList(ignoreRule); + } + + void displayChannelList(NetworkId networkId) { + emit showChannelList(networkId); + } signals: void requestNetworkStates(); void showConfigWizard(const QVariantMap &coredata); + void showChannelList(NetworkId networkId); + 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. */ @@ -182,8 +217,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. @@ -191,6 +224,15 @@ signals: */ void bufferMarkedAsRead(BufferId id); + //! Requests a password change (user name must match the currently logged in user) + void requestPasswordChange(PeerPtr peer, const QString &userName, const QString &oldPassword, const QString &newPassword); + + void requestKickClient(int peerId); + void passwordChanged(bool success); + + //! Emitted when database schema upgrade starts or ends (only mono client) + void dbUpgradeInProgress(bool inProgress); + public slots: void disconnectFromCore(); @@ -200,6 +242,8 @@ public slots: void markBufferAsRead(BufferId id); + void onDbUpgradeInProgress(bool inProgress); + private slots: void setSyncedToCore(); void setDisconnectedFromCore(); @@ -214,7 +258,9 @@ private slots: void coreNetworkCreated(NetworkId); void coreNetworkRemoved(NetworkId); - void requestInitialBacklog(); + void corePasswordChanged(PeerPtr, bool success); + + void finishConnectionInitialization(); void sendBufferedUserInput(); @@ -223,8 +269,20 @@ private: virtual ~Client(); void init(); + void requestInitialBacklog(); + + /** + * 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 void addNetwork(Network *); - static inline BufferSyncer *bufferSyncer() { return instance()->_bufferSyncer; } static QPointer instanceptr; @@ -237,11 +295,15 @@ private: ClientBacklogManager *_backlogManager; ClientBufferViewManager *_bufferViewManager; BufferViewOverlay *_bufferViewOverlay; + CoreInfo *_coreInfo; + DccConfig *_dccConfig; ClientIrcListHelper *_ircListHelper; ClientUserInputHandler *_inputHandler; NetworkConfig *_networkConfig; ClientIgnoreListManager *_ignoreListManager; + HighlightRuleManager *_highlightRuleManager; ClientTransferManager *_transferManager; + TransferModel *_transferModel; MessageModel *_messageModel; AbstractMessageProcessor *_messageProcessor; @@ -255,15 +317,8 @@ private: QHash _identities; bool _connected; - static Quassel::Features _coreFeatures; - - QString _debugLogBuffer; - QTextStream _debugLog; QList > _userInputBuffer; friend class CoreConnection; }; - - -#endif