1 files changed, 78 insertions, 63 deletions

diff --git a/src/YalpClients/EflClient/main.py b/src/YalpClients/EflClient/main.py
index de731e9..4837129 100755
--- a/src/YalpClients/EflClient/main.py
+++ b/src/YalpClients/EflClient/main.py
@@ -9,93 +9,108 @@ import emotion
 import evas
 import elementary
 
-# Parse command line
-#from optparse import OptionParser
-
-"""usage = "usage: %prog [options]"
-op = OptionParser(usage=usage)
-op.add_option("-e", "--engine", type="choice", choices=("x11", "x11-16"),
-	default="x11-16",
-	help=("which display engine to use (x11, x11-16)," "default=%default"))
-op.add_option("-n", "--no-fullscreen", action="store_true",
-	help="do not launch in fullscreen")
-op.add_option("-f", "--fps", type="int", default=20,
-	help="frames per second to use, default=%default")
-
-"""
 # Handle options and create output window
-"""options, args = op.parse_args()
-if options.engine == "x11":
-	f = ecore.evas.SoftwareX11
-elif options.engine == "x11-16":
-	if ecore.evas.engine_type_supported_get("software_x11"):
-		f = ecore.evas.SoftwareX11_16
-	else:
-		print "warning: x11-16 is not supported, fallback to x11"
-		f = ecore.evas.SoftwareX11
-"""
+elementary.init()
+win = elementary.Window("Yalp", elementary.ELM_WIN_BASIC)
+edje_file = os.path.join(os.path.dirname(sys.argv[0]),"yalp_gui.edj")
+c = edje.Edje(win.canvas, file=edje_file, group = "yalp")
 
-def huhu(obj, it, xy):
-        print "guck guck"
+def huhu(obj, str, x):
+	print "guck guck"
 
-def button_clicked(obj, signal,source):
+def findbutton_clicked(obj, signal,source):
 	print "Huhu";
-	c.signal_callback_add("mouse,clicked,1","findbutton",button_clicked)
 
-def gui():
-	elementary.init()
-	win = elementary.Window("Yalp", elementary.ELM_WIN_BASIC)
+def fill_playlist(obj, str, x):
+	playlist = elementary.List(win);
+	playlist.size_hint_weight_set(1.0, 1.0)
+	playlist.size_hint_align_set(-1.0, -1.0)
 	
-	edje_file = os.path.join(os.path.dirname(sys.argv[0]),"yalp_gui.edj")
-	#c = edje.Edje(ee.evas,file=edje_file,group="yalp")
-	c = edje.Edje(win.canvas, file=edje_file, group = "yalp")
-	#c.size = ee.evas.size
-	#c.size = win.canvas.size
-
-	items = [("huhu",huhu),
-		("haha", huhu),
-		("hoho", huhu),
-		("hehe", huhu),
-		("hihi", huhu),
-		("12345", huhu),
-		("abcde", huhu),
-		("fghij", huhu),
-		("klmno", huhu),
-		("pqrst", huhu),
-		("uvwxyz", huhu)]
-
-	#ee = ecore.evas.SoftwareX11(w=800, h=600)
-	win.title_set("YALP")
-	#edje.frametime_set(1.0 / options.fps)
+	box1 = elementary.Box(win)
+	win.resize_object_add(box1)
+	c.part_swallow("playlist", playlist)
+	
+	box1.pack_end(playlist)
+	playlist.show()
+	
+	playlist.item_append(str, None, None, None)
+	
+	playlist.go()
+	box1.show()
+
+def fill_medialist():
+	items = [("huhu", fill_playlist),
+					("haha", fill_playlist),
+					("hoho", fill_playlist),
+					("hehe", fill_playlist),
+					("hihi", fill_playlist),
+					("12345", huhu),
+					("abcde", huhu),
+					("fghij", huhu),
+					("klmno", huhu),
+					("pqrst", huhu),
+					("uvwxyz", huhu)]
 
 	medialist = elementary.List(win);
 	medialist.size_hint_weight_set(1.0, 1.0)
 	medialist.size_hint_align_set(-1.0, -1.0)
-
+	
 	box0 = elementary.Box(win)
 	win.resize_object_add(box0)
 	c.part_swallow("medialist", medialist)
-
+	
 	box0.pack_end(medialist)
-	medialist.show();
+	medialist.show()
 
 	for item in items:
-		print item[0]
-		medialist.item_append(item[0], None, None, item[1]);
-
-	medialist.go();
+		#print item[0]
+		medialist.item_append(item[0], None, None, item[1])
+	
+	medialist.go()
+	box0.show()
 
+def paint_buttons():
+	addbutton = elementary.Button(win)
+	addbutton.label_set("Add to Playlist")
+	c.part_swallow("medialist_buttonframe", addbutton)
+	addbutton.show()
+
+	playbutton = elementary.Button(win)
+	playbutton.label_set("Play")
+	c.part_swallow("playlist_buttonframe", playbutton)
+	c.signal_callback_add("mouse,clicked,1","playlist_buttonframe",
+	playbutton_clicked)
+	playbutton.show()
+
+def playbutton_clicked(obj, signal, source):
+	play_video()
+	
+def play_video():
 	vid = emotion.Emotion(win.canvas,module_filename="xine");
-	vid.file_set("/home/manut/Videos/2009-2.avi");
-
+	vid.file_set("Lordi.mpg");
+	
 	c.part_swallow("video", vid)
-
 	vid.show()
 	vid.play = True
 
+def gui():
+	#elementary.init()
+	#win = elementary.Window("Yalp", elementary.ELM_WIN_BASIC)
+	global win
+	global c
+	win.title_set("YALP")
+
+	#edje_file = os.path.join(os.path.dirname(sys.argv[0]),"yalp_gui.edj")
+	#c = edje.Edje(win.canvas, file=edje_file, group = "yalp")
+	c.signal_callback_add("mouse,clicked,1","findbutton",findbutton_clicked)
+	
+	paint_buttons()
+	
+	fill_medialist()
+	#play_video()
+
 	c.show()
 	win.resize(800,600)
-	box0.show()
 	win.show()
 	#ecore.main_loop_begin();
 	elementary.run();