[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:18 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=830b7e5
The following commit has been merged in the master branch:
commit 830b7e5e5ca6887b8967a48190d4b0d554458125
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date: Sun Feb 27 15:30:52 2011 +0100
Add telepathy-sunshine configuration plugin.
Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
CMakeLists.txt | 2 +-
sunshine/CMakeLists.txt | 38 +++++++
{gabble => sunshine}/Messages.sh | 2 +-
.../kcmtelepathyaccounts_plugin_sunshine.desktop | 16 +++
.../sunshine-account-ui-plugin.cpp | 28 +++--
.../sunshine-account-ui-plugin.h | 12 +--
.../sunshine-account-ui.cpp | 39 ++++---
.../sunshine-account-ui.h | 12 +--
.../sunshine-advanced-options-widget.cpp | 40 ++++---
.../sunshine-advanced-options-widget.h | 16 +--
sunshine/sunshine-advanced-options-widget.ui | 119 +++++++++++++++++++++
.../sunshine-main-options-widget.cpp | 17 +--
.../sunshine-main-options-widget.h | 16 +--
.../sunshine-main-options-widget.ui | 37 ++++---
14 files changed, 285 insertions(+), 109 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index af22089..a3914e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,4 +26,4 @@ add_subdirectory (idle)
add_subdirectory (haze)
add_subdirectory (rakia)
add_subdirectory (salut)
-
+add_subdirectory (sunshine)
diff --git a/sunshine/CMakeLists.txt b/sunshine/CMakeLists.txt
new file mode 100644
index 0000000..65513c3
--- /dev/null
+++ b/sunshine/CMakeLists.txt
@@ -0,0 +1,38 @@
+project (kcmtelepathyaccounts-plugin-sunshine)
+
+include_directories (${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set (kcmtelepathyaccounts_plugin_sunshine_SRCS
+ sunshine-account-ui-plugin.cpp
+ sunshine-account-ui.cpp
+ sunshine-main-options-widget.cpp
+ sunshine-advanced-options-widget.cpp
+)
+
+kde4_add_ui_files (kcmtelepathyaccounts_plugin_sunshine_SRCS
+ sunshine-main-options-widget.ui
+ sunshine-advanced-options-widget.ui
+)
+
+kde4_add_plugin (kcmtelepathyaccounts_plugin_sunshine
+ ${kcmtelepathyaccounts_plugin_sunshine_SRCS}
+)
+
+target_link_libraries (kcmtelepathyaccounts_plugin_sunshine
+ ${KCMTELEPATHYACCOUNTS_LIBRARIES}
+ ${QT_LIBRARIES}
+ ${KDE4_KDEUI_LIBS}
+ ${TELEPATHY_QT4_LIBRARIES}
+)
+
+# Install:
+install (TARGETS kcmtelepathyaccounts_plugin_sunshine
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+install (FILES kcmtelepathyaccounts_plugin_sunshine.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
diff --git a/gabble/Messages.sh b/sunshine/Messages.sh
old mode 100755
new mode 100644
similarity index 88%
copy from gabble/Messages.sh
copy to sunshine/Messages.sh
index c8d9bbc..84b4ef0
--- a/gabble/Messages.sh
+++ b/sunshine/Messages.sh
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
$EXTRACTRC `find . -name "*.ui"` >> rc.cpp || exit 11
-$XGETTEXT `find . -name "*.cpp"` -o $podir/kcmtelepathyaccounts_plugin_gabble.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/kcmtelepathyaccounts_plugin_sunshine.pot
rm -f rc.cpp
diff --git a/sunshine/kcmtelepathyaccounts_plugin_sunshine.desktop b/sunshine/kcmtelepathyaccounts_plugin_sunshine.desktop
new file mode 100644
index 0000000..4639962
--- /dev/null
+++ b/sunshine/kcmtelepathyaccounts_plugin_sunshine.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=Custom account configuration user interface for Gadu-Gadu accounts using the Sunshine connection manager.
+Icon=blockdevice
+Name=Gadu-Gadu Account Configuration User Interface
+Type=Service
+ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
+
+X-KDE-Library=kcmtelepathyaccounts_plugin_sunshine
+X-KDE-PluginInfo-Author=Florian Reinhard
+X-KDE-PluginInfo-Email=florian.reinhard at googlemail.com
+X-KDE-PluginInfo-Name=sunshine
+X-KDE-PluginInfo-Version=0.1
+X-KDE-PluginInfo-Website=http://techbase.kde.org/Projects/Telepathy
+X-KDE-PluginInfo-License=LGPL
+X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/salut/salut-account-ui-plugin.cpp b/sunshine/sunshine-account-ui-plugin.cpp
similarity index 60%
copy from salut/salut-account-ui-plugin.cpp
copy to sunshine/sunshine-account-ui-plugin.cpp
index fcc89f2..330a556 100644
--- a/salut/salut-account-ui-plugin.cpp
+++ b/sunshine/sunshine-account-ui-plugin.cpp
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "salut-account-ui-plugin.h"
-#include "salut-account-ui.h"
+#include "sunshine-account-ui-plugin.h"
+#include "sunshine-account-ui.h"
#include <KCMTelepathyAccounts/PluginMacros>
@@ -28,38 +28,36 @@
#include <QtCore/QVariantList>
-SalutAccountUiPlugin::SalutAccountUiPlugin(QObject *parent, const QVariantList &)
+SunshineAccountUiPlugin::SunshineAccountUiPlugin(QObject *parent, const QVariantList &)
: AbstractAccountUiPlugin(parent)
{
kDebug();
// Register supported cm/protocol combinations
- registerProvidedProtocol("salut", "local-xmpp");
+ registerProvidedProtocol("sunshine", "gadugadu");
}
-SalutAccountUiPlugin::~SalutAccountUiPlugin()
+SunshineAccountUiPlugin::~SunshineAccountUiPlugin()
{
kDebug();
}
-AbstractAccountUi* SalutAccountUiPlugin::accountUi(const QString &connectionManager,
+AbstractAccountUi* SunshineAccountUiPlugin::accountUi(const QString &connectionManager,
const QString &protocol,
const QString &serviceName)
{
kDebug();
- kDebug() << "connectionManager: " << connectionManager <<
- ", protocol: " << protocol <<
- ", servicename: " << serviceName;
- // We support salut/local-xmpp
- if (connectionManager == QLatin1String("salut") && protocol == QLatin1String("local-xmpp")) {
- return new SalutAccountUi;
+ // We support sunshine/gadugadu.
+ if ((connectionManager == QLatin1String("sunshine")) &&
+ (protocol == QLatin1String("gadugadu"))) {
+ return new SunshineAccountUi;
}
return 0;
}
-K_PLUGIN_FACTORY(factory, registerPlugin<SalutAccountUiPlugin>();)
-K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_salut"))
+K_PLUGIN_FACTORY(factory, registerPlugin<SunshineAccountUiPlugin>();)
+K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_sunshine"))
-#include "salut-account-ui-plugin.moc"
+#include "sunshine-account-ui-plugin.moc"
diff --git a/rakia/rakia-account-ui-plugin.h b/sunshine/sunshine-account-ui-plugin.h
similarity index 78%
copy from rakia/rakia-account-ui-plugin.h
copy to sunshine/sunshine-account-ui-plugin.h
index b29aad3..c0d1e72 100644
--- a/rakia/rakia-account-ui-plugin.h
+++ b/sunshine/sunshine-account-ui-plugin.h
@@ -18,27 +18,27 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_ACCOUNT_UI_PLUGIN_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_ACCOUNT_UI_PLUGIN_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_SUNSHINE_ACCOUNT_UI_PLUGIN_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_SUNSHINE_ACCOUNT_UI_PLUGIN_H
#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
#include <QVariantList>
-class RakiaAccountUiPlugin : public AbstractAccountUiPlugin
+class SunshineAccountUiPlugin : public AbstractAccountUiPlugin
{
Q_OBJECT
public:
- RakiaAccountUiPlugin(QObject *parent, const QVariantList &);
- virtual ~RakiaAccountUiPlugin();
+ SunshineAccountUiPlugin(QObject *parent, const QVariantList &);
+ virtual ~SunshineAccountUiPlugin();
virtual AbstractAccountUi* accountUi(const QString &connectionManager,
const QString &protocol,
const QString &serviceName);
private:
- Q_DISABLE_COPY(RakiaAccountUiPlugin);
+ Q_DISABLE_COPY(SunshineAccountUiPlugin);
};
diff --git a/salut/salut-account-ui.cpp b/sunshine/sunshine-account-ui.cpp
similarity index 50%
copy from salut/salut-account-ui.cpp
copy to sunshine/sunshine-account-ui.cpp
index 37799f8..1da7fe3 100644
--- a/salut/salut-account-ui.cpp
+++ b/sunshine/sunshine-account-ui.cpp
@@ -18,9 +18,9 @@
* 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 "sunshine-account-ui.h"
+#include "sunshine-main-options-widget.h"
+#include "sunshine-advanced-options-widget.h"
#include <KCMTelepathyAccounts/ParameterEditModel>
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
@@ -28,52 +28,57 @@
#include <KDebug>
-SalutAccountUi::SalutAccountUi(QObject *parent)
+SunshineAccountUi::SunshineAccountUi(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);
+ registerSupportedParameter("password", QVariant::String);
// Advanced Options
- registerSupportedParameter("published-name", QVariant::String);
- registerSupportedParameter("email", QVariant::String);
- registerSupportedParameter("jid", QVariant::String);
+ registerSupportedParameter("use-specified-server", QVariant::Bool);
+ registerSupportedParameter("server", QVariant::String);
+ registerSupportedParameter("port", QVariant::UInt);
+ registerSupportedParameter("use-ssl", QVariant::Bool);
+ registerSupportedParameter("export-contacts", QVariant::Bool);
+ // People using telepathy-sunshine from master (past 0.1.8 versions) will need this line insead
+ // of export-contacts. See the commit for further details:
+ // http://git.collabora.co.uk/?p=telepathy-sunshine.git;a=commit;h=83963893c34c6069f7202cf7d55add2d334581b5
+ // registerSupportedParameter("synchronise-contacts-with-server", QVariant::Bool);
}
-SalutAccountUi::~SalutAccountUi()
+SunshineAccountUi::~SunshineAccountUi()
{
kDebug();
}
-AbstractAccountParametersWidget *SalutAccountUi::mainOptionsWidget(
+AbstractAccountParametersWidget *SunshineAccountUi::mainOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
kDebug();
- return new SalutMainOptionsWidget(model, parent);
+ return new SunshineMainOptionsWidget(model, parent);
}
-bool SalutAccountUi::hasAdvancedOptionsWidget() const
+bool SunshineAccountUi::hasAdvancedOptionsWidget() const
{
kDebug();
return true;
}
-AbstractAccountParametersWidget *SalutAccountUi::advancedOptionsWidget(
+AbstractAccountParametersWidget *SunshineAccountUi::advancedOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
kDebug();
- AbstractAccountParametersWidget* aowidget = new SalutAdvancedOptionsWidget(model, parent);
+ AbstractAccountParametersWidget* aowidget = new SunshineAdvancedOptionsWidget(model, parent);
return aowidget;
}
-#include "salut-account-ui.moc"
+#include "sunshine-account-ui.moc"
diff --git a/rakia/rakia-account-ui.h b/sunshine/sunshine-account-ui.h
similarity index 82%
copy from rakia/rakia-account-ui.h
copy to sunshine/sunshine-account-ui.h
index 0f5b148..5d6b472 100644
--- a/rakia/rakia-account-ui.h
+++ b/sunshine/sunshine-account-ui.h
@@ -18,18 +18,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_ACCOUNT_UI_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_ACCOUNT_UI_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_SUNSHINE_ACCOUNT_UI_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_SUNSHINE_ACCOUNT_UI_H
#include <KCMTelepathyAccounts/AbstractAccountUi>
-class RakiaAccountUi : public AbstractAccountUi
+class SunshineAccountUi : public AbstractAccountUi
{
Q_OBJECT
public:
- explicit RakiaAccountUi(QObject *parent = 0);
- virtual ~RakiaAccountUi();
+ explicit SunshineAccountUi(QObject *parent = 0);
+ virtual ~SunshineAccountUi();
virtual AbstractAccountParametersWidget
*mainOptionsWidget(ParameterEditModel *model,
@@ -40,7 +40,7 @@ public:
QWidget *parent = 0) const;
private:
- Q_DISABLE_COPY(RakiaAccountUi);
+ Q_DISABLE_COPY(SunshineAccountUi);
};
#endif // header guard
diff --git a/rakia/rakia-main-options-widget.cpp b/sunshine/sunshine-advanced-options-widget.cpp
similarity index 53%
copy from rakia/rakia-main-options-widget.cpp
copy to sunshine/sunshine-advanced-options-widget.cpp
index c6ef831..a0c6ac1 100644
--- a/rakia/rakia-main-options-widget.cpp
+++ b/sunshine/sunshine-advanced-options-widget.cpp
@@ -18,35 +18,41 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "rakia-main-options-widget.h"
+#include "sunshine-advanced-options-widget.h"
#include <KCMTelepathyAccounts/ParameterEditModel>
#include <KDebug>
-#include <KUser>
-RakiaMainOptionsWidget::RakiaMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
+SunshineAdvancedOptionsWidget::SunshineAdvancedOptionsWidget(ParameterEditModel* model, QWidget* parent)
: AbstractAccountParametersWidget(model, parent)
{
+ kDebug();
+
// Set up the UI.
- m_ui = new Ui::RakiaMainOptionsWidget;
+ m_ui = new Ui::SunshineAdvancedOptionsWidget;
m_ui->setupUi(this);
- handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
- handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
- handleParameter("alias", QVariant::String, m_ui->aliasLineEdit, m_ui->aliasLabel);
-
- // if the account is empty on startup we add a new account, therefore
- // set the alias to the current users full name
- if(m_ui->accountLineEdit->text().isEmpty()) {
- KUser user = KUser();
- m_ui->aliasLineEdit->setText(user.property(KUser::FullName).toString());
- }
+ handleParameter("use-specified-server", QVariant::Bool,
+ m_ui->serverGroupBox,
+ 0);
+ handleParameter("server", QVariant::String,
+ m_ui->serverLineEdit,
+ m_ui->serverLabel);
+ handleParameter("port", QVariant::UInt,
+ m_ui->portSpinBox,
+ m_ui->portLabel);
+ handleParameter("use-ssl", QVariant::Bool,
+ m_ui->sslCheckBox,
+ m_ui->sslLabel);
+ handleParameter("export-contacts", QVariant::Bool,
+ m_ui->exportContactsCheckBox,
+ m_ui->exportContactsLabel);
}
-RakiaMainOptionsWidget::~RakiaMainOptionsWidget()
+SunshineAdvancedOptionsWidget::~SunshineAdvancedOptionsWidget()
{
- kDebug();
-
delete m_ui;
}
+
+#include "sunshine-advanced-options-widget.moc"
diff --git a/salut/salut-advanced-options-widget.h b/sunshine/sunshine-advanced-options-widget.h
similarity index 70%
copy from salut/salut-advanced-options-widget.h
copy to sunshine/sunshine-advanced-options-widget.h
index 7d3f2d9..234b798 100644
--- a/salut/salut-advanced-options-widget.h
+++ b/sunshine/sunshine-advanced-options-widget.h
@@ -18,25 +18,25 @@
* 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_SUNSHINE_AO_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_SUNSHINE_AO_WIDGET_H
-#include "ui_salut-advanced-options-widget.h"
+#include "ui_sunshine-advanced-options-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class SalutAdvancedOptionsWidget : public AbstractAccountParametersWidget
+class SunshineAdvancedOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit SalutAdvancedOptionsWidget(ParameterEditModel *model,
+ explicit SunshineAdvancedOptionsWidget(ParameterEditModel *model,
QWidget *parent = 0);
- virtual ~SalutAdvancedOptionsWidget();
+ virtual ~SunshineAdvancedOptionsWidget();
private:
- Q_DISABLE_COPY(SalutAdvancedOptionsWidget);
- Ui::SalutAdvancedOptionsWidget *m_ui;
+ Q_DISABLE_COPY(SunshineAdvancedOptionsWidget);
+ Ui::SunshineAdvancedOptionsWidget *m_ui;
};
diff --git a/sunshine/sunshine-advanced-options-widget.ui b/sunshine/sunshine-advanced-options-widget.ui
new file mode 100644
index 0000000..3cbcef1
--- /dev/null
+++ b/sunshine/sunshine-advanced-options-widget.ui
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SunshineAdvancedOptionsWidget</class>
+ <widget class="QWidget" name="SunshineAdvancedOptionsWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>421</width>
+ <height>206</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="serverGroupBox">
+ <property name="title">
+ <string>Custom Server Settings</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <layout class="QFormLayout" name="formLayout_3">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="serverLabel">
+ <property name="text">
+ <string>Server:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="KLineEdit" name="serverLineEdit">
+ <property name="toolTip">
+ <string>STUN server address (FQDN or IP address)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="portLabel">
+ <property name="text">
+ <string>Port:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="KIntSpinBox" name="portSpinBox">
+ <property name="maximum">
+ <number>65535</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="miscGroupBox">
+ <property name="title">
+ <string>Miscellaneous Settings</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_4">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
+ <item row="6" column="0">
+ <widget class="QLabel" name="exportContactsLabel">
+ <property name="text">
+ <string>Contacts:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QCheckBox" name="exportContactsCheckBox">
+ <property name="toolTip">
+ <string>Enable loose routing as per RFC 3261</string>
+ </property>
+ <property name="text">
+ <string>Synchronise your contacts with the gadu-gadu server</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="sslLabel">
+ <property name="text">
+ <string>Security:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QCheckBox" name="sslCheckBox">
+ <property name="text">
+ <string>Use Transport Layer Security (TLS/SSL)</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </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/rakia/rakia-main-options-widget.cpp b/sunshine/sunshine-main-options-widget.cpp
similarity index 67%
copy from rakia/rakia-main-options-widget.cpp
copy to sunshine/sunshine-main-options-widget.cpp
index c6ef831..378b059 100644
--- a/rakia/rakia-main-options-widget.cpp
+++ b/sunshine/sunshine-main-options-widget.cpp
@@ -18,33 +18,24 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "rakia-main-options-widget.h"
+#include "sunshine-main-options-widget.h"
#include <KCMTelepathyAccounts/ParameterEditModel>
#include <KDebug>
-#include <KUser>
-RakiaMainOptionsWidget::RakiaMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
+SunshineMainOptionsWidget::SunshineMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
// Set up the UI.
- m_ui = new Ui::RakiaMainOptionsWidget;
+ m_ui = new Ui::SunshineMainOptionsWidget;
m_ui->setupUi(this);
handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
- handleParameter("alias", QVariant::String, m_ui->aliasLineEdit, m_ui->aliasLabel);
-
- // if the account is empty on startup we add a new account, therefore
- // set the alias to the current users full name
- if(m_ui->accountLineEdit->text().isEmpty()) {
- KUser user = KUser();
- m_ui->aliasLineEdit->setText(user.property(KUser::FullName).toString());
- }
}
-RakiaMainOptionsWidget::~RakiaMainOptionsWidget()
+SunshineMainOptionsWidget::~SunshineMainOptionsWidget()
{
kDebug();
diff --git a/rakia/rakia-main-options-widget.h b/sunshine/sunshine-main-options-widget.h
similarity index 69%
copy from rakia/rakia-main-options-widget.h
copy to sunshine/sunshine-main-options-widget.h
index bd1291b..fbb6dca 100644
--- a/rakia/rakia-main-options-widget.h
+++ b/sunshine/sunshine-main-options-widget.h
@@ -18,25 +18,25 @@
* 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_SUNSHINE_ACCOUNT_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_SUNSHINE_ACCOUNT_PARAMETERS_WIDGET_H
-#include "ui_rakia-main-options-widget.h"
+#include "ui_sunshine-main-options-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class RakiaMainOptionsWidget : public AbstractAccountParametersWidget
+class SunshineMainOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit RakiaMainOptionsWidget(ParameterEditModel *model,
+ explicit SunshineMainOptionsWidget(ParameterEditModel *model,
QWidget *parent = 0);
- virtual ~RakiaMainOptionsWidget();
+ virtual ~SunshineMainOptionsWidget();
private:
- Q_DISABLE_COPY(RakiaMainOptionsWidget);
- Ui::RakiaMainOptionsWidget *m_ui;
+ Q_DISABLE_COPY(SunshineMainOptionsWidget);
+ Ui::SunshineMainOptionsWidget *m_ui;
};
#endif // header guard
diff --git a/gabble/main-options-widget.ui b/sunshine/sunshine-main-options-widget.ui
similarity index 85%
copy from gabble/main-options-widget.ui
copy to sunshine/sunshine-main-options-widget.ui
index c3d6d30..6dcd9b7 100644
--- a/gabble/main-options-widget.ui
+++ b/sunshine/sunshine-main-options-widget.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MainOptionsWidget</class>
- <widget class="QWidget" name="MainOptionsWidget">
+ <class>SunshineMainOptionsWidget</class>
+ <widget class="QWidget" name="SunshineMainOptionsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
- <height>62</height>
+ <height>58</height>
</rect>
</property>
<property name="windowTitle">
@@ -16,29 +16,22 @@
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QFormLayout" name="formLayout">
- <item row="0" column="1">
- <widget class="KLineEdit" name="accountLineEdit"/>
- </item>
- <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>
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
<item row="0" column="0">
<widget class="QLabel" name="accountLabel">
<property name="text">
- <string>Jabber ID:</string>
+ <string>Account</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</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">
@@ -49,6 +42,16 @@
</property>
</widget>
</item>
+ <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>
</layout>
</item>
</layout>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list