From b9433a348a57330cdf994c35b8e2f24a1736777e Mon Sep 17 00:00:00 2001 From: Bart De Vries Date: Thu, 8 Apr 2021 17:06:10 +0200 Subject: [PATCH] Minor adjustments --- src/qml/EntryListDelegate.qml | 6 ++++-- src/qml/EntryListPage.qml | 10 +++++----- src/resources.qrc | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/qml/EntryListDelegate.qml b/src/qml/EntryListDelegate.qml index 6d53368c..637aebbe 100644 --- a/src/qml/EntryListDelegate.qml +++ b/src/qml/EntryListDelegate.qml @@ -18,11 +18,13 @@ Kirigami.SwipeListItem { contentItem: RowLayout { Image { asynchronous: true - source: entry.image === "" ? "rss" : "file://"+Fetcher.image(entry.image) + source: entry.image === "" ? "logo.png" : "file://"+Fetcher.image(entry.image) fillMode: Image.PreserveAspectFit property int size: Kirigami.Units.gridUnit * 3 Layout.maximumHeight: size Layout.maximumWidth: size + height: size + width: size sourceSize.width: size sourceSize.height: size Layout.rightMargin: Kirigami.Units.smallSpacing @@ -61,7 +63,7 @@ Kirigami.SwipeListItem { Component { id: subtitle Controls.Label { - text: (Math.floor(entry.enclosure.duration/3600) < 10 ? "0" : "") + Math.floor(entry.enclosure.duration/3600) + ":" + (Math.floor(entry.enclosure.duration/60) % 60 < 10 ? "0" : "") + Math.floor(entry.enclosure.duration/60) % 60 + ":" + (Math.floor(entry.enclosure.duration) % 60 < 10 ? "0" : "") + Math.floor(entry.enclosure.duration) % 60 + text: entry.enclosure ? ((Math.floor(entry.enclosure.duration/3600) < 10 ? "0" : "") + Math.floor(entry.enclosure.duration/3600) + ":" + (Math.floor(entry.enclosure.duration/60) % 60 < 10 ? "0" : "") + Math.floor(entry.enclosure.duration/60) % 60 + ":" + (Math.floor(entry.enclosure.duration) % 60 < 10 ? "0" : "") + Math.floor(entry.enclosure.duration) % 60) : "" Layout.fillWidth: true elide: Text.ElideRight font: Kirigami.Theme.smallFont diff --git a/src/qml/EntryListPage.qml b/src/qml/EntryListPage.qml index 8dce3b4e..e180d187 100644 --- a/src/qml/EntryListPage.qml +++ b/src/qml/EntryListPage.qml @@ -79,7 +79,7 @@ Kirigami.ScrollablePage { sourceComponent: entryListDelegate } - onOriginYChanged: contentY = originY // Why is this needed? + //onOriginYChanged: contentY = originY // Why is this needed? //headerPositioning: ListView.OverlayHeader // seems broken header: Item { @@ -97,13 +97,13 @@ Kirigami.ScrollablePage { } Image { id: backgroundimage - source: page.feed.image === "" ? "rss" : "file://"+Fetcher.image(page.feed.image) + source: page.feed.image === "" ? "logo.png" : "file://"+Fetcher.image(page.feed.image) fillMode: Image.PreserveAspectCrop anchors.fill: parent asynchronous: true } - GaussianBlur { - id: blur + GaussianBlur { + id: blur anchors.fill: backgroundimage source: backgroundimage radius: 12 @@ -128,7 +128,7 @@ Kirigami.ScrollablePage { Image { id: frontimage - source: page.feed.image === "" ? "rss" : "file://"+Fetcher.image(page.feed.image) + source: page.feed.image === "" ? "logo.png" : "file://"+Fetcher.image(page.feed.image) Layout.maximumHeight: parent.size Layout.maximumWidth: parent.size asynchronous: true diff --git a/src/resources.qrc b/src/resources.qrc index 12ffb9a4..0281b82c 100755 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -14,6 +14,7 @@ qml/FooterBar.qml qml/QueuePage.qml qml/QueueDelegate.qml + ../logo.png qtquickcontrols2.conf