summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/YalpClients/EflClient/media.py8
-rw-r--r--src/YalpClients/EflClient/medialist.py6
-rw-r--r--src/YalpClients/EflClient/playlist.py5
-rw-r--r--src/YalpClients/EflClient/searchframe.py2
-rw-r--r--src/YalpClients/EflClient/yalp_gui.edc173
5 files changed, 62 insertions, 132 deletions
diff --git a/src/YalpClients/EflClient/media.py b/src/YalpClients/EflClient/media.py
index daf6d52..4ab5448 100644
--- a/src/YalpClients/EflClient/media.py
+++ b/src/YalpClients/EflClient/media.py
@@ -11,12 +11,16 @@ class Media(object):
self.servercon = servercon
self.win = win
self.c = c
+ #self.c.signal_callback_add("hide_frames", "medialist",self.hide_frames)
def callback(self, obj, str):
songlist = []
songlist.append(self.result)
ip = socket.gethostbyname(socket.gethostname())
+ #self.c.signal_callback_add("hide_frames", "medialist",self.hide_frames)
+
+
info = YalpInterfaces.AccessInfo("huhu", "huhu", "xine", "openmoko",
YalpInterfaces.STREAM)
stream = YalpInterfaces.Output(0, info, songlist, YalpInterfaces.CREATE, ip)
@@ -26,3 +30,7 @@ class Media(object):
print "stream.info:", stream.info
#video = playlist.Selection(self.win, self.c, vid, startstream)
video = playlist.Selection(self.win, self.c, stream)
+
+ #def hide_frames(self, obj, signal, source):
+ #self.c.signal_emit("signal_from_python", "")
+
diff --git a/src/YalpClients/EflClient/medialist.py b/src/YalpClients/EflClient/medialist.py
index 13132d2..ac54a69 100644
--- a/src/YalpClients/EflClient/medialist.py
+++ b/src/YalpClients/EflClient/medialist.py
@@ -18,6 +18,8 @@ class Medias(object):
self.medialist.size_hint_weight_set(1.0, 1.0)
self.medialist.size_hint_align_set(-1.0, -1.0)
self.c.part_swallow("medialist", self.medialist)
+ # ???:
+ self.c.signal_callback_add("hide_frames", self.medialist.item,self.hide_frames)
def add_media(self, media):
self.medialist.item_append(media.result.name, None, None, media.callback)
@@ -30,3 +32,7 @@ class Medias(object):
addbutton.label_set("Add to Playlist")
self.c.part_swallow("medialist_buttonframe", addbutton)
addbutton.show()
+
+ def hide_frames(self, obj, signal, source):
+ self.c.signal_emit("signal_from_python", "")
+
diff --git a/src/YalpClients/EflClient/playlist.py b/src/YalpClients/EflClient/playlist.py
index 059a04d..242aa76 100644
--- a/src/YalpClients/EflClient/playlist.py
+++ b/src/YalpClients/EflClient/playlist.py
@@ -18,10 +18,10 @@ class Selection(object):
self.vid = emotion.Emotion(win.canvas, module_filename="gstreamer")
self.stream = stream
self.play_video ()
-
+
def play_video(self):
print self.stream
- # ip = self.stream[0][0].destIp THIS CHRASHES!!!
+ # ip = self.stream[0][0].destIp THIS CHRASHES!!! -> I know :-)
ip = "127.0.0.1"
port = 9993
print "stream from", ip, port
@@ -29,3 +29,4 @@ class Selection(object):
self.c.part_swallow("video", self.vid)
self.vid.show()
self.vid.play = True
+
diff --git a/src/YalpClients/EflClient/searchframe.py b/src/YalpClients/EflClient/searchframe.py
index 8f97923..574315a 100644
--- a/src/YalpClients/EflClient/searchframe.py
+++ b/src/YalpClients/EflClient/searchframe.py
@@ -35,6 +35,8 @@ class Search(object):
def searchfield(self):
global textfield
textfield = elementary.Entry(self.win)
+ #textfield.color(95,95,95,95)
+ textfield.single_line_set(True)
textfield.entry_set("Enter Title")
self.c.part_swallow("searcharea", textfield)
textfield.editable_set(True)
diff --git a/src/YalpClients/EflClient/yalp_gui.edc b/src/YalpClients/EflClient/yalp_gui.edc
index eb76edc..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,6 +205,8 @@ collections
}
}
+ */
+
part
{
name: "searcharea";
@@ -332,7 +215,7 @@ collections
description
{
state: "default" 0.0;
- color: 255 255 255 255;
+ color: 0 0 0 0;
rel1
{
relative: 0.15 0.07;
@@ -360,22 +243,52 @@ collections
}
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: "searchframe";
target: "find_buttonframe";
target: "medialist";
- target: "playlist";
target: "searcharea";
- target: "controlframe";
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";
+ }
}
}
}