Merge lp:~brandontschaefer/unity/super-l-lock-screen into lp:unity

[Brandon Schaefer]

Adds Super+L to lock the screen, while keeping the older shortcut around in g-s-d (Ctrl+Alt+L)

Adds Super+L to lock the screen, while keeping the older shortcut around in g-s-d (Ctrl+Alt+L)

[Christopher Townsend (townsend)]

Works well. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3615
http://jenkins.qa.ubuntu.com/job/unity-ci/538/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/72

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/538/rebuild

review: Approve (continuous-integration)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-12-09 17:57:46 +0000
+++ plugins/unityshell/src/unityshell.cpp	2014-01-06 19:55:24 +0000
@@ -301,6 +301,8 @@
      wt->Run(NULL);
      uScreen = this;
 
+     optionSetLockScreenInitiate(boost::bind(&UnityScreen::LockScreenInitiate, this, _1, _2, _3));
+
      optionSetShowHudInitiate(boost::bind(&UnityScreen::ShowHudInitiate, this, _1, _2, _3));
      optionSetShowHudTerminate(boost::bind(&UnityScreen::ShowHudTerminate, this, _1, _2, _3));
      optionSetBackgroundColorNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -2435,6 +2437,15 @@
   return ShowHud();
 }
 
+bool UnityScreen::LockScreenInitiate(CompAction* action,
+                                     CompAction::State state,
+                                     CompOption::Vector& options)
+{
+  session_controller_->LockScreen();
+  return true;
+}
+
+
 unsigned UnityScreen::CompizModifiersToNux(unsigned input) const
 {
   unsigned modifiers = 0;
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2013-12-04 19:42:43 +0000
+++ plugins/unityshell/src/unityshell.h	2014-01-06 19:55:24 +0000
@@ -180,6 +180,8 @@
   bool launcherSwitcherPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool launcherSwitcherTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
+  bool LockScreenInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
+
   /* handle option changes and change settings inside of the
    * panel and dock views */
   void optionChanged(CompOption*, Options num);
 
=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2013-12-04 19:42:43 +0000
+++ plugins/unityshell/unityshell.xml.in	2014-01-06 19:55:24 +0000
@@ -44,6 +44,12 @@
             <group>
                 <_short>General</_short>
 
+                <option name="lock_screen" type="key">
+                    <_short>Key to lock the screen.</_short>
+                    <_long>Pressing this key will lock the current session.</_long>
+                    <default>&lt;Super&gt;l</default>
+                </option>
+
                 <option name="show_hud" type="key">
                     <_short>Key to show the HUD</_short>
                     <_long>A tap on this key summons the HUD.</_long>
 
=== modified file 'shutdown/SessionController.cpp'
--- shutdown/SessionController.cpp	2013-11-20 21:39:40 +0000
+++ shutdown/SessionController.cpp	2014-01-06 19:55:24 +0000
@@ -74,6 +74,11 @@
   Show(mode, false);
 }
 
+void Controller::LockScreen() const
+{
+  manager_->LockScreen();
+}
+
 void Controller::Show(View::Mode mode, bool inhibitors)
 {
   EnsureView();
 
=== modified file 'shutdown/SessionController.h'
--- shutdown/SessionController.h	2013-11-14 00:17:19 +0000
+++ shutdown/SessionController.h	2014-01-06 19:55:24 +0000
@@ -49,6 +49,8 @@
 
   bool Visible() const;
 
+  void LockScreen() const;
+
 protected:
   // Introspectable
   std::string GetName() const;