Ubuntu UI Toolkit

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

  1. handle-quit-action
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Zsombor Egri
Approved revision: 932
Merged at revision: 935
Proposed branch: lp:~pete-woods/ubuntu-ui-toolkit/handle-quit-action
Merge into: lp: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:~pete-woods/ubuntu-ui-toolkit/handle-quit-action
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zsombor Egri Approve
Ubuntu SDK team Pending
Review via email: mp+203964@code.launchpad.net

Commit message

Handle the unity-action-api quit signal

Description of the change

Handle the unity-action-api quit signal

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 :

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:~pete-woods/ubuntu-ui-toolkit/handle-quit-action updated
930. By Pete Woods

Remove this un-necessary line

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 :

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:~pete-woods/ubuntu-ui-toolkit/handle-quit-action updated
931. By Pete Woods

Change TODO -> FIXME

932. By Pete Woods

Consistently use version 1.1 of unity-action-api

Revision history for this message
Zsombor Egri (zsombi) wrote :

Seems to be working nicely. Thanks!

review: Approve
Revision history for this message
Pete Woods (pete-woods) wrote :

Thanks for your time!

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 :

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
=== modified file 'debian/control'
--- debian/control 2014-01-15 06:42:42 +0000
+++ debian/control 2014-02-10 09:29:15 +0000
@@ -20,7 +20,7 @@
20 qtdeclarative5-test-plugin,20 qtdeclarative5-test-plugin,
21 qtdeclarative5-window-plugin,21 qtdeclarative5-window-plugin,
22 qtdeclarative5-qtfeedback-plugin,22 qtdeclarative5-qtfeedback-plugin,
23 qtdeclarative5-unity-action-plugin,23 qtdeclarative5-unity-action-plugin (>= 1.1.0),
24 qtdeclarative5-localstorage-plugin,24 qtdeclarative5-localstorage-plugin,
25 qtdeclarative5-doc-html,25 qtdeclarative5-doc-html,
26 qtwebkit5-doc-html,26 qtwebkit5-doc-html,
@@ -54,7 +54,7 @@
54 qtdeclarative5-qtquick2-plugin,54 qtdeclarative5-qtquick2-plugin,
55 qtdeclarative5-window-plugin,55 qtdeclarative5-window-plugin,
56 qtdeclarative5-qtfeedback-plugin,56 qtdeclarative5-qtfeedback-plugin,
57 qtdeclarative5-unity-action-plugin,57 qtdeclarative5-unity-action-plugin (>= 1.1.0),
58 ttf-ubuntu-font-family,58 ttf-ubuntu-font-family,
59 ubuntu-ui-toolkit-theme,59 ubuntu-ui-toolkit-theme,
60 ${misc:Depends},60 ${misc:Depends},
6161
=== modified file 'modules/Ubuntu/Components/Action.qml'
--- modules/Ubuntu/Components/Action.qml 2013-11-22 14:49:12 +0000
+++ modules/Ubuntu/Components/Action.qml 2014-02-10 09:29:15 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.0
18import Ubuntu.Unity.Action 1.0 as UnityActions18import Ubuntu.Unity.Action 1.1 as UnityActions
1919
20/*!20/*!
21 \qmltype Action21 \qmltype Action
2222
=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml 2013-12-05 17:28:54 +0000
+++ modules/Ubuntu/Components/MainView.qml 2014-02-10 09:29:15 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.0
18import Ubuntu.Unity.Action 1.0 as UnityActions18import Ubuntu.Unity.Action 1.1 as UnityActions
1919
20/*!20/*!
21 \qmltype MainView21 \qmltype MainView
@@ -384,6 +384,10 @@
384 id: internal384 id: internal
385 UnityActions.ActionManager {385 UnityActions.ActionManager {
386 id: unityActionManager386 id: unityActionManager
387 onQuit: {
388 // FIXME Wire this up to the application lifecycle management API instead of quit().
389 Qt.quit()
390 }
387 }391 }
388 }392 }
389393
390394
=== modified file 'modules/Ubuntu/Components/Page.qml'
--- modules/Ubuntu/Components/Page.qml 2014-01-13 14:54:01 +0000
+++ modules/Ubuntu/Components/Page.qml 2014-02-10 09:29:15 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.0
18import Ubuntu.Unity.Action 1.0 as UnityActions18import Ubuntu.Unity.Action 1.1 as UnityActions
1919
20/*!20/*!
21 \qmltype Page21 \qmltype Page
2222
=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml 2014-01-23 17:17:00 +0000
+++ modules/Ubuntu/Components/TextField.qml 2014-02-10 09:29:15 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17import QtQuick 2.017import QtQuick 2.0
18import Ubuntu.Unity.Action 1.0 as UnityActions18import Ubuntu.Unity.Action 1.1 as UnityActions
1919
20/*!20/*!
21 \qmltype TextField21 \qmltype TextField
2222
=== modified file 'tests/unit/tst_components/tst_checkbox.qml'
--- tests/unit/tst_components/tst_checkbox.qml 2013-10-25 11:17:37 +0000
+++ tests/unit/tst_components/tst_checkbox.qml 2014-02-10 09:29:15 +0000
@@ -17,7 +17,7 @@
17import QtQuick 2.017import QtQuick 2.0
18import QtTest 1.018import QtTest 1.0
19import Ubuntu.Components 0.119import Ubuntu.Components 0.1
20import Ubuntu.Unity.Action 1.0 as UnityActions20import Ubuntu.Unity.Action 1.1 as UnityActions
2121
22TestCase {22TestCase {
23 name: "CheckBoxAPI"23 name: "CheckBoxAPI"
2424
=== modified file 'tests/unit_x11/tst_components/tst_optionselector.qml'
--- tests/unit_x11/tst_components/tst_optionselector.qml 2013-12-18 12:40:20 +0000
+++ tests/unit_x11/tst_components/tst_optionselector.qml 2014-02-10 09:29:15 +0000
@@ -18,7 +18,7 @@
18import QtTest 1.018import QtTest 1.0
19import Ubuntu.Components 0.119import Ubuntu.Components 0.1
20import Ubuntu.Test 0.120import Ubuntu.Test 0.1
21import Ubuntu.Unity.Action 1.0 as UnityActions21import Ubuntu.Unity.Action 1.1 as UnityActions
2222
23MainView {23MainView {
24 width: 40024 width: 400
2525
=== modified file 'tests/unit_x11/tst_components/tst_textfield.qml'
--- tests/unit_x11/tst_components/tst_textfield.qml 2014-01-29 19:55:41 +0000
+++ tests/unit_x11/tst_components/tst_textfield.qml 2014-02-10 09:29:15 +0000
@@ -17,7 +17,7 @@
17import QtQuick 2.017import QtQuick 2.0
18import QtTest 1.018import QtTest 1.0
19import Ubuntu.Components 0.119import Ubuntu.Components 0.1
20import Ubuntu.Unity.Action 1.0 as UnityActions20import Ubuntu.Unity.Action 1.1 as UnityActions
2121
22Item {22Item {
23 id: textItem23 id: textItem

Subscribers

People subscribed via source and target branches

to status/vote changes: