feat: add information when last time charger was connected in the battery popup (#450)

2026-04-15 00:34:08 +09:00 · 2021-05-07 18:55:45 +02:00
parent 24d552f22d
commit a5ac0d25dc
25 changed files with 56 additions and 6 deletions
--- a/Modules/Battery/main.swift
+++ b/Modules/Battery/main.swift
@@ -31,6 +31,7 @@ struct Battery_Usage: value_t {
    
    var timeToEmpty: Int = 0
    var timeToCharge: Int = 0
+    var timeOnACPower: Date? = nil
    
    public var widget_value: Double {
        get {
--- a/Modules/Battery/popup.swift
+++ b/Modules/Battery/popup.swift
@@ -21,7 +21,7 @@ internal class Popup: NSView, Popup_p {
    private let dashboardHeight: CGFloat = 90

    private let detailsHeight: CGFloat = (22 * 5) + Constants.Popup.separatorHeight
-    private let batteryHeight: CGFloat = (22 * 4) + Constants.Popup.separatorHeight
+    private let batteryHeight: CGFloat = (22 * 5) + Constants.Popup.separatorHeight
    private let adapterHeight: CGFloat = (22 * 2) + Constants.Popup.separatorHeight
    private let processHeight: CGFloat = (22 * 1)
    
@@ -37,6 +37,7 @@ internal class Popup: NSView, Popup_p {
    private var timeField: NSTextField? = nil
    private var healthField: NSTextField? = nil
    private var cyclesField: NSTextField? = nil
+    private var lastChargeField: NSTextField? = nil
    
    private var amperageField: NSTextField? = nil
    private var voltageField: NSTextField? = nil
@@ -141,13 +142,14 @@ internal class Popup: NSView, Popup_p {
        let separator = SeparatorView(LocalizedString("Details"), origin: NSPoint(x: 0, y: self.detailsHeight-Constants.Popup.separatorHeight), width: self.frame.width)
        let container: NSView = NSView(frame: NSRect(x: 0, y: 0, width: self.frame.width, height: separator.frame.origin.y))

-        self.levelField = PopupRow(container, n: 4, title: "\(LocalizedString("Level")):", value: "").1
-        self.sourceField = PopupRow(container, n: 3, title: "\(LocalizedString("Source")):", value: "").1
-        let t = self.labelValue(container, n: 2, title: "\(LocalizedString("Time")):", value: "")
+        self.levelField = PopupRow(container, n: 5, title: "\(LocalizedString("Level")):", value: "").1
+        self.sourceField = PopupRow(container, n: 4, title: "\(LocalizedString("Source")):", value: "").1
+        let t = self.labelValue(container, n: 3, title: "\(LocalizedString("Time")):", value: "")
        self.timeLabelField = t.0
        self.timeField = t.1
-        self.healthField = PopupRow(container, n: 1, title: "\(LocalizedString("Health")):", value: "").1
-        self.cyclesField = PopupRow(container, n: 0, title: "\(LocalizedString("Cycles")):", value: "").1
+        self.healthField = PopupRow(container, n: 2, title: "\(LocalizedString("Health")):", value: "").1
+        self.cyclesField = PopupRow(container, n: 1, title: "\(LocalizedString("Cycles")):", value: "").1
+        self.lastChargeField = PopupRow(container, n: 0, title: "\(LocalizedString("Last charge")):", value: "").1
        
        view.addSubview(separator)
        view.addSubview(container)
@@ -251,6 +253,27 @@ internal class Popup: NSView, Popup_p {
            }
            self.cyclesField?.stringValue = "\(value.cycles)"
            
+            let form = DateComponentsFormatter()
+            form.maximumUnitCount = 2
+            form.unitsStyle = .full
+            form.allowedUnits = [.day, .hour, .minute]
+            if let timestamp = value.timeOnACPower {
+                if let duration = form.string(from: timestamp, to: Date()) {
+                    let formatter = DateFormatter()
+                    formatter.timeStyle = .short
+                    formatter.dateStyle = .medium
+                    
+                    self.lastChargeField?.stringValue = duration
+                    self.lastChargeField?.toolTip = formatter.string(from: timestamp)
+                } else {
+                    self.lastChargeField?.stringValue = LocalizedString("Unknown")
+                    self.lastChargeField?.toolTip = LocalizedString("Unknown")
+                }
+            } else {
+                self.lastChargeField?.stringValue = LocalizedString("Unknown")
+                self.lastChargeField?.toolTip = LocalizedString("Unknown")
+            }
+            
            self.amperageField?.stringValue = "\(abs(value.amperage)) mA"
            self.voltageField?.stringValue = "\(value.voltage.roundTo(decimalPlaces: 2)) V"
            let batteryPower = value.voltage * (Double(abs(value.amperage))/1000)
--- a/Modules/Battery/readers.swift
+++ b/Modules/Battery/readers.swift
@@ -74,6 +74,10 @@ internal class UsageReader: Reader<Battery_Usage> {
                    self.usage.timeToCharge = Int(time)
                }
                
+                if self.usage.powerSource == "AC Power" {
+                    self.usage.timeOnACPower = Date()
+                }
+                
                self.usage.cycles = self.getIntValue("CycleCount" as CFString) ?? 0
                
                let maxCapacity = self.getIntValue("MaxCapacity" as CFString) ?? 1
--- a/Files/bg.lproj/Localizable.strings
+++ b/Files/bg.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Време и процент";
 "Time format" = "Формат на времето";
 "Hide additional information when full" = "Скриване на допълнителна информация при пълен заряд";
+"Last charge" = "Последно зареждане";

 // Fans
 "Fans" = "Вентилатори";
--- a/Files/cs.lproj/Localizable.strings
+++ b/Files/cs.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Čas a procenta";
 "Time format" = "Formát času";
 "Hide additional information when full" = "Skrýt další informace při plném nabití";
+"Last charge" = "Poslední poplatek";

 // Fans
 "Fans" = "Ventilátory";
--- a/Files/de.lproj/Localizable.strings
+++ b/Files/de.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Zeit und Prozentsatz";
 "Time format" = "Zeitformat";
 "Hide additional information when full" = "Zusätzliche Informationen bei vollständiger Ladung verbergen";
+"Last charge" = "Letzte Ladung";

 // Fans
 "Fans" = "Lüfter";
--- a/Files/en.lproj/Localizable.strings
+++ b/Files/en.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Time and percentage";
 "Time format" = "Time format";
 "Hide additional information when full" = "Hide additional information when full";
+"Last charge" = "Last charge";

 // Fans
 "Fans" = "Fans";
--- a/Files/es.lproj/Localizable.strings
+++ b/Files/es.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Tiempo y porcentaje";
 "Time format" = "Formato de tiempo";
 "Hide additional information when full" = "Ocultar información adicional cuando la batería está cargada";
+"Last charge" = "Última carga";

 // Fans
 "Fans" = "Ventiladores";
--- a/Files/fr.lproj/Localizable.strings
+++ b/Files/fr.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Temps et pourcentage";
 "Time format" = "Format de l'heure";
 "Hide additional information when full" = "Masquer les informations supplémentaires lorsque la batterie est pleine";
+"Last charge" = "Dernière charge";

 // Fans
 "Fans" = "Fans";
--- a/Files/hu.lproj/Localizable.strings
+++ b/Files/hu.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Időtartam és százalék";
 "Time format" = "Időformátum";
 "Hide additional information when full" = "További információk elrejtése, ha teljesen fel van töltve";
+"Last charge" = "Utolsó töltés";

 // Fans
 "Fans" = "Ventillátorok";
--- a/Files/it.lproj/Localizable.strings
+++ b/Files/it.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Tempo e percentuale";
 "Time format" = "Formato del tempo";
 "Hide additional information when full" = "Nascondi informazioni addizionali quando piena";
+"Last charge" = "Ultima carica";

 // Fans
 "Fans" = "Fans";
--- a/Files/ja.lproj/Localizable.strings
+++ b/Files/ja.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "残り時間と残量（%）";
 "Time format" = "時間の表示形式";
 "Hide additional information when full" = "フル充電済みのときはアイコンのみ表示";
+"Last charge" = "ラストチャージ";

 // Fans
 "Fans" = "ファン";
--- a/Files/ko.lproj/Localizable.strings
+++ b/Files/ko.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "시간과 비율";
 "Time format" = "시간 형식";
 "Hide additional information when full" = "배터리가 가득 차면 추가 정보 숨기기";
+"Last charge" = "마지막 청구";

 // Fans
 "Fans" = "팬";
--- a/Files/nb.lproj/Localizable.strings
+++ b/Files/nb.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Tid og prosent";
 "Time format" = "Tidsformat";
 "Hide additional information when full" = "Skjul ekstra information når fulladet";
+"Last charge" = "Siste lading";

 // Fans
 "Fans" = "Vifter";
--- a/Files/nl.lproj/Localizable.strings
+++ b/Files/nl.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Tijd and Percentage";
 "Time format" = "Tijdnotatie";
 "Hide additional information when full" = "Verberg aanvullende informatie wanneer deze vol is";
+"Last charge" = "Sidste opladning";

 // Fans
 "Fans" = "Fans";
--- a/Files/pl.lproj/Localizable.strings
+++ b/Files/pl.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Czas i procenty";
 "Time format" = "Format czasu";
 "Hide additional information when full" = "Ukryj dodatkowe informacje, gdy bateria jest naładowana";
+"Last charge" = "Ostatnie ładowanie";

 // Fans
 "Fans" = "Wentylatory";
--- a/Files/pt-BR.lproj/Localizable.strings
+++ b/Files/pt-BR.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Tempo e porcentagem";
 "Time format" = "Formato de hora";
 "Hide additional information when full" = "Ocultar informações adicionais quando estiver cheia";
+"Last charge" = "Última carga";

 // Fans
 "Fans" = "Ventoinhas";
--- a/Files/pt-PT.lproj/Localizable.strings
+++ b/Files/pt-PT.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Tempo e porcentagem";
 "Time format" = "Formato de hora";
 "Hide additional information when full" = "Ocultar informações adicionais quando estiver cheia";
+"Last charge" = "Última carga";

 // Fans
 "Fans" = "Ventoinhas";
--- a/Files/ro.lproj/Localizable.strings
+++ b/Files/ro.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Timp si procentaj";
 "Time format" = "Formatul timpului";
 "Hide additional information when full" = "Ascunde restul informației cand e plină";
+"Last charge" = "Ultima încărcare";

 // Fans
 "Fans" = "Ventilatoare";
--- a/Files/ru.lproj/Localizable.strings
+++ b/Files/ru.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Время и Проценты";
 "Time format" = "Формат времени";
 "Hide additional information when full" = "Скрыть дополнительную информацию при полном заряде";
+"Last charge" = "Последняя зарядка";

 // Fans
 "Fans" = "Fans";
--- a/Files/tr.lproj/Localizable.strings
+++ b/Files/tr.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Zaman ve yüzde";
 "Time format" = "Zaman formatı";
 "Hide additional information when full" = "Pil dolduğunda ek bilgileri gizle";
+"Last charge" = "Son ödeme";

 // Fans
 "Fans" = "Fanlar";
--- a/Files/uk.lproj/Localizable.strings
+++ b/Files/uk.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Час і проценти";
 "Time format" = "Формат часу";
 "Hide additional information when full" = "Приховати додаткову інформацію, якщо акумулятор заряджений";
+"Last charge" = "Остання зарядка";

 // Fans
 "Fans" = "Fans";
--- a/Files/vi.lproj/Localizable.strings
+++ b/Files/vi.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "Thời gian và tỷ lệ phần trăm";
 "Time format" = "Định dạng thời gian";
 "Hide additional information when full" = "Ẩn thông tin bổ sung khi pin đầy";
+"Last charge" = "Lần sạc cuối cùng";

 // Fans
 "Fans" = "Quạt";
--- a/Files/zh-Hans.lproj/Localizable.strings
+++ b/Files/zh-Hans.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "时间和百分比";
 "Time format" = "时间格式";
 "Hide additional information when full" = "电池充满后隐藏其他信息";
+"Last charge" = "最后一次收费";

 // Fans
 "Fans" = "风扇";
--- a/Files/zh-Hant.lproj/Localizable.strings
+++ b/Files/zh-Hant.lproj/Localizable.strings
@@ -211,6 +211,7 @@
 "Time and percentage" = "時間和百分比";
 "Time format" = "時間格式";
 "Hide additional information when full" = "電池充飽後隱藏其他資訊";
+"Last charge" = "最後一次收費";

 // Fans
 "Fans" = "風扇";