Merge lp:~kalikiana/ubuntu-ui-toolkit/appsettings into lp:ubuntu-ui-toolkit

[Cris Dywan]

Implement Settings and Option API with examples

Split action support in components into separate branches:
✓ lp:~kalikiana/ubuntu-ui-toolkit/checktrigger
✓ lp:~kalikiana/ubuntu-ui-toolkit/optiontrigger
✓ lp:~kalikiana/ubuntu-ui-toolkit/texttrigger
Excluding built-in types from qmlapicheck which includes U1db types:
✓ lp:~kalikiana/ubuntu-ui-toolkit/skipnuildinapi
Unrelated bugs affecting test case:
✓ lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/fix1244660 (MainView.qml:257: TypeError: Cannot call method 'hasOwnProperty')
✓ lp:~kalikiana/ubuntu-ui-toolkit/unit_x11_fixes (TextField.qml:839: TypeError: Cannot read property 'Integer')
UbuntuTestCase C++ API to make tests more consistent:
  lp:~kalikiana/ubuntu-ui-toolkit/ubuntuTestCaseCxx

[Cris Dywan (kalikiana)]

TODO: Add document on how to use Settings API

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:715
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/758/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/79
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/615
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/615/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-vm-saucy/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4092
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4092/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1614
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1614/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1354
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1366

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/758/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

I think this MR shoul dbe split in two ones at least... One is which fixes trigge() and TextField stuff, then a separate one which introduces the App Settings.

What is the U1DB API in the components.api?

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:720
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1181/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/569/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/554/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/129/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/129/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/569/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/554/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-ui-toolkit-ci/1181/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

Meh…

+++ components.api.new 2013-11-07 14:57:07.914501464 +0000
@@ -36,6 +36,7 @@ modules/Ubuntu/Components/Button.qml
 modules/Ubuntu/Components/CheckBox.qml
 AbstractButton
     property bool checked
+ function trigger()
 modules/Ubuntu/Components/CrossFadeImage.qml
 Item
     property url source

[Zsombor Egri (zsombi)]

Can we have more setting groups defined in an application? how do we select between those? Will the Settings.gropup property change cause settings reload?

review: Needs Information

[Zsombor Egri (zsombi)]

