From 709a5c1f0cd100f2436aad1d0c4551a60911be50 Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Sat, 7 Mar 2015 15:53:47 +0100 Subject: [PATCH] PlayerPage: Seek button, auto-fire, truncation --- gpodder-ui-qml | 2 +- qml/PlayerPage.qml | 84 +++++++++++++++++++++++++++------------------- 2 files changed, 50 insertions(+), 36 deletions(-) diff --git a/gpodder-ui-qml b/gpodder-ui-qml index 61863f1..55c5c8d 160000 --- a/gpodder-ui-qml +++ b/gpodder-ui-qml @@ -1 +1 @@ -Subproject commit 61863f14e31850b2bfafda8c65fca439a070e91f +Subproject commit 55c5c8d74d112f6b349b1e3418fac331e39505b2 diff --git a/qml/PlayerPage.qml b/qml/PlayerPage.qml index 52c10ef..b2fd69f 100644 --- a/qml/PlayerPage.qml +++ b/qml/PlayerPage.qml @@ -21,6 +21,7 @@ import QtQuick 2.0 import Sailfish.Silica 1.0 +import 'common' import 'common/util.js' as Util Page { @@ -150,6 +151,53 @@ Page { } } + Row { + anchors { + right: parent.right + margins: Theme.paddingMedium + } + + height: Theme.itemSizeLarge + spacing: Theme.paddingMedium + + IconMenuItem { + text: '- 1 min' + icon.source: 'image://theme/icon-m-previous' + + GPodderAutoFire { + running: parent.down + onFired: player.seekAndSync(player.position - 1000 * 60) + } + } + + IconMenuItem { + text: '- 10 sec' + icon.source: 'image://theme/icon-m-previous' + GPodderAutoFire { + running: parent.down + onFired: player.seekAndSync(player.position - 1000 * 10) + } + } + + IconMenuItem { + text: '+ 10 sec' + icon.source: 'image://theme/icon-m-next' + GPodderAutoFire { + running: parent.down + onFired: player.seekAndSync(player.position + 1000 * 10) + } + } + + IconMenuItem { + text: '+ 1 min' + icon.source: 'image://theme/icon-m-next' + GPodderAutoFire { + running: parent.down + onFired: player.seekAndSync(player.position + 1000 * 60) + } + } + } + SectionHeader { text: 'Play queue' visible: playQueueRepeater.count > 0 @@ -189,6 +237,7 @@ Page { } text: modelData.title + truncationMode: TruncationMode.Fade } onClicked: { @@ -196,41 +245,6 @@ Page { } } } - - Item { - width: parent.width - height: Theme.itemSizeLarge - } - - TimePicker { - hourMode: DateTime.TwentyFourHours - anchors.horizontalCenter: parent.horizontalCenter - - property int oldHour: hour - property int oldMinute: minute - - onHourChanged: { - var diff = hour - oldHour; - if (diff > 12) { - diff -= 24; - } else if (diff < -12) { - diff += 24; - } - player.seekAndSync(player.position + 1000 * 60 * diff); - oldHour = hour; - } - - onMinuteChanged: { - var diff = minute - oldMinute; - if (diff > 30) { - diff -= 60; - } else if (diff < -30) { - diff += 60; - } - player.seekAndSync(player.position + 1000 * 10 * diff); - oldMinute = minute; - } - } } } }