X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=9a16ac176a8e1466b50ffc732593faa6e3938ca6;hp=63ebf9af7edf7b1e20b1fbf5cdbacdbf7ff20408;hb=da28b86876edea39e97ffdd4cc5602072c001f93;hpb=9850247cc7533d35d71d202e32d9734197bb6f08

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 63ebf9af..9a16ac17 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -414,7 +414,9 @@ void NetworkItem::attachNetwork(Network *network) {
 	  this, SLOT(attachIrcChannel(QString)));
   connect(network, SIGNAL(connectedSet(bool)),
 	  this, SIGNAL(dataChanged()));
-
+  connect(network, SIGNAL(destroyed()),
+	  this, SIGNAL(dataChanged()));
+  
   emit dataChanged();
 }
 
@@ -462,10 +464,6 @@ QString NetworkItem::toolTip(int column) const {
 *****************************************/
 // we hardcode this even though we have PREFIX in network... but that wouldn't help with mapping modes to
 // category strings anyway.
-// TODO make this translateable depending on the number of users in a category
-//      -> we can't set the real string here, because tr() needs to get the actual number as second param
-//      -> tr("%n User(s)", n) needs to be used somewhere where we do know the user number n
-
 const QList<QChar> UserCategoryItem::categories = QList<QChar>() << 'q' << 'a' << 'o' << 'h' << 'v';
 
 UserCategoryItem::UserCategoryItem(int category, AbstractTreeItem *parent)
@@ -530,7 +528,7 @@ QVariant UserCategoryItem::data(int column, int role) const {
   }
 }
 
-     
+
 /*****************************************
 *  Irc User Items
 *****************************************/
@@ -594,7 +592,10 @@ QString IrcUserItem::toolTip(int column) const {
   if(_ircUser->isAway()) toolTip[0].append(" is away");
   if(!_ircUser->awayMessage().isEmpty()) toolTip[0].append(QString(" (%1)").arg(_ircUser->awayMessage()));
   if(!_ircUser->realName().isEmpty()) toolTip.append(_ircUser->realName());
-  if(!_ircUser->ircOperator().isEmpty()) toolTip.append(_ircUser->ircOperator());
+  if(!_ircUser->ircOperator().isEmpty()) toolTip.append(QString("%1 %2").arg(nickName()).arg(_ircUser->ircOperator()));
+  if(!_ircUser->suserHost().isEmpty()) toolTip.append(_ircUser->suserHost());
+  if(!_ircUser->whoisServiceReply().isEmpty()) toolTip.append(_ircUser->whoisServiceReply());
+
   toolTip.append(_ircUser->hostmask().remove(0, _ircUser->hostmask().indexOf("!")+1));
 
   if(_ircUser->idleTime().isValid()) {