expedite: porting to Eo

Signed-off-by: Yakov Goldberg <yakov.goldberg@gmail.com>

SVN revision: 83180

1 files changed, 19 insertions, 18 deletions

diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index ed3f0a0..4295721 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -62,27 +62,28 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < NUM; i++)
      {
-        o = evas_object_image_filled_add(evas);
+        o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
         o_images[i] = o;
-        evas_object_image_border_set(o, 2, 2, 2, 2);
-        evas_object_image_file_set(o, build_path("pan.png"), NULL);
-        evas_object_resize(o, win_w, ICON_SIZE);
-        evas_object_show(o);
-        
-        o = evas_object_text_add(evas);
+        eo_do(o, evas_obj_image_filled_set(1),
+                 evas_obj_image_border_set(2, 2, 2, 2),
+                 evas_obj_image_file_set(build_path("pan.png"), NULL),
+                 evas_obj_size_set(win_w, ICON_SIZE),
+                 evas_obj_visibility_set(EINA_TRUE));
+
+        o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
         o_texts[i] = o;
-        evas_object_text_font_set(o, "Vera-Bold", 10);
-        evas_object_text_text_set(o, labels[i % 26]);
-        evas_object_color_set(o, 0, 0, 0, 255);
-        evas_object_show(o);
+        eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+                 evas_obj_text_text_set(labels[i % 26]),
+                 evas_obj_color_set(0, 0, 0, 255),
+                 evas_obj_visibility_set(EINA_TRUE));
      }
    for (i = 0; i < NUM; i++)
      {
-        evas_object_raise(o_images[i]);
+        eo_do(o_images[i], evas_obj_raise());
      }
    for (i = 0; i < NUM; i++)
      {
-        evas_object_raise(o_texts[i]);
+        eo_do(o_texts[i], evas_obj_raise());
      }
    done = 0;
 }
@@ -91,8 +92,8 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
-   for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+   for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+   for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
 }
 
 /* loop - do things */
@@ -104,10 +105,10 @@ static void _loop(double t, int f)
    y = 0 - f;
    for (i = 0; i < NUM; i++)
      {
-        evas_object_move(o_images[i], x, y);
-        evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
+        eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
         cent = (ICON_SIZE - th) / 2;
-        evas_object_move(o_texts[i], x + 8, y + cent);
+        eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent));
         y += ICON_SIZE;
      }
    FPS_STD(NAME);