eyalp: edje file for desktop and openmoko guiHEADdamba

Signed-off-by: Manuel Traut <manut@mecka.net>

5 files changed, 673 insertions, 244 deletions

diff --git a/src/YalpClients/EflClient/eyalp.py b/src/YalpClients/EflClient/eyalp.py
index 9865d6a..3c6cdb0 100755
--- a/src/YalpClients/EflClient/eyalp.py
+++ b/src/YalpClients/EflClient/eyalp.py
@@ -27,12 +27,13 @@ def gui():
 
 	win.autodel_set(True)
 
-	edje_file = os.path.join(os.path.dirname(sys.argv[0]),"yalp_gui.edj")
+	edje_file = os.path.join(os.path.dirname(sys.argv[0]), sys.argv[1])
 	c = edje.Edje(win.canvas, file=edje_file, group = "yalp")
 	s = searchframe.Search(win, c)
 	
 	c.show()
-	win.resize(480,620)
+	dim = c.part_geometry_get("main")
+	win.resize(dim[2],dim[3])
 	win.show()
 	elementary.run();
 	print "quit main loop"
diff --git a/src/YalpClients/EflClient/playlist.py b/src/YalpClients/EflClient/playlist.py
index 6e356c7..16934c1 100755
--- a/src/YalpClients/EflClient/playlist.py
+++ b/src/YalpClients/EflClient/playlist.py
@@ -20,7 +20,7 @@ class Selection(object):
 		self.add_button()
 		self.c.signal_callback_add("mouse,clicked,1", "medialist_buttonframe",
 		self.play_video)
-		self.vid = emotion.Emotion(self.win.canvas, module_filename="xine")
+		self.vid = emotion.Emotion(self.win.canvas, module_filename="gstreamer")
 
 		self.is_playing = False
 
@@ -54,7 +54,7 @@ class Selection(object):
 		port = 9993
 		#self.vid = emotion.Emotion(self.win.canvas, module_filename="xine")
 		if self.is_playing == True:
-			self.vid = emotion.Emotion(self.win.canvas, module_filename="xine")
+			self.vid = emotion.Emotion(self.win.canvas, module_filename="gstreamer")
 			self.stream.outputAction = YalpInterfaces.PLAY
 			ret = self.servercon.control(self.stream)
 			self.vid.file_set("http://"+ip+":"+str(port))
diff --git a/src/YalpClients/EflClient/yalp_gui.edc b/src/YalpClients/EflClient/yalp_gui.edc
index 316ac16..a8ede1e 100755
--- a/src/YalpClients/EflClient/yalp_gui.edc
+++ b/src/YalpClients/EflClient/yalp_gui.edc
@@ -3,7 +3,7 @@ collections
 	group
 	{
 		name: "yalp";
-		min:  480 620;
+		min:  800 600;
 		parts
 		{
 			part
@@ -39,14 +39,12 @@ collections
 					aspect: 0.75 1.25;
 					rel1
 					{
-						/*relative: 0.3 0.2;*/
-						relative: 0.35 0.3;
+						relative: 0.35 0.0;
 						offset: 0 0;
 					}
 					rel2
 					{
-						/*relative: 0.75 0.8;*/
-						relative: 0.7 0.7;
+						relative: 1.0 1.0;
 						offset: 0 0;
 					}
 				}
@@ -72,22 +70,7 @@ collections
 					}
 					rel2
 					{
-						relative: 1.0 0.2;
-						offset: -1 -1;
-					}
-				}
-				description
-				{
-					state: "default" 1.0;
-					color: 0 0 0 0;
-					rel1
-					{
-						relative: 0.0 0.0;
-						offset: 0 0;
-					}
-					rel2
-					{
-						relative: 1.0 0.01;
+						relative: 0.35 0.2;
 						offset: -1 -1;
 					}
 				}
@@ -112,24 +95,7 @@ collections
 					}
 					rel2
 					{
-						relative: 1.0 1.0;
-						offset: 0 0;
-					}
-				}
-				description
-				{
-					state: "default" 1.0;
-					align: 0 0;
-					color: 0 0 0 0;
-					
-					rel1
-					{
-						relative: 0.0 0.0;
-						offset: 0 0;
-					}
-					rel2
-					{
-						relative: 0.0 0.8;
+						relative: 0.35 1.0;
 						offset: 0 0;
 					}
 				}
