EflClient: Added moving bars

- altered edc-file for moving bar with button
- moved video to background

Signed-off-by: Nicole Vreden <damba@mecka.net>

2 files changed, 186 insertions, 28 deletions

diff --git a/src/YalpClients/EflClient/main.py b/src/YalpClients/EflClient/main.py
index 9ee7a09..9afe42a 100755
--- a/src/YalpClients/EflClient/main.py
+++ b/src/YalpClients/EflClient/main.py
@@ -5,6 +5,8 @@ import ecore.evas
 import sys
 import os
 import ecore
+import emotion
+import evas
 
 # Parse command line
 from optparse import OptionParser
@@ -31,7 +33,7 @@ elif options.engine == "x11-16":
 		print "warning: x11-16 is not supported, fallback to x11"
 		f = ecore.evas.SoftwareX11
 
-ee = ecore.evas.SoftwareX11(w=400, h=400)
+ee = ecore.evas.SoftwareX11(w=800, h=600)
 edje.frametime_set(1.0 / options.fps)
 
 edje_file = os.path.join(os.path.dirname(sys.argv[0]),"yalp_gui.edj")
@@ -39,6 +41,13 @@ 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.size = ee.evas.size
 
+vid = emotion.Emotion(ee.evas,module_filename="xine");
+vid.file_set("Lordi.mpg");
+c.part_swallow("video", vid)
+
+vid.show()
+vid.play = True
+
 def button_clicked(obj, signal,source):
 		print "Huhu";
 c.signal_callback_add("mouse,clicked,1","button",button_clicked)
diff --git a/src/YalpClients/EflClient/yalp_gui.edc b/src/YalpClients/EflClient/yalp_gui.edc
index f895421..cca8331 100644
--- a/src/YalpClients/EflClient/yalp_gui.edc
+++ b/src/YalpClients/EflClient/yalp_gui.edc
@@ -25,45 +25,194 @@ collections
 					}
 				}
 			}
+			
+			part
+			{
+				name: "video";
+				type: SWALLOW;
+				description {
+					state: "default" 0.0;
+					aspect: 1.7 1.8;
+					rel1
+					{
+						relative: 0.0 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: 1.0 0.2;
+						offset: -1 -1;
+					}
+				}
+				description
+				{
+					state: "default" 1.0;
+					rel1
+					{
+						relative: 0.0 0.0;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 1.0 0.03;
+						offset: -1 -1;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "controlframe";
+				type: RECT;
+				mouse_events: 1;
+				
+				description
+				{
+					state: "default" 0.0;
+					align: 0 0;
+					color: 30 89 114 175;
+					
+					rel1
+					{
+						relative: 0.0 0.8;
+					}
+					rel2
+					{
+						relative: 1.0 1.0;
+					}
+				}
+				description
+				{
+					state: "default" 1.0;
+					rel1
+					{
+						relative: 0.0 0.97;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 1.0 1.0;
+						offset: 0 0;
+					}
+				}
+			}
 			part
 			{
 				name: "button";
 				type: RECT;
 				mouse_events: 1;
-
+				
 				description
 				{
 					state: "default" 0.0;
-					min: 100 50;
-					max: 100 50;
-					align: 0.5 0.5;
-
 					color: 211 168 234 255;
-
-					rel1 {
-									relative, 0.0 0.0;
-									offset, 0 0;
+					
+					rel1
+					{
+						relative: 0.8 0.05;
+						offset: 0 0;
 					}
-					rel2 {
-									relative, 1.0 1.0;
-									offset, -1 -1;
+					rel2
+					{
+						relative: 0.95 0.15;
+						offset: -1 -1;
 					}
-	}
-	description {
-					state, "clicked" 0.0;
-					min, 100 50;
-					max, 100 50;
-					align, 0.5 0.5;
-					color, 170 89 214 255;
-					rel1 {
-									relative, 0.0 0.0;
-									offset, 0 0;
-					}
-					rel2 {
-									relative, 1.0 1.0;
-									offset, -1 -1;
+				}
+				description
+				{
+					state: "default" 1.0;
+					rel1
+					{
+						relative: 0.8 0.0;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.95 0.03;
+						offset: -1 -1;
+					}
+				}
+			}
+			
+			part
+			{
+				name: "buttontext";
+				type: TEXT;
+				mouse_events: 0;
+				description
+				{
+					color: 255 255 255 255;
+					rel1
+					{
+						relative: 0.83 0.08;
+					}
+					rel2
+					{
+						relative: 0.94 0.12;
 					}
+					text
+					{
+						text: "Find...";
+						font:"VeraBd.ttf";
+						size: 12;
+					}
+				}
+				description
+				{
+					state: "default" 1.0;
+					rel1
+					{
+						relative: 0.83 0.0;
+						offset: 0 0;
+					}
+					rel2
+					{
+						relative: 0.94 0.03;
+						offset: -1 -1;
+					}
+				}
+			}
+		}
+		programs
+		{
+			program
+			{
+				name: "hide_searchframe";
+				source: "searchframe";
+				signal: "mouse,clicked,1";
+				action: STATE_SET "default" 1.0;
+				target: "searchframe";
+				target: "button";
+				target: "buttontext";
+				transition:SINUSOIDAL 1;
+			}
+		}
 	}
 }
 
-