Merge lp:~diegosarmentero/ubuntu-purchase-service/purchase-client-plugin into lp:ubuntu-purchase-service

[Diego Sarmentero]

- Add purchase client plugin, to communicate and listen to signals from the purchase dbus service

[lp:~diegosarmentero/ubuntu-purchase-service/purchase-client-plugin]

5. By Diego Sarmentero on 2013-12-10

moving into source folder

6. By Diego Sarmentero on 2013-12-10

fixing .pro identation

7. By Diego Sarmentero on 2013-12-10

merge

8. By Diego Sarmentero on 2013-12-10

merge

9. By Diego Sarmentero on 2013-12-10

merge

10. By Diego Sarmentero on 2013-12-10

fixing .pro and merge

[dobey (dobey)]

review: Approve

=== modified file 'purchaseservice.pro'
--- purchaseservice.pro	2013-12-10 13:51:11 +0000
+++ purchaseservice.pro	2013-12-10 13:51:11 +0000
@@ -9,11 +9,13 @@
 # Input
 SOURCES += \
     src/purchaseservice_plugin.cpp \
-    src/ubuntupurchase.cpp
+    src/ubuntupurchase.cpp \
+    src/purchaseclient.cpp
 
 HEADERS += \
     src/purchaseservice_plugin.h \
-    src/ubuntupurchase.h
+    src/ubuntupurchase.h \
+    src/purchaseclient.h
 
 system("cd service && ./generate_adaptors.sh")
 

=== modified file 'service/generate_adaptors.sh'
--- service/generate_adaptors.sh	2013-12-10 13:51:11 +0000
+++ service/generate_adaptors.sh	2013-12-10 13:51:11 +0000
@@ -1,4 +1,7 @@
 echo "Generating adaptors from DBus xml definitions:"
+echo "PurchaseServiceClient..."
+qdbusxml2cpp -v -c PurchaseServiceClient -p purchase_service_client.h:purchase_service_client.cpp com.canonical.Purchase.xml
+echo "generated"
 
 echo "PurchaseServiceAdaptor..."
 qdbusxml2cpp -c PurchaseServiceAdaptor -a purchase_service_adaptor.h:purchase_service_adaptor.cpp com.canonical.Purchase.xml

=== added file 'src/purchaseclient.cpp'
--- src/purchaseclient.cpp	1970-01-01 00:00:00 +0000
+++ src/purchaseclient.cpp	2013-12-10 13:51:11 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program 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
+ * 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "purchaseclient.h"
+#include <QDebug>
+
+namespace UbuntuPurchases {
+
+PurchaseClient::PurchaseClient(QQuickItem *parent) :
+    QQuickItem(parent)
+{
+    this->m_client = new PurchaseServiceClient("com.canonical.Purchase", "/", QDBusConnection::sessionBus(), 0);
+
+    QObject::connect(this->m_client, &PurchaseServiceClient::failure, this, &PurchaseClient::purchaseFailed);
+    QObject::connect(this->m_client, &PurchaseServiceClient::success, this, &PurchaseClient::purchaseSucceeded);
+}
+
+PurchaseClient::~PurchaseClient()
+{
+    delete this->m_client;
+}
+
+void PurchaseClient::purchaseItem(const QVariantMap id)
+{
+    this->m_client->purchase(id);
+}
+
+void PurchaseClient::purchaseFailed(const QString &packageName)
+{
+    Q_EMIT this->failed(packageName);
+}
+
+void PurchaseClient::purchaseSucceeded(const QString &packageName)
+{
+    Q_EMIT this->succeeded(packageName);
+}
+
+}

=== added file 'src/purchaseclient.h'
--- src/purchaseclient.h	1970-01-01 00:00:00 +0000
+++ src/purchaseclient.h	2013-12-10 13:51:11 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program 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
+ * 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef PURCHASECLIENT_H
+#define PURCHASECLIENT_H
+
+#include <QQuickItem>
+#include <QVariant>
+#include "service/purchase_service_client.h"
+
+namespace UbuntuPurchases {
+
+class PurchaseClient : public QQuickItem
+{
+    Q_OBJECT
+
+public:
+    PurchaseClient(QQuickItem *parent = 0);
+    ~PurchaseClient();
+
+    Q_INVOKABLE void purchaseItem(const QVariantMap id);
+
+Q_SIGNALS:
+    void failed(QString packageName);
+    void succeeded(QString packageName);
+
+private Q_SLOTS:
+    void purchaseFailed(const QString &packageName);
+    void purchaseSucceeded(const QString &packageName);
+
+private:
+    PurchaseServiceClient* m_client;
+
+};
+
+}
+
+QML_DECLARE_TYPE(UbuntuPurchases::PurchaseClient)
+
+#endif // PURCHASECLIENT_H

=== modified file 'src/purchaseservice_plugin.cpp'
--- src/purchaseservice_plugin.cpp	2013-12-10 13:51:11 +0000
+++ src/purchaseservice_plugin.cpp	2013-12-10 13:51:11 +0000
@@ -18,6 +18,7 @@
 
 #include "purchaseservice_plugin.h"
 #include "ubuntupurchase.h"
+#include "purchaseclient.h"
 
 #include <qqml.h>
 
@@ -27,6 +28,7 @@
 {
     // @uri Ubuntu.Purchase
     qmlRegisterType<UbuntuPurchase>(uri, 0, 1, "UbuntuPurchase");
+    qmlRegisterType<PurchaseClient>(uri, 0, 1, "PurchaseClient");
 }