Unity 8

Merge lp:~unity-team/unity8/scope-settings into lp:unity8

scope-settings
Merge into trunk

Proposed by Michał Sawicz on 2014-08-26

Status:	Merged
Approved by:	Michał Sawicz on 2014-08-27
Approved revision:	1151
Merged at revision:	1214
Proposed branch:	lp:~unity-team/unity8/scope-settings
Merge into:	lp:unity8
Prerequisite:	lp:~unity-team/unity8/alt_nav_support
Diff against target:	1676 lines (+1093/-74) 28 files modified qml/Dash/Dash.qml (+1/-1) qml/Dash/DashContent.qml (+4/-4) qml/Dash/GenericScopeView.qml (+67/-26) qml/Dash/PageHeader.qml (+9/-3) qml/Dash/PreviewListView.qml (+11/-1) qml/Dash/ScopeSettings/ScopeSetting.qml (+37/-0) qml/Dash/ScopeSettings/ScopeSettingBoolean.qml (+61/-0) qml/Dash/ScopeSettings/ScopeSettingList.qml (+50/-0) qml/Dash/ScopeSettings/ScopeSettingNumber.qml (+21/-0) qml/Dash/ScopeSettings/ScopeSettingString.qml (+83/-0) qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml (+57/-0) qml/Dash/ScopeSettingsPage.qml (+62/-0) qml/Dash/ScopesOverview.qml (+2/-0) tests/autopilot/unity8/shell/emulators/dash.py (+5/-5) tests/mocks/Unity/CMakeLists.txt (+2/-0) tests/mocks/Unity/fake_scope.cpp (+3/-1) tests/mocks/Unity/fake_scope.h (+1/-0) tests/mocks/Unity/fake_settingsmodel.cpp (+95/-0) tests/mocks/Unity/fake_settingsmodel.h (+54/-0) tests/mocks/Unity/fake_unity_plugin.cpp (+2/-0) tests/qmltests/CMakeLists.txt (+5/-0) tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml (+1/-1) tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml (+62/-0) tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml (+84/-0) tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml (+98/-0) tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml (+88/-0) tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml (+65/-0) tests/qmltests/Dash/tst_GenericScopeView.qml (+63/-32)
To merge this branch:	bzr merge lp:~unity-team/unity8/scope-settings
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-08-26	Approve on 2014-08-27
Michał Sawicz			Approve on 2014-08-27
Review via email: mp+232296@code.launchpad.net

This proposal supersedes a proposal from 2014-08-08.

Commit message

Add scope settings UI

Accessible through the page header in scope pages on supported scopes.

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
No
* 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?
There are no final designs yet, but this is consistent with the rest of the UI

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-09: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1113
http://jenkins.qa.ubuntu.com/job/unity8-ci/3844/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3273/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/846/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/938/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/938/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/938/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4518/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-10: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-11: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-12: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1116
http://jenkins.qa.ubuntu.com/job/unity8-ci/3860/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3348
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/862
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/954
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/954
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/954/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/954
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4594
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4594/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11280

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-08-12: Posted in a previous version of this proposal

Please delete tag 7.85+14.10.20140428.2-0ubuntu1 in this branch and any local checkouts you might have.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-12: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1117
http://jenkins.qa.ubuntu.com/job/unity8-ci/3865/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3385/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/867/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/959
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/959/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/959/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4632/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-12: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-13: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1121
http://jenkins.qa.ubuntu.com/job/unity8-ci/3886/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3481
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/886
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/980
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/980
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/980/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/980
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3382
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4728
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4728/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11404

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-14: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-08-15: Posted in a previous version of this proposal

You need to disable dash overview when in settings.

Fields don't get focus when tapped on list item.

I assume there's no way to override the color of:
- labels in ItemSelector
- checkbox? should it?

Previews are always opened starting at the first one, not the one clicked. Rebase on lp:~saviq/unity8/fix-horizontal-list-activation and add tests to ensure which item is opened. Doesn't even conflict (but you do need to replace previewListView with subPageLoader).

More to come.

review: Needs Fixing

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-08-15: Posted in a previous version of this proposal

See inline.

Didn't review tests yet, will review after other review comments are addressed.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-15: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1123
http://jenkins.qa.ubuntu.com/job/unity8-ci/3935/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3612
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/936
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1029
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1029
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1029/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1029
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3499
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4859
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4859/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11561

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-15: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-16: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1127
http://jenkins.qa.ubuntu.com/job/unity8-ci/3945/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3635
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/946
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1039
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1039
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/1039/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1039
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3524
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4882
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4882/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11598

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-16: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-16: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-17: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Revision history for this message

Andrea Cimitan (cimi) on 2014-08-18: Posted in a previous version of this proposal

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-18: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-18: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-18: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-08-25: Posted in a previous version of this proposal

See inline. There's a bunch of unanswered comments in the previous review, please answer them too.

Re: shown split or separate, I'd rather merge them unless there's a real reason why not to.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-25: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-25: Posted in a previous version of this proposal

PASSED: Continuous integration, rev:1140
http://jenkins.qa.ubuntu.com/job/unity8-ci/4083/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4008
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1177
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5259
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5259/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12063

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

review: Approve (continuous-integration)

Revision history for this message

Andrea Cimitan (cimi) on 2014-08-26: Posted in a previous version of this proposal

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-08-26: Posted in a previous version of this proposal

Do we really only want to show this once the loader is ready? There will be a delay between user tapping and the page going in on screen? OTOH that gives us protection from a broken subpage, so maybe that's fine...

Otherwise see inline.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-26: Posted in a previous version of this proposal

PASSED: Continuous integration, rev:1141
http://jenkins.qa.ubuntu.com/job/unity8-ci/4090/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4029
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1091
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3865
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5281
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5281/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12097

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

review: Approve (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) on 2014-08-26: Posted in a previous version of this proposal

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-26: Posted in a previous version of this proposal

PASSED: Continuous integration, rev:1144
http://jenkins.qa.ubuntu.com/job/unity8-ci/4106/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4061
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3898
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5313
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5313/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12135

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-26: Posted in a previous version of this proposal

PASSED: Continuous integration, rev:1147
http://jenkins.qa.ubuntu.com/job/unity8-ci/4115/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4077
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3913
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5329
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5329/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12155

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-26:

PASSED: Continuous integration, rev:1149
http://jenkins.qa.ubuntu.com/job/unity8-ci/4117/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3923
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5336
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5336/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12166

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

review: Approve (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) on 2014-08-27:

review: Needs Fixing

lp:~unity-team/unity8/scope-settings updated on 2014-08-27

1150. By Andrea Cimitan on 2014-08-27: Add link to bug
1151. By Andrea Cimitan on 2014-08-27: Fixed indent

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-08-27:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Y, works!
* Did CI run pass? If not, please explain why.
Y

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-27:

