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

The following commit has been merged in the master branch:
commit ed4cd210cd3a9183c960127844fb94b29e726f64
Author: Lasse Liehu <lliehu at kolumbus.fi>
Date:   Sun Jan 9 18:07:13 2011 +0200

    UI fine-tuning, add parameter validation
---
 idle/advanced-options-widget.ui               | 74 +++++++++++++--------------
 idle/kcmtelepathyaccounts_plugin_idle.desktop |  4 +-
 idle/main-options-widget.cpp                  |  7 ++-
 idle/main-options-widget.ui                   |  2 +-
 4 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/idle/advanced-options-widget.ui b/idle/advanced-options-widget.ui
index 2f05b48..5d741a9 100644
--- a/idle/advanced-options-widget.ui
+++ b/idle/advanced-options-widget.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
-    <height>300</height>
+    <width>314</width>
+    <height>155</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -17,6 +17,26 @@
    <property name="fieldGrowthPolicy">
     <enum>QFormLayout::ExpandingFieldsGrow</enum>
    </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="usernameLabel">
+     <property name="text">
+      <string>Username:</string>
+     </property>
+     <property name="buddy">
+      <cstring>usernameLineEdit</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="KLineEdit" name="usernameLineEdit">
+     <property name="toolTip">
+      <string/>
+     </property>
+     <property name="whatsThis">
+      <string/>
+     </property>
+    </widget>
+   </item>
    <item row="2" column="0">
     <widget class="QLabel" name="passwordLabel">
      <property name="text">
@@ -43,40 +63,23 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
-    <widget class="QCheckBox" name="useSslCheckBox">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="useSslLabel">
-     <property name="text">
-      <string>Use SSL?</string>
-     </property>
-     <property name="buddy">
-      <cstring>useSslCheckBox</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <widget class="KLineEdit" name="charsetLineEdit"/>
-   </item>
    <item row="5" column="0">
     <widget class="QLabel" name="charsetLabel">
      <property name="text">
-      <string>Character Set:</string>
+      <string>Character set:</string>
      </property>
      <property name="buddy">
       <cstring>charsetLineEdit</cstring>
      </property>
     </widget>
    </item>
+   <item row="5" column="1">
+    <widget class="KLineEdit" name="charsetLineEdit"/>
+   </item>
    <item row="6" column="0">
     <widget class="QLabel" name="portLabel">
      <property name="text">
-      <string>Server Port:</string>
+      <string>Server port:</string>
      </property>
      <property name="buddy">
       <cstring>portSpinBox</cstring>
@@ -90,23 +93,20 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="KLineEdit" name="usernameLineEdit">
-     <property name="toolTip">
-      <string/>
+   <item row="7" column="0">
+    <widget class="QLabel" name="useSslLabel">
+     <property name="text">
+      <string>Use SSL?</string>
      </property>
-     <property name="whatsThis">
-      <string/>
+     <property name="buddy">
+      <cstring>useSslCheckBox</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="usernameLabel">
+   <item row="7" column="1">
+    <widget class="QCheckBox" name="useSslCheckBox">
      <property name="text">
-      <string>Username:</string>
-     </property>
-     <property name="buddy">
-      <cstring>usernameLineEdit</cstring>
+      <string/>
      </property>
     </widget>
    </item>
@@ -127,9 +127,9 @@
  <tabstops>
   <tabstop>usernameLineEdit</tabstop>
   <tabstop>passwordLineEdit</tabstop>
-  <tabstop>useSslCheckBox</tabstop>
   <tabstop>charsetLineEdit</tabstop>
   <tabstop>portSpinBox</tabstop>
+  <tabstop>useSslCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/idle/kcmtelepathyaccounts_plugin_idle.desktop b/idle/kcmtelepathyaccounts_plugin_idle.desktop
index e69f640..b835b45 100644
--- a/idle/kcmtelepathyaccounts_plugin_idle.desktop
+++ b/idle/kcmtelepathyaccounts_plugin_idle.desktop
@@ -10,8 +10,8 @@ Type=Service
 ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
 
 X-KDE-Library=kcmtelepathyaccounts_plugin_idle
-X-KDE-PluginInfo-Author=David Edmundson
-X-KDE-PluginInfo-Email=kde at davidedmundson.co.uk
+X-KDE-PluginInfo-Author=Lasse Liehu
+X-KDE-PluginInfo-Email=lliehu at kolumbus.fi
 X-KDE-PluginInfo-Name=idle
 X-KDE-PluginInfo-Version=0.1
 X-KDE-PluginInfo-Website=http://techbase.kde.org/Projects/Telepathy
diff --git a/idle/main-options-widget.cpp b/idle/main-options-widget.cpp
index d957534..e6715cb 100644
--- a/idle/main-options-widget.cpp
+++ b/idle/main-options-widget.cpp
@@ -140,8 +140,11 @@ bool MainOptionsWidget::validateParameterValues()
 {
     kDebug();
 
-
-    return true;
+    if ((!d->ui->accountLineEdit->text().isEmpty()) && (!d->ui->serverLineEdit->text().isEmpty()))
+    {
+        return true;
+    }
+    else return false;
 }
 
 #include "main-options-widget.moc"
diff --git a/idle/main-options-widget.ui b/idle/main-options-widget.ui
index 140376f..aae76d6 100644
--- a/idle/main-options-widget.ui
+++ b/idle/main-options-widget.ui
@@ -33,7 +33,7 @@
    <item row="1" column="1">
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>Example: chat.freenode.net</string>
+      <string><i>Example:</i> chat.freenode.net</string>
      </property>
     </widget>
    </item>

-- 
ktp-accounts-kcm packaging