Merge lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/contextMenu into lp://qastaging/ubuntu-ui-toolkit/staging
Proposed by
Cris Dywan
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/contextMenu |
| Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
| Diff against target: |
615 lines (+374/-47) (has conflicts) 15 files modified
components.api (+17/-0) examples/ubuntu-ui-toolkit-gallery/ExampleContextMenu.qml (+59/-0) examples/ubuntu-ui-toolkit-gallery/NewListItems.qml (+6/-0) examples/ubuntu-ui-toolkit-gallery/Popover.qml (+5/-0) src/Ubuntu/Components/ComponentModule.pro (+4/-0) src/Ubuntu/Components/Popups/1.3/ContextMenu.qml (+44/-0) src/Ubuntu/Components/Popups/1.3/ListItemContextMenu.qml (+11/-47) src/Ubuntu/Components/Popups/1.3/MenuGroup.qml (+46/-0) src/Ubuntu/Components/Popups/1.3/MenuItem.qml (+86/-0) src/Ubuntu/Components/Popups/1.3/Popover.qml (+1/-0) src/Ubuntu/Components/Popups/Popups.pro (+4/-0) src/Ubuntu/Components/Popups/qmldir (+3/-0) src/Ubuntu/Components/Themes/Ambiance/1.3/ContextMenuForegroundStyle.qml (+43/-0) src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+2/-0) src/Ubuntu/Components/plugin/uclistitem.cpp (+43/-0) Text conflict in components.api Text conflict in src/Ubuntu/Components/ComponentModule.pro Text conflict in src/Ubuntu/Components/plugin/uclistitem.cpp |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/contextMenu |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 1607. By Cris Dywan
-
Proper looks
- 1606. By Cris Dywan
-
Example context menu
- 1605. By Cris Dywan
-
Implement ContextMenu/ MenuGroup/ (internal) MenuItem
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
