Compare commits

..
6 changed files with 156 additions and 161 deletions

No files matched your search

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

+1 -1
View File
@@ -1 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg width="48" height="48" version="1.1" viewBox="0 0 12.7 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a" x1="25" x2="25" y1="3" y2="42.605" gradientTransform="matrix(.26458 0 0 .26458 5.101e-5 3.6667e-7)" gradientUnits="userSpaceOnUse"><stop stop-color="#f47750" offset="0"/><stop stop-color="#ed1515" offset="1"/></linearGradient><linearGradient id="d" x1="24" x2="24" y1="35.353" y2="12.647" gradientUnits="userSpaceOnUse"><stop stop-color="#31363b" offset="0"/><stop stop-color="#5f6a73" offset="1"/></linearGradient><linearGradient id="c" x1="24" x2="24" y1="29" y2="19" gradientUnits="userSpaceOnUse"><stop stop-color="#4d4d4d" offset="0"/><stop stop-color="#737373" offset="1"/></linearGradient><linearGradient id="b" x1="6.35" x2="6.35" y1="9.525" y2="-1.8372" gradientUnits="userSpaceOnUse"><stop stop-color="#7f8c8d" offset="0"/><stop stop-color="#929d9e" offset="1"/></linearGradient></defs><metadata><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata><g stroke-width=".26458"><rect x="1.0584" y="1.0583" width="10.583" height="10.583" rx="1.5875" ry="1.5875" fill="#a83226" style="paint-order:stroke fill markers"/><rect x="1.0584" y="1.0583" width="10.583" height="10.319" rx="1.5875" ry="1.5875" fill="url(#a)" style="paint-order:stroke fill markers"/><circle cx="6.35" cy="6.35" r="3.175" fill="none" stroke="#eee" stroke-linecap="square" stroke-width=".26458"/><path d="m8.3465 6.35-3.0549 1.7637 3e-7 -1.7637-3e-7 -1.7637 1.5274 0.88187z" fill="#fff"/><path d="m2.3962 5.8208a3.9538 3.9538 0 0 1 3.9538-3.9538 3.9538 3.9538 0 0 1 3.9538 3.9538" fill="none" stroke="url(#b)" stroke-linecap="square" stroke-width=".26458"/><path d="m4.3731 2.3967a3.9538 3.9538 0 0 1 3.9538 1e-7" fill="none" stroke="#6b6b6b" stroke-linecap="round" stroke-width=".52917"/><path transform="scale(.26458)" d="m8 19c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h2c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1h-2zm30 0c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h2c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1h-2z" fill="url(#c)"/><path transform="scale(.26458)" d="m8 19c-0.554 0-1 0.446-1 1v8c0 0.554 0.446 1 1 1h2v-10h-2zm30 0v10h2c0.554 0 1-0.446 1-1v-8c0-0.554-0.446-1-1-1h-2z" fill="url(#d)"/></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="48" height="48" viewBox="0 0 12.7 12.7"><defs><linearGradient id="c"><stop offset="0" stop-color="#dc8689"/><stop offset="1" stop-color="#d56062"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#da4453"/><stop offset="1" stop-color="#e74c3c"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#c0392b"/><stop offset="1" stop-color="#c0392b" stop-opacity="0"/></linearGradient><linearGradient xlink:href="#a" id="e" x1="6.08542" x2="6.08542" y1="6.35" y2="11.3773" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#b" id="d" x1="6.61458" x2="6.61458" y1="6.2178" y2="1.0583" gradientTransform="translate(0 -.15143)" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#c" id="g" x1="10.58366" x2="11.64167" y1="6.08397" y2="6.08542" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#c" id="f" x1="1.05833" x2="2.38125" y1="6.08542" y2="6.08542" gradientTransform="translate(-3.43958)" gradientUnits="userSpaceOnUse"/></defs><rect width="10.583" height="10.583" x="1.0584" y="1.0583" fill="#a83226" paint-order="stroke fill markers" rx="1.5875" ry="1.5875"/><rect width="10.583" height="10.319" x="1.0584" y=".90687" fill="url(#d)" paint-order="stroke fill markers" rx="1.5875" ry="1.5875"/><circle cx="6.35" cy="6.34408" r="3.97467" fill="none" stroke="#a83226" stroke-linecap="square" stroke-width=".51752"/><path fill="url(#e)" d="M1.05885 6.08542v3.83645c0 .87947.70803 1.5875 1.5875 1.5875h7.40782c.87946 0 1.5875-.70803 1.5875-1.5875V6.08542Z" paint-order="stroke fill markers"/><path fill="#ad3327" d="M1.05833 6.08542v.52916h2.51355a.132.132 0 0 0 .13229-.13229v-.26458a.132.132 0 0 0-.1323-.1323H1.05834z"/><path fill="#ac3327" d="M9.6578 6.08542a.132.132 0 0 0-.13228.13229v.26458a.132.132 0 0 0 .13229.1323h1.98386v-.52917Z"/><circle cx="6.3499" cy="6.06637" r="3.97467" fill="none" stroke="#dc8689" stroke-linecap="square" stroke-width=".51752"/><g fill="#ad3327" transform="translate(-.52917 -.26458)"><rect width=".52917" height=".52917" x="4.49792" y="6.35" rx=".13229" ry=".13229"/><rect width=".52917" height="4.7625" x="5.29167" y="4.49792" rx=".13229" ry=".13229"/><rect width=".52917" height="3.70417" x="6.08542" y="5.02708" rx=".13229" ry=".13229"/><rect width=".52917" height="2.64583" x="6.87917" y="5.55625" rx=".13229" ry=".13229"/><rect width=".52917" height="1.5875" x="7.67292" y="6.08542" rx=".13229" ry=".13229"/></g><path fill="#a83226" d="M7.9375 6.489v.27958c0 .06128.059.11059.1323.11059h.26458c.07328 0 .13229-.0493.13229-.1106v-.27956c-.00353.0701-.0613.12557-.1323.12557H8.0698c-.071 0-.12876-.05548-.13229-.12557z"/><path fill="#ad3327" d="M8.73125 6.22443V6.504c0 .06128.059.11058.1323.11058h.26458c.07328 0 .13229-.0493.13229-.11058v-.27957c-.00353.07009-.0613.12557-.1323.12557h-.26458c-.071 0-.12876-.05548-.13229-.12557z"/><rect width=".52917" height=".52917" x="3.96875" y="5.82083" fill="#f0b4ba" rx=".13229" ry=".13229"/><rect width=".52917" height="5.29167" x="4.7625" y="3.43958" fill="#fff" rx=".13229" ry=".13229"/><rect width=".52917" height="4.23333" x="5.55625" y="3.96875" fill="#fff" rx=".13229" ry=".13229"/><rect width=".52917" height="3.175" x="6.35" y="4.49792" fill="#fff" rx=".13229" ry=".13229"/><rect width=".52917" height="2.11667" x="7.14375" y="5.02708" fill="#fff" rx=".13229" ry=".13229"/><rect width=".52917" height="1.05833" x="7.9375" y="5.55625" fill="#fff" rx=".13229" ry=".13229"/><path fill="#dc8689" d="M2.38125 5.82083V6.35h1.19063a.132.132 0 0 0 .13229-.1323v-.26457a.132.132 0 0 0-.1323-.1323z"/><rect width=".52917" height=".52917" x="9.26042" y="6.08542" fill="#f0b4ba" rx=".13229" ry=".13229" transform="translate(-.52917 -.26458)"/><path fill="#dc8689" d="M9.6573 5.82083a.132.132 0 0 0-.1323.1323v.26458a.132.132 0 0 0 .1323.13229h.66145v-.52917Z"/><rect width="1.32292" height=".52917" x="-2.38125" y="5.82083" fill="url(#f)" rx="0" ry="0" transform="scale(-1 1)"/><rect width="1.32292" height=".52917" x="10.31875" y="5.82083" fill="url(#g)" rx="0" ry="0"/></svg>

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