PASSED: Continuous integration, rev:1150
http://jenkins.qa.ubuntu.com/job/unity8-ci/4124/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4098
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3935
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5350
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5350/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12190

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Dash/Dash.qml'
 --- qml/Dash/Dash.qml	2014-08-08 09:41:13 +0000
 +++ qml/Dash/Dash.qml	2014-08-27 08:28:24 +0000
@@ -341,7 +341,7 @@
          objectName: "overviewDragHandle"
          z: 1
          direction: Direction.Upwards
--        enabled: !dashContent.previewShown &&
++        enabled: !dashContent.subPageShown &&
                    dashContent.currentScope &&
                    dashContent.currentScope.searchQuery == "" &&
                    (overviewController.progress == 0 || dragging)
 === modified file 'qml/Dash/DashContent.qml'
 --- qml/Dash/DashContent.qml	2014-08-08 08:47:36 +0000
 +++ qml/Dash/DashContent.qml	2014-08-27 08:28:24 +0000
@@ -27,8 +27,8 @@
      readonly property alias currentIndex: dashContentList.currentIndex
      readonly property string currentScopeId: dashContentList.currentItem ? dashContentList.currentItem.scopeId : ""
      readonly property var currentScope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
--    readonly property bool previewShown: dashContentList.currentItem && dashContentList.currentItem.item ?
--                                            dashContentList.currentItem.item.previewShown : false
++    readonly property bool subPageShown: dashContentList.currentItem && dashContentList.currentItem.item ?
++                                            dashContentList.currentItem.item.subPageShown : false
      readonly property bool processing: dashContentList.currentItem && dashContentList.currentItem.item
                                         && dashContentList.currentItem.item.processing || false
      readonly property bool pageHeaderTotallyVisible: dashContentList.currentItem && dashContentList.currentItem.item
@@ -96,8 +96,7 @@
              id: dashContentList
              objectName: "dashContentList"
--            interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving && !currentItem.navigationShown
--
++            interactive: dashContent.scopes.loaded && currentItem && !currentItem.moving && !currentItem.navigationShown && !currentItem.subPageShown
              anchors.fill: parent
              orientation: ListView.Horizontal
              boundsBehavior: Flickable.DragAndOvershootBounds
@@ -137,6 +136,7 @@
                      readonly property bool moving: item ? item.moving : false
                      readonly property bool navigationShown: item ? item.navigationShown : false
++                    readonly property bool subPageShown: item ? item.subPageShown : false
                      readonly property var categoryView: item ? item.categoryView : null
                      readonly property var theScope: scope
 === modified file 'qml/Dash/GenericScopeView.qml'
 --- qml/Dash/GenericScopeView.qml	2014-08-27 08:28:24 +0000
 +++ qml/Dash/GenericScopeView.qml	2014-08-27 08:28:24 +0000
@@ -34,7 +34,7 @@
      property bool enableHeightBehaviorOnNextCreation: false
      property var categoryView: categoryView
      property bool showPageHeader: true
--    readonly property alias previewShown: previewListView.open
++    readonly property alias subPageShown: subPageLoader.subPageShown
      property int paginationCount: 0
      property int paginationIndex: 0
      property alias pageHeaderTotallyVisible: categoryView.pageHeaderTotallyVisible
@@ -43,7 +43,7 @@
          style: scope ? scope.customizations : {}
+     }
--    readonly property bool processing: scope ? scope.searchInProgress || previewListView.processing : false
++    readonly property bool processing: scope ? scope.searchInProgress || subPageLoader.processing : false
      signal backClicked()
