Merge lp:~azzar1/unity/add-showdesktop-key-7.0 into lp:unity/7.0

Proposed by Andrea Azzarone on 2013-08-13
Status: Merged
Approved by: Stephen M. Webb on 2013-08-13
Approved revision: 3322
Merged at revision: 3322
Proposed branch: lp:~azzar1/unity/add-showdesktop-key-7.0
Merge into: lp:unity/7.0
Diff against target: 54 lines (+15/-0)
3 files modified
plugins/unityshell/src/unityshell.cpp (+8/-0)
plugins/unityshell/src/unityshell.h (+1/-0)
plugins/unityshell/unityshell.xml.in (+6/-0)
To merge this branch: bzr merge lp:~azzar1/unity/add-showdesktop-key-7.0
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) 2013-08-13 Approve on 2013-08-13
PS Jenkins bot (community) continuous-integration Approve on 2013-08-13
Review via email: mp+179898@code.launchpad.net

Commit message

Cherrypick lp:unity rev 3443.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Stephen M. Webb (bregma) wrote :

Compiles and works.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp 2013-05-09 18:08:23 +0000
+++ plugins/unityshell/src/unityshell.cpp 2013-08-13 11:32:20 +0000
@@ -306,6 +306,7 @@
306 optionSetKeyboardFocusInitiate(boost::bind(&UnityScreen::setKeyboardFocusKeyInitiate, this, _1, _2, _3));306 optionSetKeyboardFocusInitiate(boost::bind(&UnityScreen::setKeyboardFocusKeyInitiate, this, _1, _2, _3));
307 //optionSetKeyboardFocusTerminate (boost::bind (&UnityScreen::setKeyboardFocusKeyTerminate, this, _1, _2, _3));307 //optionSetKeyboardFocusTerminate (boost::bind (&UnityScreen::setKeyboardFocusKeyTerminate, this, _1, _2, _3));
308 optionSetExecuteCommandInitiate(boost::bind(&UnityScreen::executeCommand, this, _1, _2, _3));308 optionSetExecuteCommandInitiate(boost::bind(&UnityScreen::executeCommand, this, _1, _2, _3));
309 optionSetShowDesktopKeyInitiate(boost::bind(&UnityScreen::showDesktopKeyInitiate, this, _1, _2, _3));
309 optionSetPanelFirstMenuInitiate(boost::bind(&UnityScreen::showPanelFirstMenuKeyInitiate, this, _1, _2, _3));310 optionSetPanelFirstMenuInitiate(boost::bind(&UnityScreen::showPanelFirstMenuKeyInitiate, this, _1, _2, _3));
310 optionSetPanelFirstMenuTerminate(boost::bind(&UnityScreen::showPanelFirstMenuKeyTerminate, this, _1, _2, _3));311 optionSetPanelFirstMenuTerminate(boost::bind(&UnityScreen::showPanelFirstMenuKeyTerminate, this, _1, _2, _3));
311 optionSetAutomaximizeValueNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));312 optionSetAutomaximizeValueNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -1852,6 +1853,13 @@
1852 return true;1853 return true;
1853}1854}
18541855
1856bool UnityScreen::showDesktopKeyInitiate(CompAction* action,
1857 CompAction::State state,
1858 CompOption::Vector& options)
1859{
1860 WindowManager::Default().ShowDesktop();
1861 return true;
1862}
18551863
1856bool UnityScreen::setKeyboardFocusKeyInitiate(CompAction* action,1864bool UnityScreen::setKeyboardFocusKeyInitiate(CompAction* action,
1857 CompAction::State state,1865 CompAction::State state,
18581866
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h 2013-04-11 05:53:30 +0000
+++ plugins/unityshell/src/unityshell.h 2013-08-13 11:32:20 +0000
@@ -141,6 +141,7 @@
141 bool showPanelFirstMenuKeyTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);141 bool showPanelFirstMenuKeyTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
142142
143 bool executeCommand(CompAction* action, CompAction::State state, CompOption::Vector& options);143 bool executeCommand(CompAction* action, CompAction::State state, CompOption::Vector& options);
144 bool showDesktopKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
144 bool setKeyboardFocusKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);145 bool setKeyboardFocusKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
145146
146 bool altTabInitiateCommon(CompAction* action, switcher::ShowMode mode);147 bool altTabInitiateCommon(CompAction* action, switcher::ShowMode mode);
147148
=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in 2013-01-18 00:40:28 +0000
+++ plugins/unityshell/unityshell.xml.in 2013-08-13 11:32:20 +0000
@@ -56,6 +56,12 @@
56 <default>&lt;Alt&gt;F2</default>56 <default>&lt;Alt&gt;F2</default>
57 </option>57 </option>
5858
59 <option name="show_desktop_key" type="key">
60 <_short>Show Desktop</_short>
61 <_long>Hide all windows and focus desktop.</_long>
62 <default>&lt;Control&gt;&lt;Super&gt;d</default>
63 </option>
64
59 <option name="panel_first_menu" type="key">65 <option name="panel_first_menu" type="key">
60 <_short>Key to open the first panel menu</_short>66 <_short>Key to open the first panel menu</_short>
61 <_long>Opens the first indicator menu of the Panel, allowing keyboard navigation thereafter.</_long>67 <_long>Opens the first indicator menu of the Panel, allowing keyboard navigation thereafter.</_long>

Subscribers

People subscribed via source and target branches

to all changes: