Merge lp:~michael-sheldon/content-hub/loader-fixes into lp:content-hub

[Michael Sheldon]

Fixes updating of the ContentPeerModel when using Loader and changing ContentType or ContentHandler dynamically and ensures that ContentPeerModel Loader doesn't begin loading the model until the peer picker becomes visible (avoiding delaying app start-up time).

Fixes updating of the ContentPeerModel when using Loader and changing ContentType or ContentHandler dynamically and ensures that ContentPeerModel Loader doesn't begin loading the model until the peer picker becomes visible (avoiding delaying app start-up time).

[Michael Sheldon (michael-sheldon)]

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

 * The following MRs are required to make the Gallery, Address Book and System Settings apps compatible with the new API:

 https://code.launchpad.net/~ken-vandine/gallery-app/content_hub/+merge/211091
 https://code.launchpad.net/~michael-sheldon/address-book-app/new-content-hub-api/+merge/211093
 https://code.launchpad.net/~ken-vandine/ubuntu-system-settings/content_hub_qml_api_changes/+merge/211094

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

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

 * No change

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

 * No change

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~michael-sheldon/content-hub/loader-fixes]

147. By Michael Sheldon on 2014-03-24

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

I'm not sure why, testing with my hub-importer, hub-exporter and hub-share test apps I'm seeing each source listed twice in the ContentPeerPicker. But only sources, I'm only seeing destinations and share handlers once.

For example, hub-importer shows 2 entries for Gallery and Hub Exporter. hub-exporter only shows hub-importer and hub-share once in ContentPeerPicker.

[lp:~michael-sheldon/content-hub/loader-fixes]

148. By Michael Sheldon on 2014-03-26

Process findPeers immediately upon component completion, rather than adding it to the end of the event queue

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Great, commit 148 fixed the dupe issue.

[Ken VanDine (ken-vandine)]

The change to the title, adding "Export to", perhaps "Open with" might be better?

review: Needs Information

[lp:~michael-sheldon/content-hub/loader-fixes]

149. By Michael Sheldon on 2014-03-26

Change 'Export to' header to 'Open with'

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks great!

review: Approve

[Ken VanDine (ken-vandine)]

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

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'import/Ubuntu/Content/ContentPeerPicker.qml'
--- import/Ubuntu/Content/ContentPeerPicker.qml	2014-03-20 13:04:57 +0000
+++ import/Ubuntu/Content/ContentPeerPicker.qml	2014-03-26 13:47:51 +0000
@@ -68,6 +68,8 @@
     */
     property var customPeerModelLoader
 
+    property var completed: false
+
     /*! \qmlsignal peerSelected
         \brief Emitted when a user selects a peer.
 
@@ -88,26 +90,53 @@
 
     Header {
         id: header
-        title: (handler === ContentHandler.Source) ? i18n.tr("Choose from") : i18n.tr("Share to")
+        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 {
-            id: peerModel
-        }
+        sourceComponent: ContentPeerModel { }
         onLoaded: {
-            item.handler = root.handler
-            item.contentType = root.contentType
+            item.handler = root.handler;
+            item.contentType = root.contentType;
         }
     }
 
     Component.onCompleted: {
-        if(customPeerModelLoader) {
-            customPeerModelLoader.active = true;
-        } else {
-            peerModelLoader.active = true;
+        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;
         }
     }
 

=== modified file 'import/Ubuntu/Content/contentpeermodel.cpp'
--- import/Ubuntu/Content/contentpeermodel.cpp	2014-03-20 23:44:21 +0000
+++ import/Ubuntu/Content/contentpeermodel.cpp	2014-03-26 13:47:51 +0000
@@ -58,7 +58,7 @@
 void ContentPeerModel::componentComplete()
 {
     m_complete = true;
-    QTimer::singleShot(0, this, SLOT(findPeers()));
+    findPeers();
 }
 
 /*!
@@ -79,11 +79,13 @@
 void ContentPeerModel::setContentType(ContentType::Type contentType)
 {
     TRACE() << Q_FUNC_INFO;
-    m_contentType = contentType;
-    if (m_complete) {
-        findPeers();
+    if (m_contentType != contentType) {
+        m_contentType = contentType;
+        if (m_complete) {
+            findPeers();
+        }
+        Q_EMIT contentTypeChanged();
     }
-    Q_EMIT contentTypeChanged();
 }
 
 /*!
@@ -95,7 +97,6 @@
     m_peers.clear();
     QCoreApplication::processEvents();
     if(m_contentType == ContentType::All) {
-        appendPeersForContentType(ContentType::Unknown);
         appendPeersForContentType(ContentType::Documents);
         appendPeersForContentType(ContentType::Pictures);
         appendPeersForContentType(ContentType::Music);
@@ -139,7 +140,6 @@
             }
             Q_EMIT peersChanged();
         }
-        QCoreApplication::processEvents();
     }
 }
 
@@ -161,11 +161,13 @@
 void ContentPeerModel::setHandler(ContentHandler::Handler handler)
 {
     TRACE() << Q_FUNC_INFO;
-    m_handler = handler;
-    if (m_complete) {
-        findPeers();
+    if (m_handler != handler) {
+        m_handler = handler;
+        if (m_complete) {
+            findPeers();
+        }
+        Q_EMIT handlerChanged();
     }
-    Q_EMIT handlerChanged();
 }
 
 /*!