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

The following commit has been merged in the master branch:
commit f14f8460c500a263aff0798dcff9648cb5204ff5
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jun 16 01:32:15 2011 +0100

    Add register button to jabber account.
    
    REVIEW: 101640
    BUG: 275346
    Reviewed by: Rohan Garg
---
 gabble/main-options-widget.cpp |  1 +
 gabble/main-options-widget.ui  | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gabble/main-options-widget.cpp b/gabble/main-options-widget.cpp
index 97a79e1..89c9af3 100644
--- a/gabble/main-options-widget.cpp
+++ b/gabble/main-options-widget.cpp
@@ -34,6 +34,7 @@ MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
 
     handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
     handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
+    handleParameter("register", QVariant::Bool, m_ui->registerCheckBox, 0);
 }
 
 MainOptionsWidget::~MainOptionsWidget()
diff --git a/gabble/main-options-widget.ui b/gabble/main-options-widget.ui
index c3d6d30..9698d1c 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>62</height>
+    <height>207</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -19,7 +19,7 @@
      <item row="0" column="1">
       <widget class="KLineEdit" name="accountLineEdit"/>
      </item>
-     <item row="1" column="1">
+     <item row="2" column="1">
       <widget class="KLineEdit" name="passwordLineEdit">
        <property name="echoMode">
         <enum>QLineEdit::Password</enum>
@@ -39,7 +39,7 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
+     <item row="2" column="0">
       <widget class="QLabel" name="passwordLabel">
        <property name="text">
         <string>Password:</string>
@@ -49,6 +49,13 @@
        </property>
       </widget>
      </item>
+     <item row="3" column="1">
+      <widget class="QCheckBox" name="registerCheckBox">
+       <property name="text">
+        <string>Register new account</string>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
   </layout>

-- 
ktp-accounts-kcm packaging