Merge lp://staging/~zsombi/ubuntu-ui-toolkit/40-visualize-options into lp://staging/~zsombi/ubuntu-ui-toolkit/listitem-master
Proposed by
Zsombor Egri
Status: | Merged |
---|---|
Approved by: | Tim Peeters |
Approved revision: | 1293 |
Merged at revision: | 1273 |
Proposed branch: | lp://staging/~zsombi/ubuntu-ui-toolkit/40-visualize-options |
Merge into: | lp://staging/~zsombi/ubuntu-ui-toolkit/listitem-master |
Prerequisite: | lp://staging/~zsombi/ubuntu-ui-toolkit/35-options-panel-swipe |
Diff against target: |
511 lines (+220/-34) 9 files modified
components.api (+2/-2) modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml (+77/-3) modules/Ubuntu/Components/plugin/uclistitem.cpp (+44/-10) modules/Ubuntu/Components/plugin/uclistitem.h (+5/-6) modules/Ubuntu/Components/plugin/uclistitem_p.h (+3/-0) modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp (+1/-0) modules/Ubuntu/Components/plugin/ucstyleditembase.cpp (+2/-4) tests/resources/listitems/ListItemTest.qml (+41/-5) tests/unit_x11/tst_components/tst_listitem.qml (+45/-4) |
To merge this branch: | bzr merge lp://staging/~zsombi/ubuntu-ui-toolkit/40-visualize-options |
Related bugs: | |
Related blueprints: |
SDK: Design a new ListItem and layouts
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Peeters | Approve | ||
Review via email: mp+235166@code.staging.launchpad.net |
To post a comment you must log in.
ListItem's data and child properties had to be renamed as findChild( )/findInvisible Child() won't find the panel item anymore.