@@ -148,27 +114,12 @@ collections
 					
 					rel1
 					{
-						relative: 0.8 0.07;
+						relative: 0.25 0.07;
 						offset: 0 0;
 					}
 					rel2
 					{
-						relative: 0.95 0.13;
-						offset: -1 -1;
-					}
-				}
-				description
-				{
-					state: "default" 1.0;
-					color: 211 168 234 255;
-					rel1
-					{
-						relative: 0.8 0.0;
-						offset: 0 0;
-					}
-					rel2
-					{
-						relative: 0.95 -0.5;
+						relative: 0.33 0.13;
 						offset: -1 -1;
 					}
 				}
@@ -185,28 +136,15 @@ collections
 					color: 30 89 114 175;
 					rel1
 					{
-						relative: 0.05 0.85;
+						relative: 0.02 0.85;
 						offset: 0 0;
 					}
 					rel2
 					{
-						relative: 0.2 0.9;
+						relative: 0.1 0.9;
 						offset: 0 0;
 					}
 				}
-				description
-				{
-					state: "default" 1.0;
-					color: 0 0 0 0;
-					rel1
-					{
-						relative: 0.0 0.85;
-					}
-					rel2
-					{
-						relative: -0.5 0.9;
-					}
-				}
 			}
 			
 			part
@@ -220,28 +158,15 @@ collections
 					color: 30 89 114 175;
 					rel1
 					{
-						relative: 0.3 0.85;
+						relative: 0.12 0.85;
 						offset: 0 0;
 					}
 					rel2
 					{
-						relative: 0.45 0.9;
+						relative: 0.2 0.9;
 						offset: 0 0;
 					}
 				}
-				description
-				{
-					state: "default" 1.0;
-					color: 0 0 0 0;
-					rel1
-					{
-						relative: 0.0 0.85;
-					}
-					rel2
-					{
-						relative: -0.5 0.9;
-					}
-				}
 			}
 			part
 			{
@@ -254,63 +179,15 @@ collections
 					color: 30 89 114 175;
 					rel1
 					{
-						relative: 0.55 0.85;
-						offset: 0 0;
-					}
-					rel2
-					{
-						relative: 0.7 0.9;
-						offset: 0 0;
-					}
-				}
-				description
-				{
-					state: "default" 1.0;
-					color: 0 0 0 0;
-					rel1
-					{
-						relative: 0.0 0.85;
-					}
-					rel2
-					{
-						relative: -0.5 0.9;
-					}
-				}
-			}
-
-			part
-			{
-				name: "hide_buttonframe";
-				type: SWALLOW;
-				mouse_events: 1;
-				description
-				{
-					state: "default" 0.0;
-					color: 30 89 114 175;
-					rel1
-					{
-						relative: 0.8 0.85;
+						relative: 0.22 0.85;
 						offset: 0 0;
 					}
 					rel2
 					{
-						relative: 0.95 0.9;
+						relative: 0.3 0.9;
 						offset: 0 0;
 					}
 				}
-				description
-				{
-					state: "default" 1.0;
-					color: 0 0 0 0;
-					rel1
-					{
-						relative: 0.0 0.85;
-					}
-					rel2
-					{
-						relative: -0.5 0.9;
-					}
-				}
 			}
 
 			part
@@ -324,116 +201,14 @@ collections
 					color: 80 30 114 175;
 					rel1
 					{
-						relative: 0.15 0.1;
-					}
-					rel2
-					{
-						relative: 0.5 0.13;
-					}
-				}
-
-				description
-				{
-					state: "default" 1.0;
-					color: 0 0 0 0;
-					rel1
-					{
-						relative: 0.15 -0.5;
+						relative: 0.05 0.1;
 					}
 					rel2
 					{
-						relative: 0.5 -0.5;
+						relative: 0.2 0.12;
 					}
 				}
 			}
 		}
