[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=67e97a1

The following commit has been merged in the master branch:
commit 67e97a12bcb367e522e00f97f795185e837c3cf8
Author: Thomas Richard <thomas9999 at gmail.com>
Date:   Sun Jan 9 18:09:41 2011 +0100

    Merge part 2
---
 src/KCMTelepathyAccounts/account-edit-widget.cpp | 14 +++++++-------
 src/KCMTelepathyAccounts/account-edit-widget.ui  | 21 ++++-----------------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index 9ec1d7f..d78cf93 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -72,10 +72,10 @@ 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));
+    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();
 }
@@ -128,7 +128,7 @@ void AccountEditWidget::loadWidgets()
         //Widgets wrapped in a layout should not have double margins
         d->mainOptionsWidget->layout()->setContentsMargins(0, 0, 0, 0);
         d->ui->advancedButton->setVisible(d->accountUi->hasAdvancedOptionsWidget());
-        d->ui->verticalLayout->insertWidget(0, d->mainOptionsWidget);
+        d->ui->verticalLayout->insertWidget(1, d->mainOptionsWidget);
 
         // check if all the parameters the UI supports are available in the CM plugin
         // also verify if the UI handle all mandatory parameters
@@ -166,8 +166,8 @@ void AccountEditWidget::loadWidgets()
                 d->parameterValues,
                 this);
         d->ui->advancedButton->setVisible(false);
-        d->ui->verticalLayout->insertWidget(0, d->mainOptionsWidget);
-        d->ui->verticalLayout->setStretch(0, 1);
+        d->ui->verticalLayout->insertWidget(1, d->mainOptionsWidget);
+        d->ui->verticalLayout->setStretch(1, 1);
     }
 }
 
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.ui b/src/KCMTelepathyAccounts/account-edit-widget.ui
index ac496cd..986194b 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.ui
+++ b/src/KCMTelepathyAccounts/account-edit-widget.ui
@@ -7,10 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>394</width>
-    <height>25</height>
+    <height>55</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
@@ -52,22 +55,6 @@
     </layout>
    </item>
    <item>
-    <widget class="QWidget" name="centralWidget" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-    </widget>
-   </item>
-   <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QPushButton" name="advancedButton">

-- 
ktp-accounts-kcm packaging