[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/guidance/powermanager
From:       Sebastian Kügler <sebas () kde ! nl>
Date:       2006-08-30 22:58:33
Message-ID: 1156978713.734810.25649.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 579059 by sebas:

Fix crash when there's no battery, hide label in tooltip

 M  +2 -1      TODO  
 M  +33 -31    guidance-power-manager.py  


--- trunk/playground/base/guidance/powermanager/TODO #579058:579059
@@ -2,7 +2,6 @@
 ------------------------------
 - support for second battery
 - [brightness preview], see below
-- hide notifies when clicked
 
 
 DUNNO's:
@@ -23,6 +22,7 @@
 - Add cpu frequency to tooltip
 - Add icons to tooltip
 - Make tooltip size properly
+- battery hotplugging
 - Implement switchToBattery(), collecting all stuff for onBattery
 	- notify
 	- blankscreensaveronly
@@ -33,6 +33,7 @@
 	- undo blankscreensaveronly
 	- up brightness
 
+
 [brightness preview]
 Currently there is only a brightness preview for the currently active scheme \
(_either_ mains or battery powered).   That means if you want to set the battery \
                brightness when you are currently mains powered, you'll probably 
--- trunk/playground/base/guidance/powermanager/guidance-power-manager.py \
#579058:579059 @@ -267,43 +267,45 @@
                 self.tooltip.BatteryProgress.setFormat(format_string)
                 self.tooltip.BatteryTime.setText('')
             elif state == "charging":
-                self.tooltip.BatteryTime.setText(i18n("until fully charged"))
+                self.tooltip.BatteryTime.hide()
             else:
                 # The tooltip already contains the state "charged", so we leave this \
                one empty.
-                self.tooltip.BatteryTime.setText("")
+                self.tooltip.BatteryTime.hide()
 
     def _getIcon(self):
         """ set systray icon depending on battery status/level """
-        state, level, remain = self.battery_state
-        #powermanager.getBatteryState()
-        if state == "charged":
-            self.icon = "battery-charging-100"
-        elif state == "discharging":
-            if level >= 80:
-                self.icon = "battery-discharging-100"
-            elif level < 80 and level >= 60:
-                self.icon = "battery-discharging-080"
-            elif level < 60 and level >= 40:
-                self.icon = "battery-discharging-060"
-            elif level < 40 and level >= 20:
-                self.icon = "battery-discharging-040"
-            elif level < 20 and level >= 2:
-                self.icon = "battery-discharging-020"
-            else:
-                self.icon = "battery-discharging-000"
-        elif state == "charging":
-            if level >= 80:
+        if self.powermanager.hasBattery:
+            state, level, remain = self.battery_state
+            if state == "charged":
                 self.icon = "battery-charging-100"
-            elif level < 80 and level >= 60:
-                self.icon = "battery-charging-080"
-            elif level < 60 and level >= 40:
-                self.icon = "battery-charging-060"
-            elif level < 40 and level >= 20:
-                self.icon = "battery-charging-040"
-            elif level < 20 and level >= 2:
-                self.icon = "battery-charging-020"
-            else:
-                self.icon = "battery-charging-000"
+            elif state == "discharging":
+                if level >= 80:
+                    self.icon = "battery-discharging-100"
+                elif level < 80 and level >= 60:
+                    self.icon = "battery-discharging-080"
+                elif level < 60 and level >= 40:
+                    self.icon = "battery-discharging-060"
+                elif level < 40 and level >= 20:
+                    self.icon = "battery-discharging-040"
+                elif level < 20 and level >= 2:
+                    self.icon = "battery-discharging-020"
+                else:
+                    self.icon = "battery-discharging-000"
+            elif state == "charging":
+                if level >= 80:
+                    self.icon = "battery-charging-100"
+                elif level < 80 and level >= 60:
+                    self.icon = "battery-charging-080"
+                elif level < 60 and level >= 40:
+                    self.icon = "battery-charging-060"
+                elif level < 40 and level >= 20:
+                    self.icon = "battery-charging-040"
+                elif level < 20 and level >= 2:
+                    self.icon = "battery-charging-020"
+                else:
+                    self.icon = "battery-charging-000"
+        else:
+            self.icon = "power-information"
         return self.icon
     
     def setIcon(self):


[prev in list] [next in list] [prev in thread] [next in thread]