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

[Albert Astals Cid]

ScopesList: Use the default scope style for the header

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

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, headers are dark grey now

 * 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

[Michael Zanetti (mzanetti)]

 * 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.

not yet

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

yes

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1506
http://jenkins.qa.ubuntu.com/job/unity8-ci/5045/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/568
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/210
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/488
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/566
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/566/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16577

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

1506. By Albert Astals Cid on 2014-12-15

Use the default scope style for the header

=== modified file 'qml/Dash/ScopesList.qml'
--- qml/Dash/ScopesList.qml	2014-12-02 12:04:11 +0000
+++ qml/Dash/ScopesList.qml	2014-12-15 14:25:10 +0000
@@ -34,6 +34,9 @@
 
     state: "browse"
 
+    property var scopeStyle: ScopeStyle {
+    }
+
     onStateChanged: {
         if (state == "edit") {
             // As per design entering edit mode clears the possible existing search
@@ -66,6 +69,7 @@
         backIsClose: root.state == "edit"
         storeEntryEnabled: root.state == "browse"
         searchEntryEnabled: false // Disable search for now
+        scopeStyle: root.scopeStyle
         onBackClicked: {
             if (backIsClose) {
                 root.state = "browse"
@@ -111,7 +115,7 @@
 
                         editMode: root.state == "edit"
 
-                        scopeStyle: root.scope.scopeStyle
+                        scopeStyle: root.scopeStyle
                         isFavoritesFeed: categoryId == "favorites"
                         isAlsoInstalled: categoryId == "other"