-		programs
-		{
-			
-			program
-			{
-				name: "hide_searchframe";
-				source: "medialist_buttonframe";
-				signal: "mouse,clicked,1";
-				action: STATE_SET "default" 1.0;
-				target: "searchframe";
-				target: "find_buttonframe";
-				target: "medialist_buttonframe";
-				target: "pause_buttonframe";
-				target: "stop_buttonframe";
-				target: "hide_buttonframe";
-				target: "medialist";
-				target: "searcharea";
-				transition:SINUSOIDAL 1;
-			}
-
-			program
-			{
-				name: "hide_frames";
-				source: "hide_buttonframe";
-				signal: "mouse,clicked,1";
-				action: STATE_SET "default" 1.0;
-				target: "searchframe";
-				target: "find_buttonframe";
-				target: "medialist_buttonframe";
-				target: "stop_buttonframe";
-				target: "pause_buttonframe";
-				target: "hide_buttonframe";
-				target: "medialist";
-				target: "searcharea";
-				transition:SINUSOIDAL 1;
-			}
-			program
-			{
-				name: "show_frames_video";
-				source: "video";
-				signal: "mouse,clicked,1";
-				action: STATE_SET "default" 0.0;
-				target: "find_buttonframe";
-				target: "searchframe";
-				//target: "medialist_buttonframe";
-				target: "stop_buttonframe";
-				target: "pause_buttonframe";
-				target: "hide_buttonframe";
-				target: "medialist";
-				target: "searcharea";
-				transition:SINUSOIDAL 1;
-			}
-
-			program
-			{
-				name: "show_frames_main";
-				source: "main";
-				signal: "mouse,clicked,1";
-				action: STATE_SET "default" 0.0;
-				target: "find_buttonframe";
-				target: "searchframe";
-				target: "medialist_buttonframe";
-				target: "stop_buttonframe";
-				target: "pause_buttonframe";
-				target: "hide_buttonframe";
-				target: "medialist";
-				target: "searcharea";
-				transition:SINUSOIDAL 1;
-			}
-			
-			program
-			{
-				name: "show_play_on_pause";
-				source: "pause_buttonframe";
-				signal: "mouse,clicked,1";
-				action: STATE_SET "default" 0.0;
-				target: "medialist_buttonframe";
-			}
-
-			program
-			{
-				name: "show_play_on_stop";
-				source: "stop_buttonframe";
-				signal: "mouse,clicked,1";
-				action: STATE_SET "default" 0.0;
-				target: "medialist_buttonframe";
-			}
-		}
 	}
 }
