[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:04:28 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=1452b8f
The following commit has been merged in the master branch:
commit 1452b8f22c3775c4ec7b276b8bc470e476cca27a
Author: Daniel Cohen <analoguecolour at gmail.com>
Date: Fri Jun 21 00:23:46 2013 +0100
Add UI for creating GroupWise Accounts
REVIEW: 111157
BUG: 321264
FIXED-IN: 0.7.0
DIGEST: Add interface into the AccountsKCM for creating Novell Groupwise IM Accounts
---
plugins/haze/CMakeLists.txt | 5 +++++
....cpp => groupwise-advanced-settings-widget.cpp} | 12 +++++-----
...dget.h => groupwise-advanced-settings-widget.h} | 18 +++++++--------
...et.ui => groupwise-advanced-settings-widget.ui} | 4 ++--
...idget.cpp => groupwise-main-options-widget.cpp} | 14 ++++++------
...ns-widget.h => groupwise-main-options-widget.h} | 18 +++++++--------
...-widget.ui => groupwise-main-options-widget.ui} | 10 ++++-----
plugins/haze/haze-account-ui-plugin.cpp | 6 ++++-
...m-account-ui.cpp => haze-groupwise-account.cpp} | 26 +++++++++++-----------
...skype-account-ui.h => haze-groupwise-account.h} | 14 ++++++------
10 files changed, 68 insertions(+), 59 deletions(-)
diff --git a/plugins/haze/CMakeLists.txt b/plugins/haze/CMakeLists.txt
index 0d78647..ebc28c6 100644
--- a/plugins/haze/CMakeLists.txt
+++ b/plugins/haze/CMakeLists.txt
@@ -23,6 +23,9 @@ set (ktpaccountskcm_plugin_haze_SRCS
aim-server-settings-widget.cpp
msn-main-options-widget.cpp
haze-msn-account.cpp
+ haze-groupwise-account.cpp
+ groupwise-main-options-widget.cpp
+ groupwise-advanced-settings-widget.cpp
)
kde4_add_ui_files (ktpaccountskcm_plugin_haze_SRCS
@@ -37,6 +40,8 @@ kde4_add_ui_files (ktpaccountskcm_plugin_haze_SRCS
aim-main-options-widget.ui
aim-server-settings-widget.ui
msn-main-options-widget.ui
+ groupwise-advanced-settings-widget.ui
+ groupwise-main-options-widget.ui
)
kde4_add_plugin (ktpaccountskcm_plugin_haze
diff --git a/plugins/haze/myspaceim-advanced-settings-widget.cpp b/plugins/haze/groupwise-advanced-settings-widget.cpp
similarity index 78%
copy from plugins/haze/myspaceim-advanced-settings-widget.cpp
copy to plugins/haze/groupwise-advanced-settings-widget.cpp
index 868db05..4de1bc4 100644
--- a/plugins/haze/myspaceim-advanced-settings-widget.cpp
+++ b/plugins/haze/groupwise-advanced-settings-widget.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
+ * Copyright (C) 2013 Daniel Cohen <analoguecolour 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,14 +18,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "myspaceim-advanced-settings-widget.h"
+#include "groupwise-advanced-settings-widget.h"
-MySpaceIMAdvancedSettingsWidget::MySpaceIMAdvancedSettingsWidget(ParameterEditModel *model,
+GroupWiseAdvancedSettingsWidget::GroupWiseAdvancedSettingsWidget(ParameterEditModel *model,
QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
// Set up the UI.
- m_ui = new Ui::MySpaceIMAdvancedSettingsWidget;
+ m_ui = new Ui::GroupWiseAdvancedSettingsWidget;
m_ui->setupUi(this);
//server
@@ -33,9 +33,9 @@ MySpaceIMAdvancedSettingsWidget::MySpaceIMAdvancedSettingsWidget(ParameterEditMo
handleParameter(QLatin1String("port"), QVariant::UInt, m_ui->portSpinBox, m_ui->portLabel);
}
-MySpaceIMAdvancedSettingsWidget::~MySpaceIMAdvancedSettingsWidget()
+GroupWiseAdvancedSettingsWidget::~GroupWiseAdvancedSettingsWidget()
{
delete m_ui;
}
-#include "myspaceim-advanced-settings-widget.moc"
+#include "groupwise-advanced-settings-widget.moc"
diff --git a/plugins/haze/myspaceim-advanced-settings-widget.h b/plugins/haze/groupwise-advanced-settings-widget.h
similarity index 65%
copy from plugins/haze/myspaceim-advanced-settings-widget.h
copy to plugins/haze/groupwise-advanced-settings-widget.h
index da6fbcb..7895f29 100644
--- a/plugins/haze/myspaceim-advanced-settings-widget.h
+++ b/plugins/haze/groupwise-advanced-settings-widget.h
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
+ * Copyright (C) 2013 Daniel Cohen <analoguecolour 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,24 +18,24 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_MYSPACEIM_SERVER_SETTINGS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_MYSPACEIM_SERVER_SETTINGS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_GROUPWISE_SERVER_SETTINGS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_GROUPWISE_SERVER_SETTINGS_WIDGET_H
-#include "ui_myspaceim-advanced-settings-widget.h"
+#include "ui_groupwise-advanced-settings-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class MySpaceIMAdvancedSettingsWidget : public AbstractAccountParametersWidget
+class GroupWiseAdvancedSettingsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit MySpaceIMAdvancedSettingsWidget(ParameterEditModel *model, QWidget *parent = 0);
- virtual ~MySpaceIMAdvancedSettingsWidget();
+ explicit GroupWiseAdvancedSettingsWidget(ParameterEditModel *model, QWidget *parent = 0);
+ virtual ~GroupWiseAdvancedSettingsWidget();
private:
- Q_DISABLE_COPY(MySpaceIMAdvancedSettingsWidget);
- Ui::MySpaceIMAdvancedSettingsWidget *m_ui;
+ Q_DISABLE_COPY(GroupWiseAdvancedSettingsWidget);
+ Ui::GroupWiseAdvancedSettingsWidget *m_ui;
};
diff --git a/plugins/haze/myspaceim-advanced-settings-widget.ui b/plugins/haze/groupwise-advanced-settings-widget.ui
similarity index 94%
copy from plugins/haze/myspaceim-advanced-settings-widget.ui
copy to plugins/haze/groupwise-advanced-settings-widget.ui
index a13c23d..5ae0923 100644
--- a/plugins/haze/myspaceim-advanced-settings-widget.ui
+++ b/plugins/haze/groupwise-advanced-settings-widget.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MySpaceIMAdvancedSettingsWidget</class>
- <widget class="QWidget" name="MySpaceIMAdvancedSettingsWidget">
+ <class>GroupWiseAdvancedSettingsWidget</class>
+ <widget class="QWidget" name="GroupWiseAdvancedSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/plugins/haze/myspaceim-main-options-widget.cpp b/plugins/haze/groupwise-main-options-widget.cpp
similarity index 76%
copy from plugins/haze/myspaceim-main-options-widget.cpp
copy to plugins/haze/groupwise-main-options-widget.cpp
index 063ca96..7fe1a18 100644
--- a/plugins/haze/myspaceim-main-options-widget.cpp
+++ b/plugins/haze/groupwise-main-options-widget.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
+ * Copyright (C) 2013 Daniel Cohen <analoguecolour 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 "myspaceim-main-options-widget.h"
+#include "groupwise-main-options-widget.h"
#include <KCMTelepathyAccounts/ParameterEditModel>
-MySpaceIMMainOptionsWidget::MySpaceIMMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
+GroupWiseMainOptionsWidget::GroupWiseMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
// Set up the UI.
- m_ui = new Ui::MySpaceIMMainOptionsWidget;
+ m_ui = new Ui::GroupWiseMainOptionsWidget;
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);
}
-MySpaceIMMainOptionsWidget::~MySpaceIMMainOptionsWidget()
+GroupWiseMainOptionsWidget::~GroupWiseMainOptionsWidget()
{
delete m_ui;
}
-QString MySpaceIMMainOptionsWidget::defaultDisplayName() const
+QString GroupWiseMainOptionsWidget::defaultDisplayName() const
{
return m_ui->accountLineEdit->text();
}
-#include "myspaceim-main-options-widget.moc"
+#include "groupwise-main-options-widget.moc"
diff --git a/plugins/haze/myspaceim-main-options-widget.h b/plugins/haze/groupwise-main-options-widget.h
similarity index 67%
copy from plugins/haze/myspaceim-main-options-widget.h
copy to plugins/haze/groupwise-main-options-widget.h
index 0a61cd7..f54ca2a 100644
--- a/plugins/haze/myspaceim-main-options-widget.h
+++ b/plugins/haze/groupwise-main-options-widget.h
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
+ * Copyright (C) 2013 Daniel Cohen <analoguecolour 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,24 +18,24 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_MYSPACEIM_ACCOUNT_PARAMETERS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_MYSPACEIM_ACCOUNT_PARAMETERS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_GROUPWISE_ACCOUNT_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_GROUPWISE_ACCOUNT_PARAMETERS_WIDGET_H
-#include "ui_myspaceim-main-options-widget.h"
+#include "ui_groupwise-main-options-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class MySpaceIMMainOptionsWidget : public AbstractAccountParametersWidget
+class GroupWiseMainOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit MySpaceIMMainOptionsWidget(ParameterEditModel *model, QWidget *parent = 0);
- virtual ~MySpaceIMMainOptionsWidget();
+ explicit GroupWiseMainOptionsWidget(ParameterEditModel *model, QWidget *parent = 0);
+ virtual ~GroupWiseMainOptionsWidget();
virtual QString defaultDisplayName() const;
private:
- Q_DISABLE_COPY(MySpaceIMMainOptionsWidget);
- Ui::MySpaceIMMainOptionsWidget *m_ui;
+ Q_DISABLE_COPY(GroupWiseMainOptionsWidget);
+ Ui::GroupWiseMainOptionsWidget *m_ui;
};
#endif // header guard
diff --git a/plugins/haze/myspaceim-main-options-widget.ui b/plugins/haze/groupwise-main-options-widget.ui
similarity index 89%
copy from plugins/haze/myspaceim-main-options-widget.ui
copy to plugins/haze/groupwise-main-options-widget.ui
index 0951f38..e7e0675 100644
--- a/plugins/haze/myspaceim-main-options-widget.ui
+++ b/plugins/haze/groupwise-main-options-widget.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MySpaceIMMainOptionsWidget</class>
- <widget class="QWidget" name="MySpaceIMMainOptionsWidget">
+ <class>GroupWiseMainOptionsWidget</class>
+ <widget class="QWidget" name="GroupWiseMainOptionsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
- <height>58</height>
+ <height>60</height>
</rect>
</property>
<property name="sizePolicy">
@@ -38,13 +38,13 @@
<item row="0" column="1">
<widget class="KLineEdit" name="accountLineEdit">
<property name="toolTip">
- <string>The MySpaceIM username is your email address.</string>
+ <string>The GroupWise username is your email address.</string>
</property>
<property name="text">
<string/>
</property>
<property name="clickMessage">
- <string>john at doe.com</string>
+ <string/>
</property>
</widget>
</item>
diff --git a/plugins/haze/haze-account-ui-plugin.cpp b/plugins/haze/haze-account-ui-plugin.cpp
index 8a4b241..e618518 100644
--- a/plugins/haze/haze-account-ui-plugin.cpp
+++ b/plugins/haze/haze-account-ui-plugin.cpp
@@ -26,6 +26,7 @@
#include "haze-yahoo-account.h"
#include "haze-aim-account.h"
#include "haze-msn-account.h"
+#include "haze-groupwise-account.h"
#include <KPluginFactory>
@@ -41,6 +42,7 @@ HazeAccountUiPlugin::HazeAccountUiPlugin(QObject *parent, const QVariantList &)
registerProvidedProtocol(QLatin1String("haze"), QLatin1String("yahoo"));
registerProvidedProtocol(QLatin1String("haze"), QLatin1String("aim"));
registerProvidedProtocol(QLatin1String("haze"), QLatin1String("msn"));
+ registerProvidedProtocol(QLatin1String("haze"), QLatin1String("groupwise"));
}
HazeAccountUiPlugin::~HazeAccountUiPlugin()
@@ -64,7 +66,9 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
return new HazeAimAccount;
} else if (protocol == QLatin1String("msn")) {
return new HazeMsnAccountUi;
- }
+ } else if (protocol == QLatin1String("groupwise")) {
+ return new HazeGroupWiseAccountUi;
+ }
}
return 0;
diff --git a/plugins/haze/haze-myspaceim-account-ui.cpp b/plugins/haze/haze-groupwise-account.cpp
similarity index 64%
copy from plugins/haze/haze-myspaceim-account-ui.cpp
copy to plugins/haze/haze-groupwise-account.cpp
index 3e95f93..4283f74 100644
--- a/plugins/haze/haze-myspaceim-account-ui.cpp
+++ b/plugins/haze/haze-groupwise-account.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
+ * Copyright (C) 2013 Daniel Cohen <analoguecolour 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,12 +18,12 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "haze-myspaceim-account-ui.h"
+#include "haze-groupwise-account.h"
-#include "myspaceim-main-options-widget.h"
-#include "myspaceim-advanced-settings-widget.h"
+#include "groupwise-main-options-widget.h"
+#include "groupwise-advanced-settings-widget.h"
-HazeMySpaceIMAccountUi::HazeMySpaceIMAccountUi(QObject *parent)
+HazeGroupWiseAccountUi::HazeGroupWiseAccountUi(QObject *parent)
: AbstractAccountUi(parent)
{
// Register supported parameters
@@ -36,28 +36,28 @@ HazeMySpaceIMAccountUi::HazeMySpaceIMAccountUi(QObject *parent)
registerSupportedParameter(QLatin1String("port"), QVariant::UInt);
}
-HazeMySpaceIMAccountUi::~HazeMySpaceIMAccountUi()
+HazeGroupWiseAccountUi::~HazeGroupWiseAccountUi()
{
}
-AbstractAccountParametersWidget *HazeMySpaceIMAccountUi::mainOptionsWidget(
+AbstractAccountParametersWidget *HazeGroupWiseAccountUi::mainOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
- return new MySpaceIMMainOptionsWidget(model, parent);
+ return new GroupWiseMainOptionsWidget(model, parent);
}
-bool HazeMySpaceIMAccountUi::hasAdvancedOptionsWidget() const
+bool HazeGroupWiseAccountUi::hasAdvancedOptionsWidget() const
{
return true;
}
-AbstractAccountParametersWidget *HazeMySpaceIMAccountUi::advancedOptionsWidget(
+AbstractAccountParametersWidget *HazeGroupWiseAccountUi::advancedOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
- AbstractAccountParametersWidget *myspaceimAdvancedSettingsWidget = new MySpaceIMAdvancedSettingsWidget(model, parent);
- return myspaceimAdvancedSettingsWidget;
+ AbstractAccountParametersWidget *groupwiseAdvancedSettingsWidget = new GroupWiseAdvancedSettingsWidget(model, parent);
+ return groupwiseAdvancedSettingsWidget;
}
-#include "haze-myspaceim-account-ui.moc"
+#include "haze-groupwise-account.moc"
diff --git a/plugins/haze/haze-skype-account-ui.h b/plugins/haze/haze-groupwise-account.h
similarity index 77%
copy from plugins/haze/haze-skype-account-ui.h
copy to plugins/haze/haze-groupwise-account.h
index dcfe9f2..bcfaed2 100644
--- a/plugins/haze/haze-skype-account-ui.h
+++ b/plugins/haze/haze-groupwise-account.h
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2011 Florian Reinhard <florian.reinhard at googlemail.com>
+ * Copyright (C) 2013 Daniel Cohen <analoguecolour 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_HAZE_SKYPE_ACCOUNT_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_ACCOUNT_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_GROUPWISE_ACCOUNT_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_GROUPWISE_ACCOUNT_H
#include <KCMTelepathyAccounts/AbstractAccountUi>
-class HazeSkypeAccountUi : public AbstractAccountUi
+class HazeGroupWiseAccountUi : public AbstractAccountUi
{
Q_OBJECT
public:
- explicit HazeSkypeAccountUi(QObject *parent = 0);
- virtual ~HazeSkypeAccountUi();
+ explicit HazeGroupWiseAccountUi(QObject *parent = 0);
+ virtual ~HazeGroupWiseAccountUi();
virtual AbstractAccountParametersWidget
*mainOptionsWidget(ParameterEditModel *model,
@@ -40,7 +40,7 @@ public:
QWidget *parent = 0) const;
private:
- Q_DISABLE_COPY(HazeSkypeAccountUi);
+ Q_DISABLE_COPY(HazeGroupWiseAccountUi);
};
#endif // header guard
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list