[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=cad32b4

The following commit has been merged in the master branch:
commit cad32b4ba42ba372ac7f90bdbd0aa30695495c11
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Sep 13 19:11:03 2011 +0200

    Add a generic avatar into contact info dialog for contacts without avatar. Some enhancements in user visible strings too.
    
    Reviewed-by: David Edmundson
    REVIEW: 102606
    BUG: 278702
---
 dialogs/contact-info.cpp |  3 +++
 dialogs/contact-info.ui  | 12 +++---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dialogs/contact-info.cpp b/dialogs/contact-info.cpp
index b3efa99..0be1d56 100644
--- a/dialogs/contact-info.cpp
+++ b/dialogs/contact-info.cpp
@@ -41,6 +41,9 @@ ContactInfo::ContactInfo(const Tp::ContactPtr &contact, QWidget *parent) :
     setButtons(KDialog::Close);
 
     QPixmap avatar(contact->avatarData().fileName);
+    if (avatar.isNull()) {
+        avatar = KIconLoader::global()->loadIcon("im-user", KIconLoader::Desktop, 128);
+    }
 
     ui->avatarLabel->setPixmap(avatar.scaled(ui->avatarLabel->maximumSize(), Qt::KeepAspectRatio));
 
diff --git a/dialogs/contact-info.ui b/dialogs/contact-info.ui
index a10bc9c..a84031f 100644
--- a/dialogs/contact-info.ui
+++ b/dialogs/contact-info.ui
@@ -101,11 +101,8 @@
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label_3">
-       <property name="toolTip">
-        <string>Can see when you are online</string>
-       </property>
        <property name="text">
-        <string>Publish State:</string>
+        <string>Contact can see when you are online:</string>
        </property>
       </widget>
      </item>
@@ -118,11 +115,8 @@
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_5">
-       <property name="toolTip">
-        <string>You can see when they are online</string>
-       </property>
        <property name="text">
-        <string>Subscription State:</string>
+        <string>You can see when the contact is online:</string>
        </property>
       </widget>
      </item>
@@ -136,7 +130,7 @@
      <item row="2" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
-        <string>Blocked:</string>
+        <string>Contact is blocked:</string>
        </property>
       </widget>
      </item>

-- 
ktp-contact-list packaging