diff --git a/src/YalpClients/EflClient/yalp_gui_desktop.edc b/src/YalpClients/EflClient/yalp_gui_desktop.edc
new file mode 100755
index 0000000..a8ede1e
--- /dev/null
+++ b/src/YalpClients/EflClient/yalp_gui_desktop.edc
@@ -0,0 +1,214 @@
+collections
+{
+	group
+	{
+		name: "yalp";
+		min:  800 600;
+		parts
+		{
+			part
+			{
+				name: "main";
+				type: RECT;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					color: 0 0 0 0;				
+					rel1
+					{
+						relative: 0.0 0.0;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 1.0 1.0;
+						offset: -1 -1;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "video";
+				type: SWALLOW;
+				mouse_events: 1;
+				description 
+				{
+					state: "default" 0.0;
+					aspect: 0.75 1.25;
+					rel1
+					{
+						relative: 0.35 0.0;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 1.0 1.0;
+						offset: 0 0;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "searchframe";
+				type: RECT;
+				mouse_events: 1;
+				
+				description
+				{
+					state: "default" 0.0;
+					align: 0 0;
+					color: 30 89 114 175;
+					
+					rel1
+					{
+						relative: 0.0 0.0;
+						offset: 0 0;
+					
+					}
+					rel2
+					{
+						relative: 0.35 0.2;
+						offset: -1 -1;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "medialist";
+				type: SWALLOW;
+				mouse_events: 1;
+				
+				description
+				{
+					state: "default" 0.0;
+					align: 0 0;
+					color: 30 89 114 150;
+					
+					rel1
+					{
+						relative: 0.0 0.2;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.35 1.0;
+						offset: 0 0;
+					}
+				}
+			}
+
+			part
+			{
+				name: "find_buttonframe";
+				type: SWALLOW;
+				mouse_events: 1;
+				
+				description
+				{
+					state: "default" 0.0;
+					color: 211 168 234 255;
+					
+					rel1
+					{
+						relative: 0.25 0.07;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.33 0.13;
+						offset: -1 -1;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "medialist_buttonframe";
+				type: SWALLOW;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					color: 30 89 114 175;
+					rel1
+					{
+						relative: 0.02 0.85;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.1 0.9;
+						offset: 0 0;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "stop_buttonframe";
+				type: SWALLOW;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					color: 30 89 114 175;
+					rel1
+					{
+						relative: 0.12 0.85;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.2 0.9;
+						offset: 0 0;
+					}
+				}
+			}
+			part
+			{
+				name: "pause_buttonframe";
+				type: SWALLOW;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					color: 30 89 114 175;
+					rel1
+					{
+						relative: 0.22 0.85;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.3 0.9;
+						offset: 0 0;
+					}
+				}
+			}
+
+			part
+			{
+				name: "searcharea";
+				type: SWALLOW;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					color: 80 30 114 175;
+					rel1
+					{
+						relative: 0.05 0.1;
+					}
+					rel2
+					{
+						relative: 0.2 0.12;
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/src/YalpClients/EflClient/yalp_gui_om.edc b/src/YalpClients/EflClient/yalp_gui_om.edc
new file mode 100755
index 0000000..316ac16
--- /dev/null
+++ b/src/YalpClients/EflClient/yalp_gui_om.edc
@@ -0,0 +1,439 @@
+collections
+{
+	group
+	{
+		name: "yalp";
+		min:  480 620;
+		parts
+		{
+			part
+			{
+				name: "main";
+				type: RECT;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					color: 0 0 0 0;				
+					rel1
+					{
+						relative: 0.0 0.0;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 1.0 1.0;
+						offset: -1 -1;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "video";
+				type: SWALLOW;
+				mouse_events: 1;
+				description 
+				{
+					state: "default" 0.0;
+					aspect: 0.75 1.25;
+					rel1
+					{
+						/*relative: 0.3 0.2;*/
+						relative: 0.35 0.3;
+						offset: 0 0;
+					}
+					rel2
+					{
+						/*relative: 0.75 0.8;*/
+						relative: 0.7 0.7;
+						offset: 0 0;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "searchframe";
+				type: RECT;
+				mouse_events: 1;
+				
+				description
+				{
+					state: "default" 0.0;
+					align: 0 0;
+					color: 30 89 114 175;
+					
+					rel1
+					{
+						relative: 0.0 0.0;
+						offset: 0 0;
+					
+					}
+					rel2
+					{
+						relative: 1.0 0.2;
+						offset: -1 -1;
+					}
+				}
+				description
+				{
+					state: "default" 1.0;
+					color: 0 0 0 0;
+					rel1
+					{
+						relative: 0.0 0.0;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 1.0 0.01;
+						offset: -1 -1;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "medialist";
+				type: SWALLOW;
+				mouse_events: 1;
+				
+				description
+				{
+					state: "default" 0.0;
+					align: 0 0;
+					color: 30 89 114 150;
+					
+					rel1
+					{
+						relative: 0.0 0.2;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 1.0 1.0;
+						offset: 0 0;
+					}
+				}
+				description
+				{
+					state: "default" 1.0;
+					align: 0 0;
+					color: 0 0 0 0;
+					
+					rel1
+					{
+						relative: 0.0 0.0;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.0 0.8;
+						offset: 0 0;
+					}
+				}
+			}
+
+			part
+			{
+				name: "find_buttonframe";
+				type: SWALLOW;
+				mouse_events: 1;
+				
+				description
+				{
+					state: "default" 0.0;
+					color: 211 168 234 255;
+					
+					rel1
+					{
+						relative: 0.8 0.07;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.95 0.13;
+						offset: -1 -1;
+					}
+				}
+				description
+				{
+					state: "default" 1.0;
+					color: 211 168 234 255;
+					rel1
+					{
+						relative: 0.8 0.0;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.95 -0.5;
+						offset: -1 -1;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "medialist_buttonframe";
+				type: SWALLOW;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					color: 30 89 114 175;
+					rel1
+					{
+						relative: 0.05 0.85;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.2 0.9;
+						offset: 0 0;
+					}
+				}
+				description
+				{
+					state: "default" 1.0;
+					color: 0 0 0 0;
+					rel1
+					{
+						relative: 0.0 0.85;
+					}
+					rel2
+					{
+						relative: -0.5 0.9;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "stop_buttonframe";
+				type: SWALLOW;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					color: 30 89 114 175;
+					rel1
+					{
+						relative: 0.3 0.85;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.45 0.9;
+						offset: 0 0;
+					}
+				}
+				description
+				{
+					state: "default" 1.0;
+					color: 0 0 0 0;
+					rel1
+					{
+						relative: 0.0 0.85;
+					}
+					rel2
+					{
+						relative: -0.5 0.9;
+					}
+				}
+			}
+			part
+			{
+				name: "pause_buttonframe";
+				type: SWALLOW;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					color: 30 89 114 175;
+					rel1
+					{
+						relative: 0.55 0.85;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.7 0.9;
+						offset: 0 0;
+					}
+				}
+				description
+				{
+					state: "default" 1.0;
+					color: 0 0 0 0;
+					rel1
+					{
+						relative: 0.0 0.85;
+					}
+					rel2
+					{
+						relative: -0.5 0.9;
+					}
+				}
+			}
+
+			part
+			{
+				name: "hide_buttonframe";
+				type: SWALLOW;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					color: 30 89 114 175;
+					rel1
+					{
+						relative: 0.8 0.85;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.95 0.9;
+						offset: 0 0;
+					}
+				}
+				description
+				{
+					state: "default" 1.0;
+					color: 0 0 0 0;
+					rel1
+					{
+						relative: 0.0 0.85;
+					}
+					rel2
+					{
+						relative: -0.5 0.9;
+					}
+				}
+			}
+
+			part
+			{
+				name: "searcharea";
+				type: SWALLOW;
+				mouse_events: 1;
+				description
+				{
+					state: "default" 0.0;
+					color: 80 30 114 175;
+					rel1
+					{
+						relative: 0.15 0.1;
+					}
+					rel2
+					{
+						relative: 0.5 0.13;
+					}
+				}
+
+				description
+				{
+					state: "default" 1.0;
+					color: 0 0 0 0;
+					rel1
+					{
+						relative: 0.15 -0.5;
+					}
+					rel2
+					{
+						relative: 0.5 -0.5;
+					}
+				}
+			}
+		}
+		programs
+		{
+			
+			program
+			{
+				name: "hide_searchframe";
+				source: "medialist_buttonframe";
+				signal: "mouse,clicked,1";
+				action: STATE_SET "default" 1.0;
+				target: "searchframe";
+				target: "find_buttonframe";
+				target: "medialist_buttonframe";
+				target: "pause_buttonframe";
+				target: "stop_buttonframe";
+				target: "hide_buttonframe";
+				target: "medialist";
+				target: "searcharea";
+				transition:SINUSOIDAL 1;
+			}
+
+			program
+			{
+				name: "hide_frames";
+				source: "hide_buttonframe";
+				signal: "mouse,clicked,1";
+				action: STATE_SET "default" 1.0;
+				target: "searchframe";
+				target: "find_buttonframe";
+				target: "medialist_buttonframe";
+				target: "stop_buttonframe";
+				target: "pause_buttonframe";
+				target: "hide_buttonframe";
+				target: "medialist";
+				target: "searcharea";
+				transition:SINUSOIDAL 1;
+			}
+			program
+			{
+				name: "show_frames_video";
+				source: "video";
+				signal: "mouse,clicked,1";
+				action: STATE_SET "default" 0.0;
+				target: "find_buttonframe";
+				target: "searchframe";
+				//target: "medialist_buttonframe";
+				target: "stop_buttonframe";
+				target: "pause_buttonframe";
+				target: "hide_buttonframe";
+				target: "medialist";
+				target: "searcharea";
+				transition:SINUSOIDAL 1;
+			}
+
+			program
+			{
+				name: "show_frames_main";
+				source: "main";
+				signal: "mouse,clicked,1";
+				action: STATE_SET "default" 0.0;
+				target: "find_buttonframe";
+				target: "searchframe";
+				target: "medialist_buttonframe";
+				target: "stop_buttonframe";
+				target: "pause_buttonframe";
+				target: "hide_buttonframe";
+				target: "medialist";
+				target: "searcharea";
+				transition:SINUSOIDAL 1;
+			}
+			
+			program
+			{
+				name: "show_play_on_pause";
+				source: "pause_buttonframe";
+				signal: "mouse,clicked,1";
+				action: STATE_SET "default" 0.0;
+				target: "medialist_buttonframe";
+			}
+
+			program
+			{
+				name: "show_play_on_stop";
+				source: "stop_buttonframe";
+				signal: "mouse,clicked,1";
+				action: STATE_SET "default" 0.0;
+				target: "medialist_buttonframe";
+			}
+		}
+	}
+}