735 +Item {
736 + id: settings

Do we need an Item for this? In that way we can put visual items onto it, but that does not make any sense... Shouldn't we use Object instead? (not QtObject, we have the Object declared which can have children too).

review: Needs Information

[Zsombor Egri (zsombi)]

753 + Component.onCompleted: {

What if children get changed after this point? Do we exclude them from state saving?

review: Needs Information

[Zsombor Egri (zsombi)]

I'd rather like to see something like
Object {
   ...
    default property list<Option> options
   ---
}

So we make sure we cannot add anything else into the Settings blob... what do you think?

review: Needs Information

[Zsombor Egri (zsombi)]

Please close each JS line with semicolon.

review: Needs Fixing

[Cris Dywan (kalikiana)]

> Can we have more setting groups defined in an application? how do we select between those?

Yes, by using the "group" property which is a string.

> Will the Settings.gropup property change cause settings reload?

No and I don't see a use case for changing groups at runtime, so I added a warning that's shown if you try.

> 735 +Item {
> 736 + id: settings
> Do we need an Item for this? In that way we can put visual items onto it, but that does not make any sense... Shouldn't we use Object instead?

Yes and no. It must be an Item so that you can put it into another Item. It doesn't say anything about what you can put inside.

> 753 + Component.onCompleted: {
> What if children get changed after this point? Do we exclude them from state saving?

I changed it, this didn't work before I ported to a custom default property.

> default property list<Option> options
> So we make sure we cannot add anything else into the Settings blob

I failed to make this work before, I gave it another try. I managed to get it to work by using an alias on a second property which is the real list. If I declare it as one I get syntax errors. And indeed with this I could drop the hasOwnProperty checks. Though the error message generated by QML is not really great, it gets us an early failure.

> Please close each JS line with semicolon.

Done.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:725
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1248/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/860/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/848/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/860/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/848/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1248/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

> > Will the Settings.gropup property change cause settings reload?
>
> No and I don't see a use case for changing groups at runtime, so I added a
> warning that's shown if you try.

A use case is when you define different profiles for instance. Assume you have a host/port/login/password quadruple for "default", "home", "other device" groups. Then in your app you select the setting to be loaded based on the group itself. I'm talking about the settings use, not about its declaration.

>
> > 735 +Item {
> > 736 + id: settings
> > Do we need an Item for this? In that way we can put visual items onto it,
> but that does not make any sense... Shouldn't we use Object instead?
>
> Yes and no. It must be an Item so that you can put it into another Item. It
> doesn't say anything about what you can put inside.

You can put QtObjects inside Items, not only Items. The danger in deriving from Item is that you can declare visual components inside the Settings upon use, which may cause problems (as Settings' default w/h is 0).

I'd rather go for QtObject using the same approach for children definition as we have in Object.

>
> > 753 + Component.onCompleted: {
> > What if children get changed after this point? Do we exclude them from state
> saving?
>
> I changed it, this didn't work before I ported to a custom default property.
>
> > default property list<Option> options
> > So we make sure we cannot add anything else into the Settings blob
>
> I failed to make this work before, I gave it another try. I managed to get it
> to work by using an alias on a second property which is the real list. If I
> declare it as one I get syntax errors. And indeed with this I could drop the
> hasOwnProperty checks. Though the error message generated by QML is not really
> great, it gets us an early failure.

Yep, that's the way to do it, just like we have in Object. Btw, you could make that aliased property internal, as the name is not really nice :D

>
> > Please close each JS line with semicolon.
>
> Done.

Cool.

review: Needs Fixing

[Cris Dywan (kalikiana)]

> A use case is when you define different profiles for instance. Assume you have a host/port/login/password
> quadruple for "default", "home", "other device" groups. Then in your app you select the setting to be
> loaded based on the group itself. I'm talking about the settings use, not about its declaration.

That's something I didn't consider in this way… I need to think about that a bit more. I'll get back to this.

> You can put QtObjects inside Items, not only Items. The danger in deriving from Item is that you can declare visual components inside the Settings upon use

I tried it before and it doesn't work. If I declare Settings as Object it errors when declaring it in the gallery Settings example complaining that it can't be added to the list. This is with a TemplateRow, a normal component used in all the gallery examples.

As for as children goes, using list<Option> defines exactly what you can put inside, and you cannot add components in there anymore, so I think we are good on that front.

[Zsombor Egri (zsombi)]

> > A use case is when you define different profiles for instance. Assume you
> have a host/port/login/password
> > quadruple for "default", "home", "other device" groups. Then in your app you
> select the setting to be
> > loaded based on the group itself. I'm talking about the settings use, not
> about its declaration.
>
> That's something I didn't consider in this way… I need to think about that a
> bit more. I'll get back to this.
>
> > You can put QtObjects inside Items, not only Items. The danger in deriving
> from Item is that you can declare visual components inside the Settings upon
> use
>
> I tried it before and it doesn't work. If I declare Settings as Object it
> errors when declaring it in the gallery Settings example complaining that it
> can't be added to the list. This is with a TemplateRow, a normal component
> used in all the gallery examples.

Weird... let's keep it Item derived one, having the default property redirection would exclude the non-Option based children anyway.

Let's get the group change sorted then.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:728
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1596/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2388/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2259/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/544/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/544/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2390/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2259/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1596/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:730
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1597/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2397/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2268/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/545/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/545/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2399/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2268/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1597/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

FAIL! : tst_MainView::testLocalStorage() 'QFile::exists(databaseFolder)' returned FALSE. ()
   Loc: [tst_mainview.cpp(140)]

[lp:~kalikiana/ubuntu-ui-toolkit/appsettings]

731. By Cris Dywan on 2014-01-20

Merge lp:ubuntu-ui-toolkit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:731
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1609/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2468/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2311/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/557/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/557/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2470/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2311/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1609/rebuild

review: Needs Fixing (continuous-integration)

[lp:~kalikiana/ubuntu-ui-toolkit/appsettings]

732. By Cris Dywan on 2014-02-03

Merge lp:ubuntu-ui-toolkit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:732
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1667/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2846
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2594/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/615
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/615/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2492
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2848
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2848/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2595
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2595/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5019/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3566

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1667/rebuild

review: Needs Fixing (continuous-integration)

[lp:~kalikiana/ubuntu-ui-toolkit/appsettings]

733. By Cris Dywan on 2014-02-14

Merge lp:ubuntu-ui-toolkit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:733
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1732/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3247
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2917/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/680
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/680
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/680/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2854
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3249
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3249/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2919
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2919/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5323/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3968

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1732/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

I have few more question (perhaps we discussed about that but wasn't logged here):
1. can a Setting element be declared inside other elements? Maybe to understand it better, let's take the following example:

Page1.qml
Page {
    Settings {
        group: "page1group"
        Option {
        }
        // [...]
    }
}

Then main.qml
MainView {
    Settings {
        group: "whatever"
        // [...]
    }
}

2. Can one declare the same group in two different document? Taken the previous example, have the group "page1group" also in main.qml. If yes, do I have to have the same amount of Options in both places?

Asking this as in this way it would be easier to use the settings in individual documents rather than using the id of the setting from the topmost QML document of the app.

review: Needs Information

[Zsombor Egri (zsombi)]

915 +//#include <QtQuick/private/qquickanchors_p.h>
916 +//#include <QtQuick/private/qquickanchors_p_p.h>

Please remove these two lines.

review: Needs Fixing

[lp:~kalikiana/ubuntu-ui-toolkit/appsettings]

734. By Cris Dywan on 2014-02-21

Drop uncommented private headers from settings test

735. By Cris Dywan on 2014-02-21

Merge lp:ubuntu-ui-toolkit

736. By Cris Dywan on 2014-02-21

Delete settings.db at the start of the settings test

737. By Cris Dywan on 2014-02-21

Drop sync and persistent settings for now

738. By Cris Dywan on 2014-02-21

Strengthen defaults test to rule out missing settings

739. By Cris Dywan on 2014-02-21

Add more explicit checks of the internal document

[Cris Dywan (kalikiana)]

> 1. can a Setting element be declared inside other elements? Maybe to
> understand it better, let's take the following example:
>
> Page1.qml
> Page {
> Settings {

Anywhere is fine as these are not visual components.

> 2. Can one declare the same group in two different document? Taken the
> previous example, have the group "page1group" also in main.qml. If yes, do I
> have to have the same amount of Options in both places?
>
> Asking this as in this way it would be easier to use the settings in
> individual documents rather than using the id of the setting from the topmost
> QML document of the app.

You can declare the same group in one place only. Anything else would mean you never know if the group is complete. Having part of a group in a separate file or Loader would lead to undefined behavior and data loss.

It's still very flexible I think. You can declare Settings in a separate file as long as it's imported where it's needed. Separate groups can be used - they can be put in a Loader without any risk. If you bind components to existing options they also don't need to be in the same file.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:739
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1755/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3406
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3058/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/703
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/703
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/703/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3408
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3408/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3060
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3060/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5455/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4194

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1755/rebuild

review: Needs Fixing (continuous-integration)

[lp:~kalikiana/ubuntu-ui-toolkit/appsettings]

740. By Cris Dywan on 2014-02-27

More refinements and more sanity checks in unit test

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:740
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1802/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3563
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3172/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/750
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/750/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3567
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3174
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3174/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5558/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4345

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1802/rebuild

review: Needs Fixing (continuous-integration)

[lp:~kalikiana/ubuntu-ui-toolkit/appsettings]

741. By Cris Dywan on 2014-03-25

Merge lp:ubuntu-ui-toolkit

742. By Cris Dywan on 2014-04-02

Merge lp:ubuntu-ui-toolkit

743. By Cris Dywan on 2014-04-02

Revamp test cases using test columns and pure C++

744. By Cris Dywan on 2014-04-02

Add double option and component-based value changes

745. By Cris Dywan on 2014-04-02

First stab at Settings emulator

[Tim Peeters (tpeeters)]

Is is it really necessary to add a trigger() function to CheckBox? Can onCheckedChanged be used instead?

If trigger() is \internal, it should be __trigger()

[lp:~kalikiana/ubuntu-ui-toolkit/appsettings]

746. By Cris Dywan on 2014-04-02

Work-around inability to select non-visual components

747. By Cris Dywan on 2014-04-03

Verify flipped switches and clear the settings via a method

748. By Cris Dywan on 2014-04-04

Put switch in a property and use Eventually(Equals(

749. By Cris Dywan on 2014-04-04

No properties, restart within test, clear as class method

750. By Cris Dywan on 2014-04-04

Set __doc.docId when create is set to true

751. By Cris Dywan on 2014-04-04

Duoble-check that the database file exists

752. By Cris Dywan on 2014-04-04

Add string option and TextField component

753. By Cris Dywan on 2014-04-07

Add OptionSelector to Settings Autopilot test

754. By Cris Dywan on 2014-04-08

Use scenarios to test both default group and custom groups

755. By Cris Dywan on 2014-04-08

More concise code in autopilot code to conform to pep8

756. By Cris Dywan on 2014-04-10

Use multiple documents instead of one storage

Also use states to handle initialization

757. By Cris Dywan on 2014-04-10

Drop broken settings unit tests

758. By Cris Dywan on 2014-04-10

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

759. By Cris Dywan on 2014-04-11

Reword reasoning of CheckBox.trigger

760. By Cris Dywan on 2014-04-11

Maybe we should be pressing Enter

761. By Cris Dywan on 2014-04-11

Losing focus should suffice to save the value

762. By Cris Dywan on 2014-04-14

Use different syntax to avoid warning from property binding

763. By Cris Dywan on 2014-04-14

Move the real list property into an internal object

764. By Cris Dywan on 2014-04-14

Add qmlproperty annotation for Option

765. By Cris Dywan on 2014-04-16

Extend the settings tutorial with custom component example

766. By Cris Dywan on 2014-04-16

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

767. By Cris Dywan on 2014-04-16

Port settings test cases to new OptionSelector emulator

768. By Cris Dywan on 2014-04-16

Drop redundant [ ] in the State declared in Option

769. By Cris Dywan on 2014-04-16

Add parantheses around for and if blocks

770. By Cris Dywan on 2014-04-25

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

771. By Cris Dywan on 2014-04-25

Move Settings and Option to 1.1

772. By Cris Dywan on 2014-06-05

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

773. By Cris Dywan on 2014-06-05

Port Settings emulator to custom proxy objects

774. By Cris Dywan on 2014-06-06

Make flake8 happy

775. By Cris Dywan on 2014-06-06

Import Settings from custom proxy objects

[Florian Boucault (fboucault)]

Unless there is a solid reason against it, being API compatible with http://qt-project.org/doc/qt-5/qml-qt-labs-settings-settings.html would make us more future proof and would be easier for developers at large.

[Cris Dywan (kalikiana)]

There's been a lot of discussion around it. The Labs Settings API is limited for the purposes of defining defaults, binding values to components and abstracting when changes are preserved. Though if you have a specific idea around it feel free to file a bug with a proposal.

[Florian Boucault (fboucault)]

The specific use cases you are referring to have not been described in a
written form so it is hard for me to understand them. Can we add code
examples of things that cannot be done with the labs API?
On Jun 16, 2014 10:10 AM, "Christian Dywan" <email address hidden> wrote:

> There's been a lot of discussion around it. The Labs Settings API is
> limited for the purposes of defining defaults, binding values to components
> and abstracting when changes are preserved. Though if you have a specific
> idea around it feel free to file a bug with a proposal.
> --
>
> https://code.launchpad.net/~kalikiana/ubuntu-ui-toolkit/appsettings/+merge/181304
> Your team Ubuntu SDK team is subscribed to branch lp:ubuntu-ui-toolkit.
>

[lp:~kalikiana/ubuntu-ui-toolkit/appsettings]

776. By Cris Dywan on 2014-06-20

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

777. By Cris Dywan on 2014-06-27

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

Unmerged revisions

777. By Cris Dywan on 2014-06-27

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

776. By Cris Dywan on 2014-06-20

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

775. By Cris Dywan on 2014-06-06

Import Settings from custom proxy objects

774. By Cris Dywan on 2014-06-06

Make flake8 happy

773. By Cris Dywan on 2014-06-05

Port Settings emulator to custom proxy objects

772. By Cris Dywan on 2014-06-05

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

771. By Cris Dywan on 2014-04-25

Move Settings and Option to 1.1

770. By Cris Dywan on 2014-04-25

Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/staging

769. By Cris Dywan on 2014-04-16

Add parantheses around for and if blocks

768. By Cris Dywan on 2014-04-16

Drop redundant [ ] in the State declared in Option

=== modified file 'CHANGES'
--- CHANGES	2014-02-24 22:03:55 +0000
+++ CHANGES	2014-04-10 15:55:52 +0000
@@ -9,6 +9,7 @@
 
 API Changes
 ***********
+* DEPRECATED IN: Tabs: default property list<Item> tabChildren
 * ADDED IN: PickerDelegate: readonly property Picker picker
 * CHANGED IN: OptionSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
 * CHANGED IN: ItemSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded

=== modified file 'components.api'
--- components.api	2014-04-01 12:57:27 +0000
+++ components.api	2014-04-10 15:55:52 +0000
@@ -35,6 +35,7 @@
 modules/Ubuntu/Components/CheckBox.qml
 AbstractButton
     property bool checked
+    function trigger()
 modules/Ubuntu/Components/Colors/UbuntuColors.qml
 QtObject
     readonly property color orange
@@ -198,6 +199,12 @@
 modules/Ubuntu/Components/Object.qml
 QtObject
     default property internal children
+modules/Ubuntu/Components/Option.qml
+Action
+    property var name
+    property var defaultValue
+    property var value
+    property var __internal
 modules/Ubuntu/Components/OptionSelector.qml
 ListItem.Empty
     property var model
@@ -379,6 +386,11 @@
     property int align
     property bool __interactive
     property internal __private
+modules/Ubuntu/Components/Settings.qml
+Item
+    property string group
+    property list<Option> couldntGetListToWorkWithoutAlias
+    default property internal options
 modules/Ubuntu/Components/Slider.qml
 StyledItem
     property real minimumValue
@@ -417,9 +429,14 @@
     readonly property Tab selectedTab
     readonly property Item currentPage
     property TabBar tabBar
-    default property list<Item> tabChildren
+    property list<Item> tabChildren
     readonly property int count
     signal modelChanged()
+    function addTab(title, tab)
+    function insertTab(index, title, tab)
+    function getTab(index)
+    function moveTab(from, to)
+    function removeTab(index)
 modules/Ubuntu/Components/TextArea.qml
 StyledItem
     property bool highlighted
@@ -593,6 +610,8 @@
     function findChild(obj,objectName)
     function findInvisibleChild(obj,objectName)
     function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay)
+    function flick(item, x, y, dx, dy, pressTimeout, steps, button, modifiers, delay)
+    function mouseLongPress(item, x, y, button, modifiers, delay)
     function tryCompareFunction(func, expectedResult, timeout)
 plugins.qmltypes
     name: "InverseMouseAreaType"

=== modified file 'debian/control'
--- debian/control	2014-03-17 09:02:58 +0000
+++ debian/control	2014-04-10 15:55:52 +0000
@@ -20,6 +20,7 @@
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
                qtdeclarative5-window-plugin,
+               qtdeclarative5-u1db1.0,
                qtdeclarative5-qtfeedback-plugin,
                qtdeclarative5-unity-action-plugin (>= 1.1.0),
                qtdeclarative5-localstorage-plugin,
@@ -54,6 +55,7 @@
          libqt5svg5,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-window-plugin,
+         qtdeclarative5-u1db1.0,
          qtdeclarative5-qtfeedback-plugin,
          qtdeclarative5-unity-action-plugin (>= 1.1.0),
          ttf-ubuntu-font-family,

=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc	2014-01-23 17:13:24 +0000
+++ documentation/overview.qdoc	2014-04-10 15:55:52 +0000
@@ -26,6 +26,8 @@
      used when setting the size of UI elements (widgets, fonts, etc.) in order
      for them to behave well on a variety of devices.
      \li \l{Automatic State Saving} provides automatic property saving for components.
+     \li Applications can define \l{Application Settings} which can be bound to components,
+     handle default values and store changes.
      \endlist
 
      \part Basic QML Types

=== added file 'documentation/settings.qdoc'
--- documentation/settings.qdoc	1970-01-01 00:00:00 +0000
+++ documentation/settings.qdoc	2014-04-10 15:55:52 +0000
@@ -0,0 +1,172 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*!
+  \page ubuntu-settings.html
+  \title Application Settings
+
+  Typically applications have a few user-facing options that customize the UI or
+  change behavior for different use cases. Let's start with a simple example:
+
+  \qml
+    import QtQuick 2.0
+    import Ubuntu.Components 0.1
+
+    MainView {
+        applicationName: "example"
+
+        Settings {
+            Option {
+                id: optionVibrate
+                name: "vibrate"
+                defaultValue: false
+            }
+        }
+
+        Switch {
+            action: optionVibrate
+        }
+    }
+  \endqml
+
+  In a new application, we may initially just have one option which allows the
+  user to enable vibrations, and is off by default. That's all that is needed
+  for it to work, the API knows enough to load and save the value behind the scenes.
+
+  In the next iteration we may need a user name and age to be entered.
+
+  \qml
+    import QtQuick 2.0
+    import Ubuntu.Components 0.1
+
+    MainView {
+        applicationName: "example"
+
+        Settings {
+            Option {
+                id: optionName
+                name: "name"
+                defaultValue: "Jane Doe"
+            }
+            Option {
+                id: optionAge
+                name: "age"
+                defaultValue: 99
+            }
+        }
+
+        TextField {
+            action: optionName
+        }
+        TextField {
+            action: optionAge
+        }
+    }
+  \endqml
+
+  Again all we need to define is a name and a default value. The id is used to
+  be able to bind the options to UI components.
+
+  How about using those values in the app code?
+
+  \qml
+    import QtQuick 2.0
+    import Ubuntu.Components 0.1
+
+    Column {
+        Label {
+            text: i18n.tr("Name: %1").arg(optionName.value)
+        }
+        Label {
+            text: i18n.tr("Age: %1").arg(optionAge.value)
+        }
+        Button {
+            text: i18n.tr("Start playing")
+            onClicked: {
+                if (optionAge.value < 18)
+                    console.log("Sorry but this game is for adults.")
+                else
+                    console.log("Game started by the looks of it")
+            }
+        }
+    }
+  \endqml
+
+  Note that there's no need to worry about the default values in most cases - the
+  value reflects the saved or default automatically. If you need to ensure that
+  a value was given by the user you can however check it easily.
+
+  Let's try choosing a value from several choices where the user must choose one.
+
+  \qml
+    import QtQuick 2.0
+    import Ubuntu.Components 0.1
+
+    Column {
+        Settings {
+            Option {
+                name: "plan"
+                defaultValue: 0
+            }
+            OptionSelector {
+                action: optionPlan
+                model: [ "Undecided", "Phone only", "500G", "1G is enough" ]
+            }
+        }
+        Button {
+            text: i18n.tr("Start playing")
+            onClicked: {
+                if (optionPlan.value == 0)
+                    console.log("You must pick a data plan to continue.")
+                else
+                    console.log("Good choice, sir")
+            }
+        }
+    }
+  \endqml
+
+  As our app is starting to get really big let's use some grouping.
+
+  \qml
+    import QtQuick 2.0
+    import Ubuntu.Components 0.1
+
+    MainView {
+        applicationName: "example"
+
+        Settings {
+            group: "browser"
+            persistent: false
+            Option {
+                id: optionUrl
+                name: "homepage"
+                defaultValue: "http://www.duckduckgo.com"
+            }
+        }
+
+        TextField {
+            action: optionUrl
+        }
+    }
+  \endqml
+
+  Grouping of settings is entirely optional. Without a group name all options
+  are considered part of the "default" group.
+
+  We also just unset the persistant property, which means nothing will be saved
+  until the property is set to true.
+*/
+

=== added file 'examples/ubuntu-ui-toolkit-gallery/AppSettings.qml'
--- examples/ubuntu-ui-toolkit-gallery/AppSettings.qml	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/AppSettings.qml	2014-04-10 15:55:52 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Template {
+    TemplateSection {
+        className: "Settings"
+
+        TemplateRow {
+            title: i18n.tr("Boolean")
+
+            Settings {
+                group: "setting_boolean"
+                Option {
+                    id: optionVibrate
+                    name: "vibrate"
+                    defaultValue: false
+                    text: i18n.tr("Vibrate")
+                }
+            }
+
+            Label {
+                text: optionVibrate.value
+            }
+
+            Switch {
+                action: optionVibrate
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("String")
+            Settings {
+                group: "settings_string"
+                Option {
+                    id: optionHomepage
+                    name: "homepage"
+                    defaultValue: "http://www.duckduckgo.com"
+                    text: i18n.tr("Homepage")
+                }
+            }
+
+            Label {
+                text: optionHomepage.value
+            }
+
+            TextField {
+                action: optionHomepage
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("Integer")
+            Settings {
+                group: "settings_int"
+                Option {
+                    id: optionYearOfBirth
+                    name: "yeahOfBirth"
+                    defaultValue: 1975.2
+                    text: i18n.tr("Year of Birth")
+                }
+            }
+
+            Label {
+                text: optionYearOfBirth.value
+            }
+
+            TextField {
+                action: optionYearOfBirth
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("Choices")
+            Settings {
+                group: "settings_choices"
+                Option {
+                    id: optionHairColor
+                    name: "hairColor"
+                    defaultValue: 0
+                    text: i18n.tr("Hair Color")
+                }
+            }
+
+            Label {
+                text: optionHairColor.value
+            }
+
+            OptionSelector {
+                action: optionHairColor
+                expanded: true
+                height: units.gu(20)
+                model: [ "Black", "Ginger", "Peroxided", "White" ]
+            }
+        }
+    }
+}

=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2014-01-13 15:31:14 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2014-04-10 15:55:52 +0000
@@ -35,6 +35,10 @@
         source: "Buttons.qml"
     }
     ListElement {
+        label: "Settings"
+        source: "AppSettings.qml"
+    }
+    ListElement {
         objectName: "slidersElement"
         label: "Slider"
         source: "Sliders.qml"

=== modified file 'modules/Ubuntu/Components/CheckBox.qml'
--- modules/Ubuntu/Components/CheckBox.qml	2013-10-01 14:46:11 +0000
+++ modules/Ubuntu/Components/CheckBox.qml	2014-04-10 15:55:52 +0000
@@ -45,12 +45,21 @@
       Specifies whether the checkbox is checked or not. By default the property
       is set to false.
     */
-    property bool checked: false
+    property bool checked: action && action.hasOwnProperty("value") && typeof action.value == "boolean" ? action.value : false
+
+    /*!
+      \internal
+      Pass the real value, ActionItem.trigger otherwise causes a type mismatch error.
+      */
+    function trigger() {
+        if (enabled)
+            triggered(!checked)
+    }
 
     /*!
       \internal
      */
-    onTriggered: checked = !checked
+    onTriggered: checked = value
 
     style: Theme.createStyleComponent("CheckBoxStyle.qml", checkBox)
 }

=== added file 'modules/Ubuntu/Components/Option.qml'
--- modules/Ubuntu/Components/Option.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Option.qml	2014-04-10 15:55:52 +0000
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import U1db 1.0 as U1db
+import Ubuntu.Unity.Action 1.0 as UnityActions
+
+/*!
+    \qmltype Option
+    \inqmlmodule Ubuntu.Components 0.1
+    \ingroup ubuntu
+    \brief An option within application-specific settings.
+
+    Example:
+    \qml
+    import QtQuick 2.0
+    import Ubuntu.Components 0.1
+
+    MainView {
+        applicationName: "example"
+        Settings {
+            group: "sound"
+            Option {
+                name: "vibrate"
+                defaultValue: false
+            }
+            Option {
+                id: optionNickname
+                name: "nomDePlum"
+                defaultValue: "A. Nonymous"
+                text: i18n.tr("Pseudonym")
+                visible: proFeaturesUnlocked // variable defined in the application
+            }
+        }
+
+        Column {
+            Row {
+                Label {
+                    text: optionVibrate.text
+                }
+                Switch {
+                    action: optionVibrate
+                }
+            }
+            Row {
+                Label {
+                    text: optionNickname.text
+                }
+                TextField {
+                    action: optionNickname
+                }
+            }
+        }
+    }
+    \endqml
+
+    See Settings for more examples.
+*/
+Action {
+    id: option
+    /*!
+      A name for the setting that is unique in the group.
+      */
+    property var name: null
+    /*!
+      The default value. Any basic type is allowed. After the first time an
+      option is used on one particular device, the default is ignored unless
+      the group is reset.
+      */
+    property var defaultValue: null
+    /*!
+      The current value, either a default, locally saved state or synchronized.
+      */
+    property var value: defaultValue
+
+    /*!
+      \internal
+      The default value changed. From this we assume the value type.
+      */
+    onDefaultValueChanged: {
+        if (typeof defaultValue == "string")
+            parameterType = UnityActions.Action.String;
+        else if (typeof defaultValue == "number")
+            parameterType = UnityActions.Action.Real; // Javascript doesn't distinguish int and real
+        else if (typeof defaultValue == "boolean")
+            parameterType = UnityActions.Action.Bool;
+        else
+            parameterType = UnityActions.Action.None;
+    }
+
+    /*!
+      \internal
+      Store the new value when the action is triggered.
+      */
+    onTriggered: option.value = value
+
+    /* Can't declare anonymous Object because parent class is no Item */
+    property var __internal: Item {
+        property string group: ""
+        onGroupChanged: {
+            if (name == null || defaultValue == null)
+                console.log("Incomplete Option declaration %1 in %2".arg(objectName).arg(group));
+            else
+                state = "valid";
+        }
+        states: [ State {
+            name: "valid"
+            PropertyChanges {
+                target: doc
+                docId: "%1-%2".arg(__internal.group).arg(name)
+            }
+            PropertyChanges {
+                target: option
+                value: doc.contents.value
+                onValueChanged: doc.contents = { "value": value }
+            }
+        } ]
+        U1db.Document {
+            id: doc
+            database: U1db.Database {
+                path: "settings.db"
+            }
+        }
+    }
+}
+

=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
--- modules/Ubuntu/Components/OptionSelector.qml	2013-12-13 15:50:35 +0000
+++ modules/Ubuntu/Components/OptionSelector.qml	2014-04-10 15:55:52 +0000
@@ -282,7 +282,7 @@
                 onDelegateClicked: optionSelector.delegateClicked(index);
                 interactive: listContainer.height !== list.contentHeight && listContainer.currentlyExpanded ? true : false
                 clip: true
-                currentIndex: 0
+                currentIndex: action && action.hasOwnProperty("value") && typeof action.value == "number" ? action.value : 0
                 model: optionSelector.model
                 anchors.fill: parent
 

=== added file 'modules/Ubuntu/Components/Settings.qml'
--- modules/Ubuntu/Components/Settings.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Settings.qml	2014-04-10 15:55:52 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import U1db 1.0 as U1db
+import Ubuntu.Components 0.1 as Toolkit
+
+/*!
+    \qmltype Settings
+    \inqmlmodule Ubuntu.Components 0.1
+    \ingroup ubuntu
+    \brief Application-specific settings.
+
+    Settings are an easy way for an application to keep values on one or more
+    devices, with optional grouping. If desired, actions can be associated with
+    individual settings to provide UI.
+
+    Example:
+    \qml
+    import QtQuick 2.0
+    import Ubuntu.Components 0.1
+
+    MainView {
+        applicationName: "example"
+        Settings {
+            group: "sound"
+            Option {
+                name: "vibrate"
+                defaultValue: false
+            }
+        }
+        Settings {
+            group: "tablet"
+            sync: false
+            Option {
+                name: "bigLayout"
+                defaultValue: false
+            }
+        }
+    }
+    \endqml
+*/
+Item {
+    id: settings
+    /*!
+      An optional group for these settings.
+      */
+    property string group: "default"
+
+    /*!
+      \internal
+      */
+    property list<Option> couldntGetListToWorkWithoutAlias
+
+    /*!
+      The list of options. Most of the time it's enough to simply declare
+      each Option within the Settings.
+      */
+    default property alias options: settings.couldntGetListToWorkWithoutAlias
+
+    /*!
+      \internal
+      */
+    Component.onCompleted: {
+        for(var item in options)
+            options[item].__internal.group = group;
+    }
+}

=== modified file 'modules/Ubuntu/Components/Tab.qml'
--- modules/Ubuntu/Components/Tab.qml	2013-11-07 07:26:01 +0000
+++ modules/Ubuntu/Components/Tab.qml	2014-04-10 15:55:52 +0000
@@ -105,12 +105,5 @@
           Tab is destroyed upon removal.
           */
         property bool dynamic: false
-
-        /*
-          This flag is used by the Tabs to determine whether the pre-declared Tab was removed
-          from the Tabs model or not. The flag guards adding back pre-declared tabs upon Tabs
-          component stack  (children) change.
-          */
-        property bool removedFromTabs: false
     }
 }

=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2014-04-08 12:38:35 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2014-04-10 15:55:52 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import "mathUtils.js" as MathUtils
 
 /*!
     \qmltype Tabs
@@ -149,6 +150,110 @@
             }
         }
     \endqml
+
+    \section2 Dynamic tabs
+    So far all Tab elements were pre-declared, but there can be situations when
+    tabs need to be added dynamically. There are two ways to solve this, depending
+    on the output needed.
+
+    \section3 Using Repeaters
+    A Repeater can be used to create the necessary tabs depending on a given model.
+    In this way the number of tabs will be driven by the model itself.
+    An example of such a dynamic tab:
+    \qml
+    // DynamicTab.qml
+    import QtQuick 2.0
+    import Ubuntu.Components 0.1
+
+    Tabs {
+        property alias model: tabRepeater.model
+        Repeater {
+            id: tabRepeater
+            model: 5
+            Tab {
+                title: "Tab #" + index
+                page: Page {
+                    // [...]
+                }
+            }
+        }
+    }
+    \endqml
+    Note that in the example above the Tabs will be re-created each time the model
+    changes. This will cause state losing of each Tab, which depending on the
+    content type can be solved at some extent using StateSaver. Using a Loader
+    or specifying the Tab instance/component in the model the state can be preserved,
+    however may increase code complexity.
+
+    \section3 Dynamic tabs
+    Tabs provides functions to add Tab elements dynamically on runtime, without
+    destroying the state of the existing tabs. You can add, move and remove any
+    kind of Tab element, pre-declared or dynamically created ones. When removing
+    pre-declared tabs, those will all be held back and hidden by Tabs, and can be
+    added back any time either to the same or to a different position.
+
+    \qml
+    import QtQuick 2.0
+    import Ubuntu.Components 0.1
+
+    MainView {
+        width: units.gu(40)
+        height: units.gu(71)
+
+        Component {
+            id: dynamicTab
+            Tab {
+                page: Page {
+                    Label {
+                        text: title
+                        anchors.centerIn: parent
+                    }
+                }
+            }
+        }
+        Tabs {
+        id: tabs
+            Tab {
+                title: "Main tab"
+                page: Page {
+                    toolbar: ToolbarItems {
+                        ToolbarButton {
+                            text: "remove predeclared"
+                            onTriggered: tabs.removeTab(preDeclared.index)
+                        }
+                        ToolbarButton {
+                            text: "add new"
+                            onTriggered: tabs.addTab("New tab", dynamicTab)
+                        }
+                        ToolbarButton {
+                            text: "insert predeclared"
+                            onTriggered: tabs.insertTab("", 0)
+                        }
+                    }
+                }
+            }
+            Tab {
+            id: preDeclared
+                title: "Pre-declared tab"
+                page: Page {
+                    Label {
+                        text: "This is a predeclared tab at index #" + index
+                        anchors.centerIn: parent
+                    }
+                }
+            }
+        }
+    }
+    \endqml
+
+    \section3 Using Repeater and functions together
+    Repeaters re-create their delegates as many times the model changes. Tabs added
+    or moved in between the tabs maintained by the Repeater, as well as reordered
+    through the Tabs functions will be re-arranged once the Repeater's model changes.
+    This should be taken into account when designing the application, and the use
+    of Repeater and functions toghether should be avoided if possible, or at least
+    Repeater should always add tabs to te tail of the tab stack, and no tab insertion
+    happens in that area.
 */
 PageTreeNode {
     id: tabs
@@ -186,10 +291,14 @@
     }
 
     /*!
-      Children are placed in a separate item that has functionality to extract the Tab items.
+      \deprecated
+      Children are placed in a separate item that has functionality to extract
+      the Tab items.
+      Note: this property is deprecated. Tab components are directly parented
+      to Tabs' data property.
       \qmlproperty list<Item> tabChildren
      */
-    default property alias tabChildren: tabStack.data
+    property alias tabChildren: tabs.data
 
     /*!
       \qmlproperty int count
@@ -206,36 +315,180 @@
     signal modelChanged()
 
     /*!
+      Appends a Tab dynamically to the list of tabs. The \a title specifies the
+      title of the Tab. The \a tab can be either a Component, a URL to a Tab
+      component to be loaded or an instance of a pre-declared tab that has been
+      previously removed. The Tab's title will be replaced with the given \a title,
+      unless the value is an empty string or undefined.
+      Returns the instance of the added Tab.
+      */
+    function addTab(title, tab) {
+        return insertTab(count, title, tab);
+    }
+
+    /*!
+      Inserts a Tab at the given index. If the \a index is less or equal than 0,
+      the Tab will be added to the front, and to the end of the tab stack in case
+      the \a index is greater than \l count. \a title and \a tab are used in the
+      same way as with \l addTab().
+      Returns the instance of the inserted Tab.
+      */
+    function insertTab(index, title, tab) {
+        // check if the given component is a Tab instance
+        var tabObject = null;
+
+        if (typeof tab === "string") {
+            // we have a URL
+            var tabComponent = Qt.createComponent(tab);
+            if (tabComponent.status === Component.Error) {
+                console.error(tabComponent.errorString());
+                return null;
+            }
+            tabObject = tabComponent.createObject();
+            tabObject.__protected.dynamic = true;
+        } else if (tab.hasOwnProperty("createObject")) {
+            // we have a Component
+            tabObject = tab.createObject();
+            tabObject.__protected.dynamic = true;
+        } else if (tab.hasOwnProperty("parent") && tab.parent === trashedTabs) {
+            // we have a pre-declared tab that has been removed
+            tabObject = tab;
+        } else {
+            console.error(i18n.tr("The object is not a URL, Component or a removed Tab: ") + tab);
+            return null;
+        }
+
+        // fix title
+        if (title !== undefined && title !== "") {
+            tabObject.title = title;
+        }
+
+        // insert the created tab into the model
+        index = MathUtils.clamp(index, 0, count);
+        tabObject.__protected.inserted = true;
+        tabObject.__protected.index = index;
+        tabsModel.insertTab(tabObject, index);
+        if (tabs.selectedTabIndex >= index) {
+            // move the selected index to the next index
+            tabs.selectedTabIndex += 1;
+        } else {
+            internal.sync();
+        }
+        return tabObject;
+    }
+
+    /*!
+      The function returns the Tab from the given \a index, or null if the \a index
+      is invalid (less than \c 0 and greater than \l count).
+      */
+    function getTab(index) {
+        return (index >=0) && (index < count) ? tabsModel.get(index).tab : null;
+    }
+
+    /*!
+      Moves the tab from the given \a from position to the position given in \a to.
+      Returns true if the indexes were in 0..\l count - 1 boundary and if the operation
+      succeeds, and false otherwise. The \l selectedTabIndex is updated if it is
+      affected by the move (it is equal with \a from or falls between \a from and
+      \a to indexes).
+      */
+    function moveTab(from, to) {
+        if (from < 0 || from >= count || to < 0 || to >= count || from === to) return false;
+        var tabFrom = tabsModel.get(from).tab;
+        var tabTo = tabsModel.get(to).tab;
+
+        // move tab
+        QuickUtils.moveItemBefore(tabFrom, tabTo);
+        tabsModel.updateTabList(tabs.children);
+
+        // fix selected tab
+        if (selectedTabIndex === from) {
+            selectedTabIndex = to;
+        } else if (selectedTabIndex >= Math.min(from, to) && selectedTabIndex <= Math.max(from, to)) {
+            selectedTabIndex--;
+        } else {
+            internal.sync();
+        }
+
+        return true;
+    }
+
+    /*!
+      Removes the Tab from the given \a index. Returns true if the \a index falls
+      into 0..\l count - 1 boundary and the operation succeeds, and false on error.
+      The function removes also the pre-declared tabs. These can be added back using
+      \l addTab or \l insertTab by specifying the instance of the Tab to be added as
+      component. The \l selectedTabIndex is updated if is affected by the removal
+      (it is identical or greater than the tab index to be removed).
+      */
+    function removeTab(index) {
+        if (index < 0 || index >= count) return false;
+        var tab = tabsModel.get(index).tab;
+        var activeIndex = (selectedTabIndex >= index) ? MathUtils.clamp(selectedTabIndex, 0, count - 2) : -1;
+
+        // remove from Tabs; Tabs children change will remove the tab from the model
+        tab.parent = null;
+        if (tab.__protected.dynamic) {
+            tab.destroy();
+        } else {
+            // pre-declared tab, mark it as removed, so we don't update it next time
+            // the tabs stack children is updated
+            tab.parent = trashedTabs;
+        }
+
+        // move active tab if needed
+        if (activeIndex >= 0 && activeIndex !== selectedTabIndex) {
+            selectedTabIndex = activeIndex;
+        } else {
+            internal.sync();
+        }
+
+        return true;
+    }
+
+    /*! \internal */
+    onChildrenChanged: {
+        internal.connectToRepeaters(tabs.children);
+        tabsModel.updateTabList(tabs.children);
+    }
+
+    /*!
       \internal
       required by TabsStyle
      */
     ListModel {
         id: tabsModel
 
+        property bool updateDisabled: false
+
         function listModel(tab) {
             return {"title": tab.title, "tab": tab};
         }
 
         function updateTabList(tabsList) {
+            if (updateDisabled) return;
             var offset = 0;
-            var tabIndex;
+            var tabIndex = -1;
             for (var i in tabsList) {
                 var tab = tabsList[i];
                 if (internal.isTab(tab)) {
                     tabIndex = i - offset;
                     // make sure we have the right parent
-                    tab.parent = tabStack;
+                    tab.parent = tabs;
 
                     if (!tab.__protected.inserted) {
                         tab.__protected.index = tabIndex;
                         tab.__protected.inserted = true;
                         insert(tabIndex, listModel(tab));
-                    } else if (!tab.__protected.removedFromTabs && tabsModel.count > tab.index) {
+                    } else {
                         get(tab.index).title = tab.title;
                     }
 
                     // always makes sure that tabsModel has the same order as tabsList
-                    move(tab.__protected.index, tabIndex, 1);
+                    // but move only if there is more than one item in the list
+                    if (count > 1) {
+                        move(tab.__protected.index, tabIndex, 1);
+                    }
                     reindex();
                 } else {
                     // keep track of children that are not tabs so that we compute
@@ -243,6 +496,10 @@
                     offset += 1;
                 }
             }
+            // remove deleted tabs, those should be at the end of the list by now
+            if ((tabIndex >= 0) && (tabIndex + 1) < count) {
+                remove(tabIndex + 1, count - tabIndex - 1);
+            }
             internal.sync();
         }
 
@@ -257,18 +514,31 @@
                 tab.__protected.index = i;
             }
         }
+
+        function insertTab(tab, index) {
+            // fix index
+            if (index < 0) {
+                index = 0;
+            }
+            // get the tab before which the item will be inserted
+            var itemAtIndex = ((index >= 0) && (index < count)) ? get(index).tab : null;
+            // disable update only if we insert, append can keep the logic rolling
+            updateDisabled = (itemAtIndex !== null);
+            insert(index, listModel(tab));
+            tab.parent = tabs;
+            updateDisabled = false;
+            if (itemAtIndex) {
+                QuickUtils.moveItemBefore(tab, itemAtIndex);
+                updateTabList(tabs.children);
+            }
+        }
     }
 
-    // FIXME: this component is not really needed, as it doesn't really bring any
-    // value; should be removed in a later MR
+    // invisible component stacking removed pre-declared components
     Item {
-        anchors.fill: parent
-        id: tabStack
-
-        onChildrenChanged: {
-            internal.connectToRepeaters(tabStack.children);
-            tabsModel.updateTabList(tabStack.children);
-        }
+        id: trashedTabs
+        visible: false
+        opacity: 0.0
     }
 
     /*
@@ -283,7 +553,7 @@
         interval: 1
         running: false
         onTriggered: {
-            tabsModel.updateTabList(tabStack.children);
+            tabsModel.updateTabList(tabs.children);
             internal.sync();
         }
     }
@@ -295,8 +565,8 @@
         Binding {
             target: tabBar
             property: "animate"
-            when: internal.header && internal.header.hasOwnProperty("animate")
-            value: internal.header.animate
+            when: (internal.header !== null) && internal.header.hasOwnProperty("animate")
+            value: internal.header ? internal.header.animate : "false"
         }
 
         /*
@@ -332,7 +602,9 @@
         function connectToRepeaters(children) {
             for (var i = 0; i < children.length; i++) {
                 var child = children[i];
-                if (internal.isRepeater(child) && (internal.repeaters.indexOf(child) < 0)) {
+                if (internal.isRepeater(child) &&
+                        (internal.repeaters !== undefined) &&
+                        (internal.repeaters.indexOf(child) < 0)) {
                     internal.connectRepeater(child);
                 }
             }
@@ -355,7 +627,7 @@
            https://bugreports.qt-project.org/browse/QTBUG-32438
         */
         function updateTabsModel() {
-            tabsModel.updateTabList(tabStack.children);
+            tabsModel.updateTabList(tabs.children);
         }
 
         /*

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-03-17 17:58:47 +0000
+++ modules/Ubuntu/Components/TextField.qml	2014-04-10 15:55:52 +0000
@@ -1011,6 +1011,8 @@
         }
         // get the control's style
         clip: true
+        // If action is an Option we want to prefill the text from its value
+        text: action && action.hasOwnProperty("value") && typeof action.value != "undefined" ? action.value : ""
         onTextChanged: internal.textChanged = true
         cursorDelegate: cursor
         color: control.__styleInstance.color

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-08 12:38:35 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-04-10 15:55:52 +0000
@@ -116,8 +116,8 @@
                 AbstractButton {
                     id: button
                     anchors {
-                        top: parent.top
-                        bottom: parent.bottom
+                        top: parent ? parent.top : undefined
+                        bottom: parent ? parent.bottom: undefined
                     }
                     width: text.paintedWidth + text.anchors.leftMargin + text.anchors.rightMargin
 
@@ -150,6 +150,13 @@
                         return false;
                     }
 
+                    // update the offset of the buttonRow
+                    onOffsetChanged: {
+                        if (selected) {
+                            buttonView.updateOffset(button.offset);
+                        }
+                    }
+
                     Behavior on opacity {
                         NumberAnimation {
                             duration: headerTextFadeDuration

=== modified file 'modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp'
--- modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2014-02-21 20:02:29 +0000
+++ modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp	2014-04-10 15:55:52 +0000
@@ -21,6 +21,7 @@
 #include "alarmmanager_p.h"
 #include "alarmrequest_p.h"
 #include "alarmsadapter_p.h"
+#include <qorganizertodooccurrence.h>
 
 #include <QtCore/QFile>
 #include <QtCore/QDir>
@@ -55,11 +56,15 @@
     , manager(0)
     , fetchRequest(0)
 {
-    QOrganizerManager local;
-    bool usingDefaultManager = local.availableManagers().contains(ALARM_MANAGER);
-    manager = (usingDefaultManager) ? new QOrganizerManager(ALARM_MANAGER) : new QOrganizerManager(ALARM_MANAGER_FALLBACK);
+    QString envManager(qgetenv("ALARM_BACKEND"));
+    if (!envManager.isEmpty() && QOrganizerManager::availableManagers().contains(envManager)) {
+        manager = new QOrganizerManager(envManager);
+    } else {
+        manager = QOrganizerManager::availableManagers().contains(ALARM_MANAGER) ?
+                    new QOrganizerManager(ALARM_MANAGER) : new QOrganizerManager(ALARM_MANAGER_FALLBACK);
+    }
     manager->setParent(q_ptr);
-    if (!usingDefaultManager) {
+    if (manager->managerName() != ALARM_MANAGER) {
         qWarning() << "WARNING: default alarm manager not installed, using" << manager->managerName() << "manager.";
         qWarning() << "This manager may not provide all the needed features.";
     }
@@ -114,6 +119,7 @@
 
         int type, days;
         in >> alarm.message >> alarm.date >> alarm.sound >> type >> days >> alarm.enabled;
+        alarm.originalDate = alarm.date;
         alarm.type = static_cast<UCAlarm::AlarmType>(type);
         alarm.days = static_cast<UCAlarm::DaysOfWeek>(days);
 
@@ -142,7 +148,7 @@
 
     Q_FOREACH(const AlarmData &alarm, alarmList) {
         out << alarm.message
-            << alarm.date
+            << alarm.originalDate
             << alarm.sound
             << alarm.type
             << alarm.days
@@ -157,7 +163,6 @@
     event.setCollectionId(collection.id());
     event.setAllDay(false);
     event.setStartDateTime(alarm.date);
-    event.setDueDateTime(alarm.date);
     event.setDisplayLabel(alarm.message);
 
     if (alarm.enabled) {
@@ -224,8 +229,9 @@
 
     alarm.cookie = QVariant::fromValue<QOrganizerItemId>(event.id());
     alarm.message = event.displayLabel();
-    alarm.date = AlarmData::normalizeDate(event.dueDateTime());
+    alarm.date = AlarmData::normalizeDate(event.startDateTime());
     alarm.sound = QUrl(event.description());
+    alarm.originalDate = alarm.date;
 
     // check if the alarm is enabled or not
     QOrganizerItemVisualReminder visual = event.detail(QOrganizerItemDetail::TypeVisualReminder);
@@ -303,8 +309,8 @@
     Q_FOREACH(const QOrganizerItem &item, alarms) {
         // repeating alarms may be fetched as occurences, therefore check their parent event
         if (item.type() == QOrganizerItemType::TypeTodoOccurrence) {
-            QOrganizerTodoOccurrence occurence = static_cast<QOrganizerTodoOccurrence>(item);
-            QOrganizerItemId eventId = occurence.parentId();
+            QOrganizerTodoOccurrence occurrence = static_cast<QOrganizerTodoOccurrence>(item);
+            QOrganizerItemId eventId = occurrence.parentId();
             if (parentId.contains(eventId)) {
                 continue;
             }
@@ -317,6 +323,7 @@
         }
         AlarmData alarm;
         if (alarmDataFromOrganizerEvent(event, alarm) == UCAlarm::NoError) {
+            adjustAlarmOccurrence(event, alarm);
             alarmList << alarm;
         }
     }
@@ -324,9 +331,48 @@
     saveAlarms();
     Q_EMIT q_ptr->alarmsChanged();
     completed = true;
+    fetchRequest->deleteLater();
     fetchRequest = 0;
 }
 
+void AlarmsAdapter::adjustAlarmOccurrence(const QOrganizerTodo &event, AlarmData &alarm)
+{
+    if (alarm.type == UCAlarm::OneTime) {
+        return;
+    }
+    // with EDS we need to query the occurrences separately as the fetch reports only the main events
+    // with fallback manager this does not reduce the performance and does work the same way.
+    QDateTime currentDate = AlarmData::normalizeDate(QDateTime::currentDateTime());
+    if (alarm.date > currentDate) {
+        // no need to adjust date, the event occurs in the future
+        return;
+    }
+    QDateTime startDate;
+    QDateTime endDate;
+    if (alarm.type == UCAlarm::Repeating) {
+        // 8 days is enough from the starting date (or current date depending on the start date)
+        startDate = (alarm.date > currentDate) ? alarm.date : currentDate;
+        endDate = startDate.addDays(8);
+    }
+
+    QList<QOrganizerItem> occurrences = manager->itemOccurrences(event, startDate, endDate, 10);
+    // get the first occurrence and use the date from it
+    if ((occurrences.length() > 0) && (occurrences[0].type() == QOrganizerItemType::TypeTodoOccurrence)) {
+        // loop till we get a proper future due date
+        for (int i = 0; i < occurrences.count(); i++) {
+            QOrganizerTodoOccurrence occurrence = static_cast<QOrganizerTodoOccurrence>(occurrences[i]);
+            // check if the date is after the current datetime
+            // the first occurrence is the one closest to the currentDate, therefore we can safely
+            // set that startDate to the alarm
+            alarm.date = occurrence.startDateTime();
+            if (alarm.date > currentDate) {
+                // we have the proper date set, leave
+                break;
+            }
+        }
+    }
+}
+
 /*-----------------------------------------------------------------------------
  * AlarmRequestAdapter implementation
  */
@@ -410,23 +456,10 @@
     QOrganizerItemFetchRequest *operation = new QOrganizerItemFetchRequest(q_ptr);
     operation->setManager(owner->manager);
 
-    // FIXME: Since returning all events without a limit of date is not a good solution we need to find
-    // a better solution for that.
-    // The current solution filters only the next 7 days (one week).
-    // This will be enough for now, since the current alarms occur weekly, but for the future
-    // we want to allow create alarms with monthly or yearly recurrence
-    QDate currentDate = QDate::currentDate();
-    QDateTime startDate(currentDate,
-                        QTime(0,0,0));
-    QDateTime endDate(currentDate.addDays(7),
-                      QTime(23,59,59));
-    operation->setStartDate(startDate);
-    operation->setEndDate(endDate);
-
     // set sort order
     QOrganizerItemSortOrder sortOrder;
     sortOrder.setDirection(Qt::AscendingOrder);
-    sortOrder.setDetail(QOrganizerItemDetail::TypeTodoTime, QOrganizerTodoTime::FieldDueDateTime);
+    sortOrder.setDetail(QOrganizerItemDetail::TypeTodoTime, QOrganizerTodoTime::FieldStartDateTime);
     operation->setSorting(QList<QOrganizerItemSortOrder>() << sortOrder);
 
     // set filter

=== modified file 'modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h'
--- modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2013-09-18 10:13:04 +0000
+++ modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h	2014-04-10 15:55:52 +0000
@@ -24,6 +24,7 @@
 
 #include <qorganizer.h>
 #include <qorganizermanager.h>
+#include <qorganizertodo.h>
 
 QTORGANIZER_USE_NAMESPACE
 
@@ -78,6 +79,7 @@
     QOrganizerCollection collection;
 
     void completeFetchAlarms(const QList<QOrganizerItem> &alarmList);
+    void adjustAlarmOccurrence(const QOrganizerTodo &event, AlarmData &alarm);
 
     void loadAlarms();
     void saveAlarms();

=== modified file 'modules/Ubuntu/Components/plugin/alarmmanager_p.h'
--- modules/Ubuntu/Components/plugin/alarmmanager_p.h	2013-09-12 05:27:40 +0000
+++ modules/Ubuntu/Components/plugin/alarmmanager_p.h	2014-04-10 15:55:52 +0000
@@ -48,6 +48,7 @@
     AlarmData(const AlarmData &other)
         : changes(0)
         , cookie(other.cookie)
+        , originalDate(other.originalDate)
         , date(other.date)
         , message(other.message)
         , type(other.type)
@@ -104,6 +105,7 @@
     QVariant cookie;
 
     // data members
+    QDateTime originalDate;
     QDateTime date;
     QString message;
     QUrl sound;

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-03-05 12:29:58 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2014-04-10 15:55:52 +0000
@@ -53,9 +53,6 @@
 #include <unistd.h>
 #include <stdexcept>
 
-// Needed for unit tests
-Q_DECLARE_METATYPE(QList<QQmlError>)
-
 /*
  * Type registration functions.
  */
@@ -177,8 +174,6 @@
     qmlRegisterSingletonType<UCUriHandler>(uri, 0, 1, "UriHandler", registerUriHandler);
     qmlRegisterType<UCMouse>(uri, 0, 1, "Mouse");
     qmlRegisterType<UCInverseMouse>(uri, 0, 1, "InverseMouse");
-    // Needed for unit tests
-    qRegisterMetaType<QList <QQmlError> >();
     // register QML singletons
     qmlRegisterSingletonType<QObject>(uri, 0, 1, "PickerPanel", registerPickerPanel);
 }

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.cpp'
--- modules/Ubuntu/Components/plugin/quickutils.cpp	2014-03-20 15:46:28 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.cpp	2014-04-10 15:55:52 +0000
@@ -119,6 +119,21 @@
     return result.left(result.indexOf("_QML"));
 }
 
+/*!
+ * \internal
+ * Moves a given \a item before the \a other one in the object stack. Both \a item
+ * and \a other must have the same parent item.
+ */
+void QuickUtils::moveItemBefore(QQuickItem *item, QQuickItem *other)
+{
+    Q_ASSERT(item);
+    Q_ASSERT(item->parentItem());
+    if (other) {
+        Q_ASSERT(other->parentItem() == item->parentItem());
+        item->stackBefore(other);
+    }
+}
+
 
 /*!
  * \internal

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.h'
--- modules/Ubuntu/Components/plugin/quickutils.h	2014-03-20 15:46:28 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.h	2014-04-10 15:55:52 +0000
@@ -42,6 +42,7 @@
     QString inputMethodProvider() const;
 
     Q_INVOKABLE static QString className(QObject *item);
+    Q_INVOKABLE void moveItemBefore(QQuickItem *item, QQuickItem *before);
     QObject* createQmlObject(const QUrl &url, QQmlEngine *engine);
 
 Q_SIGNALS:

=== modified file 'modules/Ubuntu/Components/plugin/ucalarm.cpp'
--- modules/Ubuntu/Components/plugin/ucalarm.cpp	2013-09-18 10:25:18 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-04-10 15:55:52 +0000
@@ -102,15 +102,21 @@
 
 int UCAlarmPrivate::nextDayOfWeek(UCAlarm::DaysOfWeek days, int fromDay)
 {
-    if (fromDay <= 0) {
+    if (fromDay <= 0 || fromDay >= Qt::Sunday) {
+        // start from the beginning of the week
         fromDay = Qt::Monday;
+    } else {
+        // start checking from the next day onwards
+        fromDay++;
     }
     for (int d = fromDay; d <= Qt::Sunday; d++) {
         if ((1 << (d - 1)) & days) {
             return d;
         }
     }
-    return 0;
+
+    // none found for the rest of the week, return the fist day set
+    return firstDayOfWeek(days);
 }
 
 // checks whether the given num has more than one bit set
@@ -147,23 +153,14 @@
     return UCAlarm::NoError;
 }
 
-UCAlarm::Error UCAlarmPrivate::checkDow()
+// adjust dayOfWeek
+UCAlarm::Error UCAlarmPrivate::adjustDow()
 {
     if (!rawData.days) {
         return UCAlarm::NoDaysOfWeek;
     } else if (rawData.days == UCAlarm::AutoDetect) {
         rawData.days = dayOfWeek(rawData.date);
         rawData.changes |= AlarmData::Days;
-    } else if (rawData.days != UCAlarm::Daily) {
-        int alarmDay = firstDayOfWeek(rawData.days);
-        int dayOfWeek = rawData.date.date().dayOfWeek();
-        if (alarmDay < dayOfWeek) {
-            rawData.date = rawData.date.addDays(7 - dayOfWeek + alarmDay);
-            rawData.changes |= AlarmData::Date;
-        } else if (alarmDay > dayOfWeek) {
-            rawData.date = rawData.date.addDays(alarmDay - dayOfWeek);
-            rawData.changes |= AlarmData::Date;
-        }
     }
     return UCAlarm::NoError;
 }
@@ -175,8 +172,7 @@
         return UCAlarm::OneTimeOnMoreDays;
     }
 
-    // adjust start date and/or dayOfWeek according to their values
-    UCAlarm::Error result = checkDow();
+    UCAlarm::Error result = adjustDow();
     if (result != UCAlarm::NoError) {
         return result;
     }
@@ -193,23 +189,25 @@
     // start date is adjusted depending on the days value;
     // start date can be set to be the current time, as scheduling will move
     // it to the first occurence.
-    UCAlarm::Error result = checkDow();
+    UCAlarm::Error result = adjustDow();
     if (result != UCAlarm::NoError) {
         return result;
     }
 
-    // move start time to the first occurence if needed
+    // move start time of the first occurence if needed
     int dayOfWeek = rawData.date.date().dayOfWeek();
     if (!isDaySet(dayOfWeek, rawData.days) || (rawData.date <= QDateTime::currentDateTime())) {
         // check the next occurence of the alarm
-        int nextOccurence = nextDayOfWeek(rawData.days, dayOfWeek);
-        if (nextOccurence <= 0) {
-             // the starting date should be moved to the next week
-            nextOccurence = firstDayOfWeek(rawData.days);
-            rawData.date.addDays(7 - dayOfWeek + nextOccurence);
+        int nextOccurrence = nextDayOfWeek(rawData.days, dayOfWeek);
+        if (nextOccurrence == dayOfWeek) {
+            // move the date to the same day next week
+            rawData.date = rawData.date.addDays(7);
+        } else if (nextOccurrence < dayOfWeek) {
+             // the starting date should be moved to the next week's occurrence
+            rawData.date = rawData.date.addDays(7 - dayOfWeek + nextOccurrence);
         } else {
             // the starting date is still this week
-            rawData.date.addDays(nextOccurence - dayOfWeek);
+            rawData.date = rawData.date.addDays(nextOccurrence - dayOfWeek);
         }
         rawData.changes |= AlarmData::Date;
     }
@@ -304,7 +302,7 @@
     : QObject(parent)
     , d_ptr(new UCAlarmPrivate(this))
 {
-    d_ptr->rawData.date = dt;
+    d_ptr->rawData.date = AlarmData::normalizeDate(dt);
     if (!message.isEmpty()) {
         d_ptr->rawData.message = message;
     }
@@ -315,7 +313,7 @@
     : QObject(parent)
     , d_ptr(new UCAlarmPrivate(this))
 {
-    d_ptr->rawData.date = dt;
+    d_ptr->rawData.date = AlarmData::normalizeDate(dt);
     d_ptr->rawData.type = Repeating;
     d_ptr->rawData.days = days;
     if (!message.isEmpty()) {
@@ -366,12 +364,16 @@
 void UCAlarm::setDate(const QDateTime &date)
 {
     Q_D(UCAlarm);
-    if (d->rawData.date == date) {
+    if (d->rawData.date == AlarmData::normalizeDate(date)) {
         return;
     }
-    d->rawData.date = date;
+    d->rawData.date = AlarmData::normalizeDate(date);
     d->rawData.changes |= AlarmData::Date;
     Q_EMIT dateChanged();
+    if (d->rawData.type == UCAlarm::OneTime) {
+        // adjust dayOfWeek as well
+        setDaysOfWeek(UCAlarm::AutoDetect);
+    }
 }
 
 /*!
@@ -520,6 +522,8 @@
     Q_EMIT soundChanged();
 }
 
+
+
 /*!
  * \qmlproperty Error Alarm::error
  * The property holds the error code occurred during the last performed operation.
@@ -670,6 +674,8 @@
     if (result != UCAlarm::NoError) {
         d->_q_syncStatus(Saving, Fail, result);
     } else {
+        // the alarm has been modified, therefore update the original date as well
+        d->rawData.originalDate = d->rawData.date;
         if (d->createRequest()) {
             d->request->save(d->rawData);
         }

=== modified file 'modules/Ubuntu/Components/plugin/ucalarm_p.h'
--- modules/Ubuntu/Components/plugin/ucalarm_p.h	2013-09-18 10:25:18 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm_p.h	2014-04-10 15:55:52 +0000
@@ -50,7 +50,7 @@
     static int nextDayOfWeek(UCAlarm::DaysOfWeek days, int fromDay);
     static bool multipleDaysSet(UCAlarm::DaysOfWeek days);
     UCAlarm::Error checkAlarm();
-    UCAlarm::Error checkDow();
+    UCAlarm::Error adjustDow();
     UCAlarm::Error checkOneTime();
     UCAlarm::Error checkRepeatingWeekly();
 

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2014-02-13 11:48:38 +0000
+++ modules/Ubuntu/Components/qmldir	2014-04-10 15:55:52 +0000
@@ -7,6 +7,8 @@
 ToolbarButton 0.1 ToolbarButton.qml
 MainView 0.1 MainView.qml
 Button 0.1 Button.qml
+Settings 0.1 Settings.qml
+Option 0.1 Option.qml
 Panel 0.1 Panel.qml
 internal DraggingArea DraggingArea.qml
 Tab 0.1 Tab.qml

=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2014-02-25 12:36:27 +0000
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2014-04-10 15:55:52 +0000
@@ -87,7 +87,75 @@
 		}
 	}
 
-	/*!
+    /*!
+      \qmlmethod UbuntuTestCase::flick(item, x, y, dx, dy, pressTimeout = -1, steps = -1, button = Qt.LeftButton, modifiers = Qt.NoModifiers, delay = -1)
+
+      The function produces a flick event when executed on Flickables. When used
+      on other components it provides the same functionality as \l mouseDrag()
+      function. The optional \a pressTimeout parameter can be used to introduce
+      a small delay between the mouse press and the first mouse move. Setting a
+      negative or zero value will disable the timeout.
+
+      The default flick velocity is built up using 5 move points. This can be altered
+      by setting a positive value to \a steps parameter. The bigger the number the
+      longer the flick will be. When a negative or zero value is given, the default
+      of 5 move points will be used.
+
+      \note The function can be used to select a text in a TextField or TextArea by
+      specifying at least 400 millisecods to \a pressTimeout.
+      */
+    function flick(item, x, y, dx, dy, pressTimeout, steps, button, modifiers, delay) {
+        if (item === undefined || item.x === undefined || item.y === undefined)
+            return
+        if (button === undefined)
+            button = Qt.LeftButton
+        if (modifiers === undefined)
+            modifiers = Qt.NoModifier
+        if (steps === undefined || steps <= 0)
+            steps = 4;
+        // make sure we have at least two move steps so the flick will be sensed
+        steps += 1;
+        if (delay === undefined)
+            delay = -1;
+
+        var ddx = dx / steps;
+        var ddy = dy / steps;
+
+        mousePress(item, x, y, button, modifiers, delay);
+        if (pressTimeout !== undefined && pressTimeout > 0) {
+            wait(pressTimeout);
+        }
+        for (var i = 1; i <= steps; i++) {
+            // mouse moves are all processed immediately, without delay in between events
+            mouseMove(item, x + i * ddx, y + i * ddy, -1, button);
+        }
+        mouseRelease(item, x + dx, y + dy, button, modifiers, delay);
+        // empty event buffer
+        wait(200);
+    }
+
+    /*!
+        \qmlmethod UbuntuTestCase::mouseLongPress(item, x, y, button = Qt.LeftButton, modifiers = Qt.NoModifiers, delay = -1)
+
+        Simulates a long press on a mouse \a button with an optional \a modifier
+        on an \a item. The position is defined by \a x and \a y. If \a delay is
+        specified, the test will wait the specified amount of milliseconds before
+        the press.
+
+        The position given by \a x and \a y is transformed from the co-ordinate
+        system of \a item into window co-ordinates and then delivered.
+        If \a item is obscured by another item, or a child of \a item occupies
+        that position, then the event will be delivered to the other item instead.
+
+        \sa mouseRelease(), mouseClick(), mouseDoubleClick(), mouseMove(), mouseDrag(), mouseWheel()
+      */
+    function mouseLongPress(item, x, y, button, modifiers, delay) {
+        mousePress(item, x, y, button, modifiers, delay);
+        // the delay is taken from QQuickMouseArea
+        wait(800);
+    }
+
+    /*!
 		Keeps executing a given parameter-less function until it returns the given
 		expected result or the timemout is reached (in which case a test failure
 		is generated)

=== modified file 'modules/Ubuntu/Test/deployment.pri'
--- modules/Ubuntu/Test/deployment.pri	2014-01-17 12:30:05 +0000
+++ modules/Ubuntu/Test/deployment.pri	2014-04-10 15:55:52 +0000
@@ -7,9 +7,14 @@
 # make found deployables visible in Qt Creator
 OTHER_FILES += $$QMLDIR_FILE
 
+QML_FILES = $$system(ls *.qml)
+JS_FILES = $$system(ls *.js)
+
 # define deployment for found deployables
 qmldir_file.path = $$installPath
 qmldir_file.files = $$QMLDIR_FILE
+qml_files.path = $$installPath
+qml_files.files = $$QML_FILES
 js_files.path = $$installPath
 js_files.files = $$JS_FILES
 
@@ -20,4 +25,4 @@
 # https://bugreports.qt-project.org/browse/QTBUG-36243
 plugins_qmltypes.extra = $$[QT_INSTALL_BINS]/qmlplugindump -notrelocatable Ubuntu.Test 0.1 ../../ 2>/dev/null > $(INSTALL_ROOT)/$$installPath/plugins.qmltypes
 
-INSTALLS += qmldir_file plugins_qmltypes
+INSTALLS += qmldir_file plugins_qmltypes qml_files js_files

=== modified file 'modules/Ubuntu/Test/plugin/uctestcase.cpp'
--- modules/Ubuntu/Test/plugin/uctestcase.cpp	2014-03-19 12:48:33 +0000
+++ modules/Ubuntu/Test/plugin/uctestcase.cpp	2014-04-10 15:55:52 +0000
@@ -26,6 +26,8 @@
 #include <QtTest/QtTest>
 #include <QtQuick/QQuickItem>
 
+Q_DECLARE_METATYPE(QList<QQmlError>)
+
 /*!
  * \ingroup ubuntu
  * \brief UbuntuTestCase is the C++ pendant to the QML UbuntuTestCase.
@@ -37,6 +39,7 @@
     QString modulePath(QDir(modules).absolutePath());
     engine()->addImportPath(modulePath);
 
+    qRegisterMetaType<QList <QQmlError> >();
     m_spy = new QSignalSpy(engine(), SIGNAL(warnings(QList<QQmlError>)));
     m_spy->setParent(this);
 
@@ -48,3 +51,12 @@
     QTest::qWaitForWindowExposed(this);
 }
 
+/*!
+ * The number of all warnings from the point of loading the first line of QML code.
+ */
+int
+UbuntuTestCase::warnings() const
+{
+	return m_spy->count();
+}
+

=== modified file 'modules/Ubuntu/Test/plugin/uctestcase.h'
--- modules/Ubuntu/Test/plugin/uctestcase.h	2014-03-19 12:48:33 +0000
+++ modules/Ubuntu/Test/plugin/uctestcase.h	2014-04-10 15:55:52 +0000
@@ -29,6 +29,7 @@
 
 public:
     UbuntuTestCase(const QString& file, QWindow* parent = 0);
+    int warnings() const;
     // getter
     template<class T>
     inline T findItem(const QString& objectName) const {
@@ -39,7 +40,6 @@
             qFatal("Item '%s' found with unexpected type", qPrintable(objectName));
         qFatal("No item '%s' found", qPrintable(objectName));
     }
-
 private:
     QSignalSpy* m_spy;
 };

=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-08 14:46:25 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-10 15:55:52 +0000
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import os
+
 import logging
 from distutils import version
 
@@ -349,6 +351,27 @@
         return len(self._get_tabs())
 
 
+class Settings(UbuntuUIToolkitEmulatorBase):
+    """Settings Autopilot emulator."""
+
+    @classmethod
+    @autopilot_logging.log_action(logger.info)
+    def clear(cls, application_name):
+        database_file = cls._get_database_filename(application_name)
+        if os.path.exists(database_file):
+            os.remove(database_file)
+
+    @classmethod
+    def _get_database_filename(self, application_name):
+        data_home = os.environ.get(
+            'XDG_DATA_HOME',
+            os.path.join(os.environ['HOME'], '.local', 'share'))
+        return os.path.join(data_home, application_name, 'settings.db')
+
+    def get_option(self, optionName):
+        return self.select_single('Option', name=optionName)
+
+
 class TabBar(UbuntuUIToolkitEmulatorBase):
     """TabBar Autopilot emulator."""
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-03-22 06:53:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-04-10 15:55:52 +0000
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import os
+import signal
 import time
 import unittest
 
@@ -21,6 +23,8 @@
 from autopilot import input, platform
 from autopilot.introspection import dbus
 from testtools.matchers import GreaterThan, LessThan
+from autopilot.matchers import Eventually
+from testtools.matchers import Equals
 try:
     from unittest import mock
 except ImportError:
@@ -120,6 +124,199 @@
         self.assertEqual(
             str(error), 'The MainView has no Tabs.')
 
+defaultGroup = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    applicationName: 'once.upon.a.time'
+
+    Settings {
+        objectName: 'settings'
+        Option {
+            id: optionVibrate
+            name: "vibrate"
+            defaultValue: false
+        }
+        Option {
+            id: optionHomepage
+            name: "homepage"
+            defaultValue: "http://www.canonical.com"
+        }
+        Option {
+            id: optionHair
+            name: "hairColor"
+            defaultValue: 0
+        }
+    }
+
+    Column {
+        Switch {
+            action: optionVibrate
+            objectName: "vibrateSwitch"
+            property bool val: action.value
+        }
+        TextField {
+            action: optionHomepage
+            objectName: "homepageEntry"
+            property string val: action.value
+        }
+        OptionSelector {
+            action: optionHair
+            objectName: "hairColorSelector"
+            model: [ "Black", "Ginger", "Peroxided", "White" ]
+            property int val: action.value
+            expanded: true
+        }
+    }
+}
+""")
+
+multipleGroups = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    applicationName: 'once.upon.a.time'
+
+    Settings {
+        objectName: 'settings'
+        group: "general"
+        Option {
+            id: optionVibrate
+            name: "vibrate"
+            defaultValue: false
+        }
+    }
+    Settings {
+        group: "MiscellaneousOptions"
+        Option {
+            id: optionHomepage
+            name: "homepage"
+            defaultValue: "http://www.canonical.com"
+        }
+    }
+    Settings {
+        group: "userProfile"
+        Option {
+            id: optionHair
+            name: "hairColor"
+            defaultValue: 0
+        }
+    }
+
+    Column {
+        Switch {
+            action: optionVibrate
+            objectName: "vibrateSwitch"
+            property bool val: action.value
+        }
+        TextField {
+            action: optionHomepage
+            objectName: "homepageEntry"
+            property string val: action.value
+        }
+        OptionSelector {
+            action: optionHair
+            objectName: "hairColorSelector"
+            model: [ "Black", "Ginger", "Peroxided", "White" ]
+            property int val: action.value
+            expanded: true
+        }
+    }
+}
+""")
+
+
+class SettingsTestCase(tests.QMLStringAppTestCase):
+
+    scenarios = [
+        ('defaultGroup', dict(test_qml=defaultGroup)),
+        ('multipleGroups', dict(test_qml=multipleGroups)),
+    ]
+
+    def setUp(self):
+        # Make sure we start with the default settings.
+        emulators.Settings.clear('once.upon.a.time')
+        super(SettingsTestCase, self).setUp()
+
+    def get_settings(self):
+        return self.main_view.select_single(
+            emulators.Settings, objectName='settings')
+
+    def get_switch(self):
+        return self.main_view.select_single(objectName='vibrateSwitch')
+
+    def get_entry(self):
+        return self.main_view.select_single(objectName='homepageEntry')
+
+    def get_selector(self):
+        return self.main_view.select_single(objectName='hairColorSelector')
+
+    def test_select_settings_must_return_custom_proxy_object(self):
+        self.assertIsInstance(self.get_settings(), emulators.Settings)
+
+    def test_application_must_start_with_default_values(self):
+        # FIXME: bug #1273956
+        #self.assertEqual(self.settings.get_option('vibrate').value, False)
+        switch = self.get_switch()
+
+        self.assertThat(switch.checked, Eventually(Equals(False)))
+        self.assertThat(switch.val, Equals(switch.checked))
+
+    def test_check_switch_must_update_option_value(self):
+        switch = self.get_switch()
+        switch.check()
+
+        self.assertThat(switch.checked, Eventually(Equals(True)))
+        self.assertThat(switch.val, Equals(switch.checked))
+
+    def test_updated_values_must_be_kept_after_app_restart(self):
+        switch = self.get_switch()
+        switch.check()
+        self.assertThat(switch.checked, Eventually(Equals(True)))
+        self.assertThat(switch.val, Equals(switch.checked))
+
+        domain = 'http://www.ubuntu.com'
+        entry = self.get_entry()
+        entry.clear()
+        entry.write(domain)
+        self.keyboard.press_and_release('Return')
+        self.assertThat(entry.text, Eventually(Equals(domain)))
+        self.assertThat(entry.text, Equals(entry.val))
+
+        selector = self.get_selector()
+        option = selector.select_single('Label', text='Ginger')
+        self.pointing_device.click_object(selector)
+        self.pointing_device.click_object(option)
+        self.assertThat(selector.selectedIndex, Eventually(Equals(1)))
+        self.assertThat(selector.selectedIndex, Equals(selector.val))
+
+        db_file = emulators.Settings._get_database_filename('once.upon.a.time')
+        assert(os.path.exists(db_file))
+
+        # TODO update this once the restart helpers are implemented in
+        # autopilot. See http://pad.lv/1302618 --elopio - 2014-04-04
+        os.killpg(self.app.pid, signal.SIGTERM)
+        self.launch_application()
+
+        switch = self.get_switch()
+        self.assertThat(switch.checked, Eventually(Equals(True)))
+        self.assertThat(switch.val, Equals(switch.checked))
+        entry = self.get_entry()
+        self.assertThat(entry.text, Eventually(Equals(domain)))
+        self.assertThat(entry.text, Equals(entry.val))
+        selector = self.get_selector()
+        index = selector.selectedIndex
+        list = selector.select_single('QQuickListView')
+        self.assertThat(list.currentIndex, Eventually(Equals(index)))
+        self.assertThat(index, Eventually(Equals(1)))
+        self.assertThat(index, Equals(selector.val))
+
 
 class PageTestCase(tests.QMLStringAppTestCase):
 

=== modified file 'tests/resources/alarm/Alarms.qml'
--- tests/resources/alarm/Alarms.qml	2013-09-18 10:13:04 +0000
+++ tests/resources/alarm/Alarms.qml	2014-04-10 15:55:52 +0000
@@ -21,7 +21,7 @@
 
 MainView {
     id: mainView
-    width: units.gu(40)
+    width: units.gu(80)
     height: units.gu(71)
     objectName: "mainView"
 
@@ -162,7 +162,11 @@
         clip: true
         model: alarmModel
         delegate: Standard {
-            text: message
+            text: message + recurring(model) + "\n" + model.date
+            function recurring(alarmData) {
+                return (alarmData.type === Alarm.Repeating) ? "[Repeating]" : "[Onetime]";
+            }
+
             removable: true
             control: Switch {
                 checked: model.enabled

=== modified file 'tests/resources/navigation/Tabs.qml'
--- tests/resources/navigation/Tabs.qml	2014-04-07 10:03:39 +0000
+++ tests/resources/navigation/Tabs.qml	2014-04-10 15:55:52 +0000
@@ -19,9 +19,47 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 MainView {
+    id: root
     width: 800
     height: 600
 
+    property var repeaterModel: 3
+
+    Component {
+        id: dynamicTab
+        Tab {
+            page: Page {
+                Label {
+                    text: title + " at index " + index
+                    anchors.centerIn: parent
+                }
+                tools: ToolbarItems {
+                    ToolbarButton {
+                        text: "move @1"
+                        onTriggered: {
+                            print("MOVE TAB TO #1")
+                            tabs.moveTab(index, 1)
+                        }
+                    }
+                    ToolbarButton {
+                        text: "remove me"
+                        onTriggered: {
+                            print("REMOVE CURENT TAB")
+                            tabs.removeTab(index)
+                        }
+                    }
+                    ToolbarButton {
+                        text: "remove first"
+                        onTriggered: {
+                            print("REMOVE TAB AT #0")
+                            tabs.removeTab(0)
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     Tabs {
         id: tabs
         selectedTabIndex: 0
@@ -31,6 +69,7 @@
 
         Tab {
             id: simpleTab
+            objectName: title
             title: i18n.tr("Simple page #" + index)
             page: Page {
                 Row {
@@ -55,13 +94,60 @@
                         iconSource: "call_icon.png"
                         onTriggered: print("action triggered")
                     }
+                    ToolbarButton {
+                        text: "append"
+                        onTriggered: {
+                            print("APPEND TAB")
+                            tabs.addTab("Appended tab", dynamicTab)
+                        }
+                    }
+                    ToolbarButton {
+                        text: "insert@1"
+                        onTriggered: {
+                            print("INSERT TAB TO #1")
+                            tabs.insertTab(1, "Inserted tab", dynamicTab)
+                        }
+                    }
+                    ToolbarButton {
+                        text: "insert@2"
+                        onTriggered: {
+                            print("INSERT BETWEEN REPEATERS #1")
+                            tabs.insertTab(2, "Between repeaters", dynamicTab)
+                        }
+                    }
+                    ToolbarButton {
+                        text: "insert@here"
+                        onTriggered: {
+                            print("INSERT AFTER ME")
+                            tabs.insertTab(simpleTab.index, "Inserted tab", dynamicTab)
+                        }
+                    }
+                    ToolbarButton {
+                        text: "incRep"
+                        onTriggered: {
+                            print("INCREASE REPEATER MODEL")
+                            root.repeaterModel += 1
+                        }
+                    }
+                    ToolbarButton {
+                        text: "remove last"
+                        onTriggered: {
+                            print("REMOVE LAST TAB")
+                            tabs.removeTab(tabs.count - 1)
+                        }
+                    }
+                    ToolbarButton {
+                        text: "append predec"
+                        onTriggered: tabs.addTab("Re-added ListView", listViewTab)
+                    }
                 }
             }
         }
         Repeater {
-            model: 3
+            model: root.repeaterModel
             Tab {
                 id: tab
+                objectName: title
                 title: "Extra #" + tab.index
                 page: Page {
                     Column {
@@ -88,6 +174,7 @@
         }
         Tab {
             id: externalTab
+            objectName: title
             title: i18n.tr("External #" + index)
             page: Loader {
                 parent: externalTab
@@ -96,6 +183,8 @@
             }
         }
         Tab {
+            id: listViewTab
+            objectName: title
             title: i18n.tr("List view #" + index)
             page: Page {
                 ListView {

=== modified file 'tests/unit/runtest.sh'
--- tests/unit/runtest.sh	2014-03-31 18:26:46 +0000
+++ tests/unit/runtest.sh	2014-04-10 15:55:52 +0000
@@ -33,7 +33,7 @@
   if [ $_TARGET != $_TESTFILE ]; then
       _CMD="$_CMD -input $_TESTFILE"
   fi
-  _CMD="$_CMD -maxwarnings 4"
+  _CMD="$_CMD -maxwarnings 40"
 }
 
 function execute_test_cmd {
@@ -71,7 +71,6 @@
                 tst_listitems_base.qml \
                 tst_statesaver \
                 tst_theme_engine \
-                tst_orientation \
                 tst_tabs.qml \
                 tst_textfield.qml \
                 tst_mousefilters'

=== modified file 'tests/unit/tst_alarms/tst_alarms.cpp'
--- tests/unit/tst_alarms/tst_alarms.cpp	2014-02-21 18:23:41 +0000
+++ tests/unit/tst_alarms/tst_alarms.cpp	2014-04-10 15:55:52 +0000
@@ -25,6 +25,7 @@
 #include "adapters/alarmsadapter_p.h"
 #undef protected
 
+#include "uctestcase.h"
 #include <QtCore/QString>
 #include <QtCore/QTextCodec>
 #include <QtCore/QDebug>
@@ -64,11 +65,18 @@
         syncFetch();
     }
 
-    bool containsAlarm(UCAlarm *alarm)
+    bool containsAlarm(UCAlarm *alarm, bool trace = false)
     {
         UCAlarmPrivate *pAlarm = UCAlarmPrivate::get(alarm);
         QList<AlarmData> alarms = AlarmManager::instance().alarms();
         Q_FOREACH(AlarmData i, alarms) {
+            if (trace && (alarm->message() == i.message)) {
+                qDebug() << "----------------------";
+                qDebug() << "Alarm data:" << alarm->message();
+                qDebug() << alarm->date() << i.date;
+                qDebug() << alarm->type() << i.type;
+                qDebug() << alarm->daysOfWeek() << i.days;
+            }
             if (i == pAlarm->rawData) {
                 return true;
             }
@@ -127,7 +135,7 @@
 
     void test_repeating_autoDetect()
     {
-        UCAlarm alarm(QDateTime::currentDateTime(), UCAlarm::AutoDetect, "test_repeating_autoDetect");
+        UCAlarm alarm(QDateTime::currentDateTime().addSecs(20), UCAlarm::AutoDetect, "test_repeating_autoDetect");
 
         alarm.save();
         waitForRequest(&alarm);
@@ -137,28 +145,92 @@
 
     void test_repeating_daily()
     {
-        UCAlarm alarm(QDateTime::currentDateTime(), UCAlarm::Daily, "test_repeating_daily");
-
-        alarm.save();
-        waitForRequest(&alarm);
-        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
-        QVERIFY(containsAlarm(&alarm));
-    }
-
-    void test_repeating_givenDay()
-    {
-        UCAlarm alarm(QDateTime::currentDateTime(), UCAlarm::Wednesday, "test_repeating_givenDay");
-
-        alarm.save();
-        waitForRequest(&alarm);
-        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
-        QVERIFY(containsAlarm(&alarm));
+        UCAlarm alarm(QDateTime::currentDateTime().addSecs(10), UCAlarm::Daily, "test_repeating_daily");
+
+        alarm.save();
+        waitForRequest(&alarm);
+        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&alarm));
+    }
+
+    void test_repeating_givenDay_exact_data()
+    {
+        QTest::addColumn<QString>("message");
+        QTest::addColumn<int>("day");
+
+        QTest::newRow("Monday") << "Monday" << (int)UCAlarm::Monday;
+        QTest::newRow("Tuesday") << "Tuesday" << (int)UCAlarm::Tuesday;
+        QTest::newRow("Wednesday") << "Wednesday" << (int)UCAlarm::Wednesday;
+        QTest::newRow("Thursday") << "Thursday" << (int)UCAlarm::Thursday;
+        QTest::newRow("Friday") << "Friday" << (int)UCAlarm::Friday;
+        QTest::newRow("Saturday") << "Saturday" << (int)UCAlarm::Saturday;
+        QTest::newRow("Sunday") << "Sunday" << (int)UCAlarm::Sunday;
+    }
+
+    void test_repeating_givenDay_exact()
+    {
+        QFETCH(QString, message);
+        QFETCH(int, day);
+        UCAlarm alarm(QDateTime::currentDateTime(), (UCAlarm::DaysOfWeek)day, "test_repeating_givenDay_exact_" + message);
+
+        alarm.save();
+        waitForRequest(&alarm);
+        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&alarm));
+    }
+
+    void test_repeating_moreDays_data()
+    {
+        QTest::addColumn<QString>("message");
+        QTest::addColumn<int>("days");
+
+        QTest::newRow("First on Monday") << "Monday" << (int)(UCAlarm::Monday | UCAlarm::Sunday);
+        QTest::newRow("First on Tuesday") << "Tuesday" << (int)(UCAlarm::Tuesday | UCAlarm::Monday);
+        QTest::newRow("First on Wednesday") << "Wednesday" << (int)(UCAlarm::Wednesday | UCAlarm::Tuesday);
+        QTest::newRow("First on Thursday") << "Thursday" << (int)(UCAlarm::Thursday | UCAlarm::Wednesday);
+        QTest::newRow("First on Friday") << "Friday" << (int)(UCAlarm::Friday | UCAlarm::Thursday);
+        QTest::newRow("First on Saturday") << "Saturday" << (int)(UCAlarm::Saturday | UCAlarm::Friday);
+        QTest::newRow("First on Sunday") << "Sunday" << (int)(UCAlarm::Sunday | UCAlarm::Saturday);
     }
 
     void test_repeating_moreDays()
     {
-        UCAlarm alarm(QDateTime::currentDateTime(), UCAlarm::Monday | UCAlarm::Wednesday, "test_repeating_moreDays");
-
+        QFETCH(QString, message);
+        QFETCH(int, days);
+
+        QDateTime currentDate(QDateTime::currentDateTime());
+
+        UCAlarm alarm(currentDate, (UCAlarm::DaysOfWeek)days, "test_repeating_moreDays" + message);
+        // the distance is always 6 days between the occurrences
+        UCAlarm firstOccurrence(currentDate, alarm.daysOfWeek(), alarm.message());
+        // make sure we have the same setup as the original one; checkAlarm() adjusts all alarm data
+        UCAlarmPrivate::get(&firstOccurrence)->checkAlarm();
+
+        alarm.save();
+        waitForRequest(&alarm);
+        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&alarm));
+        QVERIFY(containsAlarm(&firstOccurrence));
+    }
+
+    void test_repeating_weekly_data() {
+        QTest::addColumn<QString>("message");
+        QTest::addColumn<int>("dow");
+
+        QTest::newRow("Monday") << "Monday" << (int)UCAlarm::Monday;
+        QTest::newRow("Tuesday") << "Tuesday" << (int)UCAlarm::Tuesday;
+        QTest::newRow("Wednesday") << "Wednesday" << (int)UCAlarm::Wednesday;
+        QTest::newRow("Thursday") << "Thursday" << (int)UCAlarm::Thursday;
+        QTest::newRow("Friday") << "Friday" << (int)UCAlarm::Friday;
+        QTest::newRow("Saturday") << "Saturday" << (int)UCAlarm::Saturday;
+        QTest::newRow("Sunday") << "Sunday" << (int)UCAlarm::Sunday;
+    }
+    void test_repeating_weekly()
+    {
+        QFETCH(QString, message);
+        QFETCH(int, dow);
+
+        UCAlarm alarm(QDateTime::currentDateTime().addSecs(3600), (UCAlarm::DaysOfWeek)dow, "test_repeating_weekly_" + message);
         alarm.save();
         waitForRequest(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
@@ -273,6 +345,85 @@
         QVERIFY(!containsAlarm(&copy));
     }
 
+    void test_updateAlarm_Repeating()
+    {
+        UCAlarm alarm(QDateTime::currentDateTime().addMSecs(5000), UCAlarm::AutoDetect, "test_updateAlarm_Repeating");
+
+        alarm.save();
+        waitForRequest(&alarm);
+        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&alarm));
+
+        alarm.setDate(alarm.date().addDays(1));
+        alarm.save();
+        waitForRequest(&alarm);
+        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&alarm));
+
+        alarm.setDaysOfWeek(UCAlarm::Daily);
+        alarm.save();
+        waitForRequest(&alarm);
+        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&alarm));
+    }
+
+    void test_fetchAlarmPlus7Days()
+    {
+        QDateTime dt = QDateTime::currentDateTime().addDays(10);
+        UCAlarm alarm(dt, "test_fetchAlarmPlus7Days");
+
+        alarm.save();
+        waitForRequest(&alarm);
+        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&alarm));
+
+        UCAlarm nextMonth(dt.addMonths(1), "test_fetchAlarmPlus1Month");
+        nextMonth.save();
+        waitForRequest(&nextMonth);
+        QCOMPARE(nextMonth.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&nextMonth));
+
+        UCAlarm nextYear(dt.addYears(1), "test_fetchAlarmPlus1Year");
+        nextYear.save();
+        waitForRequest(&nextYear);
+        QCOMPARE(nextYear.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&nextYear));
+    }
+
+    void test_correctAlarmOrderDaily()
+    {
+        QDate cd = QDate::currentDate();
+        QTime ct = QTime::currentTime();
+        QDateTime dt(cd, QTime(ct.hour(), ct.minute(), ct.second() + 2));
+        QDateTime nextDt(cd.addDays(1), QTime(ct.hour(), ct.minute(), ct.second() + 2));
+        UCAlarm alarm(dt, UCAlarm::Daily, "test_correctAlarmOrderDaily");
+        UCAlarm nextAlarm(nextDt, UCAlarm::Daily, "test_correctAlarmOrderDaily");
+
+        alarm.save();
+        waitForRequest(&alarm);
+        QTest::qWait(2000);
+        syncFetch();
+        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&nextAlarm));
+    }
+
+    void test_correctAlarmOrderWeekly()
+    {
+        QDate cd = QDate::currentDate();
+        QTime ct = QTime::currentTime();
+        QDateTime dt(cd, QTime(ct.hour(), ct.minute(), ct.second() + 1));
+        QDateTime nextDt(cd.addDays(7), QTime(ct.hour(), ct.minute(), ct.second() + 1));
+        UCAlarm alarm(dt, UCAlarm::AutoDetect, "test_correctAlarmOrderWeekly");
+        UCAlarm nextAlarm(nextDt, UCAlarm::AutoDetect, "test_correctAlarmOrderWeekly");
+
+        alarm.save();
+        waitForRequest(&alarm);
+        QTest::qWait(2000);
+        syncFetch();
+        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&nextAlarm));
+    }
+
 };
 
 QTEST_MAIN(tst_UCAlarms)

=== modified file 'tests/unit/tst_mainview/tst_mainview.cpp'
--- tests/unit/tst_mainview/tst_mainview.cpp	2014-04-07 14:26:30 +0000
+++ tests/unit/tst_mainview/tst_mainview.cpp	2014-04-10 15:55:52 +0000
@@ -145,14 +145,11 @@
     }
 
     void testNoWarnings_bug186065() {
-        QSignalSpy spy(view->engine(), SIGNAL(warnings(QList<QQmlError>)));
-        spy.setParent(view);
-
-        QQuickItem *root = loadTest("AppName.qml"); // An empty MainView would suffice
-        QVERIFY(root);
+        // An empty MainView would suffice
+        QScopedPointer<UbuntuTestCase>testCase (new UbuntuTestCase("AppName.qml"));
 
         // No warnings from QML
-        QCOMPARE(spy.count(), 0);
+        QCOMPARE(testCase->warnings(), 0);
     }
 
     void testWindowTitleFromPage() {

=== modified file 'tests/unit/tst_page/tst_page.cpp'
--- tests/unit/tst_page/tst_page.cpp	2013-11-08 20:19:58 +0000
+++ tests/unit/tst_page/tst_page.cpp	2014-04-10 15:55:52 +0000
@@ -23,7 +23,7 @@
 #include <QtQuick/QQuickItem>
 #include <QtCore/QDir>
 
-#include "ucunits.h"
+#include "uctestcase.h"
 
 class tst_Page : public QObject
 {
@@ -38,55 +38,19 @@
     {
     }
 
-    QQuickItem *loadTest(const QString &document)
-    {
-        // load the document
-        view->setSource(QUrl::fromLocalFile(document));
-        QTest::waitForEvents();
-
-        return view->rootObject();
-    }
-
-    QQuickItem *testItem(QQuickItem *that, const QString &identifier)
-    {
-        if (that->property(identifier.toLocal8Bit()).isValid())
-            return that->property(identifier.toLocal8Bit()).value<QQuickItem*>();
-
-        QList<QQuickItem*> children = that->findChildren<QQuickItem*>(identifier);
-        return (children.count() > 0) ? children[0] : 0;
-    }
-
 private Q_SLOTS:
 
     void initTestCase()
     {
-        QString modules("../../../modules");
-        QVERIFY(QDir(modules).exists());
-
-        view = new QQuickView;
-        QQmlEngine *quickEngine = view->engine();
-
-        view->setGeometry(0,0, UCUnits::instance().gu(40), UCUnits::instance().gu(30));
-        //add modules folder so we have access to the plugin from QML
-        QStringList imports = quickEngine->importPathList();
-        imports.prepend(QDir(modules).absolutePath());
-        quickEngine->setImportPathList(imports);
     }
 
     void cleanupTestCase()
     {
-        delete view;
     }
 
     void testAnchorToPage_bug1249386() {
-        QSignalSpy spy(view->engine(), SIGNAL(warnings(QList<QQmlError>)));
-        spy.setParent(view);
-
-        QQuickItem *root = loadTest("AnchorToPage.qml");
-        QVERIFY(root);
-
-        // No warnings from QML
-        QCOMPARE(spy.count(), 0);
+        QScopedPointer<UbuntuTestCase> testCase(new UbuntuTestCase("AnchorToPage.qml"));
+        QCOMPARE(testCase->warnings(), 0);
     }
 };
 

=== added file 'tests/unit_x11/tst_components/ExternalTab.qml'
--- tests/unit_x11/tst_components/ExternalTab.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/ExternalTab.qml	2014-04-10 15:55:52 +0000
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Tab {
+}

=== modified file 'tests/unit_x11/tst_components/tst_tabs.qml'
--- tests/unit_x11/tst_components/tst_tabs.qml	2014-01-13 12:43:12 +0000
+++ tests/unit_x11/tst_components/tst_tabs.qml	2014-04-10 15:55:52 +0000
@@ -27,6 +27,13 @@
         id: emptyTabs
     }
 
+    Component {
+        id: dynamicTab
+        Tab{
+            title: "OriginalTitle"
+        }
+    }
+
     MainView {
         id: mainView
         anchors.fill: parent
@@ -424,5 +431,149 @@
             mouseRelease(tabs.tabBar, tabs.tabBar.width/2, tabs.tabBar.height/2);
             compare(tabs.tabBar.pressed, false, "After releasing, pressed is false");
         }
+
+
+
+        // these tests should not be mixed with Repeaters
+        function test_z_addTab() {
+            var newTab = tabs.addTab("Dynamic Tab", dynamicTab);
+            compare((newTab !== null), true, "tab added");
+            compare(newTab.active, false, "the inserted tab is inactive");
+            compare(newTab.index, tabs.count - 1, "the tab is the last one");
+        }
+
+        function test_z_addExternalTab() {
+            var newTab = tabs.addTab("External Tab", Qt.resolvedUrl("ExternalTab.qml"));
+            compare((newTab !== null), true, "tab added");
+            compare(newTab.active, false, "the inserted tab is inactive");
+            compare(newTab.index, tabs.count - 1, "the tab is the last one");
+        }
+
+        function test_z_addTabWithDefaultTitle() {
+            var newTab = tabs.addTab("", dynamicTab);
+            compare((newTab !== null), true, "tab added");
+            compare(newTab.title, "OriginalTitle", "tab created with original title");
+        }
+
+        function test_z_insertTab() {
+            var tabIndex = Math.ceil(tabs.count / 2);
+            var newTab = tabs.insertTab(tabIndex, "Inserted tab", dynamicTab);
+            compare((newTab !== null), true, "tab inserted");
+            compare(newTab.index, tabIndex, "this is the first tab");
+            compare(tabs.selectedTab !== newTab, true, "the new tab is not the active one");
+        }
+
+        function test_z_insertExternalTab() {
+            var tabIndex = Math.ceil(tabs.count / 2);
+            var newTab = tabs.insertTab(tabIndex, "Inserted External tab", Qt.resolvedUrl("ExternalTab.qml"));
+            compare((newTab !== null), true, "tab inserted");
+            compare(newTab.index, tabIndex, "this is the first tab");
+            compare(tabs.selectedTab !== newTab, true, "the new tab is not the active one");
+        }
+
+        function test_z_insertTabAtSelectedIndex() {
+            tabs.selectedTabIndex = 1;
+            var tabIndex = tabs.selectedTabIndex - 1;
+            var newTab = tabs.insertTab(tabIndex, "InsertedAtSelected tab", dynamicTab);
+            compare((newTab !== null), true, "tab inserted");
+            compare(newTab.index, tabIndex, "inserted at selected tab");
+            compare(tabs.selectedTabIndex != (tabIndex + 1), true, "it is not the selected tab");
+        }
+
+        function test_z_insertTabFront() {
+            var newTab = tabs.insertTab(-1, "PreTab", dynamicTab);
+            compare(newTab !== null, true, "pre-tab inserted");
+            compare(newTab.index, 0, "this is the new first tab");
+            compare(tabs.selectedTab !== newTab, true, "the new tab is not the active one");
+        }
+
+        function test_z_insertTabEnd() {
+            var newTab = tabs.insertTab(tabs.count, "PostTab", dynamicTab);
+            compare(newTab !== null, true, "post-tab inserted");
+            compare(newTab.index, tabs.count - 1, "thsi is the new last tab");
+            compare(tabs.selectedTab !== newTab, true, "the new tab is not the active one");
+        }
+
+        function test_z_insertTabAndActivate() {
+            var newTab = tabs.addTab("Inserted tab", dynamicTab);
+            compare((newTab !== null), true, "tab inserted");
+            compare(newTab.index, tabs.count - 1, "the tab is the last one");
+            tabs.selectedTabIndex = newTab.index;
+            compare(tabs.selectedTab, newTab, "the inserted tab is selected");
+            compare(newTab.active, true, "the new tab is active");
+        }
+
+        function test_z_moveTab() {
+            var selectedIndex = tabs.count - 1;
+            tabs.selectedTabIndex = selectedIndex;
+            compare(tabs.moveTab(0, selectedIndex), true, "first tab moved to last");
+            compare(tabs.selectedTabIndex, selectedIndex - 1, "the selected index moved backwards");
+            tabs.selectedTabIndex = selectedIndex = 0;
+            compare(tabs.moveTab(selectedIndex, selectedIndex + 1), true, "selected tab moved as next");
+            compare(tabs.selectedTabIndex, selectedIndex + 1, "the selected index moved forewards");
+        }
+
+        function test_z_moveSelectedTab() {
+            tabs.selectedTabIndex = 0;
+            tabs.moveTab(0, 1);
+            compare(tabs.selectedTabIndex, 1, "selected tab moved");
+        }
+
+        function test_z_moveTabFail() {
+            compare(tabs.moveTab(-1, tabs.count - 1), false, "from-parameter out of range");
+            compare(tabs.moveTab(0, tabs.count), false, "to-parameter out of range");
+        }
+
+        function test_z_removeTab() {
+            compare(tabs.removeTab(tabs.count - 1), true, "last tab removed");
+            tabs.selectedTabIndex = 0;
+            compare(tabs.removeTab(0), true, "active tab removed");
+            compare(tabs.selectedTabIndex, 0, "the next tab is selected")
+        }
+
+        function test_z_removeActiveTab() {
+            tabs.selectedTabIndex = 1;
+            compare(tabs.removeTab(1), true, "selected tab removed");
+            compare(tabs.selectedTabIndex, 1, "selected tab is next");
+
+            tabs.selectedTabIndex = tabs.count - 1;
+            compare(tabs.removeTab(tabs.count - 1), true, "last tab removed");
+            compare(tabs.selectedTabIndex, tabs.count - 1, "selected tab moved to last item");
+        }
+
+        function test_z_removeTabAfterActiveTab() {
+            var activeTab = tabs.count - 2;
+            tabs.selectedTabIndex = activeTab;
+            compare(tabs.removeTab(tabs.count - 1), true, "last tab removed");
+            compare(tabs.selectedTabIndex, activeTab, "the selected tab wasn't moved");
+        }
+
+        function test_z_removeTabBeforeActiveTab() {
+            var activeTab = tabs.count - 1;
+            tabs.selectedTabIndex = activeTab;
+            compare(tabs.removeTab(0), true, "first tab removed");
+            compare(tabs.selectedTabIndex, activeTab - 1, "the selected tab index decreased");
+        }
+
+        function test_zz_addTabAfterCleaningUpTabs() {
+            while (tabs.count > 1) {
+                tabs.removeTab(tabs.count - 1);
+            }
+            compare(tabs.selectedTabIndex, 0, "the only tab is the selected one");
+            // add a new tab anc check the count (default added tas should not be added anymore
+            tabs.addTab("Second tab", dynamicTab);
+            compare(tabs.count, 2, "we have two tabs only");
+        }
+
+        function test_zz_addPredeclaredTab() {
+            tabs.removeTab(tab1.index);
+
+            // add a predeclared tab back with original title
+            compare(tabs.addTab("", tab1), tab1, "tab1 was not added back");
+            compare(tab1.title, "tab 1", "the original title differs");
+
+            // add a predeclared tab which was added already
+            compare(tabs.addTab("", tab1), null, "tab1 is already in tabs");
+        }
     }
 }

