diff --git a/quickshell/Common/SettingsData.qml b/quickshell/Common/SettingsData.qml index a0743a9e..d10c407f 100644 --- a/quickshell/Common/SettingsData.qml +++ b/quickshell/Common/SettingsData.qml @@ -528,7 +528,6 @@ 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 70143bac..0bbd3096 100644 --- a/quickshell/Common/settings/SettingsSpec.js +++ b/quickshell/Common/settings/SettingsSpec.js @@ -351,7 +351,6 @@ 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 2914479d..7282d342 100644 --- a/quickshell/Modules/Settings/PowerSleepTab.qml +++ b/quickshell/Modules/Settings/PowerSleepTab.qml @@ -1,5 +1,4 @@ import QtQuick -import Quickshell.Io import qs.Common import qs.Services import qs.Widgets @@ -8,17 +7,6 @@ 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] @@ -487,16 +475,6 @@ 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" @@ -506,7 +484,7 @@ Item { text: I18n.tr("Hold Duration") options: durationOptions - visible: SettingsData.powerActionConfirm || SettingsData.powerActionConfirmGreeter + visible: SettingsData.powerActionConfirm Component.onCompleted: { const currentDuration = SettingsData.powerActionHoldDuration; diff --git a/quickshell/translations/settings_search_index.json b/quickshell/translations/settings_search_index.json index c0d71cf2..62a5a349 100644 --- a/quickshell/translations/settings_search_index.json +++ b/quickshell/translations/settings_search_index.json @@ -5793,26 +5793,6 @@ ], "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",