[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:41 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=6b7f876
The following commit has been merged in the master branch:
commit 6b7f8763f49e8d11e8980ffc550dce05ece54786
Author: Daniel Cohen <analoguecolour at gmail.com>
Date: Thu Aug 8 01:01:20 2013 +0100
accounts-kcm gui code for steam plugin of libpurple
Gui code for accounts-kcm that gives the steam-mobile plugin of libpurple a native/shiny look. I Didn't include the https tickbox because it seems to not function.
REVIEW: 111727
---
data/profiles/{gadugadu.profile => steam.profile} | 8 ++---
plugins/haze/CMakeLists.txt | 3 ++
plugins/haze/haze-account-ui-plugin.cpp | 4 +++
.../haze-steam-account.cpp} | 25 ++++++-------
.../haze-steam-account.h} | 16 ++++-----
...ns-widget.cpp => steam-main-options-widget.cpp} | 13 +++----
...ptions-widget.h => steam-main-options-widget.h} | 18 +++++-----
...ions-widget.ui => steam-main-options-widget.ui} | 42 +++++++++++++++++-----
8 files changed, 81 insertions(+), 48 deletions(-)
diff --git a/data/profiles/gadugadu.profile b/data/profiles/steam.profile
similarity index 54%
copy from data/profiles/gadugadu.profile
copy to data/profiles/steam.profile
index a2ecf99..8690b4f 100644
--- a/data/profiles/gadugadu.profile
+++ b/data/profiles/steam.profile
@@ -1,8 +1,8 @@
<service xmlns="http://telepathy.freedesktop.org/wiki/service-profile-v1"
- id="gadugadu"
+ id="steam"
type="IM"
manager="haze"
- protocol="gadugadu"
- icon="im-gadugadu">
- <name>Gadu-Gadu</name>
+ protocol="steam-mobile"
+ icon="input-gaming">
+ <name>Steam Chat</name>
</service>
diff --git a/plugins/haze/CMakeLists.txt b/plugins/haze/CMakeLists.txt
index ebc28c6..2564ce2 100644
--- a/plugins/haze/CMakeLists.txt
+++ b/plugins/haze/CMakeLists.txt
@@ -26,6 +26,8 @@ set (ktpaccountskcm_plugin_haze_SRCS
haze-groupwise-account.cpp
groupwise-main-options-widget.cpp
groupwise-advanced-settings-widget.cpp
+ haze-steam-account.cpp
+ steam-main-options-widget.cpp
)
kde4_add_ui_files (ktpaccountskcm_plugin_haze_SRCS
@@ -42,6 +44,7 @@ kde4_add_ui_files (ktpaccountskcm_plugin_haze_SRCS
msn-main-options-widget.ui
groupwise-advanced-settings-widget.ui
groupwise-main-options-widget.ui
+ steam-main-options-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 e618518..085cf3a 100644
--- a/plugins/haze/haze-account-ui-plugin.cpp
+++ b/plugins/haze/haze-account-ui-plugin.cpp
@@ -27,6 +27,7 @@
#include "haze-aim-account.h"
#include "haze-msn-account.h"
#include "haze-groupwise-account.h"
+#include "haze-steam-account.h"
#include <KPluginFactory>
@@ -43,6 +44,7 @@ HazeAccountUiPlugin::HazeAccountUiPlugin(QObject *parent, const QVariantList &)
registerProvidedProtocol(QLatin1String("haze"), QLatin1String("aim"));
registerProvidedProtocol(QLatin1String("haze"), QLatin1String("msn"));
registerProvidedProtocol(QLatin1String("haze"), QLatin1String("groupwise"));
+ registerProvidedProtocol(QLatin1String("haze"), QLatin1String("steam-mobile"));
}
HazeAccountUiPlugin::~HazeAccountUiPlugin()
@@ -68,6 +70,8 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
return new HazeMsnAccountUi;
} else if (protocol == QLatin1String("groupwise")) {
return new HazeGroupWiseAccountUi;
+ } else if (protocol == QLatin1String("steam-mobile")) {
+ return new HazeSteamAccountUi;
}
}
diff --git a/plugins/butterfly/butterfly-account-ui.cpp b/plugins/haze/haze-steam-account.cpp
similarity index 60%
copy from plugins/butterfly/butterfly-account-ui.cpp
copy to plugins/haze/haze-steam-account.cpp
index bacc148..3330ffe 100644
--- a/plugins/butterfly/butterfly-account-ui.cpp
+++ b/plugins/haze/haze-steam-account.cpp
@@ -1,7 +1,7 @@
/*
* This file is part of telepathy-accounts-kcm
*
- * Copyright (C) 2009 Collabora Ltd. <info at collabora.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,28 +18,29 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "butterfly-account-ui.h"
-#include "main-options-widget.h"
+#include "haze-steam-account.h"
-#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
+#include "steam-main-options-widget.h"
-ButterflyAccountUi::ButterflyAccountUi(QObject *parent)
+HazeSteamAccountUi::HazeSteamAccountUi(QObject *parent)
: AbstractAccountUi(parent)
{
// Register supported parameters
- registerSupportedParameter(QLatin1String("account"), QVariant::String);
+ // Main Options
+ registerSupportedParameter(QLatin1String("account"), QVariant::String);
+ registerSupportedParameter(QLatin1String("steamguard"), QVariant::String);
registerSupportedParameter(QLatin1String("password"), QVariant::String);
}
-ButterflyAccountUi::~ButterflyAccountUi()
+HazeSteamAccountUi::~HazeSteamAccountUi()
{
}
-AbstractAccountParametersWidget *ButterflyAccountUi::mainOptionsWidget(
- ParameterEditModel *model,
- QWidget *parent) const
+AbstractAccountParametersWidget *HazeSteamAccountUi::mainOptionsWidget(
+ ParameterEditModel *model,
+ QWidget *parent) const
{
- return new MainOptionsWidget(model, parent);
+ return new SteamMainOptionsWidget(model, parent);
}
-#include "butterfly-account-ui.moc"
+#include "haze-steam-account.moc"
diff --git a/plugins/butterfly/butterfly-account-ui.h b/plugins/haze/haze-steam-account.h
similarity index 75%
copy from plugins/butterfly/butterfly-account-ui.h
copy to plugins/haze/haze-steam-account.h
index 1845570..d02c6a4 100644
--- a/plugins/butterfly/butterfly-account-ui.h
+++ b/plugins/haze/haze-steam-account.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 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,25 +18,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_BUTTERFLY_ACCOUNT_UI_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_BUTTERFLY_ACCOUNT_UI_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_STEAM_ACCOUNT_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_STEAM_ACCOUNT_H
#include <KCMTelepathyAccounts/AbstractAccountUi>
-class ButterflyAccountUi : public AbstractAccountUi
+class HazeSteamAccountUi : public AbstractAccountUi
{
Q_OBJECT
public:
- explicit ButterflyAccountUi(QObject *parent = 0);
- virtual ~ButterflyAccountUi();
+ explicit HazeSteamAccountUi(QObject *parent = 0);
+ virtual ~HazeSteamAccountUi();
virtual AbstractAccountParametersWidget
*mainOptionsWidget(ParameterEditModel *model,
QWidget *parent = 0) const;
+
private:
- Q_DISABLE_COPY(ButterflyAccountUi);
+ Q_DISABLE_COPY(HazeSteamAccountUi);
};
-
#endif // header guard
diff --git a/plugins/haze/groupwise-main-options-widget.cpp b/plugins/haze/steam-main-options-widget.cpp
similarity index 74%
copy from plugins/haze/groupwise-main-options-widget.cpp
copy to plugins/haze/steam-main-options-widget.cpp
index 7fe1a18..243b0dd 100644
--- a/plugins/haze/groupwise-main-options-widget.cpp
+++ b/plugins/haze/steam-main-options-widget.cpp
@@ -18,29 +18,30 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "groupwise-main-options-widget.h"
+#include "steam-main-options-widget.h"
#include <KCMTelepathyAccounts/ParameterEditModel>
-GroupWiseMainOptionsWidget::GroupWiseMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
+SteamMainOptionsWidget::SteamMainOptionsWidget(ParameterEditModel *model, QWidget *parent)
: AbstractAccountParametersWidget(model, parent)
{
// Set up the UI.
- m_ui = new Ui::GroupWiseMainOptionsWidget;
+ m_ui = new Ui::SteamMainOptionsWidget;
m_ui->setupUi(this);
handleParameter(QLatin1String("account"), QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+ handleParameter(QLatin1String("steam-guard-code"), QVariant::String, m_ui->steamguardEdit, m_ui->steamguardLabel);
handleParameter(QLatin1String("password"), QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
}
-GroupWiseMainOptionsWidget::~GroupWiseMainOptionsWidget()
+SteamMainOptionsWidget::~SteamMainOptionsWidget()
{
delete m_ui;
}
-QString GroupWiseMainOptionsWidget::defaultDisplayName() const
+QString SteamMainOptionsWidget::defaultDisplayName() const
{
return m_ui->accountLineEdit->text();
}
-#include "groupwise-main-options-widget.moc"
+#include "steam-main-options-widget.moc"
diff --git a/plugins/haze/skype-main-options-widget.h b/plugins/haze/steam-main-options-widget.h
similarity index 67%
copy from plugins/haze/skype-main-options-widget.h
copy to plugins/haze/steam-main-options-widget.h
index 4291d73..e4b7660 100644
--- a/plugins/haze/skype-main-options-widget.h
+++ b/plugins/haze/steam-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_SKYPE_ACCOUNT_PARAMETERS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPE_ACCOUNT_PARAMETERS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_STEAM_ACCOUNT_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_STEAM_ACCOUNT_PARAMETERS_WIDGET_H
-#include "ui_skype-main-options-widget.h"
+#include "ui_steam-main-options-widget.h"
#include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
-class SkypeMainOptionsWidget : public AbstractAccountParametersWidget
+class SteamMainOptionsWidget : public AbstractAccountParametersWidget
{
Q_OBJECT
public:
- explicit SkypeMainOptionsWidget(ParameterEditModel *model, QWidget *parent = 0);
- virtual ~SkypeMainOptionsWidget();
+ explicit SteamMainOptionsWidget(ParameterEditModel *model, QWidget *parent = 0);
+ virtual ~SteamMainOptionsWidget();
virtual QString defaultDisplayName() const;
private:
- Q_DISABLE_COPY(SkypeMainOptionsWidget);
- Ui::SkypeMainOptionsWidget *m_ui;
+ Q_DISABLE_COPY(SteamMainOptionsWidget);
+ Ui::SteamMainOptionsWidget *m_ui;
};
#endif // header guard
diff --git a/plugins/haze/groupwise-main-options-widget.ui b/plugins/haze/steam-main-options-widget.ui
similarity index 66%
copy from plugins/haze/groupwise-main-options-widget.ui
copy to plugins/haze/steam-main-options-widget.ui
index e7e0675..e3475e3 100644
--- a/plugins/haze/groupwise-main-options-widget.ui
+++ b/plugins/haze/steam-main-options-widget.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>GroupWiseMainOptionsWidget</class>
- <widget class="QWidget" name="GroupWiseMainOptionsWidget">
+ <class>SteamMainOptionsWidget</class>
+ <widget class="QWidget" name="SteamMainOptionsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>400</width>
- <height>60</height>
+ <width>389</width>
+ <height>131</height>
</rect>
</property>
<property name="sizePolicy">
@@ -37,9 +37,23 @@
</item>
<item row="0" column="1">
<widget class="KLineEdit" name="accountLineEdit">
- <property name="toolTip">
- <string>The GroupWise username is your email address.</string>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="clickMessage">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="steamguardLabel">
+ <property name="text">
+ <string>Steam Guard Code:</string>
</property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="KLineEdit" name="steamguardEdit">
<property name="text">
<string/>
</property>
@@ -48,6 +62,13 @@
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="KLineEdit" name="passwordLineEdit">
+ <property name="passwordMode">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
<item row="1" column="0">
<widget class="QLabel" name="passwordLabel">
<property name="text">
@@ -55,9 +76,12 @@
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="KLineEdit" name="passwordLineEdit">
- <property name="passwordMode">
+ <item row="3" column="1">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>The Steam Guard code will be emailed to you after attempting to login</string>
+ </property>
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list