~jhodapp/+junk/mediaplayer-app-gst-1.0

Viewing changes to src/qml/player/TimeLine.qml

Committer: Tarmac
Author(s): Renato Araujo Oliveira Filho, Kaleo
Date: 2013-07-02 22:39:16 UTC
mfrom: (111.1.4 new_theming)
Revision ID: tarmac-20130702223916-sp3appfuyeescaj5

* Adapt slider to newer and simpler toolkit's theming infrastructure.
* Fixed autopilot tests.
* Changed test video file.

Approved by PS Jenkins bot.

files removed:
src/qml/theme

src/qml/theme/artwork

src/qml/theme/qmldir

src/qml/theme/theme.qmltheme

files renamed:
src/qml/theme/VideoSlider.qml => src/qml/player/VideoSlider.qml

src/qml/theme/artwork/slider_bg.png => src/qml/player/artwork/slider_bg.png

src/qml/theme/artwork/slider_handle.png => src/qml/player/artwork/slider_handle.png

src/qml/theme/artwork/slider_shape.png => src/qml/player/artwork/slider_shape.png

files modified:
src/qml/player.qml

src/qml/player/TimeLine.qml

src/qml/player/VideoPlayer.qml

tests/autopilot/mediaplayer_app/tests/test_player_with_video.py

tests/videos/small.mp4

Show diffs side-by-side

added added

removed removed

src/qml/player/TimeLine.qml

import QtQuick 2.0

import Ubuntu.Components 0.1

import "../sdk"

import "../theme"

Item {

id: _timeLine

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

Older »