[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=3e4d820

The following commit has been merged in the master branch:
commit 3e4d820691292573efdb1357adeb05de17c077cf
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Mar 4 11:10:50 2011 +0100

    Make the account group header pretty again
---
 contactdelegate.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/contactdelegate.cpp b/contactdelegate.cpp
index fa53097..94951ee 100644
--- a/contactdelegate.cpp
+++ b/contactdelegate.cpp
@@ -4,6 +4,7 @@
 #include <QApplication>
 
 #include <KIconLoader>
+#include <KIcon>
 
 #include "accounts-model.h"
 
@@ -39,7 +40,7 @@ void ContactDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opt
     {
 
         QRect iconRect = optV4.rect;
-        iconRect.setSize(QSize(32, 32));
+        iconRect.setSize(QSize(AVATAR_SIZE, AVATAR_SIZE));
         iconRect.moveTo(QPoint(iconRect.x() + SPACING, iconRect.y() + SPACING));
 
         QPixmap avatar = QPixmap::fromImage(QImage(index.data(AccountsModel::AvatarRole).toString()));
@@ -111,8 +112,8 @@ void ContactDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opt
     }
     else
     {
-        painter->drawText(optV4.rect, index.data(AccountsModel::DisplayNameRole).toString());
-        /*QRect groupRect = optV4.rect;
+//        painter->drawText(optV4.rect, index.data(AccountsModel::DisplayNameRole).toString());
+        QRect groupRect = optV4.rect;
 
         QRect accountGroupRect = groupRect;
         accountGroupRect.setSize(QSize(16,16));
@@ -127,20 +128,20 @@ void ContactDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opt
         groupFont.setWeight(QFont::Normal);
         groupFont.setPixelSize(10);
 
-        QString counts = QString(" (%1/%2)").arg(index.data(ModelRoles::AccountAvailContactsCountRole).toString(),
-                                       index.data(ModelRoles::AccountAllContactsCountRole).toString());
+        QString counts;// = QString(" (%1/%2)").arg(index.data(AccountsModel::).toString(),
+                        //               index.data(ModelRoles::AccountAllContactsCountRole).toString());
 
 
         painter->fillRect(groupRect, QColor(247, 251, 255));
 
-        painter->drawPixmap(accountGroupRect, KIcon(index.data(ModelRoles::AccountIconRole).toString()).pixmap(16,16));
+        painter->drawPixmap(accountGroupRect, KIcon(index.data(AccountsModel::IconRole).toString()).pixmap(16,16));
 
         painter->setFont(groupFont);
-        painter->drawText(groupLabelRect, Qt::AlignVCenter, index.data(ModelRoles::AccountGroupRole).toString().append(counts));
+        painter->drawText(groupLabelRect, Qt::AlignVCenter, index.data(AccountsModel::DisplayNameRole).toString().append(counts));
 
         painter->setPen(QColor(220, 220, 220));
         painter->drawLine(groupRect.x(), groupRect.y(), groupRect.width(), groupRect.y());
-        painter->drawLine(groupRect.x(), groupRect.bottom(), groupRect.width(), groupRect.bottom());*/
+        painter->drawLine(groupRect.x(), groupRect.bottom(), groupRect.width(), groupRect.bottom());
     }
 
 //     QRect typeRect;

-- 
ktp-contact-list packaging