X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fusr%2Flib%2Fhildon-desktop%2Fpedometer_widget_home.py;h=ca693febaaa9df906203194e6ffc0b6637767dad;hb=31689b82e342b5912c10de8592482b257b3301f4;hp=392289a7f51700ba1ac4d415e80e4b5ba26309aa;hpb=725400841e3e3ea79c3370fbb680a1271385807b;p=pedometerwidget diff --git a/src/usr/lib/hildon-desktop/pedometer_widget_home.py b/src/usr/lib/hildon-desktop/pedometer_widget_home.py index 392289a..ca693fe 100644 --- a/src/usr/lib/hildon-desktop/pedometer_widget_home.py +++ b/src/usr/lib/hildon-desktop/pedometer_widget_home.py @@ -35,8 +35,10 @@ import hildon PATH = "/apps/pedometerhomewidget" MODE = PATH + "/mode" HEIGHT = PATH + "/height" +STEP_LENGTH = PATH + "/step_length" WEIGHT = PATH + "/weight" UNIT = PATH + "/unit" +SENSITIVITY = PATH + "/sensitivity" ASPECT = PATH + "/aspect" SECONDVIEW = PATH + "/secondview" GRAPHVIEW = PATH + "/graphview" @@ -55,7 +57,9 @@ unit = 0 class Singleton(object): _instance = None + _references = 0 def __new__(cls, *args, **kwargs): + cls._references+=1 if not cls._instance: cls._instance = super(Singleton, cls).__new__( cls, *args, **kwargs) @@ -64,6 +68,8 @@ class Singleton(object): class PedoIntervalCounter(Singleton): MIN_THRESHOLD = 500 MIN_TIME_STEPS = 0.5 + sensitivity = 100 + mode = 0 x = [] y = [] z = [] @@ -81,13 +87,17 @@ class PedoIntervalCounter(Singleton): #runnig, higher threshold to prevent fake steps self.mode = mode if mode == 1: - self.MIN_THRESHOLD = 650 + self.MIN_THRESHOLD = 650.0 * (200 - self.sensitivity) / 100 self.MIN_TIME_STEPS = 0.35 #walking else: - self.MIN_THRESHOLD = 500 + self.MIN_THRESHOLD = 500.0 * (200 - self.sensitivity) / 100 self.MIN_TIME_STEPS = 0.5 + def set_sensitivity(self, value): + self.sensitivity = value + self.set_mode(self.mode) + def calc_mean(self, vals): sum = 0 for i in vals: @@ -390,7 +400,9 @@ class PedoRepositoryPickle(PedoRepository): class PedoController(Singleton): mode = 0 unit = 0 + weight = 70 height_interval = 0 + sensitivity = 100 #what to display in second view - 0 - alltime, 1 - today, 2 - week second_view = 0 callback_update_ui = None @@ -409,6 +421,7 @@ class PedoController(Singleton): midnight_source_id = None def __init__(self): + self.pedometer = PedoCounter(self.steps_detected) self.pedometerInterval = PedoIntervalCounter() self.pedometerInterval.set_mode(self.mode) @@ -421,6 +434,9 @@ class PedoController(Singleton): self.update_at_midnight() self.midnight_set = True + self.config = Config() + self.config.add_observer(self.load_config) + def update_at_midnight(self): next_day = date.today() + timedelta(days=1) diff = time.mktime(next_day.timetuple()) - time.time() @@ -440,6 +456,15 @@ class PedoController(Singleton): else: return True + def load_config(self): + self.set_height(self.config.get_height(), self.config.get_step_length()) + self.set_mode(self.config.get_mode()) + self.set_unit(self.config.get_unit()) + self.set_weight(self.config.get_weight()) + self.set_second_view(self.config.get_secondview()) + self.set_no_idle_time(self.config.get_noidletime()) + self.set_sensitivity(self.config.get_sensitivity()) + def load_values(self): if self.second_view == 0: self.v[1] = self.repository.get_alltime_values() @@ -531,8 +556,10 @@ class PedoController(Singleton): unit = new_unit self.notify() - def get_str_weight_unit(self): - if self.unit == 0: + def get_str_weight_unit(self, unit=None): + if unit is None: + unit = self.unit + if unit == 0: return "kg" else: return "lb" @@ -544,6 +571,13 @@ class PedoController(Singleton): def get_weight(self): return self.weight + def set_sensitivity(self, value): + self.sensitivity = value + self.pedometerInterval.set_sensitivity(value) + + def get_sensitivity(self): + return self.sensitivity + def set_second_view(self, second_view): self.second_view = second_view self.load_values() @@ -552,8 +586,11 @@ class PedoController(Singleton): def set_callback_ui(self, func): self.callback_update_ui = func - def set_height(self, height_interval): - self.height_inteval = height_interval + def set_height(self, height_interval, step_length=None): + self.height_interval = height_interval + + if step_length is None: + step_length = self.STEP_LENGTH #set height, will affect the distance if height_interval == 0: self.STEP_LENGTH = 0.59 @@ -565,6 +602,8 @@ class PedoController(Singleton): self.STEP_LENGTH = 0.77 elif height_interval == 4: self.STEP_LENGTH = 0.83 + elif height_interval == 5: + self.STEP_LENGTH = step_length #increase step length if RUNNING if self.mode == 1: self.STEP_LENGTH *= 1.45 @@ -606,11 +645,8 @@ class AlarmController(Singleton): def __init__(self): self.client = gconf.client_get_default() - - self.enable = self.client.get_bool(ALARM_ENABLE) - self.fname = self.client.get_string(ALARM_FNAME) - self.interval = self.client.get_int(ALARM_INTERVAL) - self.type = self.client.get_int(ALARM_TYPE) + self.config = Config() + self.config.add_observer(self.load_config) self.pedo_controller = PedoController() if self.enable: @@ -661,11 +697,17 @@ class AlarmController(Singleton): self.is_playing = True def stop(self): - self.player.set_state(gst.STATE_NULL) + if self.player is not None: + self.player.set_state(gst.STATE_NULL) + + def load_config(self): + self.enable = self.config.get_alarm_enable() + self.set_alarm_file(self.config.get_alarm_fname()) + self.set_interval(self.config.get_alarm_interval()) + self.set_type(self.config.get_alarm_type()) def set_enable(self, value): self.enable = value - self.client.set_bool(ALARM_ENABLE, value) if self.enable: self.init_player() self.pedo_controller.add_observer(self.update) @@ -680,7 +722,6 @@ class AlarmController(Singleton): def set_alarm_file(self, fname): self.fname = fname - self.client.set_string(ALARM_FNAME, fname) def get_alarm_file(self): if self.fname == None: @@ -689,14 +730,12 @@ class AlarmController(Singleton): def set_interval(self, interval): self.interval = interval - self.client.set_int(ALARM_INTERVAL, interval) def get_interval(self): return self.interval def set_type(self, type): self.type = type - self.client.set_int(ALARM_TYPE, type) def get_type(self): return self.type @@ -859,10 +898,18 @@ class GraphController(Singleton): ytitles = ["Steps", "Average Speed", "Distance", "Calories"] xtitles = ["Day", "Week"] # "Today"] widget = None + + config = None + def __init__(self): self.repository = PedoRepositoryXML() self.last_update = 0 PedoController().add_observer(self.update_ui) + self.config = Config() + self.config.add_observer(self.load_config) + + def load_config(self): + self.set_current_view(self.config.get_graphview()) def set_graph(self, widget): self.widget = widget @@ -873,17 +920,15 @@ class GraphController(Singleton): current_view % len(ytitles) - gives the ytitle current_view / len(ytitles) - gives the xtitle """ - self.current_view = view - - if self.current_view == len(self.ytitles) * len(self.xtitles): - self.current_view = 0 - self.x_id = self.current_view / len(self.ytitles) - self.y_id = self.current_view % len(self.ytitles) + self.x_id = view / len(self.ytitles) + self.y_id = view % len(self.ytitles) + self.update_ui() def next_view(self): - self.set_current_view(self.current_view+1) - self.update_ui() - return self.current_view + current_view = self.config.get_graphview() + 1 + if current_view == len(self.ytitles) * len(self.xtitles): + current_view = 0 + self.config.set_graphview(current_view) def last_weeks_labels(self): d = date.today() @@ -1075,6 +1120,146 @@ class GraphWidget(gtk.DrawingArea): cr.move_to(-xx, yy + bar_width*1.25 / 2) cr.show_text(self.xtext[i]) +class Config(Singleton): + mode = 0 + height = 0 + step_length = 0.7 + weight = 70 + sensitivity = 100 + unit = 0 + aspect = 0 + sensitivity = 100 + second_view = 0 + graph_view = 0 + no_idle_time = False + logging = False + + alarm_enable = False + alarm_fname = "/home/user/MyDocs/.sounds/Ringtones/Bicycle.aac" + alarm_interval = 5 + alarm_type = 0 + + observers = [] + + def __init__(self): + if self._references > 1: + return + self.client = gconf.client_get_default() + self.client.add_dir('/apps/pedometerhomewidget', gconf.CLIENT_PRELOAD_NONE) + self.notify_id = self.client.notify_add('/apps/pedometerhomewidget', self.gconf_changed) + + def add_observer(self, func): + try: + self.observers.index(func) + except: + self.observers.append(func) + func() + + def remove_observer(self, func): + self.observers.remove(func) + + def gconf_changed(self, client, *args, **kargs): + self.notify() + + def notify(self): + for func in self.observers: + func() + + def get_mode(self): + return self.client.get_int(MODE) + + def set_mode(self, value): + self.client.set_int(MODE, value) + + def get_height(self): + return self.client.get_int(HEIGHT) + + def set_height(self, value): + self.client.set_int(HEIGHT, value) + + def get_step_length(self): + return self.client.get_float(STEP_LENGTH) + + def set_step_length(self, value): + self.client.set_float(STEP_LENGTH, value) + + def get_weight(self): + return self.client.get_int(WEIGHT) + + def set_weight(self, value): + self.client.set_int(WEIGHT, value) + + def get_sensitivity(self): + return self.client.get_int(SENSITIVITY) + + def set_sensitivity(self, value): + self.client.set_int(SENSITIVITY, value) + + def get_unit(self): + return self.client.get_int(UNIT) + + def set_unit(self, value): + self.client.set_int(UNIT, value) + + def get_aspect(self): + return self.client.get_int(ASPECT) + + def set_aspect(self, value): + self.client.set_int(ASPECT, value) + + def get_secondview(self): + value = self.client.get_int(SECONDVIEW) + if value < 0 or value > 2: + value = 0 + logger.error("Invalid secondview value read from Gconf. Using default value") + + return value + + def set_secondview(self, value): + self.client.set_int(SECONDVIEW, value) + + def get_graphview(self): + return self.client.get_int(GRAPHVIEW) + + def set_graphview(self, value): + self.client.set_int(GRAPHVIEW, value) + + def get_noidletime(self): + return self.client.get_bool(NOIDLETIME) + + def set_noidletime(self, value): + self.client.set_bool(NOIDLETIME, value) + + def get_logging(self): + return self.client.get_bool(LOGGING) + + def set_logging(self, value): + self.client.set_bool(LOGGING, value) + + def get_alarm_enable(self): + return self.client.get_bool(ALARM_ENABLE) + + def set_alarm_enable(self, value): + self.client.set_bool(ALARM_ENABLE, value) + + def get_alarm_fname(self): + return self.client.get_string(ALARM_FNAME) + + def set_alarm_fname(self, value): + self.client.set_string(ALARM_FNAME, value) + + def get_alarm_interval(self): + return self.client.get_int(ALARM_INTERVAL) + + def set_alarrm_interval(self, value): + self.client.set_int(ALARM_INTERVAL, value) + + def get_alarm_type(self): + return self.client.get_int(ALARM_TYPE) + + def set_alarm_type(self, value): + self.client.set_int(ALARM_TYPE, value) + class PedometerHomePlugin(hildondesktop.HomePluginItem): button = None @@ -1092,15 +1277,7 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): controller = None graph_controller = None - mode = 0 - height = 0 - weight = 70 - unit = 0 - aspect = 0 - second_view = 0 - graph_view = 0 - no_idle_time = False - logging = False + config = None def __init__(self): hildondesktop.HomePluginItem.__init__(self) @@ -1108,39 +1285,21 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): gobject.type_register(CustomEventBox) gobject.type_register(GraphWidget) - self.client = gconf.client_get_default() + self.config = Config() + + self.button = CustomButton(ICONSPATH + "play.png") + self.button.connect("clicked", self.button_clicked) - self.mode = self.client.get_int(MODE) - self.height = self.client.get_int(HEIGHT) - self.weight = self.client.get_int(WEIGHT) - self.unit = self.client.get_int(UNIT) - self.aspect = self.client.get_int(ASPECT) - self.second_view = self.client.get_int(SECONDVIEW) - self.graph_view = self.client.get_int(GRAPHVIEW) - self.no_idle_time = self.client.get_bool(NOIDLETIME) - self.logging = self.client.get_bool(LOGGING) + self.create_labels(self.labelsC) + self.create_labels(self.labelsT) + self.label_second_view = self.new_label_heading(self.second_view_labels[self.config.get_secondview()]) self.controller = PedoController() - self.controller.set_height(self.height) - self.controller.set_weight(self.weight) - self.controller.set_mode(self.mode) - self.controller.set_unit(self.unit) - self.controller.set_second_view(self.second_view) self.controller.set_callback_ui(self.update_values) - self.controller.set_no_idle_time(self.no_idle_time) self.graph_controller = GraphController() - self.graph_controller.set_current_view(self.graph_view) - self.alarm_controller = AlarmController() - self.button = CustomButton(ICONSPATH + "play.png") - self.button.connect("clicked", self.button_clicked) - - self.create_labels(self.labelsC) - self.create_labels(self.labelsT) - self.label_second_view = self.new_label_heading(self.second_view_labels[self.second_view]) - self.update_current() self.update_total() @@ -1217,9 +1376,7 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): widget.set_state(gtk.STATE_ACTIVE) def eventBoxGraph_clicked_release(self, widget, data=None): - self.graph_view = self.graph_controller.next_view() - self.client.set_int(GRAPHVIEW, self.graph_view) - + self.graph_controller.next_view() widget.set_state(gtk.STATE_NORMAL) def eventBox_clicked(self, widget, data=None): @@ -1228,9 +1385,9 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): def eventBox_clicked_release(self, widget, data=None): widget.set_state(gtk.STATE_NORMAL) - self.second_view = (self.second_view + 1) % 3 - self.controller.set_second_view(self.second_view) - self.client.set_int(SECONDVIEW, self.second_view) + second_view = self.config.get_secondview() + second_view = (second_view + 1) % 3 + self.config.set_secondview(second_view) def new_label_heading(self, title=""): l = gtk.Label(title) @@ -1245,16 +1402,16 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): new_labels[label] = l def update_aspect(self): - - if self.aspect > 0: + aspect = self.config.get_aspect() + if aspect > 0: self.graphBox.hide_all() else: self.graphBox.show_all() - if self.aspect == 0 or self.aspect == 1: + if aspect == 0 or aspect == 1: self.currentBox.show_all() self.totalBox.show_all() - elif self.aspect == 2: + elif aspect == 2: self.currentBox.show_all() self.totalBox.hide_all() else: @@ -1284,7 +1441,7 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): if ( file.run() == gtk.RESPONSE_OK): fname = file.get_filename() widget.set_value(fname) - self.alarm_controller.set_alarm_file(fname) + self.config.set_alarm_fname(fname) file.destroy() def test_sound(button): @@ -1296,15 +1453,16 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): def enableButton_changed(button): value = button.get_active() - self.alarm_controller.set_enable(value) + self.config.set_alarm_enable(value) if value: main_button.set_value("Enabled") else: main_button.set_value("Disabled") def selectorType_changed(selector, data, labelEntry2): - self.alarm_controller.set_type(selector.get_active(0)) - labelEntry2.set_label(suffix[self.alarm_controller.get_type()]) + type = selector.get_active(0) + self.config.set_alarm_type(type) + labelEntry2.set_label(suffix[type]) dialog = gtk.Dialog() dialog.set_title("Alarm settings") @@ -1363,7 +1521,7 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): break try: value = int(intervalEntry.get_text()) - self.alarm_controller.set_interval(value) + self.config.set_alarrm_interval(value) break except: hildon.hildon_banner_show_information(self, "None", "Invalid interval") @@ -1383,48 +1541,31 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): self.show_alarm_settings(widget) def selector_changed(selector, data): - widget.mode = selector.get_active(0) - widget.client.set_int(MODE, widget.mode) - widget.controller.set_mode(widget.mode) - - def selectorH_changed(selector, data): - widget.height = selector.get_active(0) - widget.client.set_int(HEIGHT, widget.height) - widget.controller.set_height(widget.height) + mode = selector.get_active(0) + self.config.set_mode(mode) def selectorUnit_changed(selector, data): - widget.unit = selector.get_active(0) - widget.client.set_int(UNIT, widget.unit) - widget.controller.set_unit(widget.unit) - - if widget.unit == 0: - self.heightPicker.set_active(widget.height) - self.heightPicker.show() - self.heightPicker_English.hide() - else: - self.heightPicker_English.set_active(widget.height) - self.heightPicker_English.show() - self.heightPicker.hide() + unit = selector.get_active(0) + self.config.set_unit(unit) update_weight_button() + stepLengthButton_value_update() def selectorUI_changed(selector, data): - widget.aspect = selectorUI.get_active(0) - widget.client.set_int(ASPECT, widget.aspect) + aspect = selectorUI.get_active(0) widget.update_aspect() def logButton_changed(checkButton): - widget.logging = checkButton.get_active() - widget.client.set_bool(LOGGING, widget.logging) + logging = checkButton.get_active() + self.config.set_logging(logging) def idleButton_changed(idleButton): - widget.no_idle_time = idleButton.get_active() - widget.client.set_bool(NOIDLETIME, widget.no_idle_time) - widget.controller.set_no_idle_time(widget.no_idle_time) + no_idle_time = idleButton.get_active() + self.config.set_noidletime(no_idle_time) def update_weight_button(): - weightButton.set_value(str(self.controller.get_weight()) + \ - " " + self.controller.get_str_weight_unit() ) + weightButton.set_value(str(self.config.get_weight()) + \ + " " + self.controller.get_str_weight_unit(self.config.get_unit()) ) def weight_dialog(button): dialog = gtk.Dialog("Weight", self.dialog) @@ -1432,9 +1573,9 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): label = gtk.Label("Weight:") entry = gtk.Entry() - entry.set_text(str(self.controller.get_weight())) + entry.set_text(str(self.config.get_weight())) - suffixLabel = gtk.Label(self.controller.get_str_weight_unit()) + suffixLabel = gtk.Label(self.controller.get_str_weight_unit(self.config.get_unit())) hbox = gtk.HBox() hbox.add(label) @@ -1451,8 +1592,7 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): value = int(entry.get_text()) if value <= 0: raise ValueError - self.controller.set_weight(value) - self.client.set_int(WEIGHT, value) + self.config.set_weight(value) update_weight_button() break except: @@ -1460,7 +1600,6 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): dialog.destroy() def sensitivity_dialog(button): - def seekbar_changed(seekbar): label.set_text(str(seekbar.get_position()) + " %") @@ -1469,12 +1608,12 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): seekbar = hildon.Seekbar() seekbar.set_size_request(400, -1) seekbar.set_total_time(200) - seekbar.set_position(100) + seekbar.set_position(self.config.get_sensitivity()) seekbar.connect("value-changed", seekbar_changed) hbox = gtk.HBox() hbox.add(seekbar) - label = gtk.Label("100 %") + label = gtk.Label(str(self.config.get_sensitivity()) + " %") label.set_size_request(30, -1) hbox.add(label) @@ -1482,16 +1621,136 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): dialog.show_all() if dialog.run() == gtk.RESPONSE_OK: - #save new value for sensitivity - pass + value = seekbar.get_position() + self.config.set_sensitivity(value) + button.set_value(str(value) + " %") dialog.destroy() + def stepLengthButton_value_update(): + if self.config.get_height() == 5: + l_unit = ["m", "ft"] + stepLengthButton.set_value("Custom value: %.2f %s" % (self.config.get_step_length(), l_unit[self.config.get_unit()])) + else: + h = [ ["< 1.50 m", "1.50 - 1.65 m", "1.66 - 1.80 m", "1.81 - 1.95 m", " > 1.95 m"], + ["< 5 ft", "5 - 5.5 ft", "5.5 - 6 ft", "6 - 6.5 ft", "> 6.5 ft"]] + str = "Using predefined value for height: %s" % h[self.config.get_unit()][self.config.get_height()] + stepLengthButton.set_value(str) + + def stepLength_dialog(button): + def selectorH_changed(selector, data, dialog): + height = selector.get_active(0) + self.config.set_height(height) + stepLengthButton_value_update() + + def manualButton_clicked(button, dialog): + dlg = gtk.Dialog() + dlg.set_title("Custom step length") + dlg.add_button("OK", gtk.RESPONSE_OK) + + label = gtk.Label("Length") + + entry = hildon.Entry(gtk.HILDON_SIZE_AUTO_WIDTH) + if self.config.get_height() == 5: + entry.set_text(str(self.config.get_step_length())) + + labelSuffix = gtk.Label() + if self.config.get_unit() == 0: + labelSuffix.set_label("m") + else: + labelSuffix.set_label("ft") + hbox = gtk.HBox() + hbox.add(label) + hbox.add(entry) + hbox.add(labelSuffix) + dlg.vbox.add(hbox) + dlg.show_all() + + while 1: + response = dlg.run() + if response != gtk.RESPONSE_OK: + break + try: + value = float(entry.get_text()) + if value <= 0: + raise ValueError + self.config.set_step_length(value) + self.config.set_height(5) + stepLengthButton_value_update() + break + except ValueError: + hildon.hildon_banner_show_information(self, "None", "Invalid length") + dlg.destroy() + dialog.destroy() + + def heightButton_clicked(button, dialog): + dialog.destroy() + + dialog = gtk.Dialog() + dialog.set_title("Step length") + + manualButton = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL) + manualButton.set_title("Enter custom value") + manualButton.set_alignment(0, 0.8, 1, 1) + manualButton.connect("clicked", manualButton_clicked, dialog) + + selectorH = hildon.TouchSelector(text=True) + selectorH.set_column_selection_mode(hildon.TOUCH_SELECTOR_SELECTION_MODE_SINGLE) + selectorH.append_text("< 1.50 m") + selectorH.append_text("1.50 - 1.65 m") + selectorH.append_text("1.66 - 1.80 m") + selectorH.append_text("1.81 - 1.95 m") + selectorH.append_text(" > 1.95 m") + + selectorH_English = hildon.TouchSelector(text=True) + selectorH_English.set_column_selection_mode(hildon.TOUCH_SELECTOR_SELECTION_MODE_SINGLE) + selectorH_English.append_text("< 5 ft") + selectorH_English.append_text("5 - 5.5 ft") + selectorH_English.append_text("5.5 - 6 ft") + selectorH_English.append_text("6 - 6.5 ft") + selectorH_English.append_text("> 6.5 ft") + + heightPicker = hildon.PickerButton(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL) + heightPicker.set_alignment(0.0, 0.5, 1.0, 1.0) + heightPicker.set_title("Use predefined values for height") + + + unit = self.config.get_unit() + if unit == 0: + heightPicker.set_selector(selectorH) + else: + heightPicker.set_selector(selectorH_English) + + height = self.config.get_height() + if height < 5: + heightPicker.set_active(height) + + heightPicker.get_selector().connect("changed", selectorH_changed, dialog) + heightPicker.connect("value-changed", heightButton_clicked, dialog) + + dialog.vbox.add(heightPicker) + dialog.vbox.add(manualButton) + dialog.show_all() + + if dialog.run() == gtk.RESPONSE_DELETE_EVENT: + dialog.destroy() + + def donateButton_clicked(button, dialog): + url = "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=BKE6E9SLK7NP4&lc=RO&item_name=Pedometer%20Widget¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted" + command = "dbus-send --system --type=method_call --dest=\"com.nokia.osso_browser\" --print-reply /com/nokia/osso_browser/request com.nokia.osso_browser.load_url string:\"%s\"" % url + os.system(command) + dialog = gtk.Dialog() dialog.set_title("Settings") dialog.add_button("OK", gtk.RESPONSE_OK) self.dialog = dialog + stepLengthButton = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL) + stepLengthButton.set_title("Step length") + stepLengthButton.set_alignment(0, 0.8, 1, 1) + stepLengthButton.connect("clicked", stepLength_dialog) + stepLengthButton_value_update() + resetButton = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL) resetButton.set_title("Reset total counter") resetButton.set_alignment(0, 0.8, 1, 1) @@ -1499,7 +1758,7 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): alarmButton = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL) alarmButton.set_title("Alarm") - if self.alarm_controller.get_enable(): + if self.config.get_alarm_enable(): alarmButton.set_value("Enabled") else: alarmButton.set_value("Disabled") @@ -1516,45 +1775,12 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): modePicker.set_alignment(0.0, 0.5, 1.0, 1.0) modePicker.set_title("Mode") modePicker.set_selector(selector) - modePicker.set_active(widget.mode) - - selectorH = hildon.TouchSelector(text=True) - selectorH.set_column_selection_mode(hildon.TOUCH_SELECTOR_SELECTION_MODE_SINGLE) - selectorH.append_text("< 1.50 m") - selectorH.append_text("1.50 - 1.65 m") - selectorH.append_text("1.66 - 1.80 m") - selectorH.append_text("1.81 - 1.95 m") - selectorH.append_text(" > 1.95 m") - selectorH.connect("changed", selectorH_changed) - - selectorH_English = hildon.TouchSelector(text=True) - selectorH_English.set_column_selection_mode(hildon.TOUCH_SELECTOR_SELECTION_MODE_SINGLE) - selectorH_English.append_text("< 5 ft") - selectorH_English.append_text("5 - 5.5 ft") - selectorH_English.append_text("5.5 - 6 ft") - selectorH_English.append_text("6 - 6.5 ft") - selectorH_English.append_text("> 6.5 ft") - selectorH_English.connect("changed", selectorH_changed) - - heightPicker = hildon.PickerButton(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL) - heightPicker.set_alignment(0.0, 0.5, 1.0, 1.0) - heightPicker.set_title("Height") - heightPicker.set_selector(selectorH) - heightPicker.set_active(widget.height) - - heightPicker_English = hildon.PickerButton(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL) - heightPicker_English.set_alignment(0.0, 0.5, 1.0, 1.0) - heightPicker_English.set_title("Height") - heightPicker_English.set_selector(selectorH_English) - heightPicker_English.set_active(widget.height) - - self.heightPicker = heightPicker - self.heightPicker_English = heightPicker_English + modePicker.set_active(self.config.get_mode()) weightButton = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL) weightButton.set_title("Weight") weightButton.set_alignment(0, 0.8, 1, 1) - weightButton.set_value(str(self.controller.get_weight()) + " " + self.controller.get_str_weight_unit() ) + update_weight_button() weightButton.connect("clicked", weight_dialog) selectorUnit = hildon.TouchSelector(text=True) @@ -1567,7 +1793,7 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): unitPicker.set_alignment(0.0, 0.5, 1.0, 1.0) unitPicker.set_title("Unit") unitPicker.set_selector(selectorUnit) - unitPicker.set_active(widget.unit) + unitPicker.set_active(self.config.get_unit()) selectorUI = hildon.TouchSelector(text=True) selectorUI = hildon.TouchSelector(text=True) @@ -1582,35 +1808,41 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): UIPicker.set_alignment(0.0, 0.5, 1.0, 1.0) UIPicker.set_title("Widget aspect") UIPicker.set_selector(selectorUI) - UIPicker.set_active(widget.aspect) + UIPicker.set_active(self.config.get_aspect()) sensitivityButton = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL) sensitivityButton.set_title("Sensitivity") sensitivityButton.set_alignment(0, 0.8, 1, 1) + sensitivityButton.set_value(str(self.config.get_sensitivity()) + " %") sensitivityButton.connect("clicked", sensitivity_dialog) + donateButton = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL) + donateButton.set_title("Donate") + donateButton.set_alignment(0, 0.8, 1, 1) + donateButton.connect("clicked", donateButton_clicked, dialog) + logButton = hildon.CheckButton(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT) logButton.set_label("Log data") - logButton.set_active(widget.logging) + logButton.set_active(self.config.get_logging()) logButton.connect("toggled", logButton_changed) idleButton = hildon.CheckButton(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT) idleButton.set_label("Pause time when not walking") - idleButton.set_active(widget.no_idle_time) + idleButton.set_active(self.config.get_noidletime()) idleButton.connect("toggled", idleButton_changed) pan_area = hildon.PannableArea() vbox = gtk.VBox() vbox.add(alarmButton) vbox.add(modePicker) - vbox.add(heightPicker) - vbox.add(heightPicker_English) + vbox.add(stepLengthButton) vbox.add(weightButton) vbox.add(unitPicker) vbox.add(sensitivityButton) vbox.add(UIPicker) vbox.add(idleButton) vbox.add(resetButton) + vbox.add(donateButton) #vbox.add(logButton) pan_area.add_with_viewport(vbox) @@ -1619,13 +1851,7 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): dialog.vbox.add(pan_area) dialog.show_all() - if widget.unit == 0: - self.heightPicker_English.hide() - else: - self.heightPicker.hide() - response = dialog.run() - #hildon.hildon_banner_show_information(self, "None", "You have to Stop/Start the counter to apply the new settings") dialog.destroy() def close_requested(self, widget): @@ -1635,7 +1861,7 @@ class PedometerHomePlugin(hildondesktop.HomePluginItem): def update_values(self): #TODO: do not update if the widget is not on the active desktop - self.label_second_view.set_label(self.second_view_labels[self.second_view]) + self.label_second_view.set_label(self.second_view_labels[self.config.get_secondview()]) self.update_current() self.update_total()