Merge lp:~fboucault/mediaplayer-app/new_theming into lp:mediaplayer-app

[Florian Boucault]

Adapted slider to newer and simpler toolkit's theming infrastructure.

The ItemStyle attached property has been removed and widgets now have a 'style' property equivalent to what ItemStyle.delegate was providing.
The Ubuntu UI Toolkit merge request containing that change is: https://code.launchpad.net/~fboucault/ubuntu-ui-toolkit/simple_theming/+merge/171645
It will be merged in the morning so that the fixes for this app can be merged in the same day.

For testing, armhf packages of the toolkit are available at: http://people.canonical.com/~kaleo/sdk_simple_theming/

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:112
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/72/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/439
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/439/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/399

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

review: Needs Fixing (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

the code looks good and works as expected.
I will approve but I will leave to top approval to Florian, with that he can sync the merge with the SDK changes.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-autolanding/28/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/576
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-autolanding/4
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-autolanding/4/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-autolanding/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/578
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/578/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/519

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-autolanding/29/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/586
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-amd64-autolanding/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-autolanding/5
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-armhf-autolanding/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-saucy-i386-autolanding/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/588
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/588/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/527

review: Needs Fixing (continuous-integration)

=== modified file 'src/qml/player/TimeLine.qml'
--- src/qml/player/TimeLine.qml	2013-05-22 17:26:17 +0000
+++ src/qml/player/TimeLine.qml	2013-06-27 19:04:25 +0000
@@ -20,7 +20,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import "../sdk"
-import "../theme"
 
 Item {
     id: _timeLine
@@ -45,7 +44,7 @@
         id: _slider
 
         objectName: "TimeLine.Slider"
-        ItemStyle.delegate: VideoSlider {property Item item: _slider}
+        style: VideoSlider {property Item item: _slider}
         anchors {
             top: parent.top
             bottom: parent.bottom

=== renamed file 'src/qml/theme/VideoSlider.qml' => 'src/qml/player/VideoSlider.qml'
=== renamed file 'src/qml/theme/artwork/slider_bg.png' => 'src/qml/player/artwork/slider_bg.png'
=== renamed file 'src/qml/theme/artwork/slider_handle.png' => 'src/qml/player/artwork/slider_handle.png'
=== renamed file 'src/qml/theme/artwork/slider_shape.png' => 'src/qml/player/artwork/slider_shape.png'
=== removed directory 'src/qml/theme'
=== removed directory 'src/qml/theme/artwork'
=== removed file 'src/qml/theme/qmldir'
--- src/qml/theme/qmldir	2013-01-29 22:36:29 +0000
+++ src/qml/theme/qmldir	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-module theme
-
-VideoSlider 0.1 VideoSlider.qml

=== removed file 'src/qml/theme/theme.qmltheme'
--- src/qml/theme/theme.qmltheme	2013-02-01 15:22:26 +0000
+++ src/qml/theme/theme.qmltheme	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Renato Araujo Oliveira Filho <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-@import url("/usr/share/themes/Ambiance/qmltheme/default.qmltheme");
-@qml-import(theme 0.1, ..);
-@qml-mapping(.slider, , VideoSlider);
-.slider{}
-