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

The following commit has been merged in the master branch:
commit db4dfd8824d7274e363c3d5fe2fca58ef6efa92b
Author: Francesco Nwokeka <francesco.nwokeka at gmail.com>
Date:   Thu Oct 27 08:07:35 2011 +0200

    Patch to set custom error message on validate account failed
    
    A patch to read/set error message for specific account plugins according to the error found when calling
    "validateParameters"
    REVIEW: 102975
    Reviewed by: David Edmundson
---
 .../abstract-account-parameters-widget.cpp                  | 13 ++++++++++++-
 .../abstract-account-parameters-widget.h                    |  3 +++
 src/KCMTelepathyAccounts/account-edit-widget.cpp            |  5 +++++
 src/KCMTelepathyAccounts/account-edit-widget.h              |  1 +
 src/add-account-assistant.cpp                               |  2 +-
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
index d0c469c..cdc2137 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
@@ -28,6 +28,7 @@
 #include <QLineEdit>
 #include <QCheckBox>
 #include <QComboBox>
+#include <KLocalizedString>
 #include <QSpinBox>
 #include <QDataWidgetMapper>
 #include <QMap>
@@ -46,6 +47,7 @@ public:
     QDataWidgetMapper *mapper;
     Tp::ProtocolParameterList parameters;
     QMap<QPersistentModelIndex,ValidatedLineEdit*> validatedWidgets;
+    QString errorMessage;
 };
 
 AbstractAccountParametersWidget::AbstractAccountParametersWidget(ParameterEditModel *parameterModel,
@@ -56,6 +58,7 @@ AbstractAccountParametersWidget::AbstractAccountParametersWidget(ParameterEditMo
     kDebug();
 
     d->parameterModel = parameterModel;
+    d->errorMessage = i18n("All mandatory fields must be filled");
 
     d->mapper = new QDataWidgetMapper(this);
     d->mapper->setModel(d->parameterModel);
@@ -70,7 +73,15 @@ AbstractAccountParametersWidget::~AbstractAccountParametersWidget()
     delete d;
 }
 
+QString AbstractAccountParametersWidget::errorMessage() const
+{
+    return d->errorMessage;
+}
 
+void AbstractAccountParametersWidget::setErrorMessage(const QString &errorMsg)
+{
+    d->errorMessage = errorMsg;
+}
 
 bool AbstractAccountParametersWidget::validateParameterValues()
 {
@@ -129,7 +140,7 @@ void AbstractAccountParametersWidget::handleParameter(const QString &parameterNa
         if(validated) {
             d->validatedWidgets.insert(index, validated);
 	}
-	
+
 	if (! (index.flags() & Qt::ItemIsEnabled)) {
             dataWidget->setEnabled(false);
         }
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
index a357757..130047f 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.h
@@ -45,6 +45,9 @@ public:
                                              QWidget *parent = 0);
     virtual ~AbstractAccountParametersWidget();
 
+    virtual QString errorMessage() const;
+    void setErrorMessage(const QString &errorMsg);
+
     /** Makes sure the model is up to date.
         Subclasses which do not only use the 'handleParameter' interface should implement this.
     */
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index 1823501..cf3e45d 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -122,6 +122,11 @@ AccountEditWidget::~AccountEditWidget()
     delete d;
 }
 
+QString AccountEditWidget::errorMessage() const
+{
+    return d->mainOptionsWidget->errorMessage();
+}
+
 bool AccountEditWidget::validateParameterValues() const
 {
     // the parameters handle by the advanced dialog are validated when the
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.h b/src/KCMTelepathyAccounts/account-edit-widget.h
index cdc2ea4..731c39a 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.h
+++ b/src/KCMTelepathyAccounts/account-edit-widget.h
@@ -46,6 +46,7 @@ public:
                                QWidget *parent = 0);
     virtual ~AccountEditWidget();
 
+    QString errorMessage() const;
     virtual bool validateParameterValues() const;
     bool connectOnAdd();
 
diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index ec4ebc9..7d532ba 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -154,7 +154,7 @@ void AddAccountAssistant::accept()
     if (!d->accountEditWidget->validateParameterValues()) {
         kDebug() << "A widget failed parameter validation. Not accepting wizard.";
         Q_EMIT feedbackMessage(i18n("Failed to create account"),
-                               i18n("All mandatory fields must be filled"),
+                               d->accountEditWidget->errorMessage(),
                                KTitleWidget::InfoMessage);
         return;
     }

-- 
ktp-accounts-kcm packaging