Merge lp:~michael-sheldon/content-hub/peer-picker-updates into lp:content-hub

[Michael Sheldon]

Make the ContentPeerPicker's header text customisable and replace the bottom cancel button with new header style cancel.

Make the ContentPeerPicker's header text customisable and replace the bottom cancel button with new header style cancel.

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes, however attaching contacts from the address-book currently fails due to https://bugs.launchpad.net/address-book-app/+bug/1346278

If you changed the UI, was the change specified/approved by design?

 * Yes, change specified at UX sprint

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:125
http://jenkins.qa.ubuntu.com/job/content-hub-ci/176/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/33
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/33

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/176/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

This change includes bumping the Ubuntu.Components import version to 1.1, is that available in the 14.04 framework?

review: Needs Information

[lp:~michael-sheldon/content-hub/peer-picker-updates]

126. By Michael Sheldon on 2014-07-21

Separate new ContentPeerPicker into new QML API version and duplicate existing 0.1 elements as 1.0

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:126
http://jenkins.qa.ubuntu.com/job/content-hub-ci/177/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/34
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/34
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/34/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/34

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/177/rebuild

review: Approve (continuous-integration)

[lp:~michael-sheldon/content-hub/peer-picker-updates]

127. By Michael Sheldon on 2014-07-22

Fix documentation for separate versions of ContentPeerPicker

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:127
http://jenkins.qa.ubuntu.com/job/content-hub-ci/178/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/35

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/178/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

This looks good with the API bump, I tested all the versions with my example apps and they all work as expected.

However, our plugin package is versioned 0.1, I guess that needs to be changed to 1.1. I also noticed even though our plugin package is versioned so it can be parallel installable, it isn't installed in a versioned directory.

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

I'm not entirely sure we want to have separate packages for the different versions as the way the QML versioning works means that the one package contains both versions of the API, with the files used for each controlled by the qmldir file (and by the C++ version registration).

[Ken VanDine (ken-vandine)]

> I'm not entirely sure we want to have separate packages for the different
> versions as the way the QML versioning works means that the one package
> contains both versions of the API, with the files used for each controlled by
> the qmldir file (and by the C++ version registration).

Yeah, in this case from a functional point of view it all works fine, the package name is just useful for package depends (not for click). So if your app import Ubuntu.Content 1.1 you would need to have that package installed. As for keeping them around and parallel installable, it'll be much more useful when we transition to say a 2.0 API version which might not be backwards compatible and we stop carrying old versions. This way the old module can be installed as well.

We currently have 3 packages depending on qtdeclarative5-ubuntu-content0.1:
 address-book-app
 unity-webapps-qml
 ubuntu-system-settings

This can land without actually breaking apps, which is great but there isn't a clear way for any of those apps depending on package versions ensure that 1.1 is installed. And folks would likely assume content0.1 provides that API versions. However, changing that to content1.1 doesn't make it clear that it also provides 0.1, so no silver bullet there.

[Ken VanDine (ken-vandine)]

This looks good, but lets land this along with:
https://code.launchpad.net/~ken-vandine/content-hub/api_v1/+merge/227948

review: Approve

