Merge lp:~unity-team/unity/unity.hud-signal-956878 into lp:unity

[Jay Taoko]

* Fix for bug #956878:
The hud is designed such that the first valid option is always selected. When the activated signal is detected early in hud::View::FindKeyFocusArea, the selected button signal is emitted, and the text entry is still selected as the focus area. Therefore, the hud should not reacted to the search_bar_->activated signal since it alreacdy acted in hud::View::FindKeyFocusArea.

* Fix for bug #956878:
The hud is designed such that the first valid option is always selected. When the activated signal is detected early in hud::View::FindKeyFocusArea, the selected button signal is emitted, and the text entry is still selected as the focus area. Therefore, the hud should not reacted to the search_bar_->activated signal since it alreacdy acted in hud::View::FindKeyFocusArea.

[Alex Launi (alexlauni)]

As discussed on IRC, please write an autopilot test for this.

review: Needs Fixing

[Gord Allott (gordallott)]

+1

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'manual-tests/Hud.txt'
--- manual-tests/Hud.txt	2012-02-12 18:23:18 +0000
+++ manual-tests/Hud.txt	2012-03-20 14:03:20 +0000
@@ -56,3 +56,15 @@
   After pressing escape in step three, the text "test" should be removed from the hud search
   After step four, the hud should dismiss itself and not be present.
 
+Hud Sending Undo
+----------------
+This test ensure that the undo action is properly handle in a text editor.
+
+#. Open GEdit and start a new document
+#. Type "0 1"
+#. Tap Alt
+#. Type "undo"
+#. Press and release the Enter Key
+
+Outcome
+  After pressing the Enter key the text in GEdit should be "0 "

=== modified file 'plugins/unityshell/src/HudView.cpp'
--- plugins/unityshell/src/HudView.cpp	2012-03-16 16:43:15 +0000
+++ plugins/unityshell/src/HudView.cpp	2012-03-20 14:03:20 +0000
@@ -64,6 +64,7 @@
   , current_height_(0)
   , timeline_need_more_draw_(false)
   , selected_button_(0)
+  , activated_signal_sent_(false)
 {
   renderer_.SetOwner(this);
   renderer_.need_redraw.connect([this] () { 
@@ -80,7 +81,8 @@
 
   search_bar_->activated.connect ([&]() 
   {
-    search_activated.emit(search_bar_->search_string);
+    if (!activated_signal_sent_)
+      search_activated.emit(search_bar_->search_string);
   });
 
   search_bar_->text_entry()->SetLoseKeyFocusOnKeyNavDirectionUp(false);
@@ -608,8 +610,9 @@
       return search_bar_->text_entry();
     }
 
-    if (direction == nux::KEY_NAV_ENTER)
+    if (event_type == nux::NUX_KEYDOWN && direction == nux::KEY_NAV_ENTER)
     {
+      activated_signal_sent_ = false;
       // The "Enter" key has been received and the text entry has the key focus.
       // If one of the button has the fake_focus, we get it to emit the query_activated signal.
       if (!buttons_.empty())
@@ -620,6 +623,7 @@
           if ((*it)->fake_focused)
           {
             query_activated.emit((*it)->GetQuery());
+            activated_signal_sent_ = true;
           }
         }
       }

=== modified file 'plugins/unityshell/src/HudView.h'
--- plugins/unityshell/src/HudView.h	2012-03-02 02:00:18 +0000
+++ plugins/unityshell/src/HudView.h	2012-03-20 14:03:20 +0000
@@ -118,6 +118,7 @@
   int current_height_;
   bool timeline_need_more_draw_;
   int selected_button_;
+  bool activated_signal_sent_;
 };
 
 

=== modified file 'tests/autopilot/autopilot/emulators/bamf.py'
--- tests/autopilot/autopilot/emulators/bamf.py	2012-03-12 05:09:01 +0000
+++ tests/autopilot/autopilot/emulators/bamf.py	2012-03-20 14:03:20 +0000
@@ -131,15 +131,21 @@
 
         return found_app[0]
 
-    def launch_application(self, desktop_file, wait=True):
+    def launch_application(self, desktop_file, files=[], wait=True):
         """Launch an application by specifying a desktop file.
 
+        `files` is a list of files to pass to the application. Not all apps support this.
+
+        If `wait` is True, this method will block until the application has launched.
+
         Returns the Gobject process object. if wait is True (the default),
         this method will not return until an instance of this application
         appears in the BAMF application list.
         """
+        if type(files) is not list:
+            raise TypeError("files must be a list.")
         proc = gio.unix.DesktopAppInfo(desktop_file)
-        proc.launch()
+        proc.launch_uris(files)
         if wait:
             self.wait_until_application_is_running(desktop_file, -1)
         return proc

=== modified file 'tests/autopilot/autopilot/tests/__init__.py'
--- tests/autopilot/autopilot/tests/__init__.py	2012-03-14 20:16:38 +0000
+++ tests/autopilot/autopilot/tests/__init__.py	2012-03-20 14:03:20 +0000
@@ -209,11 +209,14 @@
         self.addCleanup(Keyboard.cleanup)
         self.addCleanup(Mouse.cleanup)
 
-    def start_app(self, app_name):
-        """Start one of the known apps, and kill it on tear down."""
+    def start_app(self, app_name, files=[]):
+        """Start one of the known apps, and kill it on tear down.
+
+        if files is specified, start the application with the specified files.
+        """
         logger.info("Starting application '%s'", app_name)
         app = self.KNOWN_APPS[app_name]
-        self.bamf.launch_application(app['desktop-file'])
+        self.bamf.launch_application(app['desktop-file'], files)
         self.addCleanup(call, ["killall", app['process-name']])
 
     def close_all_app(self, app_name):

=== modified file 'tests/autopilot/autopilot/tests/test_hud.py'
--- tests/autopilot/autopilot/tests/test_hud.py	2012-03-19 02:29:19 +0000
+++ tests/autopilot/autopilot/tests/test_hud.py	2012-03-20 14:03:20 +0000
@@ -11,7 +11,7 @@
 
 from autopilot.emulators.unity.hud import HudController
 from autopilot.tests import AutopilotTestCase
-
+from os import remove
 
 class HudTests(AutopilotTestCase):
 
@@ -172,3 +172,31 @@
 
         self.assertEqual(calc.is_active, True)
 
+    def test_gedit_undo(self):
+        """Test undo in gedit"""
+        """Type "0 1" into gedit."""
+        """Activate the Hud, type "undo" then enter."""
+        """Save the file in gedit and close gedit."""
+        """Read the saved file. The content should be "0 "."""
+
+        self.addCleanup(remove, '/tmp/autopilot_gedit_undo_test_temp_file.txt')
+        self.start_app('Text Editor', files=['/tmp/autopilot_gedit_undo_test_temp_file.txt'])
+
+        sleep(1)
+        self.keyboard.type("0")
+        self.keyboard.type(" ")
+        self.keyboard.type("1")
+
+        self.hud.toggle_reveal()
+        sleep(1)
+
+        self.keyboard.type("undo")
+        self.keyboard.press_and_release('Return')
+        sleep(1)
+
+        self.keyboard.press_and_release("Ctrl+s")
+        sleep(1)
+
+        contents = open("/tmp/autopilot_gedit_undo_test_temp_file.txt").read().strip('\n')
+        self.assertEqual("0 ", contents)
+