=== modified file 'tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp'
--- tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp	2014-02-13 17:16:06 +0000
+++ tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp	2014-04-10 15:55:52 +0000
@@ -24,6 +24,7 @@
 
 #include "ucmouse.h"
 #include "ucinversemouse.h"
+#include "uctestcase.h"
 
 #include "ucunits.h"
 #include "quickutils.h"
@@ -56,24 +57,10 @@
     bool insideClick;
     bool oskClick;
 
-    QQuickView * loadTest(const QString &file, QSignalSpy **spy = 0)
+    QQuickView * loadTest(const QString &file)
     {
-        QQuickView *view = new QQuickView;
-        if (spy) {
-            *spy = new QSignalSpy(view->engine(), SIGNAL(warnings(QList<QQmlError>)));
-            (*spy)->setParent(view);
-        }
-        view->engine()->addImportPath(m_modulePath);
-
-        view->setSource(QUrl::fromLocalFile(file));
-        if (!view->rootObject()) {
-            delete view;
-            view = 0;
-        } else {
-            view->show();
-            QTest::qWaitForWindowExposed(view);
-        }
-        return view;
+        UbuntuTestCase* testCase = new UbuntuTestCase(file);
+        return qobject_cast<QQuickView*>(testCase);
     }
 
     void mousePressAndHold(QWindow *view, Qt::MouseButton button, Qt::KeyboardModifiers modifiers, const QPoint &point, int delay = DefaultPressAndHoldDelay + 200)
