From 8331d1954d9cd23c058307875ebea1d7f23ba59a Mon Sep 17 00:00:00 2001 From: shouya <526598+shouya@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:49:31 +0900 Subject: [PATCH 1/7] show workspaces for the focused screen --- Modules/Bar/Widgets/Workspace.qml | 13 ++++++++++++- .../Bar/WidgetSettings/WorkspaceSettings.qml | 9 +++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Modules/Bar/Widgets/Workspace.qml b/Modules/Bar/Widgets/Workspace.qml index 325f1a7e..680ca2df 100644 --- a/Modules/Bar/Widgets/Workspace.qml +++ b/Modules/Bar/Widgets/Workspace.qml @@ -46,6 +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 int characterCount: isVertical ? 2 : ((widgetSettings.characterCount !== undefined) ? widgetSettings.characterCount : widgetMetadata.characterCount) property bool isDestroying: false @@ -162,10 +163,20 @@ Item { function refreshWorkspaces() { localWorkspaces.clear(); + + var focusedOutput = null; + if (showFocusedScreen) { + for (var i = 0; i < CompositorService.workspaces.count; i++) { + const ws = CompositorService.workspaces.get(i); + if (ws.isFocused) focusedOutput = ws.output.toLowerCase(); + } + } + if (screen !== null) { for (var i = 0; i < CompositorService.workspaces.count; i++) { const ws = CompositorService.workspaces.get(i); - if (ws.output.toLowerCase() === screen.name.toLowerCase()) { + if ((showFocusedScreen && ws.output.toLowerCase() == focusedOutput) || + (!showFocusedScreen && 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 0c702563..dfb4ef84 100644 --- a/Modules/Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml +++ b/Modules/Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml @@ -14,6 +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 int valueCharacterCount: widgetData.characterCount !== undefined ? widgetData.characterCount : widgetMetadata.characterCount function saveSettings() { @@ -21,6 +22,7 @@ ColumnLayout { settings.labelMode = valueLabelMode; settings.hideUnoccupied = valueHideUnoccupied; settings.characterCount = valueCharacterCount; + settings.showFocusedScreen = valueShowFocusedScreen; return settings; } @@ -51,6 +53,13 @@ ColumnLayout { minimumWidth: 200 } + 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 + } + NToggle { label: I18n.tr("bar.widget-settings.workspace.hide-unoccupied.label") description: I18n.tr("bar.widget-settings.workspace.hide-unoccupied.description") From bcebaa018550a823afca075326673d60c9bb21a6 Mon Sep 17 00:00:00 2001 From: shouya <526598+shouya@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:52:20 +0900 Subject: [PATCH 2/7] add english translation --- Assets/Translations/en.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/Translations/en.json b/Assets/Translations/en.json index 8f2fcbef..3d1f5926 100644 --- a/Assets/Translations/en.json +++ b/Assets/Translations/en.json @@ -352,6 +352,10 @@ "description": "Don't display workspaces without windows.", "label": "Hide unoccupied" }, + "show-focused-screen": { + "description": "Show workspaces from the focused screen instead of from the same screen as the bar.", + "label": "Show focused screen" + }, "label-mode": { "description": "Choose how workspace labels are displayed.", "label": "Label Mode" From 211a9e4033fbdc9c27697218854980dda9e1ef0c Mon Sep 17 00:00:00 2001 From: shouya <526598+shouya@users.noreply.github.com> Date: Fri, 21 Nov 2025 14:53:51 +0900 Subject: [PATCH 3/7] add translations for other languages --- Assets/Translations/de.json | 4 ++++ Assets/Translations/es.json | 4 ++++ Assets/Translations/fr.json | 4 ++++ Assets/Translations/nl.json | 4 ++++ Assets/Translations/pt.json | 4 ++++ Assets/Translations/ru.json | 4 ++++ Assets/Translations/tr.json | 4 ++++ Assets/Translations/uk-UA.json | 4 ++++ Assets/Translations/zh-CN.json | 4 ++++ 9 files changed, 36 insertions(+) diff --git a/Assets/Translations/de.json b/Assets/Translations/de.json index 367205ab..0f41b4ec 100644 --- a/Assets/Translations/de.json +++ b/Assets/Translations/de.json @@ -352,6 +352,10 @@ "description": "Arbeitsbereiche ohne Fenster nicht anzeigen.", "label": "Unbesetzte ausblenden" }, + "show-focused-screen": { + "description": "Arbeitsbereiche vom fokussierten Bildschirm anzeigen, anstatt vom gleichen Bildschirm wie die Leiste.", + "label": "Fokussierten Bildschirm anzeigen" + }, "label-mode": { "description": "Wählen Sie, wie Arbeitsbereichs-Beschriftungen angezeigt werden.", "label": "Beschriftungsmodus" diff --git a/Assets/Translations/es.json b/Assets/Translations/es.json index 58cb8ff1..e8a0818e 100644 --- a/Assets/Translations/es.json +++ b/Assets/Translations/es.json @@ -352,6 +352,10 @@ "description": "No mostrar espacios de trabajo sin ventanas.", "label": "Ocultar desocupados" }, + "show-focused-screen": { + "description": "Mostrar espacios de trabajo de la pantalla enfocada en lugar de la misma pantalla que la barra.", + "label": "Mostrar pantalla enfocada" + }, "label-mode": { "description": "Elegir cómo se muestran las etiquetas de los espacios de trabajo.", "label": "Modo de etiqueta" diff --git a/Assets/Translations/fr.json b/Assets/Translations/fr.json index f7f84835..c7764732 100644 --- a/Assets/Translations/fr.json +++ b/Assets/Translations/fr.json @@ -352,6 +352,10 @@ "description": "Ne pas afficher les espaces de travail sans fenêtres.", "label": "Masquer les inoccupés" }, + "show-focused-screen": { + "description": "Afficher les espaces de travail de l'écran ciblé au lieu de l'écran où se trouve la barre.", + "label": "Afficher l'écran ciblé" + }, "label-mode": { "description": "Choisir comment les étiquettes d'espace de travail sont affichées.", "label": "Mode d'étiquette" diff --git a/Assets/Translations/nl.json b/Assets/Translations/nl.json index df6b15c1..6c5d0d4c 100644 --- a/Assets/Translations/nl.json +++ b/Assets/Translations/nl.json @@ -352,6 +352,10 @@ "description": "Werkruimten zonder vensters niet weergeven.", "label": "Ongebruikte verbergen" }, + "show-focused-screen": { + "description": "Werkruimten van het gefocuste scherm weergeven in plaats van hetzelfde scherm als de balk.", + "label": "Gefocust scherm weergeven" + }, "label-mode": { "description": "Kies hoe labels van werkruimten worden weergegeven.", "label": "Labelmodus" diff --git a/Assets/Translations/pt.json b/Assets/Translations/pt.json index f7e79563..28fb5d7d 100644 --- a/Assets/Translations/pt.json +++ b/Assets/Translations/pt.json @@ -352,6 +352,10 @@ "description": "Não exibir áreas de trabalho sem janelas.", "label": "Ocultar desocupados" }, + "show-focused-screen": { + "description": "Mostrar áreas de trabalho da tela em foco em vez da mesma tela que a barra.", + "label": "Mostrar tela em foco" + }, "label-mode": { "description": "Escolher como os rótulos de espaço de trabalho são exibidos.", "label": "Modo de rótulo" diff --git a/Assets/Translations/ru.json b/Assets/Translations/ru.json index cfdfc306..93af13bb 100644 --- a/Assets/Translations/ru.json +++ b/Assets/Translations/ru.json @@ -352,6 +352,10 @@ "description": "Не отображать рабочие пространства без окон.", "label": "Скрыть незанятые" }, + "show-focused-screen": { + "description": "Показывать рабочие пространства с фокусированного экрана вместо того же экрана, что и панель.", + "label": "Показать фокусированный экран" + }, "label-mode": { "description": "Выберите, как отображаются метки рабочих пространств.", "label": "Режим метки" diff --git a/Assets/Translations/tr.json b/Assets/Translations/tr.json index 65d25cb5..79b15a67 100644 --- a/Assets/Translations/tr.json +++ b/Assets/Translations/tr.json @@ -352,6 +352,10 @@ "description": "Penceresi olmayan çalışma alanlarını gösterme.", "label": "Dolu olmayanları gizle" }, + "show-focused-screen": { + "description": "Çubuğun bulunduğu ekran yerine odaklanmış ekrandaki çalışma alanlarını göster.", + "label": "Odaklanmış ekranı göster" + }, "label-mode": { "description": "Çalışma alanı etiketlerinin nasıl gösterileceğini seçin.", "label": "Etiket Modu" diff --git a/Assets/Translations/uk-UA.json b/Assets/Translations/uk-UA.json index 085fd5ed..5df28571 100644 --- a/Assets/Translations/uk-UA.json +++ b/Assets/Translations/uk-UA.json @@ -352,6 +352,10 @@ "description": "Не відображати робочі простори без вікон.", "label": "Приховати незайняті" }, + "show-focused-screen": { + "description": "Показувати робочі простори з фокусованого екрана замість того ж екрана, що й панель.", + "label": "Показати фокусований екран" + }, "label-mode": { "description": "Виберіть, як відображаються мітки робочих просторів.", "label": "Режим міток" diff --git a/Assets/Translations/zh-CN.json b/Assets/Translations/zh-CN.json index e6c3b8dd..8986486a 100644 --- a/Assets/Translations/zh-CN.json +++ b/Assets/Translations/zh-CN.json @@ -352,6 +352,10 @@ "description": "不显示没有窗口的工作区。", "label": "隐藏未占用" }, + "show-focused-screen": { + "description": "显示来自焦点屏幕的工作区，而不是与任务栏相同的屏幕。", + "label": "显示焦点屏幕" + }, "label-mode": { "description": "选择工作区标签的显示方式。", "label": "标签模式" From 5f2a6ffc9dfc51f4b5d50da197e69d2fae421d58 Mon Sep 17 00:00:00 2001 From: shouya <526598+shouya@users.noreply.github.com> Date: Fri, 21 Nov 2025 15:01:02 +0900 Subject: [PATCH 4/7] fix workspace.qml warning --- Modules/Bar/Widgets/Workspace.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Bar/Widgets/Workspace.qml b/Modules/Bar/Widgets/Workspace.qml index 680ca2df..1d7156f1 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 showFocusedScreen: (widgetSettings.showFocusedScreen !== undefined) ? widgetSettings.showFocusedScreen : false readonly property int characterCount: isVertical ? 2 : ((widgetSettings.characterCount !== undefined) ? widgetSettings.characterCount : widgetMetadata.characterCount) property bool isDestroying: false From 7a64758ac87495adf186260c893a362394922a23 Mon Sep 17 00:00:00 2001 From: shouya <526598+shouya@users.noreply.github.com> Date: Sat, 22 Nov 2025 19:58:11 +0900 Subject: [PATCH 5/7] declare default value for the settings --- Modules/Bar/Widgets/Workspace.qml | 2 +- Services/UI/BarWidgetRegistry.qml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Modules/Bar/Widgets/Workspace.qml b/Modules/Bar/Widgets/Workspace.qml index 1d7156f1..680ca2df 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 : false + readonly property bool showFocusedScreen: (widgetSettings.showFocusedScreen !== undefined) ? widgetSettings.showFocusedScreen : widgetMetadata.showFocusedScreen readonly property int characterCount: isVertical ? 2 : ((widgetSettings.characterCount !== undefined) ? widgetSettings.characterCount : widgetMetadata.characterCount) property bool isDestroying: false diff --git a/Services/UI/BarWidgetRegistry.qml b/Services/UI/BarWidgetRegistry.qml index 7357fe2a..76db458d 100644 --- a/Services/UI/BarWidgetRegistry.qml +++ b/Services/UI/BarWidgetRegistry.qml @@ -207,6 +207,7 @@ Singleton { "Workspace": { "allowUserSettings": true, "labelMode": "index", + "showFocusedScreen": false, "hideUnoccupied": false, "characterCount": 2 }, From 5604d79961b29dfd23677d2783a9e9d157597568 Mon Sep 17 00:00:00 2001 From: shouya <526598+shouya@users.noreply.github.com> Date: Sat, 22 Nov 2025 20:46:03 +0900 Subject: [PATCH 6/7] update translations --- Assets/Translations/de.json | 4 ++-- Assets/Translations/en.json | 4 ++-- Assets/Translations/es.json | 4 ++-- Assets/Translations/fr.json | 4 ++-- Assets/Translations/nl.json | 4 ++-- Assets/Translations/pt.json | 4 ++-- Assets/Translations/ru.json | 4 ++-- Assets/Translations/tr.json | 4 ++-- Assets/Translations/uk-UA.json | 4 ++-- Assets/Translations/zh-CN.json | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Assets/Translations/de.json b/Assets/Translations/de.json index 0f41b4ec..a934e887 100644 --- a/Assets/Translations/de.json +++ b/Assets/Translations/de.json @@ -353,8 +353,8 @@ "label": "Unbesetzte ausblenden" }, "show-focused-screen": { - "description": "Arbeitsbereiche vom fokussierten Bildschirm anzeigen, anstatt vom gleichen Bildschirm wie die Leiste.", - "label": "Fokussierten Bildschirm anzeigen" + "description": "Zeigt Arbeitsbereiche vom aktuell fokussierten Bildschirm an, statt vom Bildschirm, auf dem sich die Leiste befindet.", + "label": "Fokussiertem Bildschirm folgen" }, "label-mode": { "description": "Wählen Sie, wie Arbeitsbereichs-Beschriftungen angezeigt werden.", diff --git a/Assets/Translations/en.json b/Assets/Translations/en.json index 3d1f5926..0ccaf804 100644 --- a/Assets/Translations/en.json +++ b/Assets/Translations/en.json @@ -353,8 +353,8 @@ "label": "Hide unoccupied" }, "show-focused-screen": { - "description": "Show workspaces from the focused screen instead of from the same screen as the bar.", - "label": "Show focused screen" + "description": "Display workspaces from the currently focused screen, rather than the screen where the bar is located.", + "label": "Follow Focused Screen" }, "label-mode": { "description": "Choose how workspace labels are displayed.", diff --git a/Assets/Translations/es.json b/Assets/Translations/es.json index e8a0818e..860b5247 100644 --- a/Assets/Translations/es.json +++ b/Assets/Translations/es.json @@ -353,8 +353,8 @@ "label": "Ocultar desocupados" }, "show-focused-screen": { - "description": "Mostrar espacios de trabajo de la pantalla enfocada en lugar de la misma pantalla que la barra.", - "label": "Mostrar pantalla enfocada" + "description": "Mostrar espacios de trabajo de la pantalla actualmente enfocada, en lugar de la pantalla donde se encuentra la barra.", + "label": "Seguir Pantalla Enfocada" }, "label-mode": { "description": "Elegir cómo se muestran las etiquetas de los espacios de trabajo.", diff --git a/Assets/Translations/fr.json b/Assets/Translations/fr.json index c7764732..1f833ef9 100644 --- a/Assets/Translations/fr.json +++ b/Assets/Translations/fr.json @@ -353,8 +353,8 @@ "label": "Masquer les inoccupés" }, "show-focused-screen": { - "description": "Afficher les espaces de travail de l'écran ciblé au lieu de l'écran où se trouve la barre.", - "label": "Afficher l'écran ciblé" + "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é" }, "label-mode": { "description": "Choisir comment les étiquettes d'espace de travail sont affichées.", diff --git a/Assets/Translations/nl.json b/Assets/Translations/nl.json index 6c5d0d4c..46fabbfc 100644 --- a/Assets/Translations/nl.json +++ b/Assets/Translations/nl.json @@ -353,8 +353,8 @@ "label": "Ongebruikte verbergen" }, "show-focused-screen": { - "description": "Werkruimten van het gefocuste scherm weergeven in plaats van hetzelfde scherm als de balk.", - "label": "Gefocust scherm weergeven" + "description": "Werkruimten weergeven van het momenteel gefocuste scherm, in plaats van het scherm waar de balk zich bevindt.", + "label": "Gefocust Scherm Volgen" }, "label-mode": { "description": "Kies hoe labels van werkruimten worden weergegeven.", diff --git a/Assets/Translations/pt.json b/Assets/Translations/pt.json index 28fb5d7d..cdbdd6f6 100644 --- a/Assets/Translations/pt.json +++ b/Assets/Translations/pt.json @@ -353,8 +353,8 @@ "label": "Ocultar desocupados" }, "show-focused-screen": { - "description": "Mostrar áreas de trabalho da tela em foco em vez da mesma tela que a barra.", - "label": "Mostrar tela em foco" + "description": "Exibir áreas de trabalho da tela atualmente em foco, em vez da tela onde a barra está localizada.", + "label": "Seguir Tela em Foco" }, "label-mode": { "description": "Escolher como os rótulos de espaço de trabalho são exibidos.", diff --git a/Assets/Translations/ru.json b/Assets/Translations/ru.json index 93af13bb..f9c03b72 100644 --- a/Assets/Translations/ru.json +++ b/Assets/Translations/ru.json @@ -353,8 +353,8 @@ "label": "Скрыть незанятые" }, "show-focused-screen": { - "description": "Показывать рабочие пространства с фокусированного экрана вместо того же экрана, что и панель.", - "label": "Показать фокусированный экран" + "description": "Отображать рабочие пространства с текущего активного экрана, а не с экрана, на котором расположена панель.", + "label": "Следовать за Активным Экраном" }, "label-mode": { "description": "Выберите, как отображаются метки рабочих пространств.", diff --git a/Assets/Translations/tr.json b/Assets/Translations/tr.json index 79b15a67..7398d681 100644 --- a/Assets/Translations/tr.json +++ b/Assets/Translations/tr.json @@ -353,8 +353,8 @@ "label": "Dolu olmayanları gizle" }, "show-focused-screen": { - "description": "Çubuğun bulunduğu ekran yerine odaklanmış ekrandaki çalışma alanlarını göster.", - "label": "Odaklanmış ekranı göster" + "description": "Çubuğun bulunduğu ekran yerine, şu anda odaklanmış ekrandaki çalışma alanlarını göster.", + "label": "Odaklanmış Ekranı Takip Et" }, "label-mode": { "description": "Çalışma alanı etiketlerinin nasıl gösterileceğini seçin.", diff --git a/Assets/Translations/uk-UA.json b/Assets/Translations/uk-UA.json index 5df28571..3e0e6bb9 100644 --- a/Assets/Translations/uk-UA.json +++ b/Assets/Translations/uk-UA.json @@ -353,8 +353,8 @@ "label": "Приховати незайняті" }, "show-focused-screen": { - "description": "Показувати робочі простори з фокусованого екрана замість того ж екрана, що й панель.", - "label": "Показати фокусований екран" + "description": "Відображати робочі простори з поточного активного екрана, а не з екрана, на якому розташована панель.", + "label": "Слідувати за Активним Екраном" }, "label-mode": { "description": "Виберіть, як відображаються мітки робочих просторів.", diff --git a/Assets/Translations/zh-CN.json b/Assets/Translations/zh-CN.json index 8986486a..5e06d32c 100644 --- a/Assets/Translations/zh-CN.json +++ b/Assets/Translations/zh-CN.json @@ -353,8 +353,8 @@ "label": "隐藏未占用" }, "show-focused-screen": { - "description": "显示来自焦点屏幕的工作区，而不是与任务栏相同的屏幕。", - "label": "显示焦点屏幕" + "description": "显示当前焦点屏幕的工作区，而不是任务栏所在屏幕的工作区。", + "label": "跟随焦点屏幕" }, "label-mode": { "description": "选择工作区标签的显示方式。", 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 7/7] 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 },