lp://staging/~faenil/ubuntu-ui-toolkit/listItem_slotsLayout

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot: Approve (continuous-integration) on 2015-10-01

Zsombor Egri: Approve on 2015-10-01

Diff: 4291 lines (+3949/-41)

30 files modified

components.api (+23/-0)
examples/ubuntu-ui-toolkit-gallery/ListItemLayouts.qml (+267/-0)
examples/ubuntu-ui-toolkit-gallery/ListItemWithLabel.qml (+5/-9)
examples/ubuntu-ui-toolkit-gallery/NewListItems.qml (+19/-19)
examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml (+10/-5)
src/Ubuntu/Components/1.3/ProgressionSlot.qml (+59/-0)
src/Ubuntu/Components/ComponentModule.pro (+2/-3)
src/Ubuntu/Components/plugin/plugin.cpp (+6/-0)
src/Ubuntu/Components/plugin/plugin.pri (+9/-2)
src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp (+223/-0)
src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h (+76/-0)
src/Ubuntu/Components/plugin/uclistitemlayout.cpp (+275/-0)
src/Ubuntu/Components/plugin/uclistitemlayout.h (+42/-0)
src/Ubuntu/Components/plugin/ucslotslayout.cpp (+1296/-0)
src/Ubuntu/Components/plugin/ucslotslayout.h (+154/-0)
src/Ubuntu/Components/plugin/ucslotslayout_p.h (+149/-0)
src/Ubuntu/Components/qmldir (+1/-0)
tests/unit/tst_performance/ListItemWithInlineActionsAndFourContainersList.qml (+66/-0)
tests/unit/tst_performance/ListItemWithInlineActionsAndFourMouseAreas.qml (+66/-0)
tests/unit/tst_performance/ListOfCustomListItemLayouts.qml (+94/-0)
tests/unit/tst_performance/ListOfEmptyListItemLayout.qml (+32/-0)
tests/unit/tst_performance/ListOfEmptyListItemLayout_withProgression.qml (+32/-0)
tests/unit/tst_performance/ListOfHardcodedFourContainersLayout.qml (+32/-0)
tests/unit/tst_performance/ListOfHardcodedFourContainersLayout_withItems.qml (+34/-0)
tests/unit/tst_performance/ListOfListItemLayout_complex1.qml (+36/-0)
tests/unit/tst_performance/ListOfListItemLayout_complex2.qml (+50/-0)
tests/unit/tst_performance/ListOfListItemLayout_labelsOnly.qml (+33/-0)
tests/unit/tst_performance/tst_performance.cpp (+10/-2)
tests/unit/tst_performance/tst_performance.pro (+9/-1)
tests/unit_x11/tst_components/tst_slotslayout.qml (+839/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1462373: Need preset layouts for the new ListItem

High

Fix Released

Link a bug report

Related blueprints

1308. By Andrea Bernabei on 2015-10-01

ListItemLayout: move UCThreeLabelsSlot files to privates folder, add test for customization of mainSlot

1307. By Andrea Bernabei on 2015-09-30

ListItemLayout: add more labels layout tests

1306. By Andrea Bernabei on 2015-09-30

ListItemLayout: improve labels layout tests, fix one corner case

1305. By Andrea Bernabei on 2015-09-30

merge staging

1304. By Andrea Bernabei on 2015-09-30

ListItemLayout: add labels positioning tests, override setMainSlot to disable replacing mainSlot, deallocate old C++ mainSlots

1303. By Andrea Bernabei on 2015-09-29

SlotsLayout: code and visual review changes

1302. By Andrea Bernabei on 2015-09-29

merge staging

1301. By Andrea Bernabei on 2015-09-28

SlotsLayout: doc fix

1300. By Andrea Bernabei on 2015-09-28

SlotsLayout: improve docs

1299. By Andrea Bernabei on 2015-09-28

Merge staging and move ThreeLabelsSlot to separate files