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

Merge pull request #648 from ahmet-cetinkaya/feat/taskbar-workspace-numbers

Browse Source 
feat(bar): add workspace numbers to TaskbarGrouped widget
This commit is contained in:
Lemmy
2025-11-10 12:30:19 -05:00
committed by GitHub
parent a817b1d162 fa3e6a02b9
commit 02c250ab37
12 changed files with 290 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Translations/de.json
+10
View File
@@ -282,6 +282,16 @@
"label": "Nur vom gleichen Bildschirm"
}
},
"taskbar-grouped": {
"show-workspace-numbers": {
"label": "Arbeitsbereichsnummern anzeigen",
"description": "Arbeitsbereichsnummern in der oberen linken Ecke der Task-Gruppen anzeigen."
},
"show-numbers-only-when-occupied": {
"label": "Nur bei belegten Arbeitsbereichen anzeigen",
"description": "Arbeitsbereichsnummern nur für Arbeitsbereiche mit geöffneten Fenstern anzeigen."
}
},
"tray": {
"colorize-icons": {
"description": "Theme-Farben auf Tray-Symbole anwenden.",
Assets/Translations/en.json
+10
View File
@@ -282,6 +282,16 @@
"label": "Only from same output"
}
},
"taskbar-grouped": {
"show-workspace-numbers": {
"label": "Show workspace numbers",
"description": "Display workspace numbers in the top-left corner of task groups."
},
"show-numbers-only-when-occupied": {
"label": "Show numbers only when occupied",
"description": "Only show workspace numbers for workspaces that have open windows."
}
},
"tray": {
"colorize-icons": {
"description": "Apply theme colors to tray icons.",
Assets/Translations/es.json
+10
View File
@@ -282,6 +282,16 @@
"label": "Solo de la misma salida"
}
},
"taskbar-grouped": {
"show-workspace-numbers": {
"label": "Mostrar números de espacio de trabajo",
"description": "Mostrar números de espacio de trabajo en la esquina superior izquierda de los grupos de tareas."
},
"show-numbers-only-when-occupied": {
"label": "Mostrar números solo cuando estén ocupados",
"description": "Mostrar números de espacio de trabajo solo para espacios de trabajo con ventanas abiertas."
}
},
"tray": {
"colorize-icons": {
"description": "Aplicar colores del tema a los iconos de la bandeja del sistema.",
Assets/Translations/fr.json
+10
View File
@@ -282,6 +282,16 @@
"label": "Seulement à partir de la même sortie"
}
},
"taskbar-grouped": {
"show-workspace-numbers": {
"label": "Afficher les numéros d'espace de travail",
"description": "Afficher les numéros d'espace de travail dans le coin supérieur gauche des groupes de tâches."
},
"show-numbers-only-when-occupied": {
"label": "Afficher les numéros seulement lorsqu'occupés",
"description": "Afficher les numéros d'espace de travail uniquement pour les espaces de travail avec des fenêtres ouvertes."
}
},
"tray": {
"colorize-icons": {
"description": "Appliquer les couleurs du thème aux icônes de la barre système.",
Assets/Translations/pt.json
+10
View File
@@ -282,6 +282,16 @@
"label": "Apenas da mesma saída"
}
},
"taskbar-grouped": {
"show-workspace-numbers": {
"label": "Mostrar números do espaço de trabalho",
"description": "Exibir números do espaço de trabalho no canto superior esquerdo dos grupos de tarefas."
},
"show-numbers-only-when-occupied": {
"label": "Mostrar números apenas quando ocupados",
"description": "Mostrar números do espaço de trabalho apenas para espaços de trabalho com janelas abertas."
}
},
"tray": {
"colorize-icons": {
"description": "Aplicar cores do tema aos ícones da bandeja do sistema.",
Assets/Translations/tr.json
+10
View File
@@ -282,6 +282,16 @@
"label": "Sadece aynı çıktıdan"
}
},
"taskbar-grouped": {
"show-workspace-numbers": {
"label": "Çalışma alanı numaralarını göster",
"description": "Görev gruplarının sol üst köşesinde çalışma alanı numaralarını göster."
},
"show-numbers-only-when-occupied": {
"label": "Yalnızca dolu olduğunda numaraları göster",
"description": "Çalışma alanı numaralarını yalnızca açık pencereleri olan çalışma alanları için göster."
}
},
"tray": {
"colorize-icons": {
"description": "Tepsi ikonlarına tema renklerini uygula.",
Assets/Translations/uk-UA.json
+10
View File
@@ -282,6 +282,16 @@
"label": "Тільки з того ж виходу"
}
},
"taskbar-grouped": {
"show-workspace-numbers": {
"label": "Показувати номери робочих просторів",
"description": "Показувати номери робочих просторів у лівому верхньому куті групи завдань"
},
"show-numbers-only-when-occupied": {
"label": "Показувати номера лише коли зайнято",
"description": "Показувати номери лише для робочих просторів з відкритими вікнами"
}
},
"tray": {
"colorize-icons": {
"description": "Застосувати кольори теми до значків трея.",
Assets/Translations/zh-CN.json
+10
View File
@@ -282,6 +282,16 @@
"label": "仅显示同屏幕"
}
},
"taskbar-grouped": {
"show-workspace-numbers": {
"label": "显示工作区编号",
"description": "在任务组左上角显示工作区编号"
},
"show-numbers-only-when-occupied": {
"label": "仅在有窗口时显示编号",
"description": "只为有打开窗口的工作区显示编号"
}
},
"tray": {
"colorize-icons": {
"description": "将主题颜色应用到系统托盘图标。",
Modules/Bar/Widgets/TaskbarGrouped.qml
+165
View File
@@ -34,7 +34,12 @@ Item {
return {}
}
readonly property bool hideUnoccupied: (widgetSettings.hideUnoccupied !== undefined) ? widgetSettings.hideUnoccupied : false
readonly property bool showWorkspaceNumbers: (widgetSettings.showWorkspaceNumbers !== undefined) ? widgetSettings.showWorkspaceNumbers : true
readonly property bool showNumbersOnlyWhenOccupied: (widgetSettings.showNumbersOnlyWhenOccupied !== undefined) ? widgetSettings.showNumbersOnlyWhenOccupied : true
property ListModel localWorkspaces: ListModel {}
property real masterProgress: 0.0
property bool effectsActive: false
property color effectColor: Color.mPrimary
function refreshWorkspaces() {
localWorkspaces.clear()
@@ -57,6 +62,22 @@ Item {
localWorkspaces.append(workspaceData)
}
updateWorkspaceFocus()
}
function triggerUnifiedWave() {
effectColor = Color.mPrimary
masterAnimation.restart()
}
function updateWorkspaceFocus() {
for (var i = 0; i < localWorkspaces.count; i++) {
const ws = localWorkspaces.get(i)
if (ws.isFocused === true) {
root.triggerUnifiedWave()
break
}
}
}
Component.onCompleted: {
@@ -80,6 +101,33 @@ Item {
}
}
SequentialAnimation {
id: masterAnimation
PropertyAction {
target: root
property: "effectsActive"
value: true
}
NumberAnimation {
target: root
property: "masterProgress"
from: 0.0
to: 1.0
duration: Style.animationSlow * 2
easing.type: Easing.OutQuint
}
PropertyAction {
target: root
property: "effectsActive"
value: false
}
PropertyAction {
target: root
property: "masterProgress"
value: 0.0
}
}
Component {
id: workspaceRepeaterDelegate
@@ -107,6 +155,123 @@ Item {
}
}
Item {
id: workspaceNumberContainer
visible: root.showWorkspaceNumbers && (!root.showNumbersOnlyWhenOccupied || container.hasWindows)
anchors {
left: parent.left
top: parent.top
leftMargin: -Style.fontSizeXS * 0.5
topMargin: -Style.fontSizeXS * 0.5
}
width: Math.max(workspaceNumber.implicitWidth + Style.marginXS, Style.fontSizeXXS * 2)
height: Math.max(workspaceNumber.implicitHeight + Style.marginXS, Style.fontSizeXXS * 2)
Rectangle {
id: workspaceNumberBackground
anchors.fill: parent
radius: width * 0.5
color: {
if (workspaceModel.isFocused)
return Color.mPrimary
if (workspaceModel.isUrgent)
return Color.mError
if (hasWindows)
return Color.mSecondary
return Qt.alpha(Color.mOutline, 0.3)
}
scale: workspaceModel.isActive ? 1.0 : 0.9
Behavior on scale {
NumberAnimation {
duration: Style.animationNormal
easing.type: Easing.OutBack
}
}
Behavior on color {
ColorAnimation {
duration: Style.animationFast
easing.type: Easing.InOutCubic
}
}
}
// Burst effect overlay for focused workspace number (smaller outline)
Rectangle {
id: workspaceNumberBurst
anchors.centerIn: workspaceNumberContainer
width: workspaceNumberContainer.width + 12 * root.masterProgress
height: workspaceNumberContainer.height + 12 * root.masterProgress
radius: width / 2
color: Color.transparent
border.color: root.effectColor
border.width: Math.max(1, Math.round((2 + 4 * (1.0 - root.masterProgress))))
opacity: root.effectsActive && workspaceModel.isFocused ? (1.0 - root.masterProgress) * 0.7 : 0
visible: root.effectsActive && workspaceModel.isFocused
z: 1
}
NText {
id: workspaceNumber
anchors.centerIn: parent
text: workspaceModel.idx.toString()
family: Settings.data.ui.fontFixed
font {
pointSize: Style.fontSizeXXS
weight: Style.fontWeightBold
capitalization: Font.AllUppercase
}
applyUiScale: false
color: {
if (workspaceModel.isFocused)
return Color.mOnPrimary
if (workspaceModel.isUrgent)
return Color.mOnError
if (hasWindows)
return Color.mOnSecondary
return Color.mOnSurface
}
opacity: {
if (workspaceModel.isFocused)
return 1.0
if (workspaceModel.isUrgent)
return 0.9
if (hasWindows)
return 0.8
return 0.6
}
Behavior on opacity {
NumberAnimation {
duration: Style.animationFast
easing.type: Easing.InOutCubic
}
}
}
Behavior on opacity {
NumberAnimation {
duration: Style.animationFast
easing.type: Easing.InOutCubic
}
}
}
Flow {
id: iconsFlow
Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml
+1
View File
@@ -128,6 +128,7 @@ Popup {
"NotificationHistory": "WidgetSettings/NotificationHistorySettings.qml",
"Spacer": "WidgetSettings/SpacerSettings.qml",
"SystemMonitor": "WidgetSettings/SystemMonitorSettings.qml",
"TaskbarGrouped": "WidgetSettings/TaskbarGroupedSettings.qml",
"Volume": "WidgetSettings/VolumeSettings.qml",
"WiFi": "WidgetSettings/WiFiSettings.qml",
"Workspace": "WidgetSettings/WorkspaceSettings.qml",
Modules/Panels/Settings/Bar/WidgetSettings/TaskbarGroupedSettings.qml
+41
View File
@@ -0,0 +1,41 @@
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import qs.Commons
import qs.Widgets
ColumnLayout {
id: root
spacing: Style.marginM
// Properties to receive data from parent
property var widgetData: null
property var widgetMetadata: null
property bool valueShowWorkspaceNumbers: widgetData.showWorkspaceNumbers !== undefined ? widgetData.showWorkspaceNumbers : widgetMetadata.showWorkspaceNumbers
property bool valueShowNumbersOnlyWhenOccupied: widgetData.showNumbersOnlyWhenOccupied !== undefined ? widgetData.showNumbersOnlyWhenOccupied : widgetMetadata.showNumbersOnlyWhenOccupied
function saveSettings() {
var settings = Object.assign({}, widgetData || {})
settings.showWorkspaceNumbers = valueShowWorkspaceNumbers
settings.showNumbersOnlyWhenOccupied = valueShowNumbersOnlyWhenOccupied
return settings
}
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")
checked: root.valueShowNumbersOnlyWhenOccupied
onToggled: checked => root.valueShowNumbersOnlyWhenOccupied = checked
visible: root.valueShowWorkspaceNumbers
}
}
Services/UI/BarWidgetRegistry.qml
+3 -1
View File
@@ -157,7 +157,9 @@ Singleton {
"colorizeIcons": false
},
"TaskbarGrouped": {
"allowUserSettings": true
"allowUserSettings": true,
"showWorkspaceNumbers": true,
"showNumbersOnlyWhenOccupied": true
},
"Tray": {
"allowUserSettings": true,