Move to EFL 1.12 interface.

This commit is contained in:
Cedric BAIL 2014-08-22 01:51:47 +02:00
parent 3ef31223f6
commit 74d732c094
79 changed files with 168 additions and 168 deletions

View File

@ -50,7 +50,7 @@ esac
# EFL dependencies
PKG_CHECK_MODULES([EFL], eina >= 1.7.99 eo >= 1.7.99 evas >= 1.7.99 eet >= 1.7.99 ecore-evas >= 1.7.99 ecore >= 1.7.99)
PKG_CHECK_MODULES([EFL], eina >= 1.7.99 efl >= 1.11.99 eo >= 1.7.99 evas >= 1.7.99 eet >= 1.7.99 ecore-evas >= 1.7.99 ecore >= 1.7.99)
EFL_ENABLE_EO_API_SUPPORT
EFL_ENABLE_BETA_API_SUPPORT

View File

@ -26,7 +26,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("bar.png"), NULL),
efl_file_set(build_path("bar.png"), NULL),
evas_obj_image_border_set(6, 6, 6, 6),
evas_obj_visibility_set(EINA_TRUE));
}

View File

@ -26,7 +26,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("pan.png"), NULL),
efl_file_set(build_path("pan.png"), NULL),
evas_obj_color_set(64, 64, 64, 255),
evas_obj_image_border_set(3, 3, 3, 3),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -28,7 +28,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160));
a = 256 - (1 << ((rnd() % 8) + 1));

View File

@ -28,7 +28,7 @@ static void _setup(void)
o_images[i] = o;
a = rnd()&0xff;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_color_set(a, a, a, a),

View File

