Castopod/kasts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added duration labels, fixed header background color and other small fixes.

Browse Source
This commit is contained in:
Swapnil Tripathi 2021-06-02 02:32:08 +05:30 committed by Bart De Vries
parent 4f02d8676f
commit 617a85925c
2 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/qml/HeaderBar.qml
View File

@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: 2021 Swapnil Tripathi <swapnil06.st@gmail.com>
// SPDX-License-Identifier: GPL-2.0-or-later
import QtQuick 2.14 import QtQuick 2.14
import QtQuick.Controls 2.14 import QtQuick.Controls 2.14
import QtQuick.Layouts 1.14 import QtQuick.Layouts 1.14
@ -5,13 +8,19 @@ import QtMultimedia 5.15
import QtGraphicalEffects 1.15 import QtGraphicalEffects 1.15
import org.kde.kirigami 2.14 as Kirigami import org.kde.kirigami 2.14 as Kirigami
import org.kde.kcoreaddons 1.0 as KCoreAddons
import org.kde.kasts 1.0 import org.kde.kasts 1.0
Rectangle { Rectangle {
id: headerBar id: headerBar
anchors.fill: parent anchors.fill: parent
//set background color
Kirigami.Theme.inherit: false
Kirigami.Theme.colorSet: Kirigami.Theme.Header
color: Kirigami.Theme.backgroundColor color: Kirigami.Theme.backgroundColor
RowLayout { RowLayout {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
@ -116,17 +125,41 @@ Rectangle {
} }
} }
} }
Slider { RowLayout {
id: durationSlider
enabled: AudioManager.entry
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Label {
Layout.rightMargin: Kirigami.Units.largeSpacing text: KCoreAddons.Format.formatDuration(AudioManager.position)
padding: 0 }
from: 0 Slider {
to: AudioManager.duration id: durationSlider
value: AudioManager.position enabled: AudioManager.entry
onMoved: AudioManager.seek(value) Layout.fillWidth: true
padding: 0
from: 0
to: AudioManager.duration
value: AudioManager.position
onMoved: AudioManager.seek(value)
}
Item {
Layout.preferredHeight: endLabel.implicitHeight
Layout.preferredWidth: endLabel.implicitWidth
Layout.rightMargin: Kirigami.Units.largeSpacing
Label {
id: endLabel
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
text: (SettingsManager.toggleRemainingTime) ?
"-" + KCoreAddons.Format.formatDuration(AudioManager.duration-AudioManager.position)
: KCoreAddons.Format.formatDuration(AudioManager.duration)
}
MouseArea {
anchors.fill: parent
hoverEnabled: true
onClicked: SettingsManager.toggleRemainingTime = !SettingsManager.toggleRemainingTime
}
}
} }
} }
} }

5
src/qml/main.qml
View File

@ -19,7 +19,7 @@ Kirigami.ApplicationWindow {
property var miniplayerSize: Kirigami.Units.gridUnit * 3 + Kirigami.Units.gridUnit / 6 property var miniplayerSize: Kirigami.Units.gridUnit * 3 + Kirigami.Units.gridUnit / 6
property int tabBarHeight: Kirigami.Units.gridUnit * 2 property int tabBarHeight: Kirigami.Units.gridUnit * 2
property int bottomMessageSpacing: Kirigami.Units.largeSpacing * 9 + ( ( AudioManager.entry && Kirigami.Settings.isMobile ) ? ( footerLoader.item.contentY == 0 ? miniplayerSize : 0 ) : 0 ) + tabBarActive * tabBarHeight property int bottomMessageSpacing: Kirigami.Units.largeSpacing * 9
property int tabBarActive: 0 property int tabBarActive: 0
property int originalWidth: Kirigami.Units.gridUnit * 10 property int originalWidth: Kirigami.Units.gridUnit * 10
@ -54,6 +54,7 @@ Kirigami.ApplicationWindow {
} }
// make room at the bottom for miniplayer // make room at the bottom for miniplayer
handle.anchors.bottomMargin: (( AudioManager.entry && Kirigami.Settings.isMobile ) ? (footerLoader.item.contentY == 0 ? miniplayerSize : 0) : 0) + Kirigami.Units.smallSpacing + tabBarActive * tabBarHeight handle.anchors.bottomMargin: (( AudioManager.entry && Kirigami.Settings.isMobile ) ? (footerLoader.item.contentY == 0 ? miniplayerSize : 0) : 0) + Kirigami.Units.smallSpacing + tabBarActive * tabBarHeight
handleVisible: Kirigami.Settings.isMobile ? !AudioManager.entry || footerLoader.item.contentY === 0 : false
showHeaderWhenCollapsed: true showHeaderWhenCollapsed: true
actions: [ actions: [
Kirigami.PagePoolAction { Kirigami.PagePoolAction {
@ -134,7 +135,7 @@ Kirigami.ApplicationWindow {
id: contextDrawer id: contextDrawer
// make room at the bottom for miniplayer // make room at the bottom for miniplayer
handle.anchors.bottomMargin: ( (AudioManager.entry && Kirigami.Settings.isMobile) ? ( footerLoader.item.contentY == 0 ? miniplayerSize : 0 ) : 0 ) + Kirigami.Units.smallSpacing + tabBarActive * tabBarHeight handle.anchors.bottomMargin: ( (AudioManager.entry && Kirigami.Settings.isMobile) ? ( footerLoader.item.contentY == 0 ? miniplayerSize : 0 ) : 0 ) + Kirigami.Units.smallSpacing + tabBarActive * tabBarHeight
handleVisible: !( AudioManager.entry && Kirigami.Settings.isMobile) || footerLoader.item.contentY == 0 handleVisible: Kirigami.Settings.isMobile ? !AudioManager.entry || footerLoader.item.contentY === 0 : false
} }
Mpris2 { Mpris2 {