lp://staging/~zsombi/ubuntu-ui-toolkit/55-snap-options

Branch merges

Propose for merging

No branches dependent on this one.

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

Tim Peeters: Approve on 2014-12-01

Diff: 805 lines (+261/-109)

14 files modified

components.api (+2/-1)
modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml (+25/-2)
modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml (+5/-3)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+76/-19)
modules/Ubuntu/Components/plugin/uclistitem.h (+2/-0)
modules/Ubuntu/Components/plugin/uclistitem_p.h (+5/-1)
modules/Ubuntu/Components/plugin/uclistitemactions.cpp (+5/-5)
modules/Ubuntu/Components/plugin/uclistitemactions.h (+0/-3)
modules/Ubuntu/Components/plugin/uclistitemactions_p.h (+1/-0)
modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp (+0/-24)
modules/Ubuntu/Components/plugin/uclistitemstyle.cpp (+12/-34)
modules/Ubuntu/Components/plugin/uclistitemstyle.h (+8/-9)
modules/Ubuntu/Test/UbuntuTestCase.qml (+3/-6)
tests/unit_x11/tst_components/tst_listitem.qml (+117/-2)

api

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

Ubuntu SDK team: Pending requested 2014-09-15

Diff: 370 lines (+175/-15)

6 files modified

modules/Ubuntu/Components/plugin/uclistitem.cpp (+33/-5)
modules/Ubuntu/Components/plugin/uclistitemoptions.cpp (+72/-5)
modules/Ubuntu/Components/plugin/uclistitemoptions.h (+2/-0)
modules/Ubuntu/Components/plugin/uclistitemoptions_p.h (+7/-0)
tests/resources/listitems/ListItemTest.qml (+14/-4)
tests/unit_x11/tst_components/tst_listitem.qml (+47/-1)

api

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

Ubuntu SDK team: Pending requested 2014-08-28

Diff: 367 lines (+175/-14)

6 files modified

modules/Ubuntu/Components/plugin/uclistitem.cpp (+33/-5)
modules/Ubuntu/Components/plugin/uclistitemoptions.cpp (+72/-5)
modules/Ubuntu/Components/plugin/uclistitemoptions.h (+2/-0)
modules/Ubuntu/Components/plugin/uclistitemoptions_p.h (+7/-0)
tests/resources/listitems/ListItemTest.qml (+14/-3)
tests/unit_x11/tst_components/tst_listitem.qml (+47/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1314. By Zsombor Egri on 2014-12-01

link to style component

1313. By Zsombor Egri on 2014-12-01

rogue print removed

1312. By Zsombor Egri on 2014-12-01

overshoot fixes

1311. By Zsombor Egri on 2014-12-01

overshoot fix

1310. By Zsombor Egri on 2014-12-01

swipeOvershoot added to ListItem, overshoot removed from ListItemActions attached properties. Styling added.

1309. By Zsombor Egri on 2014-11-27

typo fix

1308. By Zsombor Egri on 2014-11-27

prereq sync

1307. By Zsombor Egri on 2014-11-25

prereq sync

1306. By Zsombor Egri on 2014-11-25

prereq sync

1305. By Zsombor Egri on 2014-11-25

prereq sync