Merge remote branch 'origin/damba' into damba

1 files changed, 59 insertions, 141 deletions

diff --git a/src/YalpClients/EflClient/yalp_gui.edc b/src/YalpClients/EflClient/yalp_gui.edc
index f15187e..24c593f 100644
--- a/src/YalpClients/EflClient/yalp_gui.edc
+++ b/src/YalpClients/EflClient/yalp_gui.edc
@@ -1,12 +1,3 @@
-styles
-{
-	style
-	{
-		name: "searchfield_style";
-		base: "font=Edje-Vera font_size=12 valign=bottom color=#000 wrap=word";
-	}
-}
-
 collections
 {
 	group
@@ -19,7 +10,7 @@ collections
 			{
 				name: "main";
 				type: RECT;
-				mouse_events: 0;
+				mouse_events: 1;
 				description
 				{
 					state: "default" 0.0;
@@ -40,6 +31,7 @@ collections
 			{
 				name: "video";
 				type: SWALLOW;
+				mouse_events: 1;
 				description {
 					state: "default" 0.0;
 					aspect: 1.7 1.8;
@@ -138,120 +130,9 @@ collections
 					}
 				}
 			}
-			
-			part
-			{
-				name: "playlist_buttonframe";
-				type: SWALLOW;
-				mouse_events: 1;
-				description
-				{
-					state: "default" 0.0;
-					align: 0 0;
-					color: 30 89 114 150;
-					rel1
-					{
-						relative: 0.66 0.85;
-					}
-					rel2
-					{
-						relative: 0.86 0.9;
-					}
-				}
-				description
-				{
-					state: "default" 1.0;
-					align: 0 0;
-					color: 0 0 0 0;
-					rel1
-					{
-						relative: 1.0 0.85;
-					}
-					rel2
-					{
-						relative: 1.0 0.9;
-					}
-				}
-			}
 
 			part
 			{
-				name: "playlist";
-				type: SWALLOW;
-				mouse_events: 1;
-				description
-				{
-					state: "default" 0.0;
-					align: 0 0;
-					color: 30 89 114 150;
-					rel1
-					{
-						relative: 0.51 0.2;
-						offset: 0 0;
-					}
-					rel2
-					{
-						relative: 1.0 0.8;
-						offset: 0 0;
-					}
-				}
-				description
-				{
-					state: "default" 1.0;
-					align: 0 0;
-					color: 0 0 0 0;
-					rel1
-					{
-						relative: 1.0 0.01;
-						offset: 0 0;
-					}
-					rel2
-					{
-						relative: 1.0 0.8;
-						offset: 0 0;
-					}
-				}
-			}
-			
-			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.97;
-						offset: 0 0;
-					}
-					rel2
-					{
-						relative: 1.0 1.0;
-						offset: 0 0;
-					}
-				}
-				description
-				{
-					state: "default" 1.0;
-					color: 30 89 114 175;
-					rel1
-					{
-						relative: 0.0 0.8;
-					}
-					rel2
-					{
-						relative: 1.0 1.0;
-					}
-				}
-			}
-			part
-			{
 				name: "find_buttonframe";
 				type: SWALLOW;
 				mouse_events: 1;
@@ -275,7 +156,7 @@ collections
 				description
 				{
 					state: "default" 1.0;
-					color: 0 0 0 0;
+					color: 211 168 234 255;
 					rel1
 					{
 						relative: 0.8 0.0;
@@ -288,7 +169,7 @@ collections
 					}
 				}
 			}
-			
+		/*	
 			part
 			{
 				name: "medialist_buttonframe";
@@ -324,53 +205,90 @@ collections
 				}
 			}
 			
+			*/
+
 			part
 			{
 				name: "searcharea";
-				type: TEXTBLOCK;
-				mouse_events: 0;
-				entry_mode: EDITABLE;
+				type: SWALLOW;
+				mouse_events: 1;
 				description
 				{
 					state: "default" 0.0;
-					color: 255 255 255 255;
-					visible: 1;
+					color: 0 0 0 0;
 					rel1
 					{
-						to: "searchframe";
-						relative: 0.0 0.00;
+						relative: 0.15 0.07;
 					}
 					rel2
 					{
-						to: "searchframe";
-						relative: 1.0 1.0;
+						relative: 0.65 0.13;
+					}
+				}
+
+				description
+				{
+					state: "default" 1.0;
+					color: 0 0 0 0;
+					rel1
+					{
+						relative: 0.15 0.0;
 					}
-					text
+					rel2
 					{
-						text: "Suchbegriff eingeben";
-						style: "searchfield_style";
-						min: 0 0;
+						relative: 0.65 0.0;
 					}
 				}
 			}
 		}
 		programs
 		{
+			/*
 			program
 			{
 				name: "hide_searchframe";
-				source: "playlist_buttonframe";
+				source: "medialist";
 				signal: "mouse,clicked,1";
 				action: STATE_SET "default" 1.0;
 				target: "searchframe";
-				target: "medialist_buttonframe";
-				target: "playlist_buttonframe";
 				target: "find_buttonframe";
 				target: "medialist";
-				target: "playlist";
-				target: "controlframe";
+				target: "searcharea";
+				transition:SINUSOIDAL 1;
+			}
+			program
+			{
+				name: "show_frames";
+				//source: "video";
+				source: "main";
+				signal: "mouse,clicked,1";
+				action: STATE_SET "default" 0.0;
+				target: "find_buttonframe";
+				target: "medialist";
+				target: "searcharea";
 				transition:SINUSOIDAL 1;
 			}
+			*/
+			program
+			{
+				name: "button_clicked_signal_program";
+				signal: "mouse,clicked,1";
+				source: "medialist";
+
+				action: SIGNAL_EMIT "hide_frames" "medialist";
+			}
+
+			program
+			{
+				name: "handle_python_signal_hide";
+				signal: "signal_from_python";
+
+				action: STATE_SET "default" 1.0;
+				target: "searchframe";
+				target: "find_buttonframe";
+				target: "medialist";
+				target: "searcharea";
+			}
 		}
 	}
 }