[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:17 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=92bdeb7
The following commit has been merged in the master branch:
commit 92bdeb7a00e5c1ba33c48841ca619a3b06e765dc
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date: Tue Feb 22 13:27:55 2011 +0100
Add telepathy-salut configuration plugin.
Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
CMakeLists.txt | 1 +
salut/CMakeLists.txt | 38 +++++++++++
{haze => salut}/Messages.sh | 2 +-
salut/kcmtelepathyaccounts_plugin_salut.desktop | 16 +++++
.../salut-account-ui-plugin.cpp | 31 ++++-----
.../salut-account-ui-plugin.h | 12 ++--
salut/salut-account-ui.cpp | 79 ++++++++++++++++++++++
.../rakia-account-ui.h => salut/salut-account-ui.h | 12 ++--
.../salut-advanced-options-widget.cpp | 28 +++-----
.../salut-advanced-options-widget.h | 20 +++---
salut/salut-advanced-options-widget.ui | 79 ++++++++++++++++++++++
.../salut-main-options-widget.cpp | 24 +++----
.../salut-main-options-widget.h | 16 ++---
.../salut-main-options-widget.ui | 46 +++++++------
14 files changed, 306 insertions(+), 98 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7fa03d..af22089 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,4 +25,5 @@ add_subdirectory (butterfly)
add_subdirectory (idle)
add_subdirectory (haze)
add_subdirectory (rakia)
+add_subdirectory (salut)
diff --git a/salut/CMakeLists.txt b/salut/CMakeLists.txt
new file mode 100644
index 0000000..75521e8
--- /dev/null
+++ b/salut/CMakeLists.txt
@@ -0,0 +1,38 @@
+project (kcmtelepathyaccounts-plugin-salut)
+
+include_directories (${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set (kcmtelepathyaccounts_plugin_salut_SRCS
+ salut-account-ui-plugin.cpp
+ salut-account-ui.cpp
+ salut-main-options-widget.cpp
+ salut-advanced-options-widget.cpp
+)
+
+kde4_add_ui_files (kcmtelepathyaccounts_plugin_salut_SRCS
+ salut-main-options-widget.ui
+ salut-advanced-options-widget.ui
+)
+
+kde4_add_plugin (kcmtelepathyaccounts_plugin_salut
+ ${kcmtelepathyaccounts_plugin_salut_SRCS}
+)
+
+target_link_libraries (kcmtelepathyaccounts_plugin_salut
+ ${KCMTELEPATHYACCOUNTS_LIBRARIES}
+ ${QT_LIBRARIES}
+ ${KDE4_KDEUI_LIBS}
+ ${TELEPATHY_QT4_LIBRARIES}
+)
+
+# Install:
+install (TARGETS kcmtelepathyaccounts_plugin_salut
+ DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+install (FILES kcmtelepathyaccounts_plugin_salut.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
diff --git a/haze/Messages.sh b/salut/Messages.sh
old mode 100755
new mode 100644
similarity index 89%
copy from haze/Messages.sh
copy to salut/Messages.sh
index e6231eb..d09e898
--- a/haze/Messages.sh
+++ b/salut/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_haze.pot
+$XGETTEXT `find . -name "*.cpp"` -o $podir/kcmtelepathyaccounts_plugin_salut.pot
rm -f rc.cpp
diff --git a/salut/kcmtelepathyaccounts_plugin_salut.desktop b/salut/kcmtelepathyaccounts_plugin_salut.desktop
new file mode 100644
index 0000000..da6d75b
--- /dev/null
+++ b/salut/kcmtelepathyaccounts_plugin_salut.desktop
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Encoding=UTF-8
+Comment=Custom account configuration user interface for accounts using the Salut connection manager.
+Icon=blockdevice
+Name=Salut Account Configuration User Interface
+Type=Service
+ServiceTypes=KCMTelepathyAccounts/AccountUiPlugin
+
+X-KDE-Library=kcmtelepathyaccounts_plugin_salut
+X-KDE-PluginInfo-Author=Florian Reinhard
+X-KDE-PluginInfo-Email=florian.reinhard at googlemail.com
+X-KDE-PluginInfo-Name=salut
+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/rakia/rakia-account-ui-plugin.cpp b/salut/salut-account-ui-plugin.cpp
similarity index 63%
copy from rakia/rakia-account-ui-plugin.cpp
copy to salut/salut-account-ui-plugin.cpp
index f61bb4c..bf42ec3 100644
--- a/rakia/rakia-account-ui-plugin.cpp
+++ b/salut/salut-account-ui-plugin.cpp
@@ -18,31 +18,31 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "rakia-account-ui-plugin.h"
-#include "rakia-account-ui.h"
+#include "salut-account-ui-plugin.h"
+#include "salut-account-ui.h"
+
+#include <KCMTelepathyAccounts/PluginMacros>
#include <KDebug>
#include <KGenericFactory>
#include <QtCore/QVariantList>
-RakiaAccountUiPlugin::RakiaAccountUiPlugin(QObject *parent, const QVariantList &)
+SalutAccountUiPlugin::SalutAccountUiPlugin(QObject *parent, const QVariantList &)
: AbstractAccountUiPlugin(parent)
{
kDebug();
// Register supported cm/protocol combinations
- // We support rakia/sip and the renamed version rakia/sip combination.
- registerProvidedProtocol("rakia", "sip");
- registerProvidedProtocol("sofiasip", "sip");
+ registerProvidedProtocol("salut", "local-xmpp");
}
-RakiaAccountUiPlugin::~RakiaAccountUiPlugin()
+SalutAccountUiPlugin::~SalutAccountUiPlugin()
{
kDebug();
}
-AbstractAccountUi* RakiaAccountUiPlugin::accountUi(const QString &connectionManager,
+AbstractAccountUi* SalutAccountUiPlugin::accountUi(const QString &connectionManager,
const QString &protocol,
const QString &serviceName)
{
@@ -51,17 +51,16 @@ AbstractAccountUi* RakiaAccountUiPlugin::accountUi(const QString &connectionMana
", protocol: " << protocol <<
", servicename: " << serviceName;
- // We support rakia/sip and the renamed version rakia/sip combination.
- if(((connectionManager == "rakia") && (protocol == "sip")) ||
- ((connectionManager == "sofiasip") && (protocol == "sip"))
- ) {
- return new RakiaAccountUi;
+ // We support salut/local-xmpp
+ if(connectionManager == QLatin1String("salut") && protocol == QLatin1String("salut"))
+ {
+ return new SalutAccountUi;
}
return 0;
}
-K_PLUGIN_FACTORY(factory, registerPlugin<RakiaAccountUiPlugin>();)
-K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_rakia"))
+K_PLUGIN_FACTORY(factory, registerPlugin<SalutAccountUiPlugin>();)
+K_EXPORT_PLUGIN(factory("kcmtelepathyaccounts_plugin_salut"))
-#include "rakia-account-ui-plugin.moc"
+#include "salut-account-ui-plugin.moc"
diff --git a/rakia/rakia-account-ui-plugin.h b/salut/salut-account-ui-plugin.h
similarity index 79%
copy from rakia/rakia-account-ui-plugin.h
copy to salut/salut-account-ui-plugin.h
index b29aad3..ed9bf6b 100644
--- a/rakia/rakia-account-ui-plugin.h
+++ b/salut/salut-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_SALUT_ACCOUNT_UI_PLUGIN_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_SALUT_ACCOUNT_UI_PLUGIN_H
#include <KCMTelepathyAccounts/AbstractAccountUiPlugin>
#include <QVariantList>
-class RakiaAccountUiPlugin : public AbstractAccountUiPlugin
+class SalutAccountUiPlugin : public AbstractAccountUiPlugin
{
Q_OBJECT
public:
- RakiaAccountUiPlugin(QObject *parent, const QVariantList &);
- virtual ~RakiaAccountUiPlugin();
+ SalutAccountUiPlugin(QObject *parent, const QVariantList &);
+ virtual ~SalutAccountUiPlugin();
virtual AbstractAccountUi* accountUi(const QString &connectionManager,
const QString &protocol,
const QString &serviceName);
private:
- Q_DISABLE_COPY(RakiaAccountUiPlugin);
+ Q_DISABLE_COPY(SalutAccountUiPlugin);
};
diff --git a/salut/salut-account-ui.cpp b/salut/salut-account-ui.cpp
new file mode 100644
index 0000000..37799f8
--- /dev/null
+++ b/salut/salut-account-ui.cpp
@@ -0,0 +1,79 @@
+/*
+ * This file is part of telepathy-accounts-kcm-plugins
+ *
+ * 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
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * 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 <KCMTelepathyAccounts/ParameterEditModel>
+#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
+#include <KCMTelepathyAccounts/GenericAdvancedOptionsWidget>
+
+#include <KDebug>
+
+SalutAccountUi::SalutAccountUi(QObject *parent)
+ : AbstractAccountUi(parent)
+{
+ kDebug();
+ // Register supported parameters
+ // Main Options
+ registerSupportedParameter("first-name", QVariant::String);
+ registerSupportedParameter("last-name", QVariant::String);
+ registerSupportedParameter("nickname", QVariant::String);
+
+ // Advanced Options
+ registerSupportedParameter("published-name", QVariant::String);
+ registerSupportedParameter("email", QVariant::String);
+ registerSupportedParameter("jid", QVariant::String);
+}
+
+SalutAccountUi::~SalutAccountUi()
+{
+ kDebug();
+}
+
+AbstractAccountParametersWidget *SalutAccountUi::mainOptionsWidget(
+ ParameterEditModel *model,
+ QWidget *parent) const
+{
+ kDebug();
+
+ return new SalutMainOptionsWidget(model, parent);
+}
+
+bool SalutAccountUi::hasAdvancedOptionsWidget() const
+{
+ kDebug();
+
+ return true;
+}
+
+AbstractAccountParametersWidget *SalutAccountUi::advancedOptionsWidget(
+ ParameterEditModel *model,
+ QWidget *parent) const
+{
+ kDebug();
+
+ AbstractAccountParametersWidget* aowidget = new SalutAdvancedOptionsWidget(model, parent);
+
+ return aowidget;
+}
+
+#include "salut-account-ui.moc"
diff --git a/rakia/rakia-account-ui.h b/salut/salut-account-ui.h
similarity index 82%
copy from rakia/rakia-account-ui.h
copy to salut/salut-account-ui.h
index 0f5b148..599addc 100644
--- a/rakia/rakia-account-ui.h
+++ b/salut/salut-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_SALUT_ACCOUNT_UI_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_SALUT_ACCOUNT_UI_H
#include <KCMTelepathyAccounts/AbstractAccountUi>
-class RakiaAccountUi : public AbstractAccountUi
+class SalutAccountUi : public AbstractAccountUi
{
Q_OBJECT
public:
- explicit RakiaAccountUi(QObject *parent = 0);
- virtual ~RakiaAccountUi();
+ explicit SalutAccountUi(QObject *parent = 0);
+ virtual ~SalutAccountUi();
virtual AbstractAccountParametersWidget
*mainOptionsWidget(ParameterEditModel *model,
@@ -40,7 +40,7 @@ public:
QWidget *parent = 0) const;
private:
- Q_DISABLE_COPY(RakiaAccountUi);
+ Q_DISABLE_COPY(SalutAccountUi);
};
#endif // header guard
diff --git a/rakia/rakia-main-options-widget.cpp b/salut/salut-advanced-options-widget.cpp
similarity index 57%
copy from rakia/rakia-main-options-widget.cpp
copy to salut/salut-advanced-options-widget.cpp
index c6ef831..02314a4 100644
--- a/rakia/rakia-main-options-widget.cpp
+++ b/salut/salut-advanced-options-widget.cpp
@@ -18,35 +18,29 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "rakia-main-options-widget.h"
+#include "salut-advanced-options-widget.h"
#include <KCMTelepathyAccounts/ParameterEditModel>
#include <KDebug>
-#include <KUser>
-RakiaMainOptionsWidget::RakiaMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
+SalutAdvancedOptionsWidget::SalutAdvancedOptionsWidget(ParameterEditModel* model, QWidget* parent)
: AbstractAccountParametersWidget(model, parent)
{
+ kDebug();
+
// Set up the UI.
- m_ui = new Ui::RakiaMainOptionsWidget;
+ m_ui = new Ui::SalutAdvancedOptionsWidget;
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("published-name", QVariant::String, m_ui->pubnameLineEdit, m_ui->pubnameLabel);
+ handleParameter("email", QVariant::String, m_ui->emailLineEdit, m_ui->emailLabel);
+ handleParameter("jid", QVariant::String, m_ui->jidLineEdit, m_ui->jidLabel);
}
-RakiaMainOptionsWidget::~RakiaMainOptionsWidget()
+SalutAdvancedOptionsWidget::~SalutAdvancedOptionsWidget()
{
- kDebug();
-
delete m_ui;
}
+
+#include "salut-advanced-options-widget.moc"
diff --git a/rakia/rakia-advanced-options-widget.h b/salut/salut-advanced-options-widget.h
similarity index 68%
copy from rakia/rakia-advanced-options-widget.h
copy to salut/salut-advanced-options-widget.h
index a2f450f..7d3f2d9 100644
--- a/rakia/rakia-advanced-options-widget.h
+++ b/salut/salut-advanced-options-widget.h
@@ -18,29 +18,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_AO_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_RAKIA_AO_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_SALUT_AO_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_SALUT_AO_WIDGET_H
-#include "ui_rakia-advanced-options-widget.h"
+#include "ui_salut-advanced-options-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class RakiaAdvancedOptionsWidget : public AbstractAccountParametersWidget
+class SalutAdvancedOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit RakiaAdvancedOptionsWidget(ParameterEditModel *model,
+ explicit SalutAdvancedOptionsWidget(ParameterEditModel *model,
QWidget *parent = 0);
- virtual ~RakiaAdvancedOptionsWidget();
- virtual void submit();
-
-public slots:
- void updateKeepalive(int index);
+ virtual ~SalutAdvancedOptionsWidget();
private:
- Q_DISABLE_COPY(RakiaAdvancedOptionsWidget);
- Ui::RakiaAdvancedOptionsWidget *m_ui;
+ Q_DISABLE_COPY(SalutAdvancedOptionsWidget);
+ Ui::SalutAdvancedOptionsWidget *m_ui;
};
diff --git a/salut/salut-advanced-options-widget.ui b/salut/salut-advanced-options-widget.ui
new file mode 100644
index 0000000..de384ea
--- /dev/null
+++ b/salut/salut-advanced-options-widget.ui
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SalutAdvancedOptionsWidget</class>
+ <widget class="QWidget" name="SalutAdvancedOptionsWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>421</width>
+ <height>118</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="additionalGroupBox">
+ <property name="title">
+ <string>Additional Information</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_6">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="pubnameLabel">
+ <property name="text">
+ <string>Published Name:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="KLineEdit" name="pubnameLineEdit">
+ <property name="toolTip">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="emailLabel">
+ <property name="text">
+ <string>Email:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="KLineEdit" name="emailLineEdit">
+ <property name="toolTip">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="jidLabel">
+ <property name="text">
+ <string>Jabber ID:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="KLineEdit" name="jidLineEdit">
+ <property name="toolTip">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <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/salut/salut-main-options-widget.cpp
similarity index 58%
copy from rakia/rakia-main-options-widget.cpp
copy to salut/salut-main-options-widget.cpp
index c6ef831..27206ce 100644
--- a/rakia/rakia-main-options-widget.cpp
+++ b/salut/salut-main-options-widget.cpp
@@ -1,5 +1,5 @@
/*
- * This file is part of telepathy-accounts-kcm-plugins
+ * This file is part of telepathy-firstnames-kcm-plugins
*
* Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
*
@@ -18,33 +18,33 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "rakia-main-options-widget.h"
+#include "salut-main-options-widget.h"
#include <KCMTelepathyAccounts/ParameterEditModel>
#include <KDebug>
#include <KUser>
-RakiaMainOptionsWidget::RakiaMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
+SalutMainOptionsWidget::SalutMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
// Set up the UI.
- m_ui = new Ui::RakiaMainOptionsWidget;
+ m_ui = new Ui::SalutMainOptionsWidget;
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);
+ handleParameter("first-name", QVariant::String, m_ui->firstnameLineEdit, m_ui->firstnameLabel);
+ handleParameter("last-name", QVariant::String, m_ui->lastnameLineEdit, m_ui->lastnameLabel);
+ handleParameter("nickname", QVariant::String, m_ui->nicknameLineEdit, m_ui->nicknameLabel);
- // 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()) {
+ // if the first- and last-name are empty on startup we add them based on
+ // the current users full name
+ if(m_ui->firstnameLineEdit->text().isEmpty()) {
KUser user = KUser();
- m_ui->aliasLineEdit->setText(user.property(KUser::FullName).toString());
+ m_ui->nicknameLineEdit->setText(user.property(KUser::FullName).toString());
}
}
-RakiaMainOptionsWidget::~RakiaMainOptionsWidget()
+SalutMainOptionsWidget::~SalutMainOptionsWidget()
{
kDebug();
diff --git a/rakia/rakia-main-options-widget.h b/salut/salut-main-options-widget.h
similarity index 72%
copy from rakia/rakia-main-options-widget.h
copy to salut/salut-main-options-widget.h
index bd1291b..ab51e19 100644
--- a/rakia/rakia-main-options-widget.h
+++ b/salut/salut-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_SALUT_ACCOUNT_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_SALUT_ACCOUNT_PARAMETERS_WIDGET_H
-#include "ui_rakia-main-options-widget.h"
+#include "ui_salut-main-options-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class RakiaMainOptionsWidget : public AbstractAccountParametersWidget
+class SalutMainOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit RakiaMainOptionsWidget(ParameterEditModel *model,
+ explicit SalutMainOptionsWidget(ParameterEditModel *model,
QWidget *parent = 0);
- virtual ~RakiaMainOptionsWidget();
+ virtual ~SalutMainOptionsWidget();
private:
- Q_DISABLE_COPY(RakiaMainOptionsWidget);
- Ui::RakiaMainOptionsWidget *m_ui;
+ Q_DISABLE_COPY(SalutMainOptionsWidget);
+ Ui::SalutMainOptionsWidget *m_ui;
};
#endif // header guard
diff --git a/gabble/main-options-widget.ui b/salut/salut-main-options-widget.ui
similarity index 60%
copy from gabble/main-options-widget.ui
copy to salut/salut-main-options-widget.ui
index c3d6d30..9aa3174 100644
--- a/gabble/main-options-widget.ui
+++ b/salut/salut-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>SalutMainOptionsWidget</class>
+ <widget class="QWidget" name="SalutMainOptionsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
- <height>62</height>
+ <height>84</height>
</rect>
</property>
<property name="windowTitle">
@@ -16,39 +16,45 @@
<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">
+ <widget class="QLabel" name="firstnameLabel">
<property name="text">
- <string>Jabber ID:</string>
+ <string>First Name:</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="firstnameLineEdit"/>
+ </item>
<item row="1" column="0">
- <widget class="QLabel" name="passwordLabel">
+ <widget class="QLabel" name="lastnameLabel">
<property name="text">
- <string>Password:</string>
+ <string>Last Name:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="KLineEdit" name="lastnameLineEdit"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="nicknameLabel">
+ <property name="text">
+ <string>Nickname:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="KLineEdit" name="nicknameLineEdit" />
+ </item>
</layout>
</item>
</layout>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list