Merge lp:~renatofilho/mediaplayer-app/fix-theme into lp:mediaplayer-app

[Renato Araujo Oliveira Filho]

Removed use of deprecated functions.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

looks good

review: Approve

=== modified file 'src/qml/player/TimeLine.qml'
--- src/qml/player/TimeLine.qml	2013-02-22 14:52:38 +0000
+++ src/qml/player/TimeLine.qml	2013-04-15 13:15:37 +0000
@@ -72,7 +72,7 @@
             }
         }
 
-        onSliderClicked: {
+        onTouched: {
             _timeLine.clicked(onThumb)
         }
     }

=== removed file 'src/qml/sdk/Slider.qml'
--- src/qml/sdk/Slider.qml	2013-02-11 13:52:33 +0000
+++ src/qml/sdk/Slider.qml	1970-01-01 00:00:00 +0000
@@ -1,246 +0,0 @@
-/*
- * Copyright 2012-2013 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// FIXME(loicm) An option should be added to render the value text outside of
-//     the thumb, on top or bottom of the thumb (or left and right once we got
-//     support for vertical orientation). Moreover, having the value text inside
-//     the thumb makes it complicated to fit numbers with high values (or high
-//     number of decimals) or visually awkward since the text is hidden by the
-//     mouse cursor (or the finger) when dragged.
-
-// FIXME(loicm) An animation should be added when the user clicks on an area
-//     outside the thumb to smoothly move it under the mouse.
-
-// FIXME(loicm) Maybe add support for vertical orientation (orientation
-//     property). Don't forget to adapt the inverted property documentation
-//     accordingly. Note that UIKit doesn't have vertical sliders.
-
-// FIXME(loicm) Add support for keyboard shortcuts (basically left/right).
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-import "mathUtils.js" as MathUtils
-import "sliderUtils.js" as SliderFuncs
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
-
-/*!
-    \qmltype Slider
-    \inqmlmodule Ubuntu.Components 0.1
-    \ingroup ubuntu
-    \brief Slider is a component to select a value from a continuous range of
-     values.
-
-    The slider's sensing area is defined by the width and height, therefore
-    delegates should take this into account when defining the visuals, and
-    alter these values to align the graphics' sizes.
-
-    Example:
-    \qml
-    Item {
-        Slider {
-            function formatValue(v) { return v.toFixed(2) }
-            minimumValue: -3.14
-            maximumValue: 3.14
-            value: 0.0
-            live: true
-        }
-    }
-    \endqml
-
-    \section2 Theming
-
-    The slider's default style class is \b slider and style properties depend on
-    the actual delegate defined by the theme, except of one property which defines
-    the spacing units between the slider's bar and thumb, called \b thumbSpacing.
-    The slider uses one single touch sensing area to position the thumb within the
-    bar. Therefore However delegates must define the following properties:
-    \list
-    \li * \b bar - the slider's bar object
-    \li * \b thumb - the slider's thumb object
-    \endlist
-
-    Beside these, the library provies functions for delegates to update liveValue and
-    normalizedValue in SliderUtils module.
-
-    \b{This component is under heavy development.}
-*/
-AbstractButton {
-    id: slider
-
-    width: units.gu(38)
-    height: units.gu(5)
-
-    Theming.ItemStyle.class: "slider"
-
-    // FIXME(loicm) Add Support for the inverted property. There's an ongoing
-    //     debate on whether we should use that property (like every other
-    //     toolkits) or add new enumerations to the orientation property and
-    //     get something like LeftToRight, RightToLeft, TopToBottom and
-    //     BottomToTop. The last proposition appears to have the advantage that
-    //     it's not culture centric (ie inverted for LeftToRight and RightToLeft
-    //     isn't natural for everybody).
-
-    // /*!
-    //    \preliminary
-    //    Selects whether or not the minimum value starts from the right.
-    // */
-    // property bool inverted: false
-
-    /*!
-       \preliminary
-       The minimum value from the continuous range of values. If this value is
-       greater than maximumValue, the component will be in an inconsistent
-       state.
-    */
-    property real minimumValue: 0.0
-
-    /*!
-       \preliminary
-       The maximum value from the continuous range of values. If this value is
-       lesser than minimumValue, the component will be in an inconsistent state.
-    */
-    property real maximumValue: 100.0
-
-    // FIXME(loicm) Add Support for the stepSize property.
-
-    // /*!
-    //    \preliminary
-    //    The distance between two selectable values in the range defined by
-    //    [minimumValue, maximumValue].
-    // */
-    // property real stepSize: 1.0
-
-    /*!
-       \preliminary
-       The current value of the slider. This property is not changed while the
-       thumb is dragged unless the live property is set to true.
-    */
-    property real value: 0.0
-
-    /*!
-       \preliminary
-       Defines whether the value is updated while the thumb is dragged or just
-       when the thumb is released.
-    */
-    property bool live: false
-
-
-    /*!
-       \preliminary
-       This handler is called when there is a click on the slider. The onThumb parameter provides information if the click, was inside of the Thumb element.
-    */
-    signal sliderClicked(bool onThumb)
-
-
-    /*!
-      \preliminary
-      This function is used by the value indicator to show the current value.
-      Reimplement this function if you want to show different information. By
-      default, the value v is rounded to the nearest interger value.
-
-      \b Note: this function will be deprecated, and will be solved with particular
-      delegates for the thumb.
-     */
-    function formatValue(v) {
-        return v.toFixed(0)
-    }
-
-    // Private symbols.
-
-    /*! \internal */
-    onValueChanged: internals.liveValue = slider.value
-
-    /*! \internal */
-    Component.onCompleted: internals.updateMouseArea()
-
-    /*! \internal */
-    onPressedChanged: internals.mouseAreaPressed()
-
-    /*! \internal */
-    property alias __internals: internals
-    QtObject {
-        id: internals
-
-        property real thumbSpacing: ComponentUtils.style(slider, "thumbSpacing", 0.0)
-        property Item bar: ComponentUtils.delegateProperty(slider, "bar", null)
-        property Item thumb: ComponentUtils.delegateProperty(slider, "thumb", null)
-
-        property real liveValue: 0.0
-        property real normalizedValue: MathUtils.clamp((liveValue - slider.minimumValue) /
-                                                         (slider.maximumValue - slider.minimumValue),
-                                                         0.0, 1.0)
-
-        property real dragInitMouseX: 0.0
-        property real dragInitNormalizedValue: 0.0
-        property real thumbWidth: thumb ? thumb.width - thumbSpacing : 0.0
-        property real thumbSpace: bar ? bar.width - (2.0 * thumbSpacing + thumbWidth) : 0.0
-
-        function updateMouseArea() {
-            slider.__mouseArea.positionChanged.connect(internals.mouseAreaPositionchanged);
-        }
-
-        function mouseAreaPressed() {
-            if (!thumb || !bar)
-                return;
-            if (slider.__mouseArea.pressedButtons == Qt.LeftButton) {
-                // Left button pressed.
-                var mouseX = slider.__mouseArea.mouseX;
-                var mouseY = slider.__mouseArea.mouseY;
-                if (mouseY >= thumb.y && mouseY <= thumb.y + thumb.height) {
-                    if (mouseX >= thumb.x && mouseX <= thumb.x + thumb.width) {
-                        // Button pressed inside the thumb.
-                        dragInitMouseX = mouseX;
-                        dragInitNormalizedValue = normalizedValue;
-                        slider.sliderClicked(true);
-                    } else if (mouseX > thumbSpacing &&
-                               mouseX < bar.width - thumbSpacing) {
-                        // Button pressed outside the thumb.
-                        var normalizedPosition = (slider.__mouseArea.mouseX - thumbSpacing - thumbWidth * 0.5) / thumbSpace;
-                        normalizedPosition = MathUtils.clamp(normalizedPosition, 0.0, 1.0);
-                        liveValue = MathUtils.lerp(normalizedPosition, slider.minimumValue, slider.maximumValue);
-                        dragInitMouseX = mouseX;
-                        dragInitNormalizedValue = normalizedValue;
-                        if (slider.live) {
-                            slider.value = liveValue;
-                        }
-                        slider.sliderClicked(false);
-                    }
-                }
-            } else {
-                // Button released.
-                if (!slider.live) {
-                    slider.value = liveValue;
-                }
-            }
-        }
-
-        function mouseAreaPositionchanged() {
-            // Left button dragging.
-            if (slider.pressed) {
-                var normalizedOffsetX = (slider.__mouseArea.mouseX - dragInitMouseX) / thumbSpace;
-                var v = MathUtils.clamp(dragInitNormalizedValue + normalizedOffsetX, 0.0, 1.0);
-                liveValue = MathUtils.lerp(v, slider.minimumValue, slider.maximumValue);
-                if (slider.live) {
-                    slider.value = liveValue;
-                }
-            }
-        }
-    }
-}

=== modified file 'src/qml/theme/VideoSlider.qml'
--- src/qml/theme/VideoSlider.qml	2013-02-11 17:39:58 +0000
+++ src/qml/theme/VideoSlider.qml	2013-04-15 13:15:37 +0000
@@ -19,7 +19,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import "/usr/share/themes/Ambiance/qmltheme/styleUtils.js" as StyleUtils
 
 Item {
     id: main
@@ -30,7 +29,7 @@
     property Item thumb: thumbShape
 
     // private properties
-    property real thumbSpacing: StyleUtils.itemStyleProperty("thumbSpacing", 0)
+    property real thumbSpacing: 0
     property real liveValue: SliderUtils.liveValue(item)
     property real normalizedValue: SliderUtils.normalizedValue(item)
 
@@ -82,7 +81,6 @@
         id: thumbShape
 
         x: backgroundShape.x + thumbSpacing + normalizedValue * thumbSpace
-        //y: backgroundShape.y + thumbSpacing
         anchors.verticalCenter: backgroundShape.verticalCenter
         width: thumbWidth
         height: thumbWidth