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
1=== modified file 'plugins/unityshell/src/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2013-05-09 18:08:23 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2013-08-13 11:32:20 +0000
4@@ -306,6 +306,7 @@
5 optionSetKeyboardFocusInitiate(boost::bind(&UnityScreen::setKeyboardFocusKeyInitiate, this, _1, _2, _3));
6 //optionSetKeyboardFocusTerminate (boost::bind (&UnityScreen::setKeyboardFocusKeyTerminate, this, _1, _2, _3));
7 optionSetExecuteCommandInitiate(boost::bind(&UnityScreen::executeCommand, this, _1, _2, _3));
8+ optionSetShowDesktopKeyInitiate(boost::bind(&UnityScreen::showDesktopKeyInitiate, this, _1, _2, _3));
9 optionSetPanelFirstMenuInitiate(boost::bind(&UnityScreen::showPanelFirstMenuKeyInitiate, this, _1, _2, _3));
10 optionSetPanelFirstMenuTerminate(boost::bind(&UnityScreen::showPanelFirstMenuKeyTerminate, this, _1, _2, _3));
11 optionSetAutomaximizeValueNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
12@@ -1852,6 +1853,13 @@
13 return true;
14 }
15
16+bool UnityScreen::showDesktopKeyInitiate(CompAction* action,
17+ CompAction::State state,
18+ CompOption::Vector& options)
19+{
20+ WindowManager::Default().ShowDesktop();
21+ return true;
22+}
23
24 bool UnityScreen::setKeyboardFocusKeyInitiate(CompAction* action,
25 CompAction::State state,
26
27=== modified file 'plugins/unityshell/src/unityshell.h'
28--- plugins/unityshell/src/unityshell.h 2013-04-11 05:53:30 +0000
29+++ plugins/unityshell/src/unityshell.h 2013-08-13 11:32:20 +0000
30@@ -141,6 +141,7 @@
31 bool showPanelFirstMenuKeyTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
32
33 bool executeCommand(CompAction* action, CompAction::State state, CompOption::Vector& options);
34+ bool showDesktopKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
35 bool setKeyboardFocusKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
36
37 bool altTabInitiateCommon(CompAction* action, switcher::ShowMode mode);
38
39=== modified file 'plugins/unityshell/unityshell.xml.in'
40--- plugins/unityshell/unityshell.xml.in 2013-01-18 00:40:28 +0000
41+++ plugins/unityshell/unityshell.xml.in 2013-08-13 11:32:20 +0000
42@@ -56,6 +56,12 @@
43 <default>&lt;Alt&gt;F2</default>
44 </option>
45
46+ <option name="show_desktop_key" type="key">
47+ <_short>Show Desktop</_short>
48+ <_long>Hide all windows and focus desktop.</_long>
49+ <default>&lt;Control&gt;&lt;Super&gt;d</default>
50+ </option>
51+
52 <option name="panel_first_menu" type="key">
53 <_short>Key to open the first panel menu</_short>
54 <_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: