lp:~zsombi/ubuntu-ui-toolkit/35-options-panel-swipe

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~zsombi/ubuntu-ui-toolkit/listitem-master at revision 1272

Tim Peeters: Approve on 2014-11-24

Diff: 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)

api

Superseded for merging into lp:~bzoltan/ubuntu-ui-toolkit/new_list_item

Ubuntu SDK team: Pending requested 2014-09-15

Diff: 1076 lines (+669/-14)

16 files modified

modules/Ubuntu/Components/ListItemPanel.qml (+53/-0)
modules/Ubuntu/Components/plugin/plugin.pro (+4/-2)
modules/Ubuntu/Components/plugin/propertychange_p.cpp (+76/-0)
modules/Ubuntu/Components/plugin/propertychange_p.h (+39/-0)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+235/-10)
modules/Ubuntu/Components/plugin/uclistitem.h (+3/-0)
modules/Ubuntu/Components/plugin/uclistitem_p.h (+15/-0)
modules/Ubuntu/Components/plugin/uclistitemoptions.cpp (+80/-0)
modules/Ubuntu/Components/plugin/uclistitemoptions_p.h (+11/-2)
modules/Ubuntu/Components/qmldir (+1/-0)
tests/resources/listitems/ListItemTest.qml (+9/-0)
tests/unit/tst_performance/ListItemWithInlineOptionsList.qml (+39/-0)
tests/unit/tst_performance/ListItemWithOptionsList.qml (+6/-0)
tests/unit/tst_performance/tst_performance.cpp (+1/-0)
tests/unit/tst_performance/tst_performance.pro (+1/-0)
tests/unit_x11/tst_components/tst_listitem.qml (+96/-0)

api

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

Ubuntu SDK team: Pending requested 2014-08-25

Diff: 1081 lines (+671/-16)

16 files modified

modules/Ubuntu/Components/ListItemPanel.qml (+53/-0)
modules/Ubuntu/Components/plugin/plugin.pro (+4/-2)
modules/Ubuntu/Components/plugin/propertychange_p.cpp (+76/-0)
modules/Ubuntu/Components/plugin/propertychange_p.h (+39/-0)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+235/-10)
modules/Ubuntu/Components/plugin/uclistitem.h (+3/-0)
modules/Ubuntu/Components/plugin/uclistitem_p.h (+15/-0)
modules/Ubuntu/Components/plugin/uclistitemoptions.cpp (+80/-0)
modules/Ubuntu/Components/plugin/uclistitemoptions_p.h (+11/-2)
modules/Ubuntu/Components/qmldir (+1/-0)
tests/resources/listitems/ListItemTest.qml (+9/-0)
tests/unit/tst_performance/ListItemWithInlineOptionsList.qml (+39/-0)
tests/unit/tst_performance/ListItemWithOptionsList.qml (+7/-1)
tests/unit/tst_performance/tst_performance.cpp (+1/-0)
tests/unit/tst_performance/tst_performance.pro (+2/-1)
tests/unit_x11/tst_components/tst_listitem.qml (+96/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1311. By Zsombor Egri on 2014-11-21

review comments applied

1310. By Zsombor Egri on 2014-11-19

prereq sync

1309. By Zsombor Egri on 2014-11-19

prereq sync

1308. By Zsombor Egri on 2014-11-18

prereq sync

1307. By Zsombor Egri on 2014-11-14

method name fixed

1306. By Zsombor Egri on 2014-11-14

prereq sync

1305. By Zsombor Egri on 2014-11-12

prereq sync

1304. By Zsombor Egri on 2014-11-12

fixing tests to comply with prereq changes

1303. By Zsombor Egri on 2014-11-12

test fix

1302. By Zsombor Egri on 2014-11-12

prereq sync