@@ -56,7 +56,7 @@
+     }
      function closePreview() {
--        previewListView.open = false;
++        subPageLoader.closeSubPage()
+     }
      function itemClicked(index, result, item, itemModel, resultsModel, limitedCategoryItemCount) {
@@ -80,19 +80,19 @@
          if (limitedCategoryItemCount > 0) {
              previewLimitModel.model = resultsModel;
              previewLimitModel.limit = limitedCategoryItemCount;
--            previewListView.model = previewLimitModel;
++            subPageLoader.model = previewLimitModel;
          } else {
--            previewListView.model = resultsModel;
++            subPageLoader.model = resultsModel;
+         }
--        previewListView.currentIndex = -1;
--        previewListView.currentIndex = index;
--        previewListView.open = true;
++        subPageLoader.initialIndex = -1;
++        subPageLoader.initialIndex = index;
++        subPageLoader.openSubPage("preview");
+     }
      Binding {
          target: scope
          property: "isActive"
--        value: isCurrent && !previewListView.open
++        value: isCurrent && !subPageLoader.open
+     }
      SortFilterProxyModel {
@@ -105,10 +105,10 @@
+     }
      onIsCurrentChanged: {
--        if (showPageHeader) {
++        if (pageHeaderLoader.item && showPageHeader) {
              pageHeaderLoader.item.resetSearch();
+         }
--        previewListView.open = false;
++        subPageLoader.closeSubPage();
+     }
      Binding {
@@ -127,8 +127,8 @@
      Connections {
          target: scopeView.scope
--        onShowDash: previewListView.open = false;
--        onHideDash: previewListView.open = false;
++        onShowDash: subPageLoader.closeSubPage()
++        onHideDash: subPageLoader.closeSubPage()
+     }
      Rectangle {
@@ -141,7 +141,7 @@
          id: categoryView
          objectName: "categoryListView"
--        x: previewListView.open ? -width : 0
++        x: subPageLoader.open ? -width : 0
          Behavior on x { UbuntuNumberAnimation { } }
          width: parent.width
          height: floatingSeeLess.visible ? parent.height - floatingSeeLess.height + floatingSeeLess.yOffset
@@ -149,7 +149,7 @@
          clip: height != parent.height
          model: scopeView.categories
--        forceNoClip: previewListView.open
++        forceNoClip: subPageLoader.open
          pixelAligned: true
          interactive: !navigationShown
@@ -294,10 +294,10 @@
                                  // If the filter animation will be seen start it, otherwise, just flip the switch
                                  var shrinkingVisible = !shouldExpand && y + item.collapsedHeight + seeAll.height < categoryView.height;
                                  var growingVisible = shouldExpand && y + height < categoryView.height;
--                                if (!previewListView.open || shouldExpand) {
++                                if (!subPageLoader.open || shouldExpand) {
                                      var animate = shrinkingVisible || growingVisible;
                                      baseItem.expand(shouldExpand, animate)
--                                    if (shouldExpand && !previewListView.open) {
++                                    if (shouldExpand && !subPageLoader.open) {
                                          categoryView.maximizeVisibleArea(index, item.expandedHeight + seeAll.height);
+                                     }
+                                 }
@@ -428,6 +428,7 @@
                      searchHint: scopeView.scope && scopeView.scope.searchHint || i18n.tr("Search")
                      showBackButton: scopeView.hasBackAction
                      searchEntryEnabled: true
++                    settingsEnabled: scopeView.scope && scopeView.scope.settings && scopeView.scope.settings.count > 0 || false
                      scopeStyle: scopeView.scopeStyle
                      paginationCount: scopeView.paginationCount
                      paginationIndex: scopeView.paginationIndex
@@ -441,6 +442,7 @@
+                     }
                      onBackClicked: scopeView.backClicked()
++                    onSettingsClicked: subPageLoader.openSubPage("settings")
+                 }
+             }
+         }
@@ -501,21 +503,60 @@
          id: previewLimitModel
+     }
--    PreviewListView {
--        id: previewListView
--        objectName: "previewListView"
++    Loader {
++        id: subPageLoader
++        objectName: "subPageLoader"
          visible: x != width
--        scope: scopeView.scope
--        scopeStyle: scopeView.scopeStyle
          width: parent.width
          height: parent.height
          anchors.left: categoryView.right
--        onOpenChanged: {
--            if (showPageHeader) {
--                pageHeaderLoader.item.unfocus();
++        property bool open: false
++        property var scope: scopeView.scope
++        property var scopeStyle: scopeView.scopeStyle
++        property int initialIndex: -1
++        property var model: null
++
++        readonly property bool processing: item && item.processing || false
++        readonly property int count: item && item.count || 0
++        readonly property int currentIndex: item && item.currentIndex || 0
++        readonly property var currentItem: item && item.currentItem || null
++
++        property string subPage: ""
++        readonly property bool subPageShown: visible && status === Loader.Ready
++
++        function openSubPage(page) {
++            subPage = page;
++        }
++
++        function closeSubPage() {
++            open = false;
++        }
++
++        source: switch(subPage) {
++            case "preview": return "PreviewListView.qml";
++            case "settings": return "ScopeSettingsPage.qml";
++            default: return "";
++        }
++
++        onLoaded: {
++            item.scope = Qt.binding(function() { return subPageLoader.scope; } )
++            item.scopeStyle = Qt.binding(function() { return subPageLoader.scopeStyle; } )
++            if (subPage == "preview") {
++                item.open = Qt.binding(function() { return subPageLoader.open; } )
++                item.initialIndex = Qt.binding(function() { return subPageLoader.initialIndex; } )
++                item.model = Qt.binding(function() { return subPageLoader.model; } )
+             }
++            open = true;
++        }
++
++        onOpenChanged: pageHeaderLoader.item.unfocus()
++
++        onVisibleChanged: if (!visible) subPage = ""
++
++        Connections {
++            target: subPageLoader.item
++            onBackClicked: subPageLoader.closeSubPage()
+         }
+     }
--
+ }
 === modified file 'qml/Dash/PageHeader.qml'
 --- qml/Dash/PageHeader.qml	2014-08-27 08:28:24 +0000
 +++ qml/Dash/PageHeader.qml	2014-08-27 08:28:24 +0000
@@ -31,6 +31,7 @@
      property string title
      property bool searchEntryEnabled: false
++    property bool settingsEnabled: false
      property ListModel searchHistory: SearchHistoryModel
      property alias searchQuery: searchTextField.text
      property alias searchHint: searchTextField.placeholderText
@@ -44,6 +45,7 @@
      property var scopeStyle: null
      signal backClicked()
++    signal settingsClicked()
      onScopeStyleChanged: refreshLogo()
      onSearchQueryChanged: {
@@ -246,9 +248,7 @@
                      backAction: Action {
                          iconName: "back"
                          visible: root.showBackButton
--                        onTriggered: {
--                            root.backClicked();
--                        }
++                        onTriggered: root.backClicked()
+                     }
                      actions: [
@@ -260,6 +260,12 @@
                                  headerContainer.showSearch = true;
                                  searchTextField.forceActiveFocus();
+                             }
++                        },
++                        Action {
++                            objectName: "settings"
++                            iconName: "settings"
++                            visible: root.settingsEnabled
++                            onTriggered: root.settingsClicked()
+                         }
+                     ]
+                 }
 === modified file 'qml/Dash/PreviewListView.qml'
 --- qml/Dash/PreviewListView.qml	2014-08-27 08:28:24 +0000
 +++ qml/Dash/PreviewListView.qml	2014-08-27 08:28:24 +0000
