Ubuntu
unity package

Merge lp:~nathwill-deactivatedaccount-deactivatedaccount/ubuntu/precise/unity/lp-972247 into lp:unity

  1. Precise (12.04)
  2. lp-972247
  3. Merge into trunk
Proposed by Nathan Williams
Status: Rejected
Rejected by: Brandon Schaefer
Proposed branch: lp:~nathwill-deactivatedaccount-deactivatedaccount/ubuntu/precise/unity/lp-972247
Merge into: lp:unity
Diff against target: 23 lines (+5/-0)
2 files modified
ChangeLog (+4/-0)
plugins/unityshell/src/unityshell.cpp (+1/-0)
To merge this branch: bzr merge lp:~nathwill-deactivatedaccount-deactivatedaccount/ubuntu/precise/unity/lp-972247
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+102424@code.launchpad.net

Description of the change

add missing Video Lens hint (lp: #972247)

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Looks like this was just fixed :(.
https://code.launchpad.net/~barneedhar/unity/lp-937334/+merge/115086

Unmerged revisions

2293. By Nathan Williams

add missing Video Lens hint (lp: #972247)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2012-04-12 13:21:20 +0000
+++ ChangeLog 2012-04-18 02:52:18 +0000
@@ -1,3 +1,7 @@
12012-04-17 Nathan Williams <nathan@nathanewilliams.com>
2
3 Add missing Video Lens hint. Fixes: https://bugs.launchpad.net/bugs/972247.
4
12012-04-12 Michal Hruby <michal.mhr@gmail.com>52012-04-12 Michal Hruby <michal.mhr@gmail.com>
26
3 Make sure the lenses search for things we want on startup. Fixes: https://bugs.launchpad.net/bugs/979799. Approved by Gord Allott.7 Make sure the lenses search for things we want on startup. Fixes: https://bugs.launchpad.net/bugs/979799. Approved by Gord Allott.
48
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp 2012-04-15 10:44:39 +0000
+++ plugins/unityshell/src/unityshell.cpp 2012-04-18 02:52:18 +0000
@@ -2872,6 +2872,7 @@
2872 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + A", _("Open the Dash App Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));2872 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + A", _("Open the Dash App Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
2873 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + F", _("Open the Dash Files Lens."), shortcut::COMPIZ_KEY_OPTION,"unityshell", "show_launcher"));2873 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + F", _("Open the Dash Files Lens."), shortcut::COMPIZ_KEY_OPTION,"unityshell", "show_launcher"));
2874 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + M", _("Open the Dash Music Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));2874 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + M", _("Open the Dash Music Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
2875 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", " + V", _("Open the Dash Video Lens."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "show_launcher"));
2875 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Switches between Lenses."), shortcut::HARDCODED_OPTION, _("Ctrl + Tab")));2876 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Switches between Lenses."), shortcut::HARDCODED_OPTION, _("Ctrl + Tab")));
2876 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Moves the focus."), shortcut::HARDCODED_OPTION, _("Cursor Keys")));2877 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Moves the focus."), shortcut::HARDCODED_OPTION, _("Cursor Keys")));
2877 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Open currently focused item."), shortcut::HARDCODED_OPTION, _("Enter & Return")));2878 hints_.push_back(std::make_shared<shortcut::Hint>(dash, "", "", _("Open currently focused item."), shortcut::HARDCODED_OPTION, _("Enter & Return")));