Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/platform_menu into lp://qastaging/ubuntu-ui-toolkit/staging
Proposed by
Zsombor Egri
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/platform_menu |
| Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
| Diff against target: |
981 lines (+803/-9) 20 files modified
README (+12/-8) debian/control (+10/-0) debian/libubuntutouchtheme5.install (+1/-0) examples/ubuntu-ui-toolkit-gallery/gallery-logging.config (+2/-0) export_modules_dir.sh (+4/-0) src/Ubuntu/Components/plugin/plugin.pri (+1/-0) src/Ubuntu/Components/plugin/ucstyleditembase.cpp (+32/-0) src/Ubuntu/UbuntuTouchTheme/EditMenu.qml (+51/-0) src/Ubuntu/UbuntuTouchTheme/UbuntuTouchTheme.pro (+38/-0) src/Ubuntu/UbuntuTouchTheme/UbuntuTouchTheme.qrc (+5/-0) src/Ubuntu/UbuntuTouchTheme/ubuntutouchtheme.json (+3/-0) src/Ubuntu/UbuntuTouchTheme/ucplatformmenu.cpp (+226/-0) src/Ubuntu/UbuntuTouchTheme/ucplatformmenu.h (+119/-0) src/Ubuntu/UbuntuTouchTheme/ucplatformmenuitem.cpp (+96/-0) src/Ubuntu/UbuntuTouchTheme/ucplatformtheme.cpp (+55/-0) src/Ubuntu/UbuntuTouchTheme/ucplatformtheme.h (+40/-0) src/Ubuntu/UbuntuTouchTheme/ucplatformthemeplugin.cpp (+38/-0) src/Ubuntu/UbuntuTouchTheme/ucplatformthemeplugin.h (+36/-0) src/src.pro (+4/-1) tests/resources/menus/QuickControls.qml (+30/-0) |
| To merge this branch: | bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/platform_menu |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
Commit message
Platform Menu support
To post a comment you must log in.
Unmerged revisions
- 1794. By Zsombor Egri
-
menu template
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
