[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/16.04.2-1-16-gc80b083

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 10 16:59:16 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=5d56c10

The following commit has been merged in the master branch:
commit 5d56c106ad2a47822507bc9dcd27df83fe8ea756
Author: Björn Bidar <theodorstormgrade at gmail.com>
Date:   Wed Jun 29 21:31:17 2016 +0100

    added support for skypeweb
    
    added support for skypeweb
    
    REVIEW: 128303
---
 ....service.in => ktp-haze-skypeweb-im.service.in} |  8 ++++----
 ...e.provider.in => ktp-haze-skypeweb.provider.in} |  8 ++++----
 plugins/haze/CMakeLists.txt                        |  3 +++
 plugins/haze/haze-account-ui-plugin.cpp            |  4 ++++
 .../haze-skypeweb-account.cpp}                     | 23 ++++++++++++++--------
 .../haze-skypeweb-account.h}                       | 17 ++++++++--------
 .../skypeweb-options-widget.cpp}                   | 15 +++++++-------
 ...-options-widget.h => skypeweb-options-widget.h} | 18 ++++++++---------
 ...ptions-widget.ui => skypeweb-options-widget.ui} |  6 +++---
 src/KCMTelepathyAccounts/dictionary.cpp            |  1 +
 10 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/data/kaccounts/ktp-haze-icq-im.service.in b/data/kaccounts/ktp-haze-skypeweb-im.service.in
similarity index 76%
copy from data/kaccounts/ktp-haze-icq-im.service.in
copy to data/kaccounts/ktp-haze-skypeweb-im.service.in
index b085387..4256bf3 100644
--- a/data/kaccounts/ktp-haze-icq-im.service.in
+++ b/data/kaccounts/ktp-haze-skypeweb-im.service.in
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<service id="ktp-haze-icq-im">
+<service id="ktp-haze-skypeweb-im">
   <type>IM</type>
   <!-- ICQ Chat - Service name being displayed as a checkbox label to enable/disable this service -->
   <_name>Chat</_name>
-  <icon>im-icq</icon>
-  <provider>ktp-haze-icq</provider>
+  <icon>im-skype</icon>
+  <provider>ktp-haze-skypeweb</provider>
   <translations>kaccounts-providers</translations>
 
   <template>
       <group name="telepathy">
           <setting name="manager">haze</setting>
-          <setting name="protocol">icq</setting>
+          <setting name="protocol">skypeweb</setting>
       </group>
       <group name="auth">
           <setting name="method">password</setting>
diff --git a/data/kaccounts/disabled/ktp-haze-steam-mobile.provider.in b/data/kaccounts/ktp-haze-skypeweb.provider.in
similarity index 61%
copy from data/kaccounts/disabled/ktp-haze-steam-mobile.provider.in
copy to data/kaccounts/ktp-haze-skypeweb.provider.in
index c1a24a1..61fae7c 100644
--- a/data/kaccounts/disabled/ktp-haze-steam-mobile.provider.in
+++ b/data/kaccounts/ktp-haze-skypeweb.provider.in
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<provider id="ktp-haze-steam-mobile">
-    <_name>Steam Chat</_name>
-    <icon>input-gaming</icon>
+<provider id="ktp-haze-skypeweb">
+    <_name>Skype</_name>
+    <icon>im-skype</icon>
     <!-- Tooltip text appearing over the button to create this type of account -->
-    <_description>Steam Chat account</_description>
+    <_description>Chat account in the Skype network</_description>
     <translations>kaccounts-providers</translations>
     <plugin>ktpaccountskcm_plugin_kaccounts</plugin>
 </provider>
