From 1b706f84693e1ff37e3bf3dff222dd3eec5db117 Mon Sep 17 00:00:00 2001 From: shouya <526598+shouya@users.noreply.github.com> Date: Sat, 22 Nov 2025 20:49:37 +0900 Subject: [PATCH] update sources for consistent naming --- Assets/Translations/de.json | 2 +- Assets/Translations/en.json | 2 +- Assets/Translations/es.json | 2 +- Assets/Translations/fr.json | 2 +- Assets/Translations/nl.json | 2 +- Assets/Translations/pt.json | 2 +- Assets/Translations/ru.json | 2 +- Assets/Translations/tr.json | 2 +- Assets/Translations/uk-UA.json | 2 +- Assets/Translations/zh-CN.json | 2 +- Modules/Bar/Widgets/Workspace.qml | 8 ++++---- .../Bar/WidgetSettings/WorkspaceSettings.qml | 12 ++++++------ Services/UI/BarWidgetRegistry.qml | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Assets/Translations/de.json b/Assets/Translations/de.json index a934e887..a342f7f6 100644 --- a/Assets/Translations/de.json +++ b/Assets/Translations/de.json @@ -352,7 +352,7 @@ "description": "Arbeitsbereiche ohne Fenster nicht anzeigen.", "label": "Unbesetzte ausblenden" }, - "show-focused-screen": { + "follow-focused-screen": { "description": "Zeigt Arbeitsbereiche vom aktuell fokussierten Bildschirm an, statt vom Bildschirm, auf dem sich die Leiste befindet.", "label": "Fokussiertem Bildschirm folgen" }, diff --git a/Assets/Translations/en.json b/Assets/Translations/en.json index 0ccaf804..4513afc2 100644 --- a/Assets/Translations/en.json +++ b/Assets/Translations/en.json @@ -352,7 +352,7 @@ "description": "Don't display workspaces without windows.", "label": "Hide unoccupied" }, - "show-focused-screen": { + "follow-focused-screen": { "description": "Display workspaces from the currently focused screen, rather than the screen where the bar is located.", "label": "Follow Focused Screen" }, diff --git a/Assets/Translations/es.json b/Assets/Translations/es.json index 860b5247..8ecdcaba 100644 --- a/Assets/Translations/es.json +++ b/Assets/Translations/es.json @@ -352,7 +352,7 @@ "description": "No mostrar espacios de trabajo sin ventanas.", "label": "Ocultar desocupados" }, - "show-focused-screen": { + "follow-focused-screen": { "description": "Mostrar espacios de trabajo de la pantalla actualmente enfocada, en lugar de la pantalla donde se encuentra la barra.", "label": "Seguir Pantalla Enfocada" }, diff --git a/Assets/Translations/fr.json b/Assets/Translations/fr.json index 1f833ef9..fdde93bd 100644 --- a/Assets/Translations/fr.json +++ b/Assets/Translations/fr.json @@ -352,7 +352,7 @@ "description": "Ne pas afficher les espaces de travail sans fenêtres.", "label": "Masquer les inoccupés" }, - "show-focused-screen": { + "follow-focused-screen": { "description": "Afficher les espaces de travail de l'écran actuellement ciblé, plutôt que de l'écran où se trouve la barre.", "label": "Suivre l'Écran Ciblé" }, diff --git a/Assets/Translations/nl.json b/Assets/Translations/nl.json index 46fabbfc..e3c70b77 100644 --- a/Assets/Translations/nl.json +++ b/Assets/Translations/nl.json @@ -352,7 +352,7 @@ "description": "Werkruimten zonder vensters niet weergeven.", "label": "Ongebruikte verbergen" }, - "show-focused-screen": { + "follow-focused-screen": { "description": "Werkruimten weergeven van het momenteel gefocuste scherm, in plaats van het scherm waar de balk zich bevindt.", "label": "Gefocust Scherm Volgen" }, diff --git a/Assets/Translations/pt.json b/Assets/Translations/pt.json index cdbdd6f6..213fc1b1 100644 --- a/Assets/Translations/pt.json +++ b/Assets/Translations/pt.json @@ -352,7 +352,7 @@ "description": "Não exibir áreas de trabalho sem janelas.", "label": "Ocultar desocupados" }, - "show-focused-screen": { + "follow-focused-screen": { "description": "Exibir áreas de trabalho da tela atualmente em foco, em vez da tela onde a barra está localizada.", "label": "Seguir Tela em Foco" }, diff --git a/Assets/Translations/ru.json b/Assets/Translations/ru.json index f9c03b72..1d57d572 100644 --- a/Assets/Translations/ru.json +++ b/Assets/Translations/ru.json @@ -352,7 +352,7 @@ "description": "Не отображать рабочие пространства без окон.", "label": "Скрыть незанятые" }, - "show-focused-screen": { + "follow-focused-screen": { "description": "Отображать рабочие пространства с текущего активного экрана, а не с экрана, на котором расположена панель.", "label": "Следовать за Активным Экраном" }, diff --git a/Assets/Translations/tr.json b/Assets/Translations/tr.json index 7398d681..d80838da 100644 --- a/Assets/Translations/tr.json +++ b/Assets/Translations/tr.json @@ -352,7 +352,7 @@ "description": "Penceresi olmayan çalışma alanlarını gösterme.", "label": "Dolu olmayanları gizle" }, - "show-focused-screen": { + "follow-focused-screen": { "description": "Çubuğun bulunduğu ekran yerine, şu anda odaklanmış ekrandaki çalışma alanlarını göster.", "label": "Odaklanmış Ekranı Takip Et" }, diff --git a/Assets/Translations/uk-UA.json b/Assets/Translations/uk-UA.json index 3e0e6bb9..152c97e4 100644 --- a/Assets/Translations/uk-UA.json +++ b/Assets/Translations/uk-UA.json @@ -352,7 +352,7 @@ "description": "Не відображати робочі простори без вікон.", "label": "Приховати незайняті" }, - "show-focused-screen": { + "follow-focused-screen": { "description": "Відображати робочі простори з поточного активного екрана, а не з екрана, на якому розташована панель.", "label": "Слідувати за Активним Екраном" }, diff --git a/Assets/Translations/zh-CN.json b/Assets/Translations/zh-CN.json index 5e06d32c..999dcf57 100644 --- a/Assets/Translations/zh-CN.json +++ b/Assets/Translations/zh-CN.json @@ -352,7 +352,7 @@ "description": "不显示没有窗口的工作区。", "label": "隐藏未占用" }, - "show-focused-screen": { + "follow-focused-screen": { "description": "显示当前焦点屏幕的工作区，而不是任务栏所在屏幕的工作区。", "label": "跟随焦点屏幕" }, diff --git a/Modules/Bar/Widgets/Workspace.qml b/Modules/Bar/Widgets/Workspace.qml index 680ca2df..462d4255 100644 --- a/Modules/Bar/Widgets/Workspace.qml +++ b/Modules/Bar/Widgets/Workspace.qml @@ -46,7 +46,7 @@ Item { readonly property string labelMode: (widgetSettings.labelMode !== undefined) ? widgetSettings.labelMode : widgetMetadata.labelMode readonly property bool hideUnoccupied: (widgetSettings.hideUnoccupied !== undefined) ? widgetSettings.hideUnoccupied : widgetMetadata.hideUnoccupied - readonly property bool showFocusedScreen: (widgetSettings.showFocusedScreen !== undefined) ? widgetSettings.showFocusedScreen : widgetMetadata.showFocusedScreen + readonly property bool followFocusedScreen: (widgetSettings.followFocusedScreen !== undefined) ? widgetSettings.followFocusedScreen : widgetMetadata.followFocusedScreen readonly property int characterCount: isVertical ? 2 : ((widgetSettings.characterCount !== undefined) ? widgetSettings.characterCount : widgetMetadata.characterCount) property bool isDestroying: false @@ -165,7 +165,7 @@ Item { localWorkspaces.clear(); var focusedOutput = null; - if (showFocusedScreen) { + if (followFocusedScreen) { for (var i = 0; i < CompositorService.workspaces.count; i++) { const ws = CompositorService.workspaces.get(i); if (ws.isFocused) focusedOutput = ws.output.toLowerCase(); @@ -175,8 +175,8 @@ Item { if (screen !== null) { for (var i = 0; i < CompositorService.workspaces.count; i++) { const ws = CompositorService.workspaces.get(i); - if ((showFocusedScreen && ws.output.toLowerCase() == focusedOutput) || - (!showFocusedScreen && ws.output.toLowerCase() == screen.name.toLowerCase())) { + if ((followFocusedScreen && ws.output.toLowerCase() == focusedOutput) || + (!followFocusedScreen && ws.output.toLowerCase() == screen.name.toLowerCase())) { if (hideUnoccupied && !ws.isOccupied && !ws.isFocused) { continue; } diff --git a/Modules/Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml b/Modules/Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml index dfb4ef84..e807a131 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml @@ -14,7 +14,7 @@ ColumnLayout { property string valueLabelMode: widgetData.labelMode !== undefined ? widgetData.labelMode : widgetMetadata.labelMode property bool valueHideUnoccupied: widgetData.hideUnoccupied !== undefined ? widgetData.hideUnoccupied : widgetMetadata.hideUnoccupied - property bool valueShowFocusedScreen: widgetData.showFocusedScreen !== undefined ? widgetData.showFocusedScreen : widgetMetadata.showFocusedScreen + property bool valueFollowFocusedScreen: widgetData.followFocusedScreen !== undefined ? widgetData.followFocusedScreen : widgetMetadata.followFocusedScreen property int valueCharacterCount: widgetData.characterCount !== undefined ? widgetData.characterCount : widgetMetadata.characterCount function saveSettings() { @@ -22,7 +22,7 @@ ColumnLayout { settings.labelMode = valueLabelMode; settings.hideUnoccupied = valueHideUnoccupied; settings.characterCount = valueCharacterCount; - settings.showFocusedScreen = valueShowFocusedScreen; + settings.followFocusedScreen = valueFollowFocusedScreen; return settings; } @@ -54,10 +54,10 @@ ColumnLayout { } NToggle { - label: I18n.tr("bar.widget-settings.workspace.show-focused-screen.label") - description: I18n.tr("bar.widget-settings.workspace.show-focused-screen.description") - checked: valueShowFocusedScreen - onToggled: checked => valueShowFocusedScreen = checked + label: I18n.tr("bar.widget-settings.workspace.follow-focused-screen.label") + description: I18n.tr("bar.widget-settings.workspace.follow-focused-screen.description") + checked: valueFollowFocusedScreen + onToggled: checked => valueFollowFocusedScreen = checked } NToggle { diff --git a/Services/UI/BarWidgetRegistry.qml b/Services/UI/BarWidgetRegistry.qml index 76db458d..fe4e8bd6 100644 --- a/Services/UI/BarWidgetRegistry.qml +++ b/Services/UI/BarWidgetRegistry.qml @@ -207,7 +207,7 @@ Singleton { "Workspace": { "allowUserSettings": true, "labelMode": "index", - "showFocusedScreen": false, + "followFocusedScreen": false, "hideUnoccupied": false, "characterCount": 2 },