[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/network/telepathy-accounts-kcm/src
From: George Goldberg <grundleborg () googlemail ! com>
Date: 2009-08-03 14:26:54
Message-ID: 1249309614.825606.7169.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1006343 by gberg:
Support pre-populating the parameter edit widgets for the case when we are editing an \
account, not adding it.
M +5 -2 add-account-assistant.cpp
M +2 -1 defaultaccountui/mandatory-parameter-edit-widget.cpp
M +2 -1 defaultaccountui/mandatory-parameter-edit-widget.h
M +3 -2 defaultaccountui/optional-parameter-edit-widget.cpp
M +2 -1 defaultaccountui/optional-parameter-edit-widget.h
M +3 -2 defaultaccountui/parameter-edit-widget.cpp
M +1 -0 defaultaccountui/parameter-edit-widget.h
M +12 -4 edit-account-dialog.cpp
M +3 -0 libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp
M +1 -0 libkcmtelepathyaccounts/abstract-account-parameters-widget.h
M +4 -2 libkcmtelepathyaccounts/abstract-account-ui.h
--- trunk/playground/network/telepathy-accounts-kcm/src/add-account-assistant.cpp \
#1006342:1006343 @@ -171,7 +171,8 @@
}
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 @@
// 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"));
}
--- trunk/playground/network/telepathy-accounts-kcm/src/defaultaccountui/mandatory-parameter-edit-widget.cpp \
#1006342:1006343 @@ -34,8 +34,9 @@
};
MandatoryParameterEditWidget::MandatoryParameterEditWidget(Tp::ProtocolParameterList \
parameters, + const \
QVariantMap &values,
QWidget *parent)
- : ParameterEditWidget(parameters, parent),
+ : ParameterEditWidget(parameters, values, parent),
d(new Private)
{
kDebug();
--- trunk/playground/network/telepathy-accounts-kcm/src/defaultaccountui/mandatory-parameter-edit-widget.h \
#1006342:1006343 @@ -29,7 +29,8 @@
public:
explicit MandatoryParameterEditWidget(Tp::ProtocolParameterList parameters,
- QWidget *parent = 0);
+ const QVariantMap &values = QVariantMap(),
+ QWidget *parent = 0);
~MandatoryParameterEditWidget();
virtual bool validateParameterValues();
--- trunk/playground/network/telepathy-accounts-kcm/src/defaultaccountui/optional-parameter-edit-widget.cpp \
#1006342:1006343 @@ -32,8 +32,9 @@
};
OptionalParameterEditWidget::OptionalParameterEditWidget(Tp::ProtocolParameterList \
parameters,
- QWidget *parent)
- : ParameterEditWidget(parameters, parent),
+ const QVariantMap &values,
+ QWidget *parent)
+ : ParameterEditWidget(parameters, values, parent),
d(new Private)
{
kDebug();
--- trunk/playground/network/telepathy-accounts-kcm/src/defaultaccountui/optional-parameter-edit-widget.h \
#1006342:1006343 @@ -29,7 +29,8 @@
public:
explicit OptionalParameterEditWidget(Tp::ProtocolParameterList parameters,
- QWidget *parent = 0);
+ const QVariantMap &values = QVariantMap(),
+ QWidget *parent = 0);
~OptionalParameterEditWidget();
virtual bool validateParameterValues();
--- trunk/playground/network/telepathy-accounts-kcm/src/defaultaccountui/parameter-edit-widget.cpp \
#1006342:1006343 @@ -42,8 +42,9 @@
};
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 @@
// 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())); }
}
--- trunk/playground/network/telepathy-accounts-kcm/src/defaultaccountui/parameter-edit-widget.h \
#1006342:1006343 @@ -31,6 +31,7 @@
public:
explicit ParameterEditWidget(Tp::ProtocolParameterList parameters,
+ const QVariantMap &values = QVariantMap(),
QWidget *parent = 0);
~ParameterEditWidget();
--- trunk/playground/network/telepathy-accounts-kcm/src/edit-account-dialog.cpp \
#1006342:1006343 @@ -95,7 +95,8 @@
// 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 @@
}
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 @@
// 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 @@
// 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"));
}
--- trunk/playground/network/telepathy-accounts-kcm/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.cpp \
#1006342:1006343 @@ -34,6 +34,7 @@
};
AbstractAccountParametersWidget::AbstractAccountParametersWidget(Tp::ProtocolParameterList \
parameters, + const \
QVariantMap &values,
QWidget *parent)
: QWidget(parent),
d(new Private)
@@ -41,6 +42,8 @@
kDebug();
d->parameters = parameters;
+
+ Q_UNUSED(values);
}
AbstractAccountParametersWidget::~AbstractAccountParametersWidget()
--- trunk/playground/network/telepathy-accounts-kcm/src/libkcmtelepathyaccounts/abstract-account-parameters-widget.h \
#1006342:1006343 @@ -35,6 +35,7 @@
public:
explicit AbstractAccountParametersWidget(Tp::ProtocolParameterList parameters,
+ const QVariantMap &values = \
QVariantMap(), QWidget *parent = 0);
virtual ~AbstractAccountParametersWidget();
--- trunk/playground/network/telepathy-accounts-kcm/src/libkcmtelepathyaccounts/abstract-account-ui.h \
#1006342:1006343 @@ -44,9 +44,11 @@
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);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic