Unity

Merge lp:~azzar1/unity/hud-shortcut-overlay into lp:unity

  1. hud-shortcut-overlay
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 2101
Proposed branch: lp:~azzar1/unity/hud-shortcut-overlay
Merge into: lp:unity
Diff against target: 81 lines (+13/-13)
2 files modified
plugins/unityshell/src/ShortcutView.cpp (+2/-3)
plugins/unityshell/src/unityshell.cpp (+11/-10)
To merge this branch: bzr merge lp:~azzar1/unity/hud-shortcut-overlay
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+94929@code.launchpad.net

Description of the change

= The Problem =

HUD shortcut is not in the overlay.

= The Fix =

Add it.

= Testing =

None.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

You're reverting a commit of few days ago... Should we use "Menu Bar" or "Top Bar" as per design?

Revision history for this message
Andrea Azzarone (azzar1) wrote :

> You're reverting a commit of few days ago... Should we use "Menu Bar" or "Top
> Bar" as per design?

I'm not reverting anything, I've started my branch using the last revno.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

I'm referring to this:

50 - std::string const menubar = _("Menu Bar");
51 -
52 - hints_.push_back(new shortcut::Hint(menubar, "", "", _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt"));
53 + std::string const menubar(_("HUD & Top Bar"));

You call the panel "Top Bar", while the revision http://bazaar.launchpad.net/~unity-team/unity/trunk/revision/2021 changed it to "Menu Bar". It fixed the bug #926213 signed off by MPT.

review: Needs Fixing
Revision history for this message
Andrea Azzarone (azzar1) wrote :

> I'm referring to this:
>
> 50 - std::string const menubar = _("Menu Bar");
> 51 -
> 52 - hints_.push_back(new shortcut::Hint(menubar, "", "", _("Reveals
> application menu."), shortcut::HARDCODED_OPTION, "Alt"));
> 53 + std::string const menubar(_("HUD & Top Bar"));
>
> You call the panel "Top Bar", while the revision http://bazaar.launchpad.net
> /~unity-team/unity/trunk/revision/2021 changed it to "Menu Bar". It fixed the
> bug #926213 signed off by MPT.

Done. Sorry about this.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Nice.

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/430/console reported an error when processing this lp:~andyrock/unity/hud-shortcut-overlay branch.
Not merging it.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/ShortcutView.cpp'
2--- plugins/unityshell/src/ShortcutView.cpp 2012-01-29 19:55:06 +0000
3+++ plugins/unityshell/src/ShortcutView.cpp 2012-03-05 20:51:21 +0000
4@@ -95,11 +95,10 @@
5 {
6 nux::VLayout* layout = new nux::VLayout(NUX_TRACKER_LOCATION);
7
8- std::string name = "<b>";
9- name += std::string(section_name);
10+ std::string name("<b>");
11+ name += glib::String(g_markup_escape_text(section_name, -1)).Str();
12 name += "</b>";
13
14-
15 nux::StaticText* section_name_view = new nux::StaticText(name.c_str(), NUX_TRACKER_LOCATION);
16 section_name_view->SetTextPointSize(SECTION_NAME_FONT_SIZE);
17 section_name_view->SetFontName("Ubuntu");
18
19=== modified file 'plugins/unityshell/src/unityshell.cpp'
20--- plugins/unityshell/src/unityshell.cpp 2012-03-04 23:58:44 +0000
21+++ plugins/unityshell/src/unityshell.cpp 2012-03-05 20:51:21 +0000
22@@ -2648,17 +2648,17 @@
23 // TODO move category text into a vector...
24
25 // Launcher...
26- std::string const launcher = _("Launcher");
27+ std::string const launcher(_("Launcher"));
28
29 hints_.push_back(new shortcut::Hint(launcher, "", _(" (Press)"), _("Open Launcher, displays shortcuts."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher" ));
30 hints_.push_back(new shortcut::Hint(launcher, "", "", _("Open Launcher keyboard navigation mode."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "keyboard_focus"));
31- hints_.push_back(new shortcut::Hint(launcher, "", "", _("Switch applications via Launcher."), shortcut::HARDCODED_OPTION, _("Super + Tab")));
32+ hints_.push_back(new shortcut::Hint(launcher, "", "", _("Switch applications via Launcher."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "launcher_switcher_forward"));
33 hints_.push_back(new shortcut::Hint(launcher, "", _(" + 1 to 9"), _("Same as clicking on a Launcher icon."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
34 hints_.push_back(new shortcut::Hint(launcher, "", _(" + Shift + 1 to 9"), _("Open new window of the app."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
35 hints_.push_back(new shortcut::Hint(launcher, "", " + T", _("Open the Trash."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
36
37 // Dash...
38- std::string const dash = _("Dash");
39+ std::string const dash( _("Dash"));
40
41 hints_.push_back(new shortcut::Hint(dash, "", _(" (Tap)"), _("Open the Dash Home."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
42 hints_.push_back(new shortcut::Hint(dash, "", " + A", _("Open the Dash App Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
43@@ -2667,30 +2667,31 @@
44 hints_.push_back(new shortcut::Hint(dash, "", "", _("Switches between Lenses."), shortcut::HARDCODED_OPTION, _("Ctrl + Tab")));
45 hints_.push_back(new shortcut::Hint(dash, "", "", _("Moves the focus."), shortcut::HARDCODED_OPTION, _("Cursor Keys")));
46 hints_.push_back(new shortcut::Hint(dash, "", "", _("Open currently focused item."), shortcut::HARDCODED_OPTION, _("Enter & Return")));
47- hints_.push_back(new shortcut::Hint(dash, "", "", _("'Run Command' mode."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "execute_command"));
48
49 // Menu Bar
50- std::string const menubar = _("Menu Bar");
51-
52- hints_.push_back(new shortcut::Hint(menubar, "", "", _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt"));
53+ std::string const menubar(_("HUD & Menu Bar"));
54+
55+ hints_.push_back(new shortcut::Hint(menubar, "", " (Tap)", _("Open the HUD."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_hud"));
56+ hints_.push_back(new shortcut::Hint(menubar, "", " (Press)", _("Reveals application menu."), shortcut::HARDCODED_OPTION, "Alt"));
57 hints_.push_back(new shortcut::Hint(menubar, "", "", _("Opens the indicator menu."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "panel_first_menu"));
58 hints_.push_back(new shortcut::Hint(menubar, "", "", _("Moves focus between indicators."), shortcut::HARDCODED_OPTION, _("Cursor Left or Right")));
59
60 // Switching
61- std::string const switching = _("Switching");
62+ std::string const switching(_("Switching"));
63
64 hints_.push_back(new shortcut::Hint(switching, "", "", _("Switch between applications."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_forward"));
65 hints_.push_back(new shortcut::Hint(switching, "", "", _("Switch windows of current application."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_next_window"));
66 hints_.push_back(new shortcut::Hint(switching, "", "", _("Moves the focus."), shortcut::HARDCODED_OPTION, _("Cursor Left or Right")));
67
68 // Workspaces
69- std::string const workspaces = _("Workspaces");
70+ std::string const workspaces(_("Workspaces"));
71+
72 hints_.push_back(new shortcut::Hint(workspaces, "", "", _("Spread workspaces."), shortcut::COMPIZ_KEY_OPTION, "expo", "expo_key"));
73 hints_.push_back(new shortcut::Hint(workspaces, "", "", _("Switch workspaces."), shortcut::HARDCODED_OPTION, _("Control + Alt + Cursor Keys")));
74 hints_.push_back(new shortcut::Hint(workspaces, "", "", _("Move focused window to different workspace."), shortcut::HARDCODED_OPTION, _("Control + Alt + Shift + Cursor Keys")));
75
76 // Windows
77- std::string const windows = _("Windows");
78+ std::string const windows(_("Windows"));
79 hints_.push_back(new shortcut::Hint(windows, "", "", _("Spreads all windows in the current workspace."), shortcut::COMPIZ_KEY_OPTION, "scale", "initiate_all_key"));
80 hints_.push_back(new shortcut::Hint(windows, "", "", _("Minimises all windows."), shortcut::COMPIZ_KEY_OPTION, "core", "show_desktop_key"));
81 hints_.push_back(new shortcut::Hint(windows, "", "", _("Maximises the current window."), shortcut::COMPIZ_KEY_OPTION, "core", "maximize_window_key"));