Merge lp:~aacid/unity8/fixPageHeader into lp:unity8

[Albert Astals Cid]

Fix name, There's nothing called pageHeader in this file

* Are there any related MPs required for this MP to build/function as expected?
Ni

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

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Albert Astals Cid (aacid)]

But there is a pageHeader in GSV that is most probably what we want to be clearning sine the page header of this file isn't even searchable :S

[Michael Zanetti (mzanetti)]

> But there is a pageHeader in GSV that is most probably what we want to be
> clearning sine the page header of this file isn't even searchable :S

Yeah, seems you're right. But in that case, this call should rather be inside GSV where the preview is opened. And dropped completely from here.

review: Needs Fixing

[lp:~aacid/unity8/fixPageHeader]

1048. By Albert Astals Cid on 2014-07-17

Real fix

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1047
http://jenkins.qa.ubuntu.com/job/unity8-ci/3465/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2129
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/466/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/559
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/559
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/559/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/559
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3282
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3282/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9999

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1048
http://jenkins.qa.ubuntu.com/job/unity8-ci/3467/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2133
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/468/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/561
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/561/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/561
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2353
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3287
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10004

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

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

Yip yip

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

No. qmltest VM seems borked atm. Tests seem to pass fine here.

review: Approve

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2014-07-14 08:05:29 +0000
+++ qml/Dash/GenericScopeView.qml	2014-07-17 13:11:00 +0000
@@ -361,6 +361,10 @@
         width: parent.width
         height: parent.height
         anchors.left: categoryView.right
+
+        onOpenChanged: {
+            pageHeader.unfocus();
+        }
     }
 
 }

=== modified file 'qml/Dash/PreviewListView.qml'
--- qml/Dash/PreviewListView.qml	2014-07-08 08:30:46 +0000
+++ qml/Dash/PreviewListView.qml	2014-07-17 13:11:00 +0000
@@ -73,9 +73,7 @@
         property bool open: false
 
         onOpenChanged: {
-            if (open) {
-                pageHeader.unfocus();
-            } else {
+            if (!open) {
                 // Cancel any pending preview requests or actions
                 if (previewListView.currentItem && previewListView.currentItem.previewData !== undefined) {
                     previewListView.currentItem.previewData.cancelAction();