From 59747baa2beccb2cf16f2fff00f3d571515282a9 Mon Sep 17 00:00:00 2001 From: Rick Peters Date: Mon, 28 Sep 2026 10:06:32 +0200 Subject: [PATCH] fix: the app's progress screen says "Boot into desktop", not "Boot into Boot into" --- CHANGELOG.md | 3 ++- ui/qml/ApplyingScreen.qml | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69c1cb6..74e7a7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,8 @@ one per merged pull request. ## 2.7.0 - 2026-09-28 - `4f6e6fd` **feat: --defaults takes --skip and --boot gamescope|desktop, for the Steam Machine ISO's installer pages** -- **fix: HDMI-CEC enables cec-audio-control.socket (the TV remote's volume keys); existing installs get it as an update** +- `5bf9da4` **fix: HDMI-CEC enables cec-audio-control.socket (the TV remote's volume keys); existing installs get it as an update** +- **fix: the app's progress screen says "Boot into desktop", not "Boot into Boot into"** ## 2.6.0 - 2026-09-27 diff --git a/ui/qml/ApplyingScreen.qml b/ui/qml/ApplyingScreen.qml index 184e10a..56c69b6 100644 --- a/ui/qml/ApplyingScreen.qml +++ b/ui/qml/ApplyingScreen.qml @@ -37,7 +37,9 @@ Item { font.pixelSize: 13; font.weight: Font.Bold } RotationAnimator on rotation { running: step.st === "run"; from: 0; to: 360; duration: 1000; loops: Animation.Infinite } } Row { width: 380; anchors.verticalCenter: parent.verticalCenter; spacing: 10 - Text { text: (Texts.actions[step.modelData.action] || [])[3] + Texts.label(step.modelData.id) + // Boot into's label is its prefix already: "Boot into desktop", not "Boot into Boot into". + Text { text: step.modelData.id === "boot" ? (Texts.actions[step.modelData.action] || [])[3] + Texts.actions[step.modelData.action][0].toLowerCase() + : (Texts.actions[step.modelData.action] || [])[3] + Texts.label(step.modelData.id) color: step.st === "wait" ? Theme.faint : Theme.textHi; font.family: Theme.body; font.pixelSize: 16; font.weight: Font.DemiBold anchors.verticalCenter: parent.verticalCenter; elide: Text.ElideRight width: Math.min(implicitWidth, parent.width - (badge.visible ? badge.width + parent.spacing : 0)) }