[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=64eaf00

The following commit has been merged in the master branch:
commit 64eaf002176c138c52f5b702dda90ab27147fbe1
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Sun Jan 20 17:01:49 2013 +0100

    Show account name in contact tooltip
    
    REVIEW: 108501
    BUG: 298030
---
 tooltips/contacttooltip.cpp |  3 +++
 tooltips/contacttooltip.ui  | 22 ++++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/tooltips/contacttooltip.cpp b/tooltips/contacttooltip.cpp
index 8b4d820..502c8fb 100644
--- a/tooltips/contacttooltip.cpp
+++ b/tooltips/contacttooltip.cpp
@@ -80,6 +80,9 @@ ContactToolTip::ContactToolTip(const QModelIndex &index) :
     ui->presenceMessageLabel->setText(presenceMessage);
     ui->blockedLabel->setShown(index.data(ContactsModel::BlockedRole).toBool());
 
+    const Tp::AccountPtr account = index.data(ContactsModel::AccountRole).value<Tp::AccountPtr>();
+    ui->accountLabel->setText(i18n("Account: %1").arg(account->displayName()));
+
     connect(ui->presenceMessageLabel, SIGNAL(linkActivated(QString)), this, SLOT(openLink(QString)));
 }
 
diff --git a/tooltips/contacttooltip.ui b/tooltips/contacttooltip.ui
index 1569249..63e1bf2 100644
--- a/tooltips/contacttooltip.ui
+++ b/tooltips/contacttooltip.ui
@@ -10,11 +10,11 @@
     <height>114</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,1,0" columnstretch="0,0,1">
+  <layout class="QGridLayout" name="gridLayout" rowstretch="0,0,0,0,1,0,0" columnstretch="0,0,1">
    <property name="margin">
     <number>0</number>
    </property>
-   <item row="0" column="0" rowspan="5">
+   <item row="0" column="0" rowspan="6">
     <widget class="QLabel" name="avatarLabel">
      <property name="minimumSize">
       <size>
@@ -32,14 +32,14 @@
       <string/>
      </property>
      <property name="scaledContents">
-      <bool>true</bool>
+      <bool>false</bool>
      </property>
      <property name="alignment">
       <set>Qt::AlignHCenter|Qt::AlignTop</set>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" rowspan="5">
+   <item row="0" column="1" rowspan="6">
     <widget class="QLabel" name="presenceIcon">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
@@ -104,7 +104,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="2">
+   <item row="5" column="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -120,7 +120,7 @@
      </property>
     </spacer>
    </item>
-   <item row="5" column="0" colspan="3">
+   <item row="6" column="0" colspan="3">
     <widget class="QLabel" name="blockedLabel">
      <property name="text">
       <string>User is blocked</string>
@@ -130,6 +130,16 @@
      </property>
     </widget>
    </item>
+   <item row="4" column="2">
+    <widget class="QLabel" name="accountLabel">
+     <property name="text">
+      <string/>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::PlainText</enum>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

-- 
ktp-contact-list packaging