lp:~zsombi/ubuntu-ui-toolkit/contextualActions

Branch merges

Propose for merging

Rejected for merging into lp:ubuntu-ui-toolkit/staging

PS Jenkins bot: Needs Fixing (continuous-integration) on 2015-08-26

Ubuntu SDK team: Pending requested 2015-08-21

Diff: 2140 lines (+1070/-194)

32 files modified

components.api (+7/-2)
src/Ubuntu/Components/1.2/Page10.qml (+10/-15)
src/Ubuntu/Components/1.3/ActionBar.qml (+6/-0)
src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+8/-0)
src/Ubuntu/Components/1.3/Page.qml (+21/-3)
src/Ubuntu/Components/1.3/Sections.qml (+10/-1)
src/Ubuntu/Components/Popups/1.2/Popover.qml (+2/-1)
src/Ubuntu/Components/Popups/1.3/Dialog.qml (+56/-39)
src/Ubuntu/Components/Popups/1.3/Popover.qml (+12/-1)
src/Ubuntu/Components/plugin/adapters/actionsproxy_p.cpp (+43/-31)
src/Ubuntu/Components/plugin/adapters/actionsproxy_p.h (+5/-2)
src/Ubuntu/Components/plugin/plugin.cpp (+1/-0)
src/Ubuntu/Components/plugin/ucaction.cpp (+145/-19)
src/Ubuntu/Components/plugin/ucaction.h (+19/-2)
src/Ubuntu/Components/plugin/ucactioncontext.cpp (+171/-25)
src/Ubuntu/Components/plugin/ucactioncontext.h (+27/-5)
src/Ubuntu/Components/plugin/ucactionitem.cpp (+8/-0)
src/Ubuntu/Components/plugin/ucactionitem.h (+3/-2)
src/Ubuntu/Components/plugin/ucactionmanager.cpp (+8/-12)
src/Ubuntu/Components/plugin/uclistitem.cpp (+26/-3)
src/Ubuntu/Components/plugin/uclistitem.h (+1/-0)
src/Ubuntu/Components/plugin/uclistitem_p.h (+2/-0)
src/Ubuntu/Components/plugin/uclistitemactions.cpp (+14/-0)
src/Ubuntu/Components/plugin/uclistitemactions_p.h (+2/-0)
src/Ubuntu/Components/plugin/ucviewitemsattached.cpp (+20/-0)
tests/unit/tst_components/tst_action.qml (+17/-16)
tests/unit/tst_components/tst_actionitem.qml (+5/-0)
tests/unit_x11/tst_components/tst_abstractbutton13.qml (+2/-1)
tests/unit_x11/tst_components/tst_action13.qml (+215/-0)
tests/unit_x11/tst_components/tst_actioncontext.qml (+181/-0)
tests/unit_x11/tst_components/tst_sections.qml (+1/-1)
tests/unit_x11/tst_components/tst_shortcuts.qml (+22/-13)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1641. By Zsombor Egri on 2015-08-26

fixing tst_actionitem

1640. By Zsombor Egri on 2015-08-26

tst_action updated

1639. By Zsombor Egri on 2015-08-26

fixing AbstractButton13 tests

1638. By Zsombor Egri on 2015-08-26

fixing active overlay

1637. By Zsombor Egri on 2015-08-25

fixes

1636. By Zsombor Egri on 2015-08-25

prereq sync

1635. By Zsombor Egri on 2015-08-25

documentation update

1634. By Zsombor Egri on 2015-08-24

forward action list to ActionContexts

1633. By Zsombor Egri on 2015-08-24

documentation fix

1632. By Zsombor Egri on 2015-08-24

context is active only if there is no overlay context set, or when one of the ancestor context is the active overlay context