[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:01:33 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=d50a497
The following commit has been merged in the master branch:
commit d50a497ef70cab9daf0b11ace3b3dcdd8c4be807
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Feb 9 12:59:36 2012 +0100
Add plugin for kde-talk
---
plugins/gabble/CMakeLists.txt | 2 +
plugins/gabble/gabble-account-ui.cpp | 3 ++
...cebook.cpp => main-options-widget-kde-talk.cpp} | 30 ++++++-------
...t-facebook.h => main-options-widget-kde-talk.h} | 25 ++++++-----
...s-widget.ui => main-options-widget-kde-talk.ui} | 51 +++++++++++++---------
5 files changed, 66 insertions(+), 45 deletions(-)
diff --git a/plugins/gabble/CMakeLists.txt b/plugins/gabble/CMakeLists.txt
index 327d5a5..93b85ea 100644
--- a/plugins/gabble/CMakeLists.txt
+++ b/plugins/gabble/CMakeLists.txt
@@ -11,6 +11,7 @@ set (ktpaccountskcm_plugin_gabble_SRCS
main-options-widget-googletalk.cpp
main-options-widget-facebook.cpp
main-options-widget-msn.cpp
+ main-options-widget-kde-talk.cpp
server-settings-widget.cpp
proxy-settings-widget.cpp
)
@@ -20,6 +21,7 @@ kde4_add_ui_files (ktpaccountskcm_plugin_gabble_SRCS
main-options-widget-googletalk.ui
main-options-widget-facebook.ui
main-options-widget-msn.ui
+ main-options-widget-kde-talk.ui
server-settings-widget.ui
proxy-settings-widget.ui
)
diff --git a/plugins/gabble/gabble-account-ui.cpp b/plugins/gabble/gabble-account-ui.cpp
index 549253e..8cc1f0e 100644
--- a/plugins/gabble/gabble-account-ui.cpp
+++ b/plugins/gabble/gabble-account-ui.cpp
@@ -24,6 +24,7 @@
#include "main-options-widget-googletalk.h"
#include "main-options-widget-facebook.h"
#include "main-options-widget-msn.h"
+#include "main-options-widget-kde-talk.h"
#include "server-settings-widget.h"
#include "proxy-settings-widget.h"
@@ -71,6 +72,8 @@ AbstractAccountParametersWidget *GabbleAccountUi::mainOptionsWidget(
return new MainOptionsWidgetFacebook(model, parent);
} else if (m_serviceName == QLatin1String("msn-xmpp")) {
return new MainOptionsWidgetMSN(model, parent);
+ } else if (m_serviceName == QLatin1String("kde-talk")) {
+ return new MainOptionsWidgetKDETalk(model, parent);
} else {
return new MainOptionsWidget(model, parent);
}
diff --git a/plugins/gabble/main-options-widget-facebook.cpp b/plugins/gabble/main-options-widget-kde-talk.cpp
similarity index 72%
copy from plugins/gabble/main-options-widget-facebook.cpp
copy to plugins/gabble/main-options-widget-kde-talk.cpp
index 7e800be..9f69f9b 100644
--- a/plugins/gabble/main-options-widget-facebook.cpp
+++ b/plugins/gabble/main-options-widget-kde-talk.cpp
@@ -2,6 +2,7 @@
* This file is part of telepathy-accounts-kcm
*
* Copyright (C) 2011 David Edmundson <kde at davidedmundson.co.uk>
+ * Copyright (C) 2012 Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,26 +19,26 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "main-options-widget-facebook.h"
+#include "main-options-widget-kde-talk.h"
+#include "ui_main-options-widget-kde-talk.h"
#include <KCMTelepathyAccounts/ParameterEditModel>
+#include <KDE/KDebug>
+#include <QValidator>
-MainOptionsWidgetFacebook::MainOptionsWidgetFacebook(ParameterEditModel *model,
- QWidget *parent)
- : AbstractAccountParametersWidget(model, parent)
+MainOptionsWidgetKDETalk::MainOptionsWidgetKDETalk(ParameterEditModel *model,
+ QWidget *parent)
+ : AbstractAccountParametersWidget(model, parent)
{
// Set up the UI.
- m_ui = new Ui::MainOptionsWidgetFacebook;
+ m_ui = new Ui::MainOptionsWidgetKDETalk;
m_ui->setupUi(this);
- // We cannot use handleParameter directly as we need to append @chat.facebook.com onto the end of the JID.
- // Profiles have no method to do this, so pseudo-hardcoding is the only available option.
-
Tp::ProtocolParameter parameter = parameterModel()->parameter(QLatin1String("account"));
QModelIndex index = parameterModel()->indexForParameter(parameter);
if (index.isValid()) {
QString account = index.data().toString();
- //strip off any "@chat.facebook.com" from the parameter when displaying it in the text edit.
+ //strip off any "@kdetalk.net" from the parameter when displaying it in the text edit.
account = account.left(account.indexOf(QLatin1Char('@')));
m_ui->accountLineEdit->setText(account);
}
@@ -46,19 +47,19 @@ MainOptionsWidgetFacebook::MainOptionsWidgetFacebook(ParameterEditModel *model,
QTimer::singleShot(0, m_ui->accountLineEdit, SLOT(setFocus()));
}
-MainOptionsWidgetFacebook::~MainOptionsWidgetFacebook()
+MainOptionsWidgetKDETalk::~MainOptionsWidgetKDETalk()
{
delete m_ui;
}
-void MainOptionsWidgetFacebook::submit()
+void MainOptionsWidgetKDETalk::submit()
{
Tp::ProtocolParameter parameter = parameterModel()->parameter(QLatin1String("account"));
QModelIndex index = parameterModel()->indexForParameter(parameter);
if (index.isValid()) {
QString account = m_ui->accountLineEdit->text();
- //append "@chat.facebook.com" (fetching the address from the default params for as much future compatiability as possible)
+ //append "@kdetalk.net" (fetching the address from the default params for as much future compatiability as possible)
account.append(QLatin1Char('@'));
QString serverAddress = parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("server"))).data().toString();
account.append(serverAddress);
@@ -69,7 +70,7 @@ void MainOptionsWidgetFacebook::submit()
AbstractAccountParametersWidget::submit();
}
-bool MainOptionsWidgetFacebook::validateParameterValues()
+bool MainOptionsWidgetKDETalk::validateParameterValues()
{
if (m_ui->accountLineEdit->text().isEmpty() || m_ui->passwordLineEdit->text().isEmpty()) {
return false;
@@ -78,5 +79,4 @@ bool MainOptionsWidgetFacebook::validateParameterValues()
return true;
}
-
-#include "main-options-widget-facebook.moc"
+#include "main-options-widget-kde-talk.moc"
diff --git a/plugins/gabble/main-options-widget-facebook.h b/plugins/gabble/main-options-widget-kde-talk.h
similarity index 69%
copy from plugins/gabble/main-options-widget-facebook.h
copy to plugins/gabble/main-options-widget-kde-talk.h
index abeacc5..58673cc 100644
--- a/plugins/gabble/main-options-widget-facebook.h
+++ b/plugins/gabble/main-options-widget-kde-talk.h
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 David Edmundson <kde at davidedmundson.co.uk>
+ * Copyright (C) 2012 Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -18,27 +18,32 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_FACEBOOK_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_FACEBOOK_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_KDE_TALK_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_GABBLE_ACCOUNT_PARAMETERS_WIDGET_KDE_TALK_H
-#include "ui_main-options-widget-facebook.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class MainOptionsWidgetFacebook : public AbstractAccountParametersWidget
+namespace Ui {
+ class MainOptionsWidgetKDETalk;
+}
+
+class MainOptionsWidgetKDETalk : public AbstractAccountParametersWidget
{
Q_OBJECT
- Q_DISABLE_COPY(MainOptionsWidgetFacebook);
+ Q_DISABLE_COPY(MainOptionsWidgetKDETalk);
+
public:
- explicit MainOptionsWidgetFacebook(ParameterEditModel *model,
- QWidget *parent = 0);
- virtual ~MainOptionsWidgetFacebook();
+ explicit MainOptionsWidgetKDETalk(ParameterEditModel *model,
+ QWidget *parent = 0);
+ virtual ~MainOptionsWidgetKDETalk();
virtual void submit();
virtual bool validateParameterValues();
+
private:
- Ui::MainOptionsWidgetFacebook *m_ui;
+ Ui::MainOptionsWidgetKDETalk *m_ui;
};
#endif // header guard
diff --git a/plugins/gabble/main-options-widget.ui b/plugins/gabble/main-options-widget-kde-talk.ui
similarity index 73%
copy from plugins/gabble/main-options-widget.ui
copy to plugins/gabble/main-options-widget-kde-talk.ui
index 9698d1c..1e648d4 100644
--- a/plugins/gabble/main-options-widget.ui
+++ b/plugins/gabble/main-options-widget-kde-talk.ui
@@ -1,45 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MainOptionsWidget</class>
- <widget class="QWidget" name="MainOptionsWidget">
+ <class>MainOptionsWidgetKDETalk</class>
+ <widget class="QWidget" name="MainOptionsWidgetKDETalk">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
- <height>207</height>
+ <height>89</height>
</rect>
</property>
<property name="windowTitle">
<string>Account Preferences</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
+ <layout class="QVBoxLayout" name="vLayout">
<item>
<layout class="QFormLayout" name="formLayout">
- <item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit"/>
- </item>
- <item row="2" column="1">
- <widget class="KLineEdit" name="passwordLineEdit">
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- <property name="passwordMode">
- <bool>true</bool>
- </property>
- </widget>
- </item>
<item row="0" column="0">
<widget class="QLabel" name="accountLabel">
<property name="text">
- <string>Jabber ID:</string>
+ <string>KDE Talk ID:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
- <item row="2" column="0">
+ <item row="0" column="1">
+ <layout class="QHBoxLayout" name="hLayout">
+ <item>
+ <widget class="KLineEdit" name="accountLineEdit"/>
+ </item>
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>@kdetalk.net</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
<widget class="QLabel" name="passwordLabel">
<property name="text">
<string>Password:</string>
@@ -49,7 +50,17 @@
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="1" column="1">
+ <widget class="KLineEdit" name="passwordLineEdit">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ <property name="passwordMode">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
<widget class="QCheckBox" name="registerCheckBox">
<property name="text">
<string>Register new account</string>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list