From 4b601bb19674abb35fdba14a6fbc6e54510a5cad Mon Sep 17 00:00:00 2001 From: rickpeters Date: Thu, 15 Oct 2026 20:56:26 +0200 Subject: [PATCH] App: a run that only needs a new GNOME login ends with a countdown and logs in again by itself --- CHANGELOG.md | 1 + ui/qml/DoneScreen.qml | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index badde38..28660cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ one per merged pull request. - **feat: after the GNOME theme is applied in a GNOME session, the app's done screen has "Restart GNOME" (GNOME Shell on Wayland can't restart in place, and the dock, extensions and Settings panel only show after a new login): with GDM autologin (the SteamOS conversion) Steamify's relogin helper logs the user straight back into the session they were in (without changing the session gaming mode's boot goes back to), else it is a plain logout (`gnome-session-quit`)** - **fix: the app on a desktop (a window, however large, also fullscreen) keeps the desktop's own scale instead of blowing its 1280x720 layout up to the screen's height (twice as big on a 1440p or ultrawide monitor): the layout fills the window at the scale of GNOME or KDE, and only a window smaller than 1280x720 shrinks it. The TV mode (`--fullscreen`, gamescope) still scales to the screen** - **fix: in the app a click on a row only selects it (a second click on the selected row used to flip it, so a click on a switch needed two); a click on the switch itself, or on the BIOS update button, acts at once and selects the row too** +- **feat: a run that only needs a new GNOME login (the theme, no reboot) ends with a countdown on the done screen ("Restarting GNOME in 10 s", with Restart GNOME now and Cancel) and then logs in again by itself, the counterpart of KDE restarting plasmashell (GNOME Shell on Wayland is the compositor too and can't restart in place). A run that needs a reboot keeps "Restart now" (it loads GNOME fresh): before, the Restart GNOME button was hidden then, and nothing started by itself** ## 2.12.0 - 2026-10-13 diff --git a/ui/qml/DoneScreen.qml b/ui/qml/DoneScreen.qml index 2e2cbd0..8b5e7f9 100644 --- a/ui/qml/DoneScreen.qml +++ b/ui/qml/DoneScreen.qml @@ -7,10 +7,24 @@ import QtQuick.Controls.Basic Item { required property AppState app readonly property bool problem: app.failed.length > 0 || app.runError !== "" + // GNOME Shell on Wayland can't restart in place (it is the compositor too), so what a KDE run does for plasmashell is a + // new login here: started by itself after a countdown, unless the run needs a reboot anyway (which does the same). + readonly property bool relogin: app.reloginNeeded && !app.restartNeeded && !problem + property int countdown: 10 + property bool cancelled: false + property bool fired: false + readonly property bool counting: relogin && !cancelled && !fired + onVisibleChanged: if (visible) { countdown = 10; cancelled = false; fired = false; } + function reloginNow() { fired = true; app.backend.restartGnome(); } + Timer { + interval: 1000; repeat: true; running: parent.visible && parent.counting + onTriggered: { parent.countdown -= 1; if (parent.countdown <= 0) parent.reloginNow(); } + } readonly property string message: { if (app.runError) return app.runError; if (!app.biosRun) return app.plan.length + (app.plan.length === 1 ? " change" : " changes") + " applied." + (app.restartNeeded ? " Some take effect after a restart." : "") - + (app.reloginNeeded && !app.restartNeeded ? " GNOME shows the dock, extensions and Settings panel after you log in again: Restart GNOME does that." : ""); + + (counting ? " Restarting GNOME in " + countdown + " s, so it loads the new dock, extensions and Settings panel." + : (relogin ? " GNOME shows the dock, extensions and Settings panel after you log in again." : "")); if (app.failed.length) return "The BIOS was not changed."; return (app.bios && app.bios.dryRun ? "Dry run: nothing was flashed. " : "BIOS " + (app.biosInfo.newest || "") + " is staged and is written during the restart. ") + "Keep the power on and don't touch the machine until it has fully started again, even if the screen stays black."; @@ -35,6 +49,7 @@ Item { Row { anchors.horizontalCenter: parent.horizontalCenter; spacing: 14; topPadding: 8 Btn { k: Input.g.back; text: "Back to the menu"; height: 52; onClicked: app.act("back") } Btn { visible: app.restartNeeded; k: Input.g.ok; text: "Restart now"; primary: true; height: 52; onClicked: app.backend.restart() } - Btn { visible: app.reloginNeeded && !app.restartNeeded; k: Input.g.ok; text: "Restart GNOME"; primary: true; height: 52; onClicked: app.backend.restartGnome() } } + Btn { visible: relogin; k: Input.g.ok; text: counting ? "Restart GNOME now" : "Restart GNOME"; primary: true; height: 52; onClicked: reloginNow() } + Btn { visible: counting; text: "Cancel"; height: 52; onClicked: cancelled = true } } } }