Merge lp:~ken-vandine/content-hub/lp1236932 into lp:~content-hub-team/content-hub/trunk

[Ken VanDine]

return a QVariantList from knownSourcesForType so the QML bindings can
expose a list of peers, fixes (LP: #1236932)

* return a QVariantList from knownSourcesForType so the QML bindings can
  expose a list of peers, fixes (LP: #1236932)

* Added id() and return name for name() instead of id

* Removed type property from ContentPeer, it isn't used and the cpp API doesn't provide it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:65
http://jenkins.qa.ubuntu.com/job/content-hub-ci/96/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-armhf-ci/95
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-armhf-ci/95/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-i386-ci/95

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/content-hub-ci/96/rebuild

review: Approve (continuous-integration)

[lp:~ken-vandine/content-hub/lp1236932]

66. By Ken VanDine on 2013-10-22

removed FIXME

67. By Ken VanDine on 2013-10-22

emit idChanged on setPeer

68. By Ken VanDine on 2013-10-22

removed the "type" property from ContentPeer, it isn't used and
com::ubuntu::content::Peer doesn't provide a type either.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/content-hub-ci/97/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-armhf-ci/96
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-armhf-ci/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-saucy-i386-ci/96

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/content-hub-ci/97/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

218 + Q_PROPERTY(QString id READ id NOTIFY idChanged)

Having a property called "id" is not the best idea, as it collides with QML "id"

review: Needs Fixing

[lp:~ken-vandine/content-hub/lp1236932]

69. By Ken VanDine on 2013-10-23

Renamed id to appId to avoid colliding with QML's id property

70. By Ken VanDine on 2013-10-23

revert changelog entry

[Günter Schwann (schwann)]

looks good to me

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/content-hub-ci/98/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/1

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/content-hub-ci/98/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/import-qml/import.qml'
--- examples/import-qml/import.qml	2013-10-01 16:55:39 +0000
+++ examples/import-qml/import.qml	2013-10-23 12:08:41 +0000
@@ -1,6 +1,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
 
 import Ubuntu.Content 0.1
 
@@ -12,41 +12,85 @@
 
     property list<ContentItem> importItems
     property var activeTransfer
-
-    Button {
-        id: importButton
-        text: "Import from default"
-        onClicked: {
-            var peer = ContentHub.defaultSourceForType(ContentType.Pictures);
-            var transfer = ContentHub.importContent(ContentType.Pictures, peer);
-            var store = ContentHub.defaultStoreForType(ContentType.Pictures);
-            console.log("Store is: " + store.uri);
-            if (transfer !== null) {
-                transfer.selectionType = ContentTransfer.Multiple;
-                transfer.setStore(store);
-                activeTransfer = transfer;
-                activeTransfer.start();
-            }
-        }
-    }
-
-    Button {
-        anchors.left: importButton.right
-        text: "Finalize import"
-        enabled: activeTransfer.state === ContentTransfer.Collected
-        onClicked: activeTransfer.finalize()
-    }
-
-    ListView {
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-            top: importButton.bottom
-        }
+    property var peers
+
+
+    function _importFromPeer(peer) {
+        /* if peer is null, choose default */
+        if (peer === null)
+            peer = ContentHub.defaultSourceForType(ContentType.Pictures);
+        var transfer = ContentHub.importContent(ContentType.Pictures, peer);
+        var store = ContentHub.defaultStoreForType(ContentType.Pictures);
+        console.log("Store is: " + store.uri);
+        if (transfer !== null) {
+            transfer.selectionType = ContentTransfer.Multiple;
+            transfer.setStore(store);
+            activeTransfer = transfer;
+            activeTransfer.start();
+        }
+    }
+
+    Component.onCompleted: {
+        peers = ContentHub.knownSourcesForType(ContentType.Pictures);
+    }
+
+    ListView {
+        id: peerList
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: importButtons.bottom
+        }
+        height: childrenRect.height
+        model: peers
+
+        delegate: ListItem.Standard {
+            text: modelData.name
+            control: Button {
+                text: "Import"
+                onClicked: {
+                    _importFromPeer(modelData);
+                }
+            }
+        }
+    }
+
+    ListItem.Empty {
+        id: importButtons
+        Button {
+            anchors {
+                left: parent.left
+                margins: units.gu(2)
+            }
+            text: "Import from default"
+            onClicked: {
+                _importFromPeer(null);
+            }
+        }
+
+        Button {
+            anchors {
+                right: parent.right
+                margins: units.gu(2)
+            }
+            text: "Finalize import"
+            enabled: activeTransfer.state === ContentTransfer.Collected
+            onClicked: activeTransfer.finalize()
+        }
+    }
+
+
+    ListView {
+        id: resultList
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: peerList.bottom
+        }
+        height: childrenRect.height
 
         model: importItems
-        delegate: Empty {
+        delegate: ListItem.Empty {
                 id: result
                 height: 128
                 UbuntuShape {

=== modified file 'import/Ubuntu/Content/contenthub.cpp'
--- import/Ubuntu/Content/contenthub.cpp	2013-10-01 16:55:39 +0000
+++ import/Ubuntu/Content/contenthub.cpp	2013-10-23 12:08:41 +0000
@@ -148,20 +148,19 @@
  *
  *  Returns all possible peers for the given content \a type
  */
-QList<ContentPeer *> ContentHub::knownSourcesForType(int type)
+QVariantList ContentHub::knownSourcesForType(int type)
 {
     qDebug() << Q_FUNC_INFO;
 
     const cuc::Type &hubType = ContentType::contentType2HubType(type);
     QVector<cuc::Peer> hubPeers = m_hub->known_peers_for_type(hubType);
 
-    QList<ContentPeer *> qmlPeers;
+    QVariantList qmlPeers;
     foreach (const cuc::Peer &hubPeer, hubPeers) {
         ContentPeer *qmlPeer = new ContentPeer(this);
         qmlPeer->setPeer(hubPeer);
-        qmlPeers.append(qmlPeer);
+        qmlPeers.append(QVariant::fromValue(qmlPeer));
     }
-
     return qmlPeers;
 }
 

=== modified file 'import/Ubuntu/Content/contenthub.h'
--- import/Ubuntu/Content/contenthub.h	2013-10-01 16:55:39 +0000
+++ import/Ubuntu/Content/contenthub.h	2013-10-23 12:08:41 +0000
@@ -48,7 +48,7 @@
     ContentHub(QObject *parent = nullptr);
 
     Q_INVOKABLE ContentPeer *defaultSourceForType(int type);
-    Q_INVOKABLE QList<ContentPeer *> knownSourcesForType(int type);
+    Q_INVOKABLE QVariantList knownSourcesForType(int type);
 
     Q_INVOKABLE ContentStore *defaultStoreForType(int type);
 

=== modified file 'import/Ubuntu/Content/contentpeer.cpp'
--- import/Ubuntu/Content/contentpeer.cpp	2013-08-23 10:05:50 +0000
+++ import/Ubuntu/Content/contentpeer.cpp	2013-10-23 12:08:41 +0000
@@ -28,7 +28,7 @@
  *
  * FIXME add documentation
  *
- * See documentation for \ContentHub
+ * See documentation for ContentHub
  */
 
 namespace cuc = com::ubuntu::content;
@@ -43,29 +43,28 @@
 /*!
  * \qmlproperty string ContentPeer::name
  *
- * FIXME add documentation
+ * Returns user friendly name of the peer
  */
-const QString &ContentPeer::name() const
+QString ContentPeer::name()
 {
     qDebug() << Q_FUNC_INFO;
-    return m_peer.id();
+    return m_peer.name();
 }
 
 /*!
- * \qmlproperty string ContentPeer::type
+ * \qmlproperty string ContentPeer::appId
  *
- * FIXME add documentation
+ * Returns the Application id
  */
-const QString &ContentPeer::type() const
+const QString &ContentPeer::appId() const
 {
     qDebug() << Q_FUNC_INFO;
-    // FIXME return the type
     return m_peer.id();
 }
 
 /*!
  * \brief ContentPeer::peer
- * \return
+ * \internal
  */
 const com::ubuntu::content::Peer &ContentPeer::peer() const
 {
@@ -74,11 +73,11 @@
 
 /*!
  * \brief ContentPeer::setPeer
- * \param peer
+ * \internal
  */
 void ContentPeer::setPeer(const cuc::Peer &peer)
 {
     m_peer = peer;
     Q_EMIT nameChanged();
-    Q_EMIT typeChanged();
+    Q_EMIT appIdChanged();
 }

=== modified file 'import/Ubuntu/Content/contentpeer.h'
--- import/Ubuntu/Content/contentpeer.h	2013-08-23 07:48:15 +0000
+++ import/Ubuntu/Content/contentpeer.h	2013-10-23 12:08:41 +0000
@@ -26,20 +26,20 @@
 {
     Q_OBJECT
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
-    Q_PROPERTY(QString type READ type NOTIFY typeChanged)
+    Q_PROPERTY(QString appId READ appId NOTIFY appIdChanged)
 
 public:
     ContentPeer(QObject *parent = nullptr);
 
-    const QString &name() const;
-    const QString &type() const;
+    QString name();
+    const QString &appId() const;
 
     const com::ubuntu::content::Peer &peer() const;
     void setPeer(const com::ubuntu::content::Peer &peer);
 
 Q_SIGNALS:
     void nameChanged();
-    void typeChanged();
+    void appIdChanged();
 
 private:
     com::ubuntu::content::Peer m_peer;