Ubuntu UI Toolkit

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

shortcuts
Merge into staging

Proposed by Cris Dywan on 2015-06-19

Status:

Merged

Approved by:

Zsombor Egri on 2015-07-07

Approved revision:

1542

Merged at revision:

1552

Proposed branch:

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

Merge into:

lp://staging/ubuntu-ui-toolkit/staging

Diff against target:

280 lines (+176/-3)

6 files modified

components.api (+2/-1)
examples/ubuntu-ui-toolkit-gallery/Buttons.qml (+8/-2)
modules/Ubuntu/Components/plugin/plugin.cpp (+1/-0)
modules/Ubuntu/Components/plugin/ucaction.cpp (+66/-0)
modules/Ubuntu/Components/plugin/ucaction.h (+7/-0)
tests/unit_x11/tst_components/tst_shortcuts.qml (+92/-0)

To merge this branch:

bzr merge lp://staging/~ubuntu-sdk-team/ubuntu-ui-toolkit/shortcuts

Wishlist

Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-07-07
Zsombor Egri		2015-06-19	Approve on 2015-07-07
Review via email: mp+262413@code.staging.launchpad.net

Commit message

Implement Action.shortcut property

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-19:

FAILED: Continuous integration, rev:1537
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1925/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3259/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/653/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/655/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/652/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3257/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1925/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~ubuntu-sdk-team/ubuntu-ui-toolkit/shortcuts updated on 2015-06-22

1538. By Cris Dywan on 2015-06-22: Fix doc comment for UCAction::shortcut

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-06-22:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1927/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-06-28:

Got some comments inline, check 'em.

review: Needs Fixing

lp://staging/~ubuntu-sdk-team/ubuntu-ui-toolkit/shortcuts updated on 2015-07-03

1539. By Cris Dywan on 2015-07-03: More explicit type check and multi modifier test case

Revision history for this message

Cris Dywan (kalikiana) wrote on 2015-07-03:

> if object is expected to be a QQuickItem,
> you should cast to it and that has a window()
> that you can use to get the window context...?

No. The action itself is in fact a QObject. We're walking up the parents to find a window.

> Shouldn't we also check whether the action is enabled?

No need, trigger() has a check already.

> What about testing also Alt+Ctrl, Shift+Ctrl and Alt+Shift+Ctrl?
> Or should we just assume that Qt shortcut system works with those?

Basically yeah, I don't think we want to duplicate their tests since we don't add any functionality. But I added another one with Atl+Shift+Ctrl just to be sure we'll know if anything obvious breaks in a Qt upgrade.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-07-03:

PASSED: Continuous integration, rev:1539
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1964/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/692
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/694
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/694/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/691

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1964/rebuild

review: Approve (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-07-07:

One more thing we forgot!

review: Needs Fixing

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-07-07:

To summarise what we talked on Mumble:
- actions to be grouped in ActionContext
- Action activation to be bound to ActionContext.active
- text input action context activation to be bound with activeFocus
- Page active to drive ActionContext.active

review: Needs Fixing

lp://staging/~ubuntu-sdk-team/ubuntu-ui-toolkit/shortcuts updated on 2015-07-07

1540. By Cris Dywan on 2015-07-07: New shortcut property needs to go on revision 3
1541. By Cris Dywan on 2015-07-07: Register UCAction revision 1 to 1.3 and shortcut to 1