X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=bb0eca5efda637c760d9f0a34e63332e472b2da3;hp=f5442be1d2dcfd6b7e3392d00e7d2df2bf2e45dd;hb=cf721fb75a7525b03c0086f98314b828f5322001;hpb=6b31f4c8abb36ebe658c2e5ce2a8e9ba2a50f443

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index f5442be1..bb0eca5e 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -21,16 +21,15 @@
 #include "networkmodel.h"
 
 #include <QAbstractItemView>
+#include <QTextDocument> 	// for Qt::escape()
 
 #include "buffermodel.h"
+#include "buffersettings.h"
 #include "client.h"
-#include "signalproxy.h"
-#include "network.h"
+#include "clientsettings.h"
 #include "ircchannel.h"
-
-#include "buffersettings.h"
-
-#include "util.h" // get rid of this (needed for isChannelName)
+#include "network.h"
+#include "signalproxy.h"
 
 /*****************************************
 *  Network Items
@@ -69,6 +68,7 @@ QVariant NetworkItem::data(int column, int role) const {
   }
 }
 
+// FIXME shouldn't we check the bufferItemCache here?
 BufferItem *NetworkItem::findBufferItem(BufferId bufferId) {
   BufferItem *bufferItem = 0;
 
@@ -107,6 +107,23 @@ BufferItem *NetworkItem::bufferItem(const BufferInfo &bufferInfo) {
   }
 
   newChild(bufferItem);
+
+  // postprocess... this is necessary because Qt doesn't seem to like adding childs which already have childs on their own
+  switch(bufferInfo.type()) {
+  case BufferInfo::ChannelBuffer:
+    {
+      ChannelBufferItem *channelBufferItem = static_cast<ChannelBufferItem *>(bufferItem);
+      if(_network) {
+        IrcChannel *ircChannel = _network->ircChannel(bufferInfo.bufferName());
+        if(ircChannel)
+          channelBufferItem->attachIrcChannel(ircChannel);
+      }
+    }
+    break;
+  default:
+    break;
+  }
+
   return bufferItem;
 }
 
@@ -117,17 +134,17 @@ void NetworkItem::attachNetwork(Network *network) {
   _network = network;
 
   connect(network, SIGNAL(networkNameSet(QString)),
-	  this, SLOT(setNetworkName(QString)));
+          this, SLOT(setNetworkName(QString)));
   connect(network, SIGNAL(currentServerSet(QString)),
-	  this, SLOT(setCurrentServer(QString)));
+          this, SLOT(setCurrentServer(QString)));
   connect(network, SIGNAL(ircChannelAdded(IrcChannel *)),
-	  this, SLOT(attachIrcChannel(IrcChannel *)));
+          this, SLOT(attachIrcChannel(IrcChannel *)));
   connect(network, SIGNAL(ircUserAdded(IrcUser *)),
-	  this, SLOT(attachIrcUser(IrcUser *)));
+          this, SLOT(attachIrcUser(IrcUser *)));
   connect(network, SIGNAL(connectedSet(bool)),
-	  this, SIGNAL(networkDataChanged()));
+          this, SIGNAL(networkDataChanged()));
   connect(network, SIGNAL(destroyed()),
-	  this, SIGNAL(networkDataChanged()));
+          this, SIGNAL(networkDataChanged()));
 
   emit networkDataChanged();
 }
@@ -174,8 +191,8 @@ void NetworkItem::setCurrentServer(const QString &serverName) {
 QString NetworkItem::toolTip(int column) const {
   Q_UNUSED(column);
 
-  QStringList toolTip(QString("<b>%1</b>").arg(networkName()));
-  toolTip.append(tr("Server: %1").arg(currentServer()));
+  QStringList toolTip(QString("<b>%1</b>").arg(Qt::escape(networkName())));
+  toolTip.append(tr("Server: %1").arg(Qt::escape(currentServer())));
   toolTip.append(tr("Users: %1").arg(nickCount()));
 
   if(_network) {
@@ -215,8 +232,13 @@ void BufferItem::setActivityLevel(BufferInfo::ActivityLevel level) {
 
 void BufferItem::clearActivityLevel() {
   _activity = BufferInfo::NoActivity;
-  _lastSeenMarkerMsgId = _lastSeenMsgId;
   _firstUnreadMsgId = MsgId();
+
+  // FIXME remove with core proto v11
+  if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
+    _markerLineMsgId = _lastSeenMsgId;
+  }
+
   emit dataChanged();
 }
 
@@ -236,7 +258,7 @@ void BufferItem::updateActivityLevel(const Message &msg) {
     stateChanged = true;
     _firstUnreadMsgId = msg.msgId();
   }
-     
+
   BufferInfo::ActivityLevel oldLevel = activityLevel();
 
   _activity |= BufferInfo::OtherActivity;
@@ -270,6 +292,8 @@ QVariant BufferItem::data(int column, int role) const {
     return (int)activityLevel();
   case NetworkModel::BufferFirstUnreadMsgIdRole:
     return qVariantFromValue(firstUnreadMsgId());
+  case NetworkModel::MarkerLineMsgIdRole:
+    return qVariantFromValue(markerLineMsgId());
   default:
     return PropertyMapItem::data(column, role);
   }
@@ -291,14 +315,23 @@ void BufferItem::setBufferName(const QString &name) {
   emit dataChanged(0);
 }
 
-void BufferItem::setLastSeenMsgId(const MsgId &msgId) {
+void BufferItem::setLastSeenMsgId(MsgId msgId) {
   _lastSeenMsgId = msgId;
-  if(!isCurrentBuffer()) {
-    _lastSeenMarkerMsgId = msgId;
+
+  // FIXME remove with core protocol v11
+  if(!(Client::coreFeatures() & Quassel::SynchronizedMarkerLine)) {
+    if(!isCurrentBuffer())
+      _markerLineMsgId = msgId;
   }
+
   setActivityLevel(BufferInfo::NoActivity);
 }
 
+void BufferItem::setMarkerLineMsgId(MsgId msgId) {
+  _markerLineMsgId = msgId;
+  emit dataChanged();
+}
+
 bool BufferItem::isCurrentBuffer() const {
   return _bufferInfo.bufferId() == Client::bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value<BufferId>();
 }
@@ -363,10 +396,10 @@ bool QueryBufferItem::setData(int column, const QVariant &value, int role) {
     {
       QString newName = value.toString();
       if(!newName.isEmpty()) {
-	Client::renameBuffer(bufferId(), newName);
-	return true;
+        Client::renameBuffer(bufferId(), newName);
+        return true;
       } else {
-	return false;
+        return false;
       }
     }
     break;
@@ -391,7 +424,7 @@ QString QueryBufferItem::toolTip(int column) const {
   toolTip.append(tr("<b>Query with %1</b>").arg(bufferName()));
 
   if(_ircUser) {
-    if(_ircUser->userModes() != "") toolTip[0].append(QString(" (%1)").arg(_ircUser->userModes()));
+    if(_ircUser->userModes() != "") toolTip[0].append(QString(" (+%1)").arg(_ircUser->userModes()));
     if(_ircUser->isAway()) {
       toolTip[0].append(QString(" (away%1)").arg(!_ircUser->awayMessage().isEmpty() ? (QString(" ") + _ircUser->awayMessage()) : QString()));
     }
@@ -447,13 +480,6 @@ ChannelBufferItem::ChannelBufferItem(const BufferInfo &bufferInfo, AbstractTreeI
   : BufferItem(bufferInfo, parent),
     _ircChannel(0)
 {
-  const Network *net = Client::network(bufferInfo.networkId());
-  if(!net)
-    return;
-
-  IrcChannel *ircChannel = net->ircChannel(bufferInfo.bufferName());
-  if(ircChannel)
-    attachIrcChannel(ircChannel);
 }
 
 QVariant ChannelBufferItem::data(int column, int role) const {
@@ -469,7 +495,7 @@ QString ChannelBufferItem::toolTip(int column) const {
   Q_UNUSED(column);
   QStringList toolTip;
 
-  toolTip.append(tr("<b>Channel %1</b>").arg(bufferName()));
+  toolTip.append(tr("<b>Channel %1</b>").arg(Qt::escape(bufferName())));
   if(isActive()) {
     //TODO: add channel modes
     toolTip.append(tr("<b>Users:</b> %1").arg(nickCount()));
@@ -479,14 +505,13 @@ QString ChannelBufferItem::toolTip(int column) const {
         toolTip.append(tr("<b>Mode:</b> %1").arg(channelMode));
     }
 
-    BufferSettings s;
-    bool showTopic = s.value("DisplayTopicInTooltip", QVariant(false)).toBool();
+    ItemViewSettings s;
+    bool showTopic = s.displayTopicInTooltip();
     if(showTopic) {
       QString _topic = topic();
       if(_topic != "") {
         _topic = stripFormatCodes(_topic);
-        _topic.replace(QString("<"), QString("&lt;"));
-        _topic.replace(QString(">"), QString("&gt;"));
+        _topic = Qt::escape(_topic);
         toolTip.append(QString("<font size='-2'>&nbsp;</font>"));
         toolTip.append(tr("<b>Topic:</b> %1").arg(_topic));
       }
@@ -504,19 +529,19 @@ void ChannelBufferItem::attachIrcChannel(IrcChannel *ircChannel) {
   _ircChannel = ircChannel;
 
   connect(ircChannel, SIGNAL(topicSet(QString)),
-	  this, SLOT(setTopic(QString)));
+          this, SLOT(setTopic(QString)));
   connect(ircChannel, SIGNAL(ircUsersJoined(QList<IrcUser *>)),
-	  this, SLOT(join(QList<IrcUser *>)));
+          this, SLOT(join(QList<IrcUser *>)));
   connect(ircChannel, SIGNAL(ircUserParted(IrcUser *)),
-	  this, SLOT(part(IrcUser *)));
+          this, SLOT(part(IrcUser *)));
   connect(ircChannel, SIGNAL(parted()),
-	  this, SLOT(ircChannelParted()));
+          this, SLOT(ircChannelParted()));
   connect(ircChannel, SIGNAL(ircUserModesSet(IrcUser *, QString)),
-	  this, SLOT(userModeChanged(IrcUser *)));
+          this, SLOT(userModeChanged(IrcUser *)));
   connect(ircChannel, SIGNAL(ircUserModeAdded(IrcUser *, QString)),
-	  this, SLOT(userModeChanged(IrcUser *)));
+          this, SLOT(userModeChanged(IrcUser *)));
   connect(ircChannel, SIGNAL(ircUserModeRemoved(IrcUser *, QString)),
-	  this, SLOT(userModeChanged(IrcUser *)));
+          this, SLOT(userModeChanged(IrcUser *)));
 
   if(!ircChannel->ircUsers().isEmpty())
     join(ircChannel->ircUsers());
@@ -604,7 +629,7 @@ void ChannelBufferItem::removeUserFromCategory(IrcUser *ircUser) {
     categoryItem = qobject_cast<UserCategoryItem *>(child(i));
     if(categoryItem->removeUser(ircUser)) {
       if(categoryItem->childCount() == 0)
-	removeChild(i);
+        removeChild(i);
       break;
     }
   }
@@ -806,9 +831,9 @@ NetworkModel::NetworkModel(QObject *parent)
   : TreeModel(NetworkModel::defaultHeader(), parent)
 {
   connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
-	  this, SLOT(checkForNewBuffers(const QModelIndex &, int, int)));
+          this, SLOT(checkForNewBuffers(const QModelIndex &, int, int)));
   connect(this, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
-	  this, SLOT(checkForRemovedBuffers(const QModelIndex &, int, int)));
+          this, SLOT(checkForRemovedBuffers(const QModelIndex &, int, int)));
 
   BufferSettings defaultSettings;
   defaultSettings.notify("UserNoticesTarget", this, SLOT(messageRedirectionSettingsChanged()));
@@ -819,7 +844,7 @@ NetworkModel::NetworkModel(QObject *parent)
 
 QList<QVariant >NetworkModel::defaultHeader() {
   QList<QVariant> data;
-  data << tr("Buffer") << tr("Topic") << tr("Nick Count");
+  data << tr("Chat") << tr("Topic") << tr("Nick Count");
   return data;
 }
 
@@ -971,13 +996,14 @@ MsgId NetworkModel::lastSeenMsgId(BufferId bufferId) const {
   return _bufferItemCache[bufferId]->lastSeenMsgId();
 }
 
-MsgId NetworkModel::lastSeenMarkerMsgId(BufferId bufferId) const {
+MsgId NetworkModel::markerLineMsgId(BufferId bufferId) const {
   if(!_bufferItemCache.contains(bufferId))
     return MsgId();
 
-  return _bufferItemCache[bufferId]->lastSeenMarkerMsgId();
+  return _bufferItemCache[bufferId]->markerLineMsgId();
 }
 
+// FIXME we always seem to use this (expensive) non-const version
 MsgId NetworkModel::lastSeenMsgId(const BufferId &bufferId) {
   BufferItem *bufferItem = findBufferItem(bufferId);
   if(!bufferItem) {
@@ -998,6 +1024,16 @@ void NetworkModel::setLastSeenMsgId(const BufferId &bufferId, const MsgId &msgId
   bufferItem->setLastSeenMsgId(msgId);
 }
 
+void NetworkModel::setMarkerLineMsgId(const BufferId &bufferId, const MsgId &msgId) {
+  BufferItem *bufferItem = findBufferItem(bufferId);
+  if(!bufferItem) {
+    qDebug() << "NetworkModel::setMarkerLineMsgId(): buffer is unknown:" << bufferId;
+    Client::purgeKnownBufferIds();
+    return;
+  }
+  bufferItem->setMarkerLineMsgId(msgId);
+}
+
 void NetworkModel::updateBufferActivity(Message &msg) {
   int redirectionTarget = 0;
   switch(msg.type()) {
@@ -1005,10 +1041,10 @@ void NetworkModel::updateBufferActivity(Message &msg) {
     if(bufferType(msg.bufferId()) != BufferInfo::ChannelBuffer) {
       msg.setFlags(msg.flags() | Message::Redirected);
       if(msg.flags() & Message::ServerMsg) {
-	// server notice
-	redirectionTarget = _serverNoticesTarget;
+        // server notice
+        redirectionTarget = _serverNoticesTarget;
       } else {
-	redirectionTarget = _userNoticesTarget;
+        redirectionTarget = _userNoticesTarget;
       }
     }
     break;
@@ -1037,7 +1073,7 @@ void NetworkModel::updateBufferActivity(Message &msg) {
     if(redirectionTarget & BufferSettings::StatusBuffer) {
       const NetworkItem *netItem = findNetworkItem(msg.bufferInfo().networkId());
       if(netItem) {
-	updateBufferActivity(netItem->statusBufferItem(), msg);
+        updateBufferActivity(netItem->statusBufferItem(), msg);
       }
     }
   } else {