[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=270eada

The following commit has been merged in the master branch:
commit 270eadad0146de6bb2543b12040aff8e79d1895a
Author: Thomas Richard <thomas9999 at gmail.com>
Date:   Sun Jan 9 01:41:47 2011 +0100

    Fix layout issues in the edit dialogs
---
 src/KCMTelepathyAccounts/account-edit-widget.ui | 19 ++++++++++++++++---
 src/edit-account-dialog.cpp                     |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/KCMTelepathyAccounts/account-edit-widget.ui b/src/KCMTelepathyAccounts/account-edit-widget.ui
index 6387e2b..5a901a4 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.ui
+++ b/src/KCMTelepathyAccounts/account-edit-widget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>394</width>
-    <height>213</height>
+    <height>63</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -17,7 +17,7 @@
    <item>
     <widget class="QWidget" name="centralWidget" native="true">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -25,7 +25,7 @@
      <property name="minimumSize">
       <size>
        <width>0</width>
-       <height>48</height>
+       <height>0</height>
       </size>
      </property>
     </widget>
@@ -54,6 +54,19 @@
      </item>
     </layout>
    </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index 27b0e73..d92b270 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -68,7 +68,7 @@ EditAccountDialog::EditAccountDialog(AccountItem *item, QWidget *parent)
                                       parameterValues,
                                       this);
     setMainWidget(d->widget);
-    resize(400, 480);
+    setMinimumWidth(400);
 }
 
 EditAccountDialog::~EditAccountDialog()

-- 
ktp-accounts-kcm packaging