X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.h;h=daf824351d4972aabc9fa637c4d49d8c6933f6b0;hp=6fd078e2aef6ae7e3fe9d0e9becb4c9edd919334;hb=4ae8f86c1ce452582d6fe576956c7c1bc1460adf;hpb=7ea9c498bfb975a95c11d6ddc28835840cf3353d

diff --git a/src/client/networkmodel.h b/src/client/networkmodel.h
index 6fd078e2..daf82435 100644
--- a/src/client/networkmodel.h
+++ b/src/client/networkmodel.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  *
@@ -28,6 +28,7 @@
 #include "treemodel.h"
 
 class BufferItem;
+class StatusBufferItem;
 
 /*****************************************
  *  Network Items
@@ -55,6 +56,7 @@ public:
   BufferItem *findBufferItem(BufferId bufferId);
   inline BufferItem *findBufferItem(const BufferInfo &bufferInfo) { return findBufferItem(bufferInfo.bufferId()); }
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
+  inline StatusBufferItem *statusBufferItem() const { return _statusBufferItem; }
 
 public slots:
   void setNetworkName(const QString &networkName);
@@ -64,8 +66,15 @@ public slots:
   void attachIrcChannel(IrcChannel *channel);
   void attachIrcUser(IrcUser *ircUser);
 
+signals:
+  void networkDataChanged(int column = -1);
+
+private slots:
+  void onBeginRemoveChilds(int start, int end);
+
 private:
   NetworkId _networkId;
+  StatusBufferItem *_statusBufferItem;
 
   QPointer<Network> _network;
 };
@@ -89,21 +98,25 @@ public:
   inline BufferId bufferId() const { return _bufferInfo.bufferId(); }
   inline BufferInfo::Type bufferType() const { return _bufferInfo.type(); }
 
-  void setBufferName(const QString &name);
+  virtual void setBufferName(const QString &name);
   virtual inline QString bufferName() const { return _bufferInfo.bufferName(); }
   virtual inline QString topic() const { return QString(); }
   virtual inline int nickCount() const { return 0; }
 
   virtual inline bool isActive() const { return qobject_cast<NetworkItem *>(parent())->isActive(); }
 
-  inline const MsgId &lastSeenMsgId() const { return _lastSeenMsgId; }
-  inline const MsgId &lastSeenMarkerMsgId() const { return _lastSeenMarkerMsgId; }
-  void setLastSeenMsgId(const MsgId &msgId);
+  inline MsgId lastSeenMsgId() const { return _lastSeenMsgId; }
+  inline MsgId markerLineMsgId() const { return _markerLineMsgId; }
+  void setLastSeenMsgId(MsgId msgId);
+  void setMarkerLineMsgId(MsgId msgId);
+
   inline BufferInfo::ActivityLevel activityLevel() const { return _activity; }
   void setActivityLevel(BufferInfo::ActivityLevel level);
   void clearActivityLevel();
   void updateActivityLevel(const Message &msg);
 
+  inline const MsgId &firstUnreadMsgId() const { return _firstUnreadMsgId; }
+
   bool isCurrentBuffer() const;
   virtual QString toolTip(int column) const;
 
@@ -114,7 +127,8 @@ private:
   BufferInfo _bufferInfo;
   BufferInfo::ActivityLevel _activity;
   MsgId _lastSeenMsgId;
-  MsgId _lastSeenMarkerMsgId;
+  MsgId _markerLineMsgId;
+  MsgId _firstUnreadMsgId;
 };
 
 /*****************************************
@@ -140,12 +154,16 @@ public:
   QueryBufferItem(const BufferInfo &bufferInfo, NetworkItem *parent);
 
   virtual QVariant data(int column, int role) const;
+  virtual bool setData(int column, const QVariant &value, int role);
+
   virtual inline bool isActive() const { return (bool)_ircUser; }
   virtual QString toolTip(int column) const;
 
+  virtual void setBufferName(const QString &name);
+
 public slots:
-  void attachIrcUser(IrcUser *ircUser);
-  void ircUserQuited();
+  void setIrcUser(IrcUser *ircUser);
+  void removeIrcUser();
 
 private:
   IrcUser *_ircUser;
@@ -257,7 +275,9 @@ public:
     ItemTypeRole,
     UserAwayRole,
     IrcUserRole,
-    IrcChannelRole
+    IrcChannelRole,
+    BufferFirstUnreadMsgIdRole,
+    MarkerLineMsgIdRole,
   };
 
   enum ItemType {
@@ -276,7 +296,6 @@ public:
 
   virtual QStringList mimeTypes() const;
   virtual QMimeData *mimeData(const QModelIndexList &) const;
-  virtual bool dropMimeData(const QMimeData *, Qt::DropAction, int, int, const QModelIndex &);
 
   void attachNetwork(Network *network);
 
@@ -301,27 +320,34 @@ public:
   BufferInfo::Type bufferType(BufferId bufferId) const;
   BufferInfo bufferInfo(BufferId bufferId) const;
   MsgId lastSeenMsgId(BufferId bufferId) const;
-  MsgId lastSeenMarkerMsgId(BufferId bufferId) const;
+  MsgId markerLineMsgId(BufferId bufferId) const;
   NetworkId networkId(BufferId bufferId) const;
   QString networkName(BufferId bufferId) const;
 
   inline QList<BufferId> allBufferIds() const { return _bufferItemCache.keys(); }
+  QList<BufferId> allBufferIdsSorted() const;
+  void sortBufferIds(QList<BufferId> &bufferIds) const;
 
 public slots:
   void bufferUpdated(BufferInfo bufferInfo);
   void removeBuffer(BufferId bufferId);
+  MsgId lastSeenMsgId(const BufferId &bufferId);
   void setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId);
+  void setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msgId);
   void setBufferActivity(const BufferId &bufferId, BufferInfo::ActivityLevel activity);
   void clearBufferActivity(const BufferId &bufferId);
-  void updateBufferActivity(const Message &msg);
+  void updateBufferActivity(Message &msg);
   void networkRemoved(const NetworkId &networkId);
 
 signals:
-  void setLastSeenMsg(BufferId bufferId, MsgId msgId);
+  void requestSetLastSeenMsg(BufferId buffer, MsgId msg);
+  void lastSeenMsgSet(BufferId buffer, MsgId msg);
+  void markerLineSet(BufferId buffer, MsgId msg);
 
 private slots:
   void checkForRemovedBuffers(const QModelIndex &parent, int start, int end);
   void checkForNewBuffers(const QModelIndex &parent, int start, int end);
+  void messageRedirectionSettingsChanged();
 
 private:
   int networkRow(NetworkId networkId) const;
@@ -331,7 +357,15 @@ private:
   BufferItem *findBufferItem(BufferId bufferId) const;
   BufferItem *bufferItem(const BufferInfo &bufferInfo);
 
+  void updateBufferActivity(BufferItem *bufferItem, const Message &msg);
+
+  static bool bufferItemLessThan(const BufferItem *left, const BufferItem *right);
+
   QHash<BufferId, BufferItem *> _bufferItemCache;
+
+  int _userNoticesTarget;
+  int _serverNoticesTarget;
+  int _errorMsgsTarget;
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(NetworkModel::ItemTypes)