Merge lp:~mterry/mediaplayer-app/hud1 into lp:mediaplayer-app

[Michael Terry]

Port to HUD 1.0.

Port to HUD 1.0.

The daily-release PPA has HUD 1.0, while the phablet-team PPA only has HUD 0.1.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/28/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/27
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/933

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

review: Needs Fixing (continuous-integration)

[Sergio Schvezov (sergiusens)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/qml/player.qml'
--- src/qml/player.qml	2013-04-01 20:24:16 +0000
+++ src/qml/player.qml	2013-04-11 20:17:21 +0000
@@ -22,7 +22,7 @@
 import QtQuick 2.0
 import QtQuick.Window 2.0
 import QtMultimedia 5.0
-import Ubuntu.HUD 0.1 as HUD
+import Ubuntu.HUD 1.0 as HUD
 
 Rectangle {
     id: mediaPlayer
@@ -145,7 +145,10 @@
     HUD.HUD {
         applicationIdentifier: "media-player" // this must match the .desktop file!
         HUD.Context {
-            toolbar.quitAction.onTriggered: Qt.quit()
+            HUD.QuitAction {
+                onTriggered: Qt.quit()
+            }
+
             HUD.Action {
                 label: "Play / Pause"
                 keywords: "Pause or Resume Playhead"