@@ -202,10 +189,9 @@
 
     void testCase_pressedOutsideTextInputAfter()
     {
-        QSignalSpy *spy;
-        QScopedPointer<QQuickView> view(loadTest("FilterInverseTextInputAfter.qml", &spy));
-        QVERIFY(view);
-        QCOMPARE(spy->count(), 1);
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("FilterInverseTextInputAfter.qml"));
+        QCOMPARE(view->warnings(), 1);
+
         UCInverseMouse *filter = attachedFilter<UCInverseMouse>(view->rootObject(), "FilterOwner");
         QVERIFY(filter);
         QSignalSpy pressed(filter, SIGNAL(pressed(QQuickMouseEvent*)));
@@ -554,18 +540,14 @@
 
     void testCase_mouseFilterAttachedToNonItem()
     {
-        QSignalSpy *warningSpy;
-        QScopedPointer<QQuickView> view(loadTest("MouseFilterAttachedToNonItem.qml", &warningSpy));
-        QVERIFY(view);
-        QCOMPARE(warningSpy->count(), 1);
+        QScopedPointer<UbuntuTestCase> testCase(new UbuntuTestCase("MouseFilterAttachedToNonItem.qml"));
+        QCOMPARE(testCase->warnings(), 1);
     }
 
     void testCase_inverseMouseFilterAttachedToNonItem()
     {
-        QSignalSpy *warningSpy;
-        QScopedPointer<QQuickView> view(loadTest("InverseMouseFilterAttachedToNonItem.qml", &warningSpy));
-        QVERIFY(view);
-        QCOMPARE(warningSpy->count(), 1);
+        QScopedPointer<UbuntuTestCase> testCase(new UbuntuTestCase("InverseMouseFilterAttachedToNonItem.qml"));
+        QCOMPARE(testCase->warnings(), 1);
     }
 
     void testCase_forwardedEventsToItem()

