summaryrefslogtreecommitdiff
path: root/src/YalpClients
diff options
context:
space:
mode:
Diffstat (limited to 'src/YalpClients')
-rw-r--r--src/YalpClients/EflClient/list_test.edc50
-rw-r--r--src/YalpClients/EflClient/list_test_elem.py57
-rwxr-xr-xsrc/YalpClients/SwtClient/Model.java4
3 files changed, 1 insertions, 110 deletions
diff --git a/src/YalpClients/EflClient/list_test.edc b/src/YalpClients/EflClient/list_test.edc
deleted file mode 100644
index f3b42e0..0000000
--- a/src/YalpClients/EflClient/list_test.edc
+++ /dev/null
@@ -1,50 +0,0 @@
-collections
-{
- group
- {
- name: "list";
- parts
- {
- part
- {
- name: "main";
- type: RECT;
- mouse_events: 0;
- description
- {
- state:"default" 0.0;
- rel1
- {
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2
- {
- relative: 1.0 1.0;
- offset: 0 0;
- }
- }
- }
- 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;
- }
- }
- }
- }
- }
-}
diff --git a/src/YalpClients/EflClient/list_test_elem.py b/src/YalpClients/EflClient/list_test_elem.py
deleted file mode 100644
index a3fcc91..0000000
--- a/src/YalpClients/EflClient/list_test_elem.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python
-
-import edje
-import ecore.evas
-import sys
-import os
-import ecore
-import emotion
-import evas
-import elementary
-
-def huhu(obj, it):
- print "guck guck";
-
-elementary.init()
-win = elementary.Window("test", elementary.ELM_WIN_BASIC);
-
-edje_file = os.path.join(os.path.dirname(sys.argv[0]),"list_test.edj")
-c = edje.Edje(win.canvas,file=edje_file,group="list")
-
-vid = emotion.Emotion(win.canvas,module_filename="xine");
-vid.file_set("/home/manut/Videos/2009-2.avi");
-
-c.part_swallow("video", vid)
-
-vid.resize(80,60);
-vid.show();
-vid.play = True;
-
-items = [("huhu",huhu),
- ("haha", huhu),
- ("hoho", huhu),
- ("hehe", huhu),
- ("hihi", huhu)];
-
-medialist = elementary.List(win);
-medialist.size_hint_weight_set(1.0, 1.0)
-medialist.size_hint_align_set(-1.0, -1.0)
-
-box0 = elementary.Box(win);
-box0.size_hint_weight_set(1.0, 1.0)
-win.resize_object_add(box0);
-box0.show();
-box0.pack_end(medialist);
-medialist.show();
-
-for item in items:
- print item[0]
- medialist.item_append(item[0], None, None, item[1]);
-
-medialist.go();
-
-win.resize(320,520);
-box0.show();
-win.show()
-#ecore.main_loop_begin();
-elementary.run();
diff --git a/src/YalpClients/SwtClient/Model.java b/src/YalpClients/SwtClient/Model.java
index ce25f54..0ebc09c 100755
--- a/src/YalpClients/SwtClient/Model.java
+++ b/src/YalpClients/SwtClient/Model.java
@@ -197,9 +197,7 @@ public class Model {
SessionHolder sess = new SessionHolder();
try{
// log on server
- this.srvCon.clientLogon(username, passwd,
- this.clientIP, sess, err);
-
+ this.srvCon.clientLogon(this.userName,passwd,this.clientIP,sess,err);
this.session = sess.value;
this.userGroup = sess.value.me.level;
/*