Python-EFL GUI: new editable Textfield

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

5 files changed, 38 insertions, 25 deletions

diff --git a/ServerSettings.xml b/ServerSettings.xml
index 4343a72..11dd45d 100644
--- a/ServerSettings.xml
+++ b/ServerSettings.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?> 
-<java version="1.6.0_17" class="java.beans.XMLDecoder"> 
- <string>jdbc:postgresql://localhost:5432/yalp</string> 
- <string>huhu</string> 
- <string>yalp</string> 
-</java> 
+<?xml version="1.0" encoding="UTF-8"?>
+<java version="1.6.0_0" class="java.beans.XMLDecoder">
+ <string>jdbc:postgresql://localhost:5432/yalp</string>
+ <string>huhu</string>
+ <string>yalp</string>
+</java>
diff --git a/server.sh b/server.sh
index 66cd5fd..0435a13 100755
--- a/server.sh
+++ b/server.sh
@@ -1,7 +1,7 @@
 /usr/bin/orbd \
 -J-Djava.net.preferIPv4Stack=true \
--J-Dorg.omg.CORBA.ORBInitialHost=127.0.0.1 \
--ORBInitialPort 1050 -ORBInitialHost 127.0.0.1 &
+-J-Dorg.omg.CORBA.ORBInitialHost=192.168.178.20 \
+-ORBInitialPort 1050 -ORBInitialHost 192.168.178.20 &
 sleep 4
 ./start-java.sh yalpServer.jar
 killall -9 orbd
diff --git a/src/YalpClients/EflClient/main.py b/src/YalpClients/EflClient/main.py
index 867d7d0..790e49d 100755
--- a/src/YalpClients/EflClient/main.py
+++ b/src/YalpClients/EflClient/main.py
@@ -25,7 +25,7 @@ def gui():
 	win.title_set("YALP")
 
 	win.autodel_set(True)
-	win.destroy = destroy
+	#win.destroy = destroy
 
 	vid = emotion.Emotion(win.canvas,module_filename="xine");
 	edje_file = os.path.join(os.path.dirname(sys.argv[0]),"yalp_gui.edj")
diff --git a/src/YalpClients/EflClient/searchframe.py b/src/YalpClients/EflClient/searchframe.py
index 8fec876..79e3fc6 100644
--- a/src/YalpClients/EflClient/searchframe.py
+++ b/src/YalpClients/EflClient/searchframe.py
@@ -13,11 +13,14 @@ class Search(object):
 	def __init__(self, win, c):
 		self.win = win
 		self.c = c
+		self.searchfield()
 		self.add_button()
 		c.signal_callback_add("mouse,clicked,1","find_buttonframe",
 		self.findbutton_clicked)
 	def findbutton_clicked(self, obj, signal,source):
-	  print "Huhu";
+		print "Huhu"
+		searchentry = textfield.entry_get()
+		print searchentry
 
 	def add_button(self):
 		findbutton = elementary.Button(self.win)
@@ -25,5 +28,10 @@ class Search(object):
 		self.c.part_swallow("find_buttonframe", findbutton)
 		findbutton.show()
 
-
-
+	def searchfield(self):
+		global textfield
+		textfield = elementary.Entry(self.win)
+		textfield.entry_set("Enter Title")
+		self.c.part_swallow("searcharea", textfield)
+		textfield.editable_set(True)
+		textfield.show()
diff --git a/src/YalpClients/EflClient/yalp_gui.edc b/src/YalpClients/EflClient/yalp_gui.edc
index f15187e..eb76edc 100644
--- a/src/YalpClients/EflClient/yalp_gui.edc
+++ b/src/YalpClients/EflClient/yalp_gui.edc
@@ -327,29 +327,33 @@ 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;
 					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;
 					}
 				}
 			}
@@ -362,12 +366,13 @@ collections
 				source: "playlist_buttonframe";
 				signal: "mouse,clicked,1";
 				action: STATE_SET "default" 1.0;
-				target: "searchframe";
+			//	target: "searchframe";
 				target: "medialist_buttonframe";
 				target: "playlist_buttonframe";
 				target: "find_buttonframe";
 				target: "medialist";
 				target: "playlist";
+				target: "searcharea";
 				target: "controlframe";
 				transition:SINUSOIDAL 1;
 			}