=== modified file 'tests/unit_x11/tst_orientation/tst_orientation.cpp'
--- tests/unit_x11/tst_orientation/tst_orientation.cpp	2014-03-19 11:24:16 +0000
+++ tests/unit_x11/tst_orientation/tst_orientation.cpp	2014-04-10 15:55:52 +0000
@@ -29,75 +29,37 @@
 #include <QtQuick/QQuickItem>
 #include <QtQml/QQmlProperty>
 
+#include "uctestcase.h"
+
 class tst_OrientationTest : public QObject
 {
     Q_OBJECT
 public:
     tst_OrientationTest() {}
 
-private:
-    QString m_modulePath;
-
-    QQuickView *createView(const QString &file, QSignalSpy **spy = 0)
-    {
-        QQuickView *view = new QQuickView(0);
-        if (spy) {
-            *spy = new QSignalSpy(view->engine(), SIGNAL(warnings(QList<QQmlError>)));
-            (*spy)->setParent(view);
-        }
-        view->engine()->addImportPath(m_modulePath);
-        view->setSource(QUrl::fromLocalFile(file));
-        if (!view->rootObject()) {
-            return 0;
-        }
-        view->show();
-        QTest::qWaitForWindowExposed(view);
-        return view;
-    }
-
 private Q_SLOTS:
 
-    void initTestCase()
-    {
-        QDir modules ("../../../modules");
-        QVERIFY(modules.exists());
-        m_modulePath = modules.absolutePath();
-    }
-
-    void cleanupTestCase()
-    {
-    }
-
     void test_defaults()
     {
-        QSignalSpy *spy;
-        QQuickView *view = createView("Defaults.qml", &spy);
-        QVERIFY(view);
-        QQuickItem *helper = view->rootObject()->findChild<QQuickItem*>("helper");
-        QVERIFY(helper);
+        QScopedPointer<UbuntuTestCase> testCase(new UbuntuTestCase("Defaults.qml"));
+        QQuickItem *helper = testCase->findItem<QQuickItem*>("helper");
         QCOMPARE(helper->property("automaticOrientation").toBool(), true);
         // No warnings expected
-        QCOMPARE(spy->count(), 0);
-        delete view;
+        QCOMPARE(testCase->warnings(), 0);
     }
 
     void test_manualAngle()
     {
-        QSignalSpy *spy;
-        QQuickView *view = createView("ManualAngle.qml", &spy);
-        QVERIFY(view);
-        QQuickItem *helper = view->rootObject()->findChild<QQuickItem*>("helper");
-        QVERIFY(helper);
+        QScopedPointer<UbuntuTestCase> testCase(new UbuntuTestCase("ManualAngle.qml"));
+        QQuickItem *helper = testCase->findItem<QQuickItem*>("helper");
         // No warning about "window" being undefined must appear
         QSKIP("TypeError: Cannot set property 'contentOrientation' of null");
-        QCOMPARE(spy->count(), 0);
+        QCOMPARE(testCase->warnings(), 0);
         QCOMPARE(helper->property("orientationAngle").toInt(), 90);
         // Verify expected values
-        QQuickItem *checkpoint = view->rootObject()->findChild<QQuickItem*>("checkpoint");
-        QVERIFY(checkpoint);
+        QQuickItem *checkpoint = testCase->findItem<QQuickItem*>("checkpoint");
         // window.contentOrientation 
         QCOMPARE(checkpoint->property("contentOrientation").toInt(), helper->property("orientationAngle").toInt());
-        delete view;
     }
 };
 

