zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-08-15 18:43:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

update sources for consistent naming

Browse Source
This commit is contained in:
shouya
2025-11-22 20:49:55 +09:00
parent 5604d79961
commit 1b706f8469
13 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Widgets/Workspace.qml
+4 -4
View File
@@ -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;
}
Modules/Panels/Settings/Bar/WidgetSettings/WorkspaceSettings.qml
+6 -6
View File
@@ -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 {