Merge lp:~stolowski/unity-2d/alt-f4-closes-dash into lp:unity-2d

[Paweł Stołowski]

[dash][hud] Hide dash and hud on ALT+F4.
Added ALT+F4 handling to Shell.qml.

[lp:~stolowski/unity-2d/alt-f4-closes-dash]

960. By Paweł Stołowski on 2012-03-08

Dash tests - removed extra newline.

[Gerry Boland (gerboland)]

Nice, thank you Pawel!

review: Approve

[Paweł Stołowski (stolowski)]

Cool, thanks :)

Pawel

On 03/08/2012 05:14 PM, Gerry Boland wrote:
> Review: Approve
>
> Nice, thank you Pawel!

=== modified file 'shell/Shell.qml'
--- shell/Shell.qml	2012-03-02 09:30:42 +0000
+++ shell/Shell.qml	2012-03-08 12:40:33 +0000
@@ -180,7 +180,7 @@
     Component.onCompleted: declarativeView.show()
 
     Keys.onPressed: {
-        if (event.key == Qt.Key_Escape) {
+        if (event.key == Qt.Key_Escape || (event.key == Qt.Key_F4 && event.modifiers == Qt.AltModifier )) {
             declarativeView.forceDeactivateWindow()
         }
     }
 
=== modified file 'tests/dash/dash-tests.rb'
--- tests/dash/dash-tests.rb	2012-03-06 14:39:51 +0000
+++ tests/dash/dash-tests.rb	2012-03-08 12:40:33 +0000
@@ -66,6 +66,34 @@
     $SUT.execute_shell_command 'pkill -nf unity-2d-shell'
   end
 
+  # Test case objectives:
+  #   * Check that Alt+F4 hides dash
+  # Pre-conditions
+  #   * Desktop with no running applications
+  # Test steps
+  #   * Verify dash is not showing
+  #   * Press Alt+F2
+  #   * Verify dash is showing
+  #   * Press Alt+F4
+  #   * Verify dash is not showing
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+  test "Alt+F2, Alt+F4 hides dash" do
+    verify_equal("false", TIMEOUT, 'There should not be a Dash declarative view on startup') {
+      @app.Dash()['active']
+    }
+    XDo::Keyboard.alt_F2
+    verify_equal("true", TIMEOUT, 'There should be a Dash declarative view after pressing Alt+F2') {
+      @app.Dash()['active']
+    }
+    XDo::Keyboard.alt_F4
+    verify_equal("false", TIMEOUT, 'There should not be a Dash declarative view after pressing Escape') {
+      @app.Dash()['active']
+    }
+  end
+
   #####################################################################################
   # Test casess
 
 
=== modified file 'tests/hud/hud_show_hide_tests.rb'
--- tests/hud/hud_show_hide_tests.rb	2012-02-20 17:02:12 +0000
+++ tests/hud/hud_show_hide_tests.rb	2012-03-08 12:40:33 +0000
@@ -118,6 +118,36 @@
       @app.Hud()
     }
   end
+ 
+  # Test case objectives:
+  #   * Check Alt+F4 key closes HUD
+  # Pre-conditions
+  #   * None
+  # Test steps
+  #   * Check HUD closed
+  #   * Tap the Alt key
+  #   * Check HUD open
+  #   * Tap Alt+F4 key
+  #   * Check HUD closed
+  # Post-conditions
+  #   * None
+  # References
+  #   * None
+  test "HUD hides with ALT+F4 key" do
+    verify_not(1, 'HUD should be hidden at startup') {
+      @app.Hud()
+    }
+
+    XDo::Keyboard.alt
+    verify_equal('true', TIMEOUT, 'HUD should be visible, as the Alt key was tapped') {
+      @app.Hud()['active']
+    }
+
+    XDo::Keyboard.alt_F4
+    verify_not(1, 'HUD should be hidden, as the ALT+F4 key should dismiss it') {
+      @app.Hud()
+    }
+  end
   
   # Test case objectives:
   #   * Check outside mouse-click closes HUD