Ubuntu UI Toolkit

Merge lp://qastaging/~pete-woods/ubuntu-ui-toolkit/handle-quit-action into lp://qastaging/ubuntu-ui-toolkit

handle-quit-action
Merge into trunk

Proposed by Pete Woods on 2014-01-30

Status:

Merged

Approved by:

Zsombor Egri on 2014-02-12

Approved revision:

932

Merged at revision:

935

Proposed branch:

lp://qastaging/~pete-woods/ubuntu-ui-toolkit/handle-quit-action

Merge into:

lp://qastaging/ubuntu-ui-toolkit

Diff against target:

123 lines (+13/-9)

8 files modified

debian/control (+2/-2)
modules/Ubuntu/Components/Action.qml (+1/-1)
modules/Ubuntu/Components/MainView.qml (+5/-1)
modules/Ubuntu/Components/Page.qml (+1/-1)
modules/Ubuntu/Components/TextField.qml (+1/-1)
tests/unit/tst_components/tst_checkbox.qml (+1/-1)
tests/unit_x11/tst_components/tst_optionselector.qml (+1/-1)
tests/unit_x11/tst_components/tst_textfield.qml (+1/-1)

To merge this branch:

bzr merge lp://qastaging/~pete-woods/ubuntu-ui-toolkit/handle-quit-action

Related bugs:

Bug #1269409: Reenable closing apps from HUD

Undecided

Fix Released

Remove

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-02-10
Zsombor Egri		2014-01-30	Approve on 2014-02-10
Ubuntu SDK team		2014-01-30	Pending
Review via email: mp+203964@code.qastaging.launchpad.net

Commit message

Handle the unity-action-api quit signal

Description of the change

Handle the unity-action-api quit signal

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-30:

#

FAILED: Continuous integration, rev:928
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1655/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2752/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2513/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/603/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/603/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2754/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2514/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-30:

#

FAILED: Continuous integration, rev:929
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1658/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2758/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2519/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/606/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/606/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2760/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2520/console

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

review: Needs Fixing (continuous-integration)

lp://qastaging/~pete-woods/ubuntu-ui-toolkit/handle-quit-action updated on 2014-02-06

930. By Pete Woods on 2014-02-06: Remove this un-necessary line

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-06:

#

PASSED: Continuous integration, rev:930
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1689/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2962
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/637
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/637
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/637/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2601
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2964
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2964/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2697
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2697/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5121
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3697

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

review: Approve (continuous-integration)

Revision history for this message

Pete Woods (pete-woods) wrote on 2014-02-06:

#

Hi Zsombi,

Seems like Jenkins is happy with this MR, now that its dependencies have been landed.

Any chance you could take a look at it now?

Thanks,
Pete

lp://qastaging/~pete-woods/ubuntu-ui-toolkit/handle-quit-action updated on 2014-02-10

931. By Pete Woods on 2014-02-10: Change TODO -> FIXME
932. By Pete Woods on 2014-02-10: Consistently use version 1.1 of unity-action-api

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-02-10:

#

Seems to be working nicely. Thanks!

review: Approve

Revision history for this message

Pete Woods (pete-woods) wrote on 2014-02-10:

#

Thanks for your time!

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-10:

#

PASSED: Continuous integration, rev:932
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1703/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3060
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2779
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/651
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/651
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/651/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2688
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3062
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3062/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2780
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2780/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5195
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3791

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

review: Approve (continuous-integration)

Revision history for this message

Pete Woods (pete-woods) wrote on 2014-02-10:

#

Okay, I've tested this on my devices (N4 and N10) and it seems to work for me.

Preview Diff

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

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes:

Brian Blevins

Caco V. Topia

Jaroslavas Karmazinas

Pete Woods

Ubuntu SDK team

to status/vote changes:

william