[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:22 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=86c7c86
The following commit has been merged in the master branch:
commit 86c7c86dc8ab42aee452a9b685bd3154a402d5e8
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date: Tue Mar 1 21:11:06 2011 +0100
Add MySpaceIM (myspace) support to haze plugin.
Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
REVIEW: 100776
---
haze/CMakeLists.txt | 5 +++
haze/haze-account-ui-plugin.cpp | 6 ++-
...ccount-ui.cpp => haze-myspaceim-account-ui.cpp} | 39 +++++++----------
...pe-account-ui.h => haze-myspaceim-account-ui.h} | 12 ++---
.../myspaceim-advanced-settings-widget.cpp | 23 ++++------
...dget.h => myspaceim-advanced-settings-widget.h} | 16 +++----
...et.ui => myspaceim-advanced-settings-widget.ui} | 51 +++++++++++-----------
.../myspaceim-main-options-widget.cpp | 19 +++++---
...gs-widget.h => myspaceim-main-options-widget.h} | 19 ++++----
...-widget.ui => myspaceim-main-options-widget.ui} | 13 +++---
10 files changed, 104 insertions(+), 99 deletions(-)
diff --git a/haze/CMakeLists.txt b/haze/CMakeLists.txt
index 96476e7..a998a65 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-myspaceim-account-ui.cpp
+ myspaceim-main-options-widget.cpp
+ myspaceim-advanced-settings-widget.cpp
haze-skype-account-ui.cpp
skype-main-options-widget.cpp
skype-advanced-settings-widget.cpp
@@ -20,6 +23,8 @@ set (kcmtelepathyaccounts_plugin_haze_SRCS
kde4_add_ui_files (kcmtelepathyaccounts_plugin_haze_SRCS
icq-main-options-widget.ui
icq-server-settings-widget.ui
+ myspaceim-main-options-widget.ui
+ myspaceim-advanced-settings-widget.ui
skype-main-options-widget.ui
skype-advanced-settings-widget.ui
yahoo-main-options-widget.ui
diff --git a/haze/haze-account-ui-plugin.cpp b/haze/haze-account-ui-plugin.cpp
index 0bc48fd..4854636 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-myspaceim-account-ui.h"
#include "haze-skype-account-ui.h"
#include "haze-yahoo-account.h"
@@ -36,6 +37,7 @@ HazeAccountUiPlugin::HazeAccountUiPlugin(QObject *parent, const QVariantList &)
// Register supported cm/protocol combinations
registerProvidedProtocol("haze", "icq");
+ registerProvidedProtocol("haze", "myspace");
registerProvidedProtocol("haze", "bigbrownchunx-skype-dbus");
registerProvidedProtocol("haze", "yahoo");
}
@@ -51,10 +53,12 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
kDebug();
- // We support haze/icq, yahoo, bigbrownchunx-skype-dbus so far
+ // We support icq, yahoo, bigbrownchunx-skype-dbus and myspace so far
if (connectionManager == QLatin1String("haze")) {
if (protocol == QLatin1String("icq")) {
return new HazeIcqAccountUi;
+ } else if (protocol == QLatin1String("myspace")){
+ return new HazeMySpaceIMAccountUi;
} else if (protocol == QLatin1String("bigbrownchunx-skype-dbus")){
return new HazeSkypeAccountUi;
} else if (protocol == QLatin1String("yahoo")){
diff --git a/haze/haze-skype-account-ui.cpp b/haze/haze-myspaceim-account-ui.cpp
similarity index 51%
copy from haze/haze-skype-account-ui.cpp
copy to haze/haze-myspaceim-account-ui.cpp
index 05de4df..3e288e7 100644
--- a/haze/haze-skype-account-ui.cpp
+++ b/haze/haze-myspaceim-account-ui.cpp
@@ -18,62 +18,55 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "haze-skype-account-ui.h"
+#include "haze-myspaceim-account-ui.h"
-#include "skype-main-options-widget.h"
-#include "skype-advanced-settings-widget.h"
-
-#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
+#include "myspaceim-main-options-widget.h"
+#include "myspaceim-advanced-settings-widget.h"
#include <KDebug>
-HazeSkypeAccountUi::HazeSkypeAccountUi(QObject *parent)
+HazeMySpaceIMAccountUi::HazeMySpaceIMAccountUi(QObject *parent)
: AbstractAccountUi(parent)
{
kDebug();
// Register supported parameters
// Main Options
- registerSupportedParameter("account", QVariant::String);
+ registerSupportedParameter("account", QVariant::String);
+ registerSupportedParameter("password", QVariant::String);
// Advanced Options
- 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);
+ registerSupportedParameter("server", QVariant::String);
+ registerSupportedParameter("port", QVariant::UInt);
}
-HazeSkypeAccountUi::~HazeSkypeAccountUi()
+HazeMySpaceIMAccountUi::~HazeMySpaceIMAccountUi()
{
kDebug();
}
-AbstractAccountParametersWidget *HazeSkypeAccountUi::mainOptionsWidget(
+AbstractAccountParametersWidget *HazeMySpaceIMAccountUi::mainOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
kDebug();
- return new SkypeMainOptionsWidget(model, parent);
+ return new MySpaceIMMainOptionsWidget(model, parent);
}
-bool HazeSkypeAccountUi::hasAdvancedOptionsWidget() const
+bool HazeMySpaceIMAccountUi::hasAdvancedOptionsWidget() const
{
return true;
}
-AbstractAccountParametersWidget *HazeSkypeAccountUi::advancedOptionsWidget(
+AbstractAccountParametersWidget *HazeMySpaceIMAccountUi::advancedOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
kDebug();
- AbstractAccountParametersWidget *skypeAdvancedSettingsWidget = new SkypeAdvancedSettingsWidget(model, parent);
- return skypeAdvancedSettingsWidget;
+ AbstractAccountParametersWidget *myspaceimAdvancedSettingsWidget = new MySpaceIMAdvancedSettingsWidget(model, parent);
+ return myspaceimAdvancedSettingsWidget;
}
-
-#include "haze-skype-account-ui.moc"
-
+#include "haze-myspaceim-account-ui.moc"
diff --git a/haze/haze-skype-account-ui.h b/haze/haze-myspaceim-account-ui.h
similarity index 81%
copy from haze/haze-skype-account-ui.h
copy to haze/haze-myspaceim-account-ui.h
index 7521734..0265bdb 100644
--- a/haze/haze-skype-account-ui.h
+++ b/haze/haze-myspaceim-account-ui.h
@@ -18,18 +18,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_ACCOUNT_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_ACCOUNT_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_MYSPACEIM_ACCOUNT_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_MYSPACEIM_ACCOUNT_H
#include <KCMTelepathyAccounts/AbstractAccountUi>
-class HazeSkypeAccountUi : public AbstractAccountUi
+class HazeMySpaceIMAccountUi : public AbstractAccountUi
{
Q_OBJECT
public:
- explicit HazeSkypeAccountUi(QObject *parent = 0);
- virtual ~HazeSkypeAccountUi();
+ explicit HazeMySpaceIMAccountUi(QObject *parent = 0);
+ virtual ~HazeMySpaceIMAccountUi();
virtual AbstractAccountParametersWidget
*mainOptionsWidget(ParameterEditModel *model,
@@ -40,7 +40,7 @@ public:
QWidget *parent = 0) const;
private:
- Q_DISABLE_COPY(HazeSkypeAccountUi);
+ Q_DISABLE_COPY(HazeMySpaceIMAccountUi);
};
#endif // header guard
diff --git a/idle/main-options-widget.cpp b/haze/myspaceim-advanced-settings-widget.cpp
similarity index 64%
copy from idle/main-options-widget.cpp
copy to haze/myspaceim-advanced-settings-widget.cpp
index ce99e35..d8f7be0 100644
--- a/idle/main-options-widget.cpp
+++ b/haze/myspaceim-advanced-settings-widget.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Lasse Liehu <lliehu at kolumbus.fi>
+ * 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,33 +18,28 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "main-options-widget.h"
+#include "myspaceim-advanced-settings-widget.h"
#include <KDebug>
-MainOptionsWidget::MainOptionsWidget(
- ParameterEditModel *model,
- QWidget *parent)
- : AbstractAccountParametersWidget(model, parent)
+MySpaceIMAdvancedSettingsWidget::MySpaceIMAdvancedSettingsWidget(ParameterEditModel *model,
+ QWidget *parent)
+ : AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- m_ui = new Ui::MainOptionsWidget;
+ m_ui = new Ui::MySpaceIMAdvancedSettingsWidget;
m_ui->setupUi(this);
- handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+ //server
handleParameter("server", QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
- handleParameter("fullname", QVariant::String, m_ui->fullnameLineEdit, m_ui->fullnameLabel);
-
-
+ handleParameter("port", QVariant::UInt, m_ui->portSpinBox, m_ui->portLabel);
}
-MainOptionsWidget::~MainOptionsWidget()
+MySpaceIMAdvancedSettingsWidget::~MySpaceIMAdvancedSettingsWidget()
{
kDebug();
delete m_ui;
}
-
-#include "main-options-widget.moc"
diff --git a/haze/skype-advanced-settings-widget.h b/haze/myspaceim-advanced-settings-widget.h
similarity index 65%
copy from haze/skype-advanced-settings-widget.h
copy to haze/myspaceim-advanced-settings-widget.h
index 520635d..905053e 100644
--- a/haze/skype-advanced-settings-widget.h
+++ b/haze/myspaceim-advanced-settings-widget.h
@@ -18,24 +18,24 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_SERVER_SETTINGS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_SERVER_SETTINGS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_MYSPACEIM_SERVER_SETTINGS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_MYSPACEIM_SERVER_SETTINGS_WIDGET_H
-#include "ui_skype-advanced-settings-widget.h"
+#include "ui_myspaceim-advanced-settings-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class SkypeAdvancedSettingsWidget : public AbstractAccountParametersWidget
+class MySpaceIMAdvancedSettingsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit SkypeAdvancedSettingsWidget(ParameterEditModel *model, QWidget *parent = 0);
- virtual ~SkypeAdvancedSettingsWidget();
+ explicit MySpaceIMAdvancedSettingsWidget(ParameterEditModel *model, QWidget *parent = 0);
+ virtual ~MySpaceIMAdvancedSettingsWidget();
private:
- Q_DISABLE_COPY(SkypeAdvancedSettingsWidget);
- Ui::SkypeAdvancedSettingsWidget *m_ui;
+ Q_DISABLE_COPY(MySpaceIMAdvancedSettingsWidget);
+ Ui::MySpaceIMAdvancedSettingsWidget *m_ui;
};
diff --git a/haze/skype-advanced-settings-widget.ui b/haze/myspaceim-advanced-settings-widget.ui
similarity index 57%
copy from haze/skype-advanced-settings-widget.ui
copy to haze/myspaceim-advanced-settings-widget.ui
index d7a2e5e..a13c23d 100644
--- a/haze/skype-advanced-settings-widget.ui
+++ b/haze/myspaceim-advanced-settings-widget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>SkypeAdvancedSettingsWidget</class>
- <widget class="QWidget" name="SkypeAdvancedSettingsWidget">
+ <class>MySpaceIMAdvancedSettingsWidget</class>
+ <widget class="QWidget" name="MySpaceIMAdvancedSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
@@ -25,38 +25,27 @@
<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">
+ <item row="0" column="0">
+ <widget class="QLabel" name="serverLabel">
<property name="text">
- <string>Make Skype online/offline when going online/offline</string>
+ <string>Server:</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 row="0" column="1">
+ <widget class="KLineEdit" name="serverLineEdit"/>
</item>
- <item row="3" column="1">
- <widget class="QCheckBox" name="authRequestsCheckBox">
+ <item row="1" column="0">
+ <widget class="QLabel" name="portLabel">
<property name="text">
- <string>Automatically reject all authorization requests</string>
+ <string>Port:</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>
+ <item row="1" column="1">
+ <widget class="KIntSpinBox" name="portSpinBox">
+ <property name="maximum">
+ <number>65535</number>
</property>
</widget>
</item>
@@ -77,6 +66,18 @@
</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>
+ </customwidgets>
<resources/>
<connections/>
</ui>
diff --git a/sunshine/sunshine-main-options-widget.cpp b/haze/myspaceim-main-options-widget.cpp
similarity index 73%
copy from sunshine/sunshine-main-options-widget.cpp
copy to haze/myspaceim-main-options-widget.cpp
index 378b059..0f23d02 100644
--- a/sunshine/sunshine-main-options-widget.cpp
+++ b/haze/myspaceim-main-options-widget.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,26 +18,33 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "sunshine-main-options-widget.h"
+#include "myspaceim-main-options-widget.h"
#include <KCMTelepathyAccounts/ParameterEditModel>
#include <KDebug>
-SunshineMainOptionsWidget::SunshineMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
- : AbstractAccountParametersWidget(model, parent)
+#include <QVariant>
+
+MySpaceIMMainOptionsWidget::MySpaceIMMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
+ : AbstractAccountParametersWidget(model, parent)
{
+ kDebug();
+
// Set up the UI.
- m_ui = new Ui::SunshineMainOptionsWidget;
+ m_ui = new Ui::MySpaceIMMainOptionsWidget;
m_ui->setupUi(this);
handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
}
-SunshineMainOptionsWidget::~SunshineMainOptionsWidget()
+MySpaceIMMainOptionsWidget::~MySpaceIMMainOptionsWidget()
{
kDebug();
delete m_ui;
}
+
+#include "myspaceim-main-options-widget.moc"
+
diff --git a/haze/skype-advanced-settings-widget.h b/haze/myspaceim-main-options-widget.h
similarity index 66%
copy from haze/skype-advanced-settings-widget.h
copy to haze/myspaceim-main-options-widget.h
index 520635d..554fc51 100644
--- a/haze/skype-advanced-settings-widget.h
+++ b/haze/myspaceim-main-options-widget.h
@@ -18,26 +18,23 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_SERVER_SETTINGS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_SERVER_SETTINGS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_MYSPACEIM_ACCOUNT_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_MYSPACEIM_ACCOUNT_PARAMETERS_WIDGET_H
-#include "ui_skype-advanced-settings-widget.h"
+#include "ui_myspaceim-main-options-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class SkypeAdvancedSettingsWidget : public AbstractAccountParametersWidget
+class MySpaceIMMainOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
-
public:
- explicit SkypeAdvancedSettingsWidget(ParameterEditModel *model, QWidget *parent = 0);
- virtual ~SkypeAdvancedSettingsWidget();
-
+ explicit MySpaceIMMainOptionsWidget(ParameterEditModel *model, QWidget *parent = 0);
+ virtual ~MySpaceIMMainOptionsWidget();
private:
- Q_DISABLE_COPY(SkypeAdvancedSettingsWidget);
- Ui::SkypeAdvancedSettingsWidget *m_ui;
+ Q_DISABLE_COPY(MySpaceIMMainOptionsWidget);
+ Ui::MySpaceIMMainOptionsWidget *m_ui;
};
-
#endif // header guard
diff --git a/haze/yahoo-main-options-widget.ui b/haze/myspaceim-main-options-widget.ui
similarity index 84%
copy from haze/yahoo-main-options-widget.ui
copy to haze/myspaceim-main-options-widget.ui
index 47aba2b..73163ab 100644
--- a/haze/yahoo-main-options-widget.ui
+++ b/haze/myspaceim-main-options-widget.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>YahooMainOptionsWidget</class>
- <widget class="QWidget" name="YahooMainOptionsWidget">
+ <class>MySpaceIMMainOptionsWidget</class>
+ <widget class="QWidget" name="MySpaceIMMainOptionsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
- <height>74</height>
+ <height>58</height>
</rect>
</property>
<property name="sizePolicy">
@@ -31,17 +31,20 @@
<item row="0" column="0">
<widget class="QLabel" name="accountLabel">
<property name="text">
- <string>Username</string>
+ <string>Username:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="KLineEdit" name="accountLineEdit">
+ <property name="toolTip">
+ <string>The MySpaceIM username is your email address.</string>
+ </property>
<property name="text">
<string/>
</property>
<property name="clickMessage">
- <string>example at yahoo.com</string>
+ <string>john at doe.com</string>
</property>
</widget>
</item>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list