[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=0cd69ab

The following commit has been merged in the master branch:
commit 0cd69ab53ecc4189a0827b7a80b1bba884197f2b
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Oct 26 12:16:10 2012 +0100

    Use correct colour role when painting text delegates on a view
    
    REVIEWED-BY: Martin Klapetek
    
    BUG: 308802
    FIXED-IN: 0.5.2
---
 abstract-contact-delegate.cpp | 2 +-
 contact-delegate-compact.cpp  | 4 ++--
 contact-delegate.cpp          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/abstract-contact-delegate.cpp b/abstract-contact-delegate.cpp
index 6013036..bc92109 100644
--- a/abstract-contact-delegate.cpp
+++ b/abstract-contact-delegate.cpp
@@ -120,7 +120,7 @@ void AbstractContactDelegate::paintHeader(QPainter *painter, const QStyleOptionV
     if (option.state & QStyle::State_HasFocus) {
         painter->setPen(option.palette.color(QPalette::Active, QPalette::HighlightedText));
     } else {
-        painter->setPen(option.palette.color(QPalette::Active, QPalette::WindowText));
+        painter->setPen(option.palette.color(QPalette::Active, QPalette::Text));
     }
 
     painter->setFont(groupFont);
diff --git a/contact-delegate-compact.cpp b/contact-delegate-compact.cpp
index f2cce42..2cb00dc 100644
--- a/contact-delegate-compact.cpp
+++ b/contact-delegate-compact.cpp
@@ -121,7 +121,7 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
     if (option.state & QStyle::State_HasFocus) {
         painter->setPen(option.palette.color(QPalette::Active, QPalette::HighlightedText));
     } else {
-        painter->setPen(option.palette.color(QPalette::Active, QPalette::WindowText));
+        painter->setPen(option.palette.color(QPalette::Active, QPalette::Text));
     }
 
     painter->setFont(nameFont);
@@ -142,7 +142,7 @@ void ContactDelegateCompact::paintContact(QPainter * painter, const QStyleOption
     if (option.state & QStyle::State_HasFocus) {
         painter->setPen(option.palette.color(QPalette::Disabled, QPalette::HighlightedText));
     } else {
-        painter->setPen(option.palette.color(QPalette::Disabled, QPalette::WindowText));
+        painter->setPen(option.palette.color(QPalette::Disabled, QPalette::Text));
     }
 
     painter->drawText(presenceMessageRect,
diff --git a/contact-delegate.cpp b/contact-delegate.cpp
index 11ed9c8..19ed1f0 100644
--- a/contact-delegate.cpp
+++ b/contact-delegate.cpp
@@ -136,7 +136,7 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
     if (option.state & QStyle::State_HasFocus) {
         painter->setPen(option.palette.color(QPalette::Active, QPalette::HighlightedText));
     } else {
-        painter->setPen(option.palette.color(QPalette::Active, QPalette::WindowText));
+        painter->setPen(option.palette.color(QPalette::Active, QPalette::Text));
     }
 
     painter->drawText(userNameRect,
@@ -153,7 +153,7 @@ void ContactDelegate::paintContact(QPainter *painter, const QStyleOptionViewItem
     if (option.state & QStyle::State_HasFocus) {
         fadingColor = QColor(option.palette.color(QPalette::Disabled, QPalette::HighlightedText));
     } else {
-        fadingColor = QColor(option.palette.color(QPalette::Disabled, QPalette::WindowText));
+        fadingColor = QColor(option.palette.color(QPalette::Disabled, QPalette::Text));
     }
 
     // if the index is hovered, set animated alpha to the color

-- 
ktp-contact-list packaging