diff --git a/epydial/data/themes/blackwhite/dialer_main.edc b/epydial/data/themes/blackwhite/dialer_main.edc index 8e36875..cdfb9f9 100644 --- a/epydial/data/themes/blackwhite/dialer_main.edc +++ b/epydial/data/themes/blackwhite/dialer_main.edc @@ -227,11 +227,23 @@ collections { description { color_class: "button_inactive"; state: "default" 0.0; - rel1 { relative: 2/3 0; } - rel2 { relative: 1 1/20; } + rel1 { relative: 1/2 0; } + rel2 { relative: 5/6 1/20; } text { text, "signal"; font: "Sans"; size, 1; align, 1 0.5; fit, 0 1; } } - } /* end signalq_text */ + } /* end signalq_battvolt_text */ + part { + name: "battvolt_text"; + type: TEXT; + mouse_events: 0; + description { + color_class: "button_inactive"; + state: "default" 0.0; + rel1 { relative: 5/6 0; } + rel2 { relative: 1 1/20; } + text { text, "1.41 V"; font: "Sans"; size, 1; align, 1 0.5; fit, 0 1; } + } + } /* end battvolt_text */ part { name: "numberdisplay_background"; type: RECT; diff --git a/epydial/dialer_screen.py b/epydial/dialer_screen.py index 32d1e18..55fa4e0 100644 --- a/epydial/dialer_screen.py +++ b/epydial/dialer_screen.py @@ -27,6 +27,10 @@ class DialerScreen(EdjeGroup): # PyneoController.register_callback("gsm_dialing", self.on_gsm_dialing) PyneoController.register_callback("gsm_operator_change", self.on_gsm_operator_change) PyneoController.register_callback("gsm_signal_strength_change", self.on_gsm_signal_strength_change) + PyneoController.register_callback("battvolt_change", self.on_battvolt_change) + + def on_battvolt_change(self, battvolt): + self.part_text_set("battvolt_text", "%s V"%str(battvolt)[:4]) def on_sim_key_required(self, key_type): print '---', 'opening keyring' @@ -51,7 +55,7 @@ class DialerScreen(EdjeGroup): self.part_text_set("operater_text", operator) def on_gsm_signal_strength_change(self, rssi): - self.part_text_set("signalq_text", "%s dBm"%str(rssi)) + self.part_text_set("signalq_text", "%s dBm /"%str(rssi)) def display_time(self): self.part_text_set("time_text", time.strftime("%H:%M", time.localtime())); diff --git a/epydial/epydial.py b/epydial/epydial.py index 1a9802d..849b99d 100755 --- a/epydial/epydial.py +++ b/epydial/epydial.py @@ -335,6 +335,8 @@ class PyneoController(object): def on_pwr_status(class_, status_map): status = dedbusmap(status_map) print "POWER Status: " + str(status) + if status.has_key('battvolt'): + class_.notify_callbacks("battvolt_change", status['battvolt']) class_.notify_callbacks("pwr_status_change", status) @classmethod