[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:59:38 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=6369aca
The following commit has been merged in the master branch:
commit 6369aca38b73eda5973aad4e322491293bb278d5
Author: Lasath Fernando <kde at lasath.org>
Date: Sun Feb 20 10:43:13 2011 +1100
Created advanced options widgt for AIM
---
haze/CMakeLists.txt | 2 +
haze/aim-main-options-widget.cpp | 5 +-
...s-widget.cpp => aim-server-settings-widget.cpp} | 25 +++---
...tings-widget.h => aim-server-settings-widget.h} | 16 ++--
...ngs-widget.ui => aim-server-settings-widget.ui} | 88 ++++++++++------------
haze/haze-aim-account.cpp | 23 +++---
6 files changed, 76 insertions(+), 83 deletions(-)
diff --git a/haze/CMakeLists.txt b/haze/CMakeLists.txt
index d632881..e77e4ec 100644
--- a/haze/CMakeLists.txt
+++ b/haze/CMakeLists.txt
@@ -20,6 +20,7 @@ set (kcmtelepathyaccounts_plugin_haze_SRCS
yahoo-server-settings-widget.cpp
aim-main-options-widget.cpp
haze-aim-account.cpp
+ aim-server-settings-widget.cpp
)
kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
@@ -32,6 +33,7 @@ kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
yahoo-main-options-widget.ui
yahoo-server-settings-widget.ui
aim-main-options-widget.ui
+ aim-server-settings-widget.ui
)
kde4_add_plugin (kcmtelepathyaccounts_plugin_haze
diff --git a/haze/aim-main-options-widget.cpp b/haze/aim-main-options-widget.cpp
index 2e1c369..0263f20 100644
--- a/haze/aim-main-options-widget.cpp
+++ b/haze/aim-main-options-widget.cpp
@@ -27,9 +27,10 @@ AimMainOptionsWidget::AimMainOptionsWidget(ParameterEditModel* model, QWidget* p
: AbstractAccountParametersWidget(model, parent)
{
kDebug() << "Creating AIM Account";
-
+
+ //I'll delete this later
foreach (Tp::ProtocolParameter param, model->parameters()) {
- kDebug() << "Found parameter: " << param.name() << param.type() << param.defaultValue();
+ kDebug() << "Found parameter: handleParameter(" << param.name() << ',' << param.type() << ", ,);" /*<< param.defaultValue()*/;
}
//setup the Ui
diff --git a/haze/yahoo-server-settings-widget.cpp b/haze/aim-server-settings-widget.cpp
similarity index 56%
copy from haze/yahoo-server-settings-widget.cpp
copy to haze/aim-server-settings-widget.cpp
index 3286cff..b875ae8 100644
--- a/haze/yahoo-server-settings-widget.cpp
+++ b/haze/aim-server-settings-widget.cpp
@@ -18,33 +18,32 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "yahoo-server-settings-widget.h"
+#include "aim-server-settings-widget.h"
#include <KDebug>
-YahooServerSettingsWidget::YahooServerSettingsWidget(ParameterEditModel *model,
+AimServerSettingsWidget::AimServerSettingsWidget(ParameterEditModel *model,
QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- m_ui = new Ui::YahooServerSettingsWidget;
+ m_ui = new Ui::AimServerSettingsWidget;
m_ui->setupUi(this);
+
//server
- handleParameter("port", QVariant::UInt, m_ui->serverPort, m_ui->serverPortLabel);
- //file transfer
- handleParameter("xfer-host", QVariant::String, m_ui->xferHost, m_ui->xferHostLabel);
- handleParameter("xfer-port", QVariant::UInt, m_ui->xferPort, m_ui->xferPortLabel);
- //locale
- handleParameter("room-list-locale", QVariant::String, m_ui->roomListLocale, m_ui->roomListLocaleLablel);
- handleParameter("charset", QVariant::String, m_ui->charsetComboBox, m_ui->charsetLabel);
+ handleParameter( "server" , QVariant::String ,m_ui->serverAddress ,m_ui->serverAddressLabel);
+ handleParameter( "port" , QVariant::UInt ,m_ui->serverPort ,m_ui->serverPortLabel);
+ //security
+ handleParameter( "encryption" , QVariant::String ,m_ui->encryption ,m_ui->encryptionLabel);
+ handleParameter( "always-use-rv-proxy" , QVariant::Bool ,m_ui->rvProxy ,0);
//other
- handleParameter("proxy-ssl", QVariant::Bool, m_ui->SslProxy, 0);
- handleParameter("ignore-invites", QVariant::Bool, m_ui->ignoreInvites, 0);
+ handleParameter( "use-clientlogin" , QVariant::Bool ,m_ui->clientLogin ,0);
+ handleParameter( "allow-multiple-logins" , QVariant::Bool ,m_ui->multipleLogins ,0);
}
-YahooServerSettingsWidget::~YahooServerSettingsWidget()
+AimServerSettingsWidget::~AimServerSettingsWidget()
{
kDebug();
diff --git a/haze/yahoo-server-settings-widget.h b/haze/aim-server-settings-widget.h
similarity index 69%
copy from haze/yahoo-server-settings-widget.h
copy to haze/aim-server-settings-widget.h
index cef13c3..f80c3e2 100644
--- a/haze/yahoo-server-settings-widget.h
+++ b/haze/aim-server-settings-widget.h
@@ -18,25 +18,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_YAHOO_SERVER_SETTINGS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_YAHOO_SERVER_SETTINGS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_AIM_SERVER_SETTINGS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_AIM_SERVER_SETTINGS_WIDGET_H
-#include "ui_yahoo-server-settings-widget.h"
+#include "ui_aim-server-settings-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class YahooServerSettingsWidget : public AbstractAccountParametersWidget
+class AimServerSettingsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit YahooServerSettingsWidget(ParameterEditModel *model,
+ explicit AimServerSettingsWidget(ParameterEditModel *model,
QWidget *parent = 0);
- virtual ~YahooServerSettingsWidget();
+ virtual ~AimServerSettingsWidget();
private:
- Q_DISABLE_COPY(YahooServerSettingsWidget);
- Ui::YahooServerSettingsWidget *m_ui;
+ Q_DISABLE_COPY(AimServerSettingsWidget);
+ Ui::AimServerSettingsWidget *m_ui;
};
diff --git a/haze/icq-server-settings-widget.ui b/haze/aim-server-settings-widget.ui
similarity index 66%
copy from haze/icq-server-settings-widget.ui
copy to haze/aim-server-settings-widget.ui
index 15b425e..a28b382 100644
--- a/haze/icq-server-settings-widget.ui
+++ b/haze/aim-server-settings-widget.ui
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>IcqServerSettingsWidget</class>
- <widget class="QWidget" name="IcqServerSettingsWidget">
+ <class>AimServerSettingsWidget</class>
+ <widget class="QWidget" name="AimServerSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>431</height>
+ <width>456</width>
+ <height>248</height>
</rect>
</property>
<property name="windowTitle">
- <string>Connection Settings</string>
+ <string>Advanced Options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="margin">
@@ -34,29 +34,33 @@
</sizepolicy>
</property>
<property name="text">
- <string><b>Server</string>
+ <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:10pt; 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;">Server</span></p></body></html></string>
</property>
</widget>
</item>
<item row="1" column="0">
- <widget class="QLabel" name="serverLabel">
+ <widget class="QLabel" name="serverAddressLabel">
<property name="text">
- <string>Address:</string>
+ <string>Address</string>
</property>
</widget>
</item>
<item row="1" column="1">
- <widget class="KLineEdit" name="serverLineEdit"/>
+ <widget class="KLineEdit" name="serverAddress"/>
</item>
<item row="2" column="0">
- <widget class="QLabel" name="portLabel">
+ <widget class="QLabel" name="serverPortLabel">
<property name="text">
<string>Port:</string>
</property>
</widget>
</item>
<item row="2" column="1">
- <widget class="KIntSpinBox" name="portSpinBox">
+ <widget class="KIntSpinBox" name="serverPort">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -64,12 +68,15 @@
</sizepolicy>
</property>
<property name="maximum">
- <number>60000</number>
+ <number>65536</number>
+ </property>
+ <property name="value">
+ <number>5050</number>
</property>
</widget>
</item>
<item row="3" column="0">
- <widget class="QLabel" name="securityHeadlineLabel">
+ <widget class="QLabel" name="transferHeadlineLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -80,36 +87,35 @@
<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>
+</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; 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;">Security</span></p></body></html></string>
</property>
</widget>
</item>
- <item row="4" column="1">
- <widget class="QCheckBox" name="useSslCheckBox">
+ <item row="4" column="0">
+ <widget class="QLabel" name="encryptionLabel">
<property name="text">
- <string>Use SSL</string>
+ <string>Encryption</string>
</property>
</widget>
</item>
+ <item row="4" column="1">
+ <widget class="KLineEdit" name="encryption"/>
+ </item>
<item row="5" column="1">
- <widget class="QCheckBox" name="allowMultipleLoginsCheckBox">
+ <widget class="QCheckBox" name="rvProxy">
<property name="text">
- <string>Allow Multiple Logins</string>
+ <string>Always use AIM proxy </string>
</property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="allowMultipleLoginsLabel">
- <property name="text">
- <string/>
+ <property name="tristate">
+ <bool>false</bool>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="otherHeadlineLabel">
<property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -118,34 +124,25 @@ p, li { white-space: pre-wrap; }
<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;">
+</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; 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">
+ <widget class="QCheckBox" name="clientLogin">
<property name="text">
- <string>Always use RV-Proxy</string>
+ <string>Use clientLogin</string>
</property>
</widget>
</item>
- <item row="8" column="0">
- <widget class="QLabel" name="charsetLabel">
+ <item row="8" column="1">
+ <widget class="QCheckBox" name="multipleLogins">
<property name="text">
- <string>Charset</string>
+ <string>Allow multiple simultaneous logins</string>
</property>
</widget>
</item>
- <item row="8" column="1">
- <widget class="KComboBox" name="charsetComboBox">
- <item>
- <property name="text">
- <string>UTF-8</string>
- </property>
- </item>
- </widget>
- </item>
</layout>
</item>
<item>
@@ -156,7 +153,7 @@ p, li { white-space: pre-wrap; }
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>40</height>
+ <height>0</height>
</size>
</property>
</spacer>
@@ -174,11 +171,6 @@ p, li { white-space: pre-wrap; }
<extends>QLineEdit</extends>
<header>klineedit.h</header>
</customwidget>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
</customwidgets>
<resources/>
<connections/>
diff --git a/haze/haze-aim-account.cpp b/haze/haze-aim-account.cpp
index e72c3c9..86db998 100644
--- a/haze/haze-aim-account.cpp
+++ b/haze/haze-aim-account.cpp
@@ -21,12 +21,13 @@
#include "haze-aim-account.h"
#include "aim-main-options-widget.h"
-// #include "aim-server-settings-widget.h"
+#include "aim-server-settings-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
#include <KDebug>
+#include <KLocalizedString>
HazeAimAccount::HazeAimAccount(QObject *parent)
: AbstractAccountUi(parent)
@@ -36,14 +37,12 @@ HazeAimAccount::HazeAimAccount(QObject *parent)
// Register supported parameters
registerSupportedParameter("account", QVariant::String);
registerSupportedParameter("password", QVariant::String);
-
-// registerSupportedParameter("port", QVariant::Int);
-// registerSupportedParameter("server", QVariant::String);
-
-// registerSupportedParameter("use-ssl", QVariant::Bool);
-// registerSupportedParameter("always-use-rv-proxy", QVariant::Bool);
-// registerSupportedParameter("allow-multiple-logins", QVariant::Bool);
-// registerSupportedParameter("charset", QVariant::String);
+ registerSupportedParameter( "server" , QVariant::String);
+ registerSupportedParameter( "port" , QVariant::UInt);
+ registerSupportedParameter( "encryption" , QVariant::String);
+ registerSupportedParameter( "always-use-rv-proxy" , QVariant::Bool );
+ registerSupportedParameter( "use-clientlogin" , QVariant::Bool );
+ registerSupportedParameter( "allow-multiple-logins" , QVariant::Bool );
}
HazeAimAccount::~HazeAimAccount()
@@ -62,7 +61,7 @@ AbstractAccountParametersWidget *HazeAimAccount::mainOptionsWidget(
bool HazeAimAccount::hasAdvancedOptionsWidget() const
{
- return false;
+ return true;
}
AbstractAccountParametersWidget *HazeAimAccount::advancedOptionsWidget(
@@ -72,8 +71,8 @@ AbstractAccountParametersWidget *HazeAimAccount::advancedOptionsWidget(
kDebug();
GenericAdvancedOptionsWidget *advancedOptionsWidget = new GenericAdvancedOptionsWidget(model, parent);
-// AbstractAccountParametersWidget *aimServerSettingsWidget = new AimServerSettingsWidget(model, parent);
-// advancedOptionsWidget->addTab(aimServerSettingsWidget, "Server");
+ AbstractAccountParametersWidget *aimServerSettingsWidget = new AimServerSettingsWidget(model, parent);
+ advancedOptionsWidget->addTab(aimServerSettingsWidget, i18n("Advanced"));
return advancedOptionsWidget;
}
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list