Fixed bugs when opening division and multiplication. Fixed multiples bugs when adding and removing digits from factors. Avoid generating history changing a number for the same number.

10 files changed, 119 insertions, 227 deletions

diff --git a/Control.py b/Control.py
index 8deb312..c788b4a 100644
--- a/Control.py
+++ b/Control.py
@@ -35,18 +35,10 @@ class Control:
         self.hist = Historia()
         self.cuenta = None
         
-
-        # Create a new window
-        self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
-        self.window.set_title("Mateton")
-        self.window.connect("delete_event", self.deleteEvent)
-        self.window.set_border_width(5)
-        self.window.set_default_size(800, 600)
-
         #Contiene todo
         self.todo = gtk.HBox(False, 0)
         self.todo.show()
-        #self.window.add(self.todo) #uncomment for PC
+        
 
         #Contiene los menus
         self.menus = gtk.VBox(False, 0)
@@ -75,7 +67,7 @@ class Control:
         self.menu.setZoomListeners((self.__moverZoom, self.cuenta.actualizarLineHor))
         self.menu.setBorrarListeners((self.__agregarAHistCV, self.__numClic, self.__actualizarAdj))
 
-        self.window.show()
+        
 
         #registro listeners
         self.num.setListener((self.__agregarAHistCV, self.__numClic, self.__actualizarAdj))
@@ -84,9 +76,27 @@ class Control:
         self.menu.setGuardarListeners((self.mantener,))
         self.menu.setAbrirListeners((self.cargar,))
 
+        # Create a new window
+
+        #<uncomment for PC>
+
 
+#        self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
+#        self.window.set_title("Mateton")
+#        self.window.connect("delete_event", self.deleteEvent)
+#        self.window.set_border_width(5)
+#        self.window.set_default_size(800, 600)
+#
+#        self.window.add(self.todo)
+#        self.window.show()
+
+
+
+        #</uncomment for PC>
 
     def cargarCuenta(self, tipo, operacion=None):
+        if self.seleccionado != None:
+            self.__desseleccionar()
         if not self.cuenta == None:
             self.todo.remove(self.pizarron)
             self.pizarron = gtk.ScrolledWindow()
@@ -111,36 +121,36 @@ class Control:
                 self.cuenta = Division((self.__digClic,))
 
         if tipo == 0 or tipo == 1:
