[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:57:44 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=e7efcc6
The following commit has been merged in the master branch:
commit e7efcc6992b389589b385cbc47b7ece5cb478f70
Author: George Goldberg <grundleborg at googlemail.com>
Date: Wed Jul 29 22:50:14 2009 +0000
Implement the most basic possible implementation of the rest of the plugn, up to displaying a blank widget for the mandatory parameters.
svn path=/trunk/playground/network/telepathy-accounts-kcm-plugins/; revision=1004370
---
CMakeLists.txt.user | 77 ++++++++++++++++++++++
gabble/CMakeLists.txt | 2 +
gabble/gabble-account-ui-plugin.cpp | 12 ++--
...account-ui-plugin.cpp => gabble-account-ui.cpp} | 43 ++++++------
...ble-account-ui-plugin.h => gabble-account-ui.h} | 21 +++---
...ui-plugin.h => mandatory-parameters-widget.cpp} | 44 ++++++++-----
...t-ui-plugin.h => mandatory-parameters-widget.h} | 19 +++---
7 files changed, 156 insertions(+), 62 deletions(-)
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
new file mode 100644
index 0000000..d9fa8e1
--- /dev/null
+++ b/CMakeLists.txt.user
@@ -0,0 +1,77 @@
+<!DOCTYPE QtCreatorProject>
+<qtcreator>
+ <data>
+ <variable>activeRunConfiguration</variable>
+ <value type="int" >0</value>
+ </data>
+ <data>
+ <variable>activebuildconfiguration</variable>
+ <value type="QString" >all</value>
+ </data>
+ <data>
+ <variable>buildConfiguration-all</variable>
+ <valuemap type="QVariantMap" >
+ <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString" >all</value>
+ <value key="buildDirectory" type="QString" >/home/gberg/development/build/work/collabora/telepathy-accounts-kcm-plugins</value>
+ <value key="msvcVersion" type="QString" ></value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>buildconfiguration-all-buildstep0</variable>
+ <valuemap type="QVariantMap" >
+ <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString" >all</value>
+ <valuelist key="buildTargets" type="QVariantList" >
+ <value type="QString" >all</value>
+ </valuelist>
+ </valuemap>
+ </data>
+ <data>
+ <variable>buildconfiguration-all-cleanstep0</variable>
+ <valuemap type="QVariantMap" >
+ <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString" >all</value>
+ <valuelist key="additionalArguments" type="QVariantList" >
+ <value type="QString" >clean</value>
+ </valuelist>
+ <value key="cleanConfig" type="bool" >true</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>buildconfigurations</variable>
+ <valuelist type="QVariantList" >
+ <value type="QString" >all</value>
+ </valuelist>
+ </data>
+ <data>
+ <variable>buildstep0</variable>
+ <valuemap type="QVariantMap" >
+ <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString" ></value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>buildsteps</variable>
+ <valuelist type="QVariantList" >
+ <value type="QString" >CMakeProjectManager.MakeStep</value>
+ </valuelist>
+ </data>
+ <data>
+ <variable>cleanstep0</variable>
+ <valuemap type="QVariantMap" >
+ <value key="ProjectExplorer.BuildConfiguration.DisplayName" type="QString" ></value>
+ <value key="clean" type="bool" >true</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>cleansteps</variable>
+ <valuelist type="QVariantList" >
+ <value type="QString" >CMakeProjectManager.MakeStep</value>
+ </valuelist>
+ </data>
+ <data>
+ <variable>defaultFileEncoding</variable>
+ <value type="QByteArray" >ISO-8859-1</value>
+ </data>
+ <data>
+ <variable>project</variable>
+ <valuemap type="QVariantMap" />
+ </data>
+</qtcreator>
diff --git a/gabble/CMakeLists.txt b/gabble/CMakeLists.txt
index b7f2e27..ef39f22 100644
--- a/gabble/CMakeLists.txt
+++ b/gabble/CMakeLists.txt
@@ -6,6 +6,8 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}
set (kcmtelepathyaccounts_plugin_gabble_SRCS
gabble-account-ui-plugin.cpp
+ gabble-account-ui.cpp
+ mandatory-parameters-widget.cpp
)
kde4_add_ui_files (kcmtelepathyaccounts_plugin_gabble_SRCS
diff --git a/gabble/gabble-account-ui-plugin.cpp b/gabble/gabble-account-ui-plugin.cpp
index a0516bd..8e497f1 100644
--- a/gabble/gabble-account-ui-plugin.cpp
+++ b/gabble/gabble-account-ui-plugin.cpp
@@ -20,6 +20,8 @@
#include "gabble-account-ui-plugin.h"
+#include "gabble-account-ui.h"
+
#include <KCMTelepathyAccounts/PluginMacros>
#include <KDebug>
@@ -54,10 +56,12 @@ GabbleAccountUiPlugin::~GabbleAccountUiPlugin()
AbstractAccountUi* GabbleAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol)
{
kDebug();
-
- Q_UNUSED(connectionManager);
- Q_UNUSED(protocol);
-
+
+ // We only support gabble/jabber combination.
+ if ((connectionManager == "gabble") && (protocol == "jabber")) {
+ return new GabbleAccountUi;
+ }
+
return 0;
}
diff --git a/gabble/gabble-account-ui-plugin.cpp b/gabble/gabble-account-ui.cpp
similarity index 53%
copy from gabble/gabble-account-ui-plugin.cpp
copy to gabble/gabble-account-ui.cpp
index a0516bd..271374e 100644
--- a/gabble/gabble-account-ui-plugin.cpp
+++ b/gabble/gabble-account-ui.cpp
@@ -18,16 +18,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "gabble-account-ui-plugin.h"
+#include "gabble-account-ui.h"
-#include <KCMTelepathyAccounts/PluginMacros>
+#include "mandatory-parameters-widget.h"
-#include <KDebug>
-#include <KGenericFactory>
+#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-#include <QtCore/QVariantList>
+#include <KDebug>
-class GabbleAccountUiPlugin::Private
+class GabbleAccountUi::Private
{
public:
Private()
@@ -36,36 +35,36 @@ public:
}
};
-GabbleAccountUiPlugin::GabbleAccountUiPlugin(QObject *parent, const QVariantList &)
- : AbstractAccountUiPlugin(parent),
+GabbleAccountUi::GabbleAccountUi(QObject *parent)
+ : AbstractAccountUi(parent),
d(new Private)
{
kDebug();
-
- // Register supported cm/protocol combinations
- registerProvidedProtocol("gabble", "jabber");
}
-GabbleAccountUiPlugin::~GabbleAccountUiPlugin()
+GabbleAccountUi::~GabbleAccountUi()
{
kDebug();
+
+ delete d;
}
-AbstractAccountUi* GabbleAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol)
+AbstractAccountParametersWidget *GabbleAccountUi::mandatoryParametersWidget(Tp::ProtocolParameterList parameters) const
{
kDebug();
-
- Q_UNUSED(connectionManager);
- Q_UNUSED(protocol);
-
- return 0;
+
+ return new MandatoryParametersWidget(parameters);
}
+QList<AbstractAccountParametersWidget*> GabbleAccountUi::optionalParametersWidgets(Tp::ProtocolParameterList parameters) const
+{
+ kDebug();
-//KCMTELEPATHYACCOUNTS_PLUGIN_EXPORT("gabble", "GabbleAccountUiPlugin")
- K_PLUGIN_FACTORY(factory, registerPlugin<GabbleAccountUiPlugin>();) \
- K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_gabble"))
+ // TODO: Implement me!
+ Q_UNUSED(parameters);
+ return QList<AbstractAccountParametersWidget*>();
+}
-#include "gabble-account-ui-plugin.moc"
+#include "gabble-account-ui.moc"
diff --git a/gabble/gabble-account-ui-plugin.h b/gabble/gabble-account-ui.h
similarity index 61%
copy from gabble/gabble-account-ui-plugin.h
copy to gabble/gabble-account-ui.h
index 9b343ac..8de914c 100644
--- a/gabble/gabble-account-ui-plugin.h
+++ b/gabble/gabble-account-ui.h
@@ -18,25 +18,26 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_PLUGIN_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_PLUGIN_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_H
-#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
+#include <KCMTelepathyAccounts/AbstractAccountUi>
-#include <QVariantList>
-
-class GabbleAccountUiPlugin : public AbstractAccountUiPlugin
+class GabbleAccountUi : public AbstractAccountUi
{
Q_OBJECT
public:
- GabbleAccountUiPlugin(QObject *parent, const QVariantList &);
- virtual ~GabbleAccountUiPlugin();
+ explicit GabbleAccountUi(QObject *parent = 0);
+ virtual ~GabbleAccountUi();
- virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol);
+ virtual AbstractAccountParametersWidget
+ *mandatoryParametersWidget(Tp::ProtocolParameterList parameters) const;
+ virtual QList<AbstractAccountParametersWidget*>
+ optionalParametersWidgets(Tp::ProtocolParameterList parameters) const;
private:
- Q_DISABLE_COPY(GabbleAccountUiPlugin);
+ Q_DISABLE_COPY(GabbleAccountUi);
class Private;
Private * const d;
diff --git a/gabble/gabble-account-ui-plugin.h b/gabble/mandatory-parameters-widget.cpp
similarity index 55%
copy from gabble/gabble-account-ui-plugin.h
copy to gabble/mandatory-parameters-widget.cpp
index 9b343ac..74b7a2d 100644
--- a/gabble/gabble-account-ui-plugin.h
+++ b/gabble/mandatory-parameters-widget.cpp
@@ -18,30 +18,42 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_PLUGIN_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_PLUGIN_H
+#include "mandatory-parameters-widget.h"
-#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
+#include <KDebug>
-#include <QVariantList>
+class MandatoryParametersWidget::Private
+{
+public:
+ Private()
+ {
+ kDebug();
+ }
+};
-class GabbleAccountUiPlugin : public AbstractAccountUiPlugin
+MandatoryParametersWidget::MandatoryParametersWidget(Tp::ProtocolParameterList parameters,
+ QWidget *parent)
+ : AbstractAccountParametersWidget(parameters, parent),
+ d(new Private)
{
- Q_OBJECT
+ kDebug();
+}
-public:
- GabbleAccountUiPlugin(QObject *parent, const QVariantList &);
- virtual ~GabbleAccountUiPlugin();
+MandatoryParametersWidget::~MandatoryParametersWidget()
+{
+ kDebug();
- virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol);
+ delete d;
+}
-private:
- Q_DISABLE_COPY(GabbleAccountUiPlugin);
+QMap<Tp::ProtocolParameter*, QVariant> MandatoryParametersWidget::parameterValues() const
+{
+ kDebug();
- class Private;
- Private * const d;
-};
+ // TODO: Implement me!
+ return QMap<Tp::ProtocolParameter*, QVariant>();
+}
-#endif // header guard
+#include "mandatory-parameters-widget.moc"
diff --git a/gabble/gabble-account-ui-plugin.h b/gabble/mandatory-parameters-widget.h
similarity index 62%
copy from gabble/gabble-account-ui-plugin.h
copy to gabble/mandatory-parameters-widget.h
index 9b343ac..021c43f 100644
--- a/gabble/gabble-account-ui-plugin.h
+++ b/gabble/mandatory-parameters-widget.h
@@ -18,25 +18,24 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_PLUGIN_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_UI_PLUGIN_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_H
-#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
+#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-#include <QVariantList>
-
-class GabbleAccountUiPlugin : public AbstractAccountUiPlugin
+class MandatoryParametersWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- GabbleAccountUiPlugin(QObject *parent, const QVariantList &);
- virtual ~GabbleAccountUiPlugin();
+ explicit MandatoryParametersWidget(Tp::ProtocolParameterList parameters,
+ QWidget *parent = 0);
+ virtual ~MandatoryParametersWidget();
- virtual AbstractAccountUi* accountUi(const QString &connectionManager, const QString &protocol);
+ virtual QMap<Tp::ProtocolParameter*, QVariant> parameterValues() const;
private:
- Q_DISABLE_COPY(GabbleAccountUiPlugin);
+ Q_DISABLE_COPY(MandatoryParametersWidget);
class Private;
Private * const d;
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list