From 9f13465cd7ea1822689356344729674b3da07042 Mon Sep 17 00:00:00 2001 From: purian23 Date: Wed, 25 Feb 2026 14:33:09 -0500 Subject: [PATCH] feat: Add independent power action confirmation settings for dms greeter --- quickshell/Common/SettingsData.qml | 1 + quickshell/Common/settings/SettingsSpec.js | 1 + quickshell/Modules/Settings/PowerSleepTab.qml | 24 ++++++++++++++++++- .../translations/settings_search_index.json | 20 ++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/quickshell/Common/SettingsData.qml b/quickshell/Common/SettingsData.qml index d10c407f..a0743a9e 100644 --- a/quickshell/Common/SettingsData.qml +++ b/quickshell/Common/SettingsData.qml @@ -528,6 +528,7 @@ Singleton { property bool osdAudioOutputEnabled: true property bool powerActionConfirm: true + property bool powerActionConfirmGreeter: true property real powerActionHoldDuration: 0.5 property var powerMenuActions: ["reboot", "logout", "poweroff", "lock", "suspend", "restart"] property string powerMenuDefaultAction: "logout" diff --git a/quickshell/Common/settings/SettingsSpec.js b/quickshell/Common/settings/SettingsSpec.js index 0bbd3096..70143bac 100644 --- a/quickshell/Common/settings/SettingsSpec.js +++ b/quickshell/Common/settings/SettingsSpec.js @@ -351,6 +351,7 @@ var SPEC = { osdAudioOutputEnabled: { def: true }, powerActionConfirm: { def: true }, + powerActionConfirmGreeter: { def: true }, powerActionHoldDuration: { def: 0.5 }, powerMenuActions: { def: ["reboot", "logout", "poweroff", "lock", "suspend", "restart"] }, powerMenuDefaultAction: { def: "logout" }, diff --git a/quickshell/Modules/Settings/PowerSleepTab.qml b/quickshell/Modules/Settings/PowerSleepTab.qml index 7282d342..2914479d 100644 --- a/quickshell/Modules/Settings/PowerSleepTab.qml +++ b/quickshell/Modules/Settings/PowerSleepTab.qml @@ -1,4 +1,5 @@ import QtQuick +import Quickshell.Io import qs.Common import qs.Services import qs.Widgets @@ -7,6 +8,17 @@ import qs.Modules.Settings.Widgets Item { id: root + property bool greeterInstalled: false + + Process { + id: greeterCheck + command: ["sh", "-c", "command -v dms-greeter 2>/dev/null || [ -f /usr/share/quickshell/dms-greeter/shell.qml ]"] + running: false + onExited: exitCode => root.greeterInstalled = exitCode === 0 + } + + Component.onCompleted: greeterCheck.running = true + readonly property var timeoutOptions: [I18n.tr("Never"), I18n.tr("1 minute"), I18n.tr("2 minutes"), I18n.tr("3 minutes"), I18n.tr("5 minutes"), I18n.tr("10 minutes"), I18n.tr("15 minutes"), I18n.tr("20 minutes"), I18n.tr("30 minutes"), I18n.tr("1 hour"), I18n.tr("1 hour 30 minutes"), I18n.tr("2 hours"), I18n.tr("3 hours")] readonly property var timeoutValues: [0, 60, 120, 180, 300, 600, 900, 1200, 1800, 3600, 5400, 7200, 10800] @@ -475,6 +487,16 @@ Item { onToggled: checked => SettingsData.set("powerActionConfirm", checked) } + SettingsToggleRow { + settingKey: "powerActionConfirmGreeter" + tags: ["power", "confirm", "hold", "greeter", "login", "screen"] + text: I18n.tr("Hold to Confirm Power Actions on the Login Screen") + description: I18n.tr("Require holding to confirm power off, restart, suspend and hibernate on the DMS Greeter login screen") + checked: SettingsData.powerActionConfirmGreeter + visible: root.greeterInstalled + onToggled: checked => SettingsData.set("powerActionConfirmGreeter", checked) + } + SettingsDropdownRow { id: holdDurationDropdown settingKey: "powerActionHoldDuration" @@ -484,7 +506,7 @@ Item { text: I18n.tr("Hold Duration") options: durationOptions - visible: SettingsData.powerActionConfirm + visible: SettingsData.powerActionConfirm || SettingsData.powerActionConfirmGreeter Component.onCompleted: { const currentDuration = SettingsData.powerActionHoldDuration; diff --git a/quickshell/translations/settings_search_index.json b/quickshell/translations/settings_search_index.json index 62a5a349..c0d71cf2 100644 --- a/quickshell/translations/settings_search_index.json +++ b/quickshell/translations/settings_search_index.json @@ -5793,6 +5793,26 @@ ], "description": "Require holding button/key to confirm power off, restart, suspend, hibernate and logout" }, + { + "section": "powerActionConfirmGreeter", + "label": "Hold to confirm on login screen", + "tabIndex": 21, + "category": "Power & Sleep", + "keywords": [ + "confirm", + "greeter", + "hold", + "holding", + "login", + "power", + "reboot", + "restart", + "screen", + "shutdown", + "suspend" + ], + "description": "Require holding to confirm power off, restart, suspend and hibernate on the greetd login screen" + }, { "section": "idleSettings", "label": "Idle Settings",