[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:08:38 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=265fa16
The following commit has been merged in the master branch:
commit 265fa1691afd2dcf76b738bbb4ac1efe42a1ae24
Author: Martin Klapetek <mklapetek at kde.org>
Date: Fri Jan 30 20:48:40 2015 +0100
Use the existing avatarPixmap() mechanism for kpeople data source
That method does pixmap data caching, contact-pixmap relation caching
and also paints it grayscale if the contact is offline
This got lost in the kf5 transition
On a second thought, the grayscaling should probably be moved to the
delegate in contact list, other UIs might want to keep the full colored
version
---
kpeople/datasourceplugin/im-persons-data-source.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kpeople/datasourceplugin/im-persons-data-source.cpp b/kpeople/datasourceplugin/im-persons-data-source.cpp
index 5d12e24..afc2e70 100644
--- a/kpeople/datasourceplugin/im-persons-data-source.cpp
+++ b/kpeople/datasourceplugin/im-persons-data-source.cpp
@@ -40,6 +40,7 @@
#include <QSqlDatabase>
#include <QSqlQuery>
+#include <QPixmap>
using namespace KPeople;
@@ -97,9 +98,8 @@ public:
return m_account->objectPath();
else if(key == S_KPEOPLE_PROPERTY_PRESENCE)
return s_presenceStrings.value(m_contact->presence().type());
- else if (key == AbstractContact::PictureProperty && !m_contact->avatarData().fileName.isEmpty()) {
- return QUrl::fromLocalFile(m_contact->avatarData().fileName);
- }
+ else if (key == AbstractContact::PictureProperty)
+ return m_contact->avatarPixmap();
}
return m_properties[key];
}
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list