[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:41 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=3c6fe56
The following commit has been merged in the master branch:
commit 3c6fe56916f9771b133e7d4c6efe6cd4f19c5911
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date: Sun Jan 9 21:48:54 2011 +0100
Implement the ICQ configuration.
---
haze/CMakeLists.txt | 3 +-
haze/icq-advanced-options-widget.cpp | 21 +--
haze/icq-main-options-widget.cpp | 2 +-
haze/icq-main-options-widget.ui | 27 ++--
haze/icq-proxy-settings-widget.cpp | 296 -----------------------------------
haze/icq-proxy-settings-widget.h | 48 ------
haze/icq-proxy-settings-widget.ui | 168 --------------------
haze/icq-server-settings-widget.cpp | 179 ++++++++++-----------
haze/icq-server-settings-widget.ui | 242 +++++++++++++++++-----------
9 files changed, 252 insertions(+), 734 deletions(-)
diff --git a/haze/CMakeLists.txt b/haze/CMakeLists.txt
index 160c9e0..920898f 100644
--- a/haze/CMakeLists.txt
+++ b/haze/CMakeLists.txt
@@ -10,13 +10,12 @@ set (kcmtelepathyaccounts_plugin_haze_SRCS
icq-main-options-widget.cpp
icq-advanced-options-widget.cpp
icq-server-settings-widget.cpp
- icq-proxy-settings-widget.cpp
+
)
kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
icq-main-options-widget.ui
icq-server-settings-widget.ui
- icq-proxy-settings-widget.ui
)
kde4_add_plugin (kcmtelepathyaccounts_plugin_haze
diff --git a/haze/icq-advanced-options-widget.cpp b/haze/icq-advanced-options-widget.cpp
index 1bbb02c..ffceabc 100644
--- a/haze/icq-advanced-options-widget.cpp
+++ b/haze/icq-advanced-options-widget.cpp
@@ -19,7 +19,6 @@
*/
#include "icq-advanced-options-widget.h"
-#include "icq-proxy-settings-widget.h"
#include "icq-server-settings-widget.h"
#include <KCMTelepathyAccounts/ProtocolParameterValue>
@@ -35,14 +34,10 @@ class IcqAdvancedOptionsWidget::Private
{
public:
Private()
- : tabWidget(0),
- proxySettings(0),
- serverSettings(0)
+ : serverSettings(0)
{
kDebug();
}
- KTabWidget *tabWidget;
- IcqProxySettingsWidget *proxySettings;
IcqServerSettingsWidget *serverSettings;
};
@@ -54,14 +49,8 @@ IcqAdvancedOptionsWidget::IcqAdvancedOptionsWidget(Tp::ProtocolParameterList par
{
// add a layout to the main widget
QHBoxLayout *layout = new QHBoxLayout(this);
- d->tabWidget = new KTabWidget(this);
- layout->addWidget(d->tabWidget);
-
- // create the pages
- d->serverSettings = new IcqServerSettingsWidget(parameters, values, d->tabWidget);
- d->tabWidget->addTab(d->serverSettings, i18n("Connection Settings"));
- d->proxySettings = new IcqProxySettingsWidget(parameters, values, d->tabWidget);
- d->tabWidget->addTab(d->proxySettings, i18n("Proxy Settings"));
+ d->serverSettings = new IcqServerSettingsWidget(parameters, values, 0);
+ layout->addWidget(d->serverSettings);
}
IcqAdvancedOptionsWidget::~IcqAdvancedOptionsWidget()
@@ -78,7 +67,6 @@ QList<ProtocolParameterValue> IcqAdvancedOptionsWidget::parameterValues() const
// the server parameter values
QList<ProtocolParameterValue> parameters;
parameters.append(d->serverSettings->parameterValues());
- parameters.append(d->proxySettings->parameterValues());
return parameters;
}
@@ -91,9 +79,6 @@ bool IcqAdvancedOptionsWidget::validateParameterValues()
if (!d->serverSettings->validateParameterValues())
return false;
- if (!d->proxySettings->validateParameterValues())
- return false;
-
return true;
}
diff --git a/haze/icq-main-options-widget.cpp b/haze/icq-main-options-widget.cpp
index d305056..6d2dbd1 100644
--- a/haze/icq-main-options-widget.cpp
+++ b/haze/icq-main-options-widget.cpp
@@ -126,7 +126,7 @@ bool IcqMainOptionsWidget::validateParameterValues()
if (d->ui->accountLineEdit->text().isEmpty()) {
kDebug() << "Returning false and alerting the user.";
- KMessageBox::error(this, i18n("Please enter a Jabber ID."));
+ KMessageBox::error(this, i18n("Please enter an ICQ UIN."));
return false;
}
diff --git a/haze/icq-main-options-widget.ui b/haze/icq-main-options-widget.ui
index 4438fa3..32c8c77 100644
--- a/haze/icq-main-options-widget.ui
+++ b/haze/icq-main-options-widget.ui
@@ -7,15 +7,27 @@
<x>0</x>
<y>0</y>
<width>400</width>
- <height>300</height>
+ <height>74</height>
</rect>
</property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="windowTitle">
<string>Account Preferences</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
<item>
<layout class="QFormLayout" name="formLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="accountLabel">
<property name="text">
@@ -42,19 +54,6 @@
</item>
</layout>
</item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>219</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
<customwidgets>
diff --git a/haze/icq-proxy-settings-widget.cpp b/haze/icq-proxy-settings-widget.cpp
deleted file mode 100644
index 1bb3b98..0000000
--- a/haze/icq-proxy-settings-widget.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-/*
- * This file is part of telepathy-accounts-kcm
- *
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "icq-proxy-settings-widget.h"
-
-#include "ui_icq-proxy-settings-widget.h"
-
-#include <KCMTelepathyAccounts/ProtocolParameterValue>
-
-#include <KDebug>
-#include <KMessageBox>
-
-
-class IcqProxySettingsWidget::Private
-{
-public:
- Private()
- : ui(0)
- {
- kDebug();
- }
-
- Tp::ProtocolParameter stunServerParameter;
- Tp::ProtocolParameter stunPortParameter;
- Tp::ProtocolParameter fallbackStunServerParameter;
- Tp::ProtocolParameter fallbackStunPortParameter;
- Tp::ProtocolParameter httpsProxyServerParameter;
- Tp::ProtocolParameter httpsProxyPortParameter;
- Tp::ProtocolParameter fallbackSocks5ProxiesParameter;
- Tp::ProtocolParameter fallbackConferenceServerParameter;
-
- Ui::IcqProxySettingsWidget *ui;
-};
-
-IcqProxySettingsWidget::IcqProxySettingsWidget(Tp::ProtocolParameterList parameters,
- const QVariantMap &values,
- QWidget *parent)
- : AbstractAccountParametersWidget(parameters, values, parent),
- d(new Private)
-{
- kDebug();
-
- // Store the parameters this widget supports
- foreach (const Tp::ProtocolParameter ¶meter, parameters) {
- if ((parameter.name() == "stun-server") && (parameter.type() == QVariant::String)) {
- d->stunServerParameter = parameter;
- } else if ((parameter.name() == "stun-port") && (parameter.type() == QVariant::UInt)) {
- d->stunPortParameter = parameter;
- } else if ((parameter.name() == "fallback-stun-server") &&
- (parameter.type() == QVariant::String)) {
- d->fallbackStunServerParameter = parameter;
- } else if ((parameter.name() == "fallback-stun-port") &&
- (parameter.type() == QVariant::UInt)) {
- d->fallbackStunPortParameter = parameter;
- } else if ((parameter.name() == "https-proxy-server") &&
- (parameter.type() == QVariant::String)) {
- d->httpsProxyServerParameter = parameter;
- } else if ((parameter.name() == "https-proxy-port") &&
- (parameter.type() == QVariant::UInt)) {
- d->httpsProxyPortParameter = parameter;
- } else if ((parameter.name() == "fallback-socks5-proxies") &&
- (parameter.type() == QVariant::StringList)) {
- d->fallbackSocks5ProxiesParameter = parameter;
- } else if ((parameter.name() == "fallback-conference-server") &&
- (parameter.type() == QVariant::String)) {
- d->fallbackConferenceServerParameter = parameter;
- }
- }
-
- // Set up the UI.
- d->ui = new Ui::IcqProxySettingsWidget;
- d->ui->setupUi(this);
-
- // Prefill UI elements if appropriate.
- if (d->stunServerParameter.isValid()) {
- if (values.contains(d->stunServerParameter.name())) {
- d->ui->stunServerLineEdit->setText(values.value(
- d->stunServerParameter.name()).toString());
- } else {
- d->ui->stunServerLineEdit->setText(d->stunServerParameter.defaultValue().toString());
- }
- }
-
- if (d->stunPortParameter.isValid()) {
- if (values.contains(d->stunPortParameter.name())) {
- d->ui->stunPortSpinBox->setValue(values.value(d->stunPortParameter.name()).toUInt());
- } else {
- d->ui->stunPortSpinBox->setValue(d->stunPortParameter.defaultValue().toUInt());
- }
- }
-
- if (d->fallbackStunServerParameter.isValid()) {
- if (values.contains(d->fallbackStunServerParameter.name())) {
- d->ui->fallbackStunServerLineEdit->setText(values.value(
- d->fallbackStunServerParameter.name()).toString());
- } else {
- d->ui->fallbackStunServerLineEdit->setText(
- d->fallbackStunServerParameter.defaultValue().toString());
- }
- }
-
- if (d->fallbackStunPortParameter.isValid()) {
- if (values.contains(d->fallbackStunPortParameter.name())) {
- d->ui->fallbackStunPortSpinBox->setValue(values.value(
- d->fallbackStunPortParameter.name()).toUInt());
- } else {
- d->ui->fallbackStunPortSpinBox->setValue(
- d->fallbackStunPortParameter.defaultValue().toUInt());
- }
- }
-
- if (d->httpsProxyServerParameter.isValid()) {
- if (values.contains(d->httpsProxyServerParameter.name())) {
- d->ui->httpsProxyServerLineEdit->setText(values.value(
- d->httpsProxyServerParameter.name()).toString());
- } else {
- d->ui->httpsProxyServerLineEdit->setText(
- d->httpsProxyServerParameter.defaultValue().toString());
- }
- }
-
- if (d->httpsProxyPortParameter.isValid()) {
- if (values.contains(d->httpsProxyPortParameter.name())) {
- d->ui->httpsProxyPortSpinBox->setValue(values.value(
- d->httpsProxyPortParameter.name()).toUInt());
- } else {
- d->ui->httpsProxyPortSpinBox->setValue(
- d->httpsProxyPortParameter.defaultValue().toUInt());
- }
- }
-
- if (d->fallbackSocks5ProxiesParameter.isValid()) {
- if (values.contains(d->fallbackSocks5ProxiesParameter.name())) {
- foreach (const QString &line,
- values.value(d->fallbackSocks5ProxiesParameter.name()).toStringList()) {
- d->ui->fallbackSocks5ProxiesTextEdit->append(line);
- }
- } else {
- foreach (const QString &line,
- d->fallbackSocks5ProxiesParameter.defaultValue().toStringList()) {
- d->ui->fallbackSocks5ProxiesTextEdit->append(line);
- }
- }
- }
-
- if (d->fallbackConferenceServerParameter.isValid()) {
- if (values.contains(d->fallbackConferenceServerParameter.name())) {
- d->ui->fallbackConferenceServerLineEdit->setText(values.value(
- d->fallbackConferenceServerParameter.name()).toString());
- } else {
- d->ui->fallbackConferenceServerLineEdit->setText(
- d->fallbackConferenceServerParameter.defaultValue().toString());
- }
- }
-
- // Hide any elements we don't have the parameters passed to show.
- if (!d->stunServerParameter.isValid()) {
- d->ui->stunServerLabel->hide();
- d->ui->stunServerLineEdit->hide();
- }
-
- if (!d->stunPortParameter.isValid()) {
- d->ui->stunPortLabel->hide();
- d->ui->stunPortSpinBox->hide();
- }
-
- if (!d->fallbackStunServerParameter.isValid()) {
- d->ui->fallbackStunServerLabel->hide();
- d->ui->fallbackStunServerLineEdit->hide();
- }
-
- if (!d->fallbackStunPortParameter.isValid()) {
- d->ui->fallbackStunPortLabel->hide();
- d->ui->fallbackStunPortSpinBox->hide();
- }
-
- if (!d->httpsProxyServerParameter.isValid()) {
- d->ui->httpsProxyServerLabel->hide();
- d->ui->httpsProxyServerLineEdit->hide();
- }
-
- if (!d->httpsProxyPortParameter.isValid()) {
- d->ui->httpsProxyPortLabel->hide();
- d->ui->httpsProxyPortSpinBox->hide();
- }
-
- if (!d->fallbackSocks5ProxiesParameter.isValid()) {
- d->ui->fallbackSocks5ProxiesLabel->hide();
- d->ui->fallbackSocks5ProxiesTextEdit->hide();
- }
-
- if (!d->fallbackConferenceServerParameter.isValid()) {
- d->ui->fallbackConferenceServerLabel->hide();
- d->ui->fallbackConferenceServerLineEdit->hide();
- }
-
- // Hide the group boxes if they are empty.
- if ((!d->stunServerParameter.isValid()) &&
- (!d->stunPortParameter.isValid()) &&
- (!d->fallbackStunServerParameter.isValid()) &&
- (!d->fallbackStunPortParameter.isValid())) {
- d->ui->stunGroupBox->hide();
- }
-
- if ((!d->httpsProxyServerParameter.isValid()) &&
- (!d->httpsProxyPortParameter.isValid()) &&
- (!d->fallbackSocks5ProxiesParameter.isValid())) {
- d->ui->proxyGroupBox->hide();
- }
-
- if (!d->fallbackConferenceServerParameter.isValid()) {
- d->ui->conferenceGroupBox->hide();
- }
-}
-
-IcqProxySettingsWidget::~IcqProxySettingsWidget()
-{
- kDebug();
-
- delete d;
-}
-
-QList<ProtocolParameterValue> IcqProxySettingsWidget::parameterValues() const
-{
- kDebug();
-
- QList<ProtocolParameterValue> parameters;
-
- // Populate the map of parameters and their values with all the parameters this widget contains.
- if (d->stunServerParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->stunServerParameter, d->ui->stunServerLineEdit->text()));
- }
-
- if (d->stunPortParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->stunPortParameter, d->ui->stunPortSpinBox->value()));
- }
-
- if (d->fallbackStunServerParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->fallbackStunServerParameter, d->ui->fallbackStunServerLineEdit->text()));
- }
-
- if (d->fallbackStunPortParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->fallbackStunPortParameter, d->ui->fallbackStunPortSpinBox->value()));
- }
-
- if (d->httpsProxyServerParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->httpsProxyServerParameter, d->ui->httpsProxyServerLineEdit->text()));
- }
-
- if (d->httpsProxyPortParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->httpsProxyPortParameter, d->ui->httpsProxyPortSpinBox->value()));
- }
-
- if (d->fallbackSocks5ProxiesParameter.isValid()) {
- QString text = d->ui->fallbackSocks5ProxiesTextEdit->toPlainText();
- QStringList value = text.split("
", QString::SkipEmptyParts);
- parameters.append(ProtocolParameterValue(d->fallbackSocks5ProxiesParameter, value));
- }
-
- if (d->fallbackConferenceServerParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->fallbackConferenceServerParameter,
- d->ui->fallbackConferenceServerLineEdit->text()));
- }
-
- return parameters;
-}
-
-bool IcqProxySettingsWidget::validateParameterValues()
-{
- kDebug();
-
- //TODO: check what parameters should be validated
-
- return true;
-}
-
-
-#include "icq-proxy-settings-widget.moc"
-
diff --git a/haze/icq-proxy-settings-widget.h b/haze/icq-proxy-settings-widget.h
deleted file mode 100644
index 41d060c..0000000
--- a/haze/icq-proxy-settings-widget.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * This file is part of telepathy-accounts-kcm
- *
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_PROXY_SETTINGS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_PROXY_SETTINGS_WIDGET_H
-
-#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-
-class IcqProxySettingsWidget : public AbstractAccountParametersWidget
-{
- Q_OBJECT
-
-public:
- explicit IcqProxySettingsWidget(Tp::ProtocolParameterList parameters,
- const QVariantMap &values = QVariantMap(),
- QWidget *parent = 0);
- virtual ~IcqProxySettingsWidget();
-
- virtual QList<ProtocolParameterValue> parameterValues() const;
- virtual bool validateParameterValues();
-
-private:
- Q_DISABLE_COPY(IcqProxySettingsWidget);
-
- class Private;
- Private * const d;
-};
-
-
-#endif // header guard
-
diff --git a/haze/icq-proxy-settings-widget.ui b/haze/icq-proxy-settings-widget.ui
deleted file mode 100644
index d959fca..0000000
--- a/haze/icq-proxy-settings-widget.ui
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>IcqProxySettingsWidget</class>
- <widget class="QWidget" name="IcqProxySettingsWidget">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>400</width>
- <height>431</height>
- </rect>
- </property>
- <property name="windowTitle">
- <string>Advanced Options</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <item>
- <widget class="QGroupBox" name="stunGroupBox">
- <property name="title">
- <string>STUN Server Settings</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <widget class="QLabel" name="stunServerLabel">
- <property name="text">
- <string>STUN Server:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KLineEdit" name="stunServerLineEdit"/>
- </item>
- <item>
- <widget class="QLabel" name="stunPortLabel">
- <property name="text">
- <string>Port:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="stunPortSpinBox">
- <property name="maximum">
- <number>65535</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QLabel" name="fallbackStunServerLabel">
- <property name="text">
- <string>Fallback STUN Server:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KLineEdit" name="fallbackStunServerLineEdit"/>
- </item>
- <item>
- <widget class="QLabel" name="fallbackStunPortLabel">
- <property name="text">
- <string>Port:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="fallbackStunPortSpinBox">
- <property name="maximum">
- <number>65535</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="proxyGroupBox">
- <property name="title">
- <string>Proxy Settings</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QLabel" name="httpsProxyServerLabel">
- <property name="text">
- <string>HTTPS Proxy Server:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KLineEdit" name="httpsProxyServerLineEdit"/>
- </item>
- <item>
- <widget class="QLabel" name="httpsProxyPortLabel">
- <property name="text">
- <string>Port:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="httpsProxyPortSpinBox">
- <property name="maximum">
- <number>65535</number>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QLabel" name="fallbackSocks5ProxiesLabel">
- <property name="text">
- <string>Fallback SOCKS 5 Proxy Servers:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KTextEdit" name="fallbackSocks5ProxiesTextEdit"/>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="conferenceGroupBox">
- <property name="title">
- <string>Conference Server Settings</string>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="fallbackConferenceServerLabel">
- <property name="text">
- <string>Fallback Conference Server:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KLineEdit" name="fallbackConferenceServerLineEdit"/>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>KLineEdit</class>
- <extends>QLineEdit</extends>
- <header>klineedit.h</header>
- </customwidget>
- <customwidget>
- <class>KTextEdit</class>
- <extends>QTextEdit</extends>
- <header>ktextedit.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/haze/icq-server-settings-widget.cpp b/haze/icq-server-settings-widget.cpp
index 4178ac1..00407bc 100644
--- a/haze/icq-server-settings-widget.cpp
+++ b/haze/icq-server-settings-widget.cpp
@@ -39,11 +39,10 @@ public:
Tp::ProtocolParameter serverParameter;
Tp::ProtocolParameter portParameter;
- Tp::ProtocolParameter keepaliveIntervalParameter;
- Tp::ProtocolParameter lowBandwidthParameter;
- Tp::ProtocolParameter requireEncryptionParameter;
- Tp::ProtocolParameter ignoreSslErrorsParameter;
- Tp::ProtocolParameter oldSslParameter;
+ Tp::ProtocolParameter useSslParameter;
+ Tp::ProtocolParameter alwaysUseRvProxyParameter;
+ Tp::ProtocolParameter allowMultipleLoginsParameter;
+ Tp::ProtocolParameter charsetParameter;
Ui::IcqServerSettingsWidget *ui;
};
@@ -58,20 +57,21 @@ IcqServerSettingsWidget::IcqServerSettingsWidget(Tp::ProtocolParameterList param
// Store the parameters this widget supports
foreach (const Tp::ProtocolParameter ¶meter, parameters) {
+
+ kDebug() << parameter.name() << parameter.type();
+
if ((parameter.name() == "server") && (parameter.type() == QVariant::String)) {
d->serverParameter = parameter;
- } else if ((parameter.name() == "port") && (parameter.type() == QVariant::UInt)) {
+ } else if ((parameter.name() == "port") && (parameter.type() == QVariant::Int)) {
d->portParameter = parameter;
- } else if ((parameter.name() == "keepalive-interval") && (parameter.type() == QVariant::UInt)) {
- d->keepaliveIntervalParameter = parameter;
- } else if ((parameter.name() == "low-bandwidth") && (parameter.type() == QVariant::Bool)) {
- d->lowBandwidthParameter = parameter;
- } else if ((parameter.name() == "require-encryption") && (parameter.type() == QVariant::Bool)) {
- d->requireEncryptionParameter = parameter;
- } else if ((parameter.name() == "ignore-ssl-errors") && (parameter.type() == QVariant::Bool)) {
- d->ignoreSslErrorsParameter = parameter;
- } else if ((parameter.name() == "old-ssl") && (parameter.type() == QVariant::Bool)) {
- d->oldSslParameter = parameter;
+ } else if ((parameter.name() == "use-ssl") && (parameter.type() == QVariant::Bool)) {
+ d->useSslParameter = parameter;
+ } else if ((parameter.name() == "always-use-rv-proxy") && (parameter.type() == QVariant::Bool)) {
+ d->alwaysUseRvProxyParameter = parameter;
+ } else if ((parameter.name() == "allow-multiple-logins") && (parameter.type() == QVariant::Bool)) {
+ d->allowMultipleLoginsParameter = parameter;
+ } else if ((parameter.name() == "charset") && (parameter.type() == QVariant::String)) {
+ d->charsetParameter = parameter;
}
}
@@ -79,6 +79,10 @@ IcqServerSettingsWidget::IcqServerSettingsWidget(Tp::ProtocolParameterList param
d->ui = new Ui::IcqServerSettingsWidget;
d->ui->setupUi(this);
+ /*
+ * First subformular
+ */
+
// Prefill UI elements if appropriate.
if (d->serverParameter.isValid()) {
if (values.contains(d->serverParameter.name())) {
@@ -96,100 +100,94 @@ IcqServerSettingsWidget::IcqServerSettingsWidget(Tp::ProtocolParameterList param
}
}
- if (d->keepaliveIntervalParameter.isValid()) {
- if (values.contains(d->keepaliveIntervalParameter.name())) {
- d->ui->keepaliveIntervalSpinBox->setValue(values.value(
- d->keepaliveIntervalParameter.name()).toUInt());
- } else {
- d->ui->keepaliveIntervalSpinBox->setValue(
- d->keepaliveIntervalParameter.defaultValue().toUInt());
- }
+ // Hide any elements we don't have the parameters passed to show.
+ if (!d->serverParameter.isValid()) {
+ d->ui->serverLabel->hide();
+ d->ui->serverLineEdit->hide();
}
- if (d->lowBandwidthParameter.isValid()) {
- if (values.contains(d->lowBandwidthParameter.name())) {
- d->ui->lowBandwidthCheckBox->setChecked(values.value(
- d->lowBandwidthParameter.name()).toBool());
- } else {
- d->ui->lowBandwidthCheckBox->setChecked(
- d->lowBandwidthParameter.defaultValue().toBool());
- }
+ if (!d->portParameter.isValid()) {
+ d->ui->portLabel->hide();
+ d->ui->portSpinBox->hide();
}
- if (d->requireEncryptionParameter.isValid()) {
- if (values.contains(d->requireEncryptionParameter.name())) {
- d->ui->requireEncryptionCheckBox->setChecked(values.value(
- d->requireEncryptionParameter.name()).toBool());
- } else {
- d->ui->requireEncryptionCheckBox->setChecked(
- d->requireEncryptionParameter.defaultValue().toBool());
- }
+ // Hide the headline if they are empty.
+ if ((!d->serverParameter.isValid()) && (!d->portParameter.isValid())) {
+ d->ui->serverHeadlineLabel->hide();
}
- if (d->ignoreSslErrorsParameter.isValid()) {
- if (values.contains(d->ignoreSslErrorsParameter.name())) {
- d->ui->ignoreSslErrorsCheckBox->setChecked(values.value(
- d->ignoreSslErrorsParameter.name()).toBool());
+ /*
+ * Second subformular
+ */
+ if (d->useSslParameter.isValid()) {
+ if (values.contains(d->useSslParameter.name())) {
+ d->ui->useSslCheckBox->setChecked(values.value(d->useSslParameter.name()).toBool());
} else {
- d->ui->ignoreSslErrorsCheckBox->setChecked(
- d->ignoreSslErrorsParameter.defaultValue().toBool());
+ d->ui->useSslCheckBox->setChecked(d->useSslParameter.defaultValue().toBool());
}
}
- if (d->oldSslParameter.isValid()) {
- if (values.contains(d->oldSslParameter.name())) {
- d->ui->oldSslCheckBox->setChecked(values.value(d->oldSslParameter.name()).toBool());
+ if (d->allowMultipleLoginsParameter.isValid()) {
+ if (values.contains(d->allowMultipleLoginsParameter.name())) {
+ d->ui->allowMultipleLoginsCheckBox->setChecked(values.value(d->allowMultipleLoginsParameter.name()).toBool());
} else {
- d->ui->oldSslCheckBox->setChecked(d->oldSslParameter.defaultValue().toBool());
+ d->ui->allowMultipleLoginsCheckBox->setChecked(d->allowMultipleLoginsParameter.defaultValue().toBool());
}
}
// Hide any elements we don't have the parameters passed to show.
- if (!d->serverParameter.isValid()) {
- d->ui->serverLabel->hide();
- d->ui->serverLineEdit->hide();
+ if (!d->useSslParameter.isValid()) {
+ d->ui->useSslCheckBox->hide();
+ // It's a checkbox, so no extra label here
}
- if (!d->portParameter.isValid()) {
- d->ui->portLabel->hide();
- d->ui->portSpinBox->hide();
+ if (!d->allowMultipleLoginsParameter.isValid()) {
+ d->ui->allowMultipleLoginsCheckBox->hide();
+ // It's a checkbox, so no extra label here
}
-
- if (!d->keepaliveIntervalParameter.isValid()) {
- d->ui->keepaliveIntervalLabel->hide();
- d->ui->keepaliveIntervalSpinBox->hide();
+
+ // Hide the headline if they are empty.
+ if ((!d->useSslParameter.isValid()) && (!d->allowMultipleLoginsParameter.isValid())) {
+ d->ui->securityHeadlineLabel->hide();
}
- if (!d->lowBandwidthParameter.isValid()) {
- d->ui->lowBandwidthCheckBox->hide();
- }
-
- if (!d->requireEncryptionParameter.isValid()) {
- d->ui->requireEncryptionCheckBox->hide();
- }
+ /*
+ * Third subformular
+ */
- if (!d->ignoreSslErrorsParameter.isValid()) {
- d->ui->ignoreSslErrorsCheckBox->hide();
+ // Prefill UI elements if appropriate.
+ if (d->charsetParameter.isValid()) {
+ if (values.contains(d->charsetParameter.name())) {
+ d->ui->charsetComboBox->setEditText(values.value(d->charsetParameter.name()).toString());
+ } else {
+ d->ui->charsetComboBox->setEditText(d->charsetParameter.defaultValue().toString());
+ }
}
- if (!d->oldSslParameter.isValid()) {
- d->ui->oldSslCheckBox->hide();
+ if (d->alwaysUseRvProxyParameter.isValid()) {
+ if (values.contains(d->alwaysUseRvProxyParameter.name())) {
+ d->ui->alwaysUseRvProxyCheckBox->setChecked(values.value(d->alwaysUseRvProxyParameter.name()).toBool());
+ } else {
+ d->ui->alwaysUseRvProxyCheckBox->setChecked(d->alwaysUseRvProxyParameter.defaultValue().toBool());
+ }
}
- // Hide the group boxes if they are empty.
- if ((!d->serverParameter.isValid()) && (!d->portParameter.isValid())) {
- d->ui->serverGroupBox->hide();
+ // Hide any elements we don't have the parameters passed to show.
+ if (!d->charsetParameter.isValid()) {
+ d->ui->charsetComboBox->hide();
+ // It's a checkbox, so no extra label here
}
- if ((!d->keepaliveIntervalParameter.isValid()) && (!d->lowBandwidthParameter.isValid())) {
- d->ui->connectionGroupBox->hide();
+ if (!d->alwaysUseRvProxyParameter.isValid()) {
+ d->ui->alwaysUseRvProxyCheckBox->hide();
+ // It's a checkbox, so no extra label here
}
- if ((!d->requireEncryptionParameter.isValid()) &&
- (!d->ignoreSslErrorsParameter.isValid()) &&
- (!d->oldSslParameter.isValid())) {
- d->ui->securityGroupBox->hide();
+ // Hide the headline if they are empty.
+ if ((!d->charsetParameter.isValid()) && (!d->alwaysUseRvProxyParameter.isValid())) {
+ d->ui->otherHeadlineLabel->hide();
}
+
}
IcqServerSettingsWidget::~IcqServerSettingsWidget()
@@ -214,25 +212,20 @@ QList<ProtocolParameterValue> IcqServerSettingsWidget::parameterValues() const
parameters.append(ProtocolParameterValue(d->portParameter, d->ui->portSpinBox->value()));
}
- if (d->keepaliveIntervalParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->keepaliveIntervalParameter, d->ui->keepaliveIntervalSpinBox->value()));
- }
-
- if (d->lowBandwidthParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->lowBandwidthParameter, d->ui->lowBandwidthCheckBox->isChecked()));
+ if (d->useSslParameter.isValid()) {
+ parameters.append(ProtocolParameterValue(d->useSslParameter, d->ui->useSslCheckBox->isChecked()));
}
- if (d->requireEncryptionParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->requireEncryptionParameter,
- d->ui->requireEncryptionCheckBox->isChecked()));
+ if (d->allowMultipleLoginsParameter.isValid()) {
+ parameters.append(ProtocolParameterValue(d->allowMultipleLoginsParameter, d->ui->allowMultipleLoginsCheckBox->isChecked()));
}
- if (d->ignoreSslErrorsParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->ignoreSslErrorsParameter, d->ui->ignoreSslErrorsCheckBox->isChecked()));
+ if (d->alwaysUseRvProxyParameter.isValid()) {
+ parameters.append(ProtocolParameterValue(d->alwaysUseRvProxyParameter, d->ui->alwaysUseRvProxyCheckBox->isChecked()));
}
- if (d->oldSslParameter.isValid()) {
- parameters.append(ProtocolParameterValue(d->oldSslParameter, d->ui->oldSslCheckBox->isChecked()));
+ if (d->charsetParameter.isValid()) {
+ parameters.append(ProtocolParameterValue(d->charsetParameter, d->ui->charsetComboBox->currentText()));
}
return parameters;
diff --git a/haze/icq-server-settings-widget.ui b/haze/icq-server-settings-widget.ui
index 79384a4..15b425e 100644
--- a/haze/icq-server-settings-widget.ui
+++ b/haze/icq-server-settings-widget.ui
@@ -14,117 +14,171 @@
<string>Connection Settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
+ <property name="margin">
+ <number>4</number>
+ </property>
<item>
- <widget class="QGroupBox" name="serverGroupBox">
- <property name="title">
- <string>Server Settings</string>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
</property>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="serverLabel">
- <property name="text">
- <string>Server Address:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="KLineEdit" name="serverLineEdit"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="portLabel">
- <property name="text">
- <string>Server Port:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="portSpinBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximum">
- <number>65535</number>
- </property>
- </widget>
- </item>
- </layout>
- <zorder>portLabel</zorder>
- <zorder>portSpinBox</zorder>
- <zorder>serverLabel</zorder>
- <zorder>serverLineEdit</zorder>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="connectionGroupBox">
- <property name="title">
- <string>Connection Settings</string>
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="keepaliveIntervalLabel">
- <property name="text">
- <string>Keep Alive Interval:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="keepaliveIntervalSpinBox"/>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QCheckBox" name="lowBandwidthCheckBox">
+ <item row="0" column="0">
+ <widget class="QLabel" name="serverHeadlineLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string><b>Server</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="serverLabel">
+ <property name="text">
+ <string>Address:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="KLineEdit" name="serverLineEdit"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="portLabel">
+ <property name="text">
+ <string>Port:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="KIntSpinBox" name="portSpinBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximum">
+ <number>60000</number>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="securityHeadlineLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Security</span></p></body></html></string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QCheckBox" name="useSslCheckBox">
+ <property name="text">
+ <string>Use SSL</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QCheckBox" name="allowMultipleLoginsCheckBox">
+ <property name="text">
+ <string>Allow Multiple Logins</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="allowMultipleLoginsLabel">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="otherHeadlineLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Other</span></p></body></html></string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
+ <widget class="QCheckBox" name="alwaysUseRvProxyCheckBox">
+ <property name="text">
+ <string>Always use RV-Proxy</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="0">
+ <widget class="QLabel" name="charsetLabel">
+ <property name="text">
+ <string>Charset</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="KComboBox" name="charsetComboBox">
+ <item>
<property name="text">
- <string>Use Low Bandwidth Mode.</string>
+ <string>UTF-8</string>
</property>
- </widget>
- </item>
- </layout>
- </widget>
+ </item>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
- <widget class="QGroupBox" name="securityGroupBox">
- <property name="title">
- <string>Security Settings</string>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QCheckBox" name="requireEncryptionCheckBox">
- <property name="text">
- <string>Require Encrypted Connection.</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="ignoreSslErrorsCheckBox">
- <property name="text">
- <string>Ignore SSL Errors.</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="oldSslCheckBox">
- <property name="text">
- <string>Use Old-Style SSL.</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
+ <class>KIntSpinBox</class>
+ <extends>QSpinBox</extends>
+ <header>knuminput.h</header>
+ </customwidget>
+ <customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
+ <customwidget>
+ <class>KComboBox</class>
+ <extends>QComboBox</extends>
+ <header>kcombobox.h</header>
+ </customwidget>
</customwidgets>
<resources/>
<connections/>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list