[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=34a4127

The following commit has been merged in the master branch:
commit 34a4127aa2cc662099bcf2972bc27adc6c8331e3
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sat Jan 8 21:45:34 2011 +0000

    Show a protocol title and icon on the edit widget
---
 src/KCMTelepathyAccounts/account-edit-widget.cpp |  4 +++
 src/KCMTelepathyAccounts/account-edit-widget.ui  | 43 ++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index 1bd635b..7ff8a62 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -25,6 +25,7 @@
 #include "abstract-account-ui.h"
 #include "parameter-edit-widget.h"
 #include "plugin-manager.h"
+#include "dictionary.h"
 
 #include <KDebug>
 #include <KLocale>
@@ -75,6 +76,9 @@ AccountEditWidget::AccountEditWidget(const Tp::ProtocolInfo &info,
     connect(d->ui.advancedButton, SIGNAL(clicked()),
             this, SLOT(onAdvancedClicked()));
     d->ui.advancedButton->setIcon(KIcon("configure"));
+    d->ui.titleLabel->setText(Dictionary::instance()->string(info.name()));
+    d->ui.iconLabel->setText("");
+    d->ui.iconLabel->setPixmap(KIcon(info.iconName()).pixmap(32));
 
     loadWidgets();
 }
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.ui b/src/KCMTelepathyAccounts/account-edit-widget.ui
index 6387e2b..554bf3c 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.ui
+++ b/src/KCMTelepathyAccounts/account-edit-widget.ui
@@ -11,9 +11,46 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>10</number>
-   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QLabel" name="titleLabel">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string notr="true">protocolIcon</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="iconLabel">
+       <property name="text">
+        <string notr="true">protocolIcon</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
    <item>
     <widget class="QWidget" name="centralWidget" native="true">
      <property name="sizePolicy">

-- 
ktp-accounts-kcm packaging