Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/35-options-panel-swipe into lp://qastaging/~zsombi/ubuntu-ui-toolkit/listitem-master
Proposed by
Zsombor Egri
Status: | Merged |
---|---|
Approved by: | Zsombor Egri |
Approved revision: | 1311 |
Merged at revision: | 1272 |
Proposed branch: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/35-options-panel-swipe |
Merge into: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/listitem-master |
Prerequisite: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/34-snap-animator |
Diff against target: |
1767 lines (+1074/-69) 22 files modified
components.api (+9/-0) modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml (+64/-0) modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml (+34/-0) modules/Ubuntu/Components/Themes/Ambiance/qmldir (+4/-0) modules/Ubuntu/Components/plugin/plugin.cpp (+5/-0) modules/Ubuntu/Components/plugin/plugin.pro (+4/-2) modules/Ubuntu/Components/plugin/uclistitem.cpp (+389/-47) modules/Ubuntu/Components/plugin/uclistitem.h (+9/-1) modules/Ubuntu/Components/plugin/uclistitem_p.h (+24/-3) modules/Ubuntu/Components/plugin/uclistitemactions.cpp (+158/-3) modules/Ubuntu/Components/plugin/uclistitemactions.h (+1/-0) modules/Ubuntu/Components/plugin/uclistitemactions_p.h (+14/-2) modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp (+6/-3) modules/Ubuntu/Components/plugin/uclistitemstyle.cpp (+92/-0) modules/Ubuntu/Components/plugin/uclistitemstyle.h (+54/-0) tests/qmlapicheck.sh (+1/-1) tests/resources/listitems/ListItemTest.qml (+29/-0) tests/unit/tst_performance/ListItemWithActionsList.qml (+6/-0) tests/unit/tst_performance/ListItemWithInlineActionsList.qml (+41/-0) tests/unit/tst_performance/tst_performance.cpp (+2/-1) tests/unit/tst_performance/tst_performance.pro (+3/-2) tests/unit_x11/tst_components/tst_listitem.qml (+125/-4) |
To merge this branch: | bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/35-options-panel-swipe |
Related bugs: | |
Related blueprints: |
SDK: Design a new ListItem and layouts
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Peeters | Approve | ||
Review via email:
|
Description of the change
Actions panel handling, swiping and snap animation take in use. Uses fix-size panel for testing.
To post a comment you must log in.
I don't see icons with this code: http:// pastebin. ubuntu. com/9145869/