Unity

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

hud-shortcut-overlay
Merge into trunk

Proposed by Andrea Azzarone on 2012-02-28

Status:

Merged

Approved by:

Didier Roche-Tolomelli on 2012-03-13

Approved revision:

no longer in the source branch.

Merged at revision:

2101

Proposed branch:

lp://qastaging/~azzar1/unity/hud-shortcut-overlay

Merge into:

lp://qastaging/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://qastaging/~azzar1/unity/hud-shortcut-overlay

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Marco Trevisan (Treviño)		2012-02-28	Approve on 2012-03-06
Review via email: mp+94929@code.qastaging.launchpad.net

Description of the change

= The Problem =

HUD shortcut is not in the overlay.

= The Fix =

Add it.

= Testing =

None.

Revision history for this message

Marco Trevisan (Treviño) (3v1n0) wrote on 2012-02-29:

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 on 2012-02-29:

> 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 on 2012-03-01:

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 on 2012-03-05:

> 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.