diff --git a/plugins/haze/CMakeLists.txt b/plugins/haze/CMakeLists.txt
index b0a42eb..1545a4d 100644
--- a/plugins/haze/CMakeLists.txt
+++ b/plugins/haze/CMakeLists.txt
@@ -33,6 +33,8 @@ set (ktpaccountskcm_plugin_haze_SRCS
      haze-sipe-account.cpp
      sipe-main-options-widget.cpp
      sipe-advanced-settings-widget.cpp
+     skypeweb-options-widget.cpp
+     haze-skypeweb-account.cpp
 )
 
 ki18n_wrap_ui (ktpaccountskcm_plugin_haze_SRCS
@@ -52,6 +54,7 @@ ki18n_wrap_ui (ktpaccountskcm_plugin_haze_SRCS
                    steam-main-options-widget.ui
                    sipe-main-options-widget.ui
                    sipe-advanced-settings-widget.ui
+                   skypeweb-options-widget.ui
 )
 
 add_library (ktpaccountskcm_plugin_haze MODULE
diff --git a/plugins/haze/haze-account-ui-plugin.cpp b/plugins/haze/haze-account-ui-plugin.cpp
index 102e139..5fef11e 100644
--- a/plugins/haze/haze-account-ui-plugin.cpp
+++ b/plugins/haze/haze-account-ui-plugin.cpp
@@ -21,6 +21,7 @@
 #include "haze-account-ui-plugin.h"
 
 #include "haze-icq-account.h"
+#include "haze-skypeweb-account.h"
 #include "haze-myspaceim-account-ui.h"
 #include "haze-skype-account-ui.h"
 #include "haze-yahoo-account.h"
@@ -47,6 +48,7 @@ HazeAccountUiPlugin::HazeAccountUiPlugin(QObject *parent, const QVariantList &)
     registerProvidedProtocol(QLatin1String("haze"), QLatin1String("groupwise"));
     registerProvidedProtocol(QLatin1String("haze"), QLatin1String("steam-mobile"));
     registerProvidedProtocol(QLatin1String("haze"), QLatin1String("sipe"));
+    registerProvidedProtocol(QLatin1String("haze"), QLatin1String("skypeweb"));
 }
 
 HazeAccountUiPlugin::~HazeAccountUiPlugin()
@@ -60,6 +62,8 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
     if (connectionManager == QLatin1String("haze")) {
         if (protocol == QLatin1String("icq")) {
             return new HazeIcqAccountUi;
+        } else if (protocol == QLatin1String("skypeweb")) {
+            return new HazeSkypeWebAccountUi;
         } else if (protocol == QLatin1String("myspace")) {
             return new HazeMySpaceIMAccountUi;
         } else if (protocol == QLatin1String("bigbrownchunx-skype-dbus")) {
diff --git a/plugins/butterfly/butterfly-account-ui.cpp b/plugins/haze/haze-skypeweb-account.cpp
similarity index 69%
copy from plugins/butterfly/butterfly-account-ui.cpp
copy to plugins/haze/haze-skypeweb-account.cpp
index bacc148..7ab3b02 100644
--- a/plugins/butterfly/butterfly-account-ui.cpp
+++ b/plugins/haze/haze-skypeweb-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) 2016 Björn Bidar <theodorstormgrade 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,35 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "butterfly-account-ui.h"
-#include "main-options-widget.h"
+#include "haze-skypeweb-account.h"
+
+#include "skypeweb-options-widget.h"
 
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
 
-ButterflyAccountUi::ButterflyAccountUi(QObject *parent)
+HazeSkypeWebAccountUi::HazeSkypeWebAccountUi(QObject *parent)
  : AbstractAccountUi(parent)
 {
     // Register supported parameters
     registerSupportedParameter(QLatin1String("account"), QVariant::String);
     registerSupportedParameter(QLatin1String("password"), QVariant::String);
+
 }
 
-ButterflyAccountUi::~ButterflyAccountUi()
+HazeSkypeWebAccountUi::~HazeSkypeWebAccountUi()
 {
 }
 
-AbstractAccountParametersWidget *ButterflyAccountUi::mainOptionsWidget(
+AbstractAccountParametersWidget *HazeSkypeWebAccountUi::mainOptionsWidget(
         ParameterEditModel *model,
         QWidget *parent) const
 {
-    return new MainOptionsWidget(model, parent);
+    return new SkypeWebOptionsWidget(model, parent);
 }
 
-#include "butterfly-account-ui.moc"
+bool HazeSkypeWebAccountUi::hasAdvancedOptionsWidget() const
+{
+    return false;
+}
+  
+#include "haze-skypeweb-account.moc"
diff --git a/plugins/morse/telegram-account-ui.h b/plugins/haze/haze-skypeweb-account.h
similarity index 71%
copy from plugins/morse/telegram-account-ui.h
copy to plugins/haze/haze-skypeweb-account.h
index 1de3735..63064b4 100644
--- a/plugins/morse/telegram-account-ui.h
+++ b/plugins/haze/haze-skypeweb-account.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of telepathy-accounts-kcm
  *
- * Copyright (C) 2014 David Edmundson <davidedmundson at kde.org>
+ * Copyright (C) 2016 Björn Bidar <theodorstormgrade 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,26 @@
  * 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_SKYPEWEB_ACCOUNT_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPEWEB_ACCOUNT_H
 
 #include <KCMTelepathyAccounts/AbstractAccountUi>
 
-class TelegramAccountUi : public AbstractAccountUi
+class HazeSkypeWebAccountUi : public AbstractAccountUi
 {
     Q_OBJECT
 
 public:
-    explicit TelegramAccountUi(QObject *parent = 0);
-    virtual ~TelegramAccountUi();
+    explicit HazeSkypeWebAccountUi(QObject *parent = 0);
+    virtual ~HazeSkypeWebAccountUi();
 
     virtual AbstractAccountParametersWidget
               *mainOptionsWidget(ParameterEditModel *model,
                                  QWidget *parent = 0) const;
+    virtual bool hasAdvancedOptionsWidget() const;
+
 private:
-    Q_DISABLE_COPY(TelegramAccountUi);
+    Q_DISABLE_COPY(HazeSkypeWebAccountUi);
 };
 
-
 #endif // header guard
diff --git a/plugins/butterfly/main-options-widget.cpp b/plugins/haze/skypeweb-options-widget.cpp
similarity index 78%
copy from plugins/butterfly/main-options-widget.cpp
copy to plugins/haze/skypeweb-options-widget.cpp
index d787b07..6f4a8d8 100644
--- a/plugins/butterfly/main-options-widget.cpp
+++ b/plugins/haze/skypeweb-options-widget.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of telepathy-accounts-kcm
  *
- * Copyright (C) 2009 Collabora Ltd. <info at collabora.com>
+ * Copyright (C) 2016 Björn Bidar <theodorstormgrade 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,30 +18,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "main-options-widget.h"
+#include "skypeweb-options-widget.h"
 
-MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
+SkypeWebOptionsWidget::SkypeWebOptionsWidget(ParameterEditModel *model,
                                      QWidget *parent)
  : AbstractAccountParametersWidget(model, parent)
 {
     // Set up the UI.
-    m_ui = new Ui::MainOptionsWidget;
+    m_ui = new Ui::SkypeWebOptionsWidget;
     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);
-
     QTimer::singleShot(0, m_ui->accountLineEdit, SLOT(setFocus()));
 }
 
-MainOptionsWidget::~MainOptionsWidget()
+SkypeWebOptionsWidget::~SkypeWebOptionsWidget()
 {
     delete m_ui;
 }
 
-QString MainOptionsWidget::defaultDisplayName() const
+QString SkypeWebOptionsWidget::defaultDisplayName() const
 {
     return m_ui->accountLineEdit->text();
 }
 
-#include "main-options-widget.moc"
+#include "skypeweb-options-widget.moc"
diff --git a/plugins/haze/icq-main-options-widget.h b/plugins/haze/skypeweb-options-widget.h
similarity index 66%
copy from plugins/haze/icq-main-options-widget.h
copy to plugins/haze/skypeweb-options-widget.h
index 56a197d..f7738d6 100644
--- a/plugins/haze/icq-main-options-widget.h
+++ b/plugins/haze/skypeweb-options-widget.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of telepathy-accounts-kcm
  *
- * Copyright (C) 2011 Dominik Schmidt <kde at dominik-schmidt.de>
+ * Copyright (C) 2016 Björn Bidar <theodorstormgrade 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_HAZE_ICQ_ACCOUNT_PARAMETERS_WIDGET_H
-#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_ICQ_ACCOUNT_PARAMETERS_WIDGET_H
+#ifndef KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPEWEB_ACCOUNT_PARAMETERS_WIDGET_H
+#define KCMTELEPATHYACCOUNTS_PLUGIN_HAZE_SKYPEWEB_ACCOUNT_PARAMETERS_WIDGET_H
 
-#include "ui_icq-main-options-widget.h"
+#include "ui_skypeweb-options-widget.h"
 
 #include <KCMTelepathyAccounts/AbstractAccountParametersWidget>
 
-class IcqMainOptionsWidget : public AbstractAccountParametersWidget
+class SkypeWebOptionsWidget : public AbstractAccountParametersWidget
 {
     Q_OBJECT
 public:
-    explicit IcqMainOptionsWidget(ParameterEditModel *model,
+    explicit SkypeWebOptionsWidget(ParameterEditModel *model,
                                   QWidget *parent = 0);
-    virtual ~IcqMainOptionsWidget();
+    virtual ~SkypeWebOptionsWidget();
 
     virtual QString defaultDisplayName() const;
 private:
-    Q_DISABLE_COPY(IcqMainOptionsWidget);
-    Ui::IcqMainOptionsWidget *m_ui;
+    Q_DISABLE_COPY(SkypeWebOptionsWidget);
+    Ui::SkypeWebOptionsWidget *m_ui;
 };
 
 #endif // header guard
diff --git a/plugins/haze/icq-main-options-widget.ui b/plugins/haze/skypeweb-options-widget.ui
similarity index 92%
copy from plugins/haze/icq-main-options-widget.ui
copy to plugins/haze/skypeweb-options-widget.ui
index ebfe188..989becc 100644
--- a/plugins/haze/icq-main-options-widget.ui
+++ b/plugins/haze/skypeweb-options-widget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>IcqMainOptionsWidget</class>
- <widget class="QWidget" name="IcqMainOptionsWidget">
+ <class>SkypeWebOptionsWidget</class>
+ <widget class="QWidget" name="SkypeWebOptionsWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -31,7 +31,7 @@
      <item row="0" column="0">
       <widget class="QLabel" name="accountLabel">
        <property name="text">
-        <string>UIN:</string>
+        <string>Name:</string>
        </property>
       </widget>
      </item>
diff --git a/src/KCMTelepathyAccounts/dictionary.cpp b/src/KCMTelepathyAccounts/dictionary.cpp
index 2dab8a1..1ef9df2 100644
--- a/src/KCMTelepathyAccounts/dictionary.cpp
+++ b/src/KCMTelepathyAccounts/dictionary.cpp
@@ -60,6 +60,7 @@ Dictionary::Dictionary()
     m_strings.insert(QLatin1String("google-talk"), i18n("Google Talk"));
     m_strings.insert(QLatin1String("groupwise"), i18n("Novell Groupwise"));
     m_strings.insert(QLatin1String("icq"), i18n("ICQ"));
+    m_strings.insert(QLatin1String("skypeweb"), i18n("Skype"));
     m_strings.insert(QLatin1String("irc"), i18n("Internet Relay Chat"));
     m_strings.insert(QLatin1String("jabber"), i18n("Jabber/XMPP"));
     m_strings.insert(QLatin1String("local-xmpp"), i18n("Bonjour/Salut"));

-- 
ktp-accounts-kcm packaging



More information about the pkg-kde-commits mailing list