[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:05:25 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=470db02
The following commit has been merged in the master branch:
commit 470db0270038cf715dca7951b562a28aa9b09882
Author: Maksim Melnikau <maxposedon at gmail.com>
Date: Mon Nov 25 00:37:56 2013 +0200
Add plugin for haze/sipe protocol support
REVIEWED-BY: David Edmundson
BUG: 328037
BUG: 326163
---
.../{gadugadu.profile => sipe-haze.profile} | 8 +-
plugins/haze/CMakeLists.txt | 5 +
plugins/haze/haze-account-ui-plugin.cpp | 6 +-
plugins/haze/haze-sipe-account.cpp | 71 +++++++++
.../{haze-aim-account.h => haze-sipe-account.h} | 14 +-
plugins/haze/sipe-advanced-settings-widget.cpp | 50 +++++++
.../sipe-advanced-settings-widget.h} | 21 ++-
plugins/haze/sipe-advanced-settings-widget.ui | 163 +++++++++++++++++++++
...ons-widget.cpp => sipe-main-options-widget.cpp} | 14 +-
.../sipe-main-options-widget.h} | 21 ++-
...tions-widget.ui => sipe-main-options-widget.ui} | 6 +-
11 files changed, 334 insertions(+), 45 deletions(-)
diff --git a/data/profiles/gadugadu.profile b/data/profiles/sipe-haze.profile
similarity index 50%
copy from data/profiles/gadugadu.profile
copy to data/profiles/sipe-haze.profile
index a2ecf99..edc0a75 100644
--- a/data/profiles/gadugadu.profile
+++ b/data/profiles/sipe-haze.profile
@@ -1,8 +1,8 @@
<service xmlns="http://telepathy.freedesktop.org/wiki/service-profile-v1"
- id="gadugadu"
+ id="sipe-haze"
type="IM"
manager="haze"
- protocol="gadugadu"
- icon="im-gadugadu">
- <name>Gadu-Gadu</name>
+ protocol="sipe"
+ icon="im-sipe">
+ <name>Office Communicator (via libpurple)</name>
</service>
diff --git a/plugins/haze/CMakeLists.txt b/plugins/haze/CMakeLists.txt
index 2564ce2..1995106 100644
--- a/plugins/haze/CMakeLists.txt
+++ b/plugins/haze/CMakeLists.txt
@@ -28,6 +28,9 @@ set (ktpaccountskcm_plugin_haze_SRCS
groupwise-advanced-settings-widget.cpp
haze-steam-account.cpp
steam-main-options-widget.cpp
+ haze-sipe-account.cpp
+ sipe-main-options-widget.cpp
+ sipe-advanced-settings-widget.cpp
)
kde4_add_ui_files (ktpaccountskcm_plugin_haze_SRCS
@@ -45,6 +48,8 @@ kde4_add_ui_files (ktpaccountskcm_plugin_haze_SRCS
groupwise-advanced-settings-widget.ui
groupwise-main-options-widget.ui
steam-main-options-widget.ui
+ sipe-main-options-widget.ui
+ sipe-advanced-settings-widget.ui
)
kde4_add_plugin (ktpaccountskcm_plugin_haze
diff --git a/plugins/haze/haze-account-ui-plugin.cpp b/plugins/haze/haze-account-ui-plugin.cpp
index 085cf3a..5ec07c2 100644
--- a/plugins/haze/haze-account-ui-plugin.cpp
+++ b/plugins/haze/haze-account-ui-plugin.cpp
@@ -28,6 +28,7 @@
#include "haze-msn-account.h"
#include "haze-groupwise-account.h"
#include "haze-steam-account.h"
+#include "haze-sipe-account.h"
#include <KPluginFactory>
@@ -45,6 +46,7 @@ HazeAccountUiPlugin::HazeAccountUiPlugin(QObject *parent, const QVariantList &)
registerProvidedProtocol(QLatin1String("haze"), QLatin1String("msn"));
registerProvidedProtocol(QLatin1String("haze"), QLatin1String("groupwise"));
registerProvidedProtocol(QLatin1String("haze"), QLatin1String("steam-mobile"));
+ registerProvidedProtocol(QLatin1String("haze"), QLatin1String("sipe"));
}
HazeAccountUiPlugin::~HazeAccountUiPlugin()
@@ -72,7 +74,9 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
return new HazeGroupWiseAccountUi;
} else if (protocol == QLatin1String("steam-mobile")) {
return new HazeSteamAccountUi;
- }
+ } else if (protocol == QLatin1String("sipe")) {
+ return new HazeSipeAccountUi;
+ }
}
return 0;
diff --git a/plugins/haze/haze-sipe-account.cpp b/plugins/haze/haze-sipe-account.cpp
new file mode 100644
index 0000000..1867ae5
--- /dev/null
+++ b/plugins/haze/haze-sipe-account.cpp
@@ -0,0 +1,71 @@
+/*
+ * This file is part of telepathy-accounts-kcm
+ *
+ * Copyright (C) 2013 Maksim Melnikau <maxposedon 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
+ * 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 "haze-sipe-account.h"
+
+#include "sipe-main-options-widget.h"
+#include "sipe-advanced-settings-widget.h"
+
+HazeSipeAccountUi::HazeSipeAccountUi(QObject *parent)
+ : AbstractAccountUi(parent)
+{
+ // Main Options
+ registerSupportedParameter(QLatin1String("account"), QVariant::String);
+ registerSupportedParameter(QLatin1String("password"), QVariant::String);
+
+ // Advanced Options
+ registerSupportedParameter(QLatin1String("login"), QVariant::String);
+ registerSupportedParameter(QLatin1String("server"), QVariant::String);
+ registerSupportedParameter(QLatin1String("transport"), QVariant::String);
+ registerSupportedParameter(QLatin1String("useragent"), QVariant::String);
+ registerSupportedParameter(QLatin1String("authentication"), QVariant::String);
+ registerSupportedParameter(QLatin1String("dont-publish"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("email-url"), QVariant::String);
+ registerSupportedParameter(QLatin1String("email"), QVariant::String);
+ registerSupportedParameter(QLatin1String("email-login"), QVariant::String);
+ registerSupportedParameter(QLatin1String("email-password"), QVariant::String);
+ registerSupportedParameter(QLatin1String("groupchat-user"), QVariant::String);
+}
+
+HazeSipeAccountUi::~HazeSipeAccountUi()
+{
+}
+
+AbstractAccountParametersWidget *HazeSipeAccountUi::mainOptionsWidget(
+ ParameterEditModel *model,
+ QWidget *parent) const
+{
+ return new SipeMainOptionsWidget(model, parent);
+}
+
+bool HazeSipeAccountUi::hasAdvancedOptionsWidget() const
+{
+ return true;
+}
+
+AbstractAccountParametersWidget *HazeSipeAccountUi::advancedOptionsWidget(
+ ParameterEditModel *model,
+ QWidget *parent) const
+{
+ AbstractAccountParametersWidget *sipeAdvancedSettingsWidget = new SipeAdvancedSettingsWidget(model, parent);
+ return sipeAdvancedSettingsWidget;
+}
+
+#include "haze-sipe-account.moc"
diff --git a/plugins/haze/haze-aim-account.h b/plugins/haze/haze-sipe-account.h
similarity index 78%
copy from plugins/haze/haze-aim-account.h
copy to plugins/haze/haze-sipe-account.h
index 39a0dd0..4440858 100644
--- a/plugins/haze/haze-aim-account.h
+++ b/plugins/haze/haze-sipe-account.h
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Lasath Fernando <kde at lasath.org>
+ * Copyright (C) 2013 Maksim Melnikau <maxposedon 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,18 +18,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_AIM_ACCOUNT_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_AIM_ACCOUNT_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SIPE_ACCOUNT_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SIPE_ACCOUNT_H
#include <KCMTelepathyAccounts/AbstractAccountUi>
-class HazeAimAccount : public AbstractAccountUi
+class HazeSipeAccountUi : public AbstractAccountUi
{
Q_OBJECT
public:
- explicit HazeAimAccount(QObject *parent = 0);
- virtual ~HazeAimAccount();
+ explicit HazeSipeAccountUi(QObject *parent = 0);
+ virtual ~HazeSipeAccountUi();
virtual AbstractAccountParametersWidget
*mainOptionsWidget(ParameterEditModel *model,
@@ -40,7 +40,7 @@ public:
QWidget *parent = 0) const;
private:
- Q_DISABLE_COPY(HazeAimAccount);
+ Q_DISABLE_COPY(HazeSipeAccountUi);
};
#endif // header guard
diff --git a/plugins/haze/sipe-advanced-settings-widget.cpp b/plugins/haze/sipe-advanced-settings-widget.cpp
new file mode 100644
index 0000000..cff730e
--- /dev/null
+++ b/plugins/haze/sipe-advanced-settings-widget.cpp
@@ -0,0 +1,50 @@
+/*
+ * This file is part of telepathy-accounts-kcm
+ *
+ * Copyright (C) 2013 Maksim Melnikau <maxposedon 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
+ * 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 "sipe-advanced-settings-widget.h"
+
+SipeAdvancedSettingsWidget::SipeAdvancedSettingsWidget(ParameterEditModel *model,
+ QWidget *parent)
+ : AbstractAccountParametersWidget(model, parent)
+{
+ // Set up the UI.
+ m_ui = new Ui::SipeAdvancedSettingsWidget;
+ m_ui->setupUi(this);
+
+ //server
+ handleParameter(QLatin1String("login"), QVariant::String, m_ui->loginLineEdit, m_ui->loginLabel);
+ handleParameter(QLatin1String("server"), QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
+ handleParameter(QLatin1String("transport"), QVariant::String, m_ui->transportLineEdit, m_ui->transportLabel);
+ handleParameter(QLatin1String("useragent"), QVariant::String, m_ui->useragentLineEdit, m_ui->useragentLabel);
+ handleParameter(QLatin1String("authentication"), QVariant::String, m_ui->authenticationLineEdit, m_ui->authenticationLabel);
+ handleParameter(QLatin1String("dont-publish"), QVariant::Bool, m_ui->dontpublishCheckBox, 0);
+ handleParameter(QLatin1String("email-url"), QVariant::String, m_ui->emailurlLineEdit, m_ui->emailurlLabel);
+ handleParameter(QLatin1String("email"), QVariant::String, m_ui->emailLineEdit, m_ui->emailLabel);
+ handleParameter(QLatin1String("email-login"), QVariant::String, m_ui->emailloginLineEdit, m_ui->emailloginLabel);
+ handleParameter(QLatin1String("email-password"), QVariant::String, m_ui->emailpasswordLineEdit, m_ui->emailpasswordLabel);
+ handleParameter(QLatin1String("groupchat-user"), QVariant::String, m_ui->groupchatuserLineEdit, m_ui->groupchatuserLabel);
+}
+
+SipeAdvancedSettingsWidget::~SipeAdvancedSettingsWidget()
+{
+ delete m_ui;
+}
+
+#include "sipe-advanced-settings-widget.moc"
diff --git a/plugins/gabble/main-options-widget.h b/plugins/haze/sipe-advanced-settings-widget.h
similarity index 63%
copy from plugins/gabble/main-options-widget.h
copy to plugins/haze/sipe-advanced-settings-widget.h
index 892da20..f1f049c 100644
--- a/plugins/gabble/main-options-widget.h
+++ b/plugins/haze/sipe-advanced-settings-widget.h
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2009 Collabora Ltd. <info at collabora.com>
+ * Copyright (C) 2013 Maksim Melnikau <maxposedon 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 +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_HAZE_SIPE_SERVER_SETTINGS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SIPE_SERVER_SETTINGS_WIDGET_H
-#include "ui_main-options-widget.h"
+#include "ui_sipe-advanced-settings-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class MainOptionsWidget : public AbstractAccountParametersWidget
+class SipeAdvancedSettingsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit MainOptionsWidget(ParameterEditModel *model,
- QWidget *parent = 0);
- virtual ~MainOptionsWidget();
+ explicit SipeAdvancedSettingsWidget(ParameterEditModel *model, QWidget *parent = 0);
+ virtual ~SipeAdvancedSettingsWidget();
- virtual QString defaultDisplayName() const;
private:
- Q_DISABLE_COPY(MainOptionsWidget);
- Ui::MainOptionsWidget *m_ui;
+ Q_DISABLE_COPY(SipeAdvancedSettingsWidget);
+ Ui::SipeAdvancedSettingsWidget *m_ui;
};
+
#endif // header guard
diff --git a/plugins/haze/sipe-advanced-settings-widget.ui b/plugins/haze/sipe-advanced-settings-widget.ui
new file mode 100644
index 0000000..890a80d
--- /dev/null
+++ b/plugins/haze/sipe-advanced-settings-widget.ui
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SipeAdvancedSettingsWidget</class>
+ <widget class="QWidget" name="SipeAdvancedSettingsWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>828</width>
+ <height>405</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Advanced Options</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <property name="margin">
+ <number>4</number>
+ </property>
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMinimumSize</enum>
+ </property>
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="loginLabel">
+ <property name="text">
+ <string>Login</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="KLineEdit" name="loginLineEdit"/>
+ </item>
+ <item row="1" column="1">
+ <widget class="KLineEdit" name="serverLineEdit"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="transportLabel">
+ <property name="text">
+ <string>Connection type</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="KLineEdit" name="transportLineEdit">
+ <property name="text">
+ <string>auto</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="useragentLabel">
+ <property name="text">
+ <string>User Agent</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="KLineEdit" name="useragentLineEdit"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="authenticationLabel">
+ <property name="text">
+ <string>Authentication scheme</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="KLineEdit" name="authenticationLineEdit">
+ <property name="text">
+ <string>ntlm</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="dontpublishLabel">
+ <property name="text">
+ <string>Don't publish my calendar information</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QCheckBox" name="dontpublishCheckBox"/>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="emailurlLabel">
+ <property name="text">
+ <string>Email services URL</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="KLineEdit" name="emailurlLineEdit"/>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLabel" name="emailLabel">
+ <property name="text">
+ <string>Email address</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
+ <widget class="KLineEdit" name="emailLineEdit"/>
+ </item>
+ <item row="8" column="0">
+ <widget class="QLabel" name="emailloginLabel">
+ <property name="text">
+ <string>Email login</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="KLineEdit" name="emailloginLineEdit"/>
+ </item>
+ <item row="9" column="0">
+ <widget class="QLabel" name="emailpasswordLabel">
+ <property name="text">
+ <string>Email password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="0">
+ <widget class="QLabel" name="groupchatuserLabel">
+ <property name="text">
+ <string>Group Chat Proxy</string>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="1">
+ <widget class="KLineEdit" name="groupchatuserLineEdit"/>
+ </item>
+ <item row="9" column="1">
+ <widget class="KLineEdit" name="emailpasswordLineEdit">
+ <property name="passwordMode">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="serverLabel">
+ <property name="text">
+ <string>Server[:Port]</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>KLineEdit</class>
+ <extends>QLineEdit</extends>
+ <header>klineedit.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/plugins/haze/groupwise-main-options-widget.cpp b/plugins/haze/sipe-main-options-widget.cpp
similarity index 74%
copy from plugins/haze/groupwise-main-options-widget.cpp
copy to plugins/haze/sipe-main-options-widget.cpp
index 7fe1a18..b04bc2e 100644
--- a/plugins/haze/groupwise-main-options-widget.cpp
+++ b/plugins/haze/sipe-main-options-widget.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2013 Daniel Cohen <analoguecolour at gmail.com>
+ * Copyright (C) 2013 Maksim Melnikau <maxposedon 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,29 +18,29 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "groupwise-main-options-widget.h"
+#include "sipe-main-options-widget.h"
#include <KCMTelepathyAccounts/ParameterEditModel>
-GroupWiseMainOptionsWidget::GroupWiseMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
+SipeMainOptionsWidget::SipeMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
// Set up the UI.
- m_ui = new Ui::GroupWiseMainOptionsWidget;
+ m_ui = new Ui::SipeMainOptionsWidget;
m_ui->setupUi(this);
handleParameter(QLatin1String("account"), QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
handleParameter(QLatin1String("password"), QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
}
-GroupWiseMainOptionsWidget::~GroupWiseMainOptionsWidget()
+SipeMainOptionsWidget::~SipeMainOptionsWidget()
{
delete m_ui;
}
-QString GroupWiseMainOptionsWidget::defaultDisplayName() const
+QString SipeMainOptionsWidget::defaultDisplayName() const
{
return m_ui->accountLineEdit->text();
}
-#include "groupwise-main-options-widget.moc"
+#include "sipe-main-options-widget.moc"
diff --git a/plugins/idle/main-options-widget.h b/plugins/haze/sipe-main-options-widget.h
similarity index 66%
copy from plugins/idle/main-options-widget.h
copy to plugins/haze/sipe-main-options-widget.h
index 64b9347..92e063b 100644
--- a/plugins/idle/main-options-widget.h
+++ b/plugins/haze/sipe-main-options-widget.h
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Lasse Liehu <lliehu at kolumbus.fi>
+ * Copyright (C) 2013 Maksim Melnikau <maxposedon 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,24 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_IDLE_ACCOUNT_MAIN_PARAMETERS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_IDLE_ACCOUNT_MAIN_PARAMETERS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SIPE_ACCOUNT_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SIPE_ACCOUNT_PARAMETERS_WIDGET_H
-#include "ui_main-options-widget.h"
+#include "ui_sipe-main-options-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class MainOptionsWidget : public AbstractAccountParametersWidget
+class SipeMainOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
-
public:
- explicit MainOptionsWidget(ParameterEditModel *model,
- QWidget *parent = 0);
- virtual ~MainOptionsWidget();
+ explicit SipeMainOptionsWidget(ParameterEditModel *model, QWidget *parent = 0);
+ virtual ~SipeMainOptionsWidget();
virtual QString defaultDisplayName() const;
private:
- Q_DISABLE_COPY(MainOptionsWidget);
- Ui::MainOptionsWidget *m_ui;
+ Q_DISABLE_COPY(SipeMainOptionsWidget);
+ Ui::SipeMainOptionsWidget *m_ui;
};
-
#endif // header guard
diff --git a/plugins/haze/myspaceim-main-options-widget.ui b/plugins/haze/sipe-main-options-widget.ui
similarity index 91%
copy from plugins/haze/myspaceim-main-options-widget.ui
copy to plugins/haze/sipe-main-options-widget.ui
index 0951f38..5025cec 100644
--- a/plugins/haze/myspaceim-main-options-widget.ui
+++ b/plugins/haze/sipe-main-options-widget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MySpaceIMMainOptionsWidget</class>
- <widget class="QWidget" name="MySpaceIMMainOptionsWidget">
+ <class>SipeMainOptionsWidget</class>
+ <widget class="QWidget" name="SipeMainOptionsWidget">
<property name="geometry">
<rect>
<x>0</x>
@@ -38,7 +38,7 @@
<item row="0" column="1">
<widget class="KLineEdit" name="accountLineEdit">
<property name="toolTip">
- <string>The MySpaceIM username is your email address.</string>
+ <string>The Sipe username is your email address.</string>
</property>
<property name="text">
<string/>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list