Merge pull request #526 from luleyleo/wifi-pill

Display SSID in WiFi bar pill

Modules/Bar/Widgets/WiFi.qml

@@ -1,46 +1,83 @@
 import QtQuick
-import QtQuick.Layouts
-import QtQuick.Controls
 import Quickshell
-import Quickshell.Wayland
 import qs.Commons
 import qs.Services
-import qs.Widgets
+import qs.Modules.Bar.Extras
 
-NIconButton {
+Item {
   id: root
 
   property ShellScreen screen
 
-  density: Settings.data.bar.density
-  baseSize: Style.capsuleHeight
-  applyUiScale: false
-  colorBg: (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent)
-  colorFg: Color.mOnSurface
-  colorBorder: Color.transparent
-  colorBorderHover: Color.transparent
-  tooltipText: I18n.tr("tooltips.manage-wifi")
-  tooltipDirection: BarService.getTooltipDirection()
-  icon: {
-    try {
-      if (NetworkService.ethernetConnected) {
-        return "ethernet"
+  // Widget properties passed from Bar.qml for per-instance settings
+  property string widgetId: ""
+  property string section: ""
+  property int sectionWidgetIndex: -1
+  property int sectionWidgetsCount: 0
+
+  property var widgetMetadata: BarWidgetRegistry.widgetMetadata[widgetId]
+  property var widgetSettings: {
+    if (section && sectionWidgetIndex >= 0) {
+      var widgets = Settings.data.bar.widgets[section]
+      if (widgets && sectionWidgetIndex < widgets.length) {
+        return widgets[sectionWidgetIndex]
       }
-      let connected = false
-      let signalStrength = 0
-      for (const net in NetworkService.networks) {
-        if (NetworkService.networks[net].connected) {
-          connected = true
-          signalStrength = NetworkService.networks[net].signal
-          break
-        }
-      }
-      return connected ? NetworkService.signalIcon(signalStrength) : "wifi-off"
-    } catch (error) {
-      Logger.e("Wi-Fi", "Error getting icon:", error)
-      return "signal_wifi_bad"
     }
+    return {}
+  }
+
+  readonly property bool isBarVertical: Settings.data.bar.position === "left" || Settings.data.bar.position === "right"
+  readonly property string displayMode: widgetSettings.displayMode !== undefined ? widgetSettings.displayMode : widgetMetadata.displayMode
+
+  implicitWidth: pill.width
+  implicitHeight: pill.height
+
+  BarPill {
+    id: pill
+
+    density: Settings.data.bar.density
+    rightOpen: BarService.getPillDirection(root)
+    icon: {
+      try {
+        if (NetworkService.ethernetConnected) {
+          return "ethernet"
+        }
+        let connected = false
+        let signalStrength = 0
+        for (const net in NetworkService.networks) {
+          if (NetworkService.networks[net].connected) {
+            connected = true
+            signalStrength = NetworkService.networks[net].signal
+            break
+          }
+        }
+        return connected ? NetworkService.signalIcon(signalStrength) : "wifi-off"
+      } catch (error) {
+        Logger.e("Wi-Fi", "Error getting icon:", error)
+        return "signal_wifi_bad"
+      }
+    }
+    text: {
+      try {
+        if (NetworkService.ethernetConnected) {
+          return ""
+        }
+        for (const net in NetworkService.networks) {
+          if (NetworkService.networks[net].connected) {
+            return net
+          }
+        }
+        return ""
+      } catch (error) {
+        Logger.e("Wi-Fi", "Error getting ssid:", error)
+        return "error"
+      }
+    }
+    autoHide: false
+    forceOpen: root.displayMode === "alwaysShow"
+    forceClose: root.displayMode === "alwaysHide" || !pill.text
+    onClicked: PanelService.getPanel("wifiPanel")?.toggle(this)
+    onRightClicked: PanelService.getPanel("wifiPanel")?.toggle(this)
+    tooltipText: I18n.tr("tooltips.manage-wifi")
   }
-  onClicked: PanelService.getPanel("wifiPanel")?.toggle(this)
-  onRightClicked: PanelService.getPanel("wifiPanel")?.toggle(this)
 }

Modules/Settings/Bar/BarWidgetSettingsDialog.qml

@@ -133,6 +133,7 @@ Popup {
       "Spacer": "WidgetSettings/SpacerSettings.qml",
       "SystemMonitor": "WidgetSettings/SystemMonitorSettings.qml",
       "Volume": "WidgetSettings/VolumeSettings.qml",
+      "WiFi": "WidgetSettings/WiFiSettings.qml",
       "Workspace": "WidgetSettings/WorkspaceSettings.qml",
       "Taskbar": "WidgetSettings/TaskbarSettings.qml",
       "Tray": "WidgetSettings/TraySettings.qml"

Modules/Settings/Bar/WidgetSettings/WiFiSettings.qml

@@ -0,0 +1,40 @@
+import QtQuick
+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
+
+  // Local state
+  property string valueDisplayMode: widgetData.displayMode !== undefined ? widgetData.displayMode : widgetMetadata.displayMode
+
+  function saveSettings() {
+    var settings = Object.assign({}, widgetData || {})
+    settings.displayMode = valueDisplayMode
+    return settings
+  }
+
+  NComboBox {
+    label: I18n.tr("bar.widget-settings.battery.display-mode.label")
+    description: I18n.tr("bar.widget-settings.battery.display-mode.description")
+    minimumWidth: 134
+    model: [{
+        "key": "onhover",
+        "name": I18n.tr("options.display-mode.on-hover")
+      }, {
+        "key": "alwaysShow",
+        "name": I18n.tr("options.display-mode.always-show")
+      }, {
+        "key": "alwaysHide",
+        "name": I18n.tr("options.display-mode.always-hide")
+      }]
+    currentKey: root.valueDisplayMode
+    onSelected: key => root.valueDisplayMode = key
+  }
+}

Services/BarWidgetRegistry.qml

@@ -129,6 +129,10 @@ Singleton {
                                     "blacklist": [],
                                     "colorizeIcons": false
                                   },
+                                  "WiFi": {
+                                    "allowUserSettings": true,
+                                    "displayMode": "onhover"
+                                  },
                                   "Workspace": {
                                     "allowUserSettings": true,
                                     "labelMode": "index",