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

The following commit has been merged in the master branch:
commit c512995d7af3b76684b7b99a969c6d8fef92fe56
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Dec 28 14:30:11 2011 +0000

    Remove showing the username in the CL
    Reviewed by: Martin Klapetek
---
 main-widget.cpp |  6 ------
 main-widget.ui  | 55 ++++++++++++++++++++++---------------------------------
 2 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index dbcd233..3ce8c54 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -42,7 +42,6 @@
 #include <KDebug>
 #include <KDialog>
 #include <KIO/Job>
-#include <KUser>
 #include <KMenu>
 #include <KMessageBox>
 #include <KProtocolInfo>
@@ -70,7 +69,6 @@ MainWidget::MainWidget(QWidget *parent)
     : KMainWindow(parent)
 {
     Tp::registerTypes();
-    KUser user;
 
     setupUi(this);
     m_filterBar->hide();
@@ -80,10 +78,6 @@ MainWidget::MainWidget(QWidget *parent)
     KSharedConfigPtr config = KGlobal::config();
     KConfigGroup guiConfigGroup(config, "GUI");
 
-    m_userAccountNameLabel->setText(user.property(KUser::FullName).isNull() ?
-        user.loginName() : user.property(KUser::FullName).toString()
-    );
-
     m_toolBar->setToolButtonStyle(Qt::ToolButtonIconOnly);
 
     m_addContactAction = new KAction(KIcon("list-add-user"), i18n("Add new contacts..."), this);
diff --git a/main-widget.ui b/main-widget.ui
index d01dfc9..62ec3b2 100644
--- a/main-widget.ui
+++ b/main-widget.ui
@@ -15,41 +15,18 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="leftMargin">
-     <number>1</number>
-    </property>
-    <property name="rightMargin">
-     <number>1</number>
-    </property>
     <item>
-     <layout class="QGridLayout" name="gridLayout">
-      <property name="horizontalSpacing">
-       <number>-1</number>
+     <widget class="GlobalPresenceChooser" name="m_presenceChooser">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
       </property>
-      <property name="verticalSpacing">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="m_userAccountNameLabel">
-        <property name="text">
-         <string notr="true">TextLabel</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="AccountButtonsPanel" name="m_accountButtons" native="true"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="GlobalPresenceChooser" name="m_presenceChooser">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     </widget>
+    </item>
+    <item>
+     <widget class="AccountButtonsPanel" name="m_accountButtons" native="true"/>
     </item>
     <item>
      <widget class="Line" name="line">
@@ -60,6 +37,18 @@
     </item>
     <item>
      <widget class="QToolBar" name="m_toolBar">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>20</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>20</height>
+       </size>
+      </property>
       <property name="toolButtonStyle">
        <enum>Qt::ToolButtonIconOnly</enum>
       </property>

-- 
ktp-contact-list packaging