Fixing interface (mejorando)

4 files changed, 66 insertions, 41 deletions

diff --git a/LegoJAM.py b/LegoJAM.py
index 3f568bb..b4d2388 100644..100755
--- a/LegoJAM.py
+++ b/LegoJAM.py
@@ -9,21 +9,20 @@ BASE = os.path.dirname(__file__)
 
 sys.path.append("nxt_plugin")
 
-# importamos las funciones de la API
+# Import the API functions
+# Importamos las funciones de la API
 import nxt
 from nxt import *
 
+from interface.window import Window
 
-class LegoJAM(gtk.Window):
+
+class LegoJAM(Window):
 
     def __init__(self):
         super(LegoJAM, self).__init__()
         self.set_title("LegoJAM")
         #self.set_icon_from_file(os.path.join(BASE, "Iconos", "ceibal.png"))
-        self.set_resizable(True)
-        self.set_size_request(640, 480)
-        self.set_border_width(2)
-        self.set_position(gtk.WIN_POS_CENTER)
 
         self.base_box = None
         # button_motor_A = None
@@ -37,40 +36,52 @@ class LegoJAM(gtk.Window):
         self.robot = Pancho()
 
     def set_layout(self):
-        self.base_box = gtk.VBox()
-
-        self.button_encender_motor_A = gtk.Button("Encender Motor A")
-        self.button_encender_motor_B = gtk.Button("Encender Motor B")
-        self.button_encender_motor_C = gtk.Button("Encender Motor C")
-
-        self.button_detener_motor_A = gtk.Button("Apagar Motor A")
-        self.button_detener_motor_B = gtk.Button("Apagar Motor B")
-        self.button_detener_motor_C = gtk.Button("Apagar Motor C")
-
-        self.button_encender_motor_A.connect("clicked", self.run_motor)
-        self.button_encender_motor_B.connect("clicked", self.run_motor)
-        self.button_encender_motor_C.connect("clicked", self.run_motor)
-
-        self.button_detener_motor_A.connect("clicked", self.stop_motor)
-        self.button_detener_motor_B.connect("clicked", self.stop_motor)
-        self.button_detener_motor_C.connect("clicked", self.stop_motor)
-
-        motor = gtk.HBox()
-        motor.pack_start(self.button_encender_motor_A, True, True, )
-        motor.pack_start(self.button_detener_motor_A, True, True, 0)
-        self.base_box.pack_start(motor, True, True, 0)
-
-        motor = gtk.HBox(0)
-        motor.pack_start(self.button_encender_motor_B, True, True, )
-        motor.pack_start(self.button_detener_motor_B, True, True, 0)
-        self.base_box.pack_start(motor, True, True, 0)
-
-        motor = gtk.HBox(0)
-        motor.pack_start(self.button_encender_motor_C, True, True, )
-        motor.pack_start(self.button_detener_motor_C, True, True, 0)
-        self.base_box.pack_start(motor, True, True, 0)
-
-        self.add(self.base_box)
+        canvas = gtk.HBox()
+        store = gtk.ListStore(str, int)
+        treeview = gtk.TreeView(store)
+        column = gtk.TreeViewColumn("Motor")
+        treeview.append_column(column)
+        cell = gtk.CellRendererText()
+        column.pack_start(cell)
+        column.add_attribute(cell, 'text', 0)
+        canvas.pack_start(treeview, False, False)
+
+        num = 0
+        for i in ['A', 'B', 'C']:
+            store.append(['Motor %s' % i, num])
+
+        #self.button_encender_motor_A = gtk.Button("Encender Motor A")
+        #self.button_encender_motor_B = gtk.Button("Encender Motor B")
+        #self.button_encender_motor_C = gtk.Button("Encender Motor C")
+
+        #self.button_detener_motor_A = gtk.Button("Apagar Motor A")
+        #self.button_detener_motor_B = gtk.Button("Apagar Motor B")
+        #self.button_detener_motor_C = gtk.Button("Apagar Motor C")
+
+        #self.button_encender_motor_A.connect("clicked", self.run_motor)
+        #self.button_encender_motor_B.connect("clicked", self.run_motor)
+        #self.button_encender_motor_C.connect("clicked", self.run_motor)
+
+        #self.button_detener_motor_A.connect("clicked", self.stop_motor)
+        #self.button_detener_motor_B.connect("clicked", self.stop_motor)
+        #self.button_detener_motor_C.connect("clicked", self.stop_motor)
+
+        #motor = gtk.HBox()
+        #motor.pack_start(self.button_encender_motor_A, True, True, )
+        #motor.pack_start(self.button_detener_motor_A, True, True, 0)
+        #self.base_box.pack_start(motor, True, True, 0)
+
+        #motor = gtk.HBox(0)
+        #motor.pack_start(self.button_encender_motor_B, True, True, )
+        #motor.pack_start(self.button_detener_motor_B, True, True, 0)
+        #self.base_box.pack_start(motor, True, True, 0)
+
+        #motor = gtk.HBox(0)
+        #motor.pack_start(self.button_encender_motor_C, True, True, )
+        #motor.pack_start(self.button_detener_motor_C, True, True, 0)
+        #self.base_box.pack_start(motor, True, True, 0)
+
+        self.set_canvas(canvas)
 
     def run_motor(self, widget):
         if widget == self.button_encender_motor_A:
diff --git a/TODO b/TODO
index b1c98dc..cb6e24d 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
 New functions / Nuevas Funciones:
-
+	
 Bugs / Bichos:
 
 Fixes / Mejoras:
diff --git a/interface/__init__.py b/interface/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/interface/__init__.py
diff --git a/interface/window.py b/interface/window.py
new file mode 100644
index 0000000..5b8dc98
--- /dev/null
+++ b/interface/window.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import gtk
+
+
+class Window(gtk.Window):
+
+    def __init__(self):
+        super(Window, self).__init__()
+        self.maximize()
+
+    def set_canvas(self, canvas):
+        self.add(canvas)