[elm] And now remove deprecated calls usage (WRT

 icon/image thing).

SVN revision: 71473

diff --git a/src/bin/config.c b/src/bin/config.c
index 84e3064..f436af1 100644 (file)
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -2248,8 +2248,8 @@ _profiles_list_fill(Evas_Object *l_widget,
         ext = strrchr(buf, '.');
         if (ext)
           {
-             if (!strcmp(ext, ".edj")) elm_icon_file_set(ic, buf, "icon");
-             else elm_icon_file_set(ic, buf, NULL);
+             if (!strcmp(ext, ".edj")) elm_image_file_set(ic, buf, "icon");
+             else elm_image_file_set(ic, buf, NULL);
           }
 
         evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL,

diff --git a/src/bin/test.c b/src/bin/test.c
index b97898b..b01eae3 100644 (file)
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -278,7 +278,7 @@ _menu_create(const char *option_str)
           {
              ic = elm_icon_add(win);
              snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), t->icon);
-             elm_icon_file_set(ic, buf, NULL);
+             elm_image_file_set(ic, buf, NULL);
              elm_object_part_content_set(bt, "icon", ic);
              evas_object_show(ic);
           }

diff --git a/src/bin/test_box.c b/src/bin/test_box.c
index eb0310a..dbc7653 100644 (file)
--- a/src/bin/test_box.c
+++ b/src/bin/test_box.c
@@ -158,24 +158,24 @@ test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_01.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_02.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.0, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_03.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, EVAS_HINT_EXPAND, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -282,24 +282,24 @@ test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_01.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_02.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.0);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_03.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -354,7 +354,7 @@ _radio_new(Evas_Object *obj)
    ic = elm_icon_add(obj);
    snprintf(buf, sizeof(buf), "%s/images/icon_%02d.png",
             elm_app_data_dir_get(), idx);
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    rd = elm_radio_add(obj);

diff --git a/src/bin/test_bubble.c b/src/bin/test_bubble.c
index 01b5ad6..92a4978 100644 (file)
--- a/src/bin/test_bubble.c
+++ b/src/bin/test_bubble.c
@@ -61,8 +61,8 @@ set_api_state(api_data *api)
               Evas_Object *ct, *ic = elm_icon_add(api->win);
 
               snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-              elm_icon_file_set(ic, buf, NULL);
-              elm_icon_resizable_set(ic, 0, 0);
+              elm_image_file_set(ic, buf, NULL);
+              elm_image_resizable_set(ic, 0, 0);
               elm_object_content_set(eina_list_nth(items, 0), ic);
               ct = elm_label_add(api->win);
               elm_object_text_set(ct, "Using icon as top-bubble content");
@@ -135,8 +135,8 @@ test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
 
    bb = elm_bubble_add(win);

diff --git a/src/bin/test_button.c b/src/bin/test_button.c
index be5d655..87fc085 100644 (file)
--- a/src/bin/test_button.c
+++ b/src/bin/test_button.c
@@ -54,7 +54,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    bt = elm_button_add(win);
    elm_object_text_set(bt, "Icon sized to button");
@@ -67,8 +67,8 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(bx);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    bt = elm_button_add(win);
    elm_object_text_set(bt, "Icon no scale");
    elm_object_part_content_set(bt, "icon", ic);
@@ -80,7 +80,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    bt = elm_button_add(win);
    elm_object_text_set(bt, "Disabled Button");
@@ -94,7 +94,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    bt = elm_button_add(win);
    elm_object_part_content_set(bt, "icon", ic);
@@ -118,8 +118,8 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    bt = elm_button_add(win);
    elm_object_part_content_set(bt, "icon", ic);
    evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)6);
@@ -138,7 +138,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    bt = elm_button_add(win);
    elm_object_style_set(bt, "anchor");
@@ -151,7 +151,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    bt = elm_button_add(win);
    elm_object_access_info_set(bt, "This is some custom text describing this widget");

diff --git a/src/bin/test_check.c b/src/bin/test_check.c
index 2e8b367..84ddb9d 100644 (file)
--- a/src/bin/test_check.c
+++ b/src/bin/test_check.c
@@ -37,7 +37,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    ck = elm_check_add(win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -53,8 +53,8 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE);
    ck = elm_check_add(win);
    elm_object_text_set(ck, "Icon not resizable");
    elm_object_part_content_set(ck, "icon", ic);
@@ -83,7 +83,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    ck = elm_check_add(win);
    evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -98,8 +98,8 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE);
    ck = elm_check_add(win);
    elm_object_part_content_set(ck, "icon", ic);
    elm_box_pack_end(bx, ck);
@@ -125,7 +125,7 @@ test_check_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    tg = elm_check_add(win);
@@ -143,8 +143,8 @@ test_check_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE);
 
    tg = elm_check_add(win);
    elm_object_style_set(tg, "toggle");
@@ -156,8 +156,8 @@ test_check_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE);
 
    tg = elm_check_add(win);
    elm_object_style_set(tg, "toggle");
@@ -178,8 +178,8 @@ test_check_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE);
 
    tg = elm_check_add(win);
    elm_object_style_set(tg, "toggle");

diff --git a/src/bin/test_ctxpopup.c b/src/bin/test_ctxpopup.c
index b89b84e..4a354c8 100644 (file)
--- a/src/bin/test_ctxpopup.c
+++ b/src/bin/test_ctxpopup.c
@@ -81,7 +81,7 @@ _ctxpopup_item_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
      {                                                                        \
         ic = elm_icon_add(obj);                                               \
         elm_icon_standard_set(ic, _icon);                                     \
-        elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);                   \
+        elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE);                   \
      }                                                                        \
    else                                                                       \
       ic = NULL;                                                              \

diff --git a/src/bin/test_diskselector.c b/src/bin/test_diskselector.c
index d62dee4..04e05db 100644 (file)
--- a/src/bin/test_diskselector.c
+++ b/src/bin/test_diskselector.c
@@ -87,7 +87,7 @@ set_api_state(api_data *api)
               char buf[PATH_MAX];
               Evas_Object *ic = elm_icon_add(elm_object_parent_widget_get(eina_list_nth(disks, 0)));
               snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-              elm_icon_file_set(ic, buf, NULL);
+              elm_image_file_set(ic, buf, NULL);
               elm_object_item_part_content_set(elm_diskselector_selected_item_get(eina_list_nth(disks, 0)), NULL, ic);
               evas_object_show(ic);
            }
@@ -271,8 +271,8 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
    disk = elm_diskselector_add(win);
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 1, 1);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 1, 1);
    elm_diskselector_item_append(disk, "Sunday", ic, NULL, NULL);
    elm_diskselector_item_append(disk, "Monday", NULL, NULL, NULL);
    elm_diskselector_item_append(disk, "Tuesday", NULL, NULL, NULL);
@@ -290,8 +290,8 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
    disk = elm_diskselector_add(win);
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 1, 1);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 1, 1);
    elm_diskselector_item_append(disk, "머리스타일", ic, NULL, NULL);
    elm_diskselector_item_append(disk, "プロが伝授する", NULL, NULL, NULL);
    elm_diskselector_item_append(disk, "生上访要求政府", NULL, NULL, NULL);

