lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

battery: new stuff from turannul

Browse Source
This commit is contained in:
Lemmy
2026-01-28 10:52:31 -05:00
parent 05ace82b52
commit a14d80abdd
3 changed files with 76 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Bar/Widgets/Battery.qml
+17 -5
View File
@@ -62,16 +62,23 @@ Item {
}
readonly property bool hasBluetoothBattery: BatteryService.isBluetoothDevice(device)
readonly property bool isReady: testMode ? true : (BatteryService.ready && BatteryService.isDeviceReady(device))
readonly property bool isReady: testMode ? true : (initializationComplete && BatteryService.isDeviceReady(device))
readonly property real percent: testMode ? testPercent : (isReady ? BatteryService.getPercentage(device) : 0)
readonly property bool isCharging: testMode ? testCharging : (isReady ? BatteryService.isCharging(device) : false)
readonly property bool isPluggedIn: testMode ? testPluggedIn : (isReady ? BatteryService.isPluggedIn(device) : false)
property bool initializationComplete: false
property bool hasNotifiedLowBattery: false
visible: shouldShow
opacity: shouldShow ? 1.0 : 0.0
Timer {
interval: 500
running: true
onTriggered: root.initializationComplete = true
}
readonly property bool isDevicePresent: {
if (testMode)
return true;
@@ -97,7 +104,7 @@ Item {
}
Connections {
target: device
target: (device && !BatteryService.isBluetoothDevice(device)) ? device : null
function onPercentageChanged() {
if (device) {
maybeNotify(getCurrentPercent(), isCharging, isPluggedIn, isReady);
@@ -116,6 +123,11 @@ Item {
Connections {
target: (device && BatteryService.isBluetoothDevice(device)) ? device : null
function onBatteryChanged() {
if (device) {
maybeNotify(getCurrentPercent(), isCharging, isPluggedIn, isReady);
}
}
}
NPopupContextMenu {
@@ -148,9 +160,9 @@ Item {
suffix: "%"
autoHide: false
forceOpen: isReady && displayMode === "alwaysShow"
forceClose: displayMode === "alwaysHide" || (BatteryService.ready && !isReady)
customBackgroundColor: !BatteryService.ready ? "transparent" : (isCharging ? Color.mPrimary : (isLowBattery ? Color.mError : "transparent"))
customTextIconColor: !BatteryService.ready ? "transparent" : (isCharging ? Color.mOnPrimary : (isLowBattery ? Color.mOnError : "transparent"))
forceClose: displayMode === "alwaysHide" || (initializationComplete && !isReady)
customBackgroundColor: !initializationComplete ? "transparent" : (isCharging ? Color.mPrimary : (isLowBattery ? Color.mError : "transparent"))
customTextIconColor: !initializationComplete ? "transparent" : (isCharging ? Color.mOnPrimary : (isLowBattery ? Color.mOnError : "transparent"))
tooltipText: {
let lines = [];
Modules/Panels/Settings/Bar/WidgetSettings/BatterySettings.qml
+8 -34
View File
@@ -4,7 +4,6 @@ import QtQuick.Layouts
import qs.Commons
import qs.Services.Hardware
import qs.Widgets
import qs.Services.Hardware
ColumnLayout {
id: root
@@ -14,8 +13,6 @@ ColumnLayout {
property var widgetData: null
property var widgetMetadata: null
signal settingsChanged(var settings)
// Local state
property string valueDisplayMode: widgetData.displayMode !== undefined ? widgetData.displayMode : widgetMetadata.displayMode
property int valueWarningThreshold: widgetData.warningThreshold !== undefined ? widgetData.warningThreshold : widgetMetadata.warningThreshold
@@ -58,10 +55,7 @@ ColumnLayout {
minimumWidth: 200
model: root.deviceModel
currentKey: root.valueDeviceNativePath
onSelected: key => {
root.valueDeviceNativePath = key;
settingsChanged(saveSettings());
}
onSelected: key => root.valueDeviceNativePath = key
}
// Update currentKey when model changes to ensure selection is preserved
@@ -75,17 +69,15 @@ ColumnLayout {
NIconButton {
icon: "refresh"
// TODO i18n
tooltipText: "Refresh device list"
onClicked: BatteryService.devicesModel = BatteryService.buildDeviceModel()
}
}
NComboBox {
Layout.fillWidth: true
label: I18n.tr("bar.volume.display-mode-label")
description: I18n.tr("bar.volume.display-mode-description")
minimumWidth: 240
minimumWidth: 134
model: [
{
"key": "onhover",
@@ -101,10 +93,7 @@ ColumnLayout {
}
]
currentKey: root.valueDisplayMode
onSelected: key => {
root.valueDisplayMode = key;
settingsChanged(saveSettings());
}
onSelected: key => root.valueDisplayMode = key
}
NSpinBox {
@@ -114,49 +103,34 @@ ColumnLayout {
suffix: "%"
minimum: 5
maximum: 50
onValueChanged: {
valueWarningThreshold = value;
settingsChanged(saveSettings());
}
onValueChanged: valueWarningThreshold = value
}
NToggle {
label: I18n.tr("bar.battery.show-power-profile-label")
description: I18n.tr("bar.battery.show-power-profile-description")
checked: valueShowPowerProfiles
onToggled: checked => {
valueShowPowerProfiles = checked;
settingsChanged(saveSettings());
}
onToggled: checked => valueShowPowerProfiles = checked
}
NToggle {
label: I18n.tr("bar.battery.show-noctalia-performance-label")
description: I18n.tr("bar.battery.show-noctalia-performance-description")
checked: valueShowNoctaliaPerformance
onToggled: checked => {
valueShowNoctaliaPerformance = checked;
settingsChanged(saveSettings());
}
onToggled: checked => valueShowNoctaliaPerformance = checked
}
NToggle {
label: I18n.tr("bar.battery.hide-if-not-detected-label")
description: I18n.tr("bar.battery.hide-if-not-detected-description")
checked: valueHideIfNotDetected
onToggled: checked => {
valueHideIfNotDetected = checked;
settingsChanged(saveSettings());
}
onToggled: checked => valueHideIfNotDetected = checked
}
NToggle {
label: I18n.tr("bar.battery.hide-if-idle-label")
description: I18n.tr("bar.battery.hide-if-idle-description")
checked: valueHideIfIdle
onToggled: checked => {
valueHideIfIdle = checked;
settingsChanged(saveSettings());
}
onToggled: checked => valueHideIfIdle = checked
}
}
Services/Hardware/BatteryService.qml
+51 -44
View File
@@ -29,17 +29,9 @@ Singleton {
if (!UPower.devices)
return UPower.displayDevice;
// 2. Determine the primary device (System Battery)
readonly property var primaryDevice: {
if (devices.length === 0)
return null;
var devices = UPower.devices.values || [];
// Prioritize DisplayDevice (Aggregate)
if (UPower.displayDevice && UPower.displayDevice.type === UPowerDeviceType.Battery && isDevicePresent(UPower.displayDevice)) {
return UPower.displayDevice;
}
// Prioritize BAT0
// 1. Explicitly look for BAT0 first
for (var i = 0; i < devices.length; i++) {
var d = devices[i];
if (d && (d.nativePath === "BAT0" || d.objectPath === "/org/freedesktop/UPower/devices/battery_BAT0")) {
@@ -47,11 +39,16 @@ Singleton {
}
}
// Prioritize (any) Laptop Battery
// 2. Fallback to displayDevice if it's a laptop battery
if (UPower.displayDevice && UPower.displayDevice.isLaptopBattery) {
return UPower.displayDevice;
}
// 3. Any other device marked as a laptop battery
for (var j = 0; j < devices.length; j++) {
var dev = devices[j];
if (dev && !isBluetoothDevice(dev) && dev.isLaptopBattery) {
return dev;
var device = devices[j];
if (device && device.type === UPowerDeviceType.Battery && device.isLaptopBattery) {
return device;
}
}
@@ -95,11 +92,21 @@ Singleton {
return _laptopBattery;
}
Timer {
interval: 500
running: true
repeat: false
onTriggered: root.initializationComplete = true
if (!UPower.devices) {
return null;
}
var deviceArray = UPower.devices.values || [];
for (var i = 0; i < deviceArray.length; i++) {
var device = deviceArray[i];
if (device && device.nativePath === nativePath) {
if (device.type === UPowerDeviceType.LinePower) {
continue;
}
return device;
}
}
return null;
}
// MARK: findBluetoothDevice
@@ -108,23 +115,18 @@ Singleton {
return null;
}
// Check for DisplayDevice explicitly if requested via "DisplayDevice" or empty string
if (nativePath === "DisplayDevice" && UPower.displayDevice) {
return UPower.displayDevice;
var macMatch = nativePath.match(/([0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2}:[0-9a-fA-F]{2})/);
if (!macMatch) {
return null;
}
// Search in our cached list
for (var i = 0; i < devices.length; i++) {
var d = devices[i];
if (isBluetoothDevice(d)) {
if (d.address && d.address.toUpperCase() === nativePath.toUpperCase())
return d;
// Try matching MAC in path string if passed format differs
if (nativePath.includes(d.address.toUpperCase()))
return d;
} else {
if (d.nativePath === nativePath)
return d;
var macAddress = macMatch[1].toUpperCase();
var deviceArray = BluetoothService.devices.values || [];
for (var i = 0; i < deviceArray.length; i++) {
var device = deviceArray[i];
if (device && device.address && device.address.toUpperCase() === macAddress) {
return device;
}
}
return null;
@@ -135,7 +137,7 @@ Singleton {
if (!device)
return false;
// Handle Bluetooth devices
// Handle Bluetooth devices (identified by having batteryAvailable property)
if (device.batteryAvailable !== undefined) {
return device.connected === true;
}
@@ -145,8 +147,11 @@ Singleton {
if (device.type === UPowerDeviceType.Battery && device.isPresent !== undefined) {
return device.isPresent === true;
}
// Fallback for non-battery UPower devices or if isPresent is missing
return device.ready && device.percentage !== undefined;
}
return false;
}
@@ -158,6 +163,7 @@ Singleton {
if (device.batteryAvailable !== undefined) {
return device.battery !== undefined;
}
return device.ready && device.percentage !== undefined;
}
@@ -257,7 +263,7 @@ Singleton {
Qt.callLater(refreshHealth);
}
}
// MARK: getIcon
// MARK: getIcon
function getIcon(percent, charging, pluggedIn, isReady) {
if (!isReady) {
return "battery-exclamation";
@@ -291,7 +297,6 @@ Singleton {
return primaryDevice !== null;
}
// MARK: Battery
// MARK: getRateText
function getRateText(device) {
@@ -312,7 +317,6 @@ Singleton {
}
}
// MARK: BatteryPanel
readonly property var externalBatteries: {
var list = [];
@@ -349,14 +353,14 @@ Singleton {
return I18n.tr("common.idle");
}
// MARK: BatterySettings
property var devicesModel: buildDeviceModel()
function buildDeviceModel() {
var model = [
{
"key": UPower.devices.DisplayDevice || "", // It was capital D and i spend an hour to figure out [why tf this do absolutely nothing] XD (I hate my left shift it sticks)
"key": UPower.devices.DisplayDevice || "" // It was capital D and i spend an hour to figure out [why tf this do absolutely nothing] XD (I hate my left shift it sticks)
,
"name": I18n.tr("bar.battery.device-default")
}
];
@@ -371,9 +375,9 @@ Singleton {
}
var displayName = device.model || device.nativePath || "Unknown";
model.push({
"key": device.nativePath || "",
"name": displayName
});
"key": device.nativePath || "",
"name": displayName
});
}
}
return model;
@@ -396,6 +400,9 @@ Singleton {
Connections {
target: UPower.devices
function onValuesChanged() { modelUpdateTimer.restart(); devicesModel = buildDeviceModel(); }
function onValuesChanged() {
modelUpdateTimer.restart();
devicesModel = buildDeviceModel();
}
}
}