X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbufferviewconfig.h;h=2d803de1a66a7b4a63f286285d6b5db5fc97fb2f;hp=6d0245297718b5bd44f7c488797875b014e89d88;hb=db00831bca59a012242d1ad5fac52a20c6cd2956;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49 diff --git a/src/common/bufferviewconfig.h b/src/common/bufferviewconfig.h index 6d024529..2d803de1 100644 --- a/src/common/bufferviewconfig.h +++ b/src/common/bufferviewconfig.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 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,41 +18,42 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef BUFFERVIEWCONFIG_H -#define BUFFERVIEWCONFIG_H +#pragma once -#include "syncableobject.h" +#include "common-export.h" +#include "bufferinfo.h" +#include "syncableobject.h" #include "types.h" -class BufferViewConfig : public SyncableObject +class COMMON_EXPORT BufferViewConfig : public SyncableObject { - SYNCABLE_OBJECT Q_OBJECT + SYNCABLE_OBJECT Q_PROPERTY(QString bufferViewName READ bufferViewName WRITE setBufferViewName) Q_PROPERTY(NetworkId networkId READ networkId WRITE setNetworkId) Q_PROPERTY(bool addNewBuffersAutomatically READ addNewBuffersAutomatically WRITE setAddNewBuffersAutomatically) Q_PROPERTY(bool sortAlphabetically READ sortAlphabetically WRITE setSortAlphabetically) Q_PROPERTY(bool hideInactiveBuffers READ hideInactiveBuffers WRITE setHideInactiveBuffers) + Q_PROPERTY(bool hideInactiveNetworks READ hideInactiveNetworks WRITE setHideInactiveNetworks) Q_PROPERTY(bool disableDecoration READ disableDecoration WRITE setDisableDecoration) Q_PROPERTY(int allowedBufferTypes READ allowedBufferTypes WRITE setAllowedBufferTypes) Q_PROPERTY(int minimumActivity READ minimumActivity WRITE setMinimumActivity) + Q_PROPERTY(bool showSearch READ showSearch WRITE setShowSearch) -public : - BufferViewConfig(int bufferViewId, QObject *parent = 0); - BufferViewConfig(int bufferViewId, const QVariantMap &properties, QObject *parent = 0); - - inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; } +public: + BufferViewConfig(int bufferViewId, QObject* parent = nullptr); + BufferViewConfig(int bufferViewId, const QVariantMap& properties, QObject* parent = nullptr); public slots: inline int bufferViewId() const { return _bufferViewId; } - inline const QString &bufferViewName() const { return _bufferViewName; } - void setBufferViewName(const QString &bufferViewName); + inline const QString& bufferViewName() const { return _bufferViewName; } + void setBufferViewName(const QString& bufferViewName); - inline const NetworkId &networkId() const { return _networkId; } - void setNetworkId(const NetworkId &networkId); + inline const NetworkId& networkId() const { return _networkId; } + void setNetworkId(const NetworkId& networkId); inline bool addNewBuffersAutomatically() const { return _addNewBuffersAutomatically; } void setAddNewBuffersAutomatically(bool addNewBuffersAutomatically); @@ -72,68 +73,75 @@ public slots: inline bool hideInactiveBuffers() const { return _hideInactiveBuffers; } void setHideInactiveBuffers(bool hideInactiveBuffers); - virtual inline void requestSetBufferViewName(const QString &bufferViewName) { REQUEST(ARG(bufferViewName)) } + inline bool hideInactiveNetworks() const { return _hideInactiveNetworks; } + void setHideInactiveNetworks(bool hideInactiveNetworks); - const QList &bufferList() const { return _buffers; } - const QSet &removedBuffers() const { return _removedBuffers; } - const QSet &temporarilyRemovedBuffers() const { return _temporarilyRemovedBuffers; } + inline bool showSearch() const { return _showSearch; } + void setShowSearch(bool showSearch); + + virtual inline void requestSetBufferViewName(const QString& bufferViewName) { REQUEST(ARG(bufferViewName)) } + + const QList& bufferList() const { return _buffers; } + const QSet& removedBuffers() const { return _removedBuffers; } + const QSet& temporarilyRemovedBuffers() const { return _temporarilyRemovedBuffers; } QVariantList initBufferList() const; - void initSetBufferList(const QVariantList &buffers); - void initSetBufferList(const QList &buffers); + void initSetBufferList(const QVariantList& buffers); + void initSetBufferList(const QList& buffers); QVariantList initRemovedBuffers() const; - void initSetRemovedBuffers(const QVariantList &buffers); + void initSetRemovedBuffers(const QVariantList& buffers); QVariantList initTemporarilyRemovedBuffers() const; - void initSetTemporarilyRemovedBuffers(const QVariantList &buffers); - - void addBuffer(const BufferId &bufferId, int pos); - virtual inline void requestAddBuffer(const BufferId &bufferId, int pos) { REQUEST(ARG(bufferId), ARG(pos)) } - void moveBuffer(const BufferId &bufferId, int pos); - virtual inline void requestMoveBuffer(const BufferId &bufferId, int pos) { REQUEST(ARG(bufferId), ARG(pos)) } - void removeBuffer(const BufferId &bufferId); - virtual inline void requestRemoveBuffer(const BufferId &bufferId) { REQUEST(ARG(bufferId)) } - void removeBufferPermanently(const BufferId &bufferId); - virtual inline void requestRemoveBufferPermanently(const BufferId &bufferId) { REQUEST(ARG(bufferId)) } - -signals: - void bufferViewNameSet(const QString &bufferViewName); // invalidate + void initSetTemporarilyRemovedBuffers(const QVariantList& buffers); + + void addBuffer(const BufferId& bufferId, int pos); + virtual inline void requestAddBuffer(const BufferId& bufferId, int pos) { REQUEST(ARG(bufferId), ARG(pos)) } + void moveBuffer(const BufferId& bufferId, int pos); + virtual inline void requestMoveBuffer(const BufferId& bufferId, int pos) { REQUEST(ARG(bufferId), ARG(pos)) } + void removeBuffer(const BufferId& bufferId); + virtual inline void requestRemoveBuffer(const BufferId& bufferId) { REQUEST(ARG(bufferId)) } + void removeBufferPermanently(const BufferId& bufferId); + virtual inline void requestRemoveBufferPermanently(const BufferId& bufferId){REQUEST(ARG(bufferId))} + + signals : void bufferViewNameSet(const QString& bufferViewName); // invalidate void configChanged(); - void networkIdSet(const NetworkId &networkId); -// void addNewBuffersAutomaticallySet(bool addNewBuffersAutomatically); // invalidate -// void sortAlphabeticallySet(bool sortAlphabetically); // invalidate -// // void disableDecorationSet(bool disableDecoration); // invalidate -// void allowedBufferTypesSet(int allowedBufferTypes); // invalidate -// void minimumActivitySet(int activity); // invalidate -// void hideInactiveBuffersSet(bool hideInactiveBuffers); // invalidate - void bufferListSet(); // invalidate - - void bufferAdded(const BufferId &bufferId, int pos); -// void addBufferRequested(const BufferId &bufferId, int pos); - void bufferMoved(const BufferId &bufferId, int pos); -// void moveBufferRequested(const BufferId &bufferId, int pos); - void bufferRemoved(const BufferId &bufferId); - void bufferPermanentlyRemoved(const BufferId &bufferId); -// void removeBufferRequested(const BufferId &bufferId); -// void removeBufferPermanentlyRequested(const BufferId &bufferId); - -// void setBufferViewNameRequested(const QString &bufferViewName); + void networkIdSet(const NetworkId& networkId); + // void addNewBuffersAutomaticallySet(bool addNewBuffersAutomatically); // invalidate + // void sortAlphabeticallySet(bool sortAlphabetically); // invalidate + // // void disableDecorationSet(bool disableDecoration); // invalidate + // void allowedBufferTypesSet(int allowedBufferTypes); // invalidate + // void minimumActivitySet(int activity); // invalidate + // void hideInactiveBuffersSet(bool hideInactiveBuffers); // invalidate + void bufferListSet(); // invalidate + + void bufferAdded(const BufferId& bufferId, int pos); + // void addBufferRequested(const BufferId &bufferId, int pos); + void bufferMoved(const BufferId& bufferId, int pos); + // void moveBufferRequested(const BufferId &bufferId, int pos); + void bufferRemoved(const BufferId& bufferId); + void bufferPermanentlyRemoved(const BufferId& bufferId); + // void removeBufferRequested(const BufferId &bufferId); + // void removeBufferPermanentlyRequested(const BufferId &bufferId); + + // void setBufferViewNameRequested(const QString &bufferViewName); private: - int _bufferViewId; - QString _bufferViewName; - NetworkId _networkId; - bool _addNewBuffersAutomatically; - bool _sortAlphabetically; - bool _hideInactiveBuffers; - bool _disableDecoration; - int _allowedBufferTypes; - int _minimumActivity; + int _bufferViewId = 0; ///< ID of the associated BufferView + QString _bufferViewName = {}; ///< Display name of the associated BufferView + NetworkId _networkId = {}; ///< Network ID this buffer belongs to + + bool _addNewBuffersAutomatically = true; ///< Automatically add new buffers when created + bool _sortAlphabetically = true; ///< Sort buffers alphabetically + bool _hideInactiveBuffers = false; ///< Hide buffers without activity + bool _hideInactiveNetworks = false; ///< Hide networks without activity + bool _disableDecoration = false; ///< Disable buffer decoration (not fully implemented) + /// Buffer types allowed within this view + int _allowedBufferTypes = (BufferInfo::StatusBuffer | BufferInfo::ChannelBuffer | BufferInfo::QueryBuffer | BufferInfo::GroupBuffer); + int _minimumActivity = 0; ///< Minimum activity for a buffer to show + bool _showSearch = false; ///< Persistently show the buffer search UI + QList _buffers; QSet _removedBuffers; QSet _temporarilyRemovedBuffers; }; - - -#endif // BUFFERVIEWCONFIG_H