Enlightenment CVS committal
Author : raster
Project : e17
Module : test
Dir : e17/test/orig/edje
Modified Files:
edje_main.c edje_test_main.c
Log Message:
fix test's - broken, and focus kbd to edje obj in test prog
===================================================================
RCS file: /cvs/e/e17/test/orig/edje/edje_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- edje_main.c 26 Aug 2007 12:29:49 -0000 1.2
+++ edje_main.c 31 May 2008 01:44:30 -0000 1.3
@@ -193,7 +193,7 @@
evas_object_resize(o, startw, starth);
evas_object_layer_set(o, -999);
evas_object_color_set(o, 255, 255, 255, 255);
- snprintf(buf, sizeof(buf), "data/images/bg.png");
+ snprintf(buf, sizeof(buf), "data/test/images/bg.png");
evas_object_image_file_set(o, buf, NULL);
evas_object_image_fill_set(o, 0, 0, 128, 128);
evas_object_pass_events_set(o, 1);
@@ -207,7 +207,7 @@
evas_object_resize(o, startw, starth);
evas_object_layer_set(o, -999);
evas_object_color_set(o, 255, 255, 255, 255);
- snprintf(buf, sizeof(buf), "data/images/shadow.png");
+ snprintf(buf, sizeof(buf), "data/test/images/shadow.png");
evas_object_image_file_set(o, buf, NULL);
evas_object_image_smooth_scale_set(o, 0);
evas_object_image_fill_set(o, 0, 0, startw, starth);
@@ -476,7 +476,7 @@
char buf[4096];
co = data;
- snprintf(buf, sizeof(buf), "data/images/item_selected.png");
+ snprintf(buf, sizeof(buf), "data/test/images/item_selected.png");
evas_object_image_file_set(co->bg, buf, NULL);
}
@@ -487,7 +487,7 @@
char buf[4096];
co = data;
- snprintf(buf, sizeof(buf), "data/images/item_normal.png");
+ snprintf(buf, sizeof(buf), "data/test/images/item_normal.png");
evas_object_image_file_set(co->bg, buf, NULL);
test_setup(co->file, co->part);
evas_object_color_set(co->bg, 128, 128, 128, 128);
@@ -594,7 +594,7 @@
o = evas_object_image_add(evas);
evas_object_layer_set(o, 10);
evas_object_image_border_set(o, 10, 10, 10, 10);
- snprintf(buf, sizeof(buf), "data/images/item_title.png");
+ snprintf(buf, sizeof(buf), "data/test/images/item_title.png");
evas_object_image_file_set(o, buf, NULL);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
list_head_down_cb, co);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
list_head_up_cb, co);
@@ -633,7 +633,7 @@
o = evas_object_image_add(evas);
evas_object_layer_set(o, 10);
evas_object_image_border_set(o, 10, 10, 10, 10);
- snprintf(buf, sizeof(buf), "data/images/item_normal.png");
+ snprintf(buf, sizeof(buf), "data/test/images/item_normal.png");
evas_object_image_file_set(o, buf, NULL);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
list_down_cb, co);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
list_up_cb, co);
@@ -725,13 +725,11 @@
hh = starth;
}
- printf("%i %i, %i %i\n", (int)startw, (int)starth, (int)ww, (int)hh);
-
de = calloc(1, sizeof(Demo_Edje));
edjes = evas_list_append(edjes, de);
o = evas_object_image_add(evas);
- snprintf(buf, sizeof(buf), "data/images/border.png");
+ snprintf(buf, sizeof(buf), "data/test/images/border.png");
evas_object_image_file_set(o, buf, NULL);
evas_object_image_smooth_scale_set(o, 0);
evas_object_color_set(o, 255, 255, 255, 255);
===================================================================
RCS file: /cvs/e/e17/test/orig/edje/edje_test_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_test_main.c 28 Oct 2006 09:01:59 -0000 1.1
+++ edje_test_main.c 31 May 2008 01:44:30 -0000 1.2
@@ -331,8 +331,6 @@
evas_object_move(o, 0, 0);
evas_object_resize(o, 240, 320);
evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, key_cb, NULL);
- evas_object_focus_set(o, 1);
evas_object_show(o);
o_bg = o;
@@ -342,6 +340,8 @@
edje_object_file_set(o, argv[1], argv[2]);
evas_object_move(o, 0, 0);
evas_object_resize(o, 240, 320);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, key_cb, NULL);
+ evas_object_focus_set(o, 1);
evas_object_show(o);
o_edje = o;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
