Unity

Merge lp:~kelemeng/unity/bug930510 into lp:unity

  1. bug930510
  2. Merge into trunk
Proposed by Gabor Kelemen
Status: Merged
Approved by: Tim Penhey
Approved revision: no longer in the source branch.
Merged at revision: 1991
Proposed branch: lp:~kelemeng/unity/bug930510
Merge into: lp:unity
Diff against target: 77 lines (+13/-10)
3 files modified
plugins/unityshell/src/ShortcutHintPrivate.cpp (+5/-3)
plugins/unityshell/src/unityshell.cpp (+7/-7)
po/POTFILES.in (+1/-0)
To merge this branch: bzr merge lp:~kelemeng/unity/bug930510
Reviewer Review Type Date Requested Status
Tim Penhey (community) Approve
Review via email: mp+93667@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

Looks good. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/ShortcutHintPrivate.cpp'
2--- plugins/unityshell/src/ShortcutHintPrivate.cpp 2011-12-19 22:59:12 +0000
3+++ plugins/unityshell/src/ShortcutHintPrivate.cpp 2012-02-18 11:50:21 +0000
4@@ -16,6 +16,8 @@
5 * Authored by: Andrea Azzarone <azzaronea@gmail.com>
6 */
7
8+#include <glib/gi18n-lib.h>
9+
10 #include "ShortcutHintPrivate.h"
11
12 #include <boost/algorithm/string/replace.hpp>
13@@ -44,9 +46,9 @@
14 {
15 std::string ret(scut);
16
17- boost::replace_all(ret, "Button1", "Left Mouse");
18- boost::replace_all(ret, "Button2", "Middle Mouse");
19- boost::replace_all(ret, "Button3", "Right Mouse");
20+ boost::replace_all(ret, "Button1", _("Left Mouse"));
21+ boost::replace_all(ret, "Button2", _("Middle Mouse"));
22+ boost::replace_all(ret, "Button3", _("Right Mouse"));
23
24 return ret;
25 }
26
27=== modified file 'plugins/unityshell/src/unityshell.cpp'
28--- plugins/unityshell/src/unityshell.cpp 2012-02-14 11:14:15 +0000
29+++ plugins/unityshell/src/unityshell.cpp 2012-02-18 11:50:21 +0000
30@@ -2582,7 +2582,7 @@
31
32 hints_.push_back(new shortcut::Hint(launcher, "", _(" (Press)"), _("Open Launcher, displays shortcuts."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher" ));
33 hints_.push_back(new shortcut::Hint(launcher, "", "", _("Open Launcher keyboard navigation mode."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "keyboard_focus"));
34- hints_.push_back(new shortcut::Hint(launcher, "", "", _("Switch applications via Launcher."), shortcut::HARDCODED_OPTION, "Super + Tab"));
35+ hints_.push_back(new shortcut::Hint(launcher, "", "", _("Switch applications via Launcher."), shortcut::HARDCODED_OPTION, _("Super + Tab")));
36 hints_.push_back(new shortcut::Hint(launcher, "", _(" + 1 to 9"), _("Same as clicking on a Launcher icon."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
37 hints_.push_back(new shortcut::Hint(launcher, "", _(" + Shift + 1 to 9"), _("Open new window of the app."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
38 hints_.push_back(new shortcut::Hint(launcher, "", " + T", _("Open the Trash."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
39@@ -2594,7 +2594,7 @@
40 hints_.push_back(new shortcut::Hint(dash, "", " + A", _("Open the Dash App Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
41 hints_.push_back(new shortcut::Hint(dash, "", " + F", _("Open the Dash Files Lens."), shortcut::COMPIZ_KEY_OPTION,"unityshell", "show_launcher"));
42 hints_.push_back(new shortcut::Hint(dash, "", " + M", _("Open the Dash Music Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
43- hints_.push_back(new shortcut::Hint(dash, "", "", _("Switches between Lenses."), shortcut::HARDCODED_OPTION, "Ctrl + Tab"));
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@@ -2625,12 +2625,12 @@
49 hints_.push_back(new shortcut::Hint(windows, "", "", _("Minimises all windows."), shortcut::COMPIZ_KEY_OPTION, "core", "show_desktop_key"));
50 hints_.push_back(new shortcut::Hint(windows, "", "", _("Maximises the current window."), shortcut::COMPIZ_KEY_OPTION, "core", "maximize_window_key"));
51 hints_.push_back(new shortcut::Hint(windows, "", "", _("Restores or minimises current window."), shortcut::COMPIZ_KEY_OPTION, "core", "unmaximize_window_key"));
52- hints_.push_back(new shortcut::Hint(windows, "", " or Right", _("Semi-maximises current window."), shortcut::COMPIZ_KEY_OPTION, "grid", "put_left_key"));
53+ hints_.push_back(new shortcut::Hint(windows, "", _(" or Right"), _("Semi-maximises current window."), shortcut::COMPIZ_KEY_OPTION, "grid", "put_left_key"));
54 hints_.push_back(new shortcut::Hint(windows, "", "", _("Closes current window."), shortcut::COMPIZ_KEY_OPTION, "core", "close_window_key"));
55- hints_.push_back(new shortcut::Hint(windows, "", "", _("Opens window accessibility menu."), shortcut::HARDCODED_OPTION, "Alt + Space"));
56- hints_.push_back(new shortcut::Hint(windows, "", "", _("Places window in corresponding positions."), shortcut::HARDCODED_OPTION, "Ctrl + Alt + Num"));
57- hints_.push_back(new shortcut::Hint(windows, "", " Drag", _("Move window."), shortcut::COMPIZ_MOUSE_OPTION, "move", "initiate_button"));
58- hints_.push_back(new shortcut::Hint(windows, "", " Drag", _("Resize window."), shortcut::COMPIZ_MOUSE_OPTION, "resize", "initiate_button"));
59+ hints_.push_back(new shortcut::Hint(windows, "", "", _("Opens window accessibility menu."), shortcut::HARDCODED_OPTION, _("Alt + Space")));
60+ hints_.push_back(new shortcut::Hint(windows, "", "", _("Places window in corresponding positions."), shortcut::HARDCODED_OPTION, _("Ctrl + Alt + Num")));
61+ hints_.push_back(new shortcut::Hint(windows, "", _(" Drag"), _("Move window."), shortcut::COMPIZ_MOUSE_OPTION, "move", "initiate_button"));
62+ hints_.push_back(new shortcut::Hint(windows, "", _(" Drag"), _("Resize window."), shortcut::COMPIZ_MOUSE_OPTION, "resize", "initiate_button"));
63 }
64
65 /* Window init */
66
67=== modified file 'po/POTFILES.in'
68--- po/POTFILES.in 2012-02-07 07:42:12 +0000
69+++ po/POTFILES.in 2012-02-18 11:50:21 +0000
70@@ -15,6 +15,7 @@
71 plugins/unityshell/src/FilterRatingsWidget.cpp
72 plugins/unityshell/src/PreviewMusic.cpp
73 plugins/unityshell/src/PreviewMusicTrack.cpp
74+plugins/unityshell/src/ShortcutHintPrivate.cpp
75 plugins/unityshell/src/unity-launcher-accessible.cpp
76 plugins/unityshell/src/unity-search-bar-accessible.cpp
77 plugins/unityshell/src/unityshell.cpp