Merge lp:~didrocks/unity/altf2 into lp:unity

[Didier Roche-Tolomelli]

Handle alt F2 unity side to show the new applications place entry.
We should now respect the show/hide variables in the .place

=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-03-09 15:04:54 +0000
+++ src/unityshell.cpp	2011-03-09 19:20:31 +0000
@@ -253,6 +253,20 @@
   return false;
 }
 
+bool
+UnityScreen::executeCommand (CompAction         *action,
+                             CompAction::State   state,
+                             CompOption::Vector &options)
+{
+  ubus_server_send_message (ubus_server_get_default (),
+                            UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
+                            g_variant_new ("(sus)",
+                                           "/com/canonical/unity/applicationsplace/runner",
+                                           0,
+                                           ""));
+  return false;
+}
+
 void
 UnityScreen::restartLauncherKeyNav ()
 {
@@ -756,6 +770,7 @@
   optionSetShowLauncherTerminate  (boost::bind (&UnityScreen::showLauncherKeyTerminate, this, _1, _2, _3));
   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));
   optionSetPanelFirstMenuInitiate (boost::bind (&UnityScreen::showPanelFirstMenuKeyInitiate, this, _1, _2, _3));
   optionSetPanelFirstMenuTerminate(boost::bind (&UnityScreen::showPanelFirstMenuKeyTerminate, this, _1, _2, _3));
 

=== modified file 'src/unityshell.h'
--- src/unityshell.h	2011-03-08 09:27:11 +0000
+++ src/unityshell.h	2011-03-09 19:20:31 +0000
@@ -104,14 +104,19 @@
 	showLauncherKeyTerminate (CompAction *action, CompAction::State state,
                               CompOption::Vector &options);
 
-  bool
-  showPanelFirstMenuKeyInitiate (CompAction         *action,
-                                 CompAction::State   state,
-                                 CompOption::Vector &options);
+    bool
+    showPanelFirstMenuKeyInitiate (CompAction         *action,
+                                   CompAction::State   state,
+                                   CompOption::Vector &options);
   bool
   showPanelFirstMenuKeyTerminate (CompAction         *action,
                                   CompAction::State   state,
                                   CompOption::Vector &options);
+                                  
+  bool
+  executeCommand (CompAction*         action,
+                  CompAction::State   state,
+                  CompOption::Vector& options);
   bool
   setKeyboardFocusKeyInitiate (CompAction*         action,
                                CompAction::State   state,

=== modified file 'unityshell.xml.in'
--- unityshell.xml.in	2011-03-04 15:01:07 +0000
+++ unityshell.xml.in	2011-03-09 19:20:31 +0000
@@ -72,6 +72,11 @@
             		    <_long>Set the keyboard-focus on the launcher so it can be navigated with the cursor-keys</_long>
             		    <default>&lt;Alt&gt;F1</default>
                   </option>
+                  <option name="execute_command" type="key">
+            		    <_short>Key to execute a command</_short>
+            		    <_long>Key to open a folder or execute a command</_long>
+            		    <default>&lt;Alt&gt;F2</default>
+                  </option>
                   <option name="panel_first_menu" type="key">
             		    <_short>Key to open the first panel menu</_short>
             		    <_long>Open the first menu on the panel, allowing keyboard navigation thereafter.</_long>