Some work

This commit is contained in:
Bart De Vries 2021-03-25 08:15:55 +01:00
parent b618229843
commit c9307d529d
5 changed files with 109 additions and 74 deletions

View File

@ -36,7 +36,7 @@ Kirigami.Page {
wrapMode: Text.WordWrap
Layout.fillWidth: true
onLinkActivated: Qt.openUrlExternally(link)
onWidthChanged: text = entry.adjustedContent(width, font.pixelSize)
onWidthChanged: text.adjustedContent(width, font.pixelSize)
}
}
}

View File

@ -0,0 +1,104 @@
/**
* SPDX-FileCopyrightText: 2021 Bart De Vries <bart@mogwai.be>
*
* SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
*/
import QtQuick 2.14
import QtQuick.Controls 2.14 as Controls
import QtQuick.Layouts 1.14
import QtMultimedia 5.15
import org.kde.kirigami 2.12 as Kirigami
import org.kde.alligator 1.0
Component {
id: minimizedplayercontrols
// progress bar for limited width (phones)
Rectangle {
z: 1
anchors.top: parent.top
anchors.left: parent.left
height: Kirigami.Units.gridUnit / 6
color: Kirigami.Theme.highlightColor
width: parent.width * audio.position / audio.duration
visible: true
}
RowLayout {
width: parent.width
visible: audio.entry !== undefined
spacing: Kirigami.Units.smallSpacing
Kirigami.Icon {
source: Fetcher.image(audio.entry.feed.image)
Layout.alignment: Qt.AlignVCenter
Layout.leftMargin: Kirigami.Units.smallSpacing
}
Controls.Button {
text: audio.playbackRate + "x"
onClicked: {
if(audio.playbackRate === 2.5)
audio.playbackRate = 1
else
audio.playbackRate = audio.playbackRate + 0.25
}
flat: true
Layout.alignment: Qt.AlignHCenter
implicitWidth: playButton.width
implicitHeight: playButton.height
}
Controls.Button {
icon.name: "media-seek-backward"
icon.height: Kirigami.Units.gridUnit * 2
icon.width: Kirigami.Units.gridUnit * 2
flat: true
Layout.alignment: Qt.AlignHCenter
onClicked: audio.seek(audio.position - 10000)
}
Controls.Button {
id: playButton
icon.name: audio.playbackState === Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
icon.height: Kirigami.Units.gridUnit * 2
icon.width: Kirigami.Units.gridUnit * 2
flat: true
onClicked: audio.playbackState === Audio.PlayingState ? audio.pause() : audio.play()
Layout.alignment: Qt.AlignHCenter
}
Controls.Button {
icon.name: "media-seek-forward"
icon.height: Kirigami.Units.gridUnit * 2
icon.width: Kirigami.Units.gridUnit * 2
flat: true
Layout.alignment: Qt.AlignHCenter
onClicked: audio.seek(audio.position + 10000)
}
Controls.Button {
icon.name: "media-skip-forward"
icon.height: Kirigami.Units.gridUnit * 2
icon.width: Kirigami.Units.gridUnit * 2
flat: true
Layout.alignment: Qt.AlignHCenter
onClicked: console.log("TODO")
}
Controls.Label {
text: (Math.floor(audio.position/3600000) < 10 ? "0" : "") + Math.floor(audio.position/3600000) + ":" + (Math.floor(audio.position/60000) % 60 < 10 ? "0" : "") + Math.floor(audio.position/60000) % 60 + ":" + (Math.floor(audio.position/1000) % 60 < 10 ? "0" : "") + Math.floor(audio.position/1000) % 60
padding: Kirigami.Units.gridUnit
}
Controls.Slider {
Layout.fillWidth: true
from: 0
to: audio.duration
value: audio.position
onMoved: audio.seek(value)
}
Controls.Label {
text: (Math.floor(audio.duration/3600000) < 10 ? "0" : "") + Math.floor(audio.duration/3600000) + ":" + (Math.floor(audio.duration/60000) % 60 < 10 ? "0" : "") + Math.floor(audio.duration/60000) % 60 + ":" + (Math.floor(audio.duration/1000) % 60 < 10 ? "0" : "") + Math.floor(audio.duration/1000) % 60
padding: Kirigami.Units.gridUnit
}
}
}

View File

