[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=538ce59
The following commit has been merged in the master branch:
commit 538ce594278a31fcfe7136f728d7d47a8fbbdbcf
Author: Lasath Fernando <kde at lasath.org>
Date: Fri Apr 29 00:42:10 2011 +1000
minor code style changes.
Also replaced a QVBoxLayout with QFormLayout in aim widgets
---
haze/aim-main-options-widget.cpp | 7 +-
haze/aim-main-options-widget.h | 4 +-
haze/aim-main-options-widget.ui | 7 --
haze/aim-server-settings-widget.ui | 231 +++++++++++++++++--------------------
haze/haze-account-ui-plugin.cpp | 3 +-
haze/haze-aim-account.cpp | 21 ++--
haze/yahoo-main-options-widget.cpp | 2 +-
7 files changed, 117 insertions(+), 158 deletions(-)
diff --git a/haze/aim-main-options-widget.cpp b/haze/aim-main-options-widget.cpp
index 0263f20..1fc3e32 100644
--- a/haze/aim-main-options-widget.cpp
+++ b/haze/aim-main-options-widget.cpp
@@ -25,14 +25,9 @@
AimMainOptionsWidget::AimMainOptionsWidget(ParameterEditModel* model, QWidget* parent)
: AbstractAccountParametersWidget(model, parent)
-{
+{
kDebug() << "Creating AIM Account";
- //I'll delete this later
- foreach (Tp::ProtocolParameter param, model->parameters()) {
- kDebug() << "Found parameter: handleParameter(" << param.name() << ',' << param.type() << ", ,);" /*<< param.defaultValue()*/;
- }
-
//setup the Ui
m_ui = new Ui::AimMainOptionsWidget;
m_ui->setupUi(this);
diff --git a/haze/aim-main-options-widget.h b/haze/aim-main-options-widget.h
index a42ccc7..607fce3 100644
--- a/haze/aim-main-options-widget.h
+++ b/haze/aim-main-options-widget.h
@@ -30,13 +30,13 @@ class AimMainOptionsWidget
: public AbstractAccountParametersWidget
{
Q_OBJECT
+ Q_DISABLE_COPY(AimMainOptionsWidget);
public:
AimMainOptionsWidget(ParameterEditModel* model, QWidget* parent = 0);
virtual ~AimMainOptionsWidget();
private:
- Q_DISABLE_COPY(AimMainOptionsWidget);
- Ui::AimMainOptionsWidget* m_ui;
+ Ui::AimMainOptionsWidget *m_ui;
};
#endif // HAZE_YAHOO_ACCOUNT_H
diff --git a/haze/aim-main-options-widget.ui b/haze/aim-main-options-widget.ui
index b6c8816..eba7245 100644
--- a/haze/aim-main-options-widget.ui
+++ b/haze/aim-main-options-widget.ui
@@ -19,11 +19,6 @@
<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>
@@ -60,8 +55,6 @@
</widget>
</item>
</layout>
- </item>
- </layout>
</widget>
<customwidgets>
<customwidget>
diff --git a/haze/aim-server-settings-widget.ui b/haze/aim-server-settings-widget.ui
index a28b382..68e6ce6 100644
--- a/haze/aim-server-settings-widget.ui
+++ b/haze/aim-server-settings-widget.ui
@@ -13,150 +13,127 @@
<property name="windowTitle">
<string>Advanced Options</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
- <property name="margin">
- <number>4</number>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
</property>
- <item>
- <layout class="QFormLayout" name="formLayout">
- <property name="sizeConstraint">
- <enum>QLayout::SetMinimumSize</enum>
- </property>
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <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>
- <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><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+ <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: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="serverAddressLabel">
- <property name="text">
- <string>Address</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="KLineEdit" name="serverAddress"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="serverPortLabel">
- <property name="text">
- <string>Port:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="KIntSpinBox" name="serverPort">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximum">
- <number>65536</number>
- </property>
- <property name="value">
- <number>5050</number>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="transferHeadlineLabel">
- <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">
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="serverAddressLabel">
+ <property name="text">
+ <string>Address</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="KLineEdit" name="serverAddress"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="serverPortLabel">
+ <property name="text">
+ <string>Port:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="KIntSpinBox" name="serverPort">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximum">
+ <number>65535</number>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="transferHeadlineLabel">
+ <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: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="0">
- <widget class="QLabel" name="encryptionLabel">
- <property name="text">
- <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="rvProxy">
- <property name="text">
- <string>Always use AIM proxy </string>
- </property>
- <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="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">
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="encryptionLabel">
+ <property name="text">
+ <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="rvProxy">
+ <property name="text">
+ <string>Always use AIM proxy </string>
+ </property>
+ <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="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: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="clientLogin">
- <property name="text">
- <string>Use clientLogin</string>
- </property>
- </widget>
- </item>
- <item row="8" column="1">
- <widget class="QCheckBox" name="multipleLogins">
- <property name="text">
- <string>Allow multiple simultaneous logins</string>
- </property>
- </widget>
- </item>
- </layout>
+ </property>
+ </widget>
</item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <item row="7" column="1">
+ <widget class="QCheckBox" name="clientLogin">
+ <property name="text">
+ <string>Use clientLogin</string>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QCheckBox" name="multipleLogins">
+ <property name="text">
+ <string>Allow multiple simultaneous logins</string>
</property>
- </spacer>
+ </widget>
</item>
</layout>
</widget>
diff --git a/haze/haze-account-ui-plugin.cpp b/haze/haze-account-ui-plugin.cpp
index 98d9531..3941e69 100644
--- a/haze/haze-account-ui-plugin.cpp
+++ b/haze/haze-account-ui-plugin.cpp
@@ -55,7 +55,6 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
kDebug();
- // We support icq, aim, yahoo, bigbrownchunx-skype-dbus and myspace so far
if (connectionManager == QLatin1String("haze")) {
if (protocol == QLatin1String("icq")) {
return new HazeIcqAccountUi;
@@ -67,7 +66,7 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
return new HazeYahooAccount;
} else if (protocol == QLatin1String("aim")){
return new HazeAimAccount;
- }
+ }
}
return 0;
diff --git a/haze/haze-aim-account.cpp b/haze/haze-aim-account.cpp
index 86db998..ed44ee3 100644
--- a/haze/haze-aim-account.cpp
+++ b/haze/haze-aim-account.cpp
@@ -24,10 +24,8 @@
#include "aim-server-settings-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
#include <KDebug>
-#include <KLocalizedString>
HazeAimAccount::HazeAimAccount(QObject *parent)
: AbstractAccountUi(parent)
@@ -37,12 +35,12 @@ HazeAimAccount::HazeAimAccount(QObject *parent)
// Register supported parameters
registerSupportedParameter("account", QVariant::String);
registerSupportedParameter("password", 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 );
+ 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()
@@ -69,11 +67,8 @@ AbstractAccountParametersWidget *HazeAimAccount::advancedOptionsWidget(
QWidget *parent) const
{
kDebug();
-
- GenericAdvancedOptionsWidget *advancedOptionsWidget = new GenericAdvancedOptionsWidget(model, parent);
- AbstractAccountParametersWidget *aimServerSettingsWidget = new AimServerSettingsWidget(model, parent);
- advancedOptionsWidget->addTab(aimServerSettingsWidget, i18n("Advanced"));
- return advancedOptionsWidget;
+
+ return new AimServerSettingsWidget(model, parent);
}
diff --git a/haze/yahoo-main-options-widget.cpp b/haze/yahoo-main-options-widget.cpp
index ec02514..8529542 100644
--- a/haze/yahoo-main-options-widget.cpp
+++ b/haze/yahoo-main-options-widget.cpp
@@ -28,7 +28,7 @@ YahooMainOptionsWidget::YahooMainOptionsWidget(ParameterEditModel* model, QWidge
: AbstractAccountParametersWidget(model, parent)
{
kDebug() << "Creating Yahoo Account";
-
+
//setup the Ui
m_ui = new Ui::YahooMainOptionsWidget;
m_ui->setupUi(this);
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list