[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=00d23cc

The following commit has been merged in the master branch:
commit 00d23ccbb6a3603ab49f68a6065305f4a61505dc
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Mar 4 16:38:21 2011 +0100

    Add expand/collapse sign to the groups headers
---
 contactdelegate.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/contactdelegate.cpp b/contactdelegate.cpp
index f54e5ab..2790987 100644
--- a/contactdelegate.cpp
+++ b/contactdelegate.cpp
@@ -5,6 +5,7 @@
 
 #include <KIconLoader>
 #include <KIcon>
+#include <KDebug>
 
 #include "accounts-model.h"
 
@@ -119,7 +120,6 @@ void ContactDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opt
     }
     else
     {
-//        painter->drawText(optV4.rect, index.data(AccountsModel::DisplayNameRole).toString());
         QRect groupRect = optV4.rect;
 
         QRect accountGroupRect = groupRect;
@@ -128,8 +128,9 @@ void ContactDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opt
 
         QRect groupLabelRect = groupRect;
         groupLabelRect.setLeft(20);
-        //groupLabelRect.setBottom(groupRect.bottom());
-        //groupLabelRect.setHeight(16);
+        
+        QRect expandSignRect = groupLabelRect;
+        expandSignRect.setLeft(groupLabelRect.right()-20);
 
         QFont groupFont = painter->font();
         groupFont.setWeight(QFont::Normal);
@@ -149,17 +150,16 @@ void ContactDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opt
         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());
-    }
 
-//     QRect typeRect;
-//
-//     typeRect = painter->boundingRect(optV4.rect, Qt::AlignLeft | Qt::AlignBottom, index.data(51).toString());
-//     typeRect.moveTo(QPoint(typeRect.x() + iconRect.x() + iconRect.width() + SPACING, typeRect.y() - SPACING));
-//     painter->drawText(typeRect, index.data(51).toString());
-//
-//     QRect sizeRect = painter->boundingRect(optV4.rect, Qt::AlignRight | Qt::AlignTop, index.data(50).toString());
-//     sizeRect.moveTo(QPoint(sizeRect.x() - SPACING, sizeRect.y() + SPACING));
-//     painter->drawText(sizeRect, index.data(50).toString());
+        painter->setPen(QColor(0, 0, 0));
+        
+        if(option.state & QStyle::State_Open) {
+            painter->drawText(expandSignRect, Qt::AlignVCenter, QString("-"));
+        }
+        else {
+            painter->drawText(expandSignRect, Qt::AlignVCenter, QString("+"));
+        }
+    }
 
     painter->restore();
 }

-- 
ktp-contact-list packaging