[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=4d56f92

The following commit has been merged in the master branch:
commit 4d56f92434bbbbe4c761bd5aabd95dfeda59d326
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Mon Sep 14 08:51:55 2009 +0000

    Use the new validation code to validate all the parameters when we add/edit an account.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1023213
---
 .../mandatory-parameter-edit-widget.cpp               |  2 +-
 .../optional-parameter-edit-widget.cpp                |  2 +-
 src/KCMTelepathyAccounts/parameter-edit-model.cpp     | 19 +++++++++++++++++++
 src/KCMTelepathyAccounts/parameter-edit-model.h       |  2 ++
 src/KCMTelepathyAccounts/parameter-edit-widget.cpp    |  5 +++++
 src/KCMTelepathyAccounts/parameter-edit-widget.h      |  2 ++
 6 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/KCMTelepathyAccounts/mandatory-parameter-edit-widget.cpp b/src/KCMTelepathyAccounts/mandatory-parameter-edit-widget.cpp
index b63b78c..db1659b 100644
--- a/src/KCMTelepathyAccounts/mandatory-parameter-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/mandatory-parameter-edit-widget.cpp
@@ -60,7 +60,7 @@ bool MandatoryParameterEditWidget::validateParameterValues()
         }
     }
 
-    return true;
+    return ParameterEditWidget::validateParameterValues();
 }
 
 
diff --git a/src/KCMTelepathyAccounts/optional-parameter-edit-widget.cpp b/src/KCMTelepathyAccounts/optional-parameter-edit-widget.cpp
index b2793b1..74b804c 100644
--- a/src/KCMTelepathyAccounts/optional-parameter-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/optional-parameter-edit-widget.cpp
@@ -52,7 +52,7 @@ bool OptionalParameterEditWidget::validateParameterValues()
     kDebug();
 
     // TODO: Implement me!
-    return true;
+    return ParameterEditWidget::validateParameterValues();
 }
 
 
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.cpp b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
index 53e01bd..0fe52a1 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
@@ -22,7 +22,10 @@
 
 #include "parameter-item.h"
 
+#include <KApplication>
 #include <KDebug>
+#include <KLocale>
+#include <KMessageBox>
 
 #include <QtGui/QValidator>
 
@@ -152,6 +155,22 @@ QMap<Tp::ProtocolParameter*, QVariant> ParameterEditModel::parameterValues() con
     return values;
 }
 
+bool ParameterEditModel::validateParameterValues()
+{
+    foreach (ParameterItem *item, m_items) {
+        if (item->validity() != QValidator::Acceptable) {
+           // Display a more helpful error here.
+           KMessageBox::error(QApplication::activeWindow (),
+                              i18n("\"<b>%1</b>\" is not an acceptable value for <b>%2</b>")
+                              .arg(item->value().toString())
+                              .arg(item->localizedName()));
+           return false;
+       }
+    }
+
+    return true;
+}
+
 
 #include "parameter-edit-model.moc"
 
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.h b/src/KCMTelepathyAccounts/parameter-edit-model.h
index 25bc2e3..0c762ea 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.h
@@ -57,6 +57,8 @@ public:
     void addItem(Tp::ProtocolParameter *parameter, const QVariant &originalValue);
     QMap<Tp::ProtocolParameter*, QVariant> parameterValues() const;
 
+    bool validateParameterValues();
+
 private:
     QList<ParameterItem*> m_items;
 };
diff --git a/src/KCMTelepathyAccounts/parameter-edit-widget.cpp b/src/KCMTelepathyAccounts/parameter-edit-widget.cpp
index 422aabb..187c39f 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-widget.cpp
@@ -86,6 +86,11 @@ void ParameterEditWidget::onDelegateDataChanged(const QModelIndex &index, const
     d->model->setData(index, value, role);
 }
 
+bool ParameterEditWidget::validateParameterValues()
+{
+    return d->model->validateParameterValues();
+}
+
 
 #include "parameter-edit-widget.moc"
 
diff --git a/src/KCMTelepathyAccounts/parameter-edit-widget.h b/src/KCMTelepathyAccounts/parameter-edit-widget.h
index 7726e62..4d3b5a6 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-widget.h
+++ b/src/KCMTelepathyAccounts/parameter-edit-widget.h
@@ -39,6 +39,8 @@ public:
 
     virtual QMap<Tp::ProtocolParameter*, QVariant> parameterValues() const;
 
+    virtual bool validateParameterValues();
+
 private Q_SLOTS:
     void onDelegateDataChanged(const QModelIndex &index, const QVariant &value, int role);
 

-- 
ktp-accounts-kcm packaging