diff options
author | Cedric BAIL <cedric@osg.samsung.com> | 2016-03-17 16:53:27 -0700 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2016-03-17 16:53:27 -0700 |
commit | 051a4ec0cf9245d086e8df9d426e57b1805a3d37 (patch) | |
tree | 6c4f9d4e073da410599de33dbfa933eef9ff29e4 | |
parent | 24eca8a7788d626135e948887c777009fc28d022 (diff) |
migrate to new efl api.
-rw-r--r-- | src/bin/image_blend_border.c | 2 | ||||
-rw-r--r-- | src/bin/image_blend_border_recolor.c | 2 | ||||
-rw-r--r-- | src/bin/image_blend_solid_border.c | 2 | ||||
-rw-r--r-- | src/bin/image_blend_solid_middle_border.c | 4 | ||||
-rw-r--r-- | src/bin/image_blend_solid_middle_unscaled.c | 4 | ||||
-rw-r--r-- | src/bin/ui.c | 2 | ||||
-rw-r--r-- | src/bin/widgets_list_1.c | 4 | ||||
-rw-r--r-- | src/bin/widgets_list_1_grouped.c | 4 | ||||
-rw-r--r-- | src/bin/widgets_list_2.c | 4 | ||||
-rw-r--r-- | src/bin/widgets_list_2_grouped.c | 4 | ||||
-rw-r--r-- | src/bin/widgets_list_3.c | 8 | ||||
-rw-r--r-- | src/bin/widgets_list_3_grouped.c | 8 | ||||
-rw-r--r-- | src/bin/widgets_list_4.c | 8 | ||||
-rw-r--r-- | src/bin/widgets_list_4_grouped.c | 8 |
14 files changed, 32 insertions, 32 deletions
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c index 9cff6df..9056755 100644 --- a/src/bin/image_blend_border.c +++ b/src/bin/image_blend_border.c | |||
@@ -26,7 +26,7 @@ static void _setup(void) | |||
26 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 26 | o = eo_add(EVAS_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_set(o, build_path("bar.png"), NULL); |
29 | evas_obj_image_border_set(o, 6, 6, 6, 6); | 29 | efl_image_border_set(o, 6, 6, 6, 6); |
30 | efl_gfx_visible_set(o, EINA_TRUE); | 30 | efl_gfx_visible_set(o, EINA_TRUE); |
31 | } | 31 | } |
32 | done = 0; | 32 | done = 0; |
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c index 806cab7..37a8304 100644 --- a/src/bin/image_blend_border_recolor.c +++ b/src/bin/image_blend_border_recolor.c | |||
@@ -27,7 +27,7 @@ static void _setup(void) | |||
27 | o_images[i] = o; | 27 | o_images[i] = o; |
28 | efl_file_set(o, build_path("pan.png"), NULL); | 28 | efl_file_set(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 | evas_obj_image_border_set(o, 3, 3, 3, 3); | 30 | efl_image_border_set(o, 3, 3, 3, 3); |
31 | efl_gfx_visible_set(o, EINA_TRUE); | 31 | efl_gfx_visible_set(o, EINA_TRUE); |
32 | } | 32 | } |
33 | done = 0; | 33 | done = 0; |
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c index 15430dc..b58670f 100644 --- a/src/bin/image_blend_solid_border.c +++ b/src/bin/image_blend_solid_border.c | |||
@@ -26,7 +26,7 @@ static void _setup(void) | |||
26 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 26 | o = eo_add(EVAS_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_set(o, build_path("frame.png"), NULL); |
29 | evas_obj_image_border_set(o, 8, 8, 8, 8); | 29 | efl_image_border_set(o, 8, 8, 8, 8); |
30 | efl_gfx_visible_set(o, EINA_TRUE); | 30 | efl_gfx_visible_set(o, EINA_TRUE); |
31 | } | 31 | } |
32 | done = 0; | 32 | done = 0; |
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c index bf5636f..b80e615 100644 --- a/src/bin/image_blend_solid_middle_border.c +++ b/src/bin/image_blend_solid_middle_border.c | |||
@@ -26,8 +26,8 @@ static void _setup(void) | |||
26 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 26 | o = eo_add(EVAS_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_set(o, build_path("bar.png"), NULL); |
29 | evas_obj_image_border_set(o, 6, 6, 6, 6); | 29 | efl_image_border_set(o, 6, 6, 6, 6); |
30 | evas_obj_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); | 30 | efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); |
31 | efl_gfx_visible_set(o, EINA_TRUE); | 31 | efl_gfx_visible_set(o, EINA_TRUE); |
32 | } | 32 | } |
33 | done = 0; | 33 | done = 0; |
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c index d607b25..8a2aecd 100644 --- a/src/bin/image_blend_solid_middle_unscaled.c +++ b/src/bin/image_blend_solid_middle_unscaled.c | |||
@@ -28,8 +28,8 @@ static void _setup(void) | |||
28 | efl_file_set(o, build_path("logo.png"), NULL); | 28 | efl_file_set(o, build_path("logo.png"), NULL); |
29 | efl_gfx_fill_set(o, 0, 0, 120, 160); | 29 | efl_gfx_fill_set(o, 0, 0, 120, 160); |
30 | efl_gfx_size_set(o, 120, 160); | 30 | efl_gfx_size_set(o, 120, 160); |
31 | evas_obj_image_border_set(o, 43, 48, 48, 83); | 31 | efl_image_border_set(o, 43, 48, 48, 83); |
32 | evas_obj_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); | 32 | efl_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID); |
33 | efl_gfx_visible_set(o, EINA_TRUE); | 33 | efl_gfx_visible_set(o, EINA_TRUE); |
34 | } | 34 | } |
35 | done = 0; | 35 | done = 0; |
diff --git a/src/bin/ui.c b/src/bin/ui.c index 75c6ec0..94a9bdc 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c | |||
@@ -458,7 +458,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) | |||
458 | efl_file_set(o, build_path("text_sel.png"), NULL); | 458 | efl_file_set(o, build_path("text_sel.png"), NULL); |
459 | efl_gfx_size_set(o, 96, 32); | 459 | efl_gfx_size_set(o, 96, 32); |
460 | efl_gfx_fill_set(o, 0, 0, 96, 32); | 460 | efl_gfx_fill_set(o, 0, 0, 96, 32); |
461 | evas_obj_image_border_set(o, 7, 7, 7, 7); | 461 | efl_image_border_set(o, 7, 7, 7, 7); |
462 | o_menu_text_sel = o; | 462 | o_menu_text_sel = o; |
463 | 463 | ||
464 | o = eo_add(EVAS_TEXT_CLASS, evas); | 464 | o = eo_add(EVAS_TEXT_CLASS, evas); |
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c index b0e9085..526d888 100644 --- a/src/bin/widgets_list_1.c +++ b/src/bin/widgets_list_1.c | |||
@@ -64,8 +64,8 @@ static void _setup(void) | |||
64 | { | 64 | { |
65 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 65 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
66 | o_images[i] = o; | 66 | o_images[i] = o; |
67 | evas_obj_image_filled_set(o, 1); | 67 | efl_gfx_fill_filled_set(o, 1); |
68 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 68 | efl_image_border_set(o, 2, 2, 2, 2); |
69 | efl_file_set(o, build_path("pan.png"), NULL); | 69 | efl_file_set(o, build_path("pan.png"), NULL); |
70 | efl_gfx_size_set(o, win_w, ICON_SIZE); | 70 | efl_gfx_size_set(o, win_w, ICON_SIZE); |
71 | efl_gfx_visible_set(o, EINA_TRUE); | 71 | efl_gfx_visible_set(o, EINA_TRUE); |
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c index 07c9d87..1c8ab3c 100644 --- a/src/bin/widgets_list_1_grouped.c +++ b/src/bin/widgets_list_1_grouped.c | |||
@@ -64,8 +64,8 @@ static void _setup(void) | |||
64 | { | 64 | { |
65 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 65 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
66 | o_images[i] = o; | 66 | o_images[i] = o; |
67 | evas_obj_image_filled_set(o, 1); | 67 | efl_gfx_fill_filled_set(o, 1); |
68 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 68 | efl_image_border_set(o, 2, 2, 2, 2); |
69 | efl_file_set(o, build_path("pan.png"), NULL); | 69 | efl_file_set(o, build_path("pan.png"), NULL); |
70 | efl_gfx_size_set(o, win_w, ICON_SIZE); | 70 | efl_gfx_size_set(o, win_w, ICON_SIZE); |
71 | efl_gfx_visible_set(o, EINA_TRUE); | 71 | efl_gfx_visible_set(o, EINA_TRUE); |
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c index e232d7d..6785d27 100644 --- a/src/bin/widgets_list_2.c +++ b/src/bin/widgets_list_2.c | |||
@@ -64,8 +64,8 @@ static void _setup(void) | |||
64 | { | 64 | { |
65 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 65 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
66 | o_images[i] = o; | 66 | o_images[i] = o; |
67 | evas_obj_image_filled_set(o, 1); | 67 | efl_gfx_fill_filled_set(o, 1); |
68 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 68 | efl_image_border_set(o, 2, 2, 2, 2); |
69 | efl_file_set(o, build_path("pan.png"), NULL); | 69 | efl_file_set(o, build_path("pan.png"), NULL); |
70 | efl_gfx_size_set(o, win_w, ICON_SIZE); | 70 | efl_gfx_size_set(o, win_w, ICON_SIZE); |
71 | efl_gfx_visible_set(o, EINA_TRUE); | 71 | efl_gfx_visible_set(o, EINA_TRUE); |
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c index c3da64a..1568c3e 100644 --- a/src/bin/widgets_list_2_grouped.c +++ b/src/bin/widgets_list_2_grouped.c | |||
@@ -64,8 +64,8 @@ static void _setup(void) | |||
64 | { | 64 | { |
65 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 65 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
66 | o_images[i] = o; | 66 | o_images[i] = o; |
67 | evas_obj_image_filled_set(o, 1); | 67 | efl_gfx_fill_filled_set(o, 1); |
68 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 68 | efl_image_border_set(o, 2, 2, 2, 2); |
69 | efl_file_set(o, build_path("pan.png"), NULL); | 69 | efl_file_set(o, build_path("pan.png"), NULL); |
70 | efl_gfx_size_set(o, win_w, ICON_SIZE); | 70 | efl_gfx_size_set(o, win_w, ICON_SIZE); |
71 | efl_gfx_visible_set(o, EINA_TRUE); | 71 | efl_gfx_visible_set(o, EINA_TRUE); |
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c index 8e6af2c..cd388a1 100644 --- a/src/bin/widgets_list_3.c +++ b/src/bin/widgets_list_3.c | |||
@@ -85,16 +85,16 @@ static void _setup(void) | |||
85 | { | 85 | { |
86 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 86 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
87 | o_images[i] = o; | 87 | o_images[i] = o; |
88 | evas_obj_image_filled_set(o, 1); | 88 | efl_gfx_fill_filled_set(o, 1); |
89 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 89 | efl_image_border_set(o, 2, 2, 2, 2); |
90 | efl_file_set(o, build_path("pan.png"), NULL); | 90 | efl_file_set(o, build_path("pan.png"), NULL); |
91 | efl_gfx_size_set(o, win_w, ICON_SIZE); | 91 | efl_gfx_size_set(o, win_w, ICON_SIZE); |
92 | efl_gfx_visible_set(o, EINA_TRUE); | 92 | efl_gfx_visible_set(o, EINA_TRUE); |
93 | 93 | ||
94 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 94 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
95 | o_icons[i] = o; | 95 | o_icons[i] = o; |
96 | evas_obj_image_filled_set(o, 1); | 96 | efl_gfx_fill_filled_set(o, 1); |
97 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 97 | efl_image_border_set(o, 2, 2, 2, 2); |
98 | efl_file_set(o, build_path(icons[i % 13]), NULL); | 98 | efl_file_set(o, build_path(icons[i % 13]), NULL); |
99 | efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); | 99 | efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); |
100 | efl_gfx_visible_set(o, EINA_TRUE); | 100 | efl_gfx_visible_set(o, EINA_TRUE); |
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c index dda2692..7d6eb8b 100644 --- a/src/bin/widgets_list_3_grouped.c +++ b/src/bin/widgets_list_3_grouped.c | |||
@@ -85,16 +85,16 @@ static void _setup(void) | |||
85 | { | 85 | { |
86 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 86 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
87 | o_images[i] = o; | 87 | o_images[i] = o; |
88 | evas_obj_image_filled_set(o, 1); | 88 | efl_gfx_fill_filled_set(o, 1); |
89 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 89 | efl_image_border_set(o, 2, 2, 2, 2); |
90 | efl_file_set(o, build_path("pan.png"), NULL); | 90 | efl_file_set(o, build_path("pan.png"), NULL); |
91 | efl_gfx_size_set(o, win_w, ICON_SIZE); | 91 | efl_gfx_size_set(o, win_w, ICON_SIZE); |
92 | efl_gfx_visible_set(o, EINA_TRUE); | 92 | efl_gfx_visible_set(o, EINA_TRUE); |
93 | 93 | ||
94 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 94 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
95 | o_icons[i] = o; | 95 | o_icons[i] = o; |
96 | evas_obj_image_filled_set(o, 1); | 96 | efl_gfx_fill_filled_set(o, 1); |
97 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 97 | efl_image_border_set(o, 2, 2, 2, 2); |
98 | efl_file_set(o, build_path(icons[i % 13]), NULL); | 98 | efl_file_set(o, build_path(icons[i % 13]), NULL); |
99 | efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); | 99 | efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); |
100 | efl_gfx_visible_set(o, EINA_TRUE); | 100 | efl_gfx_visible_set(o, EINA_TRUE); |
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c index 2779b63..52f2eb4 100644 --- a/src/bin/widgets_list_4.c +++ b/src/bin/widgets_list_4.c | |||
@@ -85,16 +85,16 @@ static void _setup(void) | |||
85 | { | 85 | { |
86 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 86 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
87 | o_images[i] = o; | 87 | o_images[i] = o; |
88 | evas_obj_image_filled_set(o, 1); | 88 | efl_gfx_fill_filled_set(o, 1); |
89 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 89 | efl_image_border_set(o, 2, 2, 2, 2); |
90 | efl_file_set(o, build_path("pan.png"), NULL); | 90 | efl_file_set(o, build_path("pan.png"), NULL); |
91 | efl_gfx_size_set(o, win_w, ICON_SIZE); | 91 | efl_gfx_size_set(o, win_w, ICON_SIZE); |
92 | efl_gfx_visible_set(o, EINA_TRUE); | 92 | efl_gfx_visible_set(o, EINA_TRUE); |
93 | 93 | ||
94 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 94 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
95 | o_icons[i] = o; | 95 | o_icons[i] = o; |
96 | evas_obj_image_filled_set(o, 1); | 96 | efl_gfx_fill_filled_set(o, 1); |
97 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 97 | efl_image_border_set(o, 2, 2, 2, 2); |
98 | efl_file_set(o, build_path(icons[i % 13]), NULL); | 98 | efl_file_set(o, build_path(icons[i % 13]), NULL); |
99 | efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); | 99 | efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); |
100 | efl_gfx_visible_set(o, EINA_TRUE); | 100 | efl_gfx_visible_set(o, EINA_TRUE); |
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c index 8283151..377c27a 100644 --- a/src/bin/widgets_list_4_grouped.c +++ b/src/bin/widgets_list_4_grouped.c | |||
@@ -85,16 +85,16 @@ static void _setup(void) | |||
85 | { | 85 | { |
86 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 86 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
87 | o_images[i] = o; | 87 | o_images[i] = o; |
88 | evas_obj_image_filled_set(o, 1); | 88 | efl_gfx_fill_filled_set(o, 1); |
89 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 89 | efl_image_border_set(o, 2, 2, 2, 2); |
90 | efl_file_set(o, build_path("pan.png"), NULL); | 90 | efl_file_set(o, build_path("pan.png"), NULL); |
91 | efl_gfx_size_set(o, win_w, ICON_SIZE); | 91 | efl_gfx_size_set(o, win_w, ICON_SIZE); |
92 | efl_gfx_visible_set(o, EINA_TRUE); | 92 | efl_gfx_visible_set(o, EINA_TRUE); |
93 | 93 | ||
94 | o = eo_add(EVAS_IMAGE_CLASS, evas); | 94 | o = eo_add(EVAS_IMAGE_CLASS, evas); |
95 | o_icons[i] = o; | 95 | o_icons[i] = o; |
96 | evas_obj_image_filled_set(o, 1); | 96 | efl_gfx_fill_filled_set(o, 1); |
97 | evas_obj_image_border_set(o, 2, 2, 2, 2); | 97 | efl_image_border_set(o, 2, 2, 2, 2); |
98 | efl_file_set(o, build_path(icons[i % 13]), NULL); | 98 | efl_file_set(o, build_path(icons[i % 13]), NULL); |
99 | efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); | 99 | efl_gfx_size_set(o, ICON_SIZE - 8, ICON_SIZE - 8); |
100 | efl_gfx_visible_set(o, EINA_TRUE); | 100 | efl_gfx_visible_set(o, EINA_TRUE); |