BatterySettings: add option to pick which battery is being shown

BatteryPanel: remove redundant things

Modules/Panels/Settings/Bar/BarWidgetSettingsDialog.qml

@@ -153,9 +153,15 @@ Popup {
   function loadWidgetSettings() {
     const source = BarWidgetRegistry.widgetSettingsMap[widgetId];
     if (source) {
-      // Use setSource to pass properties at creation time
+      var currentWidgetData = widgetData;
+      if (sectionId && widgetIndex >= 0) {
+        var widgets = Settings.data.bar.widgets[sectionId];
+        if (widgets && widgetIndex < widgets.length) {
+          currentWidgetData = widgets[widgetIndex];
+        }
+      }
       settingsLoader.setSource(source, {
-                                 "widgetData": widgetData,
+                                 "widgetData": currentWidgetData,
                                  "widgetMetadata": BarWidgetRegistry.widgetMetadata[widgetId]
                                });
     }

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

@@ -1,6 +1,7 @@
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
+import Quickshell.Services.UPower
 import qs.Commons
 import qs.Widgets
 
@@ -15,14 +16,109 @@ ColumnLayout {
   // Local state
   property string valueDisplayMode: widgetData.displayMode !== undefined ? widgetData.displayMode : widgetMetadata.displayMode
   property int valueWarningThreshold: widgetData.warningThreshold !== undefined ? widgetData.warningThreshold : widgetMetadata.warningThreshold
+  property string valueDeviceNativePath: widgetData.deviceNativePath !== undefined ? widgetData.deviceNativePath : ""
+
+  // Build model of available battery devices
+  function buildDeviceModel() {
+    var model = [
+          {
+            "key": "",
+            "name": I18n.tr("bar.widget-settings.battery.device.default")
+          }
+        ];
+
+    if (!UPower.devices) {
+      return model;
+    }
+
+    var deviceArray = UPower.devices.values || [];
+    for (var i = 0; i < deviceArray.length; i++) {
+      var device = deviceArray[i];
+      if (!device || device.type === UPowerDeviceType.LinePower) {
+        continue;
+      }
+      var displayName = device.model || device.nativePath || "Unknown";
+      model.push({
+                   "key": device.nativePath || "",
+                   "name": displayName
+                 });
+    }
+    return model;
+  }
+
+  readonly property int _deviceCount: (UPower.devices && UPower.devices.values) ? UPower.devices.values.length : 0
+  property var deviceModel: buildDeviceModel()
+
+  on_DeviceCountChanged: {
+    deviceModel = buildDeviceModel();
+  }
+
+  Connections {
+    target: UPower.devices
+    function onValuesChanged() {
+      deviceModel = buildDeviceModel();
+    }
+  }
+
+  Timer {
+    id: refreshTimer
+    interval: 2000
+    running: true
+    repeat: true
+    onTriggered: {
+      var currentCount = (UPower.devices && UPower.devices.values) ? UPower.devices.values.length : 0;
+      if (currentCount !== root._deviceCount) {
+        deviceModel = buildDeviceModel();
+      }
+    }
+  }
 
   function saveSettings() {
     var settings = Object.assign({}, widgetData || {});
+    if (widgetData && widgetData.id) {
+      settings.id = widgetData.id;
+    }
     settings.displayMode = valueDisplayMode;
     settings.warningThreshold = valueWarningThreshold;
+    if (valueDeviceNativePath && valueDeviceNativePath !== "") {
+      settings.deviceNativePath = valueDeviceNativePath;
+    } else {
+      delete settings.deviceNativePath;
+    }
     return settings;
   }
 
+  RowLayout {
+    Layout.fillWidth: true
+    spacing: Style.marginM
+
+    NComboBox {
+      id: deviceComboBox
+      Layout.fillWidth: true
+      label: I18n.tr("bar.widget-settings.battery.device.label")
+      description: I18n.tr("bar.widget-settings.battery.device.description")
+      minimumWidth: 134
+      model: root.deviceModel
+      currentKey: root.valueDeviceNativePath
+      onSelected: key => root.valueDeviceNativePath = key
+    }
+
+    // Update currentKey when model changes to ensure selection is preserved
+    Connections {
+      target: root
+      function onDeviceModelChanged() {
+        // Force update of currentKey to trigger selection update
+        deviceComboBox.currentKey = root.valueDeviceNativePath;
+      }
+    }
+
+    NIconButton {
+      icon: "refresh"
+      tooltipText: "Refresh device list"
+      onClicked: deviceModel = buildDeviceModel()
+    }
+  }
+
   NComboBox {
     label: I18n.tr("bar.widget-settings.battery.display-mode.label")
     description: I18n.tr("bar.widget-settings.battery.display-mode.description")