diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 32d5b39c..462b3e9c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,6 +17,17 @@ jobs: with: fetch-depth: 0 # Fetch full history for changelog generation + # Create VERSION file + - name: Create VERSION file + run: | + echo "${{ github.ref_name }}" > VERSION + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + git add VERSION + git commit -m "Add VERSION file for ${{ github.ref_name }}" + git tag -f ${{ github.ref_name }} + git push origin ${{ github.ref_name }} --force + # Generate changelog - name: Generate Changelog id: changelog diff --git a/Modules/Settings/AboutTab.qml b/Modules/Settings/AboutTab.qml index 606a51a0..7390ef8f 100644 --- a/Modules/Settings/AboutTab.qml +++ b/Modules/Settings/AboutTab.qml @@ -56,7 +56,7 @@ Item { } StyledText { - text: "DankMaterialShell" + text: SystemUpdateService.shellVersion ? `dms ${SystemUpdateService.shellVersion}` : "dms" font.pixelSize: Theme.fontSizeXLarge font.weight: Font.Bold color: Theme.surfaceText @@ -257,8 +257,8 @@ Item { } StyledText { - text: `DankMaterialShell is a modern desktop with a material-ish design. -

The goal is to provide a high level of functionality and customization so that it can be a suitable replacement for complete desktop environments like Gnome, KDE, or Cosmic. + text: `dms is a highly customizable, modern desktop shell with a material 3 inspired design. +

It is built on top of Quickshell, a QT6 framework for building desktop shells. ` textFormat: Text.RichText font.pixelSize: Theme.fontSizeMedium @@ -478,6 +478,34 @@ Item { anchors.verticalCenter: parent.verticalCenter } } + + StyledText { + text: "Dank Suite:" + font.pixelSize: Theme.fontSizeMedium + font.weight: Font.Medium + color: Theme.surfaceText + } + + Row { + spacing: 4 + + StyledText { + text: `danklinux.com` + font.pixelSize: Theme.fontSizeMedium + color: Theme.surfaceVariantText + linkColor: Theme.primary + textFormat: Text.RichText + onLinkActivated: url => Qt.openUrlExternally(url) + anchors.verticalCenter: parent.verticalCenter + + MouseArea { + anchors.fill: parent + cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.ArrowCursor + acceptedButtons: Qt.NoButton + propagateComposedEvents: true + } + } + } } } } diff --git a/Services/SystemUpdateService.qml b/Services/SystemUpdateService.qml index b71c6bd4..30aed013 100644 --- a/Services/SystemUpdateService.qml +++ b/Services/SystemUpdateService.qml @@ -17,6 +17,7 @@ Singleton { property string pkgManager: "" property string distribution: "" property bool distributionSupported: false + property string shellVersion: "" readonly property list supportedDistributions: ["arch", "cachyos", "manjaro", "endeavouros"] readonly property int updateCount: availableUpdates.length @@ -43,6 +44,23 @@ Singleton { } stdout: StdioCollector {} + + Component.onCompleted: { + versionDetection.running = true + } + } + + Process { + id: versionDetection + command: ["sh", "-c", "if [ -d .git ]; then echo \"(git) $(git rev-parse --short HEAD)\"; elif [ -f VERSION ]; then cat VERSION; fi"] + + onExited: (exitCode) => { + if (exitCode === 0) { + shellVersion = stdout.text.trim() + } + } + + stdout: StdioCollector {} } Process {