[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=6eeca31

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

    Added priorty spin box
    
    Review: 101319
    Review by: Daniele Elmo Domenichelli
---
 gabble/server-settings-widget.cpp |  1 +
 gabble/server-settings-widget.ui  | 31 +++++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/gabble/server-settings-widget.cpp b/gabble/server-settings-widget.cpp
index 2409610..224c181 100644
--- a/gabble/server-settings-widget.cpp
+++ b/gabble/server-settings-widget.cpp
@@ -40,6 +40,7 @@ ServerSettingsWidget::ServerSettingsWidget(ParameterEditModel *model,
     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);
+    handleParameter("priority", QVariant::Int, m_ui->prioritySpinBox, m_ui->priorityLabel);
 }
 
 ServerSettingsWidget::~ServerSettingsWidget()
diff --git a/gabble/server-settings-widget.ui b/gabble/server-settings-widget.ui
index aaea0d0..42cd0ae 100644
--- a/gabble/server-settings-widget.ui
+++ b/gabble/server-settings-widget.ui
@@ -73,20 +73,39 @@
       <item row="0" column="1">
        <widget class="QSpinBox" name="keepaliveIntervalSpinBox"/>
       </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="resourceLabel">
+      <item row="4" column="0" colspan="2">
+       <widget class="QCheckBox" name="lowBandwidthCheckBox">
         <property name="text">
-         <string>Resource:</string>
+         <string>Use Low Bandwidth Mode.</string>
         </property>
        </widget>
       </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Resource</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout_3">
+      <item row="4" column="1">
+       <widget class="QSpinBox" name="prioritySpinBox"/>
+      </item>
       <item row="1" column="1">
        <widget class="QLineEdit" name="resourceLineEdit"/>
       </item>
-      <item row="2" column="0" colspan="2">
-       <widget class="QCheckBox" name="lowBandwidthCheckBox">
+      <item row="1" column="0">
+       <widget class="QLabel" name="resourceLabel">
         <property name="text">
-         <string>Use Low Bandwidth Mode.</string>
+         <string>Resource Name:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="priorityLabel">
+        <property name="text">
+         <string>Priority:</string>
         </property>
        </widget>
       </item>

-- 
ktp-accounts-kcm packaging