mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-08-07 05:58:28 -04:00
greeter: more repairs for standalone package, scrap LegacyNetworkService
This commit is contained in:
@@ -137,6 +137,10 @@ TAB_INDEX_MAP = {
|
||||
"BatteryTab.qml": 42,
|
||||
}
|
||||
|
||||
FILE_CONDITION_MAP = {
|
||||
"GreeterTab.qml": "greeterAvailable",
|
||||
}
|
||||
|
||||
TAB_CATEGORY_MAP = {
|
||||
0: "Personalization",
|
||||
1: "Time & Weather",
|
||||
@@ -385,7 +389,7 @@ def find_settings_components(content, filename, wrappers):
|
||||
description = extract_i18n_string(desc_raw)
|
||||
|
||||
visible_raw = extract_property(block, "visible")
|
||||
condition_key = None
|
||||
condition_key = FILE_CONDITION_MAP.get(filename)
|
||||
if visible_raw:
|
||||
if "CompositorService.isNiri" in visible_raw:
|
||||
condition_key = "isNiri"
|
||||
@@ -399,8 +403,8 @@ def find_settings_components(content, filename, wrappers):
|
||||
condition_key = "soundsAvailable"
|
||||
elif "CupsService.cupsAvailable" in visible_raw:
|
||||
condition_key = "cupsAvailable"
|
||||
elif "NetworkService.usingLegacy" in visible_raw:
|
||||
condition_key = "networkNotLegacy"
|
||||
elif "NetworkService.networkAvailable" in visible_raw:
|
||||
condition_key = "networkAvailable"
|
||||
elif "DMSService.isConnected" in visible_raw:
|
||||
condition_key = "dmsConnected"
|
||||
elif "Theme.matugenAvailable" in visible_raw:
|
||||
@@ -455,6 +459,7 @@ def parse_tabs_from_sidebar(sidebar_file):
|
||||
("shortcutsOnly", "keybindsAvailable"),
|
||||
("soundsOnly", "soundsAvailable"),
|
||||
("cupsOnly", "cupsAvailable"),
|
||||
("greeterOnly", "greeterAvailable"),
|
||||
("dmsOnly", "dmsConnected"),
|
||||
("hyprlandNiriOnly", "isHyprlandOrNiri"),
|
||||
("clipboardOnly", "dmsConnected"),
|
||||
|
||||
@@ -7789,7 +7789,8 @@
|
||||
"typography"
|
||||
],
|
||||
"icon": "palette",
|
||||
"description": "Font used on the login screen"
|
||||
"description": "Font used on the login screen",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterAuth",
|
||||
@@ -7813,7 +7814,8 @@
|
||||
"write"
|
||||
],
|
||||
"icon": "fingerprint",
|
||||
"description": "DMS removes its managed block from /etc/pam.d/greetd and stops write services"
|
||||
"description": "DMS removes its managed block from /etc/pam.d/greetd and stops write services",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterAutoLogin",
|
||||
@@ -7846,7 +7848,8 @@
|
||||
"unlock",
|
||||
"until"
|
||||
],
|
||||
"description": "Skip the greeter password after boot until you sign out. Lock screen unlock is unchanged. Takes effect on the next reboot after sync."
|
||||
"description": "Skip the greeter password after boot until you sign out. Lock screen unlock is unchanged. Takes effect on the next reboot after sync.",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterBehavior",
|
||||
@@ -7865,7 +7868,8 @@
|
||||
"session"
|
||||
],
|
||||
"icon": "history",
|
||||
"description": "Pre-select the last used session on the greeter"
|
||||
"description": "Pre-select the last used session on the greeter",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterLockDateFormat",
|
||||
@@ -7881,7 +7885,8 @@
|
||||
"login",
|
||||
"screen"
|
||||
],
|
||||
"description": "Format the date on the login screen"
|
||||
"description": "Format the date on the login screen",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterDeps",
|
||||
@@ -7896,7 +7901,8 @@
|
||||
"greeter",
|
||||
"login"
|
||||
],
|
||||
"icon": "extension"
|
||||
"icon": "extension",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterEnableFprint",
|
||||
@@ -7912,7 +7918,8 @@
|
||||
"greetd",
|
||||
"greeter",
|
||||
"login"
|
||||
]
|
||||
],
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterEnableU2f",
|
||||
@@ -7929,7 +7936,8 @@
|
||||
"login",
|
||||
"security",
|
||||
"u2f"
|
||||
]
|
||||
],
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "_tab_31",
|
||||
@@ -7942,7 +7950,8 @@
|
||||
"greeter",
|
||||
"login"
|
||||
],
|
||||
"icon": "login"
|
||||
"icon": "login",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterFontFamily",
|
||||
@@ -7958,7 +7967,8 @@
|
||||
"screen",
|
||||
"typography"
|
||||
],
|
||||
"description": "Font used on the login screen"
|
||||
"description": "Font used on the login screen",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterRememberLastSession",
|
||||
@@ -7975,7 +7985,8 @@
|
||||
"select",
|
||||
"session"
|
||||
],
|
||||
"description": "Pre-select the last used session on the greeter"
|
||||
"description": "Pre-select the last used session on the greeter",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterRememberLastUser",
|
||||
@@ -7994,7 +8005,8 @@
|
||||
"user",
|
||||
"username"
|
||||
],
|
||||
"description": "Pre-fill the last successful username on the greeter"
|
||||
"description": "Pre-fill the last successful username on the greeter",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterStatus",
|
||||
@@ -8008,7 +8020,8 @@
|
||||
"login",
|
||||
"status"
|
||||
],
|
||||
"icon": "info"
|
||||
"icon": "info",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "greeterPamExternallyManaged",
|
||||
@@ -8032,7 +8045,8 @@
|
||||
"system",
|
||||
"write"
|
||||
],
|
||||
"description": "DMS removes its managed block from /etc/pam.d/greetd and stops write services"
|
||||
"description": "DMS removes its managed block from /etc/pam.d/greetd and stops write services",
|
||||
"conditionKey": "greeterAvailable"
|
||||
},
|
||||
{
|
||||
"section": "muxType",
|
||||
@@ -8588,7 +8602,7 @@
|
||||
"user",
|
||||
"users"
|
||||
],
|
||||
"description": "Add the new user to the %1 group so they can run dms greeter sync --profile."
|
||||
"description": "Add the new user to the %1 group so they can run dms-greeter sync --profile."
|
||||
},
|
||||
{
|
||||
"section": "createUser",
|
||||
|
||||
Reference in New Issue
Block a user