[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:37 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=245c394
The following commit has been merged in the master branch:
commit 245c3948b48c511b7de497d63b915bfe3b259c67
Author: Lasath Fernando <kde at lasath.org>
Date: Sat Feb 19 01:20:09 2011 +1100
Created basic options widget for AIM
---
haze/CMakeLists.txt | 3 ++
...ions-widget.cpp => aim-main-options-widget.cpp} | 19 +++++-----
...-options-widget.h => aim-main-options-widget.h} | 16 ++++-----
...ptions-widget.ui => aim-main-options-widget.ui} | 6 ++--
haze/haze-account-ui-plugin.cpp | 8 +++--
.../{haze-icq-account.cpp => haze-aim-account.cpp} | 41 +++++++++++-----------
idle/idle-account-ui.h => haze/haze-aim-account.h | 16 ++++-----
haze/yahoo-main-options-widget.cpp | 6 +---
8 files changed, 59 insertions(+), 56 deletions(-)
diff --git a/haze/CMakeLists.txt b/haze/CMakeLists.txt
index a998a65..d632881 100644
--- a/haze/CMakeLists.txt
+++ b/haze/CMakeLists.txt
@@ -18,6 +18,8 @@ set (kcmtelepathyaccounts_plugin_haze_SRCS
haze-yahoo-account.cpp
yahoo-main-options-widget.cpp
yahoo-server-settings-widget.cpp
+ aim-main-options-widget.cpp
+ haze-aim-account.cpp
)
kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
@@ -29,6 +31,7 @@ kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
skype-advanced-settings-widget.ui
yahoo-main-options-widget.ui
yahoo-server-settings-widget.ui
+ aim-main-options-widget.ui
)
kde4_add_plugin (kcmtelepathyaccounts_plugin_haze
diff --git a/haze/yahoo-main-options-widget.cpp b/haze/aim-main-options-widget.cpp
similarity index 76%
copy from haze/yahoo-main-options-widget.cpp
copy to haze/aim-main-options-widget.cpp
index 108a023..2e1c369 100644
--- a/haze/yahoo-main-options-widget.cpp
+++ b/haze/aim-main-options-widget.cpp
@@ -18,23 +18,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "yahoo-main-options-widget.h"
-
-#include <KCMTelepathyAccounts/ParameterEditModel>
+#include "aim-main-options-widget.h"
#include <KDebug>
+#include <KCMTelepathyAccounts/parameter-edit-model.h>
-YahooMainOptionsWidget::YahooMainOptionsWidget(ParameterEditModel* model, QWidget* parent)
+AimMainOptionsWidget::AimMainOptionsWidget(ParameterEditModel* model, QWidget* parent)
: AbstractAccountParametersWidget(model, parent)
-{
- kDebug();
- kDebug() << "Creating Yahoo Account";
- foreach (const Tp::ProtocolParameter ¶m, model->parameters()) {
+{
+ kDebug() << "Creating AIM Account";
+
+ foreach (Tp::ProtocolParameter param, model->parameters()) {
kDebug() << "Found parameter: " << param.name() << param.type() << param.defaultValue();
}
//setup the Ui
- m_ui = new Ui::YahooMainOptionsWidget;
+ m_ui = new Ui::AimMainOptionsWidget;
m_ui->setupUi(this);
//map the widgets to their data
@@ -42,7 +41,7 @@ YahooMainOptionsWidget::YahooMainOptionsWidget(ParameterEditModel* model, QWidge
handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
}
-YahooMainOptionsWidget::~YahooMainOptionsWidget()
+AimMainOptionsWidget::~AimMainOptionsWidget()
{
kDebug();
diff --git a/haze/yahoo-main-options-widget.h b/haze/aim-main-options-widget.h
similarity index 72%
copy from haze/yahoo-main-options-widget.h
copy to haze/aim-main-options-widget.h
index 592e582..a42ccc7 100644
--- a/haze/yahoo-main-options-widget.h
+++ b/haze/aim-main-options-widget.h
@@ -19,24 +19,24 @@
*/
-#ifndef HAZE_YAHOO_ACCOUNT_H
-#define HAZE_YAHOO_ACCOUNT_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_AIM_ACCOUNT_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_AIM_ACCOUNT_PARAMETERS_WIDGET_H
-#include "ui_yahoo-main-options-widget.h"
+#include "ui_aim-main-options-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class YahooMainOptionsWidget
+class AimMainOptionsWidget
: public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- YahooMainOptionsWidget(ParameterEditModel* model, QWidget* parent = 0);
- virtual ~YahooMainOptionsWidget();
+ AimMainOptionsWidget(ParameterEditModel* model, QWidget* parent = 0);
+ virtual ~AimMainOptionsWidget();
private:
- Q_DISABLE_COPY(YahooMainOptionsWidget);
- Ui::YahooMainOptionsWidget* m_ui;
+ Q_DISABLE_COPY(AimMainOptionsWidget);
+ Ui::AimMainOptionsWidget* m_ui;
};
#endif // HAZE_YAHOO_ACCOUNT_H
diff --git a/haze/yahoo-main-options-widget.ui b/haze/aim-main-options-widget.ui
similarity index 93%
copy from haze/yahoo-main-options-widget.ui
copy to haze/aim-main-options-widget.ui
index 47aba2b..b6c8816 100644
--- a/haze/yahoo-main-options-widget.ui
+++ b/haze/aim-main-options-widget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>YahooMainOptionsWidget</class>
- <widget class="QWidget" name="YahooMainOptionsWidget">
+ <class>AimMainOptionsWidget</class>
+ <widget class="QWidget" name="AimMainOptionsWidget">
<property name="geometry">
<rect>
<x>0</x>
@@ -41,7 +41,7 @@
<string/>
</property>
<property name="clickMessage">
- <string>example at yahoo.com</string>
+ <string/>
</property>
</widget>
</item>
diff --git a/haze/haze-account-ui-plugin.cpp b/haze/haze-account-ui-plugin.cpp
index 4854636..98d9531 100644
--- a/haze/haze-account-ui-plugin.cpp
+++ b/haze/haze-account-ui-plugin.cpp
@@ -24,6 +24,7 @@
#include "haze-myspaceim-account-ui.h"
#include "haze-skype-account-ui.h"
#include "haze-yahoo-account.h"
+#include "haze-aim-account.h"
#include <KDebug>
#include <KGenericFactory>
@@ -40,6 +41,7 @@ HazeAccountUiPlugin::HazeAccountUiPlugin(QObject *parent, const QVariantList &)
registerProvidedProtocol("haze", "myspace");
registerProvidedProtocol("haze", "bigbrownchunx-skype-dbus");
registerProvidedProtocol("haze", "yahoo");
+ registerProvidedProtocol("haze", "aim");
}
HazeAccountUiPlugin::~HazeAccountUiPlugin()
@@ -53,7 +55,7 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
kDebug();
- // We support icq, yahoo, bigbrownchunx-skype-dbus and myspace so far
+ // We support icq, aim, yahoo, bigbrownchunx-skype-dbus and myspace so far
if (connectionManager == QLatin1String("haze")) {
if (protocol == QLatin1String("icq")) {
return new HazeIcqAccountUi;
@@ -63,7 +65,9 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
return new HazeSkypeAccountUi;
} else if (protocol == QLatin1String("yahoo")){
return new HazeYahooAccount;
- }
+ } else if (protocol == QLatin1String("aim")){
+ return new HazeAimAccount;
+ }
}
return 0;
diff --git a/haze/haze-icq-account.cpp b/haze/haze-aim-account.cpp
similarity index 52%
copy from haze/haze-icq-account.cpp
copy to haze/haze-aim-account.cpp
index 8703d88..e72c3c9 100644
--- a/haze/haze-icq-account.cpp
+++ b/haze/haze-aim-account.cpp
@@ -18,16 +18,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "haze-icq-account.h"
+#include "haze-aim-account.h"
-#include "icq-main-options-widget.h"
-#include "icq-server-settings-widget.h"
+#include "aim-main-options-widget.h"
+// #include "aim-server-settings-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
+#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
#include <KDebug>
-HazeIcqAccountUi::HazeIcqAccountUi(QObject *parent)
+HazeAimAccount::HazeAimAccount(QObject *parent)
: AbstractAccountUi(parent)
{
kDebug();
@@ -36,44 +37,44 @@ HazeIcqAccountUi::HazeIcqAccountUi(QObject *parent)
registerSupportedParameter("account", QVariant::String);
registerSupportedParameter("password", QVariant::String);
- registerSupportedParameter("port", QVariant::Int);
- registerSupportedParameter("server", 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("use-ssl", QVariant::Bool);
+// registerSupportedParameter("always-use-rv-proxy", QVariant::Bool);
+// registerSupportedParameter("allow-multiple-logins", QVariant::Bool);
+// registerSupportedParameter("charset", QVariant::String);
}
-HazeIcqAccountUi::~HazeIcqAccountUi()
+HazeAimAccount::~HazeAimAccount()
{
kDebug();
}
-AbstractAccountParametersWidget *HazeIcqAccountUi::mainOptionsWidget(
+AbstractAccountParametersWidget *HazeAimAccount::mainOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
kDebug();
- return new IcqMainOptionsWidget(model, parent);
+ return new AimMainOptionsWidget(model, parent);
}
-bool HazeIcqAccountUi::hasAdvancedOptionsWidget() const
+bool HazeAimAccount::hasAdvancedOptionsWidget() const
{
- return true;
+ return false;
}
-AbstractAccountParametersWidget *HazeIcqAccountUi::advancedOptionsWidget(
+AbstractAccountParametersWidget *HazeAimAccount::advancedOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
kDebug();
- AbstractAccountParametersWidget *icqServerSettingsWidget = new IcqServerSettingsWidget(model, parent);
- return icqServerSettingsWidget;
+ GenericAdvancedOptionsWidget *advancedOptionsWidget = new GenericAdvancedOptionsWidget(model, parent);
+// AbstractAccountParametersWidget *aimServerSettingsWidget = new AimServerSettingsWidget(model, parent);
+// advancedOptionsWidget->addTab(aimServerSettingsWidget, "Server");
+ return advancedOptionsWidget;
}
-#include "haze-icq-account.moc"
-
diff --git a/idle/idle-account-ui.h b/haze/haze-aim-account.h
similarity index 80%
copy from idle/idle-account-ui.h
copy to haze/haze-aim-account.h
index bd3c582..c20315e 100644
--- a/idle/idle-account-ui.h
+++ b/haze/haze-aim-account.h
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Lasse Liehu <lliehu at kolumbus.fi>
+ * Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,18 +18,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_IDLE_ACCOUNT_UI_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_IDLE_ACCOUNT_UI_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_AIM_ACCOUNT_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_AIM_ACCOUNT_H
#include <KCMTelepathyAccounts/AbstractAccountUi>
-class IdleAccountUi : public AbstractAccountUi
+class HazeAimAccount : public AbstractAccountUi
{
Q_OBJECT
public:
- explicit IdleAccountUi(QObject *parent = 0);
- virtual ~IdleAccountUi();
+ explicit HazeAimAccount(QObject *parent = 0);
+ virtual ~HazeAimAccount();
virtual AbstractAccountParametersWidget
*mainOptionsWidget(ParameterEditModel *model,
@@ -38,10 +38,10 @@ public:
virtual AbstractAccountParametersWidget
*advancedOptionsWidget(ParameterEditModel *model,
QWidget *parent = 0) const;
+
private:
- Q_DISABLE_COPY(IdleAccountUi);
+ Q_DISABLE_COPY(HazeAimAccount);
};
-
#endif // header guard
diff --git a/haze/yahoo-main-options-widget.cpp b/haze/yahoo-main-options-widget.cpp
index 108a023..ec02514 100644
--- a/haze/yahoo-main-options-widget.cpp
+++ b/haze/yahoo-main-options-widget.cpp
@@ -27,12 +27,8 @@
YahooMainOptionsWidget::YahooMainOptionsWidget(ParameterEditModel* model, QWidget* parent)
: AbstractAccountParametersWidget(model, parent)
{
- kDebug();
kDebug() << "Creating Yahoo Account";
- foreach (const Tp::ProtocolParameter ¶m, model->parameters()) {
- kDebug() << "Found parameter: " << param.name() << param.type() << param.defaultValue();
- }
-
+
//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