@ -36,8 +36,8 @@ Kirigami.Page {
Kirigami.Icon {
source: Fetcher.image(entry.feed.image)
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
Layout.preferredWidth: Kirigami.Units.iconSizes.enormous * 3
Layout.preferredHeight: Kirigami.Units.iconSizes.enormous * 3
Layout.preferredWidth: Math.min(parent.width, Kirigami.Units.iconSizes.enormous * 3)
Layout.preferredHeight: Math.min(parent.height - 2*controls.height, Kirigami.Units.iconSizes.enormous * 3)
}
Item {
id: media

View File

@ -62,75 +62,5 @@ Kirigami.ApplicationWindow {
source: "gst-pipeline: playbin uri=file://" + entry.enclosure.path + " audio_sink=\"scaletempo ! audioconvert ! audioresample ! autoaudiosink\" video_sink=\"fakevideosink\""
}
footer: RowLayout {
width: parent.width
visible: audio.entry !== undefined
spacing: Kirigami.Units.smallSpacing
Kirigami.Icon {
source: Fetcher.image(audio.entry.feed.image)
Layout.alignment: Qt.AlignVCenter
Layout.leftMargin: Kirigami.Units.smallSpacing
}
Controls.Button {
text: audio.playbackRate + "x"
onClicked: {
if(audio.playbackRate === 2.5)
audio.playbackRate = 1
else
audio.playbackRate = audio.playbackRate + 0.25
}
flat: true
Layout.alignment: Qt.AlignHCenter
implicitWidth: playButton.width
implicitHeight: playButton.height
}
Controls.Button {
icon.name: "media-seek-backward"
icon.height: Kirigami.Units.gridUnit * 2
icon.width: Kirigami.Units.gridUnit * 2
flat: true
Layout.alignment: Qt.AlignHCenter
onClicked: audio.seek(audio.position - 10000)
}
Controls.Button {
id: playButton
icon.name: audio.playbackState === Audio.PlayingState ? "media-playback-pause" : "media-playback-start"
icon.height: Kirigami.Units.gridUnit * 2
icon.width: Kirigami.Units.gridUnit * 2
flat: true
onClicked: audio.playbackState === Audio.PlayingState ? audio.pause() : audio.play()
Layout.alignment: Qt.AlignHCenter
}
Controls.Button {
icon.name: "media-seek-forward"
icon.height: Kirigami.Units.gridUnit * 2
icon.width: Kirigami.Units.gridUnit * 2
flat: true
Layout.alignment: Qt.AlignHCenter
onClicked: audio.seek(audio.position + 10000)
}
Controls.Button {
icon.name: "media-skip-forward"
icon.height: Kirigami.Units.gridUnit * 2
icon.width: Kirigami.Units.gridUnit * 2
flat: true
Layout.alignment: Qt.AlignHCenter
onClicked: console.log("TODO")
}
Controls.Label {
text: (Math.floor(audio.position/3600000) < 10 ? "0" : "") + Math.floor(audio.position/3600000) + ":" + (Math.floor(audio.position/60000) % 60 < 10 ? "0" : "") + Math.floor(audio.position/60000) % 60 + ":" + (Math.floor(audio.position/1000) % 60 < 10 ? "0" : "") + Math.floor(audio.position/1000) % 60
padding: Kirigami.Units.gridUnit
}
Controls.Slider {
Layout.fillWidth: true
from: 0
to: audio.duration
value: audio.position
onMoved: audio.seek(value)
}
Controls.Label {
text: (Math.floor(audio.duration/3600000) < 10 ? "0" : "") + Math.floor(audio.duration/3600000) + ":" + (Math.floor(audio.duration/60000) % 60 < 10 ? "0" : "") + Math.floor(audio.duration/60000) % 60 + ":" + (Math.floor(audio.duration/1000) % 60 < 10 ? "0" : "") + Math.floor(audio.duration/1000) % 60
padding: Kirigami.Units.gridUnit
}
}
footer: MinimizedPlayerControls { }
}

View File

@ -10,6 +10,7 @@
<file alias="AddFeedSheet.qml">qml/AddFeedSheet.qml</file>
<file alias="FeedListDelegate.qml">qml/FeedListDelegate.qml</file>
<file alias="PodcastPlayerPage.qml">qml/PodcastPlayerPage.qml</file>
<file alias="MinimizedPlayerControls.qml">qml/MinimizedPlayerControls.qml</file>
<file>qtquickcontrols2.conf</file>
</qresource>
</RCC>