=== modified file 'tests/unit_x11/tst_statesaver/tst_statesaver.cpp'
--- tests/unit_x11/tst_statesaver/tst_statesaver.cpp	2014-03-26 19:25:55 +0000
+++ tests/unit_x11/tst_statesaver/tst_statesaver.cpp	2014-04-10 15:55:52 +0000
@@ -32,6 +32,7 @@
 #include "ucapplication.h"
 #include <QtCore/QProcess>
 #include <QtCore/QProcessEnvironment>
+#include "uctestcase.h"
 #include <signal.h>
 
 #define protected public
@@ -48,30 +49,24 @@
 private:
     QString m_modulePath;
 
-    QQuickView *createView(const QString &file, QSignalSpy **spy = 0)
-    {
-        QQuickView *view = new QQuickView(0);
-        if (spy) {
-            *spy = new QSignalSpy(view->engine(), SIGNAL(warnings(QList<QQmlError>)));
-            (*spy)->setParent(view);
-        }
-        view->engine()->addImportPath(m_modulePath);
-        view->setSource(QUrl::fromLocalFile(file));
-        if (!view->rootObject()) {
-            return 0;
-        }
-        view->show();
-        QTest::qWaitForWindowExposed(view);
-
-        // connect StateSaverBackend's initiateStateSaving() to view destroyed
-        return view;
-    }
-
-    void resetView(QScopedPointer<QQuickView> &view, const QString &file, QSignalSpy **spy = 0)
-    {
-        Q_EMIT StateSaverBackend::instance().initiateStateSaving();
-        view.reset();
-        view.reset(createView(file, spy));
+    QQuickView *createView(const QString &file)
+    {
+        UbuntuTestCase* testCase = new UbuntuTestCase(file);
+        return qobject_cast<QQuickView*>(testCase);
+    }
+
+    void resetView(QScopedPointer<UbuntuTestCase> &view, const QString &file)
+    {
+        Q_EMIT StateSaverBackend::instance().initiateStateSaving();
+        view.reset();
+        view.reset(new UbuntuTestCase(file));
+    }
+
+    void resetView(QScopedPointer<QQuickView> &view, const QString &file)
+    {
+        Q_EMIT StateSaverBackend::instance().initiateStateSaving();
+        view.reset();
+        view.reset(createView(file));
     }
 
     QString stateFile(const QString &appId)
@@ -236,18 +231,17 @@
 
     void test_InvalidUID()
     {
-        QSignalSpy *spy;
-        QScopedPointer<QQuickView> view(createView("InvalidUID.qml", &spy));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("InvalidUID.qml"));
         QVERIFY(view);
-        QCOMPARE(spy->count(), 1);
+        QCOMPARE(view->warnings(), 1);
         QObject *testItem = view->rootObject()->findChild<QObject*>("testItem");
         QVERIFY(testItem);
 
         testItem->setObjectName("updated");
 
-        resetView(view, "InvalidUID.qml", &spy);
+        resetView(view, "InvalidUID.qml");
         QVERIFY(view);
-        QCOMPARE(spy->count(), 1);
+        QCOMPARE(view->warnings(), 1);
         testItem = view->rootObject()->findChild<QObject*>("updated");
         QVERIFY(testItem == 0);
     }