@@ -23,6 +23,7 @@
  Item {
      id: root
++    property int initialIndex: -1
      property var scope: null
      property var scopeStyle: null
@@ -37,6 +38,8 @@
      readonly property bool processing: currentItem && (!currentItem.previewModel.loaded
                                                         || currentItem.previewModel.processingAction)
++    signal backClicked()
++
      PageHeader {
          id: header
          objectName: "pageHeader"
@@ -46,7 +49,7 @@
          searchEntryEnabled: false
          scopeStyle: root.scopeStyle
--        onBackClicked: root.open = false
++        onBackClicked: root.backClicked()
+     }
      ListView  {
@@ -80,6 +83,13 @@
+             }
+         }
++        onCountChanged: {
++            if (count > 0 && initialIndex >= 0) {
++                currentIndex = initialIndex;
++                initialIndex = -1;
++            }
++        }
++
          delegate: Previews.Preview {
              id: preview
              objectName: "preview" + index
 === added directory 'qml/Dash/ScopeSettings'
 === added file 'qml/Dash/ScopeSettings/ScopeSetting.qml'
 --- qml/Dash/ScopeSettings/ScopeSetting.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/ScopeSettings/ScopeSetting.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,37 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++import Ubuntu.Components 1.1
++
++/*! Interface for settings widgets. */
++
++Item {
++    //! The ScopeStyle component.
++    property var scopeStyle: null
++
++    //! Variable used to contain widget's data
++    property var widgetData: null
++
++    /*! \brief This signal should be emitted when a setting action was updated.
++     *
++     *  \param value the new setting value.
++     */
++    signal updated(var value)
++
++    //! \internal
++    readonly property real settingMargins: units.gu(2)
++}
 === added file 'qml/Dash/ScopeSettings/ScopeSettingBoolean.qml'
 --- qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/ScopeSettings/ScopeSettingBoolean.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,61 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++import Ubuntu.Components 1.1
++import Ubuntu.Components.ListItems 1.0 as ListItem
++
++ScopeSetting {
++    id: root
++    height: listItem.height
++
++    ListItem.Empty {
++        id: listItem
++
++        onClicked: {
++            control.checked = !control.checked;
++            updated(control.checked);
++        }
++
++        Label {
++            anchors {
++                left: parent.left
++                leftMargin: settingMargins
++                right: control.left
++                rightMargin: units.gu(1)
++                verticalCenter: parent.verticalCenter
++            }
++            text: widgetData.displayName
++            elide: Text.ElideMiddle
++            maximumLineCount: 2
++            wrapMode: Text.Wrap
++            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
++        }
++
++        CheckBox {
++            id: control
++            objectName: "control"
++            anchors {
++                right: parent.right
++                rightMargin: settingMargins
++                verticalCenter: parent.verticalCenter
++            }
++            checked: widgetData.value
++
++            onTriggered: root.updated(checked)
++        }
++    }
++}
 === added file 'qml/Dash/ScopeSettings/ScopeSettingList.qml'
 --- qml/Dash/ScopeSettings/ScopeSettingList.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/ScopeSettings/ScopeSettingList.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,50 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++import Ubuntu.Components 1.1
++import Ubuntu.Components.ListItems 1.0 as ListItem
++
++ScopeSetting {
++    id: root
++
++    // FIXME workaround for: https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1355830
++    height: listItem.currentlyExpanded ? listItem.itemHeight * widgetData.properties["values"].length + units.gu(6) : listItem.height
++
++    property int initialValue: -1
++
++    ListItem.ItemSelector {
++        id: listItem
++        objectName: "control"
++        anchors {
++            left: parent.left
++            right: parent.right
++        }
++        text: widgetData.displayName
++        model: widgetData.properties["values"]
++
++        onSelectedIndexChanged: {
++            if (root.initialValue >= 0) {
++                var tmpValue = root.initialValue;
++                root.initialValue = -1;
++                selectedIndex = tmpValue;
++                return;
++            }
++
++            root.updated(selectedIndex);
++        }
++    }
++}
 === added file 'qml/Dash/ScopeSettings/ScopeSettingNumber.qml'
 --- qml/Dash/ScopeSettings/ScopeSettingNumber.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/ScopeSettings/ScopeSettingNumber.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,21 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++
++ScopeSettingString {
++    mode: "number"
++}
 === added file 'qml/Dash/ScopeSettings/ScopeSettingString.qml'
 --- qml/Dash/ScopeSettings/ScopeSettingString.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/ScopeSettings/ScopeSettingString.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,83 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++import Ubuntu.Components 1.1
++import Ubuntu.Components.ListItems 1.0 as ListItem
++
++ScopeSetting {
++    id: root
++    height: listItem.height
++
++    property string mode: "string"
++
++    ListItem.Empty {
++        id: listItem
++        onClicked: {
++            control.forceActiveFocus();
++            control.selectAll();
++        }
++
++        Label {
++            id: label
++            anchors {
++                left: parent.left
++                leftMargin: settingMargins
++                right: control.left
++                rightMargin: units.gu(1)
++                verticalCenter: parent.verticalCenter
++            }
++            text: widgetData.displayName
++            elide: Text.ElideMiddle
++            maximumLineCount: 2
++            wrapMode: Text.Wrap
++            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
++        }
++
++        TextField {
++            id: control
++            objectName: "control"
++            anchors {
++                right: parent.right
++                rightMargin: settingMargins
++                verticalCenter: parent.verticalCenter
++            }
++            width: root.mode == "number" ? units.gu(8) : units.gu(12)
++            text: widgetData.value
++            color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.fieldText
++            validator: root.mode == "number" ? doubleValidator : null
++            hasClearButton: root.mode == "number" ? false : true
++
++            DoubleValidator {
++                id: doubleValidator
++            }
++
++            function updateText() {
++                if (acceptableInput) {
++                    text = displayText;
++                    root.updated(text);
++                }
++            }
++
++            onAccepted: updateText()
++            onActiveFocusChanged: {
++                if (!activeFocus) {
++                    updateText();
++                }
++            }
++        }
++    }
++}
 === added file 'qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml'
 --- qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/ScopeSettings/ScopeSettingsWidgetFactory.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,57 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++
++//! \brief This component loads the widgets based on type.
++
++Loader {
++    id: root
++
++    //! The ScopeStyle component.
++    property var scopeStyle: null
++
++    //! Variable used to contain widget's data
++    property var widgetData: null
++
++    //! Triggered signal forwarded from the widgets.
++    signal updated(var value)
++
++    source: widgetSource
++
++    //! \cond private
++    property url widgetSource: {
++        switch (widgetData.type) {
++            case "boolean": return "ScopeSettingBoolean.qml";
++            case "list": return "ScopeSettingList.qml";
++            case "number": return "ScopeSettingNumber.qml";
++            case "string": return "ScopeSettingString.qml";
++            default: return "";
++        }
++    }
++    //! \endcond
++
++    onLoaded: {
++        if (item.hasOwnProperty("initialValue")) item.initialValue = root.widgetData.value;
++        item.widgetData = Qt.binding(function() { return root.widgetData; } )
++        item.scopeStyle = Qt.binding(function() { return root.scopeStyle; } )
++    }
++
++    Connections {
++        target: root.item
++        onUpdated: if (value !== widgetData.value) root.updated(value)
++    }
++}
 === added file 'qml/Dash/ScopeSettingsPage.qml'
 --- qml/Dash/ScopeSettingsPage.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/ScopeSettingsPage.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.2
++import Ubuntu.Components 1.1
++import Unity 0.2
++import "../Components"
++import "ScopeSettings"
++
++Item {
++    id: root
++
++    property var scope: null
++    property var scopeStyle: null
++
++    signal backClicked()
++
++    PageHeader {
++        id: header
++        objectName: "pageHeader"
++        width: parent.width
++        title: scope ? scope.name : ""
++        showBackButton: true
++        scopeStyle: root.scopeStyle
++
++        onBackClicked: root.backClicked()
++    }
++
++    ListView {
++        id: scopeSettings
++        objectName: "scopeSettings"
++        anchors {
++            top: header.bottom
++            bottom: parent.bottom
++            left: parent.left
++            right: parent.right
++        }
++        model: root.scope ? root.scope.settings : null
++
++        delegate: ScopeSettingsWidgetFactory {
++            objectName: "scopeSettingItem" + index
++            width: root.width
++            widgetData: model
++            scopeStyle: root.scopeStyle
++
++            onUpdated: model.value = value;
++        }
++    }
++}
 === modified file 'qml/Dash/ScopesOverview.qml'
 --- qml/Dash/ScopesOverview.qml	2014-08-27 08:28:24 +0000
 +++ qml/Dash/ScopesOverview.qml	2014-08-27 08:28:24 +0000
@@ -468,6 +468,8 @@
          width: parent.width
          height: parent.height
          anchors.left: scopesOverviewContent.right
++
++        onBackClicked: open = false
+     }
      Item {
 === modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
 --- tests/autopilot/unity8/shell/emulators/dash.py	2014-08-14 01:29:20 +0000
 +++ tests/autopilot/unity8/shell/emulators/dash.py	2014-08-27 08:28:24 +0000
@@ -140,10 +140,9 @@
      def enter_search_query(self, query):
          current_header = self._get_current_page_header()
--        self.pointing_device.move(current_header.globalRect.x +
--                                  current_header.width - current_header.height / 4,
--                                  current_header.globalRect.y +
--                                  current_header.height / 4)
++        search_button = current_header.select_single(objectName="search_header_button")
++        self.pointing_device.move(search_button.globalRect.x + search_button.width / 2,
++                                  search_button.globalRect.y + search_button.height / 2)
          self.pointing_device.click()
          headerContainer = current_header.select_single(
              objectName="headerContainer")
@@ -186,7 +185,8 @@
          # --elopio - 2014-1-14
          self.click_scope_item(category, app_name)
          preview_list = self.wait_select_single(
--            'PreviewListView', objectName='previewListView')
++            'QQuickLoader', objectName='subPageLoader')
++        preview_list.subPageShown.wait_for(True)
          preview_list.x.wait_for(0)
          return preview_list.select_single(
              Preview, objectName='preview{}'.format(preview_list.currentIndex))
 === modified file 'tests/mocks/Unity/CMakeLists.txt'
 --- tests/mocks/Unity/CMakeLists.txt	2014-08-25 10:05:13 +0000
 +++ tests/mocks/Unity/CMakeLists.txt	2014-08-27 08:28:24 +0000
