Merge lp:~marcustomlinson/unity8/lp-1356410 into lp:unity8

[Marcus Tomlinson]

Handle the openScope signal in "tempScopeItem" (ScopesOverview.qml) as is done with "scopeItem" (Dash.qml)

[Albert Astals Cid (aacid)]

Should we handle gotoScope here too? I.e. can a temp scope request to go to a "favorite" scope and thus close the overview and temp scopes altogheter?

review: Needs Information

[Michał Sawicz (saviq)]

> Should we handle gotoScope here too? I.e. can a temp scope request to go to a "favorite" scope and thus close the overview and temp scopes altogheter?

Yeah it has to, since you can favorite any scope.

Wonder if bug #1355359 is close enough to fix in the same MP?

[Marcus Tomlinson (marcustomlinson)]

> > Should we handle gotoScope here too? I.e. can a temp scope request to go to
> a "favorite" scope and thus close the overview and temp scopes altogheter?
>
> Yeah it has to, since you can favorite any scope.

K, done.

>
> Wonder if bug #1355359 is close enough to fix in the same MP?

TBH, I don't have enough experience with this codebase to tackle that at this point. Could we rather just handle that bug separately.

[Albert Astals Cid (aacid)]

Have a look at the other onGotoScope implementation, calling root.favoriteSelected(scopeId); is not correct

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1180
http://jenkins.qa.ubuntu.com/job/unity8-ci/4017/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3748/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1018
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1111
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1111
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3619/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4995
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4995/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4017/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1181
http://jenkins.qa.ubuntu.com/job/unity8-ci/4027/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3783
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1028
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1121
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5030
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5030/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11751

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4027/rebuild

review: Approve (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

> Have a look at the other onGotoScope implementation, calling
> root.favoriteSelected(scopeId); is not correct

Ok, I get what you're saying -there is some method to my madness I promise ;)

My intention is to achieve a logical animation back to the dash. What I do now is close the temp scope, switch back to the favourites tab, then redirect the gotoScope to the root's implementation (which in turn animates the opening of the favourited scope from there). I feel this looks quite clean.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1183
http://jenkins.qa.ubuntu.com/job/unity8-ci/4033/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3814
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1034/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3677
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5061
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5061/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11793

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4033/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Do you have any scope that does this?

review: Needs Information

[Marcus Tomlinson (marcustomlinson)]

> Do you have any scope that does this?

Here's how to reproduce the situation:

 * Edit /usr/share/upstart/sessions/unity8-dash.conf
 * Replace "musicaggregator" with "com.canonical.scopes.sevendigital" in UNITY_SCOPES_LIST
 * Reboot the phone
 * Open the music aggregator scope from the Dash Manager "All" tab
 * Click the "New albums from 7digital" header

[Marcus Tomlinson (marcustomlinson)]

> > Do you have any scope that does this?
>
> Here's how to reproduce the situation:
>
> * Edit /usr/share/upstart/sessions/unity8-dash.conf
> * Replace "musicaggregator" with "com.canonical.scopes.sevendigital" in
> UNITY_SCOPES_LIST
> * Reboot the phone
> * Open the music aggregator scope from the Dash Manager "All" tab
> * Click the "New albums from 7digital" header

Also, clicking the "Popular tracks on Grooveshark" header will show the onOpenScope behaviour.

[Albert Astals Cid (aacid)]

The animations may need some refinement later, but still this fixes stuff so let's get this merged in and polish stuff once its in hand of designers.

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass? If not, please explain why.
Something broke in CI with 'xhost: unable to open display ":0"'

review: Approve

[Albert Astals Cid (aacid)]

Actually, can you add another TODO in that code with "Add tests for this", unless you want to play with our tests/fake scopes plugin to test it.

review: Needs Fixing

[lp:~marcustomlinson/unity8/lp-1356410]

1184. By Marcus Tomlinson on 2014-08-21

Added "// TODO Add tests for these connections"

[Marcus Tomlinson (marcustomlinson)]

> Actually, can you add another TODO in that code with "Add tests for this",
> unless you want to play with our tests/fake scopes plugin to test it.

ok, done

[Albert Astals Cid (aacid)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1183
http://jenkins.qa.ubuntu.com/job/unity8-ci/4046/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3887
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1047
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3746
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5134
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11884

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4046/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1183
http://jenkins.qa.ubuntu.com/job/unity8-ci/4097/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4042
    None: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1098/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3877
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5294
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5294/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12110

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4097/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1184
http://jenkins.qa.ubuntu.com/job/unity8-ci/4104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4052
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1105
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5304
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5304/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12125

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4104/rebuild

review: Approve (continuous-integration)

=== modified file 'qml/Dash/ScopesOverview.qml'
--- qml/Dash/ScopesOverview.qml	2014-08-15 17:37:28 +0000
+++ qml/Dash/ScopesOverview.qml	2014-08-21 08:48:30 +0000
@@ -535,6 +535,19 @@
                 scopesOverviewXYScaler.opacity = 0;
                 middleItems.overrideOpacity = -1;
             }
+            // TODO Add tests for these connections
+            Connections {
+                target: tempScopeItem.scope
+                onOpenScope: {
+                    // TODO Animate the newly opened scope into the foreground (stacked on top of the current scope)
+                    tempScopeItem.scope = scope;
+                }
+                onGotoScope: {
+                    tempScopeItem.backClicked();
+                    root.currentTab = 0;
+                    root.scope.gotoScope(scopeId);
+                }
+            }
         }
     }
 }