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

The following commit has been merged in the master branch:
commit f0281ca6e4879bc325d0fcf8a2eae03407b4a103
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon May 9 16:26:11 2011 +0100

    Add a lineedit to change the "Resource" on gabble accounts.
---
 gabble/server-settings-widget.cpp |  1 +
 gabble/server-settings-widget.ui  | 36 +++++++++++++++++++++---------------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/gabble/server-settings-widget.cpp b/gabble/server-settings-widget.cpp
index 7bb9ee0..2409610 100644
--- a/gabble/server-settings-widget.cpp
+++ b/gabble/server-settings-widget.cpp
@@ -39,6 +39,7 @@ ServerSettingsWidget::ServerSettingsWidget(ParameterEditModel *model,
     handleParameter("require-encryption", QVariant::Bool, m_ui->requireEncryptionCheckBox, 0);
     handleParameter("ignore-ssl-errors", QVariant::Bool, m_ui->ignoreSslErrorsCheckBox, 0);
     handleParameter("old-ssl", QVariant::Bool, m_ui->oldSslCheckBox, 0);
+    handleParameter("resource", QVariant::String, m_ui->resourceLineEdit, m_ui->resourceLabel);
 }
 
 ServerSettingsWidget::~ServerSettingsWidget()
diff --git a/gabble/server-settings-widget.ui b/gabble/server-settings-widget.ui
index e2a20b0..aaea0d0 100644
--- a/gabble/server-settings-widget.ui
+++ b/gabble/server-settings-widget.ui
@@ -62,22 +62,28 @@
      <property name="title">
       <string>Connection Settings</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QLabel" name="keepaliveIntervalLabel">
-          <property name="text">
-           <string>Keep Alive Interval:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="keepaliveIntervalSpinBox"/>
-        </item>
-       </layout>
+     <layout class="QFormLayout" name="formLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="keepaliveIntervalLabel">
+        <property name="text">
+         <string>Keep Alive Interval:</string>
+        </property>
+       </widget>
       </item>
-      <item>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="keepaliveIntervalSpinBox"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="resourceLabel">
+        <property name="text">
+         <string>Resource:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="resourceLineEdit"/>
+      </item>
+      <item row="2" column="0" colspan="2">
        <widget class="QCheckBox" name="lowBandwidthCheckBox">
         <property name="text">
          <string>Use Low Bandwidth Mode.</string>

-- 
ktp-accounts-kcm packaging