[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:58:47 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=14ec8ca
The following commit has been merged in the master branch:
commit 14ec8ca3c1d017ca4e357984d818f1a9f7592cc5
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date: Thu Jan 13 22:39:52 2011 +0100
Port idle plugin to the new plugin api.
---
idle/advanced-options-widget.cpp | 133 +++------------------------------------
idle/advanced-options-widget.h | 6 +-
idle/idle-account-ui.cpp | 10 ++-
idle/idle-account-ui.h | 6 +-
idle/main-options-widget.cpp | 91 ++-------------------------
idle/main-options-widget.h | 6 +-
6 files changed, 21 insertions(+), 231 deletions(-)
diff --git a/idle/advanced-options-widget.cpp b/idle/advanced-options-widget.cpp
index f579a85..f8ab288 100644
--- a/idle/advanced-options-widget.cpp
+++ b/idle/advanced-options-widget.cpp
@@ -35,108 +35,26 @@ public:
kDebug();
}
- Tp::ProtocolParameter charsetParameter;
- Tp::ProtocolParameter portParameter;
- Tp::ProtocolParameter passwordParameter;
- Tp::ProtocolParameter usernameParameter;
- Tp::ProtocolParameter useSslParameter;
-
Ui::AdvancedOptionsWidget *ui;
};
AdvancedOptionsWidget::AdvancedOptionsWidget(
- const Tp::ProtocolParameterList& parameters, const QVariantMap &values,
+ ParameterEditModel *model,
QWidget *parent)
- : AbstractAccountParametersWidget(parameters, values, parent),
+ : AbstractAccountParametersWidget(model, parent),
d(new Private)
{
kDebug();
- // Store the parameters this widget supports
- foreach (const Tp::ProtocolParameter ¶meter, parameters) {
- if ((parameter.name() == "charset") && (parameter.type() == QVariant::String)) {
- d->charsetParameter = parameter;
- } else if ((parameter.name() == "port") && (parameter.type() == QVariant::UInt)) {
- d->portParameter = parameter;
- } else if ((parameter.name() == "password") && (parameter.type() == QVariant::String)) {
- d->passwordParameter = parameter;
- } else if ((parameter.name() == "username") && (parameter.type() == QVariant::String)) {
- d->usernameParameter = parameter;
- } else if ((parameter.name() == "use-ssl") && (parameter.type() == QVariant::Bool)) {
- d->useSslParameter = parameter;
- }
- }
-
// Set up the UI.
d->ui = new Ui::AdvancedOptionsWidget;
d->ui->setupUi(this);
- // Prefill UI elements if appropriate.
- if (d->charsetParameter.isValid()) {
- if (values.contains(d->charsetParameter.name())) {
- d->ui->charsetLineEdit->setText(values.value(d->charsetParameter.name()).toString());
- } else {
- d->ui->charsetLineEdit->setText(d->charsetParameter.defaultValue().toString());
- }
- }
-
- if (d->portParameter.isValid()) {
- if (values.contains(d->portParameter.name())) {
- d->ui->portSpinBox->setValue(values.value(d->portParameter.name()).toUInt());
- } else {
- d->ui->portSpinBox->setValue(d->portParameter.defaultValue().toUInt());
- }
- }
-
- if (d->usernameParameter.isValid()) {
- if (values.contains(d->usernameParameter.name())) {
- d->ui->usernameLineEdit->setText(values.value(d->usernameParameter.name()).toString());
- } else {
- d->ui->usernameLineEdit->setText(d->usernameParameter.defaultValue().toString());
- }
- }
-
- if (d->useSslParameter.isValid()) {
- if (values.contains(d->useSslParameter.name())) {
- d->ui->useSslCheckBox->setChecked(values.value(d->useSslParameter.name()).toBool());
- } else {
- d->ui->useSslCheckBox->setChecked(d->useSslParameter.defaultValue().toBool());
- }
- }
-
- if (d->passwordParameter.isValid()) {
- if (values.contains(d->passwordParameter.name())) {
- d->ui->passwordLineEdit->setText(values.value(d->passwordParameter.name()).toString());
- } else {
- d->ui->passwordLineEdit->setText(d->passwordParameter.defaultValue().toString());
- }
- }
-
- // Hide any elements we don't have the parameters passed to show.
- if (!d->charsetParameter.isValid()) {
- d->ui->charsetLabel->hide();
- d->ui->charsetLineEdit->hide();
- }
-
- if (!d->portParameter.isValid()) {
- d->ui->portLabel->hide();
- d->ui->portSpinBox->hide();
- }
-
- if (!d->usernameParameter.isValid()) {
- d->ui->usernameLabel->hide();
- d->ui->usernameLineEdit->hide();
- }
-
- if (!d->useSslParameter.isValid()) {
- d->ui->useSslLabel->hide();
- d->ui->useSslCheckBox->hide();
- }
-
- if (!d->passwordParameter.isValid()) {
- d->ui->passwordLabel->hide();
- d->ui->passwordLineEdit->hide();
- }
+ handleParameter("port", QVariant::UInt, d->ui->portSpinBox, d->ui->portLabel);
+ handleParameter("username", QVariant::String, d->ui->usernameLineEdit, d->ui->usernameLabel);
+ handleParameter("password", QVariant::String, d->ui->passwordLineEdit, d->ui->passwordLabel);
+ handleParameter("use-ssl", QVariant::Bool, d->ui->useSslCheckBox, d->ui->useSslLabel);
+ handleParameter("charset", QVariant::String, d->ui->charsetLineEdit, d->ui->charsetLabel);
}
AdvancedOptionsWidget::~AdvancedOptionsWidget()
@@ -146,42 +64,5 @@ AdvancedOptionsWidget::~AdvancedOptionsWidget()
delete d;
}
-QList<ProtocolParameterValue> AdvancedOptionsWidget::parameterValues() const
-{
- kDebug();
-
- QList<ProtocolParameterValue> parameters;
-
- // Populate the map of parameters and their values with all the parameters this widget contains.
- if (d->charsetParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->charsetParameter, d->ui->charsetLineEdit->text()));
- }
-
- if (d->portParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->portParameter, d->ui->portSpinBox->value()));
- }
-
- if (d->usernameParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->usernameParameter, d->ui->usernameLineEdit->text()));
- }
-
- if (d->useSslParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->useSslParameter, d->ui->useSslCheckBox->isChecked()));
- }
-
- if (d->passwordParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->passwordParameter, d->ui->passwordLineEdit->text()));
- }
-
- return parameters;
-}
-
-bool AdvancedOptionsWidget::validateParameterValues()
-{
- kDebug();
-
- return true;
-}
-
#include "advanced-options-widget.moc"
diff --git a/idle/advanced-options-widget.h b/idle/advanced-options-widget.h
index 0663e4e..4ff2cc0 100644
--- a/idle/advanced-options-widget.h
+++ b/idle/advanced-options-widget.h
@@ -28,14 +28,10 @@ class AdvancedOptionsWidget : public AbstractAccountParametersWidget
Q_OBJECT
public:
- explicit AdvancedOptionsWidget(const Tp::ProtocolParameterList& parameters,
- const QVariantMap &values = QVariantMap(),
+ explicit AdvancedOptionsWidget(ParameterEditModel *model,
QWidget *parent = 0);
virtual ~AdvancedOptionsWidget();
- virtual QList<ProtocolParameterValue> parameterValues() const;
- virtual bool validateParameterValues();
-
private:
Q_DISABLE_COPY(AdvancedOptionsWidget);
diff --git a/idle/idle-account-ui.cpp b/idle/idle-account-ui.cpp
index 3227137..7db6176 100644
--- a/idle/idle-account-ui.cpp
+++ b/idle/idle-account-ui.cpp
@@ -62,13 +62,12 @@ IdleAccountUi::~IdleAccountUi()
}
AbstractAccountParametersWidget *IdleAccountUi::mainOptionsWidget(
- Tp::ProtocolParameterList parameters,
- const QVariantMap &values,
+ ParameterEditModel *model,
QWidget *parent) const
{
kDebug();
- return new MainOptionsWidget(parameters, values, parent);
+ return new MainOptionsWidget(model, parent);
}
bool IdleAccountUi::hasAdvancedOptionsWidget() const
@@ -77,13 +76,12 @@ bool IdleAccountUi::hasAdvancedOptionsWidget() const
}
AbstractAccountParametersWidget *IdleAccountUi::advancedOptionsWidget(
- Tp::ProtocolParameterList parameters,
- const QVariantMap &values,
+ ParameterEditModel *model,
QWidget *parent) const
{
kDebug();
- return new AdvancedOptionsWidget(parameters, values, parent);
+ return new AdvancedOptionsWidget(model, parent);
}
#include "idle-account-ui.moc"
diff --git a/idle/idle-account-ui.h b/idle/idle-account-ui.h
index f287752..fa65167 100644
--- a/idle/idle-account-ui.h
+++ b/idle/idle-account-ui.h
@@ -32,13 +32,11 @@ public:
virtual ~IdleAccountUi();
virtual AbstractAccountParametersWidget
- *mainOptionsWidget(Tp::ProtocolParameterList parameters,
- const QVariantMap &values = QVariantMap(),
+ *mainOptionsWidget(ParameterEditModel *model,
QWidget *parent = 0) const;
virtual bool hasAdvancedOptionsWidget() const;
virtual AbstractAccountParametersWidget
- *advancedOptionsWidget(Tp::ProtocolParameterList parameters,
- const QVariantMap &values = QVariantMap(),
+ *advancedOptionsWidget(ParameterEditModel *model,
QWidget *parent = 0) const;
private:
Q_DISABLE_COPY(IdleAccountUi);
diff --git a/idle/main-options-widget.cpp b/idle/main-options-widget.cpp
index 19743ef..f0a2b95 100644
--- a/idle/main-options-widget.cpp
+++ b/idle/main-options-widget.cpp
@@ -42,69 +42,23 @@ public:
Ui::MainOptionsWidget *ui;
};
-MainOptionsWidget::MainOptionsWidget(const Tp::ProtocolParameterList& parameters,
- const QVariantMap &values,
+MainOptionsWidget::MainOptionsWidget(
+ ParameterEditModel *model,
QWidget *parent)
- : AbstractAccountParametersWidget(parameters, values, parent),
+ : AbstractAccountParametersWidget(model, parent),
d(new Private)
{
kDebug();
- // Store the parameters this widget supports
- foreach (const Tp::ProtocolParameter ¶meter, parameters) {
- if ((parameter.name() == "account") && (parameter.type() == QVariant::String)) {
- d->accountParameter = parameter;
- } else if ((parameter.name() == "fullname") && (parameter.type() == QVariant::String)) {
- d->fullnameParameter = parameter;
- } else if ((parameter.name() == "server") && (parameter.type() == QVariant::String)) {
- d->serverParameter = parameter;
- }
- }
-
// Set up the UI.
d->ui = new Ui::MainOptionsWidget;
d->ui->setupUi(this);
- // Prefill UI elements if appropriate.
- if (d->accountParameter.isValid()) {
- if (values.contains(d->accountParameter.name())) {
- d->ui->accountLineEdit->setText(values.value(d->accountParameter.name()).toString());
- } else {
- d->ui->accountLineEdit->setText(d->accountParameter.defaultValue().toString());
- }
- }
-
- if (d->fullnameParameter.isValid()) {
- if (values.contains(d->fullnameParameter.name())) {
- d->ui->fullnameLineEdit->setText(values.value(d->fullnameParameter.name()).toString());
- } else {
- d->ui->fullnameLineEdit->setText(d->fullnameParameter.defaultValue().toString());
- }
- }
-
- if (d->serverParameter.isValid()) {
- if (values.contains(d->serverParameter.name())) {
- d->ui->serverLineEdit->setText(values.value(d->serverParameter.name()).toString());
- } else {
- d->ui->serverLineEdit->setText(d->serverParameter.defaultValue().toString());
- }
- }
+ handleParameter("account", QVariant::String, d->ui->accountLineEdit, d->ui->accountLabel);
+ handleParameter("server", QVariant::String, d->ui->serverLineEdit, d->ui->serverLabel);
+ handleParameter("fullname", QVariant::String, d->ui->fullnameLineEdit, d->ui->fullnameLabel);
- // Hide any elements we don't have the parameters passed to show.
- if (!d->accountParameter.isValid()) {
- d->ui->accountLabel->hide();
- d->ui->accountLineEdit->hide();
- }
- if (!d->fullnameParameter.isValid()) {
- d->ui->fullnameLabel->hide();
- d->ui->fullnameLineEdit->hide();
- }
-
- if (!d->serverParameter.isValid()) {
- d->ui->serverLabel->hide();
- d->ui->serverLineEdit->hide();
- }
}
MainOptionsWidget::~MainOptionsWidget()
@@ -114,37 +68,4 @@ MainOptionsWidget::~MainOptionsWidget()
delete d;
}
-QList<ProtocolParameterValue> MainOptionsWidget::parameterValues() const
-{
- kDebug();
-
- QList<ProtocolParameterValue> parameters;
-
- // Populate the map of parameters and their values with all the parameters this widget contains.
- if (d->accountParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->accountParameter, d->ui->accountLineEdit->text()));
- }
-
- if (d->fullnameParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->fullnameParameter, d->ui->fullnameLineEdit->text()));
- }
-
- if (d->serverParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->serverParameter, d->ui->serverLineEdit->text()));
- }
-
- return parameters;
-}
-
-bool MainOptionsWidget::validateParameterValues()
-{
- kDebug();
-
- if ((!d->ui->accountLineEdit->text().isEmpty()) && (!d->ui->serverLineEdit->text().isEmpty()))
- {
- return true;
- }
- else return false;
-}
-
#include "main-options-widget.moc"
diff --git a/idle/main-options-widget.h b/idle/main-options-widget.h
index 30fe4cd..513d372 100644
--- a/idle/main-options-widget.h
+++ b/idle/main-options-widget.h
@@ -28,14 +28,10 @@ class MainOptionsWidget : public AbstractAccountParametersWidget
Q_OBJECT
public:
- explicit MainOptionsWidget(const Tp::ProtocolParameterList& parameters,
- const QVariantMap &values = QVariantMap(),
+ explicit MainOptionsWidget(ParameterEditModel *model,
QWidget *parent = 0);
virtual ~MainOptionsWidget();
- virtual QList<ProtocolParameterValue> parameterValues() const;
- virtual bool validateParameterValues();
-
private:
Q_DISABLE_COPY(MainOptionsWidget);
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list