Fix conflicts: Map, Hover, Hoversel, Menu, Web

[framework/uifw/elementary.git] / src / examples / web_example.c

diff --git a/src/examples/web_example.c b/src/examples/web_example.c
index a98705b..6aa6a2a 100644 (file)
--- a/src/examples/web_example.c
+++ b/src/examples/web_example.c
@@ -17,7 +17,7 @@ typedef struct
 {
    Evas_Object *win;
    Evas_Object *main_box;
-   Evas_Object *pager;
+   Evas_Object *naviframe;
    Evas_Object *url;
    Evas_Object *default_web;
    Evas_Object *tabs;
@@ -40,7 +40,7 @@ struct _Tab_Data
 {
    Evas_Object *web;
    App_Data *app;
-   Elm_Toolbar_Item *tab;
+   Elm_Object_Item *tab;
 };
 
 static Evas_Object * _web_create_window_cb(void *data, Evas_Object *obj, Eina_Bool js, const Elm_Web_Window_Features *wf);
@@ -73,7 +73,7 @@ tab_current_set(Tab_Data *td)
    nav_button_update(td->app);
    elm_entry_icon_visible_set(td->app->url, EINA_TRUE);
 
-   elm_pager_content_promote(td->app->pager, td->web);
+   elm_naviframe_item_simple_promote(td->app->naviframe, td->web);
 }
 
 static void
@@ -96,7 +96,7 @@ _title_changed_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info)
 
    if (title)
      strncpy(buf, title, sizeof(buf) - 1);
-   elm_toolbar_item_label_set(td->tab, buf);
+   elm_object_item_text_set(td->tab, buf);
 }
 
 static void
@@ -118,7 +118,7 @@ _web_free_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *
    Tab_Data *td = data;
 
    if (td->tab)
-     elm_toolbar_item_del(td->tab);
+     elm_object_item_del(td->tab);
 
    free(td);
 }
@@ -151,12 +151,12 @@ tab_add(App_Data *ad)
    evas_object_size_hint_weight_set(td->web, EVAS_HINT_EXPAND,
                                     EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(td->web, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_pager_content_push(ad->pager, td->web);
+   elm_naviframe_item_simple_push(ad->naviframe, td->web);
 
    td->app = ad;
    td->tab = elm_toolbar_item_append(td->app->tabs, NULL, "New tab",
                                      _tab_clicked_cb, td);
-   elm_toolbar_item_del_cb_set(td->tab, _tb_item_del_cb);
+   elm_object_item_del_cb_set(td->tab, _tb_item_del_cb);
 
    evas_object_data_set(td->web, "tab_data", td);
 
@@ -397,7 +397,7 @@ _win_search_trigger_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
 
    box2 = elm_box_add(ad->win);
    elm_box_horizontal_set(box2, EINA_TRUE);
-   elm_entry_end_set(entry, box2);
+   elm_object_part_content_set(entry, "end", box2);
 
    btn = elm_button_add(ad->win);
    elm_box_pack_end(box2, btn);
@@ -463,7 +463,7 @@ default_content_set(Evas_Object *web)
 int
 elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
 {
-   Evas_Object *win, *bg, *box, *box2, *btn, *ic, *url, *pager, *tabs, *web;
+   Evas_Object *win, *bg, *box, *box2, *btn, *ic, *url, *naviframe, *tabs, *web;
    Evas *e;
    Evas_Modifier_Mask ctrl_mask;
    App_Data *ad;
@@ -512,7 +512,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
 
    box2 = elm_box_add(win);
    elm_box_horizontal_set(box2, EINA_TRUE);
-   elm_entry_icon_set(url, box2);
+   elm_object_part_content_set(url, "icon", box2);
    elm_entry_icon_visible_set(url, EINA_FALSE);
 
    btn = elm_button_add(win);
@@ -570,9 +570,9 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
 
    tabs = elm_toolbar_add(win);
    elm_toolbar_align_set(tabs, 0.0);
-   elm_toolbar_always_select_mode_set(tabs, EINA_TRUE);
+   elm_toolbar_select_mode_set(tabs, ELM_OBJECT_SELECT_MODE_ALWAYS);
    elm_toolbar_homogeneous_set(tabs, EINA_FALSE);
-   elm_toolbar_mode_shrink_set(tabs, ELM_TOOLBAR_SHRINK_MENU);
+   elm_toolbar_shrink_mode_set(tabs, ELM_TOOLBAR_SHRINK_MENU);
    evas_object_size_hint_weight_set(tabs, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(tabs, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(box2, tabs);
@@ -588,26 +588,26 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
    elm_icon_standard_set(ic, "close");
    elm_object_part_content_set(btn, "icon", ic);
 
-   pager = elm_pager_add(win);
-   evas_object_size_hint_weight_set(pager, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(pager, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_box_pack_end(box, pager);
-   evas_object_show(pager);
+   naviframe = elm_naviframe_add(win);
+   evas_object_size_hint_weight_set(naviframe, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(naviframe, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(box, naviframe);
+   evas_object_show(naviframe);
 
-   elm_toolbar_menu_parent_set(tabs, pager);
+   elm_toolbar_menu_parent_set(tabs, naviframe);
 
    web = elm_web_add(win);
    elm_web_window_create_hook_set(web, _web_create_window_cb, ad);
-   elm_web_history_enable_set(web, EINA_FALSE);
+   elm_web_history_enabled_set(web, EINA_FALSE);
    evas_object_size_hint_weight_set(web, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(web, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_pager_content_push(pager, web);
+   elm_naviframe_item_simple_push(naviframe, web);
 
    default_content_set(web);
 
    ad->win = win;
    ad->main_box = box;
-   ad->pager = pager;
+   ad->naviframe = naviframe;
    ad->url = url;
    ad->default_web = web;
    ad->tabs = tabs;