@@ -24,6 +24,7 @@
    fake_scope.cpp
    fake_scopes.cpp
    fake_scopesoverview.cpp
++  fake_settingsmodel.cpp
    fake_categories.cpp
    fake_navigation.cpp
    fake_resultsmodel.cpp
@@ -39,6 +40,7 @@
    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ResultsModelInterface.h
    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ScopeInterface.h
    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ScopesInterface.h
++  ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/SettingsModelInterface.h
+ )
  add_library(FakeUnityQml MODULE ${UnityQML_SOURCES})
 === modified file 'tests/mocks/Unity/fake_scope.cpp'
 --- tests/mocks/Unity/fake_scope.cpp	2014-08-27 08:28:24 +0000
 +++ tests/mocks/Unity/fake_scope.cpp	2014-08-27 08:28:24 +0000
@@ -22,6 +22,7 @@
  #include "fake_navigation.h"
  #include "fake_resultsmodel.h"
  #include "fake_scopes.h"
++#include "fake_settingsmodel.h"
  Scope::Scope(Scopes* parent) : Scope(QString(), QString(), false, parent)
+ {
@@ -39,6 +40,7 @@
      , m_previewRendererName("preview-generic")
      , m_categories(new Categories(categories, this))
      , m_openScope(nullptr)
++    , m_settings(new SettingsModel(this))
+ {
+ }
@@ -94,7 +96,7 @@
  unity::shell::scopes::SettingsModelInterface* Scope::settings() const
+ {
--    return nullptr;
++    return m_settings;
+ }
  QString Scope::noResultsHint() const
 === modified file 'tests/mocks/Unity/fake_scope.h'
 --- tests/mocks/Unity/fake_scope.h	2014-08-07 08:52:59 +0000
 +++ tests/mocks/Unity/fake_scope.h	2014-08-27 08:28:24 +0000
@@ -96,6 +96,7 @@
      unity::shell::scopes::CategoriesInterface* m_categories;
      unity::shell::scopes::ScopeInterface* m_openScope;
++    unity::shell::scopes::SettingsModelInterface* m_settings;
  };
  #endif // FAKE_SCOPE_H
 === added file 'tests/mocks/Unity/fake_settingsmodel.cpp'
 --- tests/mocks/Unity/fake_settingsmodel.cpp	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/fake_settingsmodel.cpp	2014-08-27 08:28:24 +0000
@@ -0,0 +1,95 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include "fake_settingsmodel.h"
++
++SettingsModel::SettingsModel(QObject* parent) :
++        SettingsModelInterface(parent) {
++    {
++        QVariantMap parameters;
++        m_data << QSharedPointer<Data>(new Data("boolean-setting", "Boolean Setting", "boolean", parameters, true));
++    }
++    {
++        QVariantMap parameters;
++        parameters["values"] = QVariantList() << "First" << "Second" << "Third";
++        m_data << QSharedPointer<Data>(new Data("list-setting", "List Setting", "list", parameters, 1));
++    }
++    {
++        QVariantMap parameters;
++        m_data << QSharedPointer<Data>(new Data("number-setting", "Number Setting", "number", parameters, 1.23));
++    }
++    {
++        QVariantMap parameters;
++        m_data << QSharedPointer<Data>(new Data("string-setting", "String Setting", "string", parameters, "flibble"));
++    }
++}
++
++QVariant SettingsModel::data(const QModelIndex& index, int role) const {
++    int row = index.row();
++    QVariant result;
++
++    if (row < m_data.size()) {
++        auto data = m_data[row];
++
++        switch (role) {
++        case Roles::RoleSettingId:
++            result = data->id;
++            break;
++        case Roles::RoleDisplayName:
++            result = data->displayName;
++            break;
++        case Roles::RoleType:
++            result = data->type;
++            break;
++        case Roles::RoleProperties:
++            result = data->properties;
++            break;
++        case Roles::RoleValue: {
++            result = data->value;
++            break;
++        }
++        default:
++            break;
++        }
++    }
++
++    return result;
++}
++
++bool SettingsModel::setData(const QModelIndex &index, const QVariant &value, int role) {
++    int row = index.row();
++    if (row < m_data.size()) {
++        switch (role) {
++        case SettingsModelInterface::RoleValue: {
++            auto data = m_data[row];
++            data->value = value;
++            return true;
++        }
++        default:
++            break;
++        }
++    }
++
++    return false;
++}
++
++int SettingsModel::rowCount(const QModelIndex&) const {
++    return count();
++}
++
++int SettingsModel::count() const {
++    return m_data.size();
++}
 === added file 'tests/mocks/Unity/fake_settingsmodel.h'
 --- tests/mocks/Unity/fake_settingsmodel.h	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/fake_settingsmodel.h	2014-08-27 08:28:24 +0000
