X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbufferviewconfig.h;h=75ca9cf64d03f726a1764878636a941189c3c23a;hp=3c88580c37d0d0cbd357819f145712384b7f0b34;hb=09515f0300f18490ee1788392a7518a6e1ab5acc;hpb=72f1a93311815cc637358f52046a4cf311bbd9f4

diff --git a/src/common/bufferviewconfig.h b/src/common/bufferviewconfig.h
index 3c88580c..75ca9cf6 100644
--- a/src/common/bufferviewconfig.h
+++ b/src/common/bufferviewconfig.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,12 +26,15 @@
 #include "types.h"
 
 class BufferViewConfig : public SyncableObject {
+  SYNCABLE_OBJECT
   Q_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 disableDecoration READ disableDecoration WRITE setDisableDecoration)
   Q_PROPERTY(int allowedBufferTypes READ allowedBufferTypes WRITE setAllowedBufferTypes)
   Q_PROPERTY(int minimumActivity READ minimumActivity WRITE setMinimumActivity)
 
@@ -39,6 +42,7 @@ 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 slots:
   inline int bufferViewId() const { return _bufferViewId; }
@@ -55,6 +59,9 @@ public slots:
   inline bool sortAlphabetically() const { return _sortAlphabetically; }
   void setSortAlphabetically(bool sortAlphabetically);
 
+  inline bool disableDecoration() const { return _disableDecoration; }
+  void setDisableDecoration(bool disableDecoration);
+
   inline int allowedBufferTypes() const { return _allowedBufferTypes; }
   void setAllowedBufferTypes(int bufferTypes);
 
@@ -63,8 +70,8 @@ public slots:
 
   inline bool hideInactiveBuffers() const { return _hideInactiveBuffers; }
   void setHideInactiveBuffers(bool hideInactiveBuffers);
-  
-  virtual inline void requestSetBufferViewName(const QString &bufferViewName) { emit setBufferViewNameRequested(bufferViewName); }
+
+  virtual inline void requestSetBufferViewName(const QString &bufferViewName) { REQUEST(ARG(bufferViewName)) }
 
   const QList<BufferId> &bufferList() const { return _buffers; }
   const QSet<BufferId> &removedBuffers() const { return _removedBuffers; }
@@ -81,35 +88,37 @@ public slots:
   void initSetTemporarilyRemovedBuffers(const QVariantList &buffers);
 
   void addBuffer(const BufferId &bufferId, int pos);
-  virtual inline void requestAddBuffer(const BufferId &bufferId, int pos) { emit addBufferRequested(bufferId, 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) { emit moveBufferRequested(bufferId, 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) { emit removeBufferRequested(bufferId); }
+  virtual inline void requestRemoveBuffer(const BufferId &bufferId) { REQUEST(ARG(bufferId)) }
   void removeBufferPermanently(const BufferId &bufferId);
-  virtual inline void requestRemoveBufferPermanently(const BufferId &bufferId) { emit removeBufferPermanentlyRequested(bufferId); }
-  
-  
+  virtual inline void requestRemoveBufferPermanently(const BufferId &bufferId) { REQUEST(ARG(bufferId)) }
+
+
 signals:
-  void bufferViewNameSet(const QString &bufferViewName);
+  void bufferViewNameSet(const QString &bufferViewName); // invalidate
+  void configChanged();
   void networkIdSet(const NetworkId &networkId);
-  void addNewBuffersAutomaticallySet(bool addNewBuffersAutomatically);
-  void sortAlphabeticallySet(bool sortAlphabetically);  
-  void allowedBufferTypesSet(int allowedBufferTypes);
-  void minimumActivitySet(int activity);
-  void hideInactiveBuffersSet(bool hideInactiveBuffers);
-  void bufferListSet();
+//   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 addBufferRequested(const BufferId &bufferId, int pos);
   void bufferMoved(const BufferId &bufferId, int pos);
-  void moveBufferRequested(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 removeBufferRequested(const BufferId &bufferId);
+//   void removeBufferPermanentlyRequested(const BufferId &bufferId);
+
+//   void setBufferViewNameRequested(const QString &bufferViewName);
 
 private:
   int _bufferViewId;
@@ -118,6 +127,7 @@ private:
   bool _addNewBuffersAutomatically;
   bool _sortAlphabetically;
   bool _hideInactiveBuffers;
+  bool _disableDecoration;
   int _allowedBufferTypes;
   int _minimumActivity;
   QList<BufferId> _buffers;