diff --git a/src/bin/test_entry_anchor.c b/src/bin/test_entry_anchor.c
index 759e06b..8b8fa69 100644 (file)
--- a/src/bin/test_entry_anchor.c
+++ b/src/bin/test_entry_anchor.c
@@ -136,8 +136,8 @@ test_entry_anchor(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
 
    bb = elm_bubble_add(win);
@@ -164,7 +164,7 @@ test_entry_anchor(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    bb = elm_bubble_add(win);
@@ -200,8 +200,8 @@ test_entry_anchor(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
 
    bb = elm_bubble_add(win);

diff --git a/src/bin/test_floating.c b/src/bin/test_floating.c
index 2e3ac94..4e19dd5 100644 (file)
--- a/src/bin/test_floating.c
+++ b/src/bin/test_floating.c
@@ -24,7 +24,7 @@ static Evas_Object *glf_content_get(void *data __UNUSED__, Evas_Object *obj, con
    char buf[PATH_MAX];
    Evas_Object *ic = elm_icon_add(obj);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    return ic;
 }

diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index c290ca9..cb7f628 100644 (file)
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -128,7 +128,7 @@ Evas_Object *gl_content_get(void *data __UNUSED__, Evas_Object *obj, const char
      snprintf(buf, sizeof(buf), "%s/images/bubble.png", elm_app_data_dir_get());
    else
      snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    return ic;
 }
@@ -649,7 +649,7 @@ Evas_Object *gl2_content_get(void *data, Evas_Object *obj, const char *part)
           snprintf(buf, sizeof(buf), "%s/images/panel_01.jpg", elm_app_data_dir_get());
         else if ((tit->mode & 0x3) == 3)
           snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get());
-        elm_icon_file_set(ic, buf, NULL);
+        elm_image_file_set(ic, buf, NULL);
      }
    else if (!strcmp(part, "elm.swallow.end"))
      {
@@ -661,7 +661,7 @@ Evas_Object *gl2_content_get(void *data, Evas_Object *obj, const char *part)
           snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", elm_app_data_dir_get());
         else if ((tit->mode & 0x3) == 3)
           snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get());
-        elm_icon_file_set(ic, buf, NULL);
+        elm_image_file_set(ic, buf, NULL);
      }
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    return ic;
@@ -942,13 +942,13 @@ Evas_Object *gl5_content_get(void *data, Evas_Object *obj, const char *part)
         elm_box_horizontal_set(bx, EINA_TRUE);
         ic = elm_icon_add(obj);
         snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-        elm_icon_file_set(ic, buf, NULL);
-        elm_icon_resizable_set(ic, 0, 0);
+        elm_image_file_set(ic, buf, NULL);
+        elm_image_resizable_set(ic, 0, 0);
         evas_object_show(ic);
         elm_box_pack_end(bx, ic);
         ic = elm_icon_add(obj);
-        elm_icon_file_set(ic, buf, NULL);
-        elm_icon_resizable_set(ic, 0, 0);
+        elm_image_file_set(ic, buf, NULL);
+        elm_image_resizable_set(ic, 0, 0);
         evas_object_show(ic);
         elm_box_pack_end(bx, ic);
         elm_box_horizontal_set(bx, EINA_TRUE);