@ -31,8 +31,8 @@ static void _setup(void)
w = 3 + ((n * (60 - 3)) / 100);
h = 4 + ((n * (80 - 4)) / 100);
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_smooth_scale_set(1),
efl_file_set(build_path("logo.png"), NULL),
efl_image_smooth_scale_set(1),
evas_obj_size_set(w, h),
evas_obj_image_fill_set(0, 0, w, h),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -26,8 +26,8 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_smooth_scale_set(0),
efl_file_set(build_path("logo.png"), NULL),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -26,8 +26,8 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_smooth_scale_set(0),
efl_file_set(build_path("logo.png"), NULL),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -26,8 +26,8 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
evas_obj_image_smooth_scale_set(0),
efl_file_set(build_path("image.png"), NULL),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -26,8 +26,8 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
evas_obj_image_smooth_scale_set(0),
efl_file_set(build_path("image.png"), NULL),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -28,7 +28,7 @@ static void _setup(void)
o_images[i] = o;
if (i < (OBNUM / 2))
{
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
eo_do(o, efl_file_set(build_path("logo.png"), NULL));
}
else
{
@ -37,7 +37,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -31,7 +31,7 @@ static void _setup(void)
o_images[i] = o;
if (i < (OBNUM / 2))
{
eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
eo_do(o, efl_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
}
else
{
@ -40,7 +40,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL),
efl_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -31,7 +31,7 @@ static void _setup(void)
o_images[i] = o;
if (i < (OBNUM / 2))
{
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
eo_do(o, efl_file_set(build_path("logo.png"), NULL));
}
else
{
@ -40,7 +40,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -31,7 +31,7 @@ static void _setup(void)
o_images[i] = o;
if (i < (OBNUM / 2))
{
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
eo_do(o, efl_file_set(build_path("logo.png"), NULL));
}
else
{
@ -40,7 +40,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -28,7 +28,7 @@ static void _setup(void)
o_images[i] = o;
if (i & 0x1)
{
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
eo_do(o, efl_file_set(build_path("logo.png"), NULL));
}
else
{
@ -37,7 +37,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -31,7 +31,7 @@ static void _setup(void)
o_images[i] = o;
if (i & 0x1)
{
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
eo_do(o, efl_file_set(build_path("logo.png"), NULL));
}
else
{
@ -40,7 +40,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -31,7 +31,7 @@ static void _setup(void)
o_images[i] = o;
if (i & 0x1)
{
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
eo_do(o, efl_file_set(build_path("logo.png"), NULL));
}
else
{
@ -40,7 +40,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -31,7 +31,7 @@ static void _setup(void)
o_images[i] = o;
if (i & 0x1)
{
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
eo_do(o, efl_file_set(build_path("logo.png"), NULL));
}
else
{
@ -40,7 +40,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -28,7 +28,7 @@ static void _setup(void)
o_images[i] = o;
if (i > (OBNUM / 2))
{
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
eo_do(o, efl_file_set(build_path("logo.png"), NULL));
}
else
{
@ -37,7 +37,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -31,7 +31,7 @@ static void _setup(void)
o_images[i] = o;
if (i > (OBNUM / 2))
{
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
eo_do(o, efl_file_set(build_path("logo.png"), NULL));
}
else
{
@ -40,7 +40,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -31,7 +31,7 @@ static void _setup(void)
o_images[i] = o;
if (i > (OBNUM / 2))
{
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
eo_do(o, efl_file_set(build_path("logo.png"), NULL));
}
else
{
@ -40,7 +40,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -31,7 +31,7 @@ static void _setup(void)
o_images[i] = o;
if (i > (OBNUM / 2))
{
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
eo_do(o, efl_file_set(build_path("logo.png"), NULL));
}
else
{
@ -40,7 +40,7 @@ static void _setup(void)
x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_position_set(x, y));
}
eo_do(o,

View File

@ -26,8 +26,8 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_smooth_scale_set(1),
efl_file_set(build_path("logo.png"), NULL),
efl_image_smooth_scale_set(1),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -26,8 +26,8 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_smooth_scale_set(1),
efl_file_set(build_path("logo.png"), NULL),
efl_image_smooth_scale_set(1),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -26,8 +26,8 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
evas_obj_image_smooth_scale_set(1),
efl_file_set(build_path("image.png"), NULL),
efl_image_smooth_scale_set(1),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -26,8 +26,8 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
evas_obj_image_smooth_scale_set(1),
efl_file_set(build_path("image.png"), NULL),
efl_image_smooth_scale_set(1),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -26,7 +26,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("frame.png"), NULL),
efl_file_set(build_path("frame.png"), NULL),
evas_obj_image_border_set(8, 8, 8, 8),
evas_obj_visibility_set(EINA_TRUE));
}

View File

@ -28,7 +28,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160));
a = 256 - (1 << ((rnd() % 8) + 1));

View File

@ -28,7 +28,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160));
a = rnd()&0xff;

View File

@ -26,7 +26,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("bar.png"), NULL),
efl_file_set(build_path("bar.png"), NULL),
evas_obj_image_border_set(6, 6, 6, 6),
evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -26,7 +26,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_image_border_set(43, 48, 48, 83),

View File

@ -26,7 +26,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -26,7 +26,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -25,7 +25,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[0] = o;
eo_do(o,
evas_obj_image_file_set(build_path("im1.png"), NULL),
efl_file_set(build_path("im1.png"), NULL),
evas_obj_image_fill_set(0, 0, 720, 420),
evas_obj_size_set(720, 420),
evas_obj_visibility_set(EINA_TRUE));
@ -33,7 +33,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[1] = o;
eo_do(o,
evas_obj_image_file_set(build_path("im2.png"), NULL),
efl_file_set(build_path("im2.png"), NULL),
evas_obj_image_fill_set(0, 0, 720, 420),
evas_obj_size_set(720, 420),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -36,7 +36,7 @@ static void _setup(void)
evas_obj_image_alpha_set(0),
evas_obj_image_fill_set(0, 0, 640, 480),
evas_obj_size_set(640, 480),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
yp = malloc(640 * 480);
up = malloc(320 * 240);

View File

@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,
evas_obj_image_file_set(build_path(buf), NULL),
efl_file_set(build_path(buf), NULL),
evas_obj_image_fill_set(0, 0, 256, 256),
evas_obj_size_set(256, 256),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
POINT(0, 0, -w, -h, -d, 0, 0);

View File

@ -58,7 +58,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,
evas_obj_image_file_set(build_path(buf), NULL),
efl_file_set(build_path(buf), NULL),
evas_obj_image_fill_set(0, 0, 256, 256),
evas_obj_size_set(256, 256),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,
evas_obj_image_file_set(build_path(buf), NULL),
efl_file_set(build_path(buf), NULL),
evas_obj_image_fill_set(0, 0, 256, 256),
evas_obj_size_set(256, 256),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
POINT(0, 0, -w, -h, -d, 0, 0);

View File

@ -58,7 +58,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,
evas_obj_image_file_set(build_path(buf), NULL),
efl_file_set(build_path(buf), NULL),
evas_obj_image_fill_set(0, 0, 256, 256),
evas_obj_size_set(256, 256),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
eo_do(o,
evas_obj_image_file_set(build_path(buf), NULL),
efl_file_set(build_path(buf), NULL),
evas_obj_image_fill_set(0, 0, 720, 420),
evas_obj_size_set(720, 420),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
POINT(0, 0, -w, -h, -d, 0, 0);

View File

@ -58,10 +58,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
eo_do(o,
evas_obj_image_file_set(build_path(buf), NULL),
efl_file_set(build_path(buf), NULL),
evas_obj_image_fill_set(0, 0, 720, 420),
evas_obj_size_set(720, 420),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
POINT(0, 0, -w, -h, -d, 0, 0);

View File

@ -33,20 +33,20 @@ static void _setup(void)
o_images[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
eo_do(o,
evas_obj_image_file_set(build_path(buf), NULL),
efl_file_set(build_path(buf), NULL),
evas_obj_image_fill_set(0, 0, 256, 256),
evas_obj_size_set(256, 256),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_reflec[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
eo_do(o,
evas_obj_image_file_set(build_path(buf), NULL),
efl_file_set(build_path(buf), NULL),
evas_obj_image_fill_set(0, 0, 256, 256),
evas_obj_size_set(256, 256),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -27,10 +27,10 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -27,10 +27,10 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -27,7 +27,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -27,7 +27,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -27,10 +27,10 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -27,10 +27,10 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -27,7 +27,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -27,7 +27,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -27,10 +27,10 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -27,10 +27,10 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_image_smooth_scale_set(0),
efl_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
}
done = 0;

View File

@ -26,7 +26,7 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
eo_do(o, efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -27,7 +27,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),
efl_file_set(build_path("image.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -26,7 +26,7 @@ static void _setup(void)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
eo_do(o, efl_file_set(build_path("tp.png"), NULL),
evas_obj_image_fill_set(0, 0, 640, 480),
evas_obj_size_set(640, 480),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -24,7 +24,7 @@ static void _setup(void)
o = eo_add(EVAS_IMAGE_CLASS, evas);
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_visibility_set(EINA_TRUE));

View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o,*src;
o = eo_add(EVAS_IMAGE_CLASS, evas);
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
eo_do(o, efl_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
evas_obj_position_set(-400, -300));

View File

@ -30,8 +30,8 @@ static void _setup(void)
o = eo_add(EVAS_TEXT_CLASS, evas);
o_texts[i] = o;
eo_do(o,
evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set("This is a test string"),
efl_text_properties_font_set("Vera-Bold", 20),
efl_text_set("This is a test string"),
evas_obj_text_style_set(st),
evas_obj_color_set(255, 255, 255, 255),
evas_obj_text_shadow_color_set(0, 0, 0, 24),

View File

@ -39,8 +39,8 @@ static void _setup(void)
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
eo_do(o,
evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set(buf),
efl_text_properties_font_set("Vera-Bold", 20),
efl_text_set(buf),
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2);
@ -93,7 +93,7 @@ static void _loop(double t, int f)
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
eo_do(o_texts[0],
evas_obj_text_set(buf),
efl_text_set(buf),
evas_obj_size_get(&w, &h));
for (i = 1; i < OBNUM; i++)
{

View File

@ -27,8 +27,8 @@ static void _setup(void)
{
o = eo_add(EVAS_TEXT_CLASS, evas);
o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set("This is a test string"),
eo_do(o, efl_text_properties_font_set("Vera-Bold", 20),
efl_text_set("This is a test string"),
evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE));
}

View File

@ -34,13 +34,13 @@ static void _setup(void)
{
o = eo_add(EVAS_TEXT_CLASS, evas);
o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
snprintf(buf, sizeof(buf), "%s %s %s %s.",
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
eo_do(o, evas_obj_text_set(buf),
eo_do(o, efl_text_set(buf),
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2);
@ -77,7 +77,7 @@ static void _loop(double t, int f)
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
eo_do(o_texts[i], evas_obj_text_set(buf));
eo_do(o_texts[i], efl_text_set(buf));
}
FPS_STD(NAME);
}

View File

@ -30,8 +30,8 @@ static void _setup(void)
o = eo_add(EVAS_TEXT_CLASS, evas);
o_texts[i] = o;
eo_do(o,
evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set("This is a test string"),
efl_text_properties_font_set("Vera-Bold", 20),
efl_text_set("This is a test string"),
evas_obj_text_style_set(st),
evas_obj_color_set(255, 255, 255, 255),
evas_obj_text_shadow_color_set(0, 0, 0, 24),

View File

@ -36,13 +36,13 @@ static void _setup(void)
{
o = eo_add(EVAS_TEXT_CLASS, evas);
o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
eo_do(o, efl_text_properties_font_set("Vera-Bold", 20));
snprintf(buf, sizeof(buf), "%s %s %s %s.",
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
eo_do(o, evas_obj_text_set(buf),
eo_do(o, efl_text_set(buf),
evas_obj_text_style_set(st),
evas_obj_color_set(255, 255, 255, 255),
evas_obj_text_shadow_color_set(0, 0, 0, 24),

View File

@ -362,7 +362,7 @@ _ui_menu_item_full_add(Eina_Bool test,
mi = malloc(sizeof(Menu_Item));
mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas);
eo_unref(mi->o_icon);
eo_do(mi->o_icon, evas_obj_image_file_set(build_path(icon), NULL),
eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL),
evas_obj_size_set(32, 32),
evas_obj_image_fill_set(0, 0, 32, 32));
mi->test = test;
@ -412,8 +412,8 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
o = eo_add(EVAS_TEXT_CLASS, evas);
eo_unref(o);
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set("EXPEDITE"),
eo_do(o, efl_text_properties_font_set("Vera-Bold", 10),
efl_text_set("EXPEDITE"),
evas_obj_layer_set(100),
evas_obj_color_set(0, 0, 0, 100),
evas_obj_pass_events_set(1),
@ -426,8 +426,8 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
o = eo_add(EVAS_TEXT_CLASS, evas);
eo_unref(o);
eo_do(o, evas_obj_text_font_set("Vera", 9),
evas_obj_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
eo_do(o, efl_text_properties_font_set("Vera", 9),
efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
evas_obj_layer_set(100),
evas_obj_color_set(0, 0, 0, 60),
evas_obj_pass_events_set(1),
@ -441,7 +441,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
o = eo_add(EVAS_IMAGE_CLASS, evas);