-            self.cuenta.factores.setListenerClicMas((self.__agregarAHistAF, self.__actualizarAdj))
-            self.cuenta.factores.setListenerClicMenos((self.__agregarAHistQF, self.__actualizarAdj))
-            self.cuenta.factores.setListenerFactores((self.__agregarAHistAD, self.__actualizarAdj), (self.__agregarAHistQD, self.__actualizarAdj))
-            self.cuenta.resultado.setListenerClicMas((self.__agregarAHistAD, self.__actualizarAdj, self.cuenta.actualizarLineHor))
-            self.cuenta.resultado.setListenerClicMenos((self.__agregarAHistQD, self.__actualizarAdj, self.cuenta.actualizarLineHor))
+            self.cuenta.factores.setListenerClicMas((self.__agregarAHistAF, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.factores.setListenerClicMenos((self.__agregarAHistQF, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.factores.setListenerFactores((self.__agregarAHistAD, self.__actualizarAdj, self.__desseleccionar), (self.__agregarAHistQD, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.resultado.setListenerClicMas((self.__agregarAHistAD, self.__actualizarAdj, self.__desseleccionar, self.cuenta.actualizarLineHor))
+            self.cuenta.resultado.setListenerClicMenos((self.__agregarAHistQD, self.__actualizarAdj, self.__desseleccionar, self.cuenta.actualizarLineHor))
         elif tipo == 2:
-            self.cuenta.factores.setListenerClicMas((self.__agregarAHistAF, self.__actualizarAdj))
-            self.cuenta.factores.setListenerClicMenos((self.__agregarAHistQF, self.__actualizarAdj))
-            self.cuenta.factores.setListenerFactores((self.__agregarAHistAD, self.__actualizarAdj), (self.__agregarAHistQD, self.__actualizarAdj))
+            self.cuenta.factores.setListenerClicMas((self.__agregarAHistAF, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.factores.setListenerClicMenos((self.__agregarAHistQF, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.factores.setListenerFactores((self.__agregarAHistAD, self.__actualizarAdj, self.__desseleccionar), (self.__agregarAHistQD, self.__actualizarAdj, self.__desseleccionar))
 
-            self.cuenta.suma.factores.setListenerFactores((self.__agregarAHistAD, self.__actualizarAdj), (self.__agregarAHistQD, self.__actualizarAdj))
-            self.cuenta.suma.factores.setListenerClicMenos((self.__agregarAHistQF, self.__actualizarAdj))
-            self.cuenta.suma.factores.setListenerClicMas((self.__agregarAHistAF, self.__actualizarAdj))
+            self.cuenta.suma.factores.setListenerFactores((self.__agregarAHistAD, self.__actualizarAdj), (self.__agregarAHistQD, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.suma.factores.setListenerClicMenos((self.__agregarAHistQF, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.suma.factores.setListenerClicMas((self.__agregarAHistAF, self.__actualizarAdj, self.__desseleccionar))
 
-            self.cuenta.suma.resultado.setListenerClicMas((self.__agregarAHistAD, self.__actualizarAdj))
-            self.cuenta.suma.resultado.setListenerClicMenos((self.__agregarAHistQD, self.__actualizarAdj))
+            self.cuenta.suma.resultado.setListenerClicMas((self.__agregarAHistAD, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.suma.resultado.setListenerClicMenos((self.__agregarAHistQD, self.__actualizarAdj, self.__desseleccionar))
 
         elif tipo == 3:
-            self.cuenta.restos.setListenerClicMas((self.__agregarAHistAF, self.__actualizarAdj))
-            self.cuenta.restos.setListenerClicMenos((self.__agregarAHistQF, self.__actualizarAdj))
-            self.cuenta.restos.setListenerFactores((self.__agregarAHistAD, self.__actualizarAdj), (self.__agregarAHistQD, self.__actualizarAdj))
+            self.cuenta.restos.setListenerClicMas((self.__agregarAHistAF, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.restos.setListenerClicMenos((self.__agregarAHistQF, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.restos.setListenerFactores((self.__agregarAHistAD, self.__actualizarAdj), (self.__agregarAHistQD, self.__actualizarAdj, self.__desseleccionar))
 
-            self.cuenta.cociente.setListenerClicMas((self.__agregarAHistAD, self.__actualizarAdj))
-            self.cuenta.cociente.setListenerClicMas((self.__agregarAHistQD, self.__actualizarAdj))
+            self.cuenta.cociente.setListenerClicMas((self.__agregarAHistAD, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.cociente.setListenerClicMas((self.__agregarAHistQD, self.__actualizarAdj, self.__desseleccionar))
 
-            self.cuenta.divisor.setListenerClicMas((self.__agregarAHistAD, self.__actualizarAdj))
-            self.cuenta.divisor.setListenerClicMas((self.__agregarAHistQD, self.__actualizarAdj))
+            self.cuenta.divisor.setListenerClicMas((self.__agregarAHistAD, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.divisor.setListenerClicMas((self.__agregarAHistQD, self.__actualizarAdj, self.__desseleccionar))
 
-            self.cuenta.dividendo.setListenerClicMas((self.__agregarAHistAD, self.__actualizarAdj))
-            self.cuenta.dividendo.setListenerClicMas((self.__agregarAHistQD, self.__actualizarAdj))
+            self.cuenta.dividendo.setListenerClicMas((self.__agregarAHistAD, self.__actualizarAdj, self.__desseleccionar))
+            self.cuenta.dividendo.setListenerClicMas((self.__agregarAHistQD, self.__actualizarAdj, self.__desseleccionar))
 
         self.pizarron.add_with_viewport(self.cuenta.agregar)
         print "paso"
@@ -158,7 +168,7 @@ class Control:
             self.seleccionado.seleccionar(True)
 
     def __agregarAHistCV(self, valor): #callback para clic en boton numero
-         if self.seleccionado:
+         if self.seleccionado and self.seleccionado.getValor() != valor:
             suc = Suceso(0)
             suc.setObjeto(self.seleccionado.idFactor, self.seleccionado.idDigito)
             suc.setValor((self.seleccionado.getValor(), valor))
@@ -183,10 +193,9 @@ class Control:
         self.hist.agregar(suc)
 
     def __actualizarAdj(self, data1=0, data2=0):
-        self.menu.adj.set_upper(len(self.hist.suc)-1)
-        self.menu.adj.set_value(self.hist.getPosicion())
-
-        
+        self.menu.cargarAdj(self.hist.getPosicion()+1, 0, len(self.hist.suc)-1)
+        self.menu.setHistListeners((self.__moverHistoria,))
+       
 
     def __deshacer(self, boton, data): #callback para el boton deshacer
         self.hist.setPosicion(self.hist.getPosicion()-1, self.cuenta)
@@ -237,6 +246,11 @@ class Control:
     def __division(self, obj, data):
         self.cargarCuenta(3)
 
+    def __desseleccionar(self, obj=0, data=0):
+        if self.seleccionado != None:
+            self.seleccionado.seleccionar(False)
+            self.seleccionado = None
+
 
 
 def main():
diff --git a/MANIFEST b/MANIFEST
index 2a31e37..23bdd1d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -4,20 +4,15 @@ setup.py
 historia/Historia.py
 historia/Suceso.py
 activity/teleton.gif
-
 activity/activity.info
 objects/Factores.py
 objects/Digitos.py
 objects/Menu.py
-
 objects/Numeros.py
 objects/Factor.py
 objects/Digito.py
 data/EstadoOperacion.py
-
-
 data/Manager.py
-
 images/+.gif
 images/lineaHor.png
 images/lineaVer.png
@@ -179,164 +174,8 @@ po/Mateton.pot
 locale/es/activity.linfo
 locale/es/LC_MESSAGES/org.teleton.ingenieria.Mateton.mo
 po/es.po
-data/saves/03-jun-2011-14:53:54.hst
-data/saves/06-jun-2011-12:19:00.opr
-data/saves/06-jun-2011-13:39:27.opr
-data/saves/06-jun-2011-12:03:10.opr
-data/saves/03-jun-2011-14:54:23.hst
-data/saves/06-jun-2011-12:22:47.opr
-data/saves/03-jun-2011-14:59:30.hst
-data/saves/06-jun-2011-13:28:20.hst
-data/saves/hola.hst
-data/saves/06-jun-2011-12:30:19.hst
-data/saves/06-jun-2011-12:10:56.opr
-data/saves/06-jun-2011-12:20:42.opr
-data/saves/06-jun-2011-13:25:28.opr
-data/saves/06-jun-2011-13:27:17.hst
-data/saves/03-jun-2011-14:59:30.opr
-data/saves/06-jun-2011-12:30:07.opr
-data/saves/03-jun-2011-14:53:55.opr
-data/saves/06-jun-2011-13:08:01.hst
-data/saves/06-jun-2011-13:17:49.opr
-data/saves/03-jun-2011-14:59:19.opr
-data/saves/06-jun-2011-12:25:15.opr
-data/saves/06-jun-2011-12:25:25.opr
-data/saves/06-jun-2011-13:17:49.hst
-data/saves/06-jun-2011-12:14:21.opr
-data/saves/06-jun-2011-12:10:56.hst
-data/saves/06-jun-2011-12:30:15.hst
-data/saves/06-jun-2011-12:29:02.hst
-data/saves/06-jun-2011-12:35:55.hst
-data/saves/06-jun-2011-12:00:32.hst
-data/saves/06-jun-2011-13:25:28.hst
-data/saves/06-jun-2011-12:00:09.hst
-data/saves/06-jun-2011-12:03:10.hst
-data/saves/06-jun-2011-12:05:23.hst
-data/saves/06-jun-2011-13:11:24.hst
-data/saves/06-jun-2011-12:11:37.hst
-data/saves/06-jun-2011-12:35:55.opr
-data/saves/06-jun-2011-13:16:39.hst
-data/saves/03-jun-2011-14:54:23.opr
-data/saves/06-jun-2011-13:16:39.opr
-data/saves/06-jun-2011-12:25:15.hst
-data/saves/06-jun-2011-12:19:00.hst
-data/saves/06-jun-2011-12:05:23.opr
-data/saves/06-jun-2011-12:14:11.hst
-data/saves/06-jun-2011-12:14:11.opr
-data/saves/06-jun-2011-13:08:01.opr
-data/saves/06-jun-2011-12:13:14.hst
-data/saves/06-jun-2011-12:30:07.hst
-data/saves/06-jun-2011-12:50:48.opr
-data/saves/06-jun-2011-12:50:48.hst
-data/saves/06-jun-2011-12:32:24.opr
-data/saves/06-jun-2011-13:28:20.opr
-data/saves/prueba1.opr
-data/saves/06-jun-2011-12:20:42.hst
-data/saves/03-jun-2011-14:59:19.hst
-data/saves/06-jun-2011-12:30:18.hst
-data/saves/06-jun-2011-13:39:27.hst
-data/saves/06-jun-2011-12:14:21.hst
-data/saves/06-jun-2011-12:22:47.hst
-data/saves/06-jun-2011-12:00:32.opr
-data/saves/06-jun-2011-13:11:24.opr
-data/saves/03-jun-2011-14:57:57.hst
-data/saves/06-jun-2011-12:10:24.opr
-data/saves/03-jun-2011-14:57:57.opr
-data/saves/hola.opr
-data/saves/03-jun-2011-14:54:32.opr
-data/saves/06-jun-2011-12:11:37.opr
-data/saves/06-jun-2011-12:15:04.hst
-data/saves/06-jun-2011-12:15:04.opr
-data/saves/prueba1.hst
-data/saves/06-jun-2011-12:24:39.hst
-data/saves/06-jun-2011-12:29:02.opr
-data/saves/06-jun-2011-12:30:15.opr
-data/saves/06-jun-2011-12:00:09.opr
-data/saves/06-jun-2011-13:17:21.opr
-data/saves/06-jun-2011-12:25:25.hst
-data/saves/06-jun-2011-13:17:21.hst
-data/saves/06-jun-2011-12:32:24.hst
-data/saves/06-jun-2011-12:10:24.hst
-data/saves/06-jun-2011-12:24:39.opr
-data/saves/03-jun-2011-14:53:54.opr
-data/saves/06-jun-2011-12:30:18.opr
-data/saves/06-jun-2011-13:16:24.opr
-data/saves/06-jun-2011-12:13:14.opr
-data/saves/06-jun-2011-13:16:24.hst
-data/saves/03-jun-2011-14:54:32.hst
-data/saves/06-jun-2011-13:27:17.opr
-data/saves/06-jun-2011-12:30:19.opr
-data/saves/03-jun-2011-14:53:55.hst
 licencense_en.txt
 license_es.txt
-activity/dibujo.svg
 activity/activity-Mateton.svg
-data/saves/07-jun-2011-13:34:49.opr
-data/saves/06-jun-2011-14:50:11.opr
-data/saves/06-jun-2011-14:44:24.opr
-data/saves/07-jun-2011-13:40:11.opr
-data/saves/06-jun-2011-14:43:52.hst
-data/saves/06-jun-2011-14:43:52.opr
-data/saves/06-jun-2011-14:46:51.opr
-data/saves/07-jun-2011-13:41:10.hst
-data/saves/07-jun-2011-13:42:24.hst
-data/saves/07-jun-2011-13:42:08.hst
-data/saves/07-jun-2011-13:40:10.opr
-data/saves/07-jun-2011-13:37:50.hst
-data/saves/07-jun-2011-14:46:42.hst
-data/saves/06-jun-2011-14:46:51.hst
-data/saves/06-jun-2011-14:45:50.hst
-data/saves/07-jun-2011-12:13:26.hst
-data/saves/06-jun-2011-14:38:10.hst
-data/saves/07-jun-2011-13:34:49.hst
-data/saves/07-jun-2011-13:41:05.hst
-data/saves/07-jun-2011-14:59:31.opr
-data/saves/07-jun-2011-12:13:19.opr
-data/saves/07-jun-2011-13:09:34.opr
-data/saves/07-jun-2011-14:46:17.hst
-data/saves/07-jun-2011-14:39:44.opr
-data/saves/07-jun-2011-13:42:08.opr
-data/saves/07-jun-2011-12:13:26.opr
-data/saves/06-jun-2011-14:46:12.opr
-data/saves/07-jun-2011-14:46:17.opr
-data/saves/06-jun-2011-14:46:12.hst
-data/saves/07-jun-2011-13:42:10.opr
-data/saves/07-jun-2011-13:42:10.hst
-data/saves/07-jun-2011-13:40:12.opr
-data/saves/06-jun-2011-14:59:19.hst
-data/saves/07-jun-2011-13:40:11.hst
-data/saves/07-jun-2011-13:40:12.hst
-data/saves/07-jun-2011-13:38:30.opr
-data/saves/06-jun-2011-14:44:24.hst
-data/saves/07-jun-2011-13:41:05.opr
-data/saves/07-jun-2011-13:37:29.opr
-data/saves/07-jun-2011-12:03:57.hst
-data/saves/07-jun-2011-14:39:39.hst
-data/saves/07-jun-2011-13:40:10.hst
-data/saves/07-jun-2011-12:13:19.hst
-data/saves/07-jun-2011-13:37:50.opr
-data/saves/07-jun-2011-13:09:17.hst
-data/saves/07-jun-2011-13:38:49.hst
-data/saves/07-jun-2011-13:09:34.hst
-data/saves/07-jun-2011-14:59:31.hst
-data/saves/07-jun-2011-14:46:18.opr
-data/saves/06-jun-2011-14:42:56.opr
-data/saves/07-jun-2011-12:13:13.hst
-data/saves/07-jun-2011-12:13:13.opr
-data/saves/07-jun-2011-13:09:17.opr
-data/saves/06-jun-2011-14:50:11.hst
-data/saves/07-jun-2011-13:38:30.hst
-data/saves/07-jun-2011-14:46:42.opr
-data/saves/07-jun-2011-13:37:29.hst
-data/saves/06-jun-2011-14:45:50.opr
-data/saves/07-jun-2011-14:39:44.hst
-data/saves/06-jun-2011-14:59:19.opr
-data/saves/07-jun-2011-13:38:49.opr
-data/saves/07-jun-2011-14:46:18.hst
-data/saves/07-jun-2011-13:41:10.opr
-data/saves/07-jun-2011-14:39:39.opr
-data/saves/06-jun-2011-14:38:10.opr
-data/saves/07-jun-2011-13:42:24.opr
-data/saves/06-jun-2011-14:42:56.hst
-data/saves/07-jun-2011-12:03:57.opr
 icons/acerca.svg
+data/saves/blank
diff --git a/Mateton.py b/Mateton.py
index b56cfee..44cb83f 100644
--- a/Mateton.py
+++ b/Mateton.py
@@ -46,6 +46,7 @@ class Mateton(activity.Activity):
         fd.close()
 
         self.activity.cargar(nombre = data['name'])
+        pass
 
     def write_file(self, file_path):
         if not self.metadata['mime_type']:
@@ -60,6 +61,7 @@ class Mateton(activity.Activity):
         fd.close()
 
         self.activity.mantener(nombre = data['name'])
+        pass
 
 
     def acerca(self, data):
@@ -73,5 +75,6 @@ class Mateton(activity.Activity):
         about.set_logo(gtk.gdk.pixbuf_new_from_file("activity/teleton.gif"))
         about.run()
         about.destroy()
+        pass
 
 
diff --git a/activity/activity-Mateton.svg b/activity/activity-Mateton.svg
index 7e140fe..31f3e82 100644
--- a/activity/activity-Mateton.svg
+++ b/activity/activity-Mateton.svg
@@ -21,7 +21,7 @@
      id="defs3187" />
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="&fill_color;"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
diff --git a/data/Manager.py b/data/Manager.py
index 89e4ddd..4a6d9a1 100644
--- a/data/Manager.py
+++ b/data/Manager.py
@@ -4,6 +4,8 @@ __date__ ="$20/05/2011 12:12:20 PM$"
 import pickle
 from Suma import Suma
 from Resta import Resta
+from Multiplicacion import Multiplicacion
+from Division import Division
 
 class Manager:
     def __init__(self, funcDigit):
@@ -40,6 +42,8 @@ class Manager:
             operacion = Resta(self.funcionesDigitos)
         elif eo.tipo == 2:
             operacion = Multiplicacion(self.funcionesDigitos)
+        elif eo.tipo == 3:
+            operacion = Division(self.funcionesDigitos)
 
         historia.actual = 0
         for i in xrange(len(historia.suc)):
diff --git a/data/saves/blank b/data/saves/blank
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/data/saves/blank
diff --git a/dist/Mateton-1.xo b/dist/Mateton-1.xo
index 02ed99f..b65025d 100644
--- a/dist/Mateton-1.xo
+++ b/dist/Mateton-1.xo
diff --git a/historia/Historia.py b/historia/Historia.py
index 7074ca1..a791179 100644
--- a/historia/Historia.py
+++ b/historia/Historia.py
@@ -24,10 +24,11 @@ class Historia:
 
 
     def setPosicion(self, lugar, operacion):
-        actual = self.suc[self.actual]
-        nuevo = self.suc[lugar]
-
         if self.actual < lugar: #me muevo hacia la derecha
+            if lugar - self.actual > 1:
+                self.setPosicion(lugar - 1, operacion)
+
+            nuevo = self.suc[lugar]
             tipo = nuevo.getTipo()
             if tipo == 0:
                 valores = nuevo.getValor()
@@ -45,6 +46,10 @@ class Historia:
                 operacion.factores.factores[obj].digitos.quitarUno()
 
         elif self.actual > lugar: #me muevo hacia la izquierda
+            if self.actual - lugar > 1:
+                self.setPosicion(lugar+1, operacion)
+
+            actual = self.suc[self.actual]
             tipo = actual.getTipo()
             if  tipo == 0:
                 valores = actual.getValor()
diff --git a/objects/Menu.py b/objects/Menu.py
index f2222f8..84ab5b8 100644
--- a/objects/Menu.py
+++ b/objects/Menu.py
@@ -22,6 +22,9 @@ class Menu:
 #        h4 = gtk.HBox()
 #        h4.show()
 
+        self.adj = None
+        self.history = None
+
         #Deshacer y borrar
         herr = gtk.Frame(_("Tools"))
         herr.show()
@@ -50,20 +53,15 @@ class Menu:
         h = gtk.Frame(_("History"))
         h.show()
         h3.add(h)
-        cont2 = gtk.VBox()
-        cont2.show()
-        h.add(cont2)
+        self.cont2 = gtk.VBox()
+        self.cont2.show()
+        h.add(self.cont2)
 
         self.undo = gtk.Button(_("Undo"))
         self.undo.show()
-        cont2.add(self.undo)
+        self.cont2.add(self.undo)
 
-        #gtk.Adjustment(value=0, lower=0, upper=0, step_incr=0, page_incr=0, page_size=0)
-        self.adj =  gtk.Adjustment(0, 0, 0, 1, 1)
-        self.history = gtk.HScale(self.adj)
-        self.history.set_digits(0)
-        self.history.show()
-        cont2.add(self.history)
+        self.cargarAdj(0, 0, 0, 1, 1)
 
         z = gtk.Frame(_("Zoom"))
         z.show()
@@ -150,4 +148,19 @@ class Menu:
 
     def __clicBorrar(self, object, data):
         for f in self.borrarListeners:
-            f(-1)
\ No newline at end of file
+            f(-1)
+
+
+    def cargarAdj(self, value=0, lower=0, upper=0, step_incr=0, page_incr=0, page_size=0):
+        #gtk.Adjustment(value=0, lower=0, upper=0, step_incr=0, page_incr=0, page_size=0)
+        if self.adj!=None:
+            del self.adj
+        if self.history !=None:
+            self.cont2.remove(self.history)
+            del self.history
+
+        self.adj =  gtk.Adjustment(value, lower, upper, step_incr, page_incr, page_size)
+        self.history = gtk.HScale(self.adj)
+        self.history.set_digits(0)
+        self.history.show()
+        self.cont2.add(self.history)
\ No newline at end of file
diff --git a/po/Mateton.pot b/po/Mateton.pot
index e638c84..f53a0b2 100644
--- a/po/Mateton.pot
+++ b/po/Mateton.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-06 13:55+0000\n"
+"POT-Creation-Date: 2011-06-10 13:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,50 +21,64 @@ msgstr ""
 msgid "Mateton"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:26
+#: /home/rodripf/Programacion/Mateton2/src/Mateton.py:26
+msgid "Acerca de..."
+msgstr ""
+
+#: /home/rodripf/Programacion/Mateton2/src/Mateton.py:72
+msgid "Rodrigo Perez Fulloni - Released under the GPL v.3.0"
+msgstr ""
+
+#: /home/rodripf/Programacion/Mateton2/src/Mateton.py:73
+msgid ""
+"Departamento de Inenieria - Fundacion Teleton\n"
+"Montevideo Uruguay"
+msgstr ""
+
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:29
 msgid "Tools"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:37
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:40
 msgid "Erase"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:41
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:44
 msgid "Save"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:45
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:48
 msgid "Load"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:50
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:53
 msgid "History"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:57
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:60
 msgid "Undo"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:68
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:66
 msgid "Zoom"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:83
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:81
 msgid "Operations"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:92
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:90
 msgid "Addition"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:95
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:93
 msgid "Subtraction"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:98
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:96
 msgid "Multiplication"
 msgstr ""
 
-#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:101
+#: /home/rodripf/Programacion/Mateton2/src/objects/Menu.py:99
 msgid "Division"
 msgstr ""