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

[Andrea Azzarone]

Cherrypick lp:unity rev 3443.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3322
http://jenkins.qa.ubuntu.com/job/unity-7.0-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-armhf-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-7.0-raring-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-7.0-ci/11/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

Compiles and works.

review: Approve

=== 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 @@
      optionSetKeyboardFocusInitiate(boost::bind(&UnityScreen::setKeyboardFocusKeyInitiate, this, _1, _2, _3));
      //optionSetKeyboardFocusTerminate (boost::bind (&UnityScreen::setKeyboardFocusKeyTerminate, this, _1, _2, _3));
      optionSetExecuteCommandInitiate(boost::bind(&UnityScreen::executeCommand, this, _1, _2, _3));
+     optionSetShowDesktopKeyInitiate(boost::bind(&UnityScreen::showDesktopKeyInitiate, this, _1, _2, _3));
      optionSetPanelFirstMenuInitiate(boost::bind(&UnityScreen::showPanelFirstMenuKeyInitiate, this, _1, _2, _3));
      optionSetPanelFirstMenuTerminate(boost::bind(&UnityScreen::showPanelFirstMenuKeyTerminate, this, _1, _2, _3));
      optionSetAutomaximizeValueNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -1852,6 +1853,13 @@
   return true;
 }
 
+bool UnityScreen::showDesktopKeyInitiate(CompAction* action,
+                                         CompAction::State state,
+                                         CompOption::Vector& options)
+{
+  WindowManager::Default().ShowDesktop();
+  return true;
+}
 
 bool UnityScreen::setKeyboardFocusKeyInitiate(CompAction* action,
                                               CompAction::State state,
 
=== 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 @@
   bool showPanelFirstMenuKeyTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
   bool executeCommand(CompAction* action, CompAction::State state, CompOption::Vector& options);
+  bool showDesktopKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool setKeyboardFocusKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
   bool altTabInitiateCommon(CompAction* action, switcher::ShowMode mode);
 
=== 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 @@
                     <default>&lt;Alt&gt;F2</default>
                 </option>
 
+                <option name="show_desktop_key" type="key">
+                    <_short>Show Desktop</_short>
+                    <_long>Hide all windows and focus desktop.</_long>
+                    <default>&lt;Control&gt;&lt;Super&gt;d</default>
+                </option>
+
                 <option name="panel_first_menu" type="key">
                     <_short>Key to open the first panel menu</_short>
                     <_long>Opens the first indicator menu of the Panel, allowing keyboard navigation thereafter.</_long>