[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/network/telepathy-accounts-kcm-plugins/gabble
From:       George Goldberg <grundleborg () googlemail ! com>
Date:       2009-08-03 14:52:16
Message-ID: 1249311136.551960.10441.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1006358 by gberg:

Bring up to date with latest libkcmtelepathyaccounts API, and make the gabble \
mandatory parameters widget support editing.

 M  +8 -3      gabble-account-ui.cpp  
 M  +4 -2      gabble-account-ui.h  
 M  +15 -1     mandatory-parameters-widget.cpp  
 M  +1 -0      mandatory-parameters-widget.h  


--- trunk/playground/network/telepathy-accounts-kcm-plugins/gabble/gabble-account-ui.cpp \
#1006357:1006358 @@ -53,19 +53,24 @@
     delete d;
 }
 
-AbstractAccountParametersWidget \
*GabbleAccountUi::mandatoryParametersWidget(Tp::ProtocolParameterList parameters) \
const +AbstractAccountParametersWidget *GabbleAccountUi::mandatoryParametersWidget(
+        Tp::ProtocolParameterList parameters,
+        const QVariantMap &values) const
 {
     kDebug();
 
-    return new MandatoryParametersWidget(parameters);
+    return new MandatoryParametersWidget(parameters, values);
 }
 
-QList<AbstractAccountParametersWidget*> \
GabbleAccountUi::optionalParametersWidgets(Tp::ProtocolParameterList parameters) \
const +QList<AbstractAccountParametersWidget*> \
GabbleAccountUi::optionalParametersWidgets( +        Tp::ProtocolParameterList \
parameters, +        const QVariantMap &values) const
 {
     kDebug();
 
     // TODO: Implement me!
     Q_UNUSED(parameters);
+    Q_UNUSED(values);
     return QList<AbstractAccountParametersWidget*>();
 }
 
--- trunk/playground/network/telepathy-accounts-kcm-plugins/gabble/gabble-account-ui.h \
#1006357:1006358 @@ -32,9 +32,11 @@
     virtual ~GabbleAccountUi();
 
     virtual AbstractAccountParametersWidget
-              *mandatoryParametersWidget(Tp::ProtocolParameterList parameters) \
const; +              *mandatoryParametersWidget(Tp::ProtocolParameterList \
parameters, +                                         const QVariantMap &values = \
QVariantMap()) const;  virtual QList<AbstractAccountParametersWidget*>
-              optionalParametersWidgets(Tp::ProtocolParameterList parameters) const;
+              optionalParametersWidgets(Tp::ProtocolParameterList parameters,
+                                        const QVariantMap &values = QVariantMap()) \
const;  
 private:
     Q_DISABLE_COPY(GabbleAccountUi);
--- trunk/playground/network/telepathy-accounts-kcm-plugins/gabble/mandatory-parameters-widget.cpp \
#1006357:1006358 @@ -44,8 +44,9 @@
 };
 
 MandatoryParametersWidget::MandatoryParametersWidget(Tp::ProtocolParameterList \
parameters, +                                                     const QVariantMap \
&values,  QWidget *parent)
- : AbstractAccountParametersWidget(parameters, parent),
+ : AbstractAccountParametersWidget(parameters, values, parent),
    d(new Private)
 {
     kDebug();
@@ -70,6 +71,19 @@
     d->ui = new Ui::MandatoryParametersWidget;
     d->ui->setupUi(this);
 
+    // Prefill UI elements if appropriate.
+    if (d->accountParameter) {
+        if (values.contains(d->accountParameter->name())) {
+            d->ui->accountLineEdit->setText(values.value(d->accountParameter->name()).toString());
 +        }
+    }
+
+    if (d->passwordParameter) {
+        if (values.contains(d->passwordParameter->name())) {
+            d->ui->passwordLineEdit->setText(values.value(d->passwordParameter->name()).toString());
 +        }
+    }
+
     // Hide any elements we don't have the parameters passed to show.
     if (!d->accountParameter) {
         d->ui->accountLabel->hide();
--- trunk/playground/network/telepathy-accounts-kcm-plugins/gabble/mandatory-parameters-widget.h \
#1006357:1006358 @@ -29,6 +29,7 @@
 
 public:
     explicit MandatoryParametersWidget(Tp::ProtocolParameterList parameters,
+                                       const QVariantMap &values = QVariantMap(),
                                        QWidget *parent = 0);
     virtual ~MandatoryParametersWidget();
 


[prev in list] [next in list] [prev in thread] [next in thread]