Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-01 19:18:28 -04:00
Code Packages Releases Activity

greeter: replace commands with dms-greeter

Browse Source
This commit is contained in:
bbedward
2026-07-19 16:43:43 -04:00
parent a69acf171a
commit dfbbfe1793
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Common/settings/Processes.qml
+3 -3
View File
@@ -367,7 +367,7 @@ Singleton {
ToastService.dismissCategory("greeter-autologin-sync"); ToastService.dismissCategory("greeter-autologin-sync");
if (settingsRoot) if (settingsRoot)
settingsRoot.set("greeterSyncPending", true); settingsRoot.set("greeterSyncPending", true);
ToastService.showWarning(I18n.tr("Auto-login change needs a sync"), I18n.tr("Administrator access is required. Use the Sync button in Settings → Greeter to apply.") + (details ? "\n\n" + details : ""), "dms greeter sync --autologin", "greeter-autologin-sync"); ToastService.showWarning(I18n.tr("Auto-login change needs a sync"), I18n.tr("Administrator access is required. Use the Sync button in Settings → Greeter to apply.") + (details ? "\n\n" + details : ""), "dms-greeter sync --autologin", "greeter-autologin-sync");
finishGreeterAutoLoginSync(); finishGreeterAutoLoginSync();
} }
@@ -535,7 +535,7 @@ Singleton {
} }
property var greeterAutoLoginSyncProcess: Process { property var greeterAutoLoginSyncProcess: Process {
command: ["dms", "greeter", "sync", "--yes", "--autologin"] command: ["dms-greeter", "sync", "--yes", "--autologin"]
running: false running: false
stdout: StdioCollector { stdout: StdioCollector {
@@ -575,7 +575,7 @@ Singleton {
onExited: exitCode => { onExited: exitCode => {
const enabling = root.settingsRoot && root.settingsRoot.greeterAutoLogin; const enabling = root.settingsRoot && root.settingsRoot.greeterAutoLogin;
if (exitCode === 0) { if (exitCode === 0) {
ToastService.showWarning(enabling ? I18n.tr("Applying auto-login on startup...") : I18n.tr("Disabling auto-login on startup..."), "", "dms greeter sync --autologin", "greeter-autologin-sync"); ToastService.showWarning(enabling ? I18n.tr("Applying auto-login on startup...") : I18n.tr("Disabling auto-login on startup..."), "", "dms-greeter sync --autologin", "greeter-autologin-sync");
root.greeterAutoLoginSyncProcess.running = true; root.greeterAutoLoginSyncProcess.running = true;
return; return;
} }
quickshell/Common/settings/SettingsSpec.js
+2 -2
View File
@@ -228,8 +228,8 @@ var SPEC = {
greeterRememberLastSession: { def: true, onChange: "markGreeterSyncPending" }, greeterRememberLastSession: { def: true, onChange: "markGreeterSyncPending" },
greeterRememberLastUser: { def: true, onChange: "markGreeterSyncPending" }, greeterRememberLastUser: { def: true, onChange: "markGreeterSyncPending" },
greeterAutoLogin: { def: false, onChange: "scheduleGreeterAutoLoginSync" }, greeterAutoLogin: { def: false, onChange: "scheduleGreeterAutoLoginSync" },
greeterEnableFprint: { def: false, onChange: "scheduleAuthApply" }, greeterEnableFprint: { def: false, onChange: "markGreeterSyncPending" },
greeterEnableU2f: { def: false, onChange: "scheduleAuthApply" }, greeterEnableU2f: { def: false, onChange: "markGreeterSyncPending" },
greeterWallpaperPath: { def: "", onChange: "markGreeterSyncPending" }, greeterWallpaperPath: { def: "", onChange: "markGreeterSyncPending" },
greeterLockDateFormat: { def: "", onChange: "markGreeterSyncPending" }, greeterLockDateFormat: { def: "", onChange: "markGreeterSyncPending" },
greeterFontFamily: { def: "", onChange: "markGreeterSyncPending" }, greeterFontFamily: { def: "", onChange: "markGreeterSyncPending" },
quickshell/Modules/Settings/GreeterTab.qml
+9 -9
View File
@@ -25,7 +25,7 @@ Item {
switch (SettingsData.greeterFingerprintReason) { switch (SettingsData.greeterFingerprintReason) {
case "ready": case "ready":
return I18n.tr("Authentication changes apply automatically", "greeter auth setting description"); return I18n.tr("Applies on the next greeter sync", "greeter auth setting description");
case "missing_enrollment": case "missing_enrollment":
return I18n.tr("Fingerprint reader detected, but no prints are enrolled yet. You can enable this now and run Sync later.", "greeter fingerprint login setting"); return I18n.tr("Fingerprint reader detected, but no prints are enrolled yet. You can enable this now and run Sync later.", "greeter fingerprint login setting");
case "missing_reader": case "missing_reader":
@@ -45,7 +45,7 @@ Item {
switch (SettingsData.greeterU2fReason) { switch (SettingsData.greeterU2fReason) {
case "ready": case "ready":
return I18n.tr("Authentication changes apply automatically", "greeter auth setting description"); return I18n.tr("Applies on the next greeter sync", "greeter auth setting description");
case "missing_key_registration": case "missing_key_registration":
return I18n.tr("Security-key support was detected, but no registered key was found yet. You can enable this now and register one later.", "security key setting status"); return I18n.tr("Security-key support was detected, but no registered key was found yet. You can enable this now and register one later.", "security key setting status");
case "missing_pam_support": case "missing_pam_support":
@@ -116,7 +116,7 @@ Item {
case "install": case "install":
return ["dms", "greeter", "install", "--terminal"]; return ["dms", "greeter", "install", "--terminal"];
case "activate": case "activate":
return ["dms", "greeter", "enable", "--terminal"]; return ["dms-greeter", "enable", "--terminal"];
default: default:
return []; return [];
} }
@@ -217,7 +217,7 @@ Item {
Process { Process {
id: greeterStatusProcess id: greeterStatusProcess
command: ["dms", "greeter", "status"] command: ["dms-greeter", "status"]
running: false running: false
stdout: StdioCollector { stdout: StdioCollector {
@@ -240,7 +240,7 @@ Item {
root.greeterStatusText = root.greeterStatusText + "\n\nstderr:\n" + err; root.greeterStatusText = root.greeterStatusText + "\n\nstderr:\n" + err;
return; return;
} }
var failure = I18n.tr("Failed to run 'dms greeter status'. Ensure DMS is installed and dms is in PATH.", "greeter status error") + " (exit " + exitCode + ")"; var failure = I18n.tr("Failed to run 'dms-greeter status'. Ensure the dms-greeter package is installed.", "greeter status error") + " (exit " + exitCode + ")";
if (out !== "") if (out !== "")
failure = failure + "\n\n" + out; failure = failure + "\n\n" + out;
if (err !== "") if (err !== "")
@@ -251,7 +251,7 @@ Item {
Process { Process {
id: greeterSyncProcess id: greeterSyncProcess
command: ["dms", "greeter", "sync", "--yes"] command: ["dms-greeter", "sync", "--yes"]
running: false running: false
stdout: StdioCollector { stdout: StdioCollector {
@@ -314,7 +314,7 @@ Item {
Process { Process {
id: greeterTerminalFallbackProcess id: greeterTerminalFallbackProcess
command: ["dms", "greeter", "sync", "--terminal", "--yes"] command: ["dms-greeter", "sync", "--terminal", "--yes"]
running: false running: false
stderr: StdioCollector { stderr: StdioCollector {
@@ -329,7 +329,7 @@ Item {
SettingsData.clearGreeterSyncPending(); SettingsData.clearGreeterSyncPending();
return; return;
} }
var fallback = I18n.tr("Terminal fallback failed. Install one of the supported terminal emulators or run 'dms greeter sync' manually.") + " (exit " + exitCode + ")"; var fallback = I18n.tr("Terminal fallback failed. Install one of the supported terminal emulators or run 'dms-greeter sync' manually.") + " (exit " + exitCode + ")";
const err = (root.greeterTerminalFallbackStderr || "").trim(); const err = (root.greeterTerminalFallbackStderr || "").trim();
if (err !== "") if (err !== "")
fallback = fallback + "\n\nstderr:\n" + err; fallback = fallback + "\n\nstderr:\n" + err;
@@ -421,7 +421,7 @@ Item {
settingKey: "greeterStatus" settingKey: "greeterStatus"
StyledText { StyledText {
text: I18n.tr("Sync applies your theme and settings to the login screen. Shared users should run dms greeter sync --profile instead of a primary user sync.") text: I18n.tr("Sync applies your theme and settings to the login screen. Shared users should run dms-greeter sync --profile instead of a primary user sync.")
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
width: parent.width width: parent.width
quickshell/Modules/Settings/UsersTab.qml
+3 -3
View File
@@ -148,7 +148,7 @@ Item {
StyledText { StyledText {
width: parent.width width: parent.width
text: I18n.tr("Greeter group members can sync their login-screen theme with dms greeter sync --profile after logging out and back in.") text: I18n.tr("Greeter group members can sync their login-screen theme with dms-greeter sync --profile after logging out and back in.")
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
wrapMode: Text.Wrap wrapMode: Text.Wrap
@@ -263,7 +263,7 @@ Item {
const enableGreeter = !userRow.modelData.isGreeter; const enableGreeter = !userRow.modelData.isGreeter;
greeterToggleConfirm.showWithOptions({ greeterToggleConfirm.showWithOptions({
title: enableGreeter ? I18n.tr("Allow greeter access?") : I18n.tr("Remove greeter access?"), title: enableGreeter ? I18n.tr("Allow greeter access?") : I18n.tr("Remove greeter access?"),
message: enableGreeter ? I18n.tr("Add \"%1\" to the %2 group? They must log out and back in, then run dms greeter sync --profile to publish their login-screen theme.").arg(userRow.modelData.username).arg(UsersService.greeterGroup) : I18n.tr("Remove \"%1\" from the %2 group?").arg(userRow.modelData.username).arg(UsersService.greeterGroup), message: enableGreeter ? I18n.tr("Add \"%1\" to the %2 group? They must log out and back in, then run dms-greeter sync --profile to publish their login-screen theme.").arg(userRow.modelData.username).arg(UsersService.greeterGroup) : I18n.tr("Remove \"%1\" from the %2 group?").arg(userRow.modelData.username).arg(UsersService.greeterGroup),
confirmText: enableGreeter ? I18n.tr("Allow") : I18n.tr("Remove"), confirmText: enableGreeter ? I18n.tr("Allow") : I18n.tr("Remove"),
confirmColor: Theme.primary, confirmColor: Theme.primary,
onConfirm: () => { onConfirm: () => {
@@ -464,7 +464,7 @@ Item {
settingKey: "createUserGreeter" settingKey: "createUserGreeter"
tags: ["user", "greeter", "login", "sync"] tags: ["user", "greeter", "login", "sync"]
text: I18n.tr("Allow greeter login access") text: I18n.tr("Allow greeter login access")
description: I18n.tr("Add the new user to the %1 group so they can run dms greeter sync --profile.").arg(UsersService.greeterGroup) description: I18n.tr("Add the new user to the %1 group so they can run dms-greeter sync --profile.").arg(UsersService.greeterGroup)
checked: root.pendingGreeter checked: root.pendingGreeter
onToggled: checked => root.pendingGreeter = checked onToggled: checked => root.pendingGreeter = checked
} }