Merge lp://qastaging/~unity-team/unity/fix-lp1309778-trusty into lp://qastaging/unity/7.2
Proposed by
Christopher Townsend
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~unity-team/unity/fix-lp1309778-trusty |
| Merge into: | lp://qastaging/unity/7.2 |
| Prerequisite: | lp://qastaging/~unity-team/unity/fix-lp1351591-trusty |
| Diff against target: |
5329 lines (+1369/-784) 71 files modified
UnityCore/AppmenuIndicator.cpp (+52/-12) UnityCore/AppmenuIndicator.h (+4/-3) UnityCore/CMakeLists.txt (+1/-0) UnityCore/DBusIndicators.cpp (+52/-40) UnityCore/GLibDBusServer.cpp (+3/-2) UnityCore/GLibSource.h (+2/-2) UnityCore/Indicator.cpp (+15/-30) UnityCore/Indicator.h (+3/-4) UnityCore/IndicatorEntry.cpp (+15/-5) UnityCore/IndicatorEntry.h (+4/-1) UnityCore/Indicators.cpp (+2/-1) UnityCore/pch/unitycore_pch.hh (+1/-0) com.canonical.Unity.gschema.xml (+6/-0) dash/DashView.h (+1/-1) dash/ScopeView.h (+2/-1) debian/control (+1/-1) decorations/DecoratedWindow.cpp (+13/-9) decorations/DecorationsManager.cpp (+12/-15) decorations/DecorationsMenuDropdown.cpp (+4/-3) decorations/DecorationsMenuEntry.cpp (+12/-2) decorations/DecorationsMenuEntry.h (+2/-1) decorations/DecorationsMenuLayout.cpp (+25/-3) decorations/DecorationsPriv.h (+3/-1) decorations/DecorationsSlidingLayout.cpp (+1/-1) decorations/DecorationsWidgets.cpp (+4/-9) launcher/LauncherEntryRemoteModel.h (+2/-2) launcher/XdndStartStopNotifierImp.h (+1/-1) lockscreen/LockScreenPanel.cpp (+1/-1) panel/PanelIndicatorEntryDropdownView.cpp (+6/-1) panel/PanelIndicatorEntryDropdownView.h (+1/-0) panel/PanelIndicatorEntryView.cpp (+7/-5) panel/PanelIndicatorEntryView.h (+2/-3) panel/PanelIndicatorsView.cpp (+43/-13) panel/PanelIndicatorsView.h (+6/-4) panel/PanelMenuView.cpp (+140/-112) panel/PanelMenuView.h (+8/-4) panel/PanelView.cpp (+3/-3) plugins/unityshell/src/unityshell.cpp (+34/-44) plugins/unityshell/src/unityshell.h (+2/-1) services/panel-main.c (+20/-20) services/panel-service-private.h (+22/-3) services/panel-service.c (+148/-60) services/panel-service.h (+0/-8) shortcuts/ShortcutModel.h (+3/-3) tests/autopilot/unity/emulators/panel.py (+4/-0) tests/autopilot/unity/tests/__init__.py (+12/-13) tests/autopilot/unity/tests/test_dash.py (+2/-2) tests/autopilot/unity/tests/test_hud.py (+2/-2) tests/autopilot/unity/tests/test_panel.py (+258/-211) tests/autopilot/unity/tests/test_wm_keybindings.py (+1/-6) tests/mock-application.h (+2/-2) tests/test_dbus_indicators.cpp (+3/-4) tests/test_indicator.cpp (+18/-21) tests/test_indicator_appmenu.cpp (+182/-21) tests/test_indicator_entry.cpp (+17/-14) tests/test_indicators.cpp (+11/-11) tests/test_panel_menu_view.cpp (+19/-3) tests/test_panel_service.cpp (+6/-2) tests/test_service_panel.cpp (+18/-15) unity-shared/IconLoader.cpp (+2/-2) unity-shared/MenuManager.cpp (+63/-8) unity-shared/NuxObjectPtrHash.h (+36/-0) unity-shared/PlacesVScrollBar.cpp (+1/-1) unity-shared/PluginAdapter.cpp (+11/-2) unity-shared/PluginAdapter.h (+2/-2) unity-shared/PreviewStyle.cpp (+1/-1) unity-shared/StandaloneWindowManager.cpp (+1/-0) unity-shared/UBusWrapper.cpp (+3/-4) unity-shared/UBusWrapper.h (+2/-2) unity-shared/UnitySettings.cpp (+2/-0) unity-shared/UnitySettings.h (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~unity-team/unity/fix-lp1309778-trusty |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Unity Team | Pending | ||
|
Review via email:
|
|||
Commit message
Decorations, Panel: add menus for unfocused windows as well
Now the indicator-appmenu exports the menus for all the windows, then it's up to us to filter them based on their parent window and show on relevant place.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Unmerged revisions
- 3833. By Christopher Townsend
-
Merge lp:unity/7.2.
- 3832. By Marco Trevisan (Treviño)
-
Decorations, Panel: add menus for unfocused windows as well
Now the indicator-appmenu exports the menus for all the windows,
then it's up to us to filter them based on their parent window and
show on relevant place.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:3832
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://