|
Lines 306-314
Link Here
|
| 306 |
debug_print( "Disconnected") |
306 |
debug_print( "Disconnected") |
| 307 |
self.disconnect() |
307 |
self.disconnect() |
| 308 |
if self.failure_callback: |
308 |
if self.failure_callback: |
| 309 |
gtk.threads_enter() |
309 |
gtk.gdk.threads_enter() |
| 310 |
self.failure_callback() |
310 |
self.failure_callback() |
| 311 |
gtk.threads_leave() |
311 |
gtk.gdk.threads_leave() |
| 312 |
return |
312 |
return |
| 313 |
|
313 |
|
| 314 |
except Exception, e: |
314 |
except Exception, e: |
|
Lines 316-324
Link Here
|
| 316 |
debug_print( "Timed out while sending or receiving data") |
316 |
debug_print( "Timed out while sending or receiving data") |
| 317 |
self.disconnect() |
317 |
self.disconnect() |
| 318 |
if self.failure_callback: |
318 |
if self.failure_callback: |
| 319 |
gtk.threads_enter() |
319 |
gtk.gdk.threads_enter() |
| 320 |
self.failure_callback() |
320 |
self.failure_callback() |
| 321 |
gtk.threads_leave() |
321 |
gtk.gdk.threads_leave() |
| 322 |
return |
322 |
return |
| 323 |
|
323 |
|
| 324 |
if find(response,"ERR UNKNOWN-UPS") != -1: |
324 |
if find(response,"ERR UNKNOWN-UPS") != -1: |
|
Lines 346-354
Link Here
|
| 346 |
|
346 |
|
| 347 |
if self.poll_callback: |
347 |
if self.poll_callback: |
| 348 |
debug_print( "Calling callback thread") |
348 |
debug_print( "Calling callback thread") |
| 349 |
gtk.threads_enter() |
349 |
gtk.gdk.threads_enter() |
| 350 |
self.poll_callback() |
350 |
self.poll_callback() |
| 351 |
gtk.threads_leave() |
351 |
gtk.gdk.threads_leave() |
| 352 |
|
352 |
|
| 353 |
def parse_input(self,linelist): |
353 |
def parse_input(self,linelist): |
| 354 |
|
354 |
|
|
Lines 370-376
Link Here
|
| 370 |
|
370 |
|
| 371 |
for line in linelist: |
371 |
for line in linelist: |
| 372 |
key, value = line |
372 |
key, value = line |
| 373 |
value = value.replace(".",radixchar) |
373 |
#value = value.replace(".",radixchar) |
| 374 |
if key == "battery.charge": |
374 |
if key == "battery.charge": |
| 375 |
self.battery_charge = float(value) / 100 |
375 |
self.battery_charge = float(value) / 100 |
| 376 |
if key == "battery.runtime": |
376 |
if key == "battery.runtime": |
|
Lines 419-424
Link Here
|
| 419 |
debug_print( "Unknown status value " + value) |
419 |
debug_print( "Unknown status value " + value) |
| 420 |
|
420 |
|
| 421 |
|
421 |
|
|
|
422 |
#if self.battery_charge is not None and self.battery_voltage is not None: |
| 423 |
if self.battery_charge is not None and self.battery_voltage is not None: |
| 424 |
value = 23 * 60 * self.battery_voltage / 12 |
| 425 |
self.max_remaining_time = round(value) |
| 426 |
debug_print( "max_remaining_time " + str(self.max_remaining_time)) |
| 427 |
self.remaining_time = self.max_remaining_time * self.battery_charge / (self.ups_load + 1) |
| 428 |
self.remaining_time = int(self.remaining_time) |
| 429 |
debug_print( "remaining_time " + str(self.remaining_time)) |
| 430 |
if self.remaining_time > self.max_remaining_time: |
| 431 |
self.max_remaining_time = self.remaining_time |
| 432 |
|
| 422 |
def get_address(self): |
433 |
def get_address(self): |
| 423 |
return self.address |
434 |
return self.address |
| 424 |
def get_host(self): |
435 |
def get_host(self): |
|
Lines 1002-1015
Link Here
|
| 1002 |
|
1013 |
|
| 1003 |
combobox = self.get_widget("hbox_local_upses").get_data("combo") |
1014 |
combobox = self.get_widget("hbox_local_upses").get_data("combo") |
| 1004 |
if not combobox: |
1015 |
if not combobox: |
| 1005 |
combobox = gtk.Combo() |
1016 |
combobox = gtk.ComboBoxEntry() |
| 1006 |
combobox.set_sensitive(False) |
1017 |
combobox.set_sensitive(False) |
| 1007 |
self.get_widget("hbox_local_upses").pack_end(combobox) |
1018 |
self.get_widget("hbox_local_upses").pack_end(combobox) |
| 1008 |
self.get_widget("hbox_local_upses").set_data("combo",combobox) |
1019 |
self.get_widget("hbox_local_upses").set_data("combo",combobox) |
| 1009 |
combobox.show() |
1020 |
combobox.show() |
| 1010 |
|
1021 |
|
| 1011 |
try: |
1022 |
try: |
| 1012 |
localupses = read_ups_config("/etc/ups/ups.conf").keys() |
1023 |
localupses = read_ups_config("/etc/nut/ups.conf").keys() |
| 1013 |
combobox.set_popdown_strings(localupses) |
1024 |
combobox.set_popdown_strings(localupses) |
| 1014 |
self.get_widget("radio_local_upses").set_sensitive(True) |
1025 |
self.get_widget("radio_local_upses").set_sensitive(True) |
| 1015 |
combobox.set_sensitive(True) |
1026 |
combobox.set_sensitive(True) |
|
Lines 1146-1152
Link Here
|
| 1146 |
app.monitor_last_ups() |
1157 |
app.monitor_last_ups() |
| 1147 |
except NoLastUPSError, e: |
1158 |
except NoLastUPSError, e: |
| 1148 |
try: |
1159 |
try: |
| 1149 |
localupses = read_ups_config("/etc/ups/ups.conf").keys() |
1160 |
localupses = read_ups_config("/etc/nut/ups.conf").keys() |
| 1150 |
if len(localupses) == 1: |
1161 |
if len(localupses) == 1: |
| 1151 |
app.monitor(localupses[0] + "@localhost",None,None) |
1162 |
app.monitor(localupses[0] + "@localhost",None,None) |
| 1152 |
except OSError, e: |
1163 |
except OSError, e: |
|
Lines 1154-1160
Link Here
|
| 1154 |
except IOError, e: |
1165 |
except IOError, e: |
| 1155 |
debug_print("No ups.conf") |
1166 |
debug_print("No ups.conf") |
| 1156 |
|
1167 |
|
| 1157 |
gtk.threads_init() |
1168 |
gtk.gdk.threads_init() |
| 1158 |
|
1169 |
|
| 1159 |
gtk.main() |
1170 |
gtk.main() |
| 1160 |
|
1171 |
|
