Unity

Merge lp:~3v1n0/unity/shortuct-hints-dynamic-show-menu into lp:unity

  1. shortuct-hints-dynamic-show-menu
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: no longer in the source branch.
Merged at revision: 4065
Proposed branch: lp:~3v1n0/unity/shortuct-hints-dynamic-show-menu
Merge into: lp:unity
Diff against target: 23 lines (+4/-2)
1 file modified
shortcuts/CompizShortcutModeller.cpp (+4/-2)
To merge this branch: bzr merge lp:~3v1n0/unity/shortuct-hints-dynamic-show-menu
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+280688@code.launchpad.net

Commit message

CompizShortcutModeller: show menus keybinding can be read from settings

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:4055
http://jenkins.qa.ubuntu.com/job/unity-ci/1385/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1385/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrea Azzarone (azzar1) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'shortcuts/CompizShortcutModeller.cpp'
2--- shortcuts/CompizShortcutModeller.cpp 2015-12-11 12:44:53 +0000
3+++ shortcuts/CompizShortcutModeller.cpp 2015-12-16 09:06:40 +0000
4@@ -70,6 +70,7 @@
5 const std::string UNITYSHELL_OPTION_LAUNCHER_SWITCHER_FORWARD = "launcher_switcher_forward";
6 const std::string UNITYSHELL_OPTION_SHOW_HUD = "show_hud";
7 const std::string UNITYSHELL_OPTION_PANEL_FIRST_MENU = "panel_first_menu";
8+ const std::string UNITYSHELL_OPTION_SHOW_MENUS = "show_menu_bar";
9 const std::string UNITYSHELL_OPTION_SPREAD_APP_WINDOWS = "spread_app_windows";
10 const std::string UNITYSHELL_OPTION_SPREAD_APP_WINDOWS_ANYWHERE = "spread_app_windows_anywhere";
11 const std::string UNITYSHELL_OPTION_ALT_TAB_FORWARD = "alt_tab_forward";
12@@ -229,8 +230,9 @@
13
14 hints.push_back(std::make_shared<shortcut::Hint>(menubar, "", _(" (Hold)"),
15 _("Reveals the application menu."),
16- shortcut::OptionType::HARDCODED,
17- "Alt"));
18+ shortcut::OptionType::COMPIZ_KEY,
19+ UNITYSHELL_PLUGIN_NAME,
20+ UNITYSHELL_OPTION_SHOW_MENUS));
21
22 hints.push_back(std::make_shared<shortcut::Hint>(menubar, "", "",
23 _("Opens the indicator menu."),