[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:28 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=e14bed9
The following commit has been merged in the master branch:
commit e14bed9ccbed550d975849d35edaddcf6766709d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date: Sat Apr 23 03:07:14 2011 +0100
Add a google talk specific profile UI.
---
gabble/CMakeLists.txt | 2 ++
gabble/gabble-account-ui-plugin.cpp | 4 +---
gabble/gabble-account-ui.cpp | 14 ++++++++++----
gabble/gabble-account-ui.h | 3 ++-
...s-widget.cpp => main-options-widget-googletalk.cpp} | 12 ++++++------
...tions-widget.h => main-options-widget-googletalk.h} | 18 +++++++++---------
...ons-widget.ui => main-options-widget-googletalk.ui} | 6 +++---
7 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/gabble/CMakeLists.txt b/gabble/CMakeLists.txt
index 53a7ee6..33972ed 100644
--- a/gabble/CMakeLists.txt
+++ b/gabble/CMakeLists.txt
@@ -8,12 +8,14 @@ set (kcmtelepathyaccounts_plugin_gabble_SRCS
gabble-account-ui-plugin.cpp
gabble-account-ui.cpp
main-options-widget.cpp
+ main-options-widget-googletalk.cpp
server-settings-widget.cpp
proxy-settings-widget.cpp
)
kde4_add_ui_files (kcmtelepathyaccounts_plugin_gabble_SRCS
main-options-widget.ui
+ main-options-widget-googletalk.ui
server-settings-widget.ui
proxy-settings-widget.ui
)
diff --git a/gabble/gabble-account-ui-plugin.cpp b/gabble/gabble-account-ui-plugin.cpp
index 344ca2e..4fbc138 100644
--- a/gabble/gabble-account-ui-plugin.cpp
+++ b/gabble/gabble-account-ui-plugin.cpp
@@ -42,13 +42,11 @@ GabbleAccountUiPlugin::~GabbleAccountUiPlugin()
AbstractAccountUi* GabbleAccountUiPlugin::accountUi(const QString &connectionManager, const QString &protocol, const QString &serviceName)
{
- Q_UNUSED(serviceName);
-
kDebug();
// We only support gabble/jabber combination.
if ((connectionManager == QLatin1String("gabble")) && (protocol == QLatin1String("jabber"))) {
- return new GabbleAccountUi;
+ return new GabbleAccountUi(serviceName, this);
}
return 0;
diff --git a/gabble/gabble-account-ui.cpp b/gabble/gabble-account-ui.cpp
index 4f6a8a3..71ce0ac 100644
--- a/gabble/gabble-account-ui.cpp
+++ b/gabble/gabble-account-ui.cpp
@@ -21,6 +21,7 @@
#include "gabble-account-ui.h"
#include "main-options-widget.h"
+#include "main-options-widget-googletalk.h"
#include "server-settings-widget.h"
#include "proxy-settings-widget.h"
@@ -29,8 +30,9 @@
#include <KDebug>
-GabbleAccountUi::GabbleAccountUi(QObject *parent)
- : AbstractAccountUi(parent)
+GabbleAccountUi::GabbleAccountUi(const QString &serviceName, QObject *parent)
+ : AbstractAccountUi(parent),
+ m_serviceName(serviceName)
{
kDebug();
@@ -65,8 +67,12 @@ AbstractAccountParametersWidget *GabbleAccountUi::mainOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
-
- return new MainOptionsWidget(model, parent);
+ if(m_serviceName == QLatin1String("google-talk")) {
+ return new MainOptionsWidgetGoogleTalk(model, parent);
+ }
+ else {
+ return new MainOptionsWidget(model, parent);
+ }
}
bool GabbleAccountUi::hasAdvancedOptionsWidget() const
diff --git a/gabble/gabble-account-ui.h b/gabble/gabble-account-ui.h
index 32e4339..99a1960 100644
--- a/gabble/gabble-account-ui.h
+++ b/gabble/gabble-account-ui.h
@@ -28,7 +28,7 @@ class GabbleAccountUi : public AbstractAccountUi
Q_OBJECT
public:
- explicit GabbleAccountUi(QObject *parent = 0);
+ explicit GabbleAccountUi(const QString &serviceName, QObject *parent = 0);
virtual ~GabbleAccountUi();
virtual AbstractAccountParametersWidget
@@ -41,6 +41,7 @@ public:
private:
Q_DISABLE_COPY(GabbleAccountUi);
+ QString m_serviceName;
};
#endif // header guard
diff --git a/gabble/main-options-widget.cpp b/gabble/main-options-widget-googletalk.cpp
similarity index 77%
copy from gabble/main-options-widget.cpp
copy to gabble/main-options-widget-googletalk.cpp
index 97a79e1..f37646b 100644
--- a/gabble/main-options-widget.cpp
+++ b/gabble/main-options-widget-googletalk.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 David Edmundson. <kde at davidedmundson.co.uk>
*
* 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 "main-options-widget-googletalk.h"
#include <KDebug>
-MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
+MainOptionsWidgetGoogleTalk::MainOptionsWidgetGoogleTalk(ParameterEditModel *model,
QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
kDebug();
// Set up the UI.
- m_ui = new Ui::MainOptionsWidget;
+ m_ui = new Ui::MainOptionsWidgetGoogleTalk;
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()
+MainOptionsWidgetGoogleTalk::~MainOptionsWidgetGoogleTalk()
{
kDebug();
delete m_ui;
}
-#include "main-options-widget.moc"
+#include "main-options-widget-googletalk.moc"
diff --git a/gabble/main-options-widget.h b/gabble/main-options-widget-googletalk.h
similarity index 72%
copy from gabble/main-options-widget.h
copy to gabble/main-options-widget-googletalk.h
index e6a7112..762856b 100644
--- a/gabble/main-options-widget.h
+++ b/gabble/main-options-widget-googletalk.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 David Edmundson. <kde at davidedmundson.co.uk>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,25 +18,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_GOOGLETALK_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_GOOGLETALK_H
-#include "ui_main-options-widget.h"
+#include "ui_main-options-widget-googletalk.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class MainOptionsWidget : public AbstractAccountParametersWidget
+class MainOptionsWidgetGoogleTalk : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit MainOptionsWidget(ParameterEditModel *model,
+ explicit MainOptionsWidgetGoogleTalk(ParameterEditModel *model,
QWidget *parent = 0);
- virtual ~MainOptionsWidget();
+ virtual ~MainOptionsWidgetGoogleTalk();
private:
- Q_DISABLE_COPY(MainOptionsWidget);
- Ui::MainOptionsWidget *m_ui;
+ Q_DISABLE_COPY(MainOptionsWidgetGoogleTalk);
+ Ui::MainOptionsWidgetGoogleTalk *m_ui;
};
#endif // header guard
diff --git a/gabble/main-options-widget.ui b/gabble/main-options-widget-googletalk.ui
similarity index 91%
copy from gabble/main-options-widget.ui
copy to gabble/main-options-widget-googletalk.ui
index c3d6d30..8205ea1 100644
--- a/gabble/main-options-widget.ui
+++ b/gabble/main-options-widget-googletalk.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MainOptionsWidget</class>
- <widget class="QWidget" name="MainOptionsWidget">
+ <class>MainOptionsWidgetGoogleTalk</class>
+ <widget class="QWidget" name="MainOptionsWidgetGoogleTalk">
<property name="geometry">
<rect>
<x>0</x>
@@ -32,7 +32,7 @@
<item row="0" column="0">
<widget class="QLabel" name="accountLabel">
<property name="text">
- <string>Jabber ID:</string>
+ <string>Email Address:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list