logre que arranque

1 files changed, 40 insertions, 17 deletions

diff --git a/activity.py b/activity.py
index 377a55b..ed75343 100644
--- a/activity.py
+++ b/activity.py
@@ -27,7 +27,6 @@ from sugar.activity.widgets import ActivityToolbarButton
 from sugar.graphics.toolbarbox import ToolbarBox
 from sugar.graphics.radiotoolbutton import RadioToolButton
 
-dic = {}
 
 lenght = {"Metro": 1, "Km": 1000, "cm": 0.01, "Yarda": 1.09361, "Pie": 3.28084,
           "Brazas": 0.5468}
@@ -43,6 +42,8 @@ class ConvertActivity(activity.Activity):
     def __init__(self, handle):
         activity.Activity.__init__(self, handle, True)
 
+        self.dic = {}
+
         toolbarbox = ToolbarBox()
 
         activity_button = ActivityToolbarButton(self)
@@ -56,42 +57,42 @@ class ConvertActivity(activity.Activity):
 
         # RadioToolButton
         self._lenght_btn = RadioToolButton()
-        self._lenght_btn.connect("clicked", self.update_combo, lenght)
+        self._lenght_btn.connect("clicked", lambda w: self.update_combo(lenght))
         self._lenght_btn.set_tooltip("lenght")
         self._lenght_btn.props.icon_name = "lenght"
 
         self._volume_btn = RadioToolButton()
-        self._volume_btn.connect("clicked", self.update_combo, volume)
+        self._volume_btn.connect("clicked", lambda w: self.update_combo(volume))
         self._volume_btn.set_tooltip("volume")
         self._volume_btn.props.icon_name = "volume"
         self._volume_btn.props.group = self._lenght_btn
 
         self._area_btn = RadioToolButton()
-        self._area_btn.connect("clicked", self.update_combo, area)
+        self._area_btn.connect("clicked", lambda w: self.update_combo(area))
         self._area_btn.set_tooltip("area")
         self._area_btn.props.icon_name = "area"
         self._area_btn.props.group = self._lenght_btn
 
         self._weight_btn = RadioToolButton()
-        self._weight_btn.connect("clicked", self.update_combo, weight)
+        self._weight_btn.connect("clicked", lambda w: self.update_combo(weight))
         self._weight_btn.set_tooltip("weight")
         self._weight_btn.props.icon_name = "weight"
         self._weight_btn.props.group = self._lenght_btn
 
         self._speed_btn = RadioToolButton()
-        self._speed_btn.connect("clicked", self.update_combo, speed)
+        self._speed_btn.connect("clicked", lambda w: self.update_combo(speed))
         self._speed_btn.set_tooltip("speed")
         self._speed_btn.props.icon_name = "speed"
         self._speed_btn.props.group = self._lenght_btn
 
         self._time_btn = RadioToolButton()
-        self._time_btn.connect("clicked", self.update_combo, time)
+        self._time_btn.connect("clicked", lambda w: self.update_combo(time))
         self._time_btn.set_tooltip("time")
         self._time_btn.props.icon_name = "time"
         self._time_btn.props.group = self._lenght_btn
 
         self._temp_btn = RadioToolButton()
-        self._temp_btn.connect("clicked", self.update_combo, temp)
+        self._temp_btn.connect("clicked", lambda w: self.update_combo(temp))
         self._temp_btn.set_tooltip("temperature")
         self._temp_btn.props.icon_name = "temp"
         self._temp_btn.props.group = self._lenght_btn
@@ -137,25 +138,47 @@ class ConvertActivity(activity.Activity):
         adjustment = gtk.Adjustment(1.0, 0.1, 1000, 0.1, 0.1, 0.1)
         spin_box = gtk.HBox()
         self.spin_btn = gtk.SpinButton(adjustment, 1.0, 1)
+        self.spin_btn.connect("button-press-event", self.update_label)
         spin_box.pack_start(self.spin_btn, True, False)
         self.canvas.pack_start(spin_box, False, False, 5)
 
-        label = gtk.Label(str(self.spin_btn.get_value()) + " ~ 000")
-        label.modify_font(pango.FontDescription('80'))
-        self.canvas.pack_start(label, True, True, 5)
+        self.label = gtk.Label()
+        self.label.set_text("%s ~ %s" % (str(self.spin_btn.get_value()),
+                            str(self.spin_btn.get_value())))
+        self.label.modify_font(pango.FontDescription('80'))
+        self.canvas.pack_start(self.label, True, True, 5)
 
         label_info = gtk.Label("   Convert \n000 x 000 = 000")
         self.canvas.pack_start(label_info, True, True, 5)
 
+        #self.dic = lenght
         self.show_all()
 
-    def update_combo(self, widget, data):
-        for x in data.keys():
+    def update_label(self, widget, data=None):
+        self.label.set_text("%s ~ %s" % (str(self.spin_btn.get_value()),
+                            self.convert()))
+
+    def update_combo(self, data):
+        for x in self.dic.keys():
+            print x
+            self.combo1.remove_text(0)
+            self.combo2.remove_text(0)
+        self.dic = data
+        for x in self.dic.keys():
             self.combo1.append_text(x)
             self.combo2.append_text(x)
         self.show_all()
 
-
-def convert(_number, unit, to_unit):
-    _unit = _number * dic[unit]
-    return _unit * dic[to_unit]
+    def get_active_text(self, combobox):
+        model = combobox.get_model()
+        active = combobox.get_active()
+        if active < 0:
+            return None
+        return model[active][0]
+
+    def convert(self):
+        _number = self.spin_btn.get_value()
+        _unit = self.get_active_text(self.combo1)
+        _to_unit = self.get_active_text(self.combo2)
+        _value = _number * self.dic[_unit]
+        return _value * self.dic[_to_unit]