Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-05-23 15:31:23 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-07-25 14:05:23 (GMT) |
| commit | c7ea4a479d2f63c73278f934f68bbb5d5430a334 (patch) | |
| tree | 62b180742186535902cd425448a041853eaba2a1 /Swift/QtUI/Roster | |
| parent | 1759abcc579bbd602f5ea5d59cfbdcb8a4e94fea (diff) | |
| download | swift-c7ea4a479d2f63c73278f934f68bbb5d5430a334.zip swift-c7ea4a479d2f63c73278f934f68bbb5d5430a334.tar.bz2 | |
Changing default avatar to a blue circled swift
The old default avatar does not work well with the new
chat view design which uses circled avatars.
This also uses the vector avatar internally in Swift and
has Qt and the chat view engine scale it to the required
size.
Test-Information:
Tested on OS X 10.11.5 with non-compact chat views and MUC
conversations.
Change-Id: I82580ecb91fc81f4fe9535aa9d3b214b720a40f3
Diffstat (limited to 'Swift/QtUI/Roster')
| -rw-r--r-- | Swift/QtUI/Roster/DelegateCommons.cpp | 2 | ||||
| -rw-r--r-- | Swift/QtUI/Roster/RosterTooltip.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/Roster/DelegateCommons.cpp b/Swift/QtUI/Roster/DelegateCommons.cpp index 517683b..c1c1244 100644 --- a/Swift/QtUI/Roster/DelegateCommons.cpp +++ b/Swift/QtUI/Roster/DelegateCommons.cpp @@ -45,7 +45,7 @@ void DelegateCommons::paintContact(QPainter* painter, const QStyleOptionViewItem } } if (!compact && avatarPixmap.isNull()) { - avatarPixmap = QPixmap(":/icons/avatar.png").scaled(avatarRegion.height(), avatarRegion.width(), Qt::KeepAspectRatio, Qt::SmoothTransformation); + avatarPixmap = QPixmap(":/icons/avatar.svg").scaled(avatarRegion.height(), avatarRegion.width(), Qt::KeepAspectRatio, Qt::SmoothTransformation); } if (!compact) { diff --git a/Swift/QtUI/Roster/RosterTooltip.cpp b/Swift/QtUI/Roster/RosterTooltip.cpp index d151628..8ecd276 100644 --- a/Swift/QtUI/Roster/RosterTooltip.cpp +++ b/Swift/QtUI/Roster/RosterTooltip.cpp @@ -85,7 +85,7 @@ QString RosterTooltip::buildDetailedTooltip(ContactRosterItem* contact, QtScaled contact->onVCardRequested(); } - QString scaledAvatarPath = cachedImageScaler->getScaledAvatarPath(P2QSTRING(contact->getAvatarPath().empty() ? ":/icons/avatar.png" : pathToString(contact->getAvatarPath()))); + QString scaledAvatarPath = cachedImageScaler->getScaledAvatarPath(P2QSTRING(contact->getAvatarPath().empty() ? ":/icons/avatar.svg" : pathToString(contact->getAvatarPath()))); QString bareJID = contact->getDisplayJID().toString().empty() ? "" : "( " + P2QSTRING(contact->getDisplayJID().toString()) + " )"; |