Merge lp://staging/~nick-dedekind/unity8/desktop_menus.gmenumodel into lp://staging/unity8
Proposed by
Nick Dedekind
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/~nick-dedekind/unity8/desktop_menus.gmenumodel |
Merge into: | lp://staging/unity8 |
Diff against target: |
3885 lines (+3069/-96) 44 files modified
CMakeLists.txt (+1/-1) debian/control (+2/-2) plugins/Utils/CMakeLists.txt (+1/-0) plugins/Utils/constants.cpp (+1/-0) plugins/Utils/constants.h (+3/-0) plugins/Utils/plugin.cpp (+2/-0) plugins/Utils/shortcutaction.cpp (+122/-0) plugins/Utils/shortcutaction.h (+44/-0) plugins/Utils/windowkeysfilter.cpp (+11/-6) plugins/Utils/windowkeysfilter.h (+1/-1) qml/ApplicationMenus/AppMenuUtils.js (+107/-0) qml/ApplicationMenus/MenuBar.qml (+245/-0) qml/ApplicationMenus/MenuBarItem.qml (+56/-0) qml/ApplicationMenus/MenuBase.qml (+116/-0) qml/ApplicationMenus/MenuItemBase.qml (+32/-0) qml/ApplicationMenus/MenuItemDelegate.qml (+49/-0) qml/ApplicationMenus/MenuItemDelegateBase.qml (+82/-0) qml/ApplicationMenus/MenuItemFactory.qml (+240/-0) qml/ApplicationMenus/MenuPage.qml (+277/-0) qml/CMakeLists.txt (+1/-0) qml/Components/PanelState/PanelState.qml (+2/-1) qml/Panel/Panel.qml (+91/-7) qml/Stages/DecoratedWindow.qml (+50/-16) qml/Stages/DesktopStage.qml (+10/-3) qml/Stages/WindowDecoration.qml (+117/-45) tests/imports/check_imports.py (+2/-1) tests/mocks/QMenuModel/QMenuModel.qmltypes (+5/-1) tests/mocks/QMenuModel/unitymenumodel.cpp (+25/-3) tests/mocks/QMenuModel/unitymenumodel.h (+2/-0) tests/mocks/Unity/Application/MirSurface.cpp (+10/-0) tests/mocks/Unity/Application/MirSurface.h (+3/-0) tests/mocks/Utils/CMakeLists.txt (+1/-0) tests/mocks/Utils/constants.cpp (+7/-0) tests/mocks/Utils/constants.h (+7/-0) tests/mocks/Utils/plugin.cpp (+2/-0) tests/qmltests/ApplicationMenus/tst_MenuBar.qml (+132/-0) tests/qmltests/ApplicationMenus/tst_MenuPage.qml (+256/-0) tests/qmltests/CMakeLists.txt (+3/-0) tests/qmltests/Panel/tst_Panel.qml (+56/-4) tests/qmltests/Stages/ApplicationCheckBox.qml (+4/-0) tests/qmltests/Stages/DesktopMenuData.qml (+702/-0) tests/qmltests/Stages/tst_DesktopStage.qml (+13/-1) tests/qmltests/Stages/tst_WindowDecoration.qml (+163/-0) tests/qmltests/tst_Shell.qml (+13/-4) |
To merge this branch: | bzr merge lp://staging/~nick-dedekind/unity8/desktop_menus.gmenumodel |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Unity Team | Pending | ||
Review via email: mp+282727@code.staging.launchpad.net |
Commit message
Desktop Menus
Description of the change
Desktop Menus
To post a comment you must log in.
Unmerged revisions
- 2111. By Nick Dedekind
-
merged with trunk
- 2110. By Nick Dedekind
-
updated control
- 2109. By Nick Dedekind
-
desktop menus
- 2108. By Launchpad Translations on behalf of unity-team
-
Launchpad automatic translations update.
FAILED: Continuous integration, rev:2109 /unity8- jenkins. ubuntu. com/job/ lp-unity8- 1-ci/90/
https:/
Executed test runs:
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- 1-ci/90/ rebuild
https:/