[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:19 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=c8db119
The following commit has been merged in the master branch:
commit c8db119569c8e81742d1bc0d3de73b8469adf8cf
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date: Tue Mar 1 13:57:32 2011 +0100
Add skype (bigbrownchunkx-skype-dbus) support to haze plugin.
---
haze/CMakeLists.txt | 5 ++
haze/haze-account-ui-plugin.cpp | 19 +++--
.../haze-skype-account-ui.cpp | 48 ++++++-------
.../haze-skype-account-ui.h | 14 ++--
.../skype-advanced-settings-widget.cpp | 22 +++---
.../skype-advanced-settings-widget.h | 20 +++---
haze/skype-advanced-settings-widget.ui | 82 ++++++++++++++++++++++
.../skype-main-options-widget.cpp | 18 ++---
.../skype-main-options-widget.h | 22 +++---
...ions-widget.ui => skype-main-options-widget.ui} | 25 ++-----
10 files changed, 178 insertions(+), 97 deletions(-)
diff --git a/haze/CMakeLists.txt b/haze/CMakeLists.txt
index 67d43a1..96476e7 100644
--- a/haze/CMakeLists.txt
+++ b/haze/CMakeLists.txt
@@ -9,6 +9,9 @@ set (kcmtelepathyaccounts_plugin_haze_SRCS
haze-icq-account.cpp
icq-main-options-widget.cpp
icq-server-settings-widget.cpp
+ haze-skype-account-ui.cpp
+ skype-main-options-widget.cpp
+ skype-advanced-settings-widget.cpp
haze-yahoo-account.cpp
yahoo-main-options-widget.cpp
yahoo-server-settings-widget.cpp
@@ -17,6 +20,8 @@ set (kcmtelepathyaccounts_plugin_haze_SRCS
kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
icq-main-options-widget.ui
icq-server-settings-widget.ui
+ skype-main-options-widget.ui
+ skype-advanced-settings-widget.ui
yahoo-main-options-widget.ui
yahoo-server-settings-widget.ui
)
diff --git a/haze/haze-account-ui-plugin.cpp b/haze/haze-account-ui-plugin.cpp
index 5cebd1a..0bc48fd 100644
--- a/haze/haze-account-ui-plugin.cpp
+++ b/haze/haze-account-ui-plugin.cpp
@@ -21,6 +21,7 @@
#include "haze-account-ui-plugin.h"
#include "haze-icq-account.h"
+#include "haze-skype-account-ui.h"
#include "haze-yahoo-account.h"
#include <KDebug>
@@ -35,6 +36,7 @@ HazeAccountUiPlugin::HazeAccountUiPlugin(QObject *parent, const QVariantList &)
// Register supported cm/protocol combinations
registerProvidedProtocol("haze", "icq");
+ registerProvidedProtocol("haze", "bigbrownchunx-skype-dbus");
registerProvidedProtocol("haze", "yahoo");
}
@@ -49,19 +51,22 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
kDebug();
- // We only support haze/icq and yahoo combination so far
- if ((connectionManager == QLatin1String("haze")) && (protocol == QLatin1String("icq"))) {
- return new HazeIcqAccountUi;
- }
- if ((connectionManager == QLatin1String("haze")) && (protocol == QLatin1String("yahoo"))){
- return new HazeYahooAccount;
+ // We support haze/icq, yahoo, bigbrownchunx-skype-dbus so far
+ if (connectionManager == QLatin1String("haze")) {
+ if (protocol == QLatin1String("icq")) {
+ return new HazeIcqAccountUi;
+ } else if (protocol == QLatin1String("bigbrownchunx-skype-dbus")){
+ return new HazeSkypeAccountUi;
+ } else if (protocol == QLatin1String("yahoo")){
+ return new HazeYahooAccount;
+ }
}
return 0;
}
-K_PLUGIN_FACTORY(factory, registerPlugin<HazeAccountUiPlugin>();) \
+K_PLUGIN_FACTORY(factory, registerPlugin<HazeAccountUiPlugin>();)
K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_haze"))
#include "haze-account-ui-plugin.moc"
diff --git a/salut/salut-account-ui.cpp b/haze/haze-skype-account-ui.cpp
similarity index 53%
copy from salut/salut-account-ui.cpp
copy to haze/haze-skype-account-ui.cpp
index 37799f8..05de4df 100644
--- a/salut/salut-account-ui.cpp
+++ b/haze/haze-skype-account-ui.cpp
@@ -1,5 +1,5 @@
/*
- * This file is part of telepathy-accounts-kcm-plugins
+ * This file is part of telepathy-accounts-kcm
*
* Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
*
@@ -18,62 +18,62 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "salut-account-ui.h"
-#include "salut-main-options-widget.h"
-#include "salut-advanced-options-widget.h"
+#include "haze-skype-account-ui.h"
+
+#include "skype-main-options-widget.h"
+#include "skype-advanced-settings-widget.h"
-#include <KCMTelepathyAccounts/ParameterEditModel>
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
#include <KDebug>
-SalutAccountUi::SalutAccountUi(QObject *parent)
- : AbstractAccountUi(parent)
+HazeSkypeAccountUi::HazeSkypeAccountUi(QObject *parent)
+ : AbstractAccountUi(parent)
{
kDebug();
+
// Register supported parameters
// Main Options
- registerSupportedParameter("first-name", QVariant::String);
- registerSupportedParameter("last-name", QVariant::String);
- registerSupportedParameter("nickname", QVariant::String);
+ registerSupportedParameter("account", QVariant::String);
// Advanced Options
- registerSupportedParameter("published-name", QVariant::String);
- registerSupportedParameter("email", QVariant::String);
- registerSupportedParameter("jid", QVariant::String);
+ registerSupportedParameter("skypeout-online", QVariant::Bool);
+ registerSupportedParameter("skype-sync", QVariant::Bool);
+ registerSupportedParameter("check-for-updates", QVariant::Bool);
+ registerSupportedParameter("reject-all-auths", QVariant::Bool);
+ registerSupportedParameter("skype-autostart", QVariant::Bool);
}
-SalutAccountUi::~SalutAccountUi()
+HazeSkypeAccountUi::~HazeSkypeAccountUi()
{
kDebug();
}
-AbstractAccountParametersWidget *SalutAccountUi::mainOptionsWidget(
+AbstractAccountParametersWidget *HazeSkypeAccountUi::mainOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
kDebug();
- return new SalutMainOptionsWidget(model, parent);
+ return new SkypeMainOptionsWidget(model, parent);
}
-bool SalutAccountUi::hasAdvancedOptionsWidget() const
+bool HazeSkypeAccountUi::hasAdvancedOptionsWidget() const
{
- kDebug();
-
return true;
}
-AbstractAccountParametersWidget *SalutAccountUi::advancedOptionsWidget(
+AbstractAccountParametersWidget *HazeSkypeAccountUi::advancedOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
kDebug();
- AbstractAccountParametersWidget* aowidget = new SalutAdvancedOptionsWidget(model, parent);
-
- return aowidget;
+ AbstractAccountParametersWidget *skypeAdvancedSettingsWidget = new SkypeAdvancedSettingsWidget(model, parent);
+ return skypeAdvancedSettingsWidget;
}
-#include "salut-account-ui.moc"
+
+#include "haze-skype-account-ui.moc"
+
diff --git a/gabble/gabble-account-ui.h b/haze/haze-skype-account-ui.h
similarity index 77%
copy from gabble/gabble-account-ui.h
copy to haze/haze-skype-account-ui.h
index 32e4339..7521734 100644
--- a/gabble/gabble-account-ui.h
+++ b/haze/haze-skype-account-ui.h
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
*
* 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_GABBLE_ACCOUNT_UI_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_ACCOUNT_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_ACCOUNT_H
#include <KCMTelepathyAccounts/AbstractAccountUi>
-class GabbleAccountUi : public AbstractAccountUi
+class HazeSkypeAccountUi : public AbstractAccountUi
{
Q_OBJECT
public:
- explicit GabbleAccountUi(QObject *parent = 0);
- virtual ~GabbleAccountUi();
+ explicit HazeSkypeAccountUi(QObject *parent = 0);
+ virtual ~HazeSkypeAccountUi();
virtual AbstractAccountParametersWidget
*mainOptionsWidget(ParameterEditModel *model,
@@ -40,7 +40,7 @@ public:
QWidget *parent = 0) const;
private:
- Q_DISABLE_COPY(GabbleAccountUi);
+ Q_DISABLE_COPY(HazeSkypeAccountUi);
};
#endif // header guard
diff --git a/gabble/main-options-widget.cpp b/haze/skype-advanced-settings-widget.cpp
similarity index 56%
copy from gabble/main-options-widget.cpp
copy to haze/skype-advanced-settings-widget.cpp
index 97a79e1..6830235 100644
--- a/gabble/main-options-widget.cpp
+++ b/haze/skype-advanced-settings-widget.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,30 +18,30 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "main-options-widget.h"
+#include "skype-advanced-settings-widget.h"
#include <KDebug>
-MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
- QWidget *parent)
+SkypeAdvancedSettingsWidget::SkypeAdvancedSettingsWidget(ParameterEditModel *model, QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- m_ui = new Ui::MainOptionsWidget;
+ m_ui = new Ui::SkypeAdvancedSettingsWidget;
m_ui->setupUi(this);
- handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
- handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
+ //server
+ handleParameter("skypeout-online", QVariant::Bool, m_ui->skypeOutCheckBox, 0);
+ handleParameter("skype-sync", QVariant::Bool, m_ui->syncCheckBox, 0);
+ handleParameter("check-for-updates",QVariant::Bool, m_ui->updatesCheckBox, 0);
+ handleParameter("reject-all-auths", QVariant::Bool, m_ui->authRequestsCheckBox, 0);
+ handleParameter("skype-autostart", QVariant::Bool, m_ui->autostartCheckBox, 0);
}
-MainOptionsWidget::~MainOptionsWidget()
+SkypeAdvancedSettingsWidget::~SkypeAdvancedSettingsWidget()
{
kDebug();
delete m_ui;
}
-
-#include "main-options-widget.moc"
-
diff --git a/salut/salut-advanced-options-widget.h b/haze/skype-advanced-settings-widget.h
similarity index 63%
copy from salut/salut-advanced-options-widget.h
copy to haze/skype-advanced-settings-widget.h
index 7d3f2d9..520635d 100644
--- a/salut/salut-advanced-options-widget.h
+++ b/haze/skype-advanced-settings-widget.h
@@ -1,5 +1,5 @@
/*
- * This file is part of telepathy-accounts-kcm-plugins
+ * This file is part of telepathy-accounts-kcm
*
* Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
*
@@ -18,26 +18,26 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_SALUT_AO_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_SALUT_AO_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_SERVER_SETTINGS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_SERVER_SETTINGS_WIDGET_H
-#include "ui_salut-advanced-options-widget.h"
+#include "ui_skype-advanced-settings-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class SalutAdvancedOptionsWidget : public AbstractAccountParametersWidget
+class SkypeAdvancedSettingsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit SalutAdvancedOptionsWidget(ParameterEditModel *model,
- QWidget *parent = 0);
- virtual ~SalutAdvancedOptionsWidget();
+ explicit SkypeAdvancedSettingsWidget(ParameterEditModel *model, QWidget *parent = 0);
+ virtual ~SkypeAdvancedSettingsWidget();
private:
- Q_DISABLE_COPY(SalutAdvancedOptionsWidget);
- Ui::SalutAdvancedOptionsWidget *m_ui;
+ Q_DISABLE_COPY(SkypeAdvancedSettingsWidget);
+ Ui::SkypeAdvancedSettingsWidget *m_ui;
};
#endif // header guard
+
diff --git a/haze/skype-advanced-settings-widget.ui b/haze/skype-advanced-settings-widget.ui
new file mode 100644
index 0000000..d7a2e5e
--- /dev/null
+++ b/haze/skype-advanced-settings-widget.ui
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SkypeAdvancedSettingsWidget</class>
+ <widget class="QWidget" name="SkypeAdvancedSettingsWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>448</width>
+ <height>303</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Advanced Options</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <property name="margin">
+ <number>4</number>
+ </property>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <item row="0" column="1">
+ <widget class="QCheckBox" name="skypeOutCheckBox">
+ <property name="text">
+ <string>Show SkypeOut contacts as 'Online'</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="syncCheckBox">
+ <property name="text">
+ <string>Make Skype online/offline when going online/offline</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QCheckBox" name="updatesCheckBox">
+ <property name="text">
+ <string>Automatically check for updates</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QCheckBox" name="authRequestsCheckBox">
+ <property name="text">
+ <string>Automatically reject all authorization requests</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QCheckBox" name="autostartCheckBox">
+ <property name="text">
+ <string>Auto-start Skype if not running</string>
+ </property>
+ </widget>
+ </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>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/gabble/main-options-widget.cpp b/haze/skype-main-options-widget.cpp
similarity index 71%
copy from gabble/main-options-widget.cpp
copy to haze/skype-main-options-widget.cpp
index 97a79e1..572804f 100644
--- a/gabble/main-options-widget.cpp
+++ b/haze/skype-main-options-widget.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/>
+ * Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,30 +18,32 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "main-options-widget.h"
+#include "skype-main-options-widget.h"
+
+#include <KCMTelepathyAccounts/ParameterEditModel>
#include <KDebug>
-MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
- QWidget *parent)
+#include <QVariant>
+
+SkypeMainOptionsWidget::SkypeMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- m_ui = new Ui::MainOptionsWidget;
+ m_ui = new Ui::SkypeMainOptionsWidget;
m_ui->setupUi(this);
handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
- handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
}
-MainOptionsWidget::~MainOptionsWidget()
+SkypeMainOptionsWidget::~SkypeMainOptionsWidget()
{
kDebug();
delete m_ui;
}
-#include "main-options-widget.moc"
+#include "skype-main-options-widget.moc"
diff --git a/rakia/rakia-main-options-widget.h b/haze/skype-main-options-widget.h
similarity index 63%
copy from rakia/rakia-main-options-widget.h
copy to haze/skype-main-options-widget.h
index bd1291b..5e7082c 100644
--- a/rakia/rakia-main-options-widget.h
+++ b/haze/skype-main-options-widget.h
@@ -1,5 +1,5 @@
/*
- * This file is part of telepathy-accounts-kcm-plugins
+ * This file is part of telepathy-accounts-kcm
*
* Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
*
@@ -18,25 +18,23 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_ACCOUNT_PARAMETERS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_ACCOUNT_PARAMETERS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_ACCOUNT_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_ACCOUNT_PARAMETERS_WIDGET_H
-#include "ui_rakia-main-options-widget.h"
+#include "ui_skype-main-options-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class RakiaMainOptionsWidget : public AbstractAccountParametersWidget
+class SkypeMainOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
-
public:
- explicit RakiaMainOptionsWidget(ParameterEditModel *model,
- QWidget *parent = 0);
- virtual ~RakiaMainOptionsWidget();
-
+ explicit SkypeMainOptionsWidget(ParameterEditModel *model, QWidget *parent = 0);
+ virtual ~SkypeMainOptionsWidget();
private:
- Q_DISABLE_COPY(RakiaMainOptionsWidget);
- Ui::RakiaMainOptionsWidget *m_ui;
+ Q_DISABLE_COPY(SkypeMainOptionsWidget);
+ Ui::SkypeMainOptionsWidget *m_ui;
};
#endif // header guard
+
diff --git a/haze/icq-main-options-widget.ui b/haze/skype-main-options-widget.ui
similarity index 69%
copy from haze/icq-main-options-widget.ui
copy to haze/skype-main-options-widget.ui
index 32c8c77..30e1a33 100644
--- a/haze/icq-main-options-widget.ui
+++ b/haze/skype-main-options-widget.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>IcqMainOptionsWidget</class>
- <widget class="QWidget" name="IcqMainOptionsWidget">
+ <class>SkypeMainOptionsWidget</class>
+ <widget class="QWidget" name="SkypeMainOptionsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
- <height>74</height>
+ <height>32</height>
</rect>
</property>
<property name="sizePolicy">
@@ -28,30 +28,19 @@
<property name="sizeConstraint">
<enum>QLayout::SetMinimumSize</enum>
</property>
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="accountLabel">
<property name="text">
- <string>UIN:</string>
+ <string>Account:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KLineEdit" name="accountLineEdit"/>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="passwordLabel">
- <property name="text">
- <string>Password:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="KLineEdit" name="passwordLineEdit">
- <property name="passwordMode">
- <bool>true</bool>
- </property>
- </widget>
- </item>
</layout>
</item>
</layout>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list