* Archivos que olvide agregar para el commit anterior.

4 files changed, 19 insertions, 90 deletions

diff --git a/data/frame.glade b/data/frame.glade
index 03fc067..e686ec6 100644
--- a/data/frame.glade
+++ b/data/frame.glade
@@ -2,7 +2,8 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkWindow" id="window1">
+  <object class="GtkWindow" id="window">
+    <signal name="destroy" handler="on_FRAME_destroy"/>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -68,57 +69,6 @@
               </object>
             </child>
             <child>
-              <object class="GtkMenuItem" id="menuitem2">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Edit</property>
-                <property name="use_underline">True</property>
-                <child type="submenu">
-                  <object class="GtkMenu" id="menu2">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem6">
-                        <property name="label">gtk-cut</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem7">
-                        <property name="label">gtk-copy</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem8">
-                        <property name="label">gtk-paste</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="imagemenuitem9">
-                        <property name="label">gtk-delete</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkMenuItem" id="menuitem3">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_View</property>
-                <property name="use_underline">True</property>
-              </object>
-            </child>
-            <child>
               <object class="GtkMenuItem" id="menuitem4">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_Help</property>
@@ -146,16 +96,24 @@
         </child>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
+            <property name="width_request">320</property>
+            <property name="height_request">240</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="hscrollbar_policy">automatic</property>
             <property name="vscrollbar_policy">automatic</property>
             <child>
-              <object class="GtkViewport" id="CONTAINER">
+              <object class="GtkViewport" id="content_container">
                 <property name="visible">True</property>
                 <property name="resize_mode">queue</property>
                 <child>
-                  <placeholder/>
+                  <object class="GtkLabel" id="dummycontent">
+                    <property name="width_request">320</property>
+                    <property name="height_request">240</property>
+                    <property name="visible">True</property>
+                    <property name="yalign">0.4699999988079071</property>
+                    <property name="label" translatable="yes">Dummy object for remove</property>
+                  </object>
                 </child>
               </object>
             </child>
diff --git a/data/state_inicio.glade b/data/state_inicio.glade
index 59aee52..c24e22e 100644
--- a/data/state_inicio.glade
+++ b/data/state_inicio.glade
@@ -5,7 +5,10 @@
   <object class="GtkWindow" id="window">
     <child>
       <object class="GtkDrawingArea" id="drawingarea">
+        <property name="width_request">320</property>
+        <property name="height_request">240</property>
         <property name="visible">True</property>
+        <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property>
         <signal name="button_press_event" handler="on_drawingarea_button_press_event"/>
         <signal name="expose_event" handler="on_drawingarea_expose_event"/>
       </object>
diff --git a/estados.py b/estados.py
index 516e40c..2593bb4 100644
--- a/estados.py
+++ b/estados.py
@@ -48,8 +48,8 @@ class Inicio:
 
 
     def on_drawingarea_button_press_event(self, widget, event):
-        #log.debug("-> cambiar estado a Jugar")
-        self.state.change_state(Fin)
+        log.debug("-> cambiar estado a Jugar")
+        #self.state.change_state(Fin)
 
 
     def on_drawingarea_expose_event(self, widget, event):
diff --git a/fracciones.py b/fracciones.py
index 863d9e0..28b95af 100755
--- a/fracciones.py
+++ b/fracciones.py
@@ -1,42 +1,10 @@
 #!/usr/bin/env python
 import logging
-import gtk
-from juego1 import JuegoModo1
+from application import app
 
 
 logging.basicConfig(level=logging.DEBUG)
-log = logging.getLogger(__name__)
-
-
-class Fracciones:
-    def __init__(self):
-        self.modo = JuegoModo1()
-
-        builder = gtk.Builder()
-        builder.add_from_file("fracciones.xml")
-        builder.connect_signals(self)
-        window = builder.get_object("window")
-        window.show()
-        self.drawingarea = builder.get_object("drawingarea")
-
-
-    def on_window_destroy(self, userdata):
-        gtk.main_quit()
-
-
-    def on_drawingarea_expose_event(self, widget, event):
-        self.modo.draw(widget, event)
-
-
-    def on_drawingarea_button_press_event(self, widget, event):
-        self.modo.update(widget, event)
-
-
-    def on_button_clicked(self, widget):
-        log.debug("on_button_clicked")
-        self.modo.check(self.drawingarea, None)
 
 
 if __name__ == "__main__":
-    app = Fracciones()
-    gtk.main()
+    app.run()