zoriya/noctalia-shell
1
0
Fork 0
mirror of https://github.com/zoriya/noctalia-shell.git synced 2026-08-05 13:57:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #776 from MrDowntempo/fix/OneLessToggle

Browse Source 
Simplified TaskbarGrouped settings by removing unneeded toggle
This commit is contained in:
Lemmy
2025-11-16 18:01:18 -05:00
committed by GitHub
parent 39fd2517c3 8e18f79acd
commit 202d974a82
12 changed files with 36 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Translations/de.json
+2 -5
View File
@@ -314,13 +314,9 @@
}
},
"taskbar-grouped": {
"show-numbers-only-when-occupied": {
"show-labels-only-when-occupied": {
"description": "Zeige nur die Workspace-Bezeichnung für Workspaces an, die offene Fenster haben.",
"label": "Zeige Label nur bei Belegung"
},
"show-workspace-numbers": {
"description": "Arbeitsbereichsbezeichnung in der oberen linken Ecke von Aufgabengruppen anzeigen.",
"label": "Arbeitsbereichsbezeichnung anzeigen"
}
},
"tray": {
@@ -557,6 +553,7 @@
},
"workspace-labels": {
"index": "Index",
"index+name": "Index und Name",
"name": "Name",
"none": "Keine"
}
Assets/Translations/en.json
+2 -5
View File
@@ -314,13 +314,9 @@
}
},
"taskbar-grouped": {
"show-numbers-only-when-occupied": {
"show-labels-only-when-occupied": {
"description": "Only show workspace label for workspaces that have open windows.",
"label": "Show label only when occupied"
},
"show-workspace-numbers": {
"description": "Display workspace label in the top-left corner of task groups.",
"label": "Show workspace label"
}
},
"tray": {
@@ -557,6 +553,7 @@
},
"workspace-labels": {
"index": "Index",
"index+name": "Index and Name",
"name": "Name",
"none": "None"
}
Assets/Translations/es.json
+2 -5
View File
@@ -314,13 +314,9 @@
}
},
"taskbar-grouped": {
"show-numbers-only-when-occupied": {
"show-labels-only-when-occupied": {
"description": "Mostrar solo la etiqueta del espacio de trabajo para los espacios de trabajo que tienen ventanas abiertas.",
"label": "Mostrar etiqueta solo cuando esté ocupado."
},
"show-workspace-numbers": {
"description": "Mostrar la etiqueta del espacio de trabajo en la esquina superior izquierda de los grupos de tareas.",
"label": "Mostrar etiqueta del espacio de trabajo"
}
},
"tray": {
@@ -557,6 +553,7 @@
},
"workspace-labels": {
"index": "Índice",
"index+name": "Índice y Nombre",
"name": "Nombre",
"none": "Ninguno"
}
Assets/Translations/fr.json
+2 -5
View File
@@ -314,13 +314,9 @@
}
},
"taskbar-grouped": {
"show-numbers-only-when-occupied": {
"show-labels-only-when-occupied": {
"description": "Afficher uniquement l'étiquette de l'espace de travail pour les espaces de travail qui ont des fenêtres ouvertes.",
"label": "Afficher l'étiquette uniquement lorsque c'est occupé."
},
"show-workspace-numbers": {
"description": "Afficher l'étiquette de l'espace de travail dans le coin supérieur gauche des groupes de tâches.",
"label": "Afficher l'étiquette de l'espace de travail"
}
},
"tray": {
@@ -557,6 +553,7 @@
},
"workspace-labels": {
"index": "Index",
"index+name": "Index et Nom",
"name": "Nom",
"none": "Aucun"
}
Assets/Translations/nl.json
+2 -5
View File
@@ -314,13 +314,9 @@
}
},
"taskbar-grouped": {
"show-numbers-only-when-occupied": {
"show-labels-only-when-occupied": {
"description": "Toon alleen de werkomgevinglabels voor werkomgevingen met open vensters.",
"label": "Label alleen tonen wanneer bezet"
},
"show-workspace-numbers": {
"description": "Toon het label van de werkruimte in de linkerbovenhoek van taakgroepen.",
"label": "Werkruimtelabel weergeven"
}
},
"tray": {
@@ -557,6 +553,7 @@
},
"workspace-labels": {
"index": "Index",
"index+name": "Index en Naam",
"name": "Naam",
"none": "Geen"
}
Assets/Translations/pt.json
+2 -5
View File
@@ -314,13 +314,9 @@
}
},
"taskbar-grouped": {
"show-numbers-only-when-occupied": {
"show-labels-only-when-occupied": {
"description": "Mostrar apenas o rótulo da área de trabalho para áreas de trabalho que têm janelas abertas.",
"label": "Mostrar rótulo somente quando ocupado."
},
"show-workspace-numbers": {
"description": "Exibir o rótulo do espaço de trabalho no canto superior esquerdo dos grupos de tarefas.",
"label": "Mostrar rótulo do espaço de trabalho"
}
},
"tray": {
@@ -557,6 +553,7 @@
},
"workspace-labels": {
"index": "Índice",
"index+name": "Índice e Nome",
"name": "Nome",
"none": "Nenhum"
}
Assets/Translations/ru.json
+2 -5
View File
@@ -314,13 +314,9 @@
}
},
"taskbar-grouped": {
"show-numbers-only-when-occupied": {
"show-labels-only-when-occupied": {
"description": "Отображать метку рабочего пространства только для тех рабочих пространств, в которых есть открытые окна.",
"label": "Показывать метку только когда занято"
},
"show-workspace-numbers": {
"description": "Отображать метку рабочего пространства в верхнем левом углу групп задач.",
"label": "Показать метку рабочей области"
}
},
"tray": {
@@ -557,6 +553,7 @@
},
"workspace-labels": {
"index": "Индекс",
"index+name": "Индекс и название",
"name": "Имя",
"none": "Нет"
}
Assets/Translations/tr.json
+2 -5
View File
@@ -314,13 +314,9 @@
}
},
"taskbar-grouped": {
"show-numbers-only-when-occupied": {
"show-labels-only-when-occupied": {
"description": "Sadece açık pencereleri olan çalışma alanları için çalışma alanı etiketini göster.",
"label": "Sadece dolu olduğunda etiketi göster."
},
"show-workspace-numbers": {
"description": "Görev gruplarının sol üst köşesinde çalışma alanı etiketini görüntüle.",
"label": "Çalışma alanı etiketini göster"
}
},
"tray": {
@@ -557,6 +553,7 @@
},
"workspace-labels": {
"index": "İndeks",
"index+name": "Dizin ve Ad",
"name": "İsim",
"none": "Hiçbiri"
}
Assets/Translations/uk-UA.json
+2 -5
View File
@@ -314,13 +314,9 @@
}
},
"taskbar-grouped": {
"show-numbers-only-when-occupied": {
"show-labels-only-when-occupied": {
"description": "Показувати мітку робочого простору лише для робочих просторів, які мають відкриті вікна.",
"label": "Показувати мітку лише коли зайнято"
},
"show-workspace-numbers": {
"description": "Відображати мітку робочої області у верхньому лівому куті груп завдань.",
"label": "Показати мітку робочої області"
}
},
"tray": {
@@ -557,6 +553,7 @@
},
"workspace-labels": {
"index": "Індекс",
"index+name": "Індекс та назва",
"name": "Назва",
"none": "Немає"
}
Assets/Translations/zh-CN.json
+2 -5
View File
@@ -314,13 +314,9 @@
}
},
"taskbar-grouped": {
"show-numbers-only-when-occupied": {
"show-labels-only-when-occupied": {
"description": "只显示有打开窗口的工作区标签。",
"label": "仅在被占用时显示标签"
},
"show-workspace-numbers": {
"description": "在任务组左上角显示工作区标签。",
"label": "显示工作区标签"
}
},
"tray": {
@@ -557,6 +553,7 @@
},
"workspace-labels": {
"index": "索引",
"index+name": "索引和名称",
"name": "名称",
"none": "无"
}
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
@@ -321,7 +320,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
@@ -388,11 +387,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
+6 -12
View File
@@ -44,8 +44,10 @@ 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
minimumWidth: 200
@@ -68,16 +70,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