@@ -269,18 +263,17 @@
 
     void test_InvalidGroupProperty()
     {
-        QSignalSpy *spy;
-        QScopedPointer<QQuickView> view(createView("InvalidGroupProperty.qml", &spy));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("InvalidGroupProperty.qml"));
         QVERIFY(view);
-        QCOMPARE(spy->count(), 1);
+        QCOMPARE(view->warnings(), 1);
         QObject *testItem = view->rootObject()->findChild<QObject*>("testItem");
         QVERIFY(testItem);
 
         testItem->setObjectName("group");
 
-        resetView(view, "InvalidGroupProperty.qml", &spy);
+        resetView(view, "InvalidGroupProperty.qml");
         QVERIFY(view);
-        QCOMPARE(spy->count(), 1);
+        QCOMPARE(view->warnings(), 1);
         testItem = view->rootObject()->findChild<QObject*>("group");
         QVERIFY(testItem == 0);
     }
@@ -389,8 +382,7 @@
 
     void test_ComponentsWithStateSaversNoId()
     {
-        QSignalSpy *spy;
-        QScopedPointer<QQuickView> view(createView("ComponentsWithStateSaversNoId.qml", &spy));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("ComponentsWithStateSaversNoId.qml"));
         QVERIFY(view);
         QObject *control1 = view->rootObject()->findChild<QObject*>("control1");
         QVERIFY(control1);
