projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a very simple tooltip for ircusers (aka: visible in the nicklist)
[quassel.git]
/
src
/
client
/
networkmodel.cpp
diff --git
a/src/client/networkmodel.cpp
b/src/client/networkmodel.cpp
index
227382b
..
784f3fc
100644
(file)
--- a/
src/client/networkmodel.cpp
+++ b/
src/client/networkmodel.cpp
@@
-191,7
+191,6
@@
void BufferItem::part(IrcUser *ircUser) {
void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
UserCategoryItem *categoryItem = 0;
void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
UserCategoryItem *categoryItem = 0;
- IrcUserItem *userItem;
for(int i = 0; i < childCount(); i++) {
categoryItem = qobject_cast<UserCategoryItem *>(child(i));
categoryItem->removeChildById((quint64)ircUser);
for(int i = 0; i < childCount(); i++) {
categoryItem = qobject_cast<UserCategoryItem *>(child(i));
categoryItem->removeChildById((quint64)ircUser);
@@
-202,10
+201,10
@@
void BufferItem::removeUserFromCategory(IrcUser *ircUser) {
void BufferItem::userModeChanged(IrcUser *ircUser) {
Q_ASSERT(_ircChannel);
void BufferItem::userModeChanged(IrcUser *ircUser) {
Q_ASSERT(_ircChannel);
-
+
UserCategoryItem *categoryItem;
int categoryId = UserCategoryItem::categoryFromModes(_ircChannel->userModes(ircUser));
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);
return; // already in the right category;
removeUserFromCategory(ircUser);
@@
-363,7
+362,7
@@
IrcUserItem::IrcUserItem(IrcUser *ircUser, AbstractTreeItem *parent)
this, SLOT(setNick(QString)));
}
this, SLOT(setNick(QString)));
}
-QString IrcUserItem::nickName() {
+QString IrcUserItem::nickName()
const
{
return _ircUser->nick();
}
return _ircUser->nick();
}
@@
-375,6
+374,13
@@
quint64 IrcUserItem::id() const {
return (quint64)_ircUser;
}
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::setNick(QString newNick) {
Q_UNUSED(newNick);
emit dataChanged(0);