Skip to content

Commit

Permalink
Vista de Juegos
Browse files Browse the repository at this point in the history
  • Loading branch information
fdanesse committed Dec 5, 2014
1 parent cb1dfa9 commit 5110037
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 6 deletions.
38 changes: 36 additions & 2 deletions GameView.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,45 @@ def __init__(self):
self.modify_bg(gtk.STATE_NORMAL, COLORES["toolbar"])
self.set_border_width(4)

self.add(gtk.Label("Games"))
self.game_widget = DrawingWidget()

self.add(self.game_widget)
self.show_all()

def stop(self):
self.game_widget.stop()
self.hide()

def run(self):
def run(self, topic):
self.show()
self.game_widget.load(topic)


class DrawingWidget(gtk.DrawingArea):

def __init__(self):

gtk.DrawingArea.__init__(self)

self.modify_bg(gtk.STATE_NORMAL, COLORES["text"])

self.juego = False

self.show_all()

def __run_game(self, _dict):
"""
Comienza a correr el Juego.
"""
xid = self.get_property('window').xid
os.putenv('SDL_WINDOWID', str(xid))
#self.juego = Juego()
#self.juego.run()

def load(self, topic):
# self.__run_game(_dict)
pass

def stop(self):
if self.juego:
self.juego.stop()
22 changes: 18 additions & 4 deletions VideoView.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ class VideoView(gtk.EventBox):

__gsignals__ = {
"flashcards": (gobject.SIGNAL_RUN_FIRST,
gobject.TYPE_NONE, (gobject.TYPE_STRING, )),
"game": (gobject.SIGNAL_RUN_FIRST,
gobject.TYPE_NONE, (gobject.TYPE_STRING, ))}

def __init__(self):
Expand Down Expand Up @@ -69,12 +71,17 @@ def __init__(self):
self.show_all()

flashcards.connect("clicked", self.__emit_flashcards)
self.imagen_juego.connect("button-press-event", self.__emit_game)

def __emit_game(self, widget, event):
self.emit("game", self.topic)

def __emit_flashcards(self, widget):
self.emit("flashcards", self.topic)

def stop(self):
self.videoplayer.stop()
self.imagen_juego.stop()
self.hide()

def run(self, topic):
Expand All @@ -92,23 +99,30 @@ def __init__(self):

self.modify_bg(gtk.STATE_NORMAL, COLORES["text"])

self.add_events(
gtk.gdk.BUTTON_PRESS_MASK
)

self.vocabulario = []
self.index_select = 1
self.imagenplayer = False
self.path = False

self.show_all()

def stop(self):
if self.imagenplayer:
self.imagenplayer.stop()
del(self.imagenplayer)
self.imagenplayer = False

def load(self, topic):
self.stop()
csvfile = os.path.join(topic, "vocabulario.csv")
self.vocabulario = get_vocabulario(csvfile)
self.index_select = 1
self.path = os.path.join(topic, "Imagenes",
"%s.png" % self.vocabulario[self.index_select][0])
if self.imagenplayer:
self.imagenplayer.stop()
del(self.imagenplayer)
self.imagenplayer = False
self.imagenplayer = ImagePlayer(self)
self.imagenplayer.load(self.path)
return False
6 changes: 6 additions & 0 deletions enfoli.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,15 @@ def __init__(self):
self.toolbar.connect("activar", self.__switch)
self.toolbar.connect("video", self.__play_video)
self.videoview.connect("flashcards", self.__play_flashcards)
self.videoview.connect("game", self.__play_game)
self.connect("delete-event", self.__salir)

self.resize(640, 480)
self.toolbar.buttons[0].set_active(True)

def __play_game(self, widget, topic):
self.__switch(False, "game", topic)

def __play_flashcards(self, widget, topic):
self.__switch(False, "flashcards", topic)

Expand All @@ -103,6 +107,8 @@ def __switch(self, widget, label, data=False):
self.videoview.run(data)
elif label == "flashcards":
self.flashcards.run(data)
elif label == "game":
self.gameview.run(data)
return False

def __salir(self, widget=None, senial=None):
Expand Down

0 comments on commit 5110037

Please sign in to comment.