From 114239072475632994c4e15b68a1f5fba4c7b2ff Mon Sep 17 00:00:00 2001 From: bbedward Date: Mon, 28 Sep 2026 14:38:43 -0400 Subject: [PATCH] settings: add + item name on every creation fab settings: stop repeating the page title as the first card label translations: index untitled cards by their page, not a nested row fixes #3604 fixes #3609 --- quickshell/Common/SettingsTabs.qml | 2 +- quickshell/Modules/Settings/AboutTab.qml | 1 - quickshell/Modules/Settings/CreateUserTab.qml | 3 +- quickshell/Modules/Settings/DankDotTab.qml | 3 +- .../Modules/Settings/DockWidgetsTab.qml | 1 - .../Modules/Settings/GreeterAuthTab.qml | 1 - .../Modules/Settings/KeybindEditorDialog.qml | 2 +- quickshell/Modules/Settings/KeybindsTab.qml | 2 +- quickshell/Modules/Settings/NetworkVpnTab.qml | 2 +- .../Modules/Settings/NotificationRulesTab.qml | 4 +- .../Modules/Settings/PaletteInjectTab.qml | 3 +- quickshell/Modules/Settings/PrinterTab.qml | 2 +- .../Modules/Settings/RunningAppsTab.qml | 2 +- quickshell/Modules/Settings/UsersTab.qml | 2 +- .../Modules/Settings/WeatherSettingsTab.qml | 2 +- .../Modules/Settings/WindowRulesTab.qml | 1 - .../translations/extract_settings_index.py | 28 +- .../translations/settings_search_index.json | 743 +++++++----------- 18 files changed, 302 insertions(+), 502 deletions(-) diff --git a/quickshell/Common/SettingsTabs.qml b/quickshell/Common/SettingsTabs.qml index d0e41a4d9..3006891cb 100644 --- a/quickshell/Common/SettingsTabs.qml +++ b/quickshell/Common/SettingsTabs.qml @@ -428,7 +428,7 @@ Singleton { { "id": "user_create", "hidden": true, - "text": I18n.tr("Create user"), + "text": I18n.tr("Add user"), "icon": "person_add", "tabIndex": 61 } diff --git a/quickshell/Modules/Settings/AboutTab.qml b/quickshell/Modules/Settings/AboutTab.qml index 6c9b04079..36734d65d 100644 --- a/quickshell/Modules/Settings/AboutTab.qml +++ b/quickshell/Modules/Settings/AboutTab.qml @@ -422,7 +422,6 @@ Item { SettingsCard { width: parent.width iconName: "info" - title: I18n.tr("About") SettingsRow { body: StyledText { diff --git a/quickshell/Modules/Settings/CreateUserTab.qml b/quickshell/Modules/Settings/CreateUserTab.qml index b6ffc97c9..b225d2a20 100644 --- a/quickshell/Modules/Settings/CreateUserTab.qml +++ b/quickshell/Modules/Settings/CreateUserTab.qml @@ -62,7 +62,6 @@ Item { SettingsCard { width: parent.width iconName: "person_add" - title: I18n.tr("Create user") settingKey: "createUser" visible: PolkitService.polkitAvailable @@ -179,7 +178,7 @@ Item { spacing: Theme.spacingM DankButton { - text: root.operationPending ? I18n.tr("Working...", "create user button text while the operation runs") : I18n.tr("Create user") + text: root.operationPending ? I18n.tr("Working...", "create user button text while the operation runs") : I18n.tr("Add user") iconName: "person_add" backgroundColor: Theme.primary textColor: Theme.primaryText diff --git a/quickshell/Modules/Settings/DankDotTab.qml b/quickshell/Modules/Settings/DankDotTab.qml index 8e083ccb6..b519f7a10 100644 --- a/quickshell/Modules/Settings/DankDotTab.qml +++ b/quickshell/Modules/Settings/DankDotTab.qml @@ -12,7 +12,6 @@ Item { readonly property var paletteValues: ["default", "bright", "dim"] - readonly property IslandSettingsStore dot: IslandSettingsStore { barId: SettingsData.dotBarConfig?.id ?? "" } @@ -22,7 +21,7 @@ Item { settingKey: "dotSize" tags: ["dot", "dankdot", "size", "diameter", "idle", "fade"] iconName: "blur_on" - title: I18n.tr("Dot", "bar layout: free-floating dot that opens island activities") + title: I18n.tr("General") SettingsSliderRow { settingKey: "islandFreeSize" diff --git a/quickshell/Modules/Settings/DockWidgetsTab.qml b/quickshell/Modules/Settings/DockWidgetsTab.qml index b1ea32a13..34e93ef90 100644 --- a/quickshell/Modules/Settings/DockWidgetsTab.qml +++ b/quickshell/Modules/Settings/DockWidgetsTab.qml @@ -148,7 +148,6 @@ Item { width: parent.width visible: dock.hasConfig iconName: "widgets" - title: I18n.tr("Apps & widgets") settingKey: "dockWidgets" tags: ["dock", "widgets", "apps", "add", "remove", "order"] diff --git a/quickshell/Modules/Settings/GreeterAuthTab.qml b/quickshell/Modules/Settings/GreeterAuthTab.qml index b09fe534a..a124baa99 100644 --- a/quickshell/Modules/Settings/GreeterAuthTab.qml +++ b/quickshell/Modules/Settings/GreeterAuthTab.qml @@ -65,7 +65,6 @@ Item { SettingsCard { width: parent.width iconName: "fingerprint" - title: I18n.tr("Authentication") settingKey: "greeterAuth" SettingsToggleRow { diff --git a/quickshell/Modules/Settings/KeybindEditorDialog.qml b/quickshell/Modules/Settings/KeybindEditorDialog.qml index 6e138558c..504a2e9d5 100644 --- a/quickshell/Modules/Settings/KeybindEditorDialog.qml +++ b/quickshell/Modules/Settings/KeybindEditorDialog.qml @@ -83,7 +83,7 @@ DankDialog { opened: false maximumWidth: SettingsMetrics.formDialogWidth surfaceColor: Theme.hostSurface - title: isNew ? I18n.tr("New shortcut") : I18n.tr("Edit shortcut", "keybind editor dialog title") + title: isNew ? I18n.tr("Add shortcut") : I18n.tr("Edit shortcut", "keybind editor dialog title") closeEnabled: !busy acceptEnabled: canSubmit onAccepted: save() diff --git a/quickshell/Modules/Settings/KeybindsTab.qml b/quickshell/Modules/Settings/KeybindsTab.qml index a8b771f3a..013e77a97 100644 --- a/quickshell/Modules/Settings/KeybindsTab.qml +++ b/quickshell/Modules/Settings/KeybindsTab.qml @@ -785,7 +785,7 @@ Item { shown: !KeybindsService.readOnly DankFab { - text: I18n.tr("New shortcut") + text: I18n.tr("Add shortcut") iconName: "add" onClicked: keybindsTab.openNewEditor() } diff --git a/quickshell/Modules/Settings/NetworkVpnTab.qml b/quickshell/Modules/Settings/NetworkVpnTab.qml index f2132eab8..e45c25347 100644 --- a/quickshell/Modules/Settings/NetworkVpnTab.qml +++ b/quickshell/Modules/Settings/NetworkVpnTab.qml @@ -457,7 +457,7 @@ Item { shown: DMSNetworkService.vpnAvailable DankFab { - text: I18n.tr("Import") + text: I18n.tr("Import VPN") iconName: "add" busy: VPNService.importing enabled: !VPNService.importing diff --git a/quickshell/Modules/Settings/NotificationRulesTab.qml b/quickshell/Modules/Settings/NotificationRulesTab.qml index a6fcd058e..f02520dd5 100644 --- a/quickshell/Modules/Settings/NotificationRulesTab.qml +++ b/quickshell/Modules/Settings/NotificationRulesTab.qml @@ -115,7 +115,7 @@ Item { id: notificationRulesCard width: parent.width iconName: "rule_settings" - title: I18n.tr("Rules", "noun, notification rules settings section title") + title: I18n.tr("Notification rules") settingKey: "notificationRules" tags: ["notification", "rules", "mute", "ignore", "priority", "regex", "history"] @@ -446,8 +446,8 @@ Item { SettingsFabBar { DankFab { + text: I18n.tr("Add rule") iconName: "add" - Accessible.name: I18n.tr("Add") onClicked: SettingsData.addNotificationRule() } } diff --git a/quickshell/Modules/Settings/PaletteInjectTab.qml b/quickshell/Modules/Settings/PaletteInjectTab.qml index cca9ccec9..be35d3236 100644 --- a/quickshell/Modules/Settings/PaletteInjectTab.qml +++ b/quickshell/Modules/Settings/PaletteInjectTab.qml @@ -18,7 +18,6 @@ Item { SettingsCard { width: parent.width iconName: "colorize" - title: I18n.tr("Injected palettes") settingKey: "paletteInject" tags: ["palette", "matugen", "inject", "namespace", "command", "template", "color"] visible: Theme.matugenAvailable @@ -176,8 +175,8 @@ Item { shown: Theme.matugenAvailable DankFab { + text: I18n.tr("Add palette") iconName: "add" - Accessible.name: I18n.tr("Add") onClicked: PaletteInjectService.addPalette() } } diff --git a/quickshell/Modules/Settings/PrinterTab.qml b/quickshell/Modules/Settings/PrinterTab.qml index 89134f6ed..3bd098a39 100644 --- a/quickshell/Modules/Settings/PrinterTab.qml +++ b/quickshell/Modules/Settings/PrinterTab.qml @@ -422,7 +422,7 @@ Item { SettingsCard { width: parent.width iconName: "print" - title: I18n.tr("Printers") + title: I18n.tr("Installed") visible: CupsService.cupsAvailable headerActions: [ diff --git a/quickshell/Modules/Settings/RunningAppsTab.qml b/quickshell/Modules/Settings/RunningAppsTab.qml index f9a4d1c5c..418bf7225 100644 --- a/quickshell/Modules/Settings/RunningAppsTab.qml +++ b/quickshell/Modules/Settings/RunningAppsTab.qml @@ -73,8 +73,8 @@ Item { SettingsFabBar { DankFab { + text: I18n.tr("Add substitution") iconName: "add" - Accessible.name: I18n.tr("Add") onClicked: SettingsData.addAppIdSubstitution("", "", "exact") } } diff --git a/quickshell/Modules/Settings/UsersTab.qml b/quickshell/Modules/Settings/UsersTab.qml index c39a6289c..0e09c19af 100644 --- a/quickshell/Modules/Settings/UsersTab.qml +++ b/quickshell/Modules/Settings/UsersTab.qml @@ -190,7 +190,7 @@ Item { shown: PolkitService.polkitAvailable DankFab { - text: I18n.tr("Create user") + text: I18n.tr("Add user") iconName: "person_add" onClicked: root.parentModal?.navigateTo("user_create") } diff --git a/quickshell/Modules/Settings/WeatherSettingsTab.qml b/quickshell/Modules/Settings/WeatherSettingsTab.qml index 9d7c0701f..37ed55916 100644 --- a/quickshell/Modules/Settings/WeatherSettingsTab.qml +++ b/quickshell/Modules/Settings/WeatherSettingsTab.qml @@ -19,7 +19,7 @@ Item { SettingsPage { SettingsCard { - title: I18n.tr("Weather") + title: I18n.tr("General") tab: "weather" settingKey: "weather" diff --git a/quickshell/Modules/Settings/WindowRulesTab.qml b/quickshell/Modules/Settings/WindowRulesTab.qml index 530b2f4e8..60692f972 100644 --- a/quickshell/Modules/Settings/WindowRulesTab.qml +++ b/quickshell/Modules/Settings/WindowRulesTab.qml @@ -305,7 +305,6 @@ Item { id: headerSection width: parent.width iconName: "select_window" - title: I18n.tr("Window rules") SettingsRow { subtitle: I18n.tr("Define rules for window behavior. Saves to %1", "window rules settings description, %1 is a config file name").arg(root.dmsRulesFileName) diff --git a/quickshell/translations/extract_settings_index.py b/quickshell/translations/extract_settings_index.py index 7dd8c7303..74f14ba18 100644 --- a/quickshell/translations/extract_settings_index.py +++ b/quickshell/translations/extract_settings_index.py @@ -318,6 +318,26 @@ def extract_property(block, prop_name): return None +def own_scope(block): + """The block with every nested component body removed, so a card without a title does not borrow one from its rows.""" + depth = 0 + kept = [] + for char in block: + if char == "{": + depth += 1 + if depth <= 1: + kept.append(char) + continue + if char == "}": + depth -= 1 + if depth <= 0: + kept.append(char) + continue + if depth <= 1: + kept.append(char) + return "".join(kept) + + def load_wrapper_components(root_dir): widgets_dir = Path(root_dir) / "Modules" / "Settings" / "Widgets" wrappers = {} @@ -400,13 +420,17 @@ def find_settings_components(content, filename, wrappers, tab_meta, hub_meta): tab_index = file_tab_index - title_raw = extract_property(block, "title") or defaults.get("title") - text_raw = extract_property(block, "text") or defaults.get("text") + own = own_scope(block) + title_raw = extract_property(own, "title") or defaults.get("title") + text_raw = extract_property(own, "text") or defaults.get("text") label = None if title_raw: label = extract_i18n_string(title_raw) if not label and text_raw: label = extract_i18n_string(text_raw) + if not label and component == "SettingsCard": + page_label = hub_meta.get(file_page) if file_page else tab_meta.get(file_tab_index, TAB_META_DEFAULT) + label = page_label[0] if not label: continue diff --git a/quickshell/translations/settings_search_index.json b/quickshell/translations/settings_search_index.json index d56ab9927..4157ce2f4 100644 --- a/quickshell/translations/settings_search_index.json +++ b/quickshell/translations/settings_search_index.json @@ -309,6 +309,27 @@ "icon": "toolbar", "description": "Layout, position, appearance" }, + { + "section": "barLayout", + "label": "Bar", + "tabIndex": -1, + "category": "Bar", + "keywords": [ + "bar", + "frame", + "island", + "layout", + "mode", + "name", + "panel", + "rename", + "standard", + "statusbar", + "taskbar", + "topbar" + ], + "page": "dankbar" + }, { "section": "barConfigurations", "label": "Bars", @@ -719,35 +740,6 @@ ], "page": "personalization" }, - { - "section": "colorMode", - "label": "Dark mode", - "tabIndex": -1, - "category": "Wallpaper & colors", - "keywords": [ - "background", - "bg", - "color", - "colors", - "colour", - "colours", - "dark", - "dark mode", - "desktop", - "hue", - "image", - "light", - "mode", - "night", - "palette", - "picture", - "theme", - "tint", - "wallpaper" - ], - "page": "personalization", - "icon": "schedule" - }, { "section": "themeScheduleNav", "label": "Dark mode", @@ -1369,24 +1361,6 @@ ], "page": "notifications" }, - { - "section": "pluginsIncompatible", - "label": "Incompatible plugins loaded", - "tabIndex": -1, - "category": "Plugins", - "keywords": [ - "addon", - "addons", - "extend", - "extensions", - "incompatible", - "loaded", - "plugins", - "widgets" - ], - "page": "plugins", - "icon": "error" - }, { "section": "_hub_input", "label": "Input", @@ -1648,6 +1622,23 @@ ], "page": "notifications" }, + { + "section": "notificationLinks", + "label": "Notifications", + "tabIndex": -1, + "category": "Notifications", + "keywords": [ + "alert", + "alerts", + "messages", + "notif", + "notifications", + "notifs", + "toast" + ], + "page": "notifications", + "icon": "rule_settings" + }, { "section": "floatingWindowTransparency", "label": "Opacity", @@ -1745,7 +1736,7 @@ }, { "section": "pluginManagerUnavailable", - "label": "Plugin manager unavailable", + "label": "Plugins", "tabIndex": -1, "category": "Plugins", "keywords": [ @@ -1753,15 +1744,28 @@ "addons", "extend", "extensions", - "manager", - "plugin", "plugins", - "unavailable", "widgets" ], "page": "plugins", "icon": "warning" }, + { + "section": "pluginsIncompatible", + "label": "Plugins", + "tabIndex": -1, + "category": "Plugins", + "keywords": [ + "addon", + "addons", + "extend", + "extensions", + "plugins", + "widgets" + ], + "page": "plugins", + "icon": "error" + }, { "section": "notificationPopups", "label": "Popups", @@ -1928,24 +1932,6 @@ ], "page": "notifications" }, - { - "section": "notificationLinks", - "label": "Rules", - "tabIndex": -1, - "category": "Notifications", - "keywords": [ - "alert", - "alerts", - "messages", - "notif", - "notifications", - "notifs", - "rules", - "toast" - ], - "page": "notifications", - "icon": "rule_settings" - }, { "section": "_hub_security_accounts", "label": "Security", @@ -2786,36 +2772,9 @@ "parentLabel": "Date, time & region", "icon": "schedule" }, - { - "section": "_tab_1", - "label": "Time & weather", - "tabIndex": 1, - "category": "Time & weather", - "keywords": [ - "calendar", - "climate", - "clock", - "date", - "date,", - "day", - "forecast", - "format", - "location", - "month", - "region", - "temperature", - "time", - "watch", - "weather", - "year" - ], - "icon": "schedule", - "parentLabel": "Date, time & region", - "description": "Clock format, calendar, weather location" - }, { "section": "weather", - "label": "Weather", + "label": "Time & weather", "tabIndex": 1, "category": "Time & weather", "keywords": [ @@ -5529,47 +5488,22 @@ }, { "section": "networkStatus", - "label": "Backend", - "tabIndex": 7, - "category": "Status", - "keywords": [ - "backend", - "connection", - "connectivity", - "ethernet", - "internet", - "network", - "online", - "status", - "wi-fi", - "wifi", - "wireless" - ], - "parentLabel": "Network", - "conditionKey": "networkAvailable" - }, - { - "section": "_tab_7", "label": "Status", "tabIndex": 7, "category": "Status", "keywords": [ - "backend", "connection", "connectivity", "ethernet", "internet", "network", "online", - "preference", "status", "wi-fi", "wifi", "wireless" ], - "icon": "lan", "parentLabel": "Network", - "description": "Backend and connection preference", "conditionKey": "networkAvailable" }, { @@ -7985,29 +7919,21 @@ "conditionKey": "soundsAvailable" }, { - "section": "_tab_15", + "section": "systemSounds", "label": "Sounds", "tabIndex": 15, "category": "Sounds", "keywords": [ - "appearance", "audio", - "colors", - "colour", "effects", - "events", - "look", "media", + "notification", "sfx", "sound", "sounds", - "style", - "system", - "theme" + "volume" ], - "icon": "volume_up", "parentLabel": "Sound & media", - "description": "System sound theme and events", "conditionKey": "soundsAvailable" }, { @@ -8028,25 +7954,6 @@ "parentLabel": "Sound & media", "conditionKey": "soundsAvailable" }, - { - "section": "systemSounds", - "label": "System sounds", - "tabIndex": 15, - "category": "Sounds", - "keywords": [ - "audio", - "effects", - "media", - "notification", - "sfx", - "sound", - "sounds", - "system", - "volume" - ], - "parentLabel": "Sound & media", - "conditionKey": "soundsAvailable" - }, { "section": "soundVolumeChanged", "label": "Volume changed", @@ -8489,43 +8396,15 @@ ] }, { - "section": "_tab_18", + "section": "osd", "label": "On-screen displays", "tabIndex": 18, "category": "On-screen displays", - "keywords": [ - "audio", - "backlight", - "bright", - "brightness", - "caps", - "dim", - "displays", - "indicator", - "lock", - "loudness", - "osd", - "popup", - "position", - "screen", - "sound", - "speaker", - "volume" - ], - "icon": "picture_in_picture", - "description": "Volume, brightness, caps lock, position" - }, - { - "section": "osd", - "label": "Position", - "tabIndex": 18, - "category": "On-screen displays", "keywords": [ "displays", "indicator", "osd", "popup", - "position", "screen" ] }, @@ -8810,26 +8689,22 @@ "parentLabel": "System & integrations" }, { - "section": "_tab_20", + "section": "systemUpdater", "label": "System updater", "tabIndex": 20, "category": "System updater", "keywords": [ - "check", - "command", - "custom", - "ignored", + "frequency", "integrations", "interval", "packages", + "poll", "system", "updater", "updates", "upgrade" ], - "icon": "refresh", - "parentLabel": "System & integrations", - "description": "Check interval, ignored packages, custom command" + "parentLabel": "System & integrations" }, { "section": "systemUpdaterCustomCommand", @@ -10944,7 +10819,7 @@ }, { "section": "displayGamma", - "label": "Gamma", + "label": "Gamma control", "tabIndex": 25, "category": "Gamma control", "keywords": [ @@ -10969,65 +10844,9 @@ ], "parentLabel": "Displays" }, - { - "section": "_tab_25", - "label": "Gamma control", - "tabIndex": 25, - "category": "Gamma control", - "keywords": [ - "blue light", - "color temperature", - "contrast", - "control", - "displays", - "gamma", - "mode", - "monitor", - "monitors", - "night", - "night light", - "output", - "outputs", - "redshift", - "resolution", - "screen", - "screens" - ], - "icon": "brightness_6", - "parentLabel": "Displays", - "description": "Night mode, gamma, contrast" - }, - { - "section": "nightModeTransitionMinutes", - "label": "Mode", - "tabIndex": 25, - "category": "Gamma control", - "keywords": [ - "blue light", - "color temperature", - "control", - "displays", - "duration", - "fade", - "gamma", - "mode", - "monitor", - "monitors", - "night", - "night light", - "output", - "outputs", - "redshift", - "resolution", - "screen", - "screens", - "transition" - ], - "parentLabel": "Displays" - }, { "section": "nightModeTemperature", - "label": "Night mode", + "label": "Gamma control", "tabIndex": 25, "category": "Gamma control", "keywords": [ @@ -11039,7 +10858,6 @@ "displays", "gamma", "kelvin", - "mode", "monitor", "monitors", "night", @@ -11057,6 +10875,33 @@ "parentLabel": "Displays", "description": "Gamma control not available. Requires DMS API v6+." }, + { + "section": "nightModeTransitionMinutes", + "label": "Gamma control", + "tabIndex": 25, + "category": "Gamma control", + "keywords": [ + "blue light", + "color temperature", + "control", + "displays", + "duration", + "fade", + "gamma", + "monitor", + "monitors", + "night", + "night light", + "output", + "outputs", + "redshift", + "resolution", + "screen", + "screens", + "transition" + ], + "parentLabel": "Displays" + }, { "section": "_tab_26", "label": "Display assignment", @@ -11761,22 +11606,9 @@ "parentLabel": "Applications", "icon": "terminal" }, - { - "section": "_tab_35", - "label": "Accounts", - "tabIndex": 35, - "category": "Accounts", - "keywords": [ - "accounts", - "users" - ], - "icon": "manage_accounts", - "parentLabel": "Users & accounts", - "description": "Users" - }, { "section": "usersList", - "label": "Refreshing...", + "label": "Accounts", "tabIndex": 35, "category": "Accounts", "keywords": [ @@ -11784,7 +11616,6 @@ "accounts", "admin", "login", - "refreshing...", "user", "users" ], @@ -12711,54 +12542,24 @@ "conditionKey": "windowRulesCapable" }, { - "section": "_tab_39", + "section": "networkEthernet", "label": "Ethernet", "tabIndex": 39, "category": "Ethernet", "keywords": [ "adapters", - "config", - "configurations", - "configure", "connection", "connectivity", "ethernet", "internet", "network", "online", - "saved", - "setup", - "wi-fi", - "wifi", - "wireless" - ], - "icon": "settings_ethernet", - "parentLabel": "Network", - "description": "Adapters and saved configurations", - "conditionKey": "networkAvailable" - }, - { - "section": "networkWifi", - "label": "Forget network", - "tabIndex": 40, - "category": "Wi-Fi", - "keywords": [ - "adapter", - "connection", - "connectivity", - "ethernet", - "forget", - "internet", - "network", - "online", - "radio", - "ssid", "wi-fi", "wifi", + "wired", "wireless" ], "parentLabel": "Network", - "icon": "wifi_find", "conditionKey": "networkAvailable" }, { @@ -12812,38 +12613,36 @@ "conditionKey": "networkAvailable" }, { - "section": "_tab_40", + "section": "networkWifi", "label": "Wi-Fi", "tabIndex": 40, "category": "Wi-Fi", "keywords": [ + "adapter", "connection", "connectivity", "ethernet", - "hotspot", "internet", "network", - "networks", "online", - "saved", + "radio", + "ssid", "wi-fi", "wifi", "wireless" ], - "icon": "wifi", "parentLabel": "Network", - "description": "Networks, saved networks, hotspot", + "icon": "wifi_find", "conditionKey": "networkAvailable" }, { "section": "networkVpn", - "label": "Delete VPN", + "label": "VPN", "tabIndex": 41, "category": "VPN", "keywords": [ "connection", "connectivity", - "delete", "ethernet", "import", "internet", @@ -12860,30 +12659,6 @@ "parentLabel": "Network", "conditionKey": "networkAvailable" }, - { - "section": "_tab_41", - "label": "VPN", - "tabIndex": 41, - "category": "VPN", - "keywords": [ - "autoconnect", - "connection", - "connections", - "connectivity", - "ethernet", - "internet", - "network", - "online", - "vpn", - "wi-fi", - "wifi", - "wireless" - ], - "icon": "vpn_key", - "parentLabel": "Network", - "description": "Connections and autoconnect", - "conditionKey": "networkAvailable" - }, { "section": "batteryChargeLimitNotificationType", "label": "Alert style", @@ -13949,28 +13724,29 @@ "conditionKey": "isNiri" }, { - "section": "_tab_47", + "section": "networkCellular", "label": "Cellular", "tabIndex": 47, "category": "Cellular", "keywords": [ + "cdma", "cellular", "connection", "connectivity", - "data", "ethernet", + "gsm", "internet", + "lte", "mobile", "modem", "network", "online", "wi-fi", "wifi", - "wireless" + "wireless", + "wwan" ], - "icon": "network_cell", "parentLabel": "Network", - "description": "Modem and mobile data", "conditionKey": "cellularAvailable" }, { @@ -15054,6 +14830,50 @@ ], "parentLabel": "Wallpaper & colors" }, + { + "section": "themeSchedule", + "label": "Dark mode", + "tabIndex": 51, + "category": "Dark mode", + "keywords": [ + "appearance", + "automatic", + "background", + "bg", + "blue light", + "brightness", + "color temperature", + "colors", + "colour", + "colours", + "control", + "dark", + "dark mode", + "desktop", + "gamma", + "hue", + "image", + "light", + "matugen", + "mode", + "night", + "night light", + "palette", + "picture", + "redshift", + "schedule", + "settings", + "shared", + "smart", + "sunrise", + "sunset", + "tint", + "wallpaper" + ], + "parentLabel": "Wallpaper & colors", + "icon": "dark_mode", + "description": "Using shared settings from Gamma Control" + }, { "section": "themeScheduleDarkMode", "label": "Dark mode", @@ -15081,52 +14901,6 @@ "parentLabel": "Wallpaper & colors", "icon": "dark_mode" }, - { - "section": "themeSchedule", - "label": "Next Transition", - "tabIndex": 51, - "category": "Dark mode", - "keywords": [ - "appearance", - "automatic", - "background", - "bg", - "blue light", - "brightness", - "color temperature", - "colors", - "colour", - "colours", - "control", - "dark", - "dark mode", - "desktop", - "gamma", - "hue", - "image", - "light", - "matugen", - "mode", - "next", - "night", - "night light", - "palette", - "picture", - "redshift", - "schedule", - "settings", - "shared", - "smart", - "sunrise", - "sunset", - "tint", - "transition", - "wallpaper" - ], - "parentLabel": "Wallpaper & colors", - "icon": "dark_mode", - "description": "Using shared settings from Gamma Control" - }, { "section": "themeModeShareGammaSettings", "label": "Share gamma control settings", @@ -15164,7 +14938,7 @@ "description": "Using shared settings from Gamma Control" }, { - "section": "_tab_52", + "section": "wallpaperCycling", "label": "Automatic cycling", "tabIndex": 52, "category": "Automatic cycling", @@ -15184,13 +14958,16 @@ "interval", "palette", "picture", + "random", + "rotate", + "shuffle", + "slideshow", "time", "tint", "wallpaper" ], - "icon": "autorenew", "parentLabel": "Wallpaper & colors", - "description": "Folder, interval, daily time" + "icon": "skip_previous" }, { "section": "wallpaperCyclingFolder", @@ -15270,39 +15047,6 @@ ], "parentLabel": "Wallpaper & colors" }, - { - "section": "wallpaperCycling", - "label": "No wallpaper selected", - "tabIndex": 52, - "category": "Automatic cycling", - "keywords": [ - "automatic", - "background", - "bg", - "colors", - "colour", - "colours", - "cycling", - "daily", - "desktop", - "folder", - "hue", - "image", - "interval", - "palette", - "picture", - "random", - "rotate", - "selected", - "shuffle", - "slideshow", - "time", - "tint", - "wallpaper" - ], - "parentLabel": "Wallpaper & colors", - "icon": "skip_previous" - }, { "section": "wallpaperCyclingRandom", "label": "Random order", @@ -15434,33 +15178,6 @@ ], "parentLabel": "Interface style" }, - { - "section": "m3ElevationEnabled", - "label": "Custom color", - "tabIndex": 53, - "category": "Shadows", - "keywords": [ - "blur", - "color", - "colour", - "custom", - "direction", - "elevation", - "hue", - "intensity", - "interface", - "lift", - "light", - "m3", - "material", - "opacity", - "shadow", - "shadows", - "style", - "tint" - ], - "parentLabel": "Interface style" - }, { "section": "barShadowDirectionManual", "label": "Direction", @@ -15602,6 +15319,29 @@ ], "parentLabel": "Interface style" }, + { + "section": "m3ElevationEnabled", + "label": "Shadows", + "tabIndex": 53, + "category": "Shadows", + "keywords": [ + "blur", + "color", + "direction", + "elevation", + "intensity", + "interface", + "lift", + "light", + "m3", + "material", + "opacity", + "shadow", + "shadows", + "style" + ], + "parentLabel": "Interface style" + }, { "section": "m3ElevationToggle", "label": "Shadows", @@ -15644,17 +15384,15 @@ }, { "section": "barWidgetGeneral", - "label": "Show in dock", + "label": "Widget settings", "tabIndex": 54, "category": "Widget settings", "keywords": [ "bar", "components", - "dock", "modules", "panel", "settings", - "show", "statusbar", "taskbar", "topbar", @@ -15690,7 +15428,7 @@ }, { "section": "notificationRules", - "label": "Rules", + "label": "Notification rules", "tabIndex": 55, "category": "Rules", "keywords": [ @@ -15712,6 +15450,28 @@ "parentLabel": "Notifications", "icon": "rule_settings" }, + { + "section": "_tab_55", + "label": "Rules", + "tabIndex": 55, + "category": "Rules", + "keywords": [ + "alert", + "alerts", + "ignore", + "messages", + "mute", + "notif", + "notifications", + "notifs", + "priority", + "rules", + "toast" + ], + "icon": "rule_settings", + "parentLabel": "Notifications", + "description": "Mute, ignore and priority rules per app" + }, { "section": "useAutoLocation", "label": "Auto location", @@ -16231,23 +15991,44 @@ "category": "Users & accounts", "keywords": [ "accounts", - "create", + "add", "user", "users" ], "icon": "account_circle" }, + { + "section": "createUser", + "label": "Add user", + "tabIndex": 61, + "category": "Add user", + "keywords": [ + "accounts", + "add", + "adds", + "admin", + "group", + "sudo", + "they", + "user", + "users", + "wheel" + ], + "parentLabel": "Users & accounts", + "icon": "person_add", + "description": "Adds them to the %1 group so they can use sudo" + }, { "section": "createUserGreeter", "label": "Allow greeter login access", "tabIndex": 61, - "category": "Create user", + "category": "Add user", "keywords": [ "access", "accounts", + "add", "adds", "allow", - "create", "greeter", "group", "login", @@ -16260,38 +16041,17 @@ "parentLabel": "Users & accounts", "description": "Adds them to the %1 group so they can run dms-greeter sync --profile" }, - { - "section": "createUser", - "label": "Create user", - "tabIndex": 61, - "category": "Create user", - "keywords": [ - "accounts", - "adds", - "admin", - "create", - "group", - "sudo", - "they", - "user", - "users", - "wheel" - ], - "parentLabel": "Users & accounts", - "icon": "person_add", - "description": "Adds them to the %1 group so they can use sudo" - }, { "section": "createUserAdmin", "label": "Grant administrator privileges", "tabIndex": 61, - "category": "Create user", + "category": "Add user", "keywords": [ "accounts", + "add", "adds", "admin", "administrator", - "create", "grant", "group", "privileges", @@ -16592,26 +16352,26 @@ "conditionKey": "dotEnabled" }, { - "section": "dotSize", + "section": "_tab_65", "label": "Dot", "tabIndex": 65, "category": "Dot", "keywords": [ + "alongside", "bar", - "dankdot", - "diameter", + "companion", "dot", - "fade", - "idle", + "floating", + "layout", "panel", - "size", "statusbar", "taskbar", - "topbar" + "topbar", + "works" ], - "parentLabel": "Bar", "icon": "blur_on", - "conditionKey": "dotEnabled" + "parentLabel": "Bar", + "description": "A floating companion that works alongside any bar layout" }, { "section": "dotNotificationExpand", @@ -16635,6 +16395,29 @@ "parentLabel": "Bar", "conditionKey": "dotEnabled" }, + { + "section": "dotSize", + "label": "General", + "tabIndex": 65, + "category": "Dot", + "keywords": [ + "bar", + "dankdot", + "diameter", + "dot", + "fade", + "general", + "idle", + "panel", + "size", + "statusbar", + "taskbar", + "topbar" + ], + "parentLabel": "Bar", + "icon": "blur_on", + "conditionKey": "dotEnabled" + }, { "section": "dotHighContrast", "label": "High contrast",