@@ -0,0 +1,54 @@
++/*
++ * Copyright (C) 2014 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef FAKE_SETTINGSMODEL_H
++#define FAKE_SETTINGSMODEL_H
++
++#include <unity/shell/scopes/SettingsModelInterface.h>
++
++#include <QList>
++#include <QSharedPointer>
++
++class SettingsModel: public unity::shell::scopes::SettingsModelInterface {
++Q_OBJECT
++
++    struct Data {
++        QString id;
++        QString displayName;
++        QString type;
++        QVariant properties;
++        QVariant value;
++
++        Data(QString const& id_, QString const& displayName_,
++             QString const& type_, QVariant const& properties_,
++             QVariant const& value_) :
++             id(id_), displayName(displayName_), type(type_),
++             properties(properties_), value(value_) {}
++    };
++
++public:
++    explicit SettingsModel(QObject* parent = 0);
++    ~SettingsModel() = default;
++    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
++    bool setData(const QModelIndex&index, const QVariant& value, int role = Qt::EditRole) override;
++    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
++    int count() const override;
++
++protected:
++    QList<QSharedPointer<Data>> m_data;
++};
++
++#endif // FAKE_SETTINGSMODEL_H
 === modified file 'tests/mocks/Unity/fake_unity_plugin.cpp'
 --- tests/mocks/Unity/fake_unity_plugin.cpp	2014-08-11 09:57:29 +0000
 +++ tests/mocks/Unity/fake_unity_plugin.cpp	2014-08-27 08:28:24 +0000
@@ -26,6 +26,7 @@
  #include "fake_previewmodel.h"
  #include "fake_previewwidgetmodel.h"
  #include "fake_resultsmodel.h"
++#include "fake_settingsmodel.h"
  // External
  #include <glib-object.h>
@@ -43,6 +44,7 @@
      qmlRegisterType<Scopes>(uri, 0, 2, "Scopes");
      qmlRegisterType<Scope>(uri, 0, 2, "MockScope");
      qmlRegisterUncreatableType<unity::shell::scopes::ScopeInterface>(uri, 0, 2, "Scope", "Can't create Scope object in QML.");
++    qmlRegisterUncreatableType<unity::shell::scopes::SettingsModelInterface>(uri, 0, 2, "SettingsModel", "Can't create SettingsModel object in QML.");
      qmlRegisterUncreatableType<unity::shell::scopes::NavigationInterface>(uri, 0, 2, "Navigation", "Can't create Navigation object in QML.");
      qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");
      qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", "Can't create new PreviewModel in QML. Get them from PreviewStack instance.");
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2014-08-27 08:28:24 +0000
 +++ tests/qmltests/CMakeLists.txt	2014-08-27 08:28:24 +0000
@@ -55,6 +55,11 @@
  add_qml_test(Dash/Previews PreviewVideoPlayback)
  add_qml_test(Dash/Previews PreviewWidgetFactory)
  add_qml_test(Dash/Previews PreviewZoomableImage)
++add_qml_test(Dash/ScopeSettings ScopeSettingBoolean)
++add_qml_test(Dash/ScopeSettings ScopeSettingList)
++add_qml_test(Dash/ScopeSettings ScopeSettingNumber)
++add_qml_test(Dash/ScopeSettings ScopeSettingString)
++add_qml_test(Dash/ScopeSettings ScopeSettingsWidgetFactory)
  add_qml_test(Greeter Lockscreen ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
  add_qml_test(Greeter MultiGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
  add_qml_test(Greeter SingleGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
 === modified file 'tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2014-08-27 08:28:24 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2014-08-27 08:28:24 +0000
@@ -94,7 +94,7 @@
              factory.widgetData = { type: data.type };
              factory.widgetType = data.type;
--            verify(("" + factory.source).indexOf(data.source) != -1);
++            verify((String(factory.source)).indexOf(data.source) != -1);
+         }
+     }
+ }
 === added directory 'tests/qmltests/Dash/ScopeSettings'
 === added file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml'
 --- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingBoolean.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,62 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++import QtTest 1.0
++import "../../../../qml/Dash/ScopeSettings"
++import Unity.Test 0.1 as UT
++
++Rectangle {
++    id: root
++    width: units.gu(40)
++    height: units.gu(80)
++
++    property var settingData: {
++        "displayName" : "Mock boolean setting",
++        "value": true
++    }
++
++    ScopeSettingBoolean {
++        id: scopeSetting
++        widgetData: settingData
++        width: parent.width
++    }
++
++    SignalSpy {
++        id: spy
++        target: scopeSetting
++        signalName: "updated"
++    }
++
++    UT.UnityTestCase {
++        id: testCase
++        name: "ScopeSettingBoolean"
++        when: windowShown
++
++        function test_updated() {
++            var control = findChild(scopeSetting, "control");
++            mouseClick(control, control.width / 2, control.height / 2);
++            spy.wait();
++            compare(spy.signalArguments[0][0], false);
++
++            spy.clear();
++            mouseClick(scopeSetting, scopeSetting.width / 2, scopeSetting.height / 2);
++            spy.wait();
++            compare(spy.signalArguments[0][0], true);
++        }
++    }
++}
 === added file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml'
 --- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingList.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,84 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++import QtTest 1.0
++import "../../../../qml/Dash/ScopeSettings"
++import Unity.Test 0.1 as UT
++
++Rectangle {
++    id: root
++    width: units.gu(40)
++    height: units.gu(80)
++
++    property var settingData: {
++        "displayName" : "Mock list setting",
++        "properties": { "values" : [ "first", "second", "third" ] }
++    }
++
++    ScopeSettingList {
++        id: scopeSetting
++        width: parent.width
++        widgetData: settingData
++    }
++
++    SignalSpy {
++        id: spy
++        target: scopeSetting
++        signalName: "updated"
++    }
++
++    UT.UnityTestCase {
++        id: testCase
++        name: "ScopeSettingList"
++        when: windowShown
++
++        property var control: findChild(scopeSetting, "control")
++
++        function cleanup() {
++            control.selectedIndex = 0;
++            spy.clear();
++        }
++
++        function test_initialValue() {
++            // there's no initialIndex, so we workaround, testing is difficult too https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1362031
++            var newObject = Qt.createQmlObject('import "../../../../qml/Dash/ScopeSettings" \n\
++                                                ScopeSettingList { initialValue: 2; }', root, "dynamicScopeSettingList");
++            newObject.widgetData = settingData;
++            var controlDynamic = findChild(newObject, "control");
++            tryCompare(controlDynamic, "selectedIndex", 2);
++        }
++
++        function test_updated_data() {
++            return [
++                { tag: "current", index: 0, updated: false },
++                { tag: "second", index: 1, updated: true },
++                { tag: "third", index: 2, updated: true }
++            ]
++        }
++
++        function test_updated(data) {
++            control.selectedIndex = data.index;
++            if (data.updated) {
++                spy.wait();
++                compare(spy.signalArguments[0][0], data.index);
++            } else {
++                compare(spy.count, 0);
++            }
++        }
++    }
++}
 === added file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml'
 --- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingNumber.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,98 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++import QtTest 1.0
++import "../../../../qml/Dash/ScopeSettings"
++import Unity.Test 0.1 as UT
++
++Rectangle {
++    id: root
++    width: units.gu(40)
++    height: units.gu(80)
++
++    property var settingData: {
++        "displayName" : "Mock number setting",
++        "value": 0.2
++    }
++
++    ScopeSettingNumber {
++        id: scopeSetting
++        widgetData: settingData
++        width: parent.width
++    }
++
++    SignalSpy {
++        id: spy
++        target: scopeSetting
++        signalName: "updated"
++    }
++
++    UT.UnityTestCase {
++        id: testCase
++        name: "ScopeSettingNumber"
++        when: windowShown
++
++        property var control: findChild(scopeSetting, "control")
++        property real newNumber: 11.7
++
++        function cleanup() {
++            control.focus = false;
++            control.text = settingData.value;
++            spy.clear();
++        }
++
++        function test_updated_on_unfocus() {
++            mouseClick(control, control.width / 2, control.height / 2);
++            control.selectAll();
++            control.cut();
++            control.insert(0, newNumber);
++            control.focus = false;
++            spy.wait();
++            verify(spy.signalArguments[0][0] == newNumber);
++        }
++
++        function test_updated_on_accepted() {
++            mouseClick(control, control.width / 2, control.height / 2);
++            control.selectAll();
++            control.cut();
++            control.insert(0, newNumber);
++            control.accepted();
++            spy.wait();
++            verify(spy.signalArguments[0][0] == newNumber);
++        }
++
++        function test_selection_on_listitem_click() {
++            mouseClick(scopeSetting, 0, scopeSetting.height / 2);
++            compare(control.focus, true);
++            // we're checking that selectAll() is being called by omitting it here
++            control.cut();
++            control.insert(0, newNumber);
++            verify(control.displayText == newNumber);
++        }
++
++        function test_unacceptable_input() {
++            mouseClick(control, control.width / 2, control.height / 2);
++            control.selectAll();
++            control.cut();
++            control.insert(0, "not valid");
++            control.accepted();
++            compare(spy.count, 0);
++            compare(control.displayText, "");
++        }
++    }
++}
 === added file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml'
 --- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingString.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,88 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++import QtTest 1.0
++import "../../../../qml/Dash/ScopeSettings"
++import Unity.Test 0.1 as UT
++
++Rectangle {
++    id: root
++    width: units.gu(40)
++    height: units.gu(80)
++
++    property var settingData: {
++        "displayName" : "Mock string setting",
++        "value": "mock string"
++    }
++
++    ScopeSettingString {
++        id: scopeSetting
++        widgetData: settingData
++        width: parent.width
++    }
++
++    SignalSpy {
++        id: spy
++        target: scopeSetting
++        signalName: "updated"
++    }
++
++    UT.UnityTestCase {
++        id: testCase
++        name: "ScopeSettingString"
++        when: windowShown
++
++        property var control: findChild(scopeSetting, "control")
++        property string newText: "new text to compare"
++
++        function cleanup() {
++            control.focus = false;
++            control.text = settingData.value;
++            spy.clear();
++        }
++
++        function test_updated_on_unfocus() {
++            mouseClick(control, control.width / 2, control.height / 2);
++            control.selectAll();
++            control.cut();
++            control.insert(0, newText);
++            control.focus = false;
++            spy.wait();
++            compare(spy.signalArguments[0][0], newText);
++        }
++
++        function test_updated_on_accepted() {
++            mouseClick(control, control.width / 2, control.height / 2);
++            control.selectAll();
++            control.cut();
++            control.insert(0, newText);
++            control.accepted();
++            spy.wait();
++            compare(spy.signalArguments[0][0], newText);
++        }
++
++        function test_selection_on_listitem_click() {
++            mouseClick(scopeSetting, 0, scopeSetting.height / 2);
++            compare(control.focus, true);
++            // we're checking that selectAll() is being called by omitting it here
++            control.cut();
++            control.insert(0, newText);
++            compare(control.displayText, newText);
++        }
++    }
++}
 === added file 'tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml'
 --- tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Dash/ScopeSettings/tst_ScopeSettingsWidgetFactory.qml	2014-08-27 08:28:24 +0000
@@ -0,0 +1,65 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 1.1
++import QtTest 1.0
++import "../../../../qml/Dash/ScopeSettings"
++import Unity.Test 0.1 as UT
++
++Rectangle {
++    id: root
++    width: units.gu(40)
++    height: units.gu(80)
++
++    property var settingData: {
++        "type": "",
++        "displayName" : "Mock setting",
++        "value": "1",
++        "properties": { "values" : [ "first", "second", "third" ] }
++    }
++
++    ScopeSettingsWidgetFactory {
++        id: scopeSettingsWidgetFactory
++        anchors {
++            left: parent.left
++            right: parent.right
++        }
++    }
++
++    UT.UnityTestCase {
++        id: testCase
++        name: "ScopeSettingWidgetFactory"
++        when: windowShown
++
++        function test_mapping_data() {
++            return [
++                { tag: "Boolean", type: "boolean", source: "ScopeSettingBoolean.qml" },
++                { tag: "List", type: "list", source: "ScopeSettingList.qml" },
++                { tag: "Number", type: "number", source: "ScopeSettingNumber.qml" },
++                { tag: "String", type: "string", source: "ScopeSettingString.qml" }
++            ];
++        }
++
++        function test_mapping(data) {
++            var newSettingData = settingData;
++            newSettingData.type = data.type;
++            scopeSettingsWidgetFactory.widgetData = newSettingData;
++
++            verify((String(scopeSettingsWidgetFactory.source)).indexOf(data.source) != -1);
++        }
++    }
++}
 === modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
 --- tests/qmltests/Dash/tst_GenericScopeView.qml	2014-08-27 08:28:24 +0000
 +++ tests/qmltests/Dash/tst_GenericScopeView.qml	2014-08-27 08:28:24 +0000
@@ -39,6 +39,8 @@
      Scopes {
          id: scopes
++        // for tryGenericScopeView
++        onLoadedChanged: if (loaded) genericScopeView.scope = scopes.getScope(2);
+     }
      SignalSpy {
@@ -59,7 +61,7 @@
              name: "GenericScopeView"
              when: scopes.loaded && windowShown
--            property Item previewListView: findChild(genericScopeView, "previewListView")
++            property Item subPageLoader: findChild(genericScopeView, "subPageLoader")
              property Item header: findChild(genericScopeView, "scopePageHeader")
              function init() {
@@ -94,24 +96,24 @@
                  tryCompare(genericScopeView.scope, "isActive", false)
                  genericScopeView.isCurrent = true
                  tryCompare(genericScopeView.scope, "isActive", true)
--                testCase.previewListView.open = true
++                testCase.subPageLoader.open = true
                  tryCompare(genericScopeView.scope, "isActive", false)
--                testCase.previewListView.open = false
++                testCase.subPageLoader.open = false
                  tryCompare(genericScopeView.scope, "isActive", true)
                  genericScopeView.isCurrent = false
                  tryCompare(genericScopeView.scope, "isActive", false)
+             }
              function test_showDash() {
--                testCase.previewListView.open = true;
++                testCase.subPageLoader.open = true;
                  genericScopeView.scope.showDash();
--                tryCompare(testCase.previewListView, "open", false);
++                tryCompare(testCase.subPageLoader, "open", false);
+             }
              function test_hideDash() {
--                testCase.previewListView.open = true;
++                testCase.subPageLoader.open = true;
                  genericScopeView.scope.hideDash();
--                tryCompare(testCase.previewListView, "open", false);
++                tryCompare(testCase.subPageLoader, "open", false);
+             }
              function test_searchQuery() {
@@ -214,7 +216,7 @@
                  openPreview(4, 0);
--                compare(testCase.previewListView.count, 12, "There should only be 12 items in preview.");
++                compare(testCase.subPageLoader.count, 12, "There should only be 12 items in preview.");
                  closePreview();
+             }
@@ -276,19 +278,21 @@
                                      true);
                  var tile = findChild(findChild(genericScopeView, category), "delegate"+delegate);
                  mouseClick(tile, tile.width / 2, tile.height / 2);
--                tryCompare(testCase.previewListView, "open", true);
--                tryCompare(testCase.previewListView, "x", 0);
++                tryCompare(testCase.subPageLoader, "open", true);
++                tryCompare(testCase.subPageLoader, "x", 0);
+             }
              function closePreview() {
--                var closePreviewMouseArea = findChild(genericScopeView, "innerPageHeader");
++                var closePreviewMouseArea = findChild(subPageLoader.item, "pageHeader");
                  mouseClick(closePreviewMouseArea, units.gu(2), units.gu(2));
--                tryCompare(testCase.previewListView, "open", false);
++                tryCompare(testCase.subPageLoader, "open", false);
++                tryCompare(testCase.subPageLoader, "visible", false);
+             }
              function test_previewOpenClose() {
--                tryCompare(testCase.previewListView, "open", false);
++                tryCompare(testCase.subPageLoader, "open", false);
++                tryCompare(testCase.subPageLoader, "visible", false);
                  var categoryListView = findChild(genericScopeView, "categoryListView");
                  categoryListView.positionAtBeginning();
@@ -300,7 +304,7 @@
              function test_showPreviewCarousel() {
                  var category = scrollToCategory("dashCategory1");
--                tryCompare(testCase.previewListView, "open", false);
++                tryCompare(testCase.subPageLoader, "open", false);
                  var tile = findChild(category, "carouselDelegate1");
                  verify(tile, "Could not find delegate");
@@ -308,14 +312,14 @@
                  mouseClick(tile, tile.width / 2, tile.height / 2);
                  tryCompare(tile, "explicitlyScaled", true);
                  mouseClick(tile, tile.width / 2, tile.height / 2);
--                tryCompare(testCase.previewListView, "open", true);
--                tryCompare(testCase.previewListView, "x", 0);
++                tryCompare(testCase.subPageLoader, "open", true);
++                tryCompare(testCase.subPageLoader, "x", 0);
                  closePreview();
                  mousePress(tile, tile.width / 2, tile.height / 2);
--                tryCompare(testCase.previewListView, "open", true);
--                tryCompare(testCase.previewListView, "x", 0);
++                tryCompare(testCase.subPageLoader, "open", true);
++                tryCompare(testCase.subPageLoader, "x", 0);
                  mouseRelease(tile, tile.width / 2, tile.height / 2);
                  closePreview();
@@ -324,20 +328,20 @@
              function test_showPreviewHorizontalList() {
                  var category = scrollToCategory("dashCategory18");
--                tryCompare(testCase.previewListView, "open", false);
++                tryCompare(testCase.subPageLoader, "open", false);
                  var tile = findChild(category, "delegate1");
                  verify(tile, "Could not find delegate");
                  mouseClick(tile, tile.width / 2, tile.height / 2);
--                tryCompare(testCase.previewListView, "open", true);
--                tryCompare(testCase.previewListView, "x", 0);
++                tryCompare(testCase.subPageLoader, "open", true);
++                tryCompare(testCase.subPageLoader, "x", 0);
                  closePreview();
                  mousePress(tile, tile.width / 2, tile.height / 2);
--                tryCompare(testCase.previewListView, "open", true);
--                tryCompare(testCase.previewListView, "x", 0);
++                tryCompare(testCase.subPageLoader, "open", true);
++                tryCompare(testCase.subPageLoader, "x", 0);
                  mouseRelease(tile, tile.width / 2, tile.height / 2);
                  closePreview();
@@ -347,25 +351,52 @@
                  var categoryListView = findChild(genericScopeView, "categoryListView");
                  categoryListView.positionAtBeginning();
--                tryCompare(testCase.previewListView, "open", false);
--                var previewListViewList = findChild(previewListView, "listView");
++                tryCompare(testCase.subPageLoader, "open", false);
                  openPreview();
++                var previewListViewList = findChild(subPageLoader.item, "listView");
                  // flick to the next previews
--                tryCompare(testCase.previewListView, "count", 15);
--                for (var i = 1; i < testCase.previewListView.count; ++i) {
--                    mouseFlick(testCase.previewListView, testCase.previewListView.width - units.gu(1),
--                                                testCase.previewListView.height / 2,
++                tryCompare(testCase.subPageLoader, "count", 15);
++                for (var i = 1; i < testCase.subPageLoader.count; ++i) {
++                    mouseFlick(testCase.subPageLoader.item, testCase.subPageLoader.width - units.gu(1),
++                                                testCase.subPageLoader.height / 2,
                                                  units.gu(2),
--                                                testCase.previewListView.height / 2);
++                                                testCase.subPageLoader.height / 2);
                      tryCompare(previewListViewList, "moving", false);
--                    tryCompare(testCase.previewListView.currentItem, "objectName", "preview" + i);
--
++                    tryCompare(testCase.subPageLoader.currentItem, "objectName", "preview" + i);
+                 }
                  closePreview();
+             }
++            function test_settingsOpenClose() {
++                waitForRendering(genericScopeView);
++                verify(header, "Could not find the header.");
++                var innerHeader = findChild(header, "innerPageHeader");
++                verify(innerHeader, "Could not find the inner header");
++
++                // open
++                tryCompare(testCase.subPageLoader, "open", false);
++                tryCompare(testCase.subPageLoader, "visible", false);
++                var settings = findChild(innerHeader, "settings_header_button");
++                mouseClick(settings, settings.width / 2, settings.height / 2);
++                tryCompare(testCase.subPageLoader, "open", true);
++                tryCompareFunction(function() { return (String(subPageLoader.source)).indexOf("ScopeSettingsPage.qml") != -1; }, true);
++                tryCompare(genericScopeView, "subPageShown", true);
++                compare(testCase.subPageLoader.subPage, "settings");
++                tryCompare(testCase.subPageLoader, "x", 0);
++
++                // close
++                var settingsHeader = findChild(testCase.subPageLoader.item, "pageHeader");
++                mouseClick(settingsHeader, units.gu(2), units.gu(2));
++                tryCompare(testCase.subPageLoader, "open", false);
++                tryCompare(genericScopeView, "subPageShown", false);
++                var categoryListView = findChild(genericScopeView, "categoryListView");
++                tryCompare(categoryListView, "x", 0);
++                tryCompare(testCase.subPageLoader, "visible", false);
++                tryCompare(testCase.subPageLoader, "source", "");
++            }
++
              function test_header_style_data() {
                  return [
                      { tag: "Default", index: 0, foreground: UbuntuColors.darkGrey, background: "color:///#f5f5f5", logo: "" },