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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1757

Cris Dywan: Approve on 2015-12-11

PS Jenkins bot: Approve (continuous-integration) on 2015-12-11

Diff: 1523 lines (+580/-310)

16 files modified

src/Ubuntu/Components/plugin/plugin.pri (+3/-0)
src/Ubuntu/Components/plugin/ucabstractbutton.cpp (+76/-38)
src/Ubuntu/Components/plugin/ucabstractbutton.h (+9/-11)
src/Ubuntu/Components/plugin/ucabstractbutton_p.h (+50/-0)
src/Ubuntu/Components/plugin/ucaction.h (+1/-0)
src/Ubuntu/Components/plugin/ucactionitem.cpp (+162/-125)
src/Ubuntu/Components/plugin/ucactionitem.h (+8/-23)
src/Ubuntu/Components/plugin/ucactionitem_p.h (+63/-0)
src/Ubuntu/Components/plugin/ucbottomedge.cpp (+13/-13)
src/Ubuntu/Components/plugin/ucbottomedge.h (+0/-1)
src/Ubuntu/Components/plugin/ucbottomedge_p.h (+2/-0)
src/Ubuntu/Components/plugin/ucbottomedgehint.cpp (+130/-82)
src/Ubuntu/Components/plugin/ucbottomedgehint.h (+9/-14)
src/Ubuntu/Components/plugin/ucbottomedgehint_p.h (+46/-0)
src/Ubuntu/Components/plugin/ucstyleditembase.cpp (+7/-2)
src/Ubuntu/Components/plugin/ucstyleditembase_p.h (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1524234: QML function trigger() with no argument doesn't override ActionItem.trigger

Critical

Fix Released

Link a bug report

Related blueprints

1759. By Zsombor Egri on 2015-12-11

fix property backup initialization

1758. By Zsombor Egri on 2015-12-11

Adjust BottomEdge code

1757. By Zsombor Egri on 2015-12-11

fix AbstractButton __acceptEvents property

1756. By Zsombor Egri on 2015-12-11

BottomEdgeHint private

1755. By Zsombor Egri on 2015-12-11

AbstractButton with private

1754. By Zsombor Egri on 2015-12-11

ActionItem private added

1753. By Cris Dywan on 2015-12-10

runtest.sh needs to add subdirs to the libpath. Fixes: https://bugs.launchpad.net/bugs/1524710.

Approved by PS Jenkins bot, Zsombor Egri.

1752. By Tim Peeters on 2015-12-10

Implement header slot management for convergence:
- Adapt the number of action slots to the width of the view.
- When a new action appears, show a quick fade-in.
- Reverse the order of the actions in the header.
- Update icon width to 4GU. Fixes: https://bugs.launchpad.net/bugs/1428757.

Approved by Christian Dywan, PS Jenkins bot.

1751. By Tim Peeters on 2015-12-10

To prevent an invalid sectionIndex, reset the value of sectionIndex to -1 when the model of Sections is changed. Fixes: https://bugs.launchpad.net/bugs/1513933.

Approved by Christian Dywan, PS Jenkins bot.

1750. By Loïc Molinari on 2015-12-10

[UbuntuShape] Cleaned up includes.

Approved by PS Jenkins bot, Zsombor Egri.