[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Fri May 27 23:57:57 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=7ca2687
The following commit has been merged in the master branch:
commit 7ca2687d4385dc44f2c07aa582243fb7ca7f7f7c
Author: George Goldberg <grundleborg at googlemail.com>
Date: Mon Aug 3 14:26:53 2009 +0000
Support pre-populating the parameter edit widgets for the case when we are editing an account, not adding it.
svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1006343
---
src/add-account-assistant.cpp | 7 +++++--
src/defaultaccountui/mandatory-parameter-edit-widget.cpp | 3 ++-
src/defaultaccountui/mandatory-parameter-edit-widget.h | 3 ++-
src/defaultaccountui/optional-parameter-edit-widget.cpp | 5 +++--
src/defaultaccountui/optional-parameter-edit-widget.h | 3 ++-
src/defaultaccountui/parameter-edit-widget.cpp | 5 +++--
src/defaultaccountui/parameter-edit-widget.h | 1 +
src/edit-account-dialog.cpp | 16 ++++++++++++----
.../abstract-account-parameters-widget.cpp | 3 +++
.../abstract-account-parameters-widget.h | 1 +
src/libkcmtelepathyaccounts/abstract-account-ui.h | 6 ++++--
11 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 0be66cc..1085f84 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -171,7 +171,8 @@ void AddAccountAssistant::next()
}
if (!d->mandatoryParametersWidget) {
- d->mandatoryParametersWidget = new MandatoryParameterEditWidget(item->mandatoryParameters(), d->tabWidget);
+ d->mandatoryParametersWidget = new MandatoryParameterEditWidget(
+ item->mandatoryParameters(), QVariantMap(), d->tabWidget);
}
d->tabWidget->addTab(d->mandatoryParametersWidget, i18n("Mandatory Parameters"));
@@ -210,7 +211,9 @@ void AddAccountAssistant::next()
// Show the generic UI if optionalParameters is not empty.
if (optionalParametersLeft.size() > 0) {
OptionalParameterEditWidget *opew =
- new OptionalParameterEditWidget(optionalParametersLeft, d->tabWidget);
+ new OptionalParameterEditWidget(optionalParametersLeft,
+ QVariantMap(),
+ d->tabWidget);
d->optionalParametersWidgets.append(opew);
d->tabWidget->addTab(opew, i18n("Optional Parameters"));
}
diff --git a/src/defaultaccountui/mandatory-parameter-edit-widget.cpp b/src/defaultaccountui/mandatory-parameter-edit-widget.cpp
index 567cc6d..b63b78c 100644
--- a/src/defaultaccountui/mandatory-parameter-edit-widget.cpp
+++ b/src/defaultaccountui/mandatory-parameter-edit-widget.cpp
@@ -34,8 +34,9 @@ public:
};
MandatoryParameterEditWidget::MandatoryParameterEditWidget(Tp::ProtocolParameterList parameters,
+ const QVariantMap &values,
QWidget *parent)
- : ParameterEditWidget(parameters, parent),
+ : ParameterEditWidget(parameters, values, parent),
d(new Private)
{
kDebug();
diff --git a/src/defaultaccountui/mandatory-parameter-edit-widget.h b/src/defaultaccountui/mandatory-parameter-edit-widget.h
index a2c08c7..78d10d6 100644
--- a/src/defaultaccountui/mandatory-parameter-edit-widget.h
+++ b/src/defaultaccountui/mandatory-parameter-edit-widget.h
@@ -29,7 +29,8 @@ class MandatoryParameterEditWidget : public ParameterEditWidget
public:
explicit MandatoryParameterEditWidget(Tp::ProtocolParameterList parameters,
- QWidget *parent = 0);
+ const QVariantMap &values = QVariantMap(),
+ QWidget *parent = 0);
~MandatoryParameterEditWidget();
virtual bool validateParameterValues();
diff --git a/src/defaultaccountui/optional-parameter-edit-widget.cpp b/src/defaultaccountui/optional-parameter-edit-widget.cpp
index 6582266..b2793b1 100644
--- a/src/defaultaccountui/optional-parameter-edit-widget.cpp
+++ b/src/defaultaccountui/optional-parameter-edit-widget.cpp
@@ -32,8 +32,9 @@ public:
};
OptionalParameterEditWidget::OptionalParameterEditWidget(Tp::ProtocolParameterList parameters,
- QWidget *parent)
- : ParameterEditWidget(parameters, parent),
+ const QVariantMap &values,
+ QWidget *parent)
+ : ParameterEditWidget(parameters, values, parent),
d(new Private)
{
kDebug();
diff --git a/src/defaultaccountui/optional-parameter-edit-widget.h b/src/defaultaccountui/optional-parameter-edit-widget.h
index 0716bee..6a8e788 100644
--- a/src/defaultaccountui/optional-parameter-edit-widget.h
+++ b/src/defaultaccountui/optional-parameter-edit-widget.h
@@ -29,7 +29,8 @@ class OptionalParameterEditWidget : public ParameterEditWidget
public:
explicit OptionalParameterEditWidget(Tp::ProtocolParameterList parameters,
- QWidget *parent = 0);
+ const QVariantMap &values = QVariantMap(),
+ QWidget *parent = 0);
~OptionalParameterEditWidget();
virtual bool validateParameterValues();
diff --git a/src/defaultaccountui/parameter-edit-widget.cpp b/src/defaultaccountui/parameter-edit-widget.cpp
index 82df541..422aabb 100644
--- a/src/defaultaccountui/parameter-edit-widget.cpp
+++ b/src/defaultaccountui/parameter-edit-widget.cpp
@@ -42,8 +42,9 @@ public:
};
ParameterEditWidget::ParameterEditWidget(Tp::ProtocolParameterList parameters,
+ const QVariantMap &values,
QWidget *parent)
- : AbstractAccountParametersWidget(parameters, parent),
+ : AbstractAccountParametersWidget(parameters, values, parent),
d(new Private)
{
kDebug();
@@ -63,7 +64,7 @@ ParameterEditWidget::ParameterEditWidget(Tp::ProtocolParameterList parameters,
// Add the parameters to the model.
foreach (Tp::ProtocolParameter *parameter, parameters) {
- d->model->addItem(parameter, parameter->defaultValue());
+ d->model->addItem(parameter, values.value(parameter->name(), parameter->defaultValue()));
}
}
diff --git a/src/defaultaccountui/parameter-edit-widget.h b/src/defaultaccountui/parameter-edit-widget.h
index 77fa911..da29b06 100644
--- a/src/defaultaccountui/parameter-edit-widget.h
+++ b/src/defaultaccountui/parameter-edit-widget.h
@@ -31,6 +31,7 @@ class ParameterEditWidget : public AbstractAccountParametersWidget
public:
explicit ParameterEditWidget(Tp::ProtocolParameterList parameters,
+ const QVariantMap &values = QVariantMap(),
QWidget *parent = 0);
~ParameterEditWidget();
diff --git a/src/edit-account-dialog.cpp b/src/edit-account-dialog.cpp
index 6af4793..4d84988 100644
--- a/src/edit-account-dialog.cpp
+++ b/src/edit-account-dialog.cpp
@@ -95,7 +95,8 @@ EditAccountDialog::EditAccountDialog(AccountItem *item, QWidget *parent)
// Create the custom UI or generic UI depending on available parameters.
if (ui) {
// UI does exist, set it up.
- AbstractAccountParametersWidget *widget = ui->mandatoryParametersWidget(d->mandatoryProtocolParameters);
+ AbstractAccountParametersWidget *widget = ui->mandatoryParametersWidget(d->mandatoryProtocolParameters,
+ item->account()->parameters());
QMap<QString, QVariant::Type> manParams = ui->supportedMandatoryParameters();
QMap<QString, QVariant::Type>::const_iterator manIter = manParams.constBegin();
while(manIter != manParams.constEnd()) {
@@ -123,7 +124,10 @@ EditAccountDialog::EditAccountDialog(AccountItem *item, QWidget *parent)
}
if (!d->mandatoryParametersWidget) {
- d->mandatoryParametersWidget = new MandatoryParameterEditWidget(d->mandatoryProtocolParameters, d->tabWidget);
+ d->mandatoryParametersWidget = new MandatoryParameterEditWidget(
+ d->mandatoryProtocolParameters,
+ item->account()->parameters(),
+ d->tabWidget);
}
d->tabWidget->addTab(d->mandatoryParametersWidget, i18n("Mandatory Parameters"));
@@ -135,7 +139,9 @@ EditAccountDialog::EditAccountDialog(AccountItem *item, QWidget *parent)
// everything.
if (ui) {
// UI Does exist, set it up.
- QList<AbstractAccountParametersWidget*> widgets = ui->optionalParametersWidgets(d->optionalProtocolParameters);
+ QList<AbstractAccountParametersWidget*> widgets = ui->optionalParametersWidgets(
+ d->optionalProtocolParameters,
+ item->account()->parameters());
// Remove all handled parameters from the optionalParameters list.
QMap<QString, QVariant::Type> opParams = ui->supportedOptionalParameters();
@@ -161,7 +167,9 @@ EditAccountDialog::EditAccountDialog(AccountItem *item, QWidget *parent)
// Show the generic UI if optionalParameters is not empty.
if (optionalParametersLeft.size() > 0) {
OptionalParameterEditWidget *opew =
- new OptionalParameterEditWidget(optionalParametersLeft, d->tabWidget);
+ new OptionalParameterEditWidget(optionalParametersLeft,
+ item->account()->parameters(),
+ d->tabWidget);
d->optionalParametersWidgets.append(opew);
d->tabWidget->addTab(opew, i18n("Optional Parameters"));
}
diff --git a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
index d85b50e..d0ad71a 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
+++ b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
@@ -34,6 +34,7 @@ public:
};
AbstractAccountParametersWidget::AbstractAccountParametersWidget(Tp::ProtocolParameterList parameters,
+ const QVariantMap &values,
QWidget *parent)
: QWidget(parent),
d(new Private)
@@ -41,6 +42,8 @@ AbstractAccountParametersWidget::AbstractAccountParametersWidget(Tp::ProtocolPar
kDebug();
d->parameters = parameters;
+
+ Q_UNUSED(values);
}
AbstractAccountParametersWidget::~AbstractAccountParametersWidget()
diff --git a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
index 00dd584..6357b4e 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h
@@ -35,6 +35,7 @@ class KDE_EXPORT AbstractAccountParametersWidget : public QWidget
public:
explicit AbstractAccountParametersWidget(Tp::ProtocolParameterList parameters,
+ const QVariantMap &values = QVariantMap(),
QWidget *parent = 0);
virtual ~AbstractAccountParametersWidget();
diff --git a/src/libkcmtelepathyaccounts/abstract-account-ui.h b/src/libkcmtelepathyaccounts/abstract-account-ui.h
index c42ebac..e8538c8 100644
--- a/src/libkcmtelepathyaccounts/abstract-account-ui.h
+++ b/src/libkcmtelepathyaccounts/abstract-account-ui.h
@@ -44,9 +44,11 @@ public:
virtual const QMap<QString, QVariant::Type> &supportedOptionalParameters() const;
virtual AbstractAccountParametersWidget
- *mandatoryParametersWidget(Tp::ProtocolParameterList parameters) const = 0;
+ *mandatoryParametersWidget(Tp::ProtocolParameterList parameters,
+ const QVariantMap &values = QVariantMap()) const = 0;
virtual QList<AbstractAccountParametersWidget*>
- optionalParametersWidgets(Tp::ProtocolParameterList parameters) const = 0;
+ optionalParametersWidgets(Tp::ProtocolParameterList parameters,
+ const QVariantMap &values = QVariantMap()) const = 0;
protected:
virtual void registerSupportedMandatoryParameter(const QString &name, QVariant::Type type);
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list