Merge pull request mixxxdj#2160 from rrrapha/battery-unknown

Fix battery tooltip text when minutesLeft is unknown
haslersn · Jun 16, 2019 · a2941cc · a2941cc
2 parents 1710d69 + 851cc34
commit a2941cc
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/src/util/battery/battery.h b/src/util/battery/battery.h
@@ -6,6 +6,7 @@
 class Battery : public QObject {
     Q_OBJECT
   public:
+    static constexpr int TIME_UNKNOWN = -1;
     enum ChargingState {
         UNKNOWN,
         DISCHARGING,

diff --git a/src/util/battery/batterylinux.cpp b/src/util/battery/batterylinux.cpp
@@ -14,7 +14,7 @@ BatteryLinux::~BatteryLinux() {
 }
 
 void BatteryLinux::read() {
-    m_iMinutesLeft = 0;
+    m_iMinutesLeft = Battery::TIME_UNKNOWN;
     m_dPercentage = 0.0;
     m_chargingState = Battery::UNKNOWN;
 
@@ -89,9 +89,11 @@ void BatteryLinux::read() {
         }
 
         m_dPercentage = percentage;
-        if (m_chargingState == CHARGING) {
+
+        // upower tells us the remainging time in seconds (0 if unknown)
+        if (m_chargingState == CHARGING && timeToFull > 0) {
           m_iMinutesLeft = timeToFull / 60;
-        } else if (m_chargingState == DISCHARGING) {
+        } else if (m_chargingState == DISCHARGING && timeToEmpty > 0) {
           m_iMinutesLeft = timeToEmpty / 60;
         }
         break;

diff --git a/src/util/battery/batterymac.cpp b/src/util/battery/batterymac.cpp
@@ -16,7 +16,7 @@ BatteryMac::~BatteryMac() {
 }
 
 void BatteryMac::read() {
-    m_iMinutesLeft = 0;
+    m_iMinutesLeft = Battery::TIME_UNKNOWN;
     m_dPercentage = 0.0;
     m_chargingState = Battery::UNKNOWN;
 
@@ -125,7 +125,7 @@ void BatteryMac::read() {
             m_chargingState = DISCHARGING;
         }
 
-        if (minutes_left != -1) {
+        if (minutes_left >= 0) {
             m_iMinutesLeft = minutes_left;
         }
 

diff --git a/src/util/battery/batterywindows.cpp b/src/util/battery/batterywindows.cpp
@@ -15,7 +15,7 @@ BatteryWindows::~BatteryWindows() {
 }
 
 void BatteryWindows::read() {
-    m_iMinutesLeft = 0;
+    m_iMinutesLeft = Battery::TIME_UNKNOWN;
     m_dPercentage = 0.0;
     m_chargingState = Battery::UNKNOWN;
 
@@ -39,8 +39,11 @@ void BatteryWindows::read() {
         if (m_dPercentage > 99) {
             m_chargingState = Battery::CHARGED;
         }
-        // windows tells us the remainging time in seconds
-        m_iMinutesLeft = static_cast<int>(spsPwr.BatteryLifeTime) / 60;
+        // windows tells us the remainging time in seconds (-1 if unknown)
+        int seconds_left = static_cast<int>(spsPwr.BatteryLifeTime);
+        if (seconds_left >= 0) {
+            m_iMinutesLeft = seconds_left / 60;
+        }
     }
 
     // QString bat = "unknown";

diff --git a/src/widget/wbattery.cpp b/src/widget/wbattery.cpp
@@ -105,7 +105,7 @@ void WBattery::update() {
                     pixmapIndexFromPercentage(dPercentage,
                                               m_chargingPixmaps.size())];
             }
-            if (minutesLeft == -1) {
+            if (minutesLeft == Battery::TIME_UNKNOWN) {
                 setBaseTooltip(tr("Time until charged unknown."));
             } else {
                 setBaseTooltip(tr("Time until charged: %1")
@@ -118,7 +118,7 @@ void WBattery::update() {
                     pixmapIndexFromPercentage(dPercentage,
                                               m_dischargingPixmaps.size())];
             }
-            if (minutesLeft == -1) {
+            if (minutesLeft == Battery::TIME_UNKNOWN) {
                 setBaseTooltip(tr("Time left unknown."));
             } else {
                 setBaseTooltip(tr("Time left: %1")