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

Simplified TaskbarGrouped settings by removing unneeded toggle and adding its functionality to the combobox.

Browse Source
This commit is contained in:
Corey Woodworth
2025-11-16 17:32:18 -05:00
parent 0706285048
commit d6de45275f
12 changed files with 35 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Widgets/TaskbarGrouped.qml
+10 -7
View File
@@ -36,8 +36,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 int characterCount: 2
readonly property bool showWorkspaceNumbers: (widgetSettings.showWorkspaceNumbers !== undefined) ? widgetSettings.showWorkspaceNumbers : true
readonly property bool showNumbersOnlyWhenOccupied: (widgetSettings.showNumbersOnlyWhenOccupied !== undefined) ? widgetSettings.showNumbersOnlyWhenOccupied : true
readonly property bool showLabelsOnlyWhenOccupied: (widgetSettings.showLabelsOnlyWhenOccupied !== undefined) ? widgetSettings.showLabelsOnlyWhenOccupied : true
readonly property bool colorizeIcons: (widgetSettings.colorizeIcons !== undefined) ? widgetSettings.colorizeIcons : widgetMetadata.colorizeIcons
property ListModel localWorkspaces: ListModel {}
property real masterProgress: 0.0
@@ -322,7 +321,7 @@ Item {
Item {
id: workspaceNumberContainer
visible: root.labelMode !== "none" && root.showWorkspaceNumbers && (!root.showNumbersOnlyWhenOccupied || container.hasWindows)
visible: root.labelMode !== "none" && (!root.showLabelsOnlyWhenOccupied || container.hasWindows)
anchors {
left: parent.left
@@ -389,11 +388,15 @@ Item {
anchors.centerIn: parent
text: {
if (root.labelMode === "name" && workspaceModel.name && workspaceModel.name.length > 0) {
return workspaceModel.name.substring(0, root.characterCount)
} else {
return workspaceModel.idx.toString()
if (workspaceModel.name && workspaceModel.name.length > 0) {
if (root.labelMode === "name") {
return workspaceModel.name.substring(0, root.characterCount)
}
if (root.labelMode === "index+name") {
return (workspaceModel.idx.toString() + " " + workspaceModel.name.substring(0, root.characterCount))
}
}
return workspaceModel.idx.toString()
}
family: Settings.data.ui.fontFixed
Modules/Panels/Settings/Bar/WidgetSettings/TaskbarGroupedSettings.qml
+5 -10
View File
@@ -41,6 +41,9 @@ ColumnLayout {
}, {
"key": "name",
"name": I18n.tr("options.workspace-labels.name")
}, {
"key": "index+name",
"name": I18n.tr("options.workspace-labels.index+name")
}]
currentKey: widgetData.labelMode || widgetMetadata.labelMode
onSelected: key => valueLabelMode = key
@@ -64,16 +67,8 @@ ColumnLayout {
NToggle {
Layout.fillWidth: true
label: I18n.tr("bar.widget-settings.taskbar-grouped.show-workspace-numbers.label")
description: I18n.tr("bar.widget-settings.taskbar-grouped.show-workspace-numbers.description")
checked: root.valueShowWorkspaceNumbers
onToggled: checked => root.valueShowWorkspaceNumbers = checked
}
NToggle {
Layout.fillWidth: true
label: I18n.tr("bar.widget-settings.taskbar-grouped.show-numbers-only-when-occupied.label")
description: I18n.tr("bar.widget-settings.taskbar-grouped.show-numbers-only-when-occupied.description")
label: I18n.tr("bar.widget-settings.taskbar-grouped.show-labels-only-when-occupied.label")
description: I18n.tr("bar.widget-settings.taskbar-grouped.show-labels-only-when-occupied.description")
checked: root.valueShowNumbersOnlyWhenOccupied
onToggled: checked => root.valueShowNumbersOnlyWhenOccupied = checked
visible: root.valueShowWorkspaceNumbers