Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2011-07-09 19:15:47 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2011-07-09 19:15:47 (GMT) |
| commit | d78c4858afaaf856ec95d45adf59916b6eaf032d (patch) | |
| tree | 5c58f8553ddf3afd05255a0c7bb3b582b63700cc | |
| parent | 3e154a0c3eae309acecdfe7524cfe1e1ca95386a (diff) | |
| download | swift-d78c4858afaaf856ec95d45adf59916b6eaf032d.zip swift-d78c4858afaaf856ec95d45adf59916b6eaf032d.tar.bz2 | |
Fix roster avatars
| -rw-r--r-- | Swift/QtUI/ChatList/ChatListDelegate.cpp | 3 | ||||
| -rw-r--r-- | Swift/QtUI/ChatList/ChatListRecentItem.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/Roster/RosterDelegate.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Swift/QtUI/ChatList/ChatListDelegate.cpp b/Swift/QtUI/ChatList/ChatListDelegate.cpp index 520b40e..0c4356c 100644 --- a/Swift/QtUI/ChatList/ChatListDelegate.cpp +++ b/Swift/QtUI/ChatList/ChatListDelegate.cpp @@ -101,12 +101,13 @@ void ChatListDelegate::paintRecent(QPainter* painter, const QStyleOptionViewItem QColor nameColor = item->data(Qt::TextColorRole).value<QColor>(); QString avatarPath; if (item->data(ChatListRecentItem::AvatarRole).isValid() && !item->data(ChatListRecentItem::AvatarRole).value<QString>().isNull()) { - QString avatarPath = item->data(ChatListRecentItem::AvatarRole).value<QString>(); + avatarPath = item->data(ChatListRecentItem::AvatarRole).value<QString>(); } QIcon presenceIcon = item->data(ChatListRecentItem::PresenceIconRole).isValid() && !item->data(ChatListRecentItem::PresenceIconRole).value<QIcon>().isNull() ? item->data(ChatListRecentItem::PresenceIconRole).value<QIcon>() : QIcon(":/icons/offline.png"); QString name = item->data(Qt::DisplayRole).toString(); + //qDebug() << "Avatar for " << name << " = " << avatarPath; QString statusText = item->data(ChatListRecentItem::DetailTextRole).toString(); common_.paintContact(painter, option, nameColor, avatarPath, presenceIcon, name, statusText); } diff --git a/Swift/QtUI/ChatList/ChatListRecentItem.cpp b/Swift/QtUI/ChatList/ChatListRecentItem.cpp index e7c9599..6c9807f 100644 --- a/Swift/QtUI/ChatList/ChatListRecentItem.cpp +++ b/Swift/QtUI/ChatList/ChatListRecentItem.cpp @@ -25,7 +25,7 @@ QVariant ChatListRecentItem::data(int role) const { case Qt::BackgroundColorRole: return backgroundColor_; case Qt::ToolTipRole: return isContact() ? toolTipString() : QVariant(); case StatusTextRole: return statusText_;*/ - case AvatarRole: return chat_.avatarPath.string().c_str(); + case AvatarRole: return QVariant(QString(chat_.avatarPath.string().c_str())); case PresenceIconRole: return getPresenceIcon(); default: return QVariant(); } diff --git a/Swift/QtUI/Roster/RosterDelegate.cpp b/Swift/QtUI/Roster/RosterDelegate.cpp index 6914fc3..1adb9e3 100644 --- a/Swift/QtUI/Roster/RosterDelegate.cpp +++ b/Swift/QtUI/Roster/RosterDelegate.cpp @@ -64,7 +64,7 @@ void RosterDelegate::paintContact(QPainter* painter, const QStyleOptionViewItem& QColor nameColor = index.data(Qt::TextColorRole).value<QColor>(); QString avatarPath; if (index.data(AvatarRole).isValid() && !index.data(AvatarRole).value<QString>().isNull()) { - QString avatarPath = index.data(AvatarRole).value<QString>(); + avatarPath = index.data(AvatarRole).value<QString>(); } QIcon presenceIcon = index.data(PresenceIconRole).isValid() && !index.data(PresenceIconRole).value<QIcon>().isNull() ? index.data(PresenceIconRole).value<QIcon>() |