@@ -1195,7 +1195,7 @@ Evas_Object *gl4_content_get(void *data __UNUSED__, Evas_Object *obj, const char
      {
         Evas_Object *ic = elm_icon_add(obj);
         snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-        elm_icon_file_set(ic, buf, NULL);
+        elm_image_file_set(ic, buf, NULL);
         evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
         evas_object_show(ic);
         return ic;
@@ -1772,7 +1772,7 @@ Evas_Object *gl10_content_get(void *data __UNUSED__, Evas_Object *obj, const cha
      snprintf(buf, sizeof(buf), "%s/images/bubble.png", elm_app_data_dir_get());
    else
      snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    return ic;
 }
@@ -2397,7 +2397,7 @@ Evas_Object *gl15_content_get(void *data, Evas_Object *obj, const char *part)
      {
         Evas_Object *ic = elm_icon_add(obj);
         snprintf(buf, sizeof(buf), "%s/images/bubble.png", PACKAGE_DATA_DIR);
-        elm_icon_file_set(ic, buf, NULL);
+        elm_image_file_set(ic, buf, NULL);
         evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
         return ic;
      }
@@ -2414,7 +2414,7 @@ Evas_Object *gl15_content_get(void *data, Evas_Object *obj, const char *part)
      {
         Evas_Object *icn = elm_icon_add(obj);
         snprintf(buf, sizeof(buf), "%s/images/icon_06.png", PACKAGE_DATA_DIR);
-        elm_icon_file_set(icn, buf, NULL);
+        elm_image_file_set(icn, buf, NULL);
         evas_object_propagate_events_set(icn, EINA_FALSE);
         evas_object_size_hint_aspect_set(icn, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
         evas_object_smart_callback_add(icn, "clicked", _edit_icon_clicked_cb, (void *)tit->item);
@@ -2563,7 +2563,7 @@ Evas_Object *gl16_content_get(void *data, Evas_Object *obj, const char *part)
      {
         Evas_Object *icn = elm_icon_add(obj);
         snprintf(buf, sizeof(buf), "%s/images/icon_04.png", PACKAGE_DATA_DIR);
-        elm_icon_file_set(icn, buf, NULL);
+        elm_image_file_set(icn, buf, NULL);
         evas_object_propagate_events_set(icn, EINA_FALSE);
         evas_object_size_hint_aspect_set(icn, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
         return icn;
@@ -2572,7 +2572,7 @@ Evas_Object *gl16_content_get(void *data, Evas_Object *obj, const char *part)
      {
         Evas_Object *icn = elm_icon_add(obj);
         snprintf(buf, sizeof(buf), "%s/images/icon_09.png", PACKAGE_DATA_DIR);
-        elm_icon_file_set(icn, buf, NULL);
+        elm_image_file_set(icn, buf, NULL);
         evas_object_propagate_events_set(icn, EINA_FALSE);
         evas_object_size_hint_aspect_set(icn, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
         evas_object_smart_callback_add(icn, "clicked", _flip_icon_clicked_cb, (void *)tit);

diff --git a/src/bin/test_gesture_layer.c b/src/bin/test_gesture_layer.c
index caaefcc..295e549 100644 (file)
--- a/src/bin/test_gesture_layer.c
+++ b/src/bin/test_gesture_layer.c
@@ -301,7 +301,7 @@ photo_object_add(Evas_Object *parent, Evas_Object *ic, const char *icon, Evas_Co
    else
      {
         po->ic = elm_icon_add(parent);
-        elm_icon_file_set(po->ic, icon, NULL);
+        elm_image_file_set(po->ic, icon, NULL);
      }
 
    po->bx = x;
@@ -313,7 +313,7 @@ photo_object_add(Evas_Object *parent, Evas_Object *ic, const char *icon, Evas_Co
      {
         po->shadow = elm_icon_add(po->ic);
         snprintf(buf, sizeof(buf), "%s/images/pol_shadow.png", elm_app_data_dir_get());
-        elm_icon_file_set(po->shadow, buf, NULL);
+        elm_image_file_set(po->shadow, buf, NULL);
         evas_object_resize(po->shadow, SHADOW_W, SHADOW_H);
         evas_object_show(po->shadow);
      }

diff --git a/src/bin/test_gesture_layer2.c b/src/bin/test_gesture_layer2.c
index 487c84e..c05f2a7 100644 (file)
--- a/src/bin/test_gesture_layer2.c
+++ b/src/bin/test_gesture_layer2.c
@@ -166,7 +166,7 @@ _color_and_icon_set(infra_data *infra, char *name, int n, int max,
 
         snprintf(infra->buf, sizeof(infra->buf),
               "%s/images/g_layer/%s_%d.png", elm_app_data_dir_get(), i->name, nn);
-        elm_icon_file_set(i->icon, infra->buf, NULL);
+        elm_image_file_set(i->icon, infra->buf, NULL);
         _icon_color_set(i, r, g, b, a);
      }
 }
@@ -501,8 +501,8 @@ Evas_Object *create_gesture_box(Evas_Object *win, icon_properties *icons,
    icons[idx].name = name;
    snprintf(buf, sizeof(buf), "%s/images/g_layer/%s_1.png",
          elm_app_data_dir_get(), icons[idx].name);
-   elm_icon_file_set(icons[idx].icon, buf, NULL);
-   elm_icon_resizable_set(icons[idx].icon, 0, 0);
+   elm_image_file_set(icons[idx].icon, buf, NULL);
+   elm_image_resizable_set(icons[idx].icon, 0, 0);
    evas_object_size_hint_align_set(icons[idx].icon, 0.5, 0.5);
    _icon_color_set(&icons[idx], INI_R, INI_G, INI_B, INI_A);
    elm_box_pack_end(bx, icons[idx].icon);

diff --git a/src/bin/test_gesture_layer3.c b/src/bin/test_gesture_layer3.c
index 780032e..51152f8 100644 (file)
--- a/src/bin/test_gesture_layer3.c
+++ b/src/bin/test_gesture_layer3.c
@@ -486,7 +486,7 @@ photo_object_add(Evas_Object *parent, Evas_Object *ic, const char *icon,
    else
      {
         po->ic = elm_icon_add(parent);
-        elm_icon_file_set(po->ic, icon, NULL);
+        elm_image_file_set(po->ic, icon, NULL);
      }
 
    po->bx = x;
@@ -498,7 +498,7 @@ photo_object_add(Evas_Object *parent, Evas_Object *ic, const char *icon,
      {
         po->shadow = elm_icon_add(po->ic);
         snprintf(buf, sizeof(buf), "%s/images/pol_shadow.png", elm_app_data_dir_get());
-        elm_icon_file_set(po->shadow, buf, NULL);
+        elm_image_file_set(po->shadow, buf, NULL);
         evas_object_resize(po->shadow, SHADOW_W, SHADOW_H);
         evas_object_show(po->shadow);
      }

diff --git a/src/bin/test_hover.c b/src/bin/test_hover.c
index c9a8fc7..5d05231 100644 (file)
--- a/src/bin/test_hover.c
+++ b/src/bin/test_hover.c
@@ -56,8 +56,8 @@ test_hover(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
 
@@ -139,8 +139,8 @@ test_hover2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
    bt = elm_button_add(win);

diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c
index d86c3cf..fe02f8e 100644 (file)
--- a/src/bin/test_hoversel.c
+++ b/src/bin/test_hoversel.c
@@ -189,7 +189,7 @@ test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    elm_object_part_content_set(bt, "icon", ic);
    evas_object_show(ic);
 

diff --git a/src/bin/test_icon.c b/src/bin/test_icon.c
index 28bda73..3098d39 100644 (file)
--- a/src/bin/test_icon.c
+++ b/src/bin/test_icon.c
@@ -8,7 +8,7 @@ static void
 aspect_fixed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Evas_Object *ic = (Evas_Object *)data;
-   elm_icon_aspect_fixed_set(ic, elm_check_state_get(obj));
+   elm_image_aspect_fixed_set(ic, elm_check_state_get(obj));
 }
 
 static void
@@ -22,7 +22,7 @@ static void
 smooth_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Evas_Object *ic = (Evas_Object *)data;
-   elm_icon_smooth_set(ic, elm_check_state_get(obj));
+   elm_image_smooth_set(ic, elm_check_state_get(obj));
 }
 
 static void
@@ -38,14 +38,14 @@ bt_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_win_resize_object_add(win, ic);
    snprintf(buf, sizeof(buf), "%s/images/insanely_huge_test_image.jpg",
             elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
 
    evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ic, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_icon_resizable_set(ic, EINA_TRUE, EINA_TRUE);
-   elm_icon_aspect_fixed_set(ic, EINA_FALSE);
-   elm_icon_preload_disabled_set(ic, EINA_TRUE);
-   elm_icon_prescale_set(ic, EINA_TRUE);
+   elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE);
+   elm_image_aspect_fixed_set(ic, EINA_FALSE);
+   elm_image_preload_disabled_set(ic, EINA_TRUE);
+   elm_image_prescale_set(ic, EINA_TRUE);
    evas_object_show(ic);
 
    evas_object_resize(win, 350, 350);
@@ -76,8 +76,8 @@ test_icon(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
    Evas_Object *ic = elm_icon_add(win);
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, EINA_TRUE, EINA_TRUE);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, EINA_TRUE, EINA_TRUE);
    evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ic, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
@@ -144,9 +144,9 @@ test_icon_transparent(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
-   elm_icon_no_scale_set(ic, 1);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
+   elm_image_no_scale_set(ic, 1);
    evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(ic, 0.5, 0.5);
    elm_win_resize_object_add(win, ic);

diff --git a/src/bin/test_icon_animated.c b/src/bin/test_icon_animated.c
index 8d00700..484fdfb 100644 (file)
--- a/src/bin/test_icon_animated.c
+++ b/src/bin/test_icon_animated.c
@@ -9,10 +9,10 @@ icon_clicked(void *data , Evas_Object *obj __UNUSED__, void *event_info __UNUSED
    Evas_Object *ic;
    ic = data;
    Eina_Bool rec;
-   rec = elm_icon_animated_play_get(ic);
+   rec = elm_image_animated_play_get(ic);
    rec = !rec;
    printf("clicked!rec =%d\n",rec);
-   elm_icon_animated_play_set(ic, rec);
+   elm_image_animated_play_set(ic, rec);
 }
 
 void
@@ -28,15 +28,15 @@ test_icon_animated(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/animated_logo.gif", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   if (elm_icon_animated_available_get(ic))
+   elm_image_file_set(ic, buf, NULL);
+   if (elm_image_animated_available_get(ic))
      {
         printf("============Support animator==============\n");
-        elm_icon_animated_set(ic, EINA_TRUE);
-        elm_icon_animated_play_set(ic, EINA_TRUE);
+        elm_image_animated_set(ic, EINA_TRUE);
+        elm_image_animated_play_set(ic, EINA_TRUE);
      }
-   elm_icon_resizable_set(ic, 0, 0);
-   elm_icon_no_scale_set(ic, 1);
+   elm_image_resizable_set(ic, 0, 0);
+   elm_image_no_scale_set(ic, 1);
    evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(ic, 0.5, 0.5);
    elm_win_resize_object_add(win, ic);

diff --git a/src/bin/test_launcher.c b/src/bin/test_launcher.c
index 9c8c594..3f83d95 100644 (file)
--- a/src/bin/test_launcher.c
+++ b/src/bin/test_launcher.c
@@ -264,8 +264,8 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
                   ic = elm_icon_add(win);
                   elm_object_scale_set(ic, 0.5);
                   snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", elm_app_data_dir_get(), n);
-                  elm_icon_file_set(ic, buf, NULL);
-                  elm_icon_resizable_set(ic, 0, 0);
+                  elm_image_file_set(ic, buf, NULL);
+                  elm_image_resizable_set(ic, 0, 0);
                   evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                   evas_object_size_hint_align_set(ic, 0.5, 0.5);
                   elm_table_pack(tb, ic, 1 + i, 1 + (j * 2), 1, 1);
@@ -808,8 +808,8 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
                   ic = elm_icon_add(win);
                   elm_object_scale_set(ic, 0.5);
                   snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", elm_app_data_dir_get(), n);
-                  elm_icon_file_set(ic, buf, NULL);
-                  elm_icon_resizable_set(ic, 0, 0);
+                  elm_image_file_set(ic, buf, NULL);
+                  elm_image_resizable_set(ic, 0, 0);
                   evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
                   evas_object_size_hint_align_set(ic, 0.5, 0.5);
                   elm_object_part_content_set(ly2, "slot", ic);

diff --git a/src/bin/test_list.c b/src/bin/test_list.c
index b057815..0dbeb40 100644 (file)
--- a/src/bin/test_list.c
+++ b/src/bin/test_list.c
@@ -317,25 +317,25 @@ test_list(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 1, 1);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 1, 1);
    list_it1 = elm_list_item_append(li, "Hello", ic, NULL, NULL, NULL);
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_resizable_set(ic, 0, 0);
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
    elm_list_item_append(li, "world", ic, NULL, NULL, NULL);
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "edit");
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_resizable_set(ic, 0, 0);
    elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
 
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "delete");
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_resizable_set(ic, 0, 0);
    ic2 = elm_icon_add(win);
    elm_icon_standard_set(ic2, "clock");
-   elm_icon_resizable_set(ic2, 0, 0);
+   elm_image_resizable_set(ic2, 0, 0);
    list_it2 = elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
 
    bx = elm_box_add(win);
@@ -343,24 +343,24 @@ test_list(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.0);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -459,41 +459,41 @@ test_list_horizontal(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 1, 1);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 1, 1);
    list_it1 = elm_list_item_append(li, "Hello", ic, NULL, NULL, NULL);
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_resizable_set(ic, 0, 0);
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
    elm_list_item_append(li, "world", ic, NULL, NULL, NULL);
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "edit");
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_resizable_set(ic, 0, 0);
    elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
 
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "delete");
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_resizable_set(ic, 0, 0);
    ic2 = elm_icon_add(win);
    elm_icon_standard_set(ic2, "clock");
-   elm_icon_resizable_set(ic2, 0, 0);
+   elm_image_resizable_set(ic2, 0, 0);
    list_it2 = elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
 
    bx = elm_box_add(win);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.0);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -613,25 +613,25 @@ test_list2(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    list_it = elm_list_item_append(li, "Hello", ic, NULL, my_li2_sel, NULL);
    elm_list_item_selected_set(list_it, EINA_TRUE);
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_resizable_set(ic, 0, 0);
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
    elm_list_item_append(li, "world", ic, NULL, NULL, NULL);
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "edit");
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_resizable_set(ic, 0, 0);
    elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
 
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "delete");
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_resizable_set(ic, 0, 0);
    ic2 = elm_icon_add(win);
    elm_icon_standard_set(ic2, "clock");
-   elm_icon_resizable_set(ic2, 0, 0);
+   elm_image_resizable_set(ic2, 0, 0);
    elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
 
    bx2 = elm_box_add(win);
@@ -639,16 +639,16 @@ test_list2(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx2, ic);
    evas_object_show(ic);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.0);
    elm_box_pack_end(bx2, ic);
    evas_object_show(ic);
@@ -739,8 +739,8 @@ test_list3(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_resizable_set(ic, 0, 0);
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
    ic2 = elm_button_add(win);
    elm_object_text_set(ic2, "Click me");
    evas_object_smart_callback_add(ic2, "clicked", _bt_clicked, NULL);
@@ -749,8 +749,8 @@ test_list3(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_resizable_set(ic, 0, 0);
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
    ic2 = elm_button_add(win);
    elm_object_text_set(ic2, "Click me");
    evas_object_smart_callback_add(ic2, "clicked", _bt_clicked, NULL);
@@ -758,15 +758,15 @@ test_list3(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "edit");
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_resizable_set(ic, 0, 0);
    elm_list_item_append(li, ".", ic, NULL, NULL, NULL);
 
    ic = elm_icon_add(win);
    elm_icon_standard_set(ic, "delete");
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_resizable_set(ic, 0, 0);
    ic2 = elm_icon_add(win);
    elm_icon_standard_set(ic2, "clock");
-   elm_icon_resizable_set(ic2, 0, 0);
+   elm_image_resizable_set(ic2, 0, 0);
    elm_list_item_append(li, "How", ic, ic2, NULL, NULL);
 
    bx = elm_box_add(win);
@@ -774,24 +774,24 @@ test_list3(void        *data __UNUSED__,
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.0);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -915,8 +915,8 @@ test_list4(void        *data __UNUSED__,
                            "conceptalbums The Dark Side of the Moon, Wish You Were Here, Animals, and The Wall.";
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/mystrale.jpg", elm_app_data_dir_get());
-   elm_icon_resizable_set(ic, 0, 0);
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
    elm_list_item_append(li, "Pink Floyd", ic, NULL, NULL, &pf_data);
 
    static char ds_data[] = "Dire Straits were a British rock band, formed by Mark Knopfler "                          \
@@ -932,8 +932,8 @@ test_list4(void        *data __UNUSED__,
                            "their first album going multi-platinum globally.";
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/mystrale_2.jpg", elm_app_data_dir_get());
-   elm_icon_resizable_set(ic, 0, 0);
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
    elm_list_item_append(li, "Dire Straits", ic, NULL, NULL, &ds_data);
 
    static char uh_data[] = "Uriah Heep are an English hard rock band. The band released several "                       \
@@ -944,8 +944,8 @@ test_list4(void        *data __UNUSED__,
                            "perform at stadium-sized venues.";
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_17.png", elm_app_data_dir_get());
-   elm_icon_resizable_set(ic, 1, 1);
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 1, 1);
+   elm_image_file_set(ic, buf, NULL);
    elm_list_item_append(li, "Uriah Heep", ic, NULL, NULL, &uh_data);
 
    static char r_data[] = "Rush is a Canadian rock band formed in August 1968, in the Willowdale "                       \
@@ -956,11 +956,11 @@ test_list4(void        *data __UNUSED__,
                           "two weeks before the group's first United States tour.";
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_21.png", elm_app_data_dir_get());
-   elm_icon_resizable_set(ic, 0, 0);
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
    ic2 = elm_icon_add(win);
    elm_icon_standard_set(ic2, "clock");
-   elm_icon_resizable_set(ic2, 0, 0);
+   elm_image_resizable_set(ic2, 0, 0);
    elm_list_item_append(li, "Rush", ic, ic2, NULL, &r_data);
 
    elm_list_go(li);

diff --git a/src/bin/test_map.c b/src/bin/test_map.c
index 643f66d..69842c2 100644 (file)
--- a/src/bin/test_map.c
+++ b/src/bin/test_map.c
@@ -80,7 +80,7 @@ static Evas_Object *
 _route_icon_get(Evas_Object *obj)
 {
    Evas_Object *icon = elm_icon_add(obj);
-   elm_icon_file_set(icon, PACKAGE_DATA_DIR"/images/bubble.png", NULL);
+   elm_image_file_set(icon, PACKAGE_DATA_DIR"/images/bubble.png", NULL);
    evas_object_show(icon);
 
    return icon;
@@ -124,7 +124,7 @@ static Evas_Object *
 _icon_get(Evas_Object *obj, Overlay_Data *data)
 {
    Evas_Object *icon = elm_icon_add(obj);
-   elm_icon_file_set(icon, data->file, NULL);
+   elm_image_file_set(icon, data->file, NULL);
    evas_object_show(icon);
 
    return icon;

diff --git a/src/bin/test_naviframe.c b/src/bin/test_naviframe.c
index 66e3ca4..ea6a0e4 100644 (file)
--- a/src/bin/test_naviframe.c
+++ b/src/bin/test_naviframe.c
@@ -139,7 +139,7 @@ _page4(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    ic = elm_icon_add(nf);
    snprintf(buf, sizeof(buf), "%s/images/icon_right_arrow.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    bt = elm_button_add(nf);
@@ -160,7 +160,7 @@ _page4(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    ic = elm_icon_add(nf);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    elm_object_item_part_content_set(it, "icon", ic);
    elm_naviframe_item_title_visible_set(it, EINA_FALSE);
@@ -194,7 +194,7 @@ _page3(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
                                 NULL);
    ic = elm_icon_add(nf);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    elm_object_item_part_content_set(it, "icon", ic);
@@ -214,7 +214,7 @@ _page2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    ic = elm_icon_add(nf);
    snprintf(buf, sizeof(buf), "%s/images/icon_right_arrow.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    elm_object_part_content_set(bt, "icon", ic);
 

diff --git a/src/bin/test_naviframe_complex.c b/src/bin/test_naviframe_complex.c
index eeb33de..f4b573d 100644 (file)
--- a/src/bin/test_naviframe_complex.c
+++ b/src/bin/test_naviframe_complex.c
@@ -39,7 +39,7 @@ gl_content_get(void *data __UNUSED__, Evas_Object *obj, const char *part)
      snprintf(buf, sizeof(buf), "%s/images/bubble.png", elm_app_data_dir_get());
    else
      snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    return ic;
 }
@@ -63,7 +63,7 @@ _content_image_new(Evas_Object *parent, const char *img)
    Evas_Object *ic;
 
    ic = elm_icon_add(parent);
-   elm_icon_file_set(ic, img, NULL);
+   elm_image_file_set(ic, img, NULL);
    elm_icon_fill_outside_set(ic, EINA_FALSE);
    return ic;
 }
@@ -219,7 +219,7 @@ _page4(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    ic = elm_icon_add(nf);
    snprintf(buf, sizeof(buf), "%s/images/icon_right_arrow.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    bt = elm_button_add(nf);
@@ -240,7 +240,7 @@ _page4(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    ic = elm_icon_add(nf);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    elm_object_item_part_content_set(it, "icon", ic);
    elm_naviframe_item_title_visible_set(it, EINA_FALSE);
@@ -274,7 +274,7 @@ _page3(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
                                 NULL);
    ic = elm_icon_add(nf);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    elm_object_item_part_content_set(it, "icon", ic);
@@ -294,7 +294,7 @@ _page2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    ic = elm_icon_add(nf);
    snprintf(buf, sizeof(buf), "%s/images/icon_right_arrow.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    elm_object_part_content_set(bt, "icon", ic);
 

diff --git a/src/bin/test_popup.c b/src/bin/test_popup.c
index 723b3f0..d500846 100644 (file)
--- a/src/bin/test_popup.c
+++ b/src/bin/test_popup.c
@@ -139,7 +139,7 @@ _popup_bottom_title_text_3button_cb(void *data, Evas_Object *obj __UNUSED__,
    icon = elm_icon_add(popup);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(icon, buf, NULL);
+   elm_image_file_set(icon, buf, NULL);
    elm_object_part_content_set(popup, "title,icon", icon);
    btn1 = elm_button_add(popup);
    elm_object_text_set(btn1, "OK");
@@ -171,7 +171,7 @@ _popup_center_title_content_3button_cb(void *data, Evas_Object *obj __UNUSED__,
    icon = elm_icon_add(btn);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(icon, buf, NULL);
+   elm_image_file_set(icon, buf, NULL);
    elm_object_content_set(btn, icon);
    elm_object_content_set(popup, btn);
    elm_object_part_text_set(popup, "title,text", "Title");
@@ -204,7 +204,7 @@ _popup_center_title_item_3button_cb(void *data, Evas_Object *obj __UNUSED__,
    elm_object_part_text_set(popup, "title,text", "Title");
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(icon1, buf, NULL);
+   elm_image_file_set(icon1, buf, NULL);
    for (i = 0; i < 10; i++)
      {
         snprintf(buf, sizeof(buf), "Item%u", i+1);

diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c
index 6eed552..4164ea1 100644 (file)
--- a/src/bin/test_progressbar.c
+++ b/src/bin/test_progressbar.c
@@ -104,7 +104,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
 
    ic1 = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic1, buf, NULL);
+   elm_image_file_set(ic1, buf, NULL);
    evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    pb = elm_progressbar_add(win);
@@ -150,7 +150,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    _test_progressbar.pb5 = pb;
 
    ic2 = elm_icon_add(win);
-   elm_icon_file_set(ic2, buf, NULL);
+   elm_image_file_set(ic2, buf, NULL);
    evas_object_size_hint_aspect_set(ic2, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
 
    pb = elm_progressbar_add(win);

diff --git a/src/bin/test_radio.c b/src/bin/test_radio.c
index 1c822ea..fd8bf95 100644 (file)
--- a/src/bin/test_radio.c
+++ b/src/bin/test_radio.c
@@ -19,7 +19,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    rd = elm_radio_add(win);
@@ -35,8 +35,8 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
 
    rd = elm_radio_add(win);
    elm_radio_state_value_set(rd, 1);
@@ -64,8 +64,8 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
 
    rd = elm_radio_add(win);
    elm_radio_state_value_set(rd, 4);
@@ -77,8 +77,8 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
 
    rd = elm_radio_add(win);
    elm_radio_state_value_set(rd, 5);

diff --git a/src/bin/test_segment_control.c b/src/bin/test_segment_control.c
index 48ae35b..0ea3fab 100644 (file)
--- a/src/bin/test_segment_control.c
+++ b/src/bin/test_segment_control.c
@@ -31,12 +31,12 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e
 
    ic = elm_icon_add(in_layout);
    snprintf(buf1, sizeof(buf1), "%s/images/logo.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf1, NULL);
+   elm_image_file_set(ic, buf1, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
 
    ic1 = elm_icon_add(in_layout);
    snprintf(buf2, sizeof(buf2), "%s/images/logo.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic1, buf2, NULL);
+   elm_image_file_set(ic1, buf2, NULL);
    evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
 
    segment1 = elm_segment_control_add(win);
@@ -56,17 +56,17 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e
 
    ic2 = elm_icon_add(in_layout);
    snprintf(buf3, sizeof(buf3), "%s/images/logo.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic2, buf3, NULL);
+   elm_image_file_set(ic2, buf3, NULL);
    evas_object_size_hint_aspect_set(ic2, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
 
    ic3 = elm_icon_add(in_layout);
    snprintf(buf4, sizeof(buf4), "%s/images/logo.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic3, buf4, NULL);
+   elm_image_file_set(ic3, buf4, NULL);
    evas_object_size_hint_aspect_set(ic3, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
 
    ic4 = elm_icon_add(in_layout);
    snprintf(buf5, sizeof(buf5), "%s/images/logo.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic4, buf5, NULL);
+   elm_image_file_set(ic4, buf5, NULL);
    evas_object_size_hint_aspect_set(ic4, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
 
    segment3 = elm_segment_control_add(win);
@@ -77,7 +77,7 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e
 
    ic5 = elm_icon_add(in_layout);
    snprintf(buf6, sizeof(buf6), "%s/images/logo.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic5, buf6, NULL);
+   elm_image_file_set(ic5, buf6, NULL);
    evas_object_size_hint_aspect_set(ic5, EVAS_ASPECT_CONTROL_BOTH, 1, 1);
 
    segment4 = elm_segment_control_add(win);

diff --git a/src/bin/test_slider.c b/src/bin/test_slider.c
index c10e93c..5e62efb 100644 (file)
--- a/src/bin/test_slider.c
+++ b/src/bin/test_slider.c
@@ -27,7 +27,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    sl = elm_slider_add(win);
@@ -45,7 +45,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    /* horizontal disable state */
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    sl = elm_slider_add(win);
@@ -64,7 +64,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    sl = elm_slider_add(win);
@@ -86,7 +86,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    /* label2 disable */
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    sl = elm_slider_add(win);
@@ -130,7 +130,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
 
    sl = elm_slider_add(win);
@@ -168,7 +168,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    /* vertical disable state */
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
 
    sl = elm_slider_add(win);

diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c
index 7d4cb97..33a015a 100644 (file)
--- a/src/bin/test_tooltip.c
+++ b/src/bin/test_tooltip.c
@@ -116,8 +116,8 @@ _tt_item_icon(void *data   __UNUSED__,
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_resize(ic, 64, 64);
    return ic;
 }
@@ -131,8 +131,8 @@ _tt_item_icon2(void *data   __UNUSED__,
    Evas_Object *ic = elm_icon_add(tt);
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    return ic;
 }
 
@@ -147,9 +147,9 @@ _tt_item_icon3(void *data   __UNUSED__,
 
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/insanely_huge_test_image.jpg", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_size_get(ic, &w, &h);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_object_size_get(ic, &w, &h);
+   elm_image_resizable_set(ic, 0, 0);
    elm_win_screen_size_get(tt, NULL, NULL, &sw, &sh);
    if ((w > sw) || (h > sh))
      {
@@ -248,8 +248,8 @@ _tt_icon(void *data   __UNUSED__,
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_resize(ic, 64, 64);
    return ic;
 }
@@ -262,8 +262,8 @@ _tt_icon2(void *data   __UNUSED__,
    Evas_Object *ic = elm_icon_add(tt);
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/icon_00.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_resize(ic, 64, 64);
    return ic;
 }

diff --git a/src/bin/test_transit.c b/src/bin/test_transit.c
index 7596d01..0ca740d 100644 (file)
--- a/src/bin/test_transit.c
+++ b/src/bin/test_transit.c
@@ -250,7 +250,7 @@ test_transit(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_11.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    bt = elm_button_add(win);
@@ -357,7 +357,7 @@ test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_max_set(ic, 50, 50);
 
    bt = elm_button_add(win);
@@ -369,7 +369,7 @@ test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_max_set(ic, 50, 50);
 
    bt2 = elm_button_add(win);
@@ -397,7 +397,7 @@ test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/rock_01.jpg", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_max_set(ic, 50, 50);
 
    bt = elm_button_add(win);
@@ -409,7 +409,7 @@ test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/rock_02.jpg", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_max_set(ic, 50, 50);
 
    bt2 = elm_button_add(win);

diff --git a/src/bin/test_win_inline.c b/src/bin/test_win_inline.c
index a8aed99..b996e5e 100644 (file)
--- a/src/bin/test_win_inline.c
+++ b/src/bin/test_win_inline.c
@@ -48,8 +48,8 @@ fill(Evas_Object *win, Eina_Bool do_bg)
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
 
    bb = elm_bubble_add(win);
@@ -73,7 +73,7 @@ fill(Evas_Object *win, Eina_Bool do_bg)
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    bb = elm_bubble_add(win);
@@ -107,8 +107,8 @@ fill(Evas_Object *win, Eina_Bool do_bg)
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
 
    bb = elm_bubble_add(win);

diff --git a/src/bin/test_win_socket.c b/src/bin/test_win_socket.c
index 223bb57..dbeb03b 100644 (file)
--- a/src/bin/test_win_socket.c
+++ b/src/bin/test_win_socket.c
@@ -55,8 +55,8 @@ fill(Evas_Object *win, Eina_Bool do_bg)
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
 
    bb = elm_bubble_add(win);
@@ -80,7 +80,7 @@ fill(Evas_Object *win, Eina_Bool do_bg)
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
+   elm_image_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    bb = elm_bubble_add(win);
@@ -114,8 +114,8 @@ fill(Evas_Object *win, Eina_Bool do_bg)
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
 
    bb = elm_bubble_add(win);

diff --git a/src/edje_externals/elm.c b/src/edje_externals/elm.c
index ced69b8..80b7248 100644 (file)
--- a/src/edje_externals/elm.c
+++ b/src/edje_externals/elm.c
@@ -236,7 +236,7 @@ external_common_param_icon_get(Evas_Object *obj, const Edje_External_Param *p)
      parent_widget = edje;
    icon = elm_icon_add(parent_widget);
 
-   if (elm_icon_file_set(icon, file, p->s))
+   if (elm_image_file_set(icon, file, p->s))
      return icon;
    if (elm_icon_standard_set(icon, p->s))
      return icon;

diff --git a/src/edje_externals/elm_icon.c b/src/edje_externals/elm_icon.c
index fbd1c5f..ee056ae 100644 (file)
--- a/src/edje_externals/elm_icon.c
+++ b/src/edje_externals/elm_icon.c
@@ -37,22 +37,22 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
 
    if (p->file)
      {
-        elm_icon_file_set(obj, p->file, NULL);
+        elm_image_file_set(obj, p->file, NULL);
         param_icon->file = p->file;
      }
    if (p->smooth_exists)
      {
-        elm_icon_smooth_set(obj, p->smooth);
+        elm_image_smooth_set(obj, p->smooth);
         param_icon->smooth = p->smooth;
      }
    if (p->no_scale_exists)
      {
-        elm_icon_no_scale_set(obj, p->no_scale);
+        elm_image_no_scale_set(obj, p->no_scale);
         param_icon->no_scale = p->no_scale;
      }
    if (p->scale_up_exists && p->scale_down_exists)
      {
-        elm_icon_resizable_set(obj, p->scale_up, p->scale_down);
+        elm_image_resizable_set(obj, p->scale_up, p->scale_down);
         param_icon->scale_up = p->scale_up;
         param_icon->scale_down = p->scale_down;
      }
@@ -60,12 +60,12 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
      {
         if (p->scale_up_exists)
           {
-             elm_icon_resizable_set(obj, p->scale_up, param_icon->scale_down);
+             elm_image_resizable_set(obj, p->scale_up, param_icon->scale_down);
              param_icon->scale_up = p->scale_up;
           }
         else
           {
-             elm_icon_resizable_set(obj, param_icon->scale_up, p->scale_down);
+             elm_image_resizable_set(obj, param_icon->scale_up, p->scale_down);
              param_icon->scale_down = p->scale_down;
           }
      }
@@ -76,7 +76,7 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
      }
    if (p->prescale_size_exists)
      {
-        elm_icon_prescale_set(obj, p->prescale_size);
+        elm_image_prescale_set(obj, p->prescale_size);
         param_icon->prescale_size = p->prescale_size;
      }
    if (p->icon)
@@ -84,7 +84,7 @@ external_icon_state_set(void *data __UNUSED__, Evas_Object *obj,
         edje = evas_object_smart_parent_get(obj);
         edje_object_file_get(edje, &file, NULL);
 
-        if (!elm_icon_file_set(obj, file, p->icon))
+        if (!elm_image_file_set(obj, file, p->icon))
           elm_icon_standard_set(obj, p->icon);
      }
 }
@@ -99,7 +99,7 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
    if (!strcmp(param->name, "file")
                   && param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
      {
-        Eina_Bool ret = elm_icon_file_set(obj, param->s, NULL);
+        Eina_Bool ret = elm_image_file_set(obj, param->s, NULL);
        if (ret)
          param_icon->file = param->s;
        return ret;
@@ -107,28 +107,28 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
    else if (!strcmp(param->name, "smooth")
             && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
      {
-        elm_icon_smooth_set(obj, param->i);
+        elm_image_smooth_set(obj, param->i);
         param_icon->smooth = param->i;
         return EINA_TRUE;
      }
    else if (!strcmp(param->name, "no scale")
             && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
      {
-        elm_icon_no_scale_set(obj, param->i);
+        elm_image_no_scale_set(obj, param->i);
         param_icon->no_scale = param->i;
         return EINA_TRUE;
      }
    else if (!strcmp(param->name, "scale up")
             && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
      {
-        elm_icon_resizable_set(obj, param->i, param_icon->scale_down);
+        elm_image_resizable_set(obj, param->i, param_icon->scale_down);
         param_icon->scale_up = param->i;
         return EINA_TRUE;
      }
    else if (!strcmp(param->name, "scale down")
             && param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
      {
-        elm_icon_resizable_set(obj, param_icon->scale_up, param->i);
+        elm_image_resizable_set(obj, param_icon->scale_up, param->i);
         param_icon->scale_down = param->i;
         return EINA_TRUE;
      }
@@ -142,7 +142,7 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
    else if (!strcmp(param->name, "prescale")
             && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
      {
-        elm_icon_prescale_set(obj, param->i);
+        elm_image_prescale_set(obj, param->i);
         param_icon->prescale_size = param->i;
         return EINA_TRUE;
      }
@@ -153,7 +153,7 @@ external_icon_param_set(void *data __UNUSED__, Evas_Object *obj,
              edje = evas_object_smart_parent_get(obj);
              edje_object_file_get(edje, &file, NULL);
 
-             if (!elm_icon_file_set(obj, file, param->s))
+             if (!elm_image_file_set(obj, file, param->s))
                elm_icon_standard_set(obj, param->s);
              return EINA_TRUE;
           }

diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 136697c..cc6c3aa 100644 (file)
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -191,9 +191,9 @@ _activate(Evas_Object *obj)
         if (item->icon_file)
           {
              ic = elm_icon_add(obj);
-             elm_icon_resizable_set(ic, EINA_FALSE, EINA_TRUE);
+             elm_image_resizable_set(ic, EINA_FALSE, EINA_TRUE);
              if (item->icon_type == ELM_ICON_FILE)
-               elm_icon_file_set(ic, item->icon_file, item->icon_group);
+               elm_image_file_set(ic, item->icon_file, item->icon_group);
              else if (item->icon_type == ELM_ICON_STANDARD)
                elm_icon_standard_set(ic, item->icon_file);
              elm_object_part_content_set(bt, "icon", ic);

diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 64300d2..831b7e5 100644 (file)
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -1524,7 +1524,7 @@ elm_drag_start(Evas_Object *obj, Elm_Sel_Format format, const char *data, void (
 
    /* FIXME: Images only */
    icon = elm_icon_add(dragwin);
-   elm_icon_file_set(icon, data + 7, NULL); /* 7!? "file://" */
+   elm_image_file_set(icon, data + 7, NULL); /* 7!? "file://" */
    elm_win_resize_object_add(dragwin, icon);
    evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);

diff --git a/src/lib/elm_icon.c b/src/lib/elm_icon.c
index 043111a..012bb8d 100644 (file)
--- a/src/lib/elm_icon.c
+++ b/src/lib/elm_icon.c
@@ -380,7 +380,7 @@ _icon_freedesktop_set(Evas_Object * obj __UNUSED__,
    if (sd->freedesktop.use)
      {
         sd->freedesktop.requested_size = size;
-        elm_icon_file_set(obj, path, NULL);
+        elm_image_file_set(obj, path, NULL);
         return EINA_TRUE;
      }
 #endif
@@ -556,7 +556,7 @@ _icon_file_set(Elm_Icon_Smart_Data * sd __UNUSED__,
                const char *path)
 #endif
 {
-   if (elm_icon_file_set(obj, path, NULL))
+   if (elm_image_file_set(obj, path, NULL))
      {
 #ifdef ELM_EFREET
         /* TODO: elm_unneed_efreet() */

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 4ecc632..1892882 100644 (file)
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1436,18 +1436,18 @@ _icon_dup(const Evas_Object *icon, Evas_Object *parent)
    Evas_Object *dupp;
 
    dupp = elm_icon_add(parent);
-   elm_icon_file_get(icon, &file, &group);
-   elm_icon_file_set(dupp, file, group);
-   elm_icon_animated_set(dupp, elm_icon_animated_get(icon));
-   elm_icon_animated_play_set(dupp, elm_icon_animated_play_get(icon));
+   elm_image_file_get(icon, &file, &group);
+   elm_image_file_set(dupp, file, group);
+   elm_image_animated_set(dupp, elm_image_animated_get(icon));
+   elm_image_animated_play_set(dupp, elm_image_animated_play_get(icon));
    elm_icon_standard_set(dupp, elm_icon_standard_get(icon));
    elm_icon_order_lookup_set(dupp, elm_icon_order_lookup_get(icon));
-   elm_icon_no_scale_set(dupp, elm_icon_no_scale_get(icon));
-   elm_icon_resizable_get(icon, &size_up, &size_down);
-   elm_icon_resizable_set(dupp, size_up, size_down);
-   elm_icon_fill_outside_set(dupp, elm_icon_fill_outside_get(icon));
-   elm_icon_prescale_set(dupp, elm_icon_prescale_get(icon));
-   elm_icon_aspect_fixed_set(dupp, elm_icon_aspect_fixed_get(icon));
+   elm_image_no_scale_set(dupp, elm_image_no_scale_get(icon));
+   elm_image_resizable_get(icon, &size_up, &size_down);
+   elm_image_resizable_set(dupp, size_up, size_down);
+   elm_icon_fill_outside_set(dupp, elm_image_fill_outside_get(icon));
+   elm_image_prescale_set(dupp, elm_image_prescale_get(icon));
+   elm_image_aspect_fixed_set(dupp, elm_image_aspect_fixed_get(icon));
    return dupp;
 }
 

diff --git a/src/lib/elm_photo.c b/src/lib/elm_photo.c
index 535cf5d..86ea28c 100644 (file)
--- a/src/lib/elm_photo.c
+++ b/src/lib/elm_photo.c
@@ -125,7 +125,7 @@ _icon_move_resize_cb(void *data,
    if (sd->fill_inside)
      {
         Edje_Message_Int_Set *msg;
-        Evas_Object *img = elm_icon_object_get(sd->icon);
+        Evas_Object *img = elm_image_object_get(sd->icon);
 
         evas_object_geometry_get(img, NULL, NULL, &w, &h);
         msg = alloca(sizeof(Edje_Message_Int_Set) + (sizeof(int)));
@@ -193,7 +193,7 @@ _long_press_cb(void *obj)
    evas_object_event_callback_del
      (sd->icon, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move);
 
-   img = elm_icon_object_get(sd->icon);
+   img = elm_image_object_get(sd->icon);
    file = NULL;
    evas_object_image_file_get(img, &file, NULL);
    if (file)
@@ -251,7 +251,7 @@ _icon_size_min_get(Evas_Object *icon)
 {
    int size;
 
-   elm_icon_size_get(icon, &size, NULL);
+   elm_image_object_size_get(icon, &size, NULL);
 
    return (size < 32) ? 32 : size;
 }
@@ -263,7 +263,7 @@ _elm_photo_internal_image_follow(Evas_Object *obj)
 
    ELM_PHOTO_DATA_GET(obj, sd);
 
-   img = elm_icon_object_get(sd->icon);
+   img = elm_image_object_get(sd->icon);
 
    evas_object_event_callback_add
      (img, EVAS_CALLBACK_MOVE, _icon_move_resize_cb, obj);
@@ -291,10 +291,10 @@ _elm_photo_smart_add(Evas_Object *obj)
    priv->icon = elm_icon_add(obj);
    evas_object_repeat_events_set(priv->icon, EINA_TRUE);
 
-   elm_icon_resizable_set(priv->icon, EINA_TRUE, EINA_TRUE);
-   elm_icon_smooth_set(priv->icon, EINA_TRUE);
+   elm_image_resizable_set(priv->icon, EINA_TRUE, EINA_TRUE);
+   elm_image_smooth_set(priv->icon, EINA_TRUE);
    elm_icon_fill_outside_set(priv->icon, !priv->fill_inside);
-   elm_icon_prescale_set(priv->icon, 0);
+   elm_image_prescale_set(priv->icon, 0);
 
    elm_object_scale_set(priv->icon, elm_widget_scale_get(obj));
 
@@ -371,7 +371,7 @@ elm_photo_file_set(Evas_Object *obj,
    ELM_PHOTO_CHECK(obj) EINA_FALSE;
    ELM_PHOTO_DATA_GET(obj, sd);
 
-   if (!elm_icon_file_set(sd->icon, file, NULL))
+   if (!elm_image_file_set(sd->icon, file, NULL))
      return EINA_FALSE;
 
    _sizing_eval(obj);
@@ -444,7 +444,7 @@ elm_photo_aspect_fixed_set(Evas_Object *obj,
    ELM_PHOTO_CHECK(obj);
    ELM_PHOTO_DATA_GET(obj, sd);
 
-   return elm_icon_aspect_fixed_set(sd->icon, fixed);
+   return elm_image_aspect_fixed_set(sd->icon, fixed);
 }
 
 EAPI Eina_Bool
@@ -453,5 +453,5 @@ elm_photo_aspect_fixed_get(const Evas_Object *obj)
    ELM_PHOTO_CHECK(obj) EINA_FALSE;
    ELM_PHOTO_DATA_GET(obj, sd);
 
-   return elm_icon_aspect_fixed_get(sd->icon);
+   return elm_image_aspect_fixed_get(sd->icon);
 }

diff --git a/src/lib/elm_store.c b/src/lib/elm_store.c
index 92303cd..ea4b48e 100644 (file)
--- a/src/lib/elm_store.c
+++ b/src/lib/elm_store.c
@@ -329,9 +329,9 @@ _store_item_content_get(void *data, Evas_Object *obj, const char *part)
                                                     EVAS_ASPECT_CONTROL_VERTICAL,
                                                     m->details.icon.w,
                                                     m->details.icon.h);
-                   elm_icon_smooth_set(ic, m->details.icon.smooth);
-                   elm_icon_no_scale_set(ic, m->details.icon.no_scale);
-                   elm_icon_resizable_set(ic,
+                   elm_image_smooth_set(ic, m->details.icon.smooth);
+                   elm_image_no_scale_set(ic, m->details.icon.no_scale);
+                   elm_image_resizable_set(ic,
                                       m->details.icon.scale_up,
                                       m->details.icon.scale_down);
                    if (s)
@@ -339,7 +339,7 @@ _store_item_content_get(void *data, Evas_Object *obj, const char *part)
                         if (m->details.icon.standard_name)
                           elm_icon_standard_set(ic, s);
                         else
-                          elm_icon_file_set(ic, s, NULL);
+                          elm_image_file_set(ic, s, NULL);
                      }
                    break;
                 case ELM_STORE_ITEM_MAPPING_PHOTO:

diff --git a/src/lib/elm_theme.c b/src/lib/elm_theme.c
index f818a69..e397279 100644 (file)
--- a/src/lib/elm_theme.c
+++ b/src/lib/elm_theme.c
@@ -296,8 +296,8 @@ _elm_theme_icon_set(Elm_Theme *th,
    file = _elm_theme_group_file_find(th, buf2);
    if (file)
      {
-        elm_icon_file_set(o, file, buf2);
-        elm_icon_size_get(o, &w, &h);
+        elm_image_file_set(o, file, buf2);
+        elm_image_object_size_get(o, &w, &h);
         if (w > 0) return EINA_TRUE;
      }
    snprintf(buf2, sizeof(buf2), "elm/icon/%s/default", group);
@@ -305,8 +305,8 @@ _elm_theme_icon_set(Elm_Theme *th,
 
    if (!file) return EINA_FALSE;
 
-   elm_icon_file_set(o, file, buf2);
-   elm_icon_size_get(o, &w, &h);
+   elm_image_file_set(o, file, buf2);
+   elm_image_object_size_get(o, &w, &h);
 
    return w > 0;
 }

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index d5afdfc..0d84c44 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1749,7 +1749,7 @@ elm_toolbar_item_icon_memfile_set(Elm_Object_Item *it, const void *img, size_t s
      {
         icon_obj = elm_icon_add(obj);
         evas_object_repeat_events_set(icon_obj, EINA_TRUE);
-        ret = elm_icon_memfile_set(icon_obj, img, size, format, key);
+        ret = elm_image_memfile_set(icon_obj, img, size, format, key);
         if (!ret)
           {
              evas_object_del(icon_obj);
@@ -1782,7 +1782,7 @@ elm_toolbar_item_icon_file_set(Elm_Object_Item *it, const char *file, const char
      {
         icon_obj = elm_icon_add(obj);
         evas_object_repeat_events_set(icon_obj, EINA_TRUE);
-        ret = elm_icon_file_set(icon_obj, file, key);
+        ret = elm_image_file_set(icon_obj, file, key);
         if (!ret)
           {
              evas_object_del(icon_obj);

diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c
index 70c7d83..4bd74c0 100644 (file)
--- a/src/lib/elm_transit.c
+++ b/src/lib/elm_transit.c
@@ -2321,7 +2321,7 @@ _transit_effect_image_animation_op(Elm_Transit_Effect *effect, Elm_Transit *tran
    EINA_LIST_FOREACH(transit->objs, elist, obj)
      {
         if (elm_widget_type_check(obj, type, __func__))
-          elm_icon_file_set(obj,
+          elm_image_file_set(obj,
                             eina_list_nth(image_animation->images, count), NULL);
      }