TaskbarGrouped: add scroll support

TaskbarGroupoedSettings: add colorize, hide when unoccupied, name display settings

Modules/Panels/Settings/Bar/WidgetSettings/TaskbarGroupedSettings.qml

@@ -12,16 +12,56 @@ ColumnLayout {
   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
+  property string valueLabelMode: widgetData.labelMode !== undefined ? widgetData.labelMode : (widgetMetadata ? widgetMetadata.labelMode : "index")
+  property bool valueHideUnoccupied: widgetData.hideUnoccupied !== undefined ? widgetData.hideUnoccupied : (widgetMetadata ? widgetMetadata.hideUnoccupied : false)
+  property bool valueShowWorkspaceNumbers: widgetData.showWorkspaceNumbers !== undefined ? widgetData.showWorkspaceNumbers : (widgetMetadata ? widgetMetadata.showWorkspaceNumbers : true)
+  property bool valueShowNumbersOnlyWhenOccupied: widgetData.showNumbersOnlyWhenOccupied !== undefined ? widgetData.showNumbersOnlyWhenOccupied : (widgetMetadata ? widgetMetadata.showNumbersOnlyWhenOccupied : true)
+  property bool valueColorizeIcons: widgetData.colorizeIcons !== undefined ? widgetData.colorizeIcons : (widgetMetadata ? widgetMetadata.colorizeIcons : false)
 
   function saveSettings() {
     var settings = Object.assign({}, widgetData || {})
+    settings.labelMode = valueLabelMode
+    settings.hideUnoccupied = valueHideUnoccupied
     settings.showWorkspaceNumbers = valueShowWorkspaceNumbers
     settings.showNumbersOnlyWhenOccupied = valueShowNumbersOnlyWhenOccupied
+    settings.colorizeIcons = valueColorizeIcons
     return settings
   }
 
+  NComboBox {
+    id: labelModeCombo
+    label: I18n.tr("bar.widget-settings.workspace.label-mode.label")
+    description: I18n.tr("bar.widget-settings.workspace.label-mode.description")
+    model: [{
+        "key": "none",
+        "name": I18n.tr("options.workspace-labels.none")
+      }, {
+        "key": "index",
+        "name": I18n.tr("options.workspace-labels.index")
+      }, {
+        "key": "name",
+        "name": I18n.tr("options.workspace-labels.name")
+      }]
+    currentKey: widgetData.labelMode || widgetMetadata.labelMode
+    onSelected: key => valueLabelMode = key
+    minimumWidth: 200
+  }
+
+  NToggle {
+    label: I18n.tr("bar.widget-settings.workspace.hide-unoccupied.label")
+    description: I18n.tr("bar.widget-settings.workspace.hide-unoccupied.description")
+    checked: valueHideUnoccupied
+    onToggled: checked => valueHideUnoccupied = checked
+  }
+
+  NToggle {
+    Layout.fillWidth: true
+    label: I18n.tr("bar.widget-settings.active-window.colorize-icons.label")
+    description: I18n.tr("bar.widget-settings.active-window.colorize-icons.description")
+    checked: root.valueColorizeIcons
+    onToggled: checked => root.valueColorizeIcons = checked
+  }
+
   NToggle {
     Layout.fillWidth: true
     label: I18n.tr("bar.widget-settings.taskbar-grouped.show-workspace-numbers.label")

Modules/Panels/Settings/SettingsPanel.qml

@@ -260,6 +260,17 @@ SmartPanel {
                      "icon": "settings-screen-recorder",
                      "source": screenRecorderTab
                    }, {
+                     "id": SettingsPanel.Tab.SessionMenu,
+                     "label": "settings.session-menu.title",
+                     "icon": "settings-session-menu",
+                     "source": sessionMenuTab
+                   }, //  {
+                   //    "id": SettingsPanel.Tab.SystemMonitor,
+                   //    "label": "settings.system-monitor.title",
+                   //    "icon": "settings-system-monitor",
+                   //    "source": systemMonitorTab
+                   //  },
+                   {
                      "id": SettingsPanel.Tab.Hooks,
                      "label": "settings.hooks.title",
                      "icon": "settings-hooks",