+128 -131
View File
@@ -231,7 +231,6 @@ Item {
id: controlButtonBox
Layout.alignment: Qt.AlignHCenter
anchors.right: !isWidescreen? root.right:null
Layout.fillHeight: true
spacing: 2
@@ -466,51 +465,63 @@ Item {
onClosed: {
interactive = false
}
RowLayout {
id: contents
ColumnLayout {
width: volumeDrawer.width
ToolButton{
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
Layout.maximumWidth: height
Layout.preferredWidth: height
Rectangle {
Layout.margins: 5
radius:50
Layout.alignment: Qt.AlignHCenter
color: Kirigami.Theme.textColor
opacity: 0.7
width: 40
height: 4
icon.name: muteButton.icon.name
checkable: true
checked: muteButton.checked
onClicked: {
if(audio.muted)
{
muteButton.unmuteAudio()
}
else
{
muteButton.muteAudio()
}
}
}
Slider {
value: volumeSlider.value
opacity: volumeSlider.opacity
wheelEnabled: true
RowLayout {
Layout.fillWidth: true
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
Layout.fillHeight: true
id: contents
ToolButton{
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
Layout.maximumWidth: height
Layout.preferredWidth: height
onMoved: {
volumeSlider.value = value
volumeSlider.valueChanged()
icon.name: muteButton.icon.name
checkable: true
checked: muteButton.checked
onClicked: {
if(audio.muted)
{
muteButton.unmuteAudio()
}
else
{
muteButton.muteAudio()
}
}
}
}
Label {
Layout.preferredHeight: Slider.height
Layout.preferredWidth: Kirigami.Units.gridUnit * 2.5
Slider {
value: volumeSlider.value
opacity: volumeSlider.opacity
wheelEnabled: true
text: volumeLabel.text
Layout.fillWidth: true
Layout.preferredHeight: Kirigami.Units.gridUnit * 2.5
onMoved: {
volumeSlider.value = value
volumeSlider.valueChanged()
}
}
Label {
Layout.preferredHeight: Slider.height
Layout.preferredWidth: Kirigami.Units.gridUnit * 2.5
text: volumeLabel.text
}
}
}
}
@@ -694,115 +705,108 @@ Item {
anchors.fill: parent
color: "white"
opacity: 0.2
}
ColumnLayout{
spacing:0
}
ScrollView {
anchors.fill: parent
ListView {
spacing: 5
rightMargin: 10
leftMargin:10
topMargin:10
bottomMargin: 10
clip: true
ScrollView {
Layout.fillWidth: true
Layout.fillHeight: true
Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
Kirigami.Theme.inherit: false
ListView {
spacing: 5
rightMargin: 10
leftMargin:10
topMargin:10
bottomMargin: 10
clip: true
BusyIndicator {
anchors.centerIn: parent
visible: UserPlaylistModel.loading || UserPlaylistModel.loading
}
Kirigami.Theme.colorSet: Kirigami.Theme.Complementary
Kirigami.Theme.inherit: false
model: UserPlaylistModel
BusyIndicator {
anchors.centerIn: parent
visible: UserPlaylistModel.loading || UserPlaylistModel.loading
}
delegate: Kirigami.SwipeListItem {
id: delegateItem
required property string title
required property string videoId
required property string artists
required property bool isCurrent
required property int index
model: UserPlaylistModel
alwaysVisibleActions: true
delegate: Kirigami.SwipeListItem {
background: Rectangle{
radius: 7
color:
if (parent.down){
Kirigami.ColorUtils.linearInterpolation(Kirigami.Theme.hoverColor, "transparent", 0.3)
}else if(parent.hovered){
Kirigami.ColorUtils.linearInterpolation(Kirigami.Theme.hoverColor, "transparent", 0.7)
}else if(parent.highlighted){
Kirigami.ColorUtils.linearInterpolation(Kirigami.Theme.hoverColor, "transparent", 0.7)
}else{
Qt.rgba(0, 0, 0, 0.4)
}
id: delegateItem
required property string title
required property string videoId
required property string artists
required property bool isCurrent
required property int index
background: Rectangle{
radius: 7
color:
border.color:
if (parent.down){
Kirigami.ColorUtils.linearInterpolation(Kirigami.Theme.hoverColor, "transparent", 0.3)
Kirigami.Theme.hoverColor
}else if(parent.hovered){
Kirigami.ColorUtils.linearInterpolation(Kirigami.Theme.hoverColor, "transparent", 0.7)
}else if(parent.highlighted){
Kirigami.ColorUtils.linearInterpolation(Kirigami.Theme.hoverColor, "transparent", 0.7)
Kirigami.Theme.hoverColor
}else{
Qt.rgba(0, 0, 0, 0.4)
Qt.rgba(1, 1, 1, 0)
}
border.color:
if (parent.down){
Kirigami.Theme.hoverColor
}else if(parent.hovered){
Kirigami.Theme.hoverColor
}else{
Qt.rgba(1, 1, 1, 0)
}
border.width: 1
border.width: 1
}
highlighted: isCurrent
onClicked: UserPlaylistModel.skipTo(videoId)
contentItem: RowLayout{
ThumbnailSource {
id: delegateThumbnailSource
videoId: delegateItem.videoId
}
highlighted: isCurrent
onClicked: UserPlaylistModel.skipTo(videoId)
RowLayout{
RoundedImage {
source: delegateThumbnailSource.cachedPath
Layout.margins: 2.5
height: delegateItem.height
width: height
radius: 5
}
ColumnLayout {
Layout.margins: 5
Layout.fillWidth: true
ThumbnailSource {
id: delegateThumbnailSource
videoId: delegateItem.videoId
}
RoundedImage {
source: delegateThumbnailSource.cachedPath
Layout.margins: 2.5
height: delegateItem.height
width: height
radius: 5
}
ColumnLayout {
Layout.margins: 5
Layout.fillWidth: true
Kirigami.Heading {
Kirigami.Heading {
// Layout.leftMargin: 5
// Layout.rightMargin: 5
// Layout.topMargin: 5
elide: Text.ElideRight
Layout.fillWidth: true
level: 2
text: title
}
elide: Text.ElideRight
Layout.fillWidth: true
level: 2
text: title
}
Label {
Label {
elide: Text.ElideRight
Layout.fillWidth: true
color: Kirigami.Theme.disabledTextColor
text: artists
}
elide: Text.ElideRight
Layout.fillWidth: true
color: Kirigami.Theme.disabledTextColor
text: artists
}
}
actions: [
Kirigami.Action {
text: i18n("Remove Track")
icon.name: "list-remove"
icon.color: "white"
onTriggered: UserPlaylistModel.remove(delegateItem.videoId)
}
]
}
actions: [
Kirigami.Action {
text: i18n("Remove Track")
icon.name: "list-remove"
icon.color: "white"
onTriggered: UserPlaylistModel.remove(delegateItem.videoId)
}
]
}
}
}
@@ -823,9 +827,8 @@ Item {
color: Kirigami.Theme.backgroundColor
}
ColumnLayout{
contentItem: ColumnLayout{
spacing:0
anchors.fill: parent
Rectangle {
Layout.margins: 5
radius:50
@@ -880,13 +883,9 @@ Item {
}
ColumnLayout {
Layout.margins: 5
Layout.fillWidth: true
Kirigami.Heading {
Layout.leftMargin: 5
Layout.rightMargin: 5
Layout.topMargin: 5
elide: Text.ElideRight
Layout.fillWidth: true
level: 2
@@ -894,8 +893,6 @@ Item {
}
Label {
Layout.margins: 5
elide: Text.ElideRight
Layout.fillWidth: true
color: Kirigami.Theme.disabledTextColor
+1 -5
View File
@@ -176,7 +176,7 @@ Item {
? (Math.min(content.implicitHeight, Kirigami.Units.gridUnit * 20))+2*(popup.shadowSize+popup.expansion)
: (Kirigami.Units.gridUnit * 20)+2*(popup.shadowSize+popup.expansion)
duration: 100
to: searchField.heigth
to: searchField.height
}
NumberAnimation on width{
id: playCloseWidth
@@ -203,9 +203,6 @@ Item {
to: -0
}
contentItem: ColumnLayout{
id: content
width: parent.width
@@ -339,5 +336,4 @@ Item {
}
}
}
}
+10 -7
View File
@@ -58,13 +58,16 @@ Item {
videoId: drawer.videoId
}
// Kirigami.Icon {
// Layout.margins: Kirigami.Units.smallSpacing
// source: "arrow-down"
// implicitWidth: Kirigami.Units.gridUnit
// implicitHeight: Kirigami.Units.gridUnit
// Layout.alignment: Qt.AlignHCenter
// }
Rectangle {
Layout.margins: 5
radius:50
Layout.alignment: Qt.AlignHCenter
color: Kirigami.Theme.textColor
opacity: 0.7
width: 40
height: 4
}
RowLayout {
spacing: 10
Kirigami.ShadowedRectangle {
+16 -17
View File
@@ -62,24 +62,23 @@ Kirigami.ApplicationWindow {
}
contentItem: RowLayout {
spacing: 0
Row {
Layout.alignment: Qt.AlignLeft
Controls.ToolButton {
id: back
enabled: applicationWindow().pageStack.layers.depth > 1 || (applicationWindow().pageStack.depth > 1 && (applicationWindow().pageStack.currentIndex > 0 || applicationWindow().pageStack.contentItem.contentX > 0)) // Copied from https://invent.kde.org/frameworks/kirigami/-/blob/master/src/controls/templates/private/BackButton.qml#L16
icon.name: "draw-arrow-back"
onClicked: pageStack.goBack()
visible: wideScreen
}
Controls.ToolButton {
icon.name: "draw-arrow-forward"
enabled: applicationWindow().pageStack.currentIndex < applicationWindow().pageStack.depth-1
onClicked: pageStack.goForward()
anchors.left: back.right
visible: wideScreen
Controls.ToolButton {
id: back
enabled: applicationWindow().pageStack.layers.depth > 1 || (applicationWindow().pageStack.depth > 1 && (applicationWindow().pageStack.currentIndex > 0 || applicationWindow().pageStack.contentItem.contentX > 0)) // Copied from https://invent.kde.org/frameworks/kirigami/-/blob/master/src/controls/templates/private/BackButton.qml#L16
icon.name: "draw-arrow-back"
onClicked: pageStack.goBack()
visible: wideScreen
}
Controls.ToolButton {
icon.name: "draw-arrow-forward"
enabled: applicationWindow().pageStack.currentIndex < applicationWindow().pageStack.depth-1
onClicked: pageStack.goForward()
visible: wideScreen
}
}
// spacer