1 files changed, 10 insertions, 70 deletions
diff --git a/src/YalpClients/EflClient/main.py b/src/YalpClients/EflClient/main.py
index a7050b8..8483878 100755
--- a/src/YalpClients/EflClient/main.py
+++ b/src/YalpClients/EflClient/main.py
@@ -9,83 +9,23 @@ import emotion
 import evas
 import elementary
 
+#imort own Classes
 import searchframe
 import medialist
-
-#import globals
-
-# Handle options and create output window
-
-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")
-m = medialist.Medias()
-s = searchframe.Search()
-
-"""
-def huhu(obj, str, x):
-	print "guck guck"
-
-
-def findbutton_clicked(obj, signal,source):
-	print "Huhu";
-"""
-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)
-	
-	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 paint_buttons():
-	"""
-	addbutton = elementary.Button(win)
-	addbutton.label_set("Add to Playlist")
-	c.part_swallow("medialist_buttonframe", addbutton)
-	addbutton.show()
-	"""
-	
-	m.add_button(win, c)
-	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("Lordi.mpg");
-	
-	c.part_swallow("video", vid)
-	vid.show()
-	vid.play = True
+import playlist
 
 def gui():
-	global win
-	global c
+	elementary.init()
+	win = elementary.Window("Yalp", elementary.ELM_WIN_BASIC)
 	win.title_set("YALP")
+	vid = emotion.Emotion(win.canvas,module_filename="xine");
+	edje_file = os.path.join(os.path.dirname(sys.argv[0]),"yalp_gui.edj")
+	c = edje.Edje(win.canvas, file=edje_file, group = "yalp")
+	m = medialist.Medias(win, c)
+	s = searchframe.Search(win, c)
+	video = playlist.Selection(win, c, vid)
 
-	c.signal_callback_add("mouse,clicked,1","findbutton", s.findbutton_clicked)
-	paint_buttons()
-	
 	m.fill_medialist(win, c)
-	#play_video()
-
 	c.show()
 	win.resize(800,600)
 	win.show()