Unity

Merge lp:~beuno/unity/bug-926441 into lp:unity

  1. bug-926441
  2. Merge into trunk
Proposed by Martin Albisetti
Status: Merged
Approved by: Thomi Richards
Approved revision: no longer in the source branch.
Merged at revision: 1928
Proposed branch: lp:~beuno/unity/bug-926441
Merge into: lp:unity
Diff against target: 14 lines (+2/-2)
1 file modified
plugins/unityshell/src/unityshell.cpp (+2/-2)
To merge this branch: bzr merge lp:~beuno/unity/bug-926441
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+91549@code.launchpad.net

Description of the change

This updates the shortcut descriptions to reflect how they actually work :)

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

The proper solution is to read the value from the gconf key (using the compiz wrapper). But but but we have a little problem. This value is not stored in a single key, so for the moment I can approve the change.

Just a small fix: remove the "or Right" postfix in the last line please :) Not your fault...

Revision history for this message
Martin Albisetti (beuno) wrote :

> Just a small fix: remove the "or Right" postfix in the last line please :) Not
> your fault...

Pushed!

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 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2012-02-04 01:55:49 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2012-02-04 15:35:21 +0000
4@@ -2550,8 +2550,8 @@
5 // Workspaces
6 std::string const workspaces = _("Workspaces");
7 hints_.push_back(new shortcut::Hint(workspaces, "", "", _("Spread workspaces."), shortcut::COMPIZ_KEY_OPTION, "expo", "expo_key"));
8- hints_.push_back(new shortcut::Hint(workspaces, "", "", _("Switch workspaces."), shortcut::HARDCODED_OPTION, _("Super + Cursor Keys")));
9- hints_.push_back(new shortcut::Hint(workspaces, "", " or Right", _("Move focused window to different workspace."), shortcut::HARDCODED_OPTION, _("Super + Alt + Cursor Keys")));
10+ hints_.push_back(new shortcut::Hint(workspaces, "", "", _("Switch workspaces."), shortcut::HARDCODED_OPTION, _("Control + Alt + Cursor Keys")));
11+ hints_.push_back(new shortcut::Hint(workspaces, "", "", _("Move focused window to different workspace."), shortcut::HARDCODED_OPTION, _("Control + Alt + Shift + Cursor Keys")));
12
13 // Windows
14 std::string const windows = _("Windows");