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

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

    Fix layout issues in the edit dialogs
---
 butterfly/main-options-widget.ui | 26 ++++++++++++++++----------
 gabble/main-options-widget.ui    | 15 +--------------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/butterfly/main-options-widget.ui b/butterfly/main-options-widget.ui
index 672d561..36496c9 100644
--- a/butterfly/main-options-widget.ui
+++ b/butterfly/main-options-widget.ui
@@ -6,10 +6,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>286</width>
+    <height>74</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Account Preferences</string>
   </property>
@@ -27,10 +33,10 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="KLineEdit" name="accountLineEdit">
-     <property name="showClearButton" stdset="0">
-      <bool>false</bool>
+   <item row="1" column="1">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Example: user at hotmail.com</string>
      </property>
     </widget>
    </item>
@@ -57,10 +63,10 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Example: user at hotmail.com</string>
+   <item row="0" column="1">
+    <widget class="KLineEdit" name="accountLineEdit">
+     <property name="showClearButton" stdset="0">
+      <bool>false</bool>
      </property>
     </widget>
    </item>
diff --git a/gabble/main-options-widget.ui b/gabble/main-options-widget.ui
index ad60065..5e56e33 100644
--- a/gabble/main-options-widget.ui
+++ b/gabble/main-options-widget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>300</height>
+    <height>62</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -59,19 +59,6 @@
      </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>219</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>

-- 
ktp-accounts-kcm packaging