From eae2bf14763ddb791e9d8fba34c5adc91f002adc Mon Sep 17 00:00:00 2001 From: lysec Date: Fri, 17 Oct 2025 13:33:31 +0200 Subject: [PATCH] IdleInhibitor: initialize at startup, remove persistent setting (#505) --- Assets/settings-default.json | 1 - Commons/Settings.qml | 1 - Services/IdleInhibitorService.qml | 16 ++++------------ shell.qml | 1 + 4 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Assets/settings-default.json b/Assets/settings-default.json index dbb018400..ce680d75c 100644 --- a/Assets/settings-default.json +++ b/Assets/settings-default.json @@ -207,7 +207,6 @@ "fontFixed": "DejaVu Sans Mono", "fontDefaultScale": 1, "fontFixedScale": 1, - "idleInhibitorEnabled": false, "tooltipsEnabled": true }, "brightness": { diff --git a/Commons/Settings.qml b/Commons/Settings.qml index 0c5fb9c60..1f925537f 100644 --- a/Commons/Settings.qml +++ b/Commons/Settings.qml @@ -342,7 +342,6 @@ Singleton { property string fontFixed: "DejaVu Sans Mono" property real fontDefaultScale: 1.0 property real fontFixedScale: 1.0 - property bool idleInhibitorEnabled: false property bool tooltipsEnabled: true } diff --git a/Services/IdleInhibitorService.qml b/Services/IdleInhibitorService.qml index 964430c8b..ab20dd947 100644 --- a/Services/IdleInhibitorService.qml +++ b/Services/IdleInhibitorService.qml @@ -16,15 +16,9 @@ Singleton { // Different inhibitor strategies property string strategy: "systemd" // "systemd", "wayland", or "auto" - Component.onCompleted: { - Logger.i("IdleInhibitor", "Service started") + function init() { + Logger.d("IdleInhibitor", "Service started") detectStrategy() - - // Restore previous state from settings - if (Settings.data.ui.idleInhibitorEnabled) { - addInhibitor("manual", "Restored from previous session") - Logger.d("IdleInhibitor", "Restored previous manual inhibition state") - } } // Auto-detect the best strategy @@ -162,15 +156,13 @@ Singleton { function manualToggle() { if (activeInhibitors.includes("manual")) { removeInhibitor("manual") - Settings.data.ui.idleInhibitorEnabled = false ToastService.showNotice(I18n.tr("tooltips.keep-awake"), I18n.tr("toast.keep-awake.disabled")) - Logger.i("IdleInhibitor", "Manual inhibition disabled and saved to settings") + Logger.i("IdleInhibitor", "Manual inhibition disabled") return false } else { addInhibitor("manual", "Manually activated by user") - Settings.data.ui.idleInhibitorEnabled = true ToastService.showNotice(I18n.tr("tooltips.keep-awake"), I18n.tr("toast.keep-awake.enabled")) - Logger.i("IdleInhibitor", "Manual inhibition enabled and saved to settings") + Logger.i("IdleInhibitor", "Manual inhibition enabled (will reset on next session)") return true } } diff --git a/shell.qml b/shell.qml index e4645fbe7..26022135d 100644 --- a/shell.qml +++ b/shell.qml @@ -90,6 +90,7 @@ ShellRoot { HooksService.init() BluetoothService.init() BatteryService.init() + IdleInhibitorService.init() } Background {}