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

[Ken VanDine]

allow ContentPeer to be creatable in QML, this makes it more obvious
how to deal with the list returned by knownSourcesForType.

allow ContentPeer to be creatable in QML, this makes it more obvious
how to deal with the list returned by knownSourcesForType.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

=== modified file 'examples/import-qml/import.qml'
--- examples/import-qml/import.qml	2013-10-22 17:36:14 +0000
+++ examples/import-qml/import.qml	2013-11-08 21:19:44 +0000
@@ -12,7 +12,7 @@
 
     property list<ContentItem> importItems
     property var activeTransfer
-    property var peers
+    property list<ContentPeer> peers
 
 
     function _importFromPeer(peer) {

=== modified file 'import/Ubuntu/Content/contenthub.cpp'
--- import/Ubuntu/Content/contenthub.cpp	2013-11-07 20:12:56 +0000
+++ import/Ubuntu/Content/contenthub.cpp	2013-11-08 21:19:44 +0000
@@ -149,6 +149,29 @@
  * \qmlmethod ContentHub::knownSourcesForType(ContentType)
  *
  *  Returns all possible peers for the given ContentType
+ *
+ * \qml
+ * import QtQuick 2.0
+ * import Ubuntu.Components 0.1
+ * import Ubuntu.Components.ListItems 0.1 as ListItem
+ * import Ubuntu.Content 0.1
+ *
+ * MainView {
+ *     property list<ContentPeer> peers
+ *
+ *     Component.onCompleted: {
+ *         peers = ContentHub.knownSourcesForType(ContentType.Pictures);
+ *     }
+ *     ListView {
+ *         anchors.fill: parent
+ *         height: childrenRect.height
+ *         model: peers
+ *         delegate: ListItem.Standard {
+ *             text: modelData.name
+ *         }
+ *     }
+ * }
+ * \endqml
  */
 QVariantList ContentHub::knownSourcesForType(int type)
 {

=== modified file 'import/Ubuntu/Content/contenthubplugin.cpp'
--- import/Ubuntu/Content/contenthubplugin.cpp	2013-10-21 16:36:02 +0000
+++ import/Ubuntu/Content/contenthubplugin.cpp	2013-11-08 21:19:44 +0000
@@ -52,8 +52,8 @@
 
     qmlRegisterSingletonType<ContentHub>(uri, versionMajor, versionMinor, "ContentHub", qml_content_hub);
     qmlRegisterType<ContentItem>(uri, versionMajor, versionMinor, "ContentItem");
+    qmlRegisterType<ContentPeer>(uri, versionMajor, versionMinor, "ContentPeer");
     qmlRegisterUncreatableType<ContentStore>(uri, versionMajor, versionMinor, "ContentStore", "created by hub");
-    qmlRegisterUncreatableType<ContentPeer>(uri, versionMajor, versionMinor, "ContentPeer", "created by hub");
     qmlRegisterUncreatableType<ContentTransfer>(uri, versionMajor, versionMinor, "ContentTransfer", "created by hub");
     qmlRegisterUncreatableType<ContentType>(uri, versionMajor, versionMinor, "ContentType", "Use only the type");
 }