=== modified file 'doc/qml/pages/mainpage.qdoc'
--- doc/qml/pages/mainpage.qdoc	2014-04-02 12:00:25 +0000
+++ doc/qml/pages/mainpage.qdoc	2014-07-22 08:44:26 +0000
@@ -67,8 +67,8 @@
 
 \qml
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Content 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Content 1.1
 
 Rectangle {
   id: root
@@ -140,7 +140,7 @@
 \part Components
 Available through:
 \code
-    import Ubuntu.Content 0.1
+    import Ubuntu.Content 1.1
 \endcode
 
 */

=== modified file 'doc/qml/pages/moduledef.qdoc'
--- doc/qml/pages/moduledef.qdoc	2014-04-02 12:18:01 +0000
+++ doc/qml/pages/moduledef.qdoc	2014-07-22 08:44:26 +0000
@@ -1,3 +1,3 @@
 /*!
- \qmlmodule Ubuntu.Content 0.1
+ \qmlmodule Ubuntu.Content 1.1
 */

=== added file 'import/Ubuntu/Content/ContentPeerPicker.qdoc'
--- import/Ubuntu/Content/ContentPeerPicker.qdoc	1970-01-01 00:00:00 +0000
+++ import/Ubuntu/Content/ContentPeerPicker.qdoc	2014-07-22 08:44:26 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*!
+    \qmltype ContentPeerPicker
+    \inqmlmodule Ubuntu.Content
+    \brief Component that allows users to select a source/destination for content transfer
+
+    This component displays a list of applications, devices and services which
+    are appropriate for transferring a given content type with.
+*/
+
+/*!
+    \qmlproperty ContentHandler ContentPeerPicker::handler
+    \brief The ContentHandler to use when finding peers.
+*/
+
+/*! 
+    \qmlproperty ContentType ContentPeerPicker::contentType
+    \brief The ContentType to use when finding peers.
+*/
+
+/*! 
+    \qmlproperty bool ContentPeerPicker::showTitle
+    \brief Determines whether the header should be displayed.
+
+    This makes it possible to hide the header, which can be useful
+    if embedding the picker within another page or popup.
+*/
+
+/*! 
+    \qmlproperty ContentPeer ContentPeerPicker::peer
+    \brief The peer selected by the user.
+
+    Once the peerSelected signal has been sent, this provides the
+    ContentPeer which the user has selected.
+*/
+
+/*! 
+    \qmlproperty Loader ContentPeerPicker::customerPeerModelLoader
+    \brief A Loader containing a ContentPeerModel.
+
+    This can optionally be used to provide a pre-populated ContentPeerModel
+    to this ContentPeerPicker.
+*/
+
+/*! 
+    \qmlproperty string ContentPeerPicker::headerText
+    \brief Text to display in the header.
+*/
+
+/*! 
+    \qmlsignal ContentPeerPicker::peerSelected
+    \brief Emitted when a user selects a peer.
+
+    Once this signal has been emitted the selected peer can be accessed via
+    the peer property.
+    \c onPeerSelected
+*/
+
+/*! 
+    \qmlsignal ContentPeerPicker::cancelPressed
+    \brief Emitted when the user clicks the cancel button.
+    
+    The ContentPeerPicker will be hidden automatically when the user cancels
+    the operations and the active ContentTransfer will be set to Aborted.
+    \c onCancelPressed
+*/
+

=== added file 'import/Ubuntu/Content/ContentPeerPicker10.qml'
--- import/Ubuntu/Content/ContentPeerPicker10.qml	1970-01-01 00:00:00 +0000
+++ import/Ubuntu/Content/ContentPeerPicker10.qml	2014-07-22 08:44:26 +0000
@@ -0,0 +1,261 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Content 0.1
+
+/*!
+  \internal
+  Documentation is in ContentPeerPicker.qdoc
+*/
+Item {
+    id: root
+    anchors.fill: parent
+
+    property var handler
+    property var contentType
+    property alias showTitle: header.visible
+    property var peer
+    property var customPeerModelLoader
+    property var completed: false
+
+    signal peerSelected
+    signal cancelPressed
+
+    Rectangle {
+        anchors.fill: parent
+        color: Theme.palette.normal.overlay
+    }
+
+    Header {
+        id: header
+        title: (handler === ContentHandler.Source) ? i18n.tr("Choose from") : (handler === ContentHandler.Destination ? i18n.tr("Open with") : i18n.tr("Share to"))
+    }
+
+    Loader {
+        id: peerModelLoader
+        active: false
+        sourceComponent: ContentPeerModel { }
+        onLoaded: {
+            item.handler = root.handler;
+            item.contentType = root.contentType;
+        }
+    }
+
+    Component.onCompleted: {
+        if (root.visible) {
+            if (customPeerModelLoader) {
+                customPeerModelLoader.active = true;
+            } else {
+                peerModelLoader.active = true;
+            }
+        }
+        completed = true;
+    }
+
+    onVisibleChanged: {
+        if (completed) {
+            if (customPeerModelLoader) {
+                customPeerModelLoader.active = true;
+            } else {
+                peerModelLoader.active = true;
+            }
+        }
+    }
+
+    onHandlerChanged: {
+        if (!customPeerModelLoader && peerModelLoader.item) {
+            appPeers.model = undefined; // Clear grid view
+            peerModelLoader.item.handler = root.handler;
+            appPeers.model = peerModelLoader.item.peers;
+        }
+    }
+
+    onContentTypeChanged: {
+        if (!customPeerModelLoader && peerModelLoader.item) {
+            appPeers.model = undefined; // Clear grid view
+            peerModelLoader.item.contentType = root.contentType;
+            appPeers.model = peerModelLoader.item.peers;
+        }
+    }
+
+    Component {
+        id: peerDelegate
+        Item {
+            width: units.gu(13.5)
+            height: units.gu(16)
+            AbstractButton {
+                width: parent.width
+                height: icon.height + label.height
+                UbuntuShape {
+                    id: icon
+                    anchors {
+                        top: parent.top
+                        horizontalCenter: parent.horizontalCenter
+                    }
+                    radius: "medium"
+                    width: units.gu(8)
+                    height: units.gu(7.5)
+                    image: Image {
+                        id: image
+                        objectName: "image"
+                        sourceSize { width: icon.width; height: icon.height }
+                        asynchronous: true
+                        cache: false
+                        source: "image://content-hub/" + modelData.appId
+                        horizontalAlignment: Image.AlignHCenter
+                        verticalAlignment: Image.AlignVCenter
+                    }
+               }
+
+                Label {
+                    id: label
+                    objectName: "label"
+                    anchors {
+                        baseline: icon.bottom
+                        baselineOffset: units.gu(2)
+                        left: parent.left
+                        right: parent.right
+                        leftMargin: units.gu(1)
+                        rightMargin: units.gu(1)
+                    }
+
+                    opacity: 0.9
+                    fontSize: "small"
+                    elide: Text.ElideMiddle
+                    horizontalAlignment: Text.AlignHCenter
+                    text: modelData.name || modelData.appId
+                }
+
+                onClicked: {
+                        peer = modelData
+                        peerSelected()
+                }
+            }
+
+        }
+    }
+
+    ListItem.Header {
+        id: appTitle
+        anchors.top: header.visible ? header.bottom : parent.top
+        text: i18n.tr("Apps")
+    }
+
+    Rectangle {
+        id: apps
+        color: "#FFFFFF"
+        clip: true
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: appTitle.bottom
+            bottom: devTitle.visible ? devTitle.top : cancelButton.top
+            bottomMargin: units.gu(1)
+        }
+
+        Flickable {
+            anchors.fill: parent
+
+            ResponsiveGridView {
+                id: appPeers
+                anchors.fill: parent
+                minimumHorizontalSpacing: units.gu(0.5)
+                maximumNumberOfColumns: 6
+                delegateWidth: units.gu(11)
+                delegateHeight: units.gu(9.5)
+                verticalSpacing: units.gu(2)
+                model: customPeerModelLoader ? customPeerModelLoader.item.peers : peerModelLoader.item.peers
+                delegate: peerDelegate
+
+                Label {
+                    anchors.top: parent.top
+                    anchors.topMargin: units.gu(2.5)
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    width: parent.width - units.gu(5)
+                    wrapMode: Text.WordWrap
+                    horizontalAlignment: Text.AlignHCenter
+                    text: root.handler === ContentHandler.Source ? i18n.tr("Sorry, there aren't currently any apps installed that can provide this type of content.") : i18n.tr("Sorry, there aren't currently any apps installed that can handle this type of content.")
+                    visible: appPeers.model ? appPeers.model.length == 0 : false
+                }
+            }
+        }
+    }
+
+    ListItem.Header {
+        id: devTitle
+        // TODO: make this visible when we have a way to populate devices
+        visible: false
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: apps.bottom
+        }
+        text: i18n.tr("Devices")
+    }
+
+    Rectangle {
+        id: devices
+        // TODO: make this visible when we have a way to populate devices
+        visible: false
+        color: "#FFFFFF"
+        width: parent.width
+        radius: 0
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: devTitle.bottom
+            bottom: cancelButton.top
+            bottomMargin: units.gu(1)
+        }
+
+        Flickable {
+            anchors.fill: parent
+
+            ResponsiveGridView {
+                id: devPeers
+                anchors.fill: parent
+                minimumHorizontalSpacing: units.gu(0.5)
+                maximumNumberOfColumns: 6
+                delegateWidth: units.gu(11)
+                delegateHeight: units.gu(9.5)
+                verticalSpacing: units.gu(2)
+                delegate: peerDelegate
+            }
+        }
+    }
+
+    Button {
+        id: cancelButton
+        objectName: "contentPeerPickerCancelButton"
+        text: i18n.tr("Cancel")
+        anchors {
+            left: parent.left
+            bottom: parent.bottom
+            margins: units.gu(1)
+        }
+        onClicked: {
+            if(root.activeTransfer) {
+                root.activeTransfer.state = ContentTransfer.Aborted;
+            }
+            cancelPressed();
+        }
+    }
+
+}

