[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:36 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=1c81907
The following commit has been merged in the master branch:
commit 1c8190708eac8a5f6b7c0d1163f2a6f52149268a
Author: Lasse Liehu <lliehu at kolumbus.fi>
Date: Sun Jan 9 02:44:07 2011 +0200
"account" option is the nickname; move username to advanced settings
---
idle/advanced-options-widget.cpp | 20 ++++++++++++++++++++
idle/advanced-options-widget.ui | 37 +++++++++++++++++++++++++++++--------
idle/main-options-widget.cpp | 20 --------------------
idle/main-options-widget.ui | 22 ++++------------------
4 files changed, 53 insertions(+), 46 deletions(-)
diff --git a/idle/advanced-options-widget.cpp b/idle/advanced-options-widget.cpp
index 69f1de2..a1cc5d5 100644
--- a/idle/advanced-options-widget.cpp
+++ b/idle/advanced-options-widget.cpp
@@ -38,6 +38,7 @@ public:
Tp::ProtocolParameter charsetParameter;
Tp::ProtocolParameter portParameter;
Tp::ProtocolParameter passwordParameter;
+ Tp::ProtocolParameter usernameParameter;
Tp::ProtocolParameter useSslParameter;
Ui::AdvancedOptionsWidget *ui;
@@ -59,6 +60,8 @@ AdvancedOptionsWidget::AdvancedOptionsWidget(
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;
}
@@ -85,6 +88,14 @@ AdvancedOptionsWidget::AdvancedOptionsWidget(
}
}
+ 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());
@@ -112,6 +123,11 @@ AdvancedOptionsWidget::AdvancedOptionsWidget(
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();
@@ -145,6 +161,10 @@ QList<ProtocolParameterValue> AdvancedOptionsWidget::parameterValues() const
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()));
}
diff --git a/idle/advanced-options-widget.ui b/idle/advanced-options-widget.ui
index 8ded8e5..2f05b48 100644
--- a/idle/advanced-options-widget.ui
+++ b/idle/advanced-options-widget.ui
@@ -17,7 +17,7 @@
<property name="fieldGrowthPolicy">
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
- <item row="0" column="0">
+ <item row="2" column="0">
<widget class="QLabel" name="passwordLabel">
<property name="text">
<string>Password:</string>
@@ -30,7 +30,7 @@
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item row="2" column="1">
<widget class="KLineEdit" name="passwordLineEdit">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
@@ -43,14 +43,14 @@
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="3" column="1">
<widget class="QCheckBox" name="useSslCheckBox">
<property name="text">
<string/>
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="3" column="0">
<widget class="QLabel" name="useSslLabel">
<property name="text">
<string>Use SSL?</string>
@@ -60,10 +60,10 @@
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="5" column="1">
<widget class="KLineEdit" name="charsetLineEdit"/>
</item>
- <item row="3" column="0">
+ <item row="5" column="0">
<widget class="QLabel" name="charsetLabel">
<property name="text">
<string>Character Set:</string>
@@ -73,7 +73,7 @@
</property>
</widget>
</item>
- <item row="4" column="0">
+ <item row="6" column="0">
<widget class="QLabel" name="portLabel">
<property name="text">
<string>Server Port:</string>
@@ -83,13 +83,33 @@
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="6" column="1">
<widget class="KIntSpinBox" name="portSpinBox">
<property name="maximum">
<number>65535</number>
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <widget class="KLineEdit" name="usernameLineEdit">
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="whatsThis">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="usernameLabel">
+ <property name="text">
+ <string>Username:</string>
+ </property>
+ <property name="buddy">
+ <cstring>usernameLineEdit</cstring>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<customwidgets>
@@ -105,6 +125,7 @@
</customwidget>
</customwidgets>
<tabstops>
+ <tabstop>usernameLineEdit</tabstop>
<tabstop>passwordLineEdit</tabstop>
<tabstop>useSslCheckBox</tabstop>
<tabstop>charsetLineEdit</tabstop>
diff --git a/idle/main-options-widget.cpp b/idle/main-options-widget.cpp
index ee605bb..d957534 100644
--- a/idle/main-options-widget.cpp
+++ b/idle/main-options-widget.cpp
@@ -37,7 +37,6 @@ public:
Tp::ProtocolParameter accountParameter;
Tp::ProtocolParameter fullnameParameter;
- Tp::ProtocolParameter usernameParameter;
Tp::ProtocolParameter serverParameter;
Ui::MainOptionsWidget *ui;
@@ -57,8 +56,6 @@ MainOptionsWidget::MainOptionsWidget(Tp::ProtocolParameterList parameters,
d->accountParameter = parameter;
} else if ((parameter.name() == "fullname") && (parameter.type() == QVariant::String)) {
d->fullnameParameter = parameter;
- } else if ((parameter.name() == "username") && (parameter.type() == QVariant::String)) {
- d->usernameParameter = parameter;
} else if ((parameter.name() == "server") && (parameter.type() == QVariant::String)) {
d->serverParameter = parameter;
}
@@ -93,14 +90,6 @@ MainOptionsWidget::MainOptionsWidget(Tp::ProtocolParameterList parameters,
}
}
- 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());
- }
- }
-
// Hide any elements we don't have the parameters passed to show.
if (!d->accountParameter.isValid()) {
d->ui->accountLabel->hide();
@@ -112,11 +101,6 @@ MainOptionsWidget::MainOptionsWidget(Tp::ProtocolParameterList parameters,
d->ui->fullnameLineEdit->hide();
}
- if (!d->usernameParameter.isValid()) {
- d->ui->usernameLabel->hide();
- d->ui->usernameLineEdit->hide();
- }
-
if (!d->serverParameter.isValid()) {
d->ui->serverLabel->hide();
d->ui->serverLineEdit->hide();
@@ -145,10 +129,6 @@ QList<ProtocolParameterValue> MainOptionsWidget::parameterValues() const
parameters.append(ProtocolParameterValue(d->fullnameParameter, d->ui->fullnameLineEdit->text()));
}
- if (d->usernameParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->usernameParameter, d->ui->usernameLineEdit->text()));
- }
-
if (d->serverParameter.isValid()) {
parameters.append(ProtocolParameterValue(d->serverParameter, d->ui->serverLineEdit->text()));
}
diff --git a/idle/main-options-widget.ui b/idle/main-options-widget.ui
index 9a75db4..140376f 100644
--- a/idle/main-options-widget.ui
+++ b/idle/main-options-widget.ui
@@ -40,7 +40,7 @@
<item row="3" column="0">
<widget class="QLabel" name="accountLabel">
<property name="text">
- <string>Account (nick?):</string>
+ <string>Nickname:</string>
</property>
<property name="buddy">
<cstring>accountLineEdit</cstring>
@@ -50,20 +50,7 @@
<item row="3" column="1">
<widget class="KLineEdit" name="accountLineEdit"/>
</item>
- <item row="4" column="0">
- <widget class="QLabel" name="usernameLabel">
- <property name="text">
- <string>Username:</string>
- </property>
- <property name="buddy">
- <cstring>usernameLineEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="KLineEdit" name="usernameLineEdit"/>
- </item>
- <item row="6" column="0">
+ <item row="5" column="0">
<widget class="QLabel" name="fullnameLabel">
<property name="text">
<string>Real name:</string>
@@ -73,10 +60,10 @@
</property>
</widget>
</item>
- <item row="6" column="1">
+ <item row="5" column="1">
<widget class="KLineEdit" name="fullnameLineEdit"/>
</item>
- <item row="7" column="1">
+ <item row="6" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Real name can be left empty.</string>
@@ -95,7 +82,6 @@
<tabstops>
<tabstop>serverLineEdit</tabstop>
<tabstop>accountLineEdit</tabstop>
- <tabstop>usernameLineEdit</tabstop>
<tabstop>fullnameLineEdit</tabstop>
</tabstops>
<resources/>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list