Enpese a programar el creado de las opciones de los combos

2 files changed, 29 insertions, 8 deletions

diff --git a/activity.py b/activity.py
index e5ce141..c7f2a91 100644
--- a/activity.py
+++ b/activity.py
@@ -19,6 +19,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import gtk
+import convert
 
 from sugar.activity import activity
 from sugar.activity.widgets import StopButton
@@ -112,3 +113,7 @@ class Canvas(gtk.VBox):
 
         self.spin_btn2 = gtk.SpinButton(adjustment, 1.0, 0)
         self.table.attach(self.spin_btn2, 3, 4, 1, 2)
+
+    def update_combo(self, type_u):
+        self.combo1.set_popdown_strings(convert.return_list)
+        self.combo2.set_popdown_strings(convert.return_list)
diff --git a/convert.py b/convert.py
index aad7114..84efda4 100644
--- a/convert.py
+++ b/convert.py
@@ -18,16 +18,16 @@
 # adic_long with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-def convert(number, uni1, uni2, type_u):
-    dic = {}
+dic = {}
 
-    dic_long = {"Metro": 1, "Yarda": 1.09361, "Pie": 3.28084, "Brazas": 0.5468}
-    vol = {}
-    area = {}
-    peso = {}
-    vel = {}
-    time = {}
+dic_long = {"Metro": 1, "Yarda": 1.09361, "Pie": 3.28084, "Brazas": 0.5468}
+vol = {}
+area = {}
+peso = {}
+vel = {}
+time = {}
 
+def convert(number, uni1, uni2, type_u):
     if type_u == "dic_long":
         dic = dic_long
     elif type_u == "vol":
@@ -44,3 +44,19 @@ def convert(number, uni1, uni2, type_u):
     unidad = number * dic[uni1]
 
     return unidad * dic[uni2]
+
+def return_list(type_u):
+    if type_u == "dic_long":
+        dic = dic_long
+    elif type_u == "vol":
+        dic = vol
+    elif type_u == "area":
+        dic = area
+    elif type_u == "peso":
+        dic = peso
+    elif type_u == "vel":
+        dic = vel
+    elif type_u == "time":
+        dic = time
+
+    return dic.key()