Haha! The Inputline is now a seperate dock! Sput: I told you that I'll make it :P

[quassel.git] / src / client / networkmodel.cpp

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 227382b..83716ee 100644 (file)
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -97,6 +97,8 @@ QVariant BufferItem::data(int column, int role) const {
     return qVariantFromValue(bufferInfo().uid());
   case NetworkModel::NetworkIdRole:
     return qVariantFromValue(bufferInfo().networkId());
+  case NetworkModel::BufferInfoRole:
+    return qVariantFromValue(bufferInfo());
   case NetworkModel::BufferTypeRole:
     return int(bufferType());
   case NetworkModel::ItemActiveRole:
@@ -190,8 +192,9 @@ void BufferItem::part(IrcUser *ircUser) {
 }
 
 void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
+  Q_ASSERT(_ircChannel);
+
   UserCategoryItem *categoryItem = 0;
-  IrcUserItem *userItem;
   for(int i = 0; i < childCount(); i++) {
     categoryItem = qobject_cast<UserCategoryItem *>(child(i));
     categoryItem->removeChildById((quint64)ircUser);
@@ -202,10 +205,10 @@ void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
 
 void BufferItem::userModeChanged(IrcUser *ircUser) {
   Q_ASSERT(_ircChannel);
-    
+
   UserCategoryItem *categoryItem;
   int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
-  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))))
+  if((categoryItem = qobject_cast<UserCategoryItem *>(childById(qHash(categoryId)))) && categoryItem->childById((quint64)(ircUser)))
     return; // already in the right category;
   
   removeUserFromCategory(ircUser);
@@ -313,12 +316,13 @@ void NetworkItem::setCurrentServer(const QString &serverName) {
 *****************************************/
 // we hardcode this even though we have PREFIX in network... but that wouldn't help with mapping modes to
 // category strings anyway.
-const QList<UserCategoryItem::Category> UserCategoryItem::categories = QList<UserCategoryItem::Category>() << UserCategoryItem::Category('q', "Owners")
-                                                                                                          << UserCategoryItem::Category('a', "Admins")
-                                                                                                          << UserCategoryItem::Category('a', "Admins")
-                                                                                                          << UserCategoryItem::Category('o', "Operators")
-                                                                                                          << UserCategoryItem::Category('h', "Half-Ops")
-                                                                                                          << UserCategoryItem::Category('v', "Voiced");
+const QList<UserCategoryItem::Category> UserCategoryItem::categories = QList<UserCategoryItem::Category>()
+  << UserCategoryItem::Category('q', "Owners")
+  << UserCategoryItem::Category('a', "Admins")
+  << UserCategoryItem::Category('a', "Admins")
+  << UserCategoryItem::Category('o', "Operators")
+  << UserCategoryItem::Category('h', "Half-Ops")
+  << UserCategoryItem::Category('v', "Voiced");
 
 UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "categoryId", parent),
@@ -356,14 +360,14 @@ IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
   : PropertyMapItem(QStringList() << "nickName", parent),
     _ircUser(ircUser)
 {
-  connect(ircUser, SIGNAL(destroyed()),
-         this, SLOT(ircUserDestroyed()));
+  // we don't need to handle the ircUser's destroyed signal since it's automatically removed
+  // by the IrcChannel::ircUserParted();
   
   connect(ircUser, SIGNAL(nickSet(QString)),
          this, SLOT(setNick(QString)));
 }
 
-QString IrcUserItem::nickName() {
+QString IrcUserItem::nickName() const {
   return _ircUser->nick();
 }
 
@@ -375,14 +379,17 @@ quint64 IrcUserItem::id() const {
   return (quint64)_ircUser;
 }
 
+QVariant IrcUserItem::data(int column, int role) const {
+  if(role != Qt::ToolTipRole)
+    return PropertyMapItem::data(column, role);
+
+  return "<p><b>" + nickName() + "</b><br />" + _ircUser->hostmask() + "</p>";
+}
+
 void IrcUserItem::setNick(QString newNick) {
   Q_UNUSED(newNick);
   emit dataChanged(0);
 }
-void IrcUserItem::ircUserDestroyed() {
-  parent()->removeChildById(id());
-  // deleteLater();
-}
 
 /*****************************************
  * NetworkModel