diff --git a/dank-qml-common b/dank-qml-common index a8dc266e8..6413f857b 160000 --- a/dank-qml-common +++ b/dank-qml-common @@ -1 +1 @@ -Subproject commit a8dc266e80480eadb12794d3b4522d8e0d69ef7d +Subproject commit 6413f857ba0734a5fa33acff40d6cee9900d95e5 diff --git a/quickshell/Modules/Settings/AboutTab.qml b/quickshell/Modules/Settings/AboutTab.qml index 10e92cfeb..9a630a06f 100644 --- a/quickshell/Modules/Settings/AboutTab.qml +++ b/quickshell/Modules/Settings/AboutTab.qml @@ -116,11 +116,6 @@ Item { SettingsPage { SettingsHeroCard { - Item { - width: parent.width - height: Theme.spacingS - } - DButton { anchors.horizontalCenter: parent.horizontalCenter text: I18n.tr("Support DMS", "about page hero button, opens the Ko-fi donation page") diff --git a/quickshell/Modules/Settings/Widgets/SettingsHeroCard.qml b/quickshell/Modules/Settings/Widgets/SettingsHeroCard.qml index 41454241d..82a5ee5cd 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsHeroCard.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsHeroCard.qml @@ -1,85 +1,15 @@ import QtQuick -import QtQuick.Effects -import Quickshell.Widgets import qs.Common import qs.Services import qs.DCommon.Widgets -DCard { - id: root - - property string brand: "DMS" - property string accent: { +DHeroCard { + brand: "DMS" + accent: { const semver = ShellVersionService.semverVersion.replace(/^v/, ""); const base = semver.match(/^\d+\.\d+/); return base ? base[0] : semver || SystemUpdateService.shellRunning.replace(/^v/, ""); } - property string caption: ShellVersionService.shellCodename.toUpperCase() - default property alias extra: heroColumn.data - - width: parent?.width ?? 0 - height: heroColumn.implicitHeight + SettingsMetrics.pagePaddingV * 2 - restRadius: Theme.groupedListOuterRadius + caption: ShellVersionService.shellCodename.toUpperCase() color: SettingsMetrics.rowColor - pad: 0 - showFocusRing: false - - // Clips the image only: text inside a ClippingRectangle is drawn from a texture and blurs at fractional scales. - ClippingRectangle { - anchors.fill: parent - radius: root.bodyRadius - color: "transparent" - - Image { - anchors.fill: parent - source: "file://" + Theme.shellDir + "/assets/release-banner.svg" - fillMode: Image.Stretch - asynchronous: true - cache: false - sourceSize.width: SettingsMetrics.windowWidth - opacity: Theme.pendingOpacity - layer.enabled: true - layer.effect: MultiEffect { - colorization: 1 - colorizationColor: Theme.primary - } - } - } - - Column { - id: heroColumn - anchors.centerIn: parent - width: parent.width - SettingsMetrics.heroPadding * 2 - spacing: Theme.spacingS - - Row { - anchors.horizontalCenter: parent.horizontalCenter - spacing: Theme.spacingS - - StyledText { - id: brandText - text: root.brand - font.pixelSize: Theme.fontSizeDisplayLarge - font.weight: Theme.fontWeightBold - color: Theme.surfaceText - } - - StyledText { - text: root.accent - font: brandText.font - color: Theme.primary - } - } - - StyledText { - width: parent.width - visible: root.caption !== "" - text: root.caption - font.pixelSize: Theme.fontSizeMedium - font.weight: Theme.fontWeightMedium - color: Theme.primary - horizontalAlignment: Text.AlignHCenter - elide: Text.ElideRight - } - } } diff --git a/quickshell/assets/release-banner.svg b/quickshell/assets/release-banner.svg deleted file mode 100644 index eb84a6c38..000000000 --- a/quickshell/assets/release-banner.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -