move code for run from fractionpresentation to main

3 files changed, 9 insertions, 31 deletions

diff --git a/fracciones.activity/fracciones_standalone.py b/fracciones.activity/fracciones_standalone.py
deleted file mode 100644
index 9f52088..0000000
--- a/fracciones.activity/fracciones_standalone.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-import gtk
-from application import ApplicationManager
-
-class FraccionesStandalone(gtk.Window):
-    """ Clase principal cuando se corre por fuera de Sugar """
-    def __init__(self, *args, **kwargs):
-        super(FraccionesStandalone, self).__init__(gtk.WINDOW_TOPLEVEL, *args, **kwargs)
-
-        # conectar maquina de estados principal
-        self.application_manager = ApplicationManager(self)
diff --git a/fracciones.activity/fractionpresentation.py b/fracciones.activity/fractionpresentation.py
index ee98f14..f53185f 100644
--- a/fracciones.activity/fractionpresentation.py
+++ b/fracciones.activity/fractionpresentation.py
@@ -111,15 +111,3 @@ class FractionPresentation(gtk.VBox):
         self.logic.generate()
         self.label.set_text("""Eat %i/%i"""%self.logic.get_current())
         self.cake.reset(self.logic.get_current()[1])
-
-
-if __name__ == "__main__":
-    class Main(gtk.Window):
-        def __init__(self):
-            super(Main, self).__init__() 
-            self.add(FractionPresentation())
-            self.connect("destroy", gtk.main_quit)
-            self.show()
-    log.debug("Hola")
-    Main()
-    gtk.main()
diff --git a/fracciones.activity/main.py b/fracciones.activity/main.py
index b17e876..bf37a5e 100755
--- a/fracciones.activity/main.py
+++ b/fracciones.activity/main.py
@@ -1,16 +1,17 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-.
-
-import logging
 import gtk
-from fracciones_standalone import FraccionesStandalone
-
+from fractionpresentation import FractionPresentation
 
-logging.basicConfig(level=logging.DEBUG)
 
+class FraccionesStandalone(gtk.Window):
+    def __init__(self):
+        super(FraccionesStandalone, self).__init__() 
+        self.add(FractionPresentation())
+        self.connect("destroy", gtk.main_quit)
+        self.show()
+ 
 
 if __name__ == "__main__":
-    # crea ventana standalone
-    standalone = FraccionesStandalone()
-    # loop de eventos
+    FraccionesStandalone()
     gtk.main()