@@ -399,7 +391,7 @@
         UCStateSaverAttached *stateSaver1 = qobject_cast<UCStateSaverAttached*>(qmlAttachedPropertiesObject<UCStateSaver>(control1, false));
         QVERIFY(stateSaver1);
         QVERIFY(stateSaver1->enabled() == false);
-        QCOMPARE(spy->count(), 1);
+        QCOMPARE(view->warnings(), 1);
         UCStateSaverAttached *stateSaver2 = qobject_cast<UCStateSaverAttached*>(qmlAttachedPropertiesObject<UCStateSaver>(control2, false));
         QVERIFY(stateSaver2);
         QVERIFY(stateSaver2->enabled());

=== modified file 'tests/unit_x11/tst_test/tst_ubuntutestcase.qml'
--- tests/unit_x11/tst_test/tst_ubuntutestcase.qml	2014-02-13 10:27:14 +0000
+++ tests/unit_x11/tst_test/tst_ubuntutestcase.qml	2014-04-10 15:55:52 +0000
@@ -23,30 +23,57 @@
  width: 800
  height: 600
 
- MouseArea {
-    id: mouseArea
-    objectName: "myMouseArea"
- 	anchors.fill: parent
- 	hoverEnabled: true
-	property int testX : 0
-	property int testY : 0
-	property int steps : 0
+ Column {
+     anchors.fill: parent
+     MouseArea {
+        id: mouseArea
+        objectName: "myMouseArea"
+        width: parent.width
+        height: 300
+        hoverEnabled: true
+        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
+        property int testX : 0
+        property int testY : 0
+        property int steps : 0
 
- 	onPositionChanged: {
- 	   testX = mouseX;
-	   testY = mouseY;
-	   steps++;
- 	}
+        onPositionChanged: {
+           testX = mouseX;
+           testY = mouseY;
+           steps++;
+        }
+     }
+     Flickable {
+         id: flicker
+         width: parent.width
+         height: 400
+         contentWidth: rect.width
+         contentHeight: rect.height
+         clip: true
+         Rectangle {
+             id: rect
+             color: "blue"
+             width: 1000
+             height: 1000
+         }
+     }
  }
  
  UbuntuTestCase {
     name: "TestTheUbuntuTestCase"
     when: windowShown
 
+    function init() {
+        mouseArea.steps = 0;
+    }
+    function cleanup() {
+        movementSpy.clear();
+        longPressSpy.clear();
+    }
+
     function test_mouseMoveSlowly() {
-       mouseMoveSlowly(root,0,0,800,600,10,100);
+       mouseMoveSlowly(root,0,0,800,300,10,100);
        compare(mouseArea.testX,800);
-       compare(mouseArea.testY,600);
+       compare(mouseArea.testY,300);
        compare(mouseArea.steps,10);
     }
 
@@ -58,5 +85,66 @@
         child = findChild(root,"NoSuchChildHere");
         compare(child===null,true,"When there is no child, function should return null");
     }
+
+    SignalSpy {
+        id: longPressSpy
+        target: mouseArea
+        signalName: "onPressAndHold"
+    }
+
+    function test_longPress_left() {
+        longPressSpy.clear();
+        mouseLongPress(mouseArea, mouseArea.width / 2, mouseArea.height / 2);
+        longPressSpy.wait();
+        // cleanup
+        mouseRelease(mouseArea, mouseArea.width / 2, mouseArea.height / 2);
+    }
+
+    function test_longPress_right() {
+        longPressSpy.clear();
+        mouseLongPress(mouseArea, mouseArea.width / 2, mouseArea.height / 2, Qt.RightButton);
+        longPressSpy.wait();
+        // cleanup
+        mouseRelease(mouseArea, mouseArea.width / 2, mouseArea.height / 2, Qt.RightButton);
+    }
+
+    function test_longPress_middle() {
+        longPressSpy.clear();
+        mouseLongPress(mouseArea, mouseArea.width / 2, mouseArea.height / 2, Qt.MiddleButton);
+        longPressSpy.wait();
+        // cleanup
+        mouseRelease(mouseArea, mouseArea.width / 2, mouseArea.height / 2, Qt.MiddleButton);
+    }
+
+    SignalSpy {
+        id: movementSpy
+        target: flicker
+        signalName: "onMovementEnded"
+    }
+
+    function test_flick_default() {
+        flick(flicker, 0, 0, flicker.width, flicker.height);
+        movementSpy.wait();
+    }
+    function test_flick_long() {
+        flick(flicker, 0, 0, flicker.width, flicker.height, -1, 10);
+        movementSpy.wait();
+    }
+    function test_flick_short() {
+        flick(flicker, 0, 0, flicker.width, flicker.height, -1, 1);
+        movementSpy.wait();
+    }
+    function test_flick_pressTimeout() {
+        flick(flicker, 0, 0, flicker.width, flicker.height, 400);
+        movementSpy.wait();
+    }
+    function test_flick_pressTimeout_short() {
+        flick(flicker, flicker.width, flicker.height, -flicker.width, -flicker.height, 400, 1);
+        movementSpy.wait();
+    }
+    function test_flick_pressTimeout_long() {
+        flick(flicker, flicker.width, flicker.height, -flicker.width, -flicker.height, 400, 100);
+        movementSpy.wait();
+    }
  }
 }

=== modified file 'tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp'
--- tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp	2013-12-03 13:09:51 +0000
+++ tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp	2014-04-10 15:55:52 +0000
@@ -21,6 +21,8 @@
 #include <QtQml/QQmlComponent>
 #include "uctheme.h"
 
+Q_DECLARE_METATYPE(QList<QQmlError>)
+
 class tst_UCTheme : public QObject
 {
     Q_OBJECT
@@ -154,6 +156,7 @@
 
     UCTheme theme;
     QQmlEngine engine;
+    qRegisterMetaType<QList <QQmlError> >();
     QSignalSpy spy(&engine, SIGNAL(warnings(QList<QQmlError>)));
     theme.registerToContext(engine.rootContext());
     QQmlComponent parentComponent(&engine, "Parent.qml");