summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@ddlm.me>2019-03-13 17:17:36 -0700
committerCedric BAIL <cedric@ddlm.me>2019-03-13 17:19:06 -0700
commit153818c6bcfe3476ababe93e3c4dfdc5c0f2bb3e (patch)
tree985a4c23c60f0a81f6c1db232cc4652f15cf8ea9
parenta12ab95df071167e68439f10251d5eaa71187558 (diff)
efl: use new API efl_file_simple_load.
-rw-r--r--src/bin/image_blend_border.c2
-rw-r--r--src/bin/image_blend_border_recolor.c2
-rw-r--r--src/bin/image_blend_fade_pow2_unscaled.c2
-rw-r--r--src/bin/image_blend_fade_unscaled.c2
-rw-r--r--src/bin/image_blend_many_smooth_same_scaled.c2
-rw-r--r--src/bin/image_blend_nearest_same_scaled.c2
-rw-r--r--src/bin/image_blend_nearest_scaled.c2
-rw-r--r--src/bin/image_blend_nearest_solid_same_scaled.c2
-rw-r--r--src/bin/image_blend_nearest_solid_scaled.c2
-rw-r--r--src/bin/image_blend_occlude1.c4
-rw-r--r--src/bin/image_blend_occlude1_few.c4
-rw-r--r--src/bin/image_blend_occlude1_many.c4
-rw-r--r--src/bin/image_blend_occlude1_very_many.c4
-rw-r--r--src/bin/image_blend_occlude2.c4
-rw-r--r--src/bin/image_blend_occlude2_few.c4
-rw-r--r--src/bin/image_blend_occlude2_many.c4
-rw-r--r--src/bin/image_blend_occlude2_very_many.c4
-rw-r--r--src/bin/image_blend_occlude3.c4
-rw-r--r--src/bin/image_blend_occlude3_few.c4
-rw-r--r--src/bin/image_blend_occlude3_many.c4
-rw-r--r--src/bin/image_blend_occlude3_very_many.c4
-rw-r--r--src/bin/image_blend_smooth_same_scaled.c2
-rw-r--r--src/bin/image_blend_smooth_scaled.c2
-rw-r--r--src/bin/image_blend_smooth_solid_same_scaled.c2
-rw-r--r--src/bin/image_blend_smooth_solid_scaled.c2
-rw-r--r--src/bin/image_blend_solid_border.c2
-rw-r--r--src/bin/image_blend_solid_fade_pow2_unscaled.c2
-rw-r--r--src/bin/image_blend_solid_fade_unscaled.c2
-rw-r--r--src/bin/image_blend_solid_middle_border.c2
-rw-r--r--src/bin/image_blend_solid_middle_unscaled.c2
-rw-r--r--src/bin/image_blend_solid_unscaled.c2
-rw-r--r--src/bin/image_blend_unscaled.c2
-rw-r--r--src/bin/image_crossfade.c4
-rw-r--r--src/bin/image_map_3d_1.c2
-rw-r--r--src/bin/image_map_3d_2.c2
-rw-r--r--src/bin/image_map_3d_3.c2
-rw-r--r--src/bin/image_map_3d_4.c2
-rw-r--r--src/bin/image_map_3d_5.c2
-rw-r--r--src/bin/image_map_3d_6.c2
-rw-r--r--src/bin/image_map_3d_flow.c4
-rw-r--r--src/bin/image_map_color_alpha_nearest_rotate.c2
-rw-r--r--src/bin/image_map_color_alpha_nearest_solid_rotate.c2
-rw-r--r--src/bin/image_map_color_alpha_rotate.c2
-rw-r--r--src/bin/image_map_color_alpha_solid_rotate.c2
-rw-r--r--src/bin/image_map_color_nearest_rotate.c2
-rw-r--r--src/bin/image_map_color_nearest_solid_rotate.c2
-rw-r--r--src/bin/image_map_color_rotate.c2
-rw-r--r--src/bin/image_map_color_solid_rotate.c2
-rw-r--r--src/bin/image_map_nearest_rotate.c2
-rw-r--r--src/bin/image_map_nearest_solid_rotate.c2
-rw-r--r--src/bin/image_map_rotate.c2
-rw-r--r--src/bin/image_map_solid_rotate.c2
-rw-r--r--src/bin/image_mask.c4
-rw-r--r--src/bin/image_mask_10.c4
-rw-r--r--src/bin/image_mask_11.c4
-rw-r--r--src/bin/image_mask_12.c4
-rw-r--r--src/bin/image_mask_13.c4
-rw-r--r--src/bin/image_mask_2.c4
-rw-r--r--src/bin/image_mask_3.c4
-rw-r--r--src/bin/image_mask_4.c4
-rw-r--r--src/bin/image_mask_5.c4
-rw-r--r--src/bin/image_mask_6.c4
-rw-r--r--src/bin/image_mask_7.c4
-rw-r--r--src/bin/image_mask_8.c4
-rw-r--r--src/bin/image_mask_9.c4
-rw-r--r--src/bin/image_quality_scale.c2
-rw-r--r--src/bin/proxy_image.c2
-rw-r--r--src/bin/proxy_image_offscreen.c2
-rw-r--r--src/bin/snapshot_widgets_file_icons.c2
-rw-r--r--src/bin/ui.c10
-rw-r--r--src/bin/widgets_file_icons.c2
-rw-r--r--src/bin/widgets_file_icons_2.c2
-rw-r--r--src/bin/widgets_file_icons_2_grouped.c2
-rw-r--r--src/bin/widgets_file_icons_2_same.c2
-rw-r--r--src/bin/widgets_file_icons_2_same_grouped.c2
-rw-r--r--src/bin/widgets_file_icons_3.c2
-rw-r--r--src/bin/widgets_file_icons_4.c2
-rw-r--r--src/bin/widgets_list_1.c2
-rw-r--r--src/bin/widgets_list_1_grouped.c2
-rw-r--r--src/bin/widgets_list_2.c2
-rw-r--r--src/bin/widgets_list_2_grouped.c2
-rw-r--r--src/bin/widgets_list_3.c4
-rw-r--r--src/bin/widgets_list_3_grouped.c4
-rw-r--r--src/bin/widgets_list_4.c4
-rw-r--r--src/bin/widgets_list_4_grouped.c4
85 files changed, 120 insertions, 120 deletions
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 3c9ee8f..188bfe7 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("bar.png"), NULL); 28 efl_file_simple_load(o, build_path("bar.png"), NULL);
29 efl_gfx_image_border_set(o, 6, 6, 6, 6); 29 efl_gfx_image_border_set(o, 6, 6, 6, 6);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 3218e18..4de2697 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("pan.png"), NULL); 28 efl_file_simple_load(o, build_path("pan.png"), NULL);
29 efl_gfx_color_set(o, 64, 64, 64, 255); 29 efl_gfx_color_set(o, 64, 64, 64, 255);
30 efl_gfx_image_border_set(o, 3, 3, 3, 3); 30 efl_gfx_image_border_set(o, 3, 3, 3, 3);
31 efl_gfx_entity_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index 69f40e5..b4bf458 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 27
28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 efl_file_set(o, build_path("logo.png"), NULL); 30 efl_file_simple_load(o, build_path("logo.png"), NULL);
31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
33 a = 256 - (1 << ((rnd() % 8) + 1)); 33 a = 256 - (1 << ((rnd() % 8) + 1));
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index adbc87a..d4de1d3 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 a = rnd()&0xff; 29 a = rnd()&0xff;
30 efl_file_set(o, build_path("logo.png"), NULL); 30 efl_file_simple_load(o, build_path("logo.png"), NULL);
31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
33 efl_gfx_color_set(o, a, a, a, a); 33 efl_gfx_color_set(o, a, a, a, a);
diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c
index d830968..5805dfa 100644
--- a/src/bin/image_blend_many_smooth_same_scaled.c
+++ b/src/bin/image_blend_many_smooth_same_scaled.c
@@ -30,7 +30,7 @@ static void _setup(void)
30 n = rnd() % 100; 30 n = rnd() % 100;
31 w = 3 + ((n * (60 - 3)) / 100); 31 w = 3 + ((n * (60 - 3)) / 100);
32 h = 4 + ((n * (80 - 4)) / 100); 32 h = 4 + ((n * (80 - 4)) / 100);
33 efl_file_set(o, build_path("logo.png"), NULL); 33 efl_file_simple_load(o, build_path("logo.png"), NULL);
34 efl_gfx_image_smooth_scale_set(o, 1); 34 efl_gfx_image_smooth_scale_set(o, 1);
35 efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h)); 35 efl_gfx_entity_size_set(o, EINA_SIZE2D(w, h));
36 efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h)); 36 efl_gfx_fill_set(o, EINA_RECT(0, 0, w, h));
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 4df527a..2f31642 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_simple_load(o, build_path("logo.png"), NULL);
29 efl_gfx_image_smooth_scale_set(o, 0); 29 efl_gfx_image_smooth_scale_set(o, 0);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index c7360b9..699afb3 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_simple_load(o, build_path("logo.png"), NULL);
29 efl_gfx_image_smooth_scale_set(o, 0); 29 efl_gfx_image_smooth_scale_set(o, 0);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index e5421f6..eb8a305 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_simple_load(o, build_path("image.png"), NULL);
29 efl_gfx_image_smooth_scale_set(o, 0); 29 efl_gfx_image_smooth_scale_set(o, 0);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index a6a6b9a..8221fb3 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_simple_load(o, build_path("image.png"), NULL);
29 efl_gfx_image_smooth_scale_set(o, 0); 29 efl_gfx_image_smooth_scale_set(o, 0);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index a3430f0..4df92e3 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i < (OBNUM / 2)) 29 if (i < (OBNUM / 2))
30 { 30 {
31 efl_file_set(o, build_path("logo.png"), NULL); 31 efl_file_simple_load(o, build_path("logo.png"), NULL);
32 } 32 }
33 else 33 else
34 { 34 {
@@ -36,7 +36,7 @@ static void _setup(void)
36 36
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 efl_file_set(o, build_path("image.png"), NULL); 39 efl_file_simple_load(o, build_path("image.png"), NULL);
40 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 40 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
41 } 41 }
42 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 42 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index 4f19696..bea13c3 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 efl_file_set(o, PACKAGE_DATA_DIR"/data/logo.png", NULL); 34 efl_file_simple_load(o, PACKAGE_DATA_DIR"/data/logo.png", NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,7 +39,7 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL); 42 efl_file_simple_load(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 481f0bd..f3e4ca5 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 efl_file_set(o, build_path("logo.png"), NULL); 34 efl_file_simple_load(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,7 +39,7 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_simple_load(o, build_path("image.png"), NULL);
43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 06f5540..f95d18f 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i < (OBNUM / 2)) 32 if (i < (OBNUM / 2))
33 { 33 {
34 efl_file_set(o, build_path("logo.png"), NULL); 34 efl_file_simple_load(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,7 +39,7 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_simple_load(o, build_path("image.png"), NULL);
43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 8f105f2..36820ad 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i & 0x1) 29 if (i & 0x1)
30 { 30 {
31 efl_file_set(o, build_path("logo.png"), NULL); 31 efl_file_simple_load(o, build_path("logo.png"), NULL);
32 } 32 }
33 else 33 else
34 { 34 {
@@ -36,7 +36,7 @@ static void _setup(void)
36 36
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 efl_file_set(o, build_path("image.png"), NULL); 39 efl_file_simple_load(o, build_path("image.png"), NULL);
40 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 40 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
41 } 41 }
42 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 42 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 38f7232..0901441 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 efl_file_set(o, build_path("logo.png"), NULL); 34 efl_file_simple_load(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,7 +39,7 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_simple_load(o, build_path("image.png"), NULL);
43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index 3f271f1..cfe443e 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 efl_file_set(o, build_path("logo.png"), NULL); 34 efl_file_simple_load(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,7 +39,7 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_simple_load(o, build_path("image.png"), NULL);
43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index c91e72e..0992f88 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i & 0x1) 32 if (i & 0x1)
33 { 33 {
34 efl_file_set(o, build_path("logo.png"), NULL); 34 efl_file_simple_load(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,7 +39,7 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_simple_load(o, build_path("image.png"), NULL);
43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index de92621..9f56f49 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -28,7 +28,7 @@ static void _setup(void)
28 o_images[i] = o; 28 o_images[i] = o;
29 if (i > (OBNUM / 2)) 29 if (i > (OBNUM / 2))
30 { 30 {
31 efl_file_set(o, build_path("logo.png"), NULL); 31 efl_file_simple_load(o, build_path("logo.png"), NULL);
32 } 32 }
33 else 33 else
34 { 34 {
@@ -36,7 +36,7 @@ static void _setup(void)
36 36
37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 37 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 38 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
39 efl_file_set(o, build_path("image.png"), NULL); 39 efl_file_simple_load(o, build_path("image.png"), NULL);
40 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 40 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
41 } 41 }
42 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 42 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index e7b2b56..d99657e 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 efl_file_set(o, build_path("logo.png"), NULL); 34 efl_file_simple_load(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,7 +39,7 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_simple_load(o, build_path("image.png"), NULL);
43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index 0926c9b..d8e04c3 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 efl_file_set(o, build_path("logo.png"), NULL); 34 efl_file_simple_load(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,7 +39,7 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_simple_load(o, build_path("image.png"), NULL);
43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index f193727..5df9829 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -31,7 +31,7 @@ static void _setup(void)
31 o_images[i] = o; 31 o_images[i] = o;
32 if (i > (OBNUM / 2)) 32 if (i > (OBNUM / 2))
33 { 33 {
34 efl_file_set(o, build_path("logo.png"), NULL); 34 efl_file_simple_load(o, build_path("logo.png"), NULL);
35 } 35 }
36 else 36 else
37 { 37 {
@@ -39,7 +39,7 @@ static void _setup(void)
39 39
40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 40 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 41 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
42 efl_file_set(o, build_path("image.png"), NULL); 42 efl_file_simple_load(o, build_path("image.png"), NULL);
43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y)); 43 efl_gfx_entity_position_set(o, EINA_POSITION2D(x, y));
44 } 44 }
45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index 3106941..5f6db38 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_simple_load(o, build_path("logo.png"), NULL);
29 efl_gfx_image_smooth_scale_set(o, 1); 29 efl_gfx_image_smooth_scale_set(o, 1);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index 5d9547d..34f920b 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_simple_load(o, build_path("logo.png"), NULL);
29 efl_gfx_image_smooth_scale_set(o, 1); 29 efl_gfx_image_smooth_scale_set(o, 1);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index d1a349e..0d88e70 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_simple_load(o, build_path("image.png"), NULL);
29 efl_gfx_image_smooth_scale_set(o, 1); 29 efl_gfx_image_smooth_scale_set(o, 1);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index e6e3931..033bebd 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_simple_load(o, build_path("image.png"), NULL);
29 efl_gfx_image_smooth_scale_set(o, 1); 29 efl_gfx_image_smooth_scale_set(o, 1);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 8d3a02d..b72d7b7 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("frame.png"), NULL); 28 efl_file_simple_load(o, build_path("frame.png"), NULL);
29 efl_gfx_image_border_set(o, 8, 8, 8, 8); 29 efl_gfx_image_border_set(o, 8, 8, 8, 8);
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 } 31 }
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 4ed7adf..969e281 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 27
28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 efl_file_set(o, build_path("image.png"), NULL); 30 efl_file_simple_load(o, build_path("image.png"), NULL);
31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
33 a = 256 - (1 << ((rnd() % 8) + 1)); 33 a = 256 - (1 << ((rnd() % 8) + 1));
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index 5508e91..54f3335 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 27
28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 28 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
29 o_images[i] = o; 29 o_images[i] = o;
30 efl_file_set(o, build_path("image.png"), NULL); 30 efl_file_simple_load(o, build_path("image.png"), NULL);
31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
33 a = rnd()&0xff; 33 a = rnd()&0xff;
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 2569abd..95e22c8 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("bar.png"), NULL); 28 efl_file_simple_load(o, build_path("bar.png"), NULL);
29 efl_gfx_image_border_set(o, 6, 6, 6, 6); 29 efl_gfx_image_border_set(o, 6, 6, 6, 6);
30 efl_gfx_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID); 30 efl_gfx_image_border_center_fill_set(o, EFL_GFX_BORDER_FILL_MODE_SOLID);
31 efl_gfx_entity_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index 60607b2..5a3fdc0 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_simple_load(o, build_path("logo.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_image_border_set(o, 43, 48, 48, 83); 31 efl_gfx_image_border_set(o, 43, 48, 48, 83);
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 12dffcf..57109cb 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_simple_load(o, build_path("image.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_entity_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index d4ab662..8b043da 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("logo.png"), NULL); 28 efl_file_simple_load(o, build_path("logo.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_entity_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index d3e9dc8..f80d46c 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -24,14 +24,14 @@ static void _setup(void)
24 24
25 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 25 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
26 o_images[0] = o; 26 o_images[0] = o;
27 efl_file_set(o, build_path("im1.png"), NULL); 27 efl_file_simple_load(o, build_path("im1.png"), NULL);
28 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 28 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
29 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 29 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
30 efl_gfx_entity_visible_set(o, EINA_TRUE); 30 efl_gfx_entity_visible_set(o, EINA_TRUE);
31 31
32 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 32 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
33 o_images[1] = o; 33 o_images[1] = o;
34 efl_file_set(o, build_path("im2.png"), NULL); 34 efl_file_simple_load(o, build_path("im2.png"), NULL);
35 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 35 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
36 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 36 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
37 efl_gfx_entity_visible_set(o, EINA_TRUE); 37 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index 8703570..25f96cb 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_simple_load(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
63 efl_gfx_image_smooth_scale_set(o, 0); 63 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index a5b1a8b..c1cac6f 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_simple_load(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
63 efl_gfx_entity_visible_set(o, EINA_TRUE); 63 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index 701ee35..6147fe2 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_simple_load(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
63 efl_gfx_image_smooth_scale_set(o, 0); 63 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index b44f7d8..c9a6c09 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1); 59 snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_simple_load(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
63 efl_gfx_entity_visible_set(o, EINA_TRUE); 63 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 8aba670..16b27f1 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_simple_load(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
62 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
63 efl_gfx_image_smooth_scale_set(o, 0); 63 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index f8581ff..3fec3ec 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -57,7 +57,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 c->side[i].o = o; 58 c->side[i].o = o;
59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); 59 snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
60 efl_file_set(o, build_path(buf), NULL); 60 efl_file_simple_load(o, build_path(buf), NULL);
61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 61 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
62 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 62 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
63 efl_gfx_image_smooth_scale_set(o, 0); 63 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index 55ceb02..94a32c4 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -32,7 +32,7 @@ static void _setup(void)
32 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 32 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
33 o_images[i] = o; 33 o_images[i] = o;
34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 34 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
35 efl_file_set(o, build_path(buf), NULL); 35 efl_file_simple_load(o, build_path(buf), NULL);
36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); 36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
37 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); 37 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
38 efl_gfx_image_smooth_scale_set(o, 0); 38 efl_gfx_image_smooth_scale_set(o, 0);
@@ -41,7 +41,7 @@ static void _setup(void)
41 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 41 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
42 o_reflec[i] = o; 42 o_reflec[i] = o;
43 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); 43 snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
44 efl_file_set(o, build_path(buf), NULL); 44 efl_file_simple_load(o, build_path(buf), NULL);
45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256)); 45 efl_gfx_fill_set(o, EINA_RECT(0, 0, 256, 256));
46 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256)); 46 efl_gfx_entity_size_set(o, EINA_SIZE2D(256, 256));
47 efl_gfx_image_smooth_scale_set(o, 0); 47 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index b7b72dc..951d523 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_simple_load(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index dc4f931..474bf42 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_simple_load(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index f35dd41..2d30005 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_simple_load(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_entity_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index ad9b4fd..31a6be0 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_simple_load(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_entity_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index 28befcf..2a4441d 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_simple_load(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 18fb435..3406900 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_simple_load(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index f026081..e8ccf56 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_simple_load(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_entity_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index ed5dba5..4841f28 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_simple_load(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_entity_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index a4bf4ba..95204b3 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_simple_load(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 2f40227..7c041f8 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_simple_load(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_image_smooth_scale_set(o, 0); 32 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index ab1ae84..f4fa2f5 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("logo.png"), NULL); 29 efl_file_simple_load(o, build_path("logo.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_entity_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index 3aab338..df8a8ba 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("image.png"), NULL); 29 efl_file_simple_load(o, build_path("image.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
32 efl_gfx_entity_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c
index 66a36bd..8e5abaf 100644
--- a/src/bin/image_mask.c
+++ b/src/bin/image_mask.c
@@ -25,14 +25,14 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_simple_load(o, build_path("image.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_entity_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 32
33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
34 o_images[i + 1] = o; 34 o_images[i + 1] = o;
35 efl_file_set(o, build_path("e-logo.png"), NULL); 35 efl_file_simple_load(o, build_path("e-logo.png"), NULL);
36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
37 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 37 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
38 efl_gfx_entity_visible_set(o, EINA_TRUE); 38 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index 24a46bb..eb2b8d5 100644
--- a/src/bin/image_mask_10.c
+++ b/src/bin/image_mask_10.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 25
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("texture.png"), NULL); 38 efl_file_simple_load(o, build_path("texture.png"), NULL);
39 efl_gfx_fill_set(o, EINA_RECT(0, 0, win_w * 4, win_h * 4)); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, win_w * 4, win_h * 4));
40 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4)); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index 168bdc3..38479e2 100644
--- a/src/bin/image_mask_11.c
+++ b/src/bin/image_mask_11.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 25
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_simple_load(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c
index 9a5462d..2ab5ade 100644
--- a/src/bin/image_mask_12.c
+++ b/src/bin/image_mask_12.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 25
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_simple_load(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 efl_gfx_image_smooth_scale_set(o, 1); 41 efl_gfx_image_smooth_scale_set(o, 1);
diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c
index d627525..bf59c76 100644
--- a/src/bin/image_mask_13.c
+++ b/src/bin/image_mask_13.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 25
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_simple_load(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 efl_gfx_image_smooth_scale_set(o, 0); 41 efl_gfx_image_smooth_scale_set(o, 0);
diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c
index 85b0c71..70c4715 100644
--- a/src/bin/image_mask_2.c
+++ b/src/bin/image_mask_2.c
@@ -25,14 +25,14 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("image.png"), NULL); 28 efl_file_simple_load(o, build_path("image.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_entity_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 32
33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
34 o_images[i + 1] = o; 34 o_images[i + 1] = o;
35 efl_file_set(o, build_path("e-logo-2.png"), NULL); 35 efl_file_simple_load(o, build_path("e-logo-2.png"), NULL);
36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
37 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 37 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
38 efl_gfx_entity_visible_set(o, EINA_TRUE); 38 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c
index 16d882f..101fe0c 100644
--- a/src/bin/image_mask_3.c
+++ b/src/bin/image_mask_3.c
@@ -25,14 +25,14 @@ static void _setup(void)
25 { 25 {
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_images[i] = o; 27 o_images[i] = o;
28 efl_file_set(o, build_path("e-logo-2.png"), NULL); 28 efl_file_simple_load(o, build_path("e-logo-2.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_entity_visible_set(o, EINA_TRUE); 31 efl_gfx_entity_visible_set(o, EINA_TRUE);
32 32
33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 33 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
34 o_images[i + 1] = o; 34 o_images[i + 1] = o;
35 efl_file_set(o, build_path("logo.png"), NULL); 35 efl_file_simple_load(o, build_path("logo.png"), NULL);
36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 36 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
37 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 37 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
38 efl_gfx_entity_visible_set(o, EINA_TRUE); 38 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c
index 549e7bd..230ba81 100644
--- a/src/bin/image_mask_4.c
+++ b/src/bin/image_mask_4.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 25
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_simple_load(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c
index a7d564d..e19b55f 100644
--- a/src/bin/image_mask_5.c
+++ b/src/bin/image_mask_5.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 25
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-2.png"), NULL); 28 efl_file_simple_load(o, build_path("e-logo-2.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, (win_h - 160) / 2)); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, (win_h - 160) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_simple_load(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c
index 0e6f58c..7d1fc3e 100644
--- a/src/bin/image_mask_6.c
+++ b/src/bin/image_mask_6.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 25
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_simple_load(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120 / 2, 160 / 2)); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120 / 2, 160 / 2));
40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120 / 2, 160 / 2)); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120 / 2, 160 / 2));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c
index 6f57d6b..de885af 100644
--- a/src/bin/image_mask_7.c
+++ b/src/bin/image_mask_7.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 25
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-2.png"), NULL); 28 efl_file_simple_load(o, build_path("e-logo-2.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, (win_h - 160) / 2)); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, (win_h - 160) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("logo.png"), NULL); 38 efl_file_simple_load(o, build_path("logo.png"), NULL);
39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c
index ba58050..1401240 100644
--- a/src/bin/image_mask_8.c
+++ b/src/bin/image_mask_8.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 25
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("texture.png"), NULL); 38 efl_file_simple_load(o, build_path("texture.png"), NULL);
39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 500, 444)); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 500, 444));
40 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4)); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index 6c50d9e..046c1b0 100644
--- a/src/bin/image_mask_9.c
+++ b/src/bin/image_mask_9.c
@@ -25,7 +25,7 @@ static void _setup(void)
25 25
26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 26 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
27 o_mask = o; 27 o_mask = o;
28 efl_file_set(o, build_path("e-logo-mask.png"), NULL); 28 efl_file_simple_load(o, build_path("e-logo-mask.png"), NULL);
29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420)); 29 efl_gfx_fill_set(o, EINA_RECT(0, 0, 720, 420));
30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420)); 30 efl_gfx_entity_size_set(o, EINA_SIZE2D(720, 420));
31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2)); 31 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 720) / 2, (win_h - 420) / 2));
@@ -35,7 +35,7 @@ static void _setup(void)
35 { 35 {
36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 36 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
37 o_images[i] = o; 37 o_images[i] = o;
38 efl_file_set(o, build_path("texture.png"), NULL); 38 efl_file_simple_load(o, build_path("texture.png"), NULL);
39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 500, 444)); 39 efl_gfx_fill_set(o, EINA_RECT(0, 0, 500, 444));
40 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4)); 40 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w * 4, win_h * 4));
41 evas_object_clip_set(o, o_mask); 41 evas_object_clip_set(o, o_mask);
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 9a6b58f..7606d2e 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -26,7 +26,7 @@ static void _setup(void)
26 { 26 {
27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 27 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
28 o_images[i] = o; 28 o_images[i] = o;
29 efl_file_set(o, build_path("tp.png"), NULL); 29 efl_file_simple_load(o, build_path("tp.png"), NULL);
30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480)); 30 efl_gfx_fill_set(o, EINA_RECT(0, 0, 640, 480));
31 efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480)); 31 efl_gfx_entity_size_set(o, EINA_SIZE2D(640, 480));
32 efl_gfx_entity_visible_set(o, EINA_TRUE); 32 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index 8d9f0a0..049dd4e 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -23,7 +23,7 @@ static void _setup(void)
23 Evas_Object *o,*src; 23 Evas_Object *o,*src;
24 24
25 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 25 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
26 efl_file_set(o, build_path("logo.png"), NULL); 26 efl_file_simple_load(o, build_path("logo.png"), NULL);
27 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 27 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
28 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 28 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
29 efl_gfx_entity_visible_set(o, EINA_TRUE); 29 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index 0827435..f7d0ac3 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -27,7 +27,7 @@ static void _setup(void)
27 Evas_Object *o,*src; 27 Evas_Object *o,*src;
28 28
29 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas); 29 o = eo_add(EFL_CANVAS_IMAGE_CLASS, evas);
30 efl_file_set(o, build_path("logo.png"), NULL); 30 efl_file_simple_load(o, build_path("logo.png"), NULL);
31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 31 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 32 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
33 efl_gfx_entity_position_set(o, EINA_POSITION2D(-400, -300)); 33 efl_gfx_entity_position_set(o, EINA_POSITION2D(-400, -300));
diff --git a/src/bin/snapshot_widgets_file_icons.c b/src/bin/snapshot_widgets_file_icons.c
index 288eb2b..8eeabd2 100644
--- a/src/bin/snapshot_widgets_file_icons.c
+++ b/src/bin/snapshot_widgets_file_icons.c
@@ -56,7 +56,7 @@ static void _setup(void)
56 56
57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 57 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
58 o_images[i] = o; 58 o_images[i] = o;
59 efl_file_set(o, build_path(icons[i % 13]), NULL); 59 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
60 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); 60 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
61 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); 61 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
62 efl_gfx_entity_position_set(o, EINA_POSITION2D(x + 8, y)); 62 efl_gfx_entity_position_set(o, EINA_POSITION2D(x + 8, y));
diff --git a/src/bin/ui.c b/src/bin/ui.c
index db68adf..cb2c67a 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -363,7 +363,7 @@ _ui_menu_item_full_add(Eina_Bool test,
363 363
364 mi = malloc(sizeof(Menu_Item)); 364 mi = malloc(sizeof(Menu_Item));
365 mi->o_icon = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 365 mi->o_icon = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
366 efl_file_set(mi->o_icon, build_path(icon), NULL); 366 efl_file_simple_load(mi->o_icon, build_path(icon), NULL);
367 efl_gfx_entity_size_set(mi->o_icon, EINA_SIZE2D(32, 32)); 367 efl_gfx_entity_size_set(mi->o_icon, EINA_SIZE2D(32, 32));
368 efl_gfx_fill_set(mi->o_icon, EINA_RECT(0, 0, 32, 32)); 368 efl_gfx_fill_set(mi->o_icon, EINA_RECT(0, 0, 32, 32));
369 mi->test = test; 369 mi->test = test;
@@ -437,7 +437,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
437 437
438 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 438 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
439 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, ((win_h - 160) / 2))); 439 efl_gfx_entity_position_set(o, EINA_POSITION2D((win_w - 120) / 2, ((win_h - 160) / 2)));
440 efl_file_set(o, build_path("e-logo.png"), NULL); 440 efl_file_simple_load(o, build_path("e-logo.png"), NULL);
441 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160)); 441 efl_gfx_fill_set(o, EINA_RECT(0, 0, 120, 160));
442 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160)); 442 efl_gfx_entity_size_set(o, EINA_SIZE2D(120, 160));
443 efl_gfx_stack_layer_set(o, -98); 443 efl_gfx_stack_layer_set(o, -98);
@@ -454,14 +454,14 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
454 454
455 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 455 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
456 efl_gfx_entity_position_set(o, EINA_POSITION2D(0, 0)); 456 efl_gfx_entity_position_set(o, EINA_POSITION2D(0, 0));
457 efl_file_set(o, build_path("icon_sel.png"), NULL); 457 efl_file_simple_load(o, build_path("icon_sel.png"), NULL);
458 efl_gfx_entity_size_set(o, EINA_SIZE2D(48, 48)); 458 efl_gfx_entity_size_set(o, EINA_SIZE2D(48, 48));
459 efl_gfx_fill_set(o, EINA_RECT(0, 0, 48, 48)); 459 efl_gfx_fill_set(o, EINA_RECT(0, 0, 48, 48));
460 o_menu_icon_sel = o; 460 o_menu_icon_sel = o;
461 461
462 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 462 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
463 efl_gfx_entity_position_set(o, EINA_POSITION2D(0, 0)); 463 efl_gfx_entity_position_set(o, EINA_POSITION2D(0, 0));
464 efl_file_set(o, build_path("text_sel.png"), NULL); 464 efl_file_simple_load(o, build_path("text_sel.png"), NULL);
465 efl_gfx_entity_size_set(o, EINA_SIZE2D(96, 32)); 465 efl_gfx_entity_size_set(o, EINA_SIZE2D(96, 32));
466 efl_gfx_fill_set(o, EINA_RECT(0, 0, 96, 32)); 466 efl_gfx_fill_set(o, EINA_RECT(0, 0, 96, 32));
467 efl_gfx_image_border_set(o, 7, 7, 7, 7); 467 efl_gfx_image_border_set(o, 7, 7, 7, 7);
@@ -625,7 +625,7 @@ ui_loop(void *data EINA_UNUSED)
625 625
626 o = o_menu_icon; 626 o = o_menu_icon;
627 snprintf(buf, 4096, "%s%s", data_dir, mi->icon); 627 snprintf(buf, 4096, "%s%s", data_dir, mi->icon);
628 efl_file_set(o, buf, NULL); 628 efl_file_simple_load(o, buf, NULL);
629 efl_gfx_color_set(o, a / 2, a / 2, a / 2, a / 2); 629 efl_gfx_color_set(o, a / 2, a / 2, a / 2, a / 2);
630 } 630 }
631 i++; 631 i++;
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index 3c6ca4d..53fc593 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -48,7 +48,7 @@ static void _setup(void)
48 { 48 {
49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 efl_file_set(o, build_path(icons[i % 13]), NULL); 51 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
52 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); 52 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
53 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); 53 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
54 efl_gfx_entity_visible_set(o, EINA_TRUE); 54 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index d251407..d913078 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -48,7 +48,7 @@ static void _setup(void)
48 { 48 {
49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 efl_file_set(o, build_path(icons[i % 13]), NULL); 51 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
52 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); 52 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
53 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); 53 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
54 efl_gfx_entity_visible_set(o, EINA_TRUE); 54 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index 5ed5a4a..e12259a 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -48,7 +48,7 @@ static void _setup(void)
48 { 48 {
49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 efl_file_set(o, build_path(icons[i % 13]), NULL); 51 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
52 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); 52 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
53 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); 53 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
54 efl_gfx_entity_visible_set(o, EINA_TRUE); 54 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index afe4117..05571b5 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -33,7 +33,7 @@ static void _setup(void)
33 { 33 {
34 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 34 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
35 o_images[i] = o; 35 o_images[i] = o;
36 efl_file_set(o, build_path(icons[i % 1]), NULL); 36 efl_file_simple_load(o, build_path(icons[i % 1]), NULL);
37 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); 37 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
38 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); 38 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
39 efl_gfx_entity_visible_set(o, EINA_TRUE); 39 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index 37c607b..9b38366 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -33,7 +33,7 @@ static void _setup(void)
33 { 33 {
34 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 34 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
35 o_images[i] = o; 35 o_images[i] = o;
36 efl_file_set(o, build_path(icons[i % 1]), NULL); 36 efl_file_simple_load(o, build_path(icons[i % 1]), NULL);
37 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); 37 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
38 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); 38 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
39 efl_gfx_entity_visible_set(o, EINA_TRUE); 39 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index 2fbe254..8040eca 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -48,7 +48,7 @@ static void _setup(void)
48 { 48 {
49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 efl_file_set(o, build_path(icons[i % 13]), NULL); 51 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
52 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); 52 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
53 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); 53 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
54 efl_gfx_entity_visible_set(o, EINA_TRUE); 54 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index c1b91cf..4e295fd 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -48,7 +48,7 @@ static void _setup(void)
48 { 48 {
49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 49 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
50 o_images[i] = o; 50 o_images[i] = o;
51 efl_file_set(o, build_path(icons[i % 13]), NULL); 51 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
52 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE)); 52 efl_gfx_fill_set(o, EINA_RECT(0, 0, ICON_SIZE, ICON_SIZE));
53 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE)); 53 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE, ICON_SIZE));
54 efl_gfx_entity_visible_set(o, EINA_TRUE); 54 efl_gfx_entity_visible_set(o, EINA_TRUE);
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 8b73ffa..01f0869 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -65,7 +65,7 @@ static void _setup(void)
65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_gfx_image_border_set(o, 2, 2, 2, 2); 67 efl_gfx_image_border_set(o, 2, 2, 2, 2);
68 efl_file_set(o, build_path("pan.png"), NULL); 68 efl_file_simple_load(o, build_path("pan.png"), NULL);
69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
70 efl_gfx_entity_visible_set(o, EINA_TRUE); 70 efl_gfx_entity_visible_set(o, EINA_TRUE);
71 71
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index bfef9b0..3b4f2c4 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -65,7 +65,7 @@ static void _setup(void)
65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_gfx_image_border_set(o, 2, 2, 2, 2); 67 efl_gfx_image_border_set(o, 2, 2, 2, 2);
68 efl_file_set(o, build_path("pan.png"), NULL); 68 efl_file_simple_load(o, build_path("pan.png"), NULL);
69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
70 efl_gfx_entity_visible_set(o, EINA_TRUE); 70 efl_gfx_entity_visible_set(o, EINA_TRUE);
71 71
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index dd37807..01e04e8 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -65,7 +65,7 @@ static void _setup(void)
65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_gfx_image_border_set(o, 2, 2, 2, 2); 67 efl_gfx_image_border_set(o, 2, 2, 2, 2);
68 efl_file_set(o, build_path("pan.png"), NULL); 68 efl_file_simple_load(o, build_path("pan.png"), NULL);
69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
70 efl_gfx_entity_visible_set(o, EINA_TRUE); 70 efl_gfx_entity_visible_set(o, EINA_TRUE);
71 71
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index fb3bfd7..028321e 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -65,7 +65,7 @@ static void _setup(void)
65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 65 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
66 o_images[i] = o; 66 o_images[i] = o;
67 efl_gfx_image_border_set(o, 2, 2, 2, 2); 67 efl_gfx_image_border_set(o, 2, 2, 2, 2);
68 efl_file_set(o, build_path("pan.png"), NULL); 68 efl_file_simple_load(o, build_path("pan.png"), NULL);
69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 69 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
70 efl_gfx_entity_visible_set(o, EINA_TRUE); 70 efl_gfx_entity_visible_set(o, EINA_TRUE);
71 71
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index d906324..9fe60a0 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -86,14 +86,14 @@ static void _setup(void)
86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_gfx_image_border_set(o, 2, 2, 2, 2); 88 efl_gfx_image_border_set(o, 2, 2, 2, 2);
89 efl_file_set(o, build_path("pan.png"), NULL); 89 efl_file_simple_load(o, build_path("pan.png"), NULL);
90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
91 efl_gfx_entity_visible_set(o, EINA_TRUE); 91 efl_gfx_entity_visible_set(o, EINA_TRUE);
92 92
93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_gfx_image_border_set(o, 2, 2, 2, 2); 95 efl_gfx_image_border_set(o, 2, 2, 2, 2);
96 efl_file_set(o, build_path(icons[i % 13]), NULL); 96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); 97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
98 efl_gfx_entity_visible_set(o, EINA_TRUE); 98 efl_gfx_entity_visible_set(o, EINA_TRUE);
99 99
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index 32cf5da..64b7e0d 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -86,14 +86,14 @@ static void _setup(void)
86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_gfx_image_border_set(o, 2, 2, 2, 2); 88 efl_gfx_image_border_set(o, 2, 2, 2, 2);
89 efl_file_set(o, build_path("pan.png"), NULL); 89 efl_file_simple_load(o, build_path("pan.png"), NULL);
90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
91 efl_gfx_entity_visible_set(o, EINA_TRUE); 91 efl_gfx_entity_visible_set(o, EINA_TRUE);
92 92
93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_gfx_image_border_set(o, 2, 2, 2, 2); 95 efl_gfx_image_border_set(o, 2, 2, 2, 2);
96 efl_file_set(o, build_path(icons[i % 13]), NULL); 96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); 97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
98 efl_gfx_entity_visible_set(o, EINA_TRUE); 98 efl_gfx_entity_visible_set(o, EINA_TRUE);
99 99
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index 4992dbc..8488874 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -86,14 +86,14 @@ static void _setup(void)
86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_gfx_image_border_set(o, 2, 2, 2, 2); 88 efl_gfx_image_border_set(o, 2, 2, 2, 2);
89 efl_file_set(o, build_path("pan.png"), NULL); 89 efl_file_simple_load(o, build_path("pan.png"), NULL);
90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
91 efl_gfx_entity_visible_set(o, EINA_TRUE); 91 efl_gfx_entity_visible_set(o, EINA_TRUE);
92 92
93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_gfx_image_border_set(o, 2, 2, 2, 2); 95 efl_gfx_image_border_set(o, 2, 2, 2, 2);
96 efl_file_set(o, build_path(icons[i % 13]), NULL); 96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); 97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
98 efl_gfx_entity_visible_set(o, EINA_TRUE); 98 efl_gfx_entity_visible_set(o, EINA_TRUE);
99 99
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 20b6164..3827c9e 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -86,14 +86,14 @@ static void _setup(void)
86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 86 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
87 o_images[i] = o; 87 o_images[i] = o;
88 efl_gfx_image_border_set(o, 2, 2, 2, 2); 88 efl_gfx_image_border_set(o, 2, 2, 2, 2);
89 efl_file_set(o, build_path("pan.png"), NULL); 89 efl_file_simple_load(o, build_path("pan.png"), NULL);
90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE)); 90 efl_gfx_entity_size_set(o, EINA_SIZE2D(win_w, ICON_SIZE));
91 efl_gfx_entity_visible_set(o, EINA_TRUE); 91 efl_gfx_entity_visible_set(o, EINA_TRUE);
92 92
93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); 93 o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
94 o_icons[i] = o; 94 o_icons[i] = o;
95 efl_gfx_image_border_set(o, 2, 2, 2, 2); 95 efl_gfx_image_border_set(o, 2, 2, 2, 2);
96 efl_file_set(o, build_path(icons[i % 13]), NULL); 96 efl_file_simple_load(o, build_path(icons[i % 13]), NULL);
97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8)); 97 efl_gfx_entity_size_set(o, EINA_SIZE2D(ICON_SIZE - 8, ICON_SIZE - 8));
98 efl_gfx_entity_visible_set(o, EINA_TRUE); 98 efl_gfx_entity_visible_set(o, EINA_TRUE);
99 99