=== renamed file 'import/Ubuntu/Content/ContentPeerPicker.qml' => 'import/Ubuntu/Content/ContentPeerPicker11.qml'
--- import/Ubuntu/Content/ContentPeerPicker.qml	2014-07-09 13:03:19 +0000
+++ import/Ubuntu/Content/ContentPeerPicker11.qml	2014-07-22 08:44:26 +0000
@@ -15,76 +15,28 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.Content 0.1
+import Ubuntu.Content 1.1
 
 /*!
-    \qmltype ContentPeerPicker
-    \inqmlmodule Ubuntu.Content
-    \brief Component that allows users to select a source/destination for content transfer
-
-    This component displays a list of applications, devices and services which
-    are appropriate for transferring a given content type with.
+  \internal
+  Documentation is in ContentPeerPicker.qdoc
 */
 Item {
     id: root
     anchors.fill: parent
 
-    /*!
-        \qmlproperty ContentHandler handler
-        \brief The ContentHandler to use when finding peers.
-    */
     property var handler
-
-    /*! \qmlproperty ContentType contentType
-        \brief The ContentType to use when finding peers.
-    */
     property var contentType
-
-    /*! \qmlproperty bool showTitle
-        \brief Determines whether the header should be displayed.
-
-        This makes it possible to hide the header, which can be useful
-        if embedding the picker within another page or popup.
-    */
     property alias showTitle: header.visible
-
-    /*! \qmlproperty ContentPeer peer
-        \brief The peer selected by the user.
-
-        Once the peerSelected signal has been sent, this provides the
-        ContentPeer which the user has selected.
-    */
     property var peer
-
-    /*! \qmlproperty Loader customerPeerModelLoader
-        \brief A Loader containing a ContentPeerModel.
-
-        This can optionally be used to provide a pre-populated ContentPeerModel
-        to this ContentPeerPicker.
-    */
     property var customPeerModelLoader
-
+    property string headerText
     property var completed: false
 
-    /*! \qmlsignal peerSelected
-        \brief Emitted when a user selects a peer.
-
-        Once this signal has been emitted the selected peer can be accessed via
-        the peer property.
-        \c onPeerSelected
-    */
     signal peerSelected
-
-    /*! \qmlsignal cancelPressed
-        \brief Emitted when the user clicks the cancel button.
-        
-        The ContentPeerPicker will be hidden automatically when the user cancels
-        the operations and the active ContentTransfer will be set to Aborted.
-        \c onCancelPressed
-    */
     signal cancelPressed
 
     Rectangle {
@@ -94,7 +46,23 @@
 
     Header {
         id: header
-        title: (handler === ContentHandler.Source) ? i18n.tr("Choose from") : (handler === ContentHandler.Destination ? i18n.tr("Open with") : i18n.tr("Share to"))
+        title: headerText ? headerText : (handler === ContentHandler.Source) ? i18n.tr("Choose from") : (handler === ContentHandler.Destination ? i18n.tr("Open with") : i18n.tr("Share to"))
+        useDeprecatedToolbar: false
+        config: PageHeadConfiguration {
+            backAction: Action {
+                objectName: "cancel"
+
+                iconName: "close"
+                text: i18n.tr("Cancel")
+                onTriggered: {
+                    if(root.activeTransfer) {
+                        root.activeTransfer.state = ContentTransfer.Aborted;
+                    }
+                    cancelPressed()
+                }
+
+            }
+        }
     }
 
     Loader {
@@ -215,7 +183,7 @@
             left: parent.left
             right: parent.right
             top: appTitle.bottom
-            bottom: devTitle.visible ? devTitle.top : cancelButton.top
+            bottom: devTitle.visible ? devTitle.top : parent.bottom
             bottomMargin: units.gu(1)
         }
 
@@ -270,7 +238,7 @@
             left: parent.left
             right: parent.right
             top: devTitle.bottom
-            bottom: cancelButton.top
+            bottom: parent.bottom
             bottomMargin: units.gu(1)
         }
 
@@ -290,21 +258,4 @@
         }
     }
 
