diff -Nru acpibattery-screenlet-0.2/debian/changelog acpibattery-screenlet-0.2.1/debian/changelog --- acpibattery-screenlet-0.2/debian/changelog 2010-11-17 05:06:11.000000000 +0000 +++ acpibattery-screenlet-0.2.1/debian/changelog 2010-11-19 18:27:21.000000000 +0000 @@ -1,5 +1,5 @@ -acpibattery-screenlet (0.2) maverick; urgency=low +acpibattery-screenlet (0.2.1) maverick; urgency=low * Created automatically by The Screenlets Debianizer. - -- Guido Tabbernuk Wed, 17 Nov 2010 14:06:11 +0900 \ No newline at end of file + -- Guido Tabbernuk Sat, 20 Nov 2010 03:27:21 +0900 \ No newline at end of file diff -Nru acpibattery-screenlet-0.2/screenlet/ACPIBattery/ACPIBatteryScreenlet.py acpibattery-screenlet-0.2.1/screenlet/ACPIBattery/ACPIBatteryScreenlet.py --- acpibattery-screenlet-0.2/screenlet/ACPIBattery/ACPIBatteryScreenlet.py 2010-11-17 05:06:11.000000000 +0000 +++ acpibattery-screenlet-0.2.1/screenlet/ACPIBattery/ACPIBatteryScreenlet.py 2010-11-19 18:27:21.000000000 +0000 @@ -29,7 +29,7 @@ # default meta-info for Screenlets __name__ = 'ACPIBatteryScreenlet' - __version__ = '0.2' + __version__ = '0.2.1' __author__ = 'JMDK' __desc__ = 'A themeable ACPI Battery meter.' @@ -48,39 +48,48 @@ show_percent = True show_background = True background_color = (0,0,0, 0.4) + # constructor def __init__(self, **keyword_args): #call super (and not show window yet) screenlets.Screenlet.__init__(self, uses_theme=True,width=100,height=50, **keyword_args) + # set theme self.theme_name = "default" - # add settings + + # internals + self.__timeout = None + self.__flag=0 + + # add options that can be changed with the option dialog and will autosave/load self.add_options_group('ACPI Battery', 'ACPI Battery specific options') + self.add_option(IntOption('ACPI Battery', 'update_interval', - self.update_interval, 'Update interval', - 'The interval for updating the ACPI Battery meter (in seconds) ...', + 5, 'Update interval', 'The interval for updating the ACPI Battery meter in seconds.', min=1, max=60)) self.add_option(IntOption('ACPI Battery', 'alarm_threshold', - self.alarm_threshold, 'Alarm threshold', - 'The threshold triggering the low battery alarm (in precent) ...', + 5, 'Alarm threshold', 'The threshold percent for triggering the low battery alarm.', min=1, max=100)) self.add_option(BoolOption('ACPI Battery', 'file_auto', - self.file_auto, 'Guess battery file', 'Try to guess which battery to use ...')) + True, 'Guess battery file', 'Try to guess which battery to use.')) self.add_option(StringOption('ACPI Battery', 'file_path', - self.file_path, 'Battery files path', 'Path to the battery files ...'), + '/proc/acpi/battery/BAT0/', 'Battery files path', 'Path to the battery files.'), realtime=False) self.add_option(StringOption('ACPI Battery', 'state_file', - self.state_file, 'Battery state file', 'Name of the battery state file ...'), + 'state', 'Battery state file', 'Name of the battery state file.'), realtime=False) self.add_option(StringOption('ACPI Battery', 'info_file', - self.info_file, 'Battery info file', 'Name of the battery info file ...'), + 'info', 'Battery info file', 'Name of the battery info file.'), realtime=False) self.add_option(BoolOption('ACPI Battery', 'show_time', - self.show_time, 'Display time', 'Show remaining time on ACPI battery meter ...')) + True, 'Display time', 'Show remaining time on ACPI battery meter.')) self.add_option(BoolOption('ACPI Battery', 'show_percent', - self.show_percent, 'Display percentage', 'Show percentage on ACPI battery meter ...')) + True, 'Display percentage', 'Show percentage on ACPI battery meter.')) self.add_option(ColorOption('ACPI Battery','background_color', - self.background_color, 'Back color(only with default theme)', 'only works with default theme')) + (0,0,0, 0.4), 'Back color(only with default theme)', 'Only works with default theme')) + + # create the right click menu + self.add_default_menuitems() # init the timeout function self.update_interval = self.update_interval @@ -89,8 +98,9 @@ # attribute-"setter", handles setting of attributes def __setattr__(self, name, value): - # call Screenlet.__setattr__ in baseclass (ESSENTIAL!!!!) + # important: call Screenlet.__setattr__ in baseclass screenlets.Screenlet.__setattr__(self, name, value) + # check for this Screenlet's attributes, we are interested in: if name == "update_interval": if value > 0: @@ -101,28 +111,26 @@ else: # TODO: raise exception!!! self.__dict__['update_interval'] = 1 + elif name == "file_auto": if value: try: - dirs=listdir('/proc/acpi/battery/'); + dirs=listdir('/proc/acpi/battery/') except OSError: - dirs=[]; - pass + dirs=[] + dirs.sort(); try: self.__dict__['file_path']='/proc/acpi/battery/'+dirs[0]+'/' except IndexError: pass - + elif name == "file_path": if self.__flag>0: self.__dict__['file_auto']=0 self.__flag+=1 - def on_init (self): - print "Screenlet has been initialized." - # add default menuitems - self.add_default_menuitems() - def getValue(self): + + def get_value(self): present_rate = None charge_status='NA' ispresent='no' @@ -206,7 +214,7 @@ return True def on_draw(self, ctx): - (charge_status,present_rate,remaining,last_full)=self.getValue() + (charge_status,present_rate,remaining,last_full)=self.get_value() percents="%3i" % ((100*int(remaining)) / int(last_full)) # set size ctx.scale(self.scale, self.scale) @@ -300,3 +308,4 @@ if __name__ == "__main__": import screenlets.session screenlets.session.create_session(ACPIBatteryScreenlet) + Binary files /tmp/bUESJMbQYg/acpibattery-screenlet-0.2/screenlet/ACPIBattery/ACPIBatteryScreenlet.pyc and /tmp/xnzEpXDRvp/acpibattery-screenlet-0.2.1/screenlet/ACPIBattery/ACPIBatteryScreenlet.pyc differ