Merge lp:~renatofilho/mediaplayer-app/show-controls-at-end into lp:mediaplayer-app

[Renato Araujo Oliveira Filho]

Force the controls to became visible at the end of the video.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:67
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/518

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

review: Approve (continuous-integration)

[lp:~renatofilho/mediaplayer-app/show-controls-at-end]

68. By Renato Araujo Oliveira Filho on 2013-04-01

Added autopilot test for controls appear in the end of the movie.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/12
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/12/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/521

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/13/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good and works as expected.

review: Approve

=== modified file 'src/qml/player.qml'
--- src/qml/player.qml	2013-02-26 21:01:23 +0000
+++ src/qml/player.qml	2013-04-01 22:20:29 +0000
@@ -133,6 +133,15 @@
         ]
     }
 
+    Connections {
+        target: playerLoader.item
+        onStatusChanged: {
+            if (playerLoader.item.status === MediaPlayer.EndOfMedia) {
+                playerLoader.item.controlsActive = true
+            }
+        }
+    }
+
     HUD.HUD {
         applicationIdentifier: "media-player" // this must match the .desktop file!
         HUD.Context {

=== modified file 'src/qml/player/VideoPlayer.qml'
--- src/qml/player/VideoPlayer.qml	2013-02-21 20:39:19 +0000
+++ src/qml/player/VideoPlayer.qml	2013-04-01 22:20:29 +0000
@@ -32,6 +32,7 @@
     property bool wasPlaying: false
     property string uri
     property bool rotating: false   
+    property alias controlsActive: _controls.active
 
     signal timeClicked
 

=== modified file 'tests/autopilot/mediaplayer_app/tests/test_player_with_video.py'
--- tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2013-03-21 19:11:38 +0000
+++ tests/autopilot/mediaplayer_app/tests/test_player_with_video.py	2013-04-01 22:20:29 +0000
@@ -144,6 +144,27 @@
         self.assertEqual(time_label.text[0:9], "- 00:00:0")
 
 
+    def test_show_controls_at_end(self):
+        self.show_controls()
+        time_line = self.main_window.get_object("Slider", "TimeLine.Slider")
+
+        """ Seek to the midle of the video  """        
+        self.mouse.move_to_object(time_line)
+        self.mouse.click()
+        
+        """ hide controls """
+        video_area = self.main_window.get_object("VideoPlayer", "player")
+        self.mouse.move_to_object(video_area)
+        self.mouse.click()
+
+        """ wait for video ends and control appears"""
+        controls = self.main_window.get_object("Controls", "controls")
+        self.assertProperty(controls, visible=False)
+        self.assertThat(controls.visible, Eventually(Equals(True)))
+
+        
+
+