-    Button {
-        id: cancelButton
-        objectName: "contentPeerPickerCancelButton"
-        text: i18n.tr("Cancel")
-        anchors {
-            left: parent.left
-            bottom: parent.bottom
-            margins: units.gu(1)
-        }
-        onClicked: {
-            if(root.activeTransfer) {
-                root.activeTransfer.state = ContentTransfer.Aborted;
-            }
-            cancelPressed();
-        }
-    }
-
 }

=== modified file 'import/Ubuntu/Content/contenthubplugin.cpp'
--- import/Ubuntu/Content/contenthubplugin.cpp	2014-07-04 13:09:29 +0000
+++ import/Ubuntu/Content/contenthubplugin.cpp	2014-07-22 08:44:26 +0000
@@ -66,16 +66,24 @@
     TRACE() << Q_FUNC_INFO;
     Q_ASSERT(uri == QLatin1String("Ubuntu.Content"));
 
-    const int versionMajor = 0;
-    const int versionMinor = 1;
-
-    qmlRegisterUncreatableType<ContentHandler>(uri, versionMajor, versionMinor, "ContentHandler", "Not creatable as an object, use only to retrieve handler enums (e.g. ContentHandler.Source)");
-    qmlRegisterSingletonType<ContentHub>(uri, versionMajor, versionMinor, "ContentHub", qml_content_hub);
-    qmlRegisterType<ContentItem>(uri, versionMajor, versionMinor, "ContentItem");
-    qmlRegisterType<ContentPeer>(uri, versionMajor, versionMinor, "ContentPeer");
-    qmlRegisterType<ContentPeerModel>(uri, versionMajor, versionMinor, "ContentPeerModel");
-    qmlRegisterType<ContentScope>(uri, versionMajor, versionMinor, "ContentScope");
-    qmlRegisterType<ContentStore>(uri, versionMajor, versionMinor, "ContentStore");
-    qmlRegisterUncreatableType<ContentTransfer>(uri, versionMajor, versionMinor, "ContentTransfer", "created by hub");
-    qmlRegisterUncreatableType<ContentType>(uri, versionMajor, versionMinor, "ContentType", "Use only the type");
+    QVector<QPair<int, int>> versions;
+    versions.append(QPair<int, int>(0, 1));
+    versions.append(QPair<int, int>(1, 0));
+    versions.append(QPair<int, int>(1, 1));
+
+    // Register common types for version 0.1, 1.0 and 1.1
+    for(int i = 0; i < versions.length(); i++) {
+        int versionMajor = versions[i].first;
+        int versionMinor = versions[i].second;
+
+        qmlRegisterUncreatableType<ContentHandler>(uri, versionMajor, versionMinor, "ContentHandler", "Not creatable as an object, use only to retrieve handler enums (e.g. ContentHandler.Source)");
+        qmlRegisterSingletonType<ContentHub>(uri, versionMajor, versionMinor, "ContentHub", qml_content_hub);
+        qmlRegisterType<ContentItem>(uri, versionMajor, versionMinor, "ContentItem");
+        qmlRegisterType<ContentPeer>(uri, versionMajor, versionMinor, "ContentPeer");
+        qmlRegisterType<ContentPeerModel>(uri, versionMajor, versionMinor, "ContentPeerModel");
+        qmlRegisterType<ContentScope>(uri, versionMajor, versionMinor, "ContentScope");
+        qmlRegisterType<ContentStore>(uri, versionMajor, versionMinor, "ContentStore");
+        qmlRegisterUncreatableType<ContentTransfer>(uri, versionMajor, versionMinor, "ContentTransfer", "created by hub");
+        qmlRegisterUncreatableType<ContentType>(uri, versionMajor, versionMinor, "ContentType", "Use only the type");
+    }
 }

=== modified file 'import/Ubuntu/Content/qmldir'
--- import/Ubuntu/Content/qmldir	2014-02-26 15:51:06 +0000
+++ import/Ubuntu/Content/qmldir	2014-07-22 08:44:26 +0000
@@ -1,5 +1,13 @@
 module Ubuntu.Content
 plugin ubuntu-content-hub-plugin
 
+#0.1
 ContentTransferHint 0.1 ContentTransferHint.qml
-ContentPeerPicker 0.1 ContentPeerPicker.qml
+ContentPeerPicker 0.1 ContentPeerPicker10.qml
+
+#1.0
+ContentTransferHint 1.0 ContentTransferHint.qml
+ContentPeerPicker 1.0 ContentPeerPicker10.qml
+
+#1.1
+ContentPeerPicker 1.1 ContentPeerPicker11.qml