Ubuntu UI Toolkit

Merge lp://staging/~zsombi/ubuntu-ui-toolkit/30-options into lp://staging/~zsombi/ubuntu-ui-toolkit/listitem-master

  1. 30-options
  2. Merge into listitem-master
Proposed by Zsombor Egri
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1227
Merged at revision: 1268
Proposed branch: lp://staging/~zsombi/ubuntu-ui-toolkit/30-options
Merge into: lp://staging/~zsombi/ubuntu-ui-toolkit/listitem-master
Prerequisite: lp://staging/~zsombi/ubuntu-ui-toolkit/20-divider
Diff against target: 701 lines (+443/-7)
16 files modified
components.api (+8/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+2/-0)
modules/Ubuntu/Components/plugin/plugin.pro (+5/-2)
modules/Ubuntu/Components/plugin/quickutils.cpp (+23/-0)
modules/Ubuntu/Components/plugin/quickutils.h (+1/-0)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+47/-3)
modules/Ubuntu/Components/plugin/uclistitem.h (+9/-0)
modules/Ubuntu/Components/plugin/uclistitem_p.h (+3/-0)
modules/Ubuntu/Components/plugin/uclistitemactions.cpp (+158/-0)
modules/Ubuntu/Components/plugin/uclistitemactions.h (+49/-0)
modules/Ubuntu/Components/plugin/uclistitemactions_p.h (+46/-0)
tests/resources/listitems/ListItemTest.qml (+22/-1)
tests/unit/tst_performance/ListItemWithOptionsList.qml (+37/-0)
tests/unit/tst_performance/tst_performance.cpp (+3/-1)
tests/unit/tst_performance/tst_performance.pro (+1/-0)
tests/unit_x11/tst_components/tst_listitem.qml (+29/-0)
To merge this branch: bzr merge lp://staging/~zsombi/ubuntu-ui-toolkit/30-options
Reviewer Review Type Date Requested Status
Tim Peeters Approve
Zsombor Egri continuous-integration Approve
Review via email: mp+235130@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Zsombor Egri (zsombi) wrote :

Approved by Tim.

Changes since then:
- ListItemOptions renamed to ListItemActions
- any reference to options renamed to actions
- actions list property now is a list of UCActions
- actions property is NOT default property
- data property added, accepts any child object so ListItemOptions can hold other elements

review: Approve (continuous-integration)
lp://staging/~zsombi/ubuntu-ui-toolkit/30-options updated
1217. By Zsombor Egri

prereq sync

1218. By Zsombor Egri

performance test fixed

1219. By Zsombor Egri

prereq sync

1220. By Zsombor Egri

panelItem removed from API

1221. By Zsombor Egri

prereq sync

1222. By Zsombor Egri

prereq sync

1223. By Zsombor Egri

prereq sync

1224. By Zsombor Egri

prereq sync

1225. By Zsombor Egri

prereq sync

1226. By Zsombor Egri

prereq sync

1227. By Zsombor Egri

prereq sync

Revision history for this message
Tim Peeters (tpeeters) wrote :

thanks

review: Approve
lp://staging/~zsombi/ubuntu-ui-toolkit/30-options updated
1228. By Zsombor Egri

prereq sync

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: