Merge lp:~schwann/gallery-app/gallery-pick-return into lp:gallery-app

[Günter Schwann]

Do not quit gallery when done with picking content fixes LP: #1236308

Do not quit gallery when done with picking content fixes LP: #1236308

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:870
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/565/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/375
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/375/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/375
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4838
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2699
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/713
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/713/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2701
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2701/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2236
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2249

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/gallery-app-ci/565/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

I have tested this on my device with Mir, and it does work fine. However I do think we should quit if gallery-app wasn't already running before getting called for picking. If a user didn't have gallery-app in their list of running apps, it would be annoying to leave it running after picking is complete. From the users point of view, they used system-settings to pick a background, not gallery-app. The fact that it's gallery-app doing the work, should be transparent to the user.

[Bill Filler (bfiller)]

agreed. gallery should quit if it wasn't already opened before picking but not quit if it was already open.

review: Needs Fixing

[Günter Schwann (schwann)]

Quiting the application in that case should be handled by the content hub.
Gallery doesn't know if it was running "normally" before already. At least not, if there was no command line argument (will add this scenario, even if not used in content-hub).

I'll add the functionality to the content hub. Checking if the app is running already and stopping an app, is in the content hub ApplicationManager. So not too much left to there.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:871
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/566/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/376
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/376/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4887
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2761
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/762
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/762/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2763
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2763/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2298
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2313

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/gallery-app-ci/566/rebuild

review: Needs Fixing (continuous-integration)

[Günter Schwann (schwann)]

MR for quiting the source if it was started by the content hub:
https://code.launchpad.net/~schwann/content-hub/content-quit-source/+merge/190389

[Ken VanDine (ken-vandine)]

Works for me on the device, I tested it with the referenced content-hub branch.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:871
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/567/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/377
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/377/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4906
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/781
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/781/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2786
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2786/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2320
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2345

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/gallery-app-ci/567/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/249/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-autolanding/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/162
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/162/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-autolanding/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4911
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1089
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/786
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/786/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2793
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2793/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2325
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2358

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:871
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/568/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/378
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/378/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/378
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4914
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1092
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/789
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/789/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2797
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2797/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2329
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2365

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/gallery-app-ci/568/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/250/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-autolanding/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/163
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/163/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-autolanding/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4925
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2812
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/800
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/800/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2814
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2814/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2342
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2382

review: Needs Fixing (continuous-integration)

=== modified file 'rc/qml/GalleryApplication.qml'
--- rc/qml/GalleryApplication.qml	2013-10-06 23:52:24 +0000
+++ rc/qml/GalleryApplication.qml	2013-10-10 09:19:50 +0000
@@ -175,9 +175,18 @@
         objectName: "mainLoader"
 
         anchors.fill: parent
-        source: allLoaded ? (APP.pickModeEnabled ? Qt.resolvedUrl("PickerScreen.qml")
-                                                     : Qt.resolvedUrl("MainScreen.qml"))
-                          : ""
+        source: allLoaded ? Qt.resolvedUrl("MainScreen.qml") : ""
+        visible: !pickScreenLoader.visible
+    }
+
+    /// FIXME use state saving instead of loading the UI twice
+    Loader {
+        id: pickScreenLoader
+        objectName: "pickLoader"
+
+        anchors.fill: parent
+        source: (allLoaded && APP.pickModeEnabled) ? Qt.resolvedUrl("PickerScreen.qml") : ""
+        visible: source != ""
     }
 
     Component.onCompleted: {

=== modified file 'src/content-communicator.cpp'
--- src/content-communicator.cpp	2013-09-27 11:07:13 +0000
+++ src/content-communicator.cpp	2013-10-10 09:19:50 +0000
@@ -62,8 +62,6 @@
     emit photoRequested();
     emit selectionTypeChanged();
     emit singleContentPickModeChanged();
-
-    QObject::connect(m_transfer, SIGNAL(stateChanged()), this, SLOT(quitApp()));
 }
 
 /*!
@@ -125,14 +123,3 @@
 
     return m_transfer->selectionType() == Transfer::SelectionType::single;
 }
-
-/*!
- * \brief ContentCommunicator::quitApp
- * FIXME
- * As long as the content hub soes not close gallery -use this as fallback
- */
-void ContentCommunicator::quitApp()
-{
-    if (!m_transfer)
-        qApp->quit();
-}

=== modified file 'src/content-communicator.h'
--- src/content-communicator.h	2013-09-26 16:32:46 +0000
+++ src/content-communicator.h	2013-10-10 09:19:50 +0000
@@ -59,8 +59,6 @@
     void singleContentPickModeChanged();
 
 private:
-    Q_SLOT void quitApp();
-
     content::Transfer *m_transfer;
 };
 

=== modified file 'src/gallery-application.cpp'
--- src/gallery-application.cpp	2013-09-26 16:32:46 +0000
+++ src/gallery-application.cpp	2013-10-10 09:19:50 +0000
@@ -51,6 +51,7 @@
 #include <QQuickItem>
 #include <QQuickView>
 #include <QString>
+#include <QTimer>
 #include <QUrl>
 
 QElapsedTimer* GalleryApplication::m_timer = 0;
@@ -272,10 +273,12 @@
     }
     m_contentCommunicator->returnPhotos(selectedMedias);
 
-// do not switch UI, as gallery anyway always quits atm.
-//    if (m_defaultUiMode == BrowseContentMode) {
-//        setUiMode(BrowseContentMode);
-//    }
+    if (m_defaultUiMode == BrowseContentMode) {
+        setUiMode(BrowseContentMode);
+    } else {
+        // give the app and content-hub some time to finish taks (run the event loop)
+        QTimer::singleShot(10, this, SLOT(quit()));
+    }
 }
 
 /*!
@@ -286,10 +289,12 @@
 {
     m_contentCommunicator->cancelTransfer();
 
-// do not switch UI, as gallery anyway always quits atm.
-//    if (m_defaultUiMode == BrowseContentMode) {
-//        setUiMode(BrowseContentMode);
-//    }
+    if (m_defaultUiMode == BrowseContentMode) {
+        setUiMode(BrowseContentMode);
+    } else {
+        // give the app and content-hub some time to finish taks (run the event loop)
+        QTimer::singleShot(10, this, SLOT(quit()));
+    }
 }
 
 /*!

=== modified file 'tests/unittests/stubs/content-communicator_stub.cpp'
--- tests/unittests/stubs/content-communicator_stub.cpp	2013-09-26 16:32:46 +0000
+++ tests/unittests/stubs/content-communicator_stub.cpp	2013-10-10 09:19:50 +0000
@@ -51,7 +51,3 @@
 {
     return true;
 }
-
-void ContentCommunicator::quitApp()
-{
-}