morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-15 00:34:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

feat: added current capacity value to the network popup view (#1235)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2022-12-20 17:31:31 +01:00
parent a26b450dd8
commit 810ec885ab
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Modules/Battery/main.swift
View File

@@ -25,6 +25,7 @@ struct Battery_Usage: value_t {
var designedCapacity: Int = 0
var maxCapacity: Int = 0
var currentCapacity: Int = 0
var amperage: Int = 0
var voltage: Double = 0

7
Modules/Battery/popup.swift
View File

@@ -160,7 +160,7 @@ internal class Popup: NSView, Popup_p {
self.sourceField = popupRow(container, title: "\(localizedString("Source")):", value: "").1
self.healthField = popupRow(container, title: "\(localizedString("Health")):", value: "").1
self.capacityField = popupRow(container, title: "\(localizedString("Capacity")):", value: "").1
self.capacityField?.toolTip = localizedString("maximum / designed")
self.capacityField?.toolTip = localizedString("current / maximum / designed")
self.cyclesField = popupRow(container, title: "\(localizedString("Cycles")):", value: "").1
let t = self.labelValue(container, title: "\(localizedString("Time")):", value: "")
self.timeLabelField = t.0
@@ -251,7 +251,8 @@ internal class Popup: NSView, Popup_p {
DispatchQueue.main.async(execute: {
self.dashboardBatteryView?.setValue(abs(value.level))
self.levelField?.stringValue = "\(Int(abs(value.level) * 100)) %"
self.levelField?.stringValue = "\(Int(abs(value.level) * 100))%"
self.levelField?.toolTip = "\(value.currentCapacity) mAh"
self.sourceField?.stringValue = localizedString(value.powerSource)
self.timeField?.stringValue = ""
@@ -280,7 +281,7 @@ internal class Popup: NSView, Popup_p {
}
self.healthField?.stringValue = "\(value.health)%"
self.capacityField?.stringValue = "\(value.maxCapacity) / \(value.designedCapacity) mAh"
self.capacityField?.stringValue = "\(value.currentCapacity) / \(value.maxCapacity) / \(value.designedCapacity) mAh"
if let state = value.state {
self.healthField?.stringValue += " (\(state))"

1
Modules/Battery/readers.swift
View File

@@ -89,6 +89,7 @@ internal class UsageReader: Reader<Battery_Usage> {
self.usage.cycles = self.getIntValue("CycleCount" as CFString) ?? 0
self.usage.currentCapacity = self.getIntValue("AppleRawCurrentCapacity" as CFString) ?? 0
self.usage.designedCapacity = self.getIntValue("DesignCapacity" as CFString) ?? 1
self.usage.maxCapacity = self.getIntValue((isARM ? "AppleRawMaxCapacity" : "MaxCapacity") as CFString) ?? 1
if !isARM {