From: Woochan Lee Date: Thu, 30 Jun 2016 11:09:26 +0000 (+0900) Subject: Coding Rule: 5. C API naming. X-Git-Tag: submit/tizen/20160707.233627~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=703089019e5f44c96943f9984d7b521d3b343994;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git Coding Rule: 5. C API naming. Change-Id: Ia4d047695bbc83b67399147339dcab0f9d29f8ae --- diff --git a/src/examples/efl/c/page1.cpp b/src/examples/efl/c/page1.cpp index 15c0680..4302e7f 100644 --- a/src/examples/efl/c/page1.cpp +++ b/src/examples/efl/c/page1.cpp @@ -37,7 +37,7 @@ view1_load_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -48,7 +48,7 @@ view1_load_cb(ui_standard_view *view, void *data) content = create_content(base, "ViewMgr Demo
Basic View", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - if (!ui_standard_view_content_set(view, content, "Page1", NULL, NULL, NULL)) + if (!ui_standard_view_set_content(view, content, "Page1", NULL, NULL, NULL)) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); return false; @@ -74,12 +74,12 @@ create_page1() //Set View Life-Cycle callbacks. lifecycle_callback.load = view1_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set() is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page10.cpp b/src/examples/efl/c/page10.cpp index e092a1b..110d3f6 100644 --- a/src/examples/efl/c/page10.cpp +++ b/src/examples/efl/c/page10.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -36,7 +36,7 @@ view10_rotate_cb(ui_standard_view *view, int degree, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -50,15 +50,15 @@ view10_rotate_cb(ui_standard_view *view, int degree, void *data) //Portrait content = create_content(base, "ViewMgr Demo
Rotation", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - ui_view_indicator_set(view, UI_VIEW_INDICATOR_DEFAULT); + ui_view_set_indicator(view, UI_VIEW_INDICATOR_DEFAULT); } else { //Landscape content = create_landscape_content(base, "ViewMgr Demo
Rotation", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - ui_view_indicator_set(view, UI_VIEW_INDICATOR_OPTIMAL); + ui_view_set_indicator(view, UI_VIEW_INDICATOR_OPTIMAL); } - ui_standard_view_content_set(view, content, "Page10", NULL, NULL, NULL); + ui_standard_view_set_content(view, content, "Page10", NULL, NULL, NULL); return true; } @@ -66,7 +66,7 @@ view10_rotate_cb(ui_standard_view *view, int degree, void *data) static bool view10_load_cb(ui_standard_view *view, void *data) { - return view10_rotate_cb(view, ui_view_degree_get(view), data); + return view10_rotate_cb(view, ui_view_get_degree(view), data); } void @@ -87,7 +87,7 @@ create_page10() //Set View Life-Cycle callbacks. lifecycle_callback.load = view10_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); @@ -96,10 +96,10 @@ create_page10() //Set Rotation Event callbacks. event_callback.rotate = view10_rotate_cb; - if (!(ret = ui_view_event_callbacks_set(view, &event_callback, NULL))) + if (!(ret = ui_view_set_event_callbacks(view, &event_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_event_callback_set is failed. err = %d", ret); } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page11.cpp b/src/examples/efl/c/page11.cpp index 968c8f9..345c9b3 100644 --- a/src/examples/efl/c/page11.cpp +++ b/src/examples/efl/c/page11.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -36,7 +36,7 @@ view11_load_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -47,7 +47,7 @@ view11_load_cb(ui_standard_view *view, void *data) content = create_content(base, "ViewMgr Demo
Menu Popup", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - if (!ui_standard_view_content_set(view, content, "Page11", NULL, NULL, NULL)) + if (!ui_standard_view_set_content(view, content, "Page11", NULL, NULL, NULL)) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); return false; @@ -71,7 +71,7 @@ view11_menu_cb(ui_menu *menu, void *data) Elm_Ctxpopup *ctxpopup = NULL; //Get a base object from menu. - base = ui_menu_base_get(menu); + base = ui_menu_get_base(menu); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a menu base object"); @@ -96,7 +96,7 @@ view11_menu_cb(ui_menu *menu, void *data) elm_ctxpopup_item_append(ctxpopup, "Search", NULL, ctxpopup_item_select_cb, NULL); elm_ctxpopup_item_append(ctxpopup, "Dialer", NULL, ctxpopup_item_select_cb, NULL); - ui_menu_content_set(menu, ctxpopup); + ui_menu_set_content(menu, ctxpopup); return true; } @@ -119,7 +119,7 @@ create_page11() //Set View Life-Cycle callbacks. lifecycle_callback.load = view11_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); @@ -128,10 +128,10 @@ create_page11() //Set Menu Event callbacks. event_callback.menu = view11_menu_cb; - if (!(ret = ui_view_event_callbacks_set(view, &event_callback, NULL))) + if (!(ret = ui_view_set_event_callbacks(view, &event_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_event_callback_set is failed. err = %d", ret); } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page12.cpp b/src/examples/efl/c/page12.cpp index bd41b2a..75d3509 100644 --- a/src/examples/efl/c/page12.cpp +++ b/src/examples/efl/c/page12.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -69,7 +69,7 @@ view12_btn_clicked(void *data, Evas_Object *obj, void *event_info) } //Get a base object from popup. - base = ui_popup_base_get(popup); + base = ui_popup_get_base(popup); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -89,7 +89,7 @@ view12_btn_clicked(void *data, Evas_Object *obj, void *event_info) evas_object_smart_callback_add(content, "timeout", popup_timeout_cb, NULL); //Set elm popup as a ui_popup content. - ui_popup_content_set(popup, content); + ui_popup_set_content(popup, content); ui_popup_activate(popup); } @@ -101,7 +101,7 @@ view12_load_cb(ui_standard_view *view, void *data) Elm_Button *right_btn = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -112,14 +112,14 @@ view12_load_cb(ui_standard_view *view, void *data) content = create_content(base, "ViewMgr Demo
Popup", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - ui_standard_view_content_set(view, content, "Page12", NULL, NULL, NULL); + ui_standard_view_set_content(view, content, "Page12", NULL, NULL, NULL); //Title Right button right_btn = elm_button_add(base); elm_object_text_set(right_btn, "popup"); evas_object_smart_callback_add(right_btn, "clicked", view12_btn_clicked, view); - ui_standard_view_title_right_btn_set(view, right_btn); + ui_standard_view_set_title_right_btn(view, right_btn); return true; } @@ -141,12 +141,12 @@ create_page12() //Set View Life-Cycle callbacks. lifecycle_callback.load = view12_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page13.cpp b/src/examples/efl/c/page13.cpp index 583ff38..c3074ac 100644 --- a/src/examples/efl/c/page13.cpp +++ b/src/examples/efl/c/page13.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -36,7 +36,7 @@ view13_load_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -47,7 +47,7 @@ view13_load_cb(ui_standard_view *view, void *data) content = create_content(base, "ViewMgr Demo
Fade Transition", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - ui_standard_view_content_set(view, content, "Page13", NULL, NULL, NULL); + ui_standard_view_set_content(view, content, "Page13", NULL, NULL, NULL); return true; } @@ -68,16 +68,16 @@ create_page13() } //Set Fade Transition Effect. - ui_view_transition_style_set(view, "fade"); + ui_view_set_transition_style(view, "fade"); //Set View Life-Cycle callbacks. lifecycle_callback.load = view13_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page14.cpp b/src/examples/efl/c/page14.cpp index 9dc68ca..4d28748 100644 --- a/src/examples/efl/c/page14.cpp +++ b/src/examples/efl/c/page14.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -36,7 +36,7 @@ view14_load_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -47,7 +47,7 @@ view14_load_cb(ui_standard_view *view, void *data) content = create_content(base, "ViewMgr Demo
None Transition", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - ui_standard_view_content_set(view, content, "Page14", NULL, NULL, NULL); + ui_standard_view_set_content(view, content, "Page14", NULL, NULL, NULL); return true; } @@ -68,16 +68,16 @@ create_page14() } //Turn off Transition Effect. - ui_view_transition_style_set(view, "none"); + ui_view_set_transition_style(view, "none"); //Set View Life-Cycle callbacks. lifecycle_callback.load = view14_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page15.cpp b/src/examples/efl/c/page15.cpp index 59a6f6d..7fa1748 100644 --- a/src/examples/efl/c/page15.cpp +++ b/src/examples/efl/c/page15.cpp @@ -30,7 +30,7 @@ view15_load_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -41,14 +41,14 @@ view15_load_cb(ui_standard_view *view, void *data) content = create_scrolling_content(base); if (!content) return false; - ui_standard_view_content_set(view, content, "Page 15 Scroller In Viewmgr", NULL, NULL, NULL); + ui_standard_view_set_content(view, content, "Page 15 Scroller In Viewmgr", NULL, NULL, NULL); //Title Right button Elm_Button *right_btn = elm_button_add(base); elm_object_text_set(right_btn, "Next"); evas_object_smart_callback_add(right_btn, "clicked", view15_btn_clicked_cb, NULL); - ui_standard_view_title_right_btn_set(view, right_btn); + ui_standard_view_set_title_right_btn(view, right_btn); return true; } @@ -69,13 +69,13 @@ create_page15() //Set View Life-Cycle callbacks. lifecycle_callback.load = view15_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page16.cpp b/src/examples/efl/c/page16.cpp index 9651b2a..2186d93 100644 --- a/src/examples/efl/c/page16.cpp +++ b/src/examples/efl/c/page16.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -33,28 +33,28 @@ static void title_show_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { ui_standard_view *view = (ui_standard_view *) data; - ui_standard_view_title_visible_set(view, true, false); + ui_standard_view_set_title_visible(view, true, false); } static void title_hide_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { ui_standard_view *view = (ui_standard_view *) data; - ui_standard_view_title_visible_set(view, false, false); + ui_standard_view_set_title_visible(view, false, false); } static void title_show_anim_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { ui_standard_view *view = (ui_standard_view *) data; - ui_standard_view_title_visible_set(view, true, true); + ui_standard_view_set_title_visible(view, true, true); } static void title_hide_anim_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { ui_standard_view *view = (ui_standard_view *) data; - ui_standard_view_title_visible_set(view, false, true); + ui_standard_view_set_title_visible(view, false, true); } static bool @@ -64,7 +64,7 @@ view16_load_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -75,7 +75,7 @@ view16_load_cb(ui_standard_view *view, void *data) content = create_title_handle_content(base, prev_btn_clicked_cb, next_btn_clicked_cb, title_show_btn_clicked_cb, title_hide_btn_clicked_cb, title_show_anim_btn_clicked_cb, title_hide_anim_btn_clicked_cb, view); if (!content) return false; - ui_standard_view_content_set(view, content, "Page16", NULL, NULL, NULL); + ui_standard_view_set_content(view, content, "Page16", NULL, NULL, NULL); return true; } @@ -97,12 +97,12 @@ create_page16() //Set View Life-Cycle callbacks. lifecycle_callback.load = view16_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page2.cpp b/src/examples/efl/c/page2.cpp index 7de98e3..1dbc0d2 100644 --- a/src/examples/efl/c/page2.cpp +++ b/src/examples/efl/c/page2.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -36,7 +36,7 @@ view2_load_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -55,7 +55,7 @@ view2_load_cb(ui_standard_view *view, void *data) Elm_Button *right_title_btn = elm_button_add(base); elm_object_text_set(right_title_btn, "Done"); - if (!ui_standard_view_content_set(view, content, "Page2", NULL, left_title_btn, right_title_btn)) + if (!ui_standard_view_set_content(view, content, "Page2", NULL, left_title_btn, right_title_btn)) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); return false; @@ -81,12 +81,12 @@ create_page2() //Set View Life-Cycle callbacks. lifecycle_callback.load = view2_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set() is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page3.cpp b/src/examples/efl/c/page3.cpp index b3898e6..d62dd4e 100644 --- a/src/examples/efl/c/page3.cpp +++ b/src/examples/efl/c/page3.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -36,7 +36,7 @@ view3_load_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -47,7 +47,7 @@ view3_load_cb(ui_standard_view *view, void *data) content = create_content(base, "ViewMgr Demo
Subtitle", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - if (!ui_standard_view_content_set(view, content, "Page3", "Subtitle", NULL, NULL)) + if (!ui_standard_view_set_content(view, content, "Page3", "Subtitle", NULL, NULL)) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); return false; @@ -73,12 +73,12 @@ create_page3() //Set View Life-Cycle callbacks. lifecycle_callback.load = view3_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page4.cpp b/src/examples/efl/c/page4.cpp index 89b23fa..660ffc9 100644 --- a/src/examples/efl/c/page4.cpp +++ b/src/examples/efl/c/page4.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -36,7 +36,7 @@ view4_load_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -47,13 +47,13 @@ view4_load_cb(ui_standard_view *view, void *data) content = create_content(base, "ViewMgr Demo
Title Badge", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - if (!ui_standard_view_content_set(view, content, "Page4 We put a long title here intentionally", NULL, NULL, NULL)) + if (!ui_standard_view_set_content(view, content, "Page4 We put a long title here intentionally", NULL, NULL, NULL)) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); return false; } - ui_standard_view_title_badge_set(view, "999+"); + ui_standard_view_set_title_badge(view, "999+"); return true; } @@ -75,12 +75,12 @@ create_page4() //Set View Life-Cycle callbacks. lifecycle_callback.load = view4_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page5.cpp b/src/examples/efl/c/page5.cpp index caffd36..bac11a9 100644 --- a/src/examples/efl/c/page5.cpp +++ b/src/examples/efl/c/page5.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -36,7 +36,7 @@ view5_load_cb(ui_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -47,12 +47,12 @@ view5_load_cb(ui_view *view, void *data) content = create_content(base, "ViewMgr Demo
Full View", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - if (!ui_view_content_set(view, content)) + if (!ui_view_set_content(view, content)) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); return false; } - ui_view_indicator_set(view, UI_VIEW_INDICATOR_HIDE); + ui_view_set_indicator(view, UI_VIEW_INDICATOR_HIDE); return true; } @@ -74,12 +74,12 @@ create_page5() //Set View Life-Cycle callbacks. lifecycle_callback.load = view5_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page6.cpp b/src/examples/efl/c/page6.cpp index 6d6b7fc..a527636 100644 --- a/src/examples/efl/c/page6.cpp +++ b/src/examples/efl/c/page6.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -36,7 +36,7 @@ view6_load_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -47,14 +47,14 @@ view6_load_cb(ui_standard_view *view, void *data) content = create_content(base, "ViewMgr Demo
Toolbar", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - if (!ui_standard_view_content_set(view, content, "Page6", NULL, NULL, NULL)) + if (!ui_standard_view_set_content(view, content, "Page6", NULL, NULL, NULL)) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); return false; } Elm_Toolbar *toolbar = create_toolbar(base, "toolbar_with_title"); - if (toolbar) ui_standard_view_toolbar_set(view, toolbar); + if (toolbar) ui_standard_view_set_toolbar(view, toolbar); return true; } @@ -76,12 +76,12 @@ create_page6() //Set View Life-Cycle callbacks. lifecycle_callback.load = view6_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page7.cpp b/src/examples/efl/c/page7.cpp index c26f780..7072d38 100644 --- a/src/examples/efl/c/page7.cpp +++ b/src/examples/efl/c/page7.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -36,7 +36,7 @@ view7_load_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -47,14 +47,14 @@ view7_load_cb(ui_standard_view *view, void *data) content = create_content(base, "ViewMgr Demo
Navigationbar", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - if (!ui_standard_view_content_set(view, content, "Page7", NULL, NULL, NULL)) + if (!ui_standard_view_set_content(view, content, "Page7", NULL, NULL, NULL)) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); return false; } Elm_Toolbar *toolbar = create_toolbar(base, "navigationbar"); - if (toolbar) ui_standard_view_toolbar_set(view, toolbar); + if (toolbar) ui_standard_view_set_toolbar(view, toolbar); return true; } @@ -76,12 +76,12 @@ create_page7() //Set View Life-Cycle callbacks. lifecycle_callback.load = view7_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); return; } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page8.cpp b/src/examples/efl/c/page8.cpp index f17ec52..4f0d351 100644 --- a/src/examples/efl/c/page8.cpp +++ b/src/examples/efl/c/page8.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -45,7 +45,7 @@ create_page8() } //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -61,7 +61,7 @@ create_page8() return; } - if (!ui_standard_view_content_set(view, content, "Page8", NULL, NULL, NULL)) + if (!ui_standard_view_set_content(view, content, "Page8", NULL, NULL, NULL)) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); ui_view_destroy(view); @@ -70,8 +70,8 @@ create_page8() //Don't delete view's content when this view popped. //This is a show case for saving this content for reuse later. - ui_view_removable_content_set(view, false); + ui_view_set_removable_content(view, false); - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/examples/efl/c/page9.cpp b/src/examples/efl/c/page9.cpp index 39c231a..34386f1 100644 --- a/src/examples/efl/c/page9.cpp +++ b/src/examples/efl/c/page9.cpp @@ -20,7 +20,7 @@ static void prev_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info) { - UI_VIEWMGR_VIEW_POP(); + UI_VIEWMGR_POP_VIEW(); } static void @@ -36,7 +36,7 @@ view9_portrait_cb(ui_standard_view *view, void *data) Evas_Object *base = NULL; //Get a base object from view. - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -47,13 +47,13 @@ view9_portrait_cb(ui_standard_view *view, void *data) content = create_content(base, "ViewMgr Demo
Portrait/Landscape", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - if (!ui_standard_view_content_set(view, content, "Page9", NULL, NULL, NULL)) + if (!ui_standard_view_set_content(view, content, "Page9", NULL, NULL, NULL)) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); return false; } - ui_view_indicator_set(view, UI_VIEW_INDICATOR_DEFAULT); + ui_view_set_indicator(view, UI_VIEW_INDICATOR_DEFAULT); return true; } @@ -64,7 +64,7 @@ view9_landscape_cb(ui_standard_view *view, void *data) Evas_Object *content = NULL; Evas_Object *base = NULL; - base = ui_view_base_get(view); + base = ui_view_get_base(view); if (!base) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to get a view base object"); @@ -74,13 +74,13 @@ view9_landscape_cb(ui_standard_view *view, void *data) content = create_landscape_content(base, "ViewMgr Demo
Portrait/Landscape", prev_btn_clicked_cb, next_btn_clicked_cb); if (!content) return false; - if (!ui_standard_view_content_set(view, content, "Page9", NULL, NULL, NULL)) + if (!ui_standard_view_set_content(view, content, "Page9", NULL, NULL, NULL)) { dlog_print(DLOG_ERROR, LOG_TAG, "failed to set view content"); return false; } - ui_view_indicator_set(view, UI_VIEW_INDICATOR_OPTIMAL); + ui_view_set_indicator(view, UI_VIEW_INDICATOR_OPTIMAL); return true; } @@ -89,7 +89,7 @@ static bool view9_load_cb(ui_standard_view *view, void *data) { //FIXME: Change below code to more convenient and clear way. - if (ui_view_degree_get(view) == 90 || ui_view_degree_get(view) == 270) + if (ui_view_get_degree(view) == 90 || ui_view_get_degree(view) == 270) { return view9_landscape_cb(view, data); } else { @@ -115,7 +115,7 @@ create_page9() //Set View Life-Cycle callbacks. lifecycle_callback.load = view9_load_cb; - if (!(ret = ui_view_lifecycle_callbacks_set(view, &lifecycle_callback, NULL))) + if (!(ret = ui_view_set_lifecycle_callbacks(view, &lifecycle_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_lifecycle_callback_set is failed. err = %d", ret); ui_view_destroy(view); @@ -125,10 +125,10 @@ create_page9() //Set Portrait/Landscape Event callbacks. event_callback.portrait = view9_portrait_cb; event_callback.landscape = view9_landscape_cb; - if (!(ret = ui_view_event_callbacks_set(view, &event_callback, NULL))) + if (!(ret = ui_view_set_event_callbacks(view, &event_callback, NULL))) { dlog_print(DLOG_ERROR, LOG_TAG, "ui_view_event_callback_set is failed. err = %d", ret); } - UI_VIEWMGR_VIEW_PUSH(view); + UI_VIEWMGR_PUSH_VIEW(view); } diff --git a/src/include/efl/mobile/c/ui_menu.h b/src/include/efl/mobile/c/ui_menu.h index 2ff1a52..0f97ef0 100644 --- a/src/include/efl/mobile/c/ui_menu.h +++ b/src/include/efl/mobile/c/ui_menu.h @@ -22,7 +22,7 @@ extern "C" { * * @see ui_menu_content_get() */ -EAPI bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup); +EAPI bool ui_menu_set_content(ui_menu *menu, Elm_Ctxpopup *ctxpopup); /** * @brief Return an ui_menu content. @@ -33,7 +33,7 @@ EAPI bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup); * * @see ui_menu_content_set() */ -EAPI Elm_Ctxpopup *ui_menu_content_get(ui_menu *menu); +EAPI Elm_Ctxpopup *ui_menu_get_content(ui_menu *menu); /** * @brief Unset an ui_menu content. @@ -44,7 +44,7 @@ EAPI Elm_Ctxpopup *ui_menu_content_get(ui_menu *menu); * * @see ui_menu_content_set() */ -EAPI Elm_Ctxpopup *ui_menu_content_unset(ui_menu *menu); +EAPI Elm_Ctxpopup *ui_menu_unset_content(ui_menu *menu); /** * @brief Activate an ui_menu. @@ -82,7 +82,7 @@ EAPI bool ui_menu_deactivate(ui_menu *menu); * @see ui_menu_activate() * @see ui_menu_deactivate() */ -EAPI bool ui_menu_activated_get(ui_menu *menu); +EAPI bool ui_menu_get_activated(ui_menu *menu); /** * @brief Get a base object of an ui_menu. @@ -93,7 +93,7 @@ EAPI bool ui_menu_activated_get(ui_menu *menu); * * @return base object of ui_menu. */ -EAPI Evas_Object *ui_menu_base_get(ui_menu *menu); +EAPI Evas_Object *ui_menu_get_base(ui_menu *menu); /** * @brief Get a current ui_menu's degree. @@ -102,7 +102,7 @@ EAPI Evas_Object *ui_menu_base_get(ui_menu *menu); * * @return Current rotation degree, -1 if it fails to get degree information. */ -EAPI int ui_menu_degree_get(ui_menu *menu); +EAPI int ui_menu_get_degree(ui_menu *menu); /** * @brief Return a view which is matched with this ui_menu. @@ -111,7 +111,7 @@ EAPI int ui_menu_degree_get(ui_menu *menu); * * @return The view which is matched with ui_menu */ -EAPI ui_view *ui_menu_view_get(ui_menu *menu); +EAPI ui_view *ui_menu_get_view(ui_menu *menu); #ifdef __cplusplus } diff --git a/src/include/efl/mobile/c/ui_popup.h b/src/include/efl/mobile/c/ui_popup.h index a19e4cc..43e4b0d 100644 --- a/src/include/efl/mobile/c/ui_popup.h +++ b/src/include/efl/mobile/c/ui_popup.h @@ -49,7 +49,7 @@ EAPI void ui_popup_destroy(ui_popup *popup); * * @see ui_popup_content_get() */ -EAPI bool ui_popup_content_set(ui_popup *popup, Elm_Popup *content); +EAPI bool ui_popup_set_content(ui_popup *popup, Elm_Popup *content); /** * @brief Return a content object of ui_popup. @@ -60,7 +60,7 @@ EAPI bool ui_popup_content_set(ui_popup *popup, Elm_Popup *content); * * @see ui_popup_content_set() */ -EAPI Elm_Popup *ui_popup_content_get(ui_popup *popup); +EAPI Elm_Popup *ui_popup_get_content(ui_popup *popup); /** * @brief Unset an ui_popup content. @@ -71,7 +71,7 @@ EAPI Elm_Popup *ui_popup_content_get(ui_popup *popup); * * @see ui_popup_content_set() */ -EAPI Elm_Popup *ui_popup_content_unset(ui_popup *popup); +EAPI Elm_Popup *ui_popup_unset_content(ui_popup *popup); /** * @brief Activate an ui_popup. @@ -109,7 +109,7 @@ EAPI bool ui_popup_deactivate(ui_popup *popup); * @see ui_popup_activate() * @see ui_popup_deactivate() */ -EAPI bool ui_popup_activated_get(ui_popup *popup); +EAPI bool ui_popup_get_activated(ui_popup *popup); /** * @brief Get a base object of an ui_popup. @@ -120,7 +120,7 @@ EAPI bool ui_popup_activated_get(ui_popup *popup); * * @return base object of ui_popup. */ -EAPI Evas_Object *ui_popup_base_get(ui_popup *popup); +EAPI Evas_Object *ui_popup_get_base(ui_popup *popup); /** * @brief Get current ui_popup's degree. @@ -129,7 +129,7 @@ EAPI Evas_Object *ui_popup_base_get(ui_popup *popup); * * @return Current rotation degree, -1 if it fails to get degree information. */ -EAPI int ui_popup_degree_get(ui_popup *popup); +EAPI int ui_popup_get_degree(ui_popup *popup); /** * @brief Return a view which is matched with the ui_popup. @@ -138,7 +138,7 @@ EAPI int ui_popup_degree_get(ui_popup *popup); * * @return The view which is matched with ui_popup. */ -EAPI ui_view *ui_popup_view_get(ui_popup *popup); +EAPI ui_view *ui_popup_get_view(ui_popup *popup); #ifdef __cplusplus } diff --git a/src/include/efl/mobile/c/ui_standard_view.h b/src/include/efl/mobile/c/ui_standard_view.h index b739280..82b77a0 100644 --- a/src/include/efl/mobile/c/ui_standard_view.h +++ b/src/include/efl/mobile/c/ui_standard_view.h @@ -38,7 +38,7 @@ EAPI ui_standard_view *ui_standard_view_create(const char *name); * * @see ui_view_content_get() */ -EAPI bool ui_standard_view_content_set(ui_standard_view *view, Evas_Object *content, const char *title, const char *subtitle, Evas_Object *title_left_btn, Evas_Object *title_right_btn); +EAPI bool ui_standard_view_set_content(ui_standard_view *view, Evas_Object *content, const char *title, const char *subtitle, Evas_Object *title_left_btn, Evas_Object *title_right_btn); /** * @brief Set a title text. @@ -50,7 +50,7 @@ EAPI bool ui_standard_view_content_set(ui_standard_view *view, Evas_Object *cont * * @ui_standard_view_title_get() */ -EAPI bool ui_standard_view_title_set(ui_standard_view *view, const char *text); +EAPI bool ui_standard_view_set_title(ui_standard_view *view, const char *text); /** * @brief Set a subtitle text. @@ -62,7 +62,7 @@ EAPI bool ui_standard_view_title_set(ui_standard_view *view, const char *text); * * @see ui_standard_view_sub_title_get() */ -EAPI bool ui_standard_view_sub_title_set(ui_standard_view *view, const char *text); +EAPI bool ui_standard_view_set_sub_title(ui_standard_view *view, const char *text); /** * @brief Set a title badge text. @@ -74,7 +74,7 @@ EAPI bool ui_standard_view_sub_title_set(ui_standard_view *view, const char *tex * * @see ui_standard_view_title_badge_get() */ -EAPI bool ui_standard_view_title_badge_set(ui_standard_view *view, const char *badge_text); +EAPI bool ui_standard_view_set_title_badge(ui_standard_view *view, const char *badge_text); /** * @brief Set a title_right_btn. @@ -86,7 +86,7 @@ EAPI bool ui_standard_view_title_badge_set(ui_standard_view *view, const char *b * * @see ui_standard_view_title_right_btn_get() */ -EAPI bool ui_standard_view_title_right_btn_set(ui_standard_view *view, Evas_Object *title_right_btn); +EAPI bool ui_standard_view_set_title_right_btn(ui_standard_view *view, Evas_Object *title_right_btn); /** * @brief Return a title right button of the view. @@ -97,7 +97,7 @@ EAPI bool ui_standard_view_title_right_btn_set(ui_standard_view *view, Evas_Obje * * @see ui_standard_view_title_right_btn_set() */ -EAPI Elm_Button *ui_standard_view_title_right_btn_get(ui_standard_view *view); +EAPI Elm_Button *ui_standard_view_get_title_right_btn(ui_standard_view *view); /** * @brief Unset a title right button of title area. @@ -105,7 +105,7 @@ EAPI Elm_Button *ui_standard_view_title_right_btn_get(ui_standard_view *view); * @param view An ui_standard_view instance. * @return A previous content. If it wasn't, return @c NULL */ -EAPI Elm_Button *ui_standard_view_title_right_btn_unset(ui_standard_view *view); +EAPI Elm_Button *ui_standard_view_unset_title_right_btn(ui_standard_view *view); /** * @brief Set a title_left_btn. @@ -117,7 +117,7 @@ EAPI Elm_Button *ui_standard_view_title_right_btn_unset(ui_standard_view *view); * * @see ui_standard_view_title_left_btn_get() */ -EAPI bool ui_standard_view_title_left_btn_set(ui_standard_view *view, Evas_Object *title_left_btn); +EAPI bool ui_standard_view_set_title_left_btn(ui_standard_view *view, Evas_Object *title_left_btn); /** * @brief Return a title left button of the view. @@ -128,7 +128,7 @@ EAPI bool ui_standard_view_title_left_btn_set(ui_standard_view *view, Evas_Objec * * @see ui_standard_view_title_left_btn_set() */ -EAPI Elm_Button *ui_standard_view_title_left_btn_get(ui_standard_view *view); +EAPI Elm_Button *ui_standard_view_get_title_left_btn(ui_standard_view *view); /** * @brief Unset a title right button of title area. @@ -137,7 +137,7 @@ EAPI Elm_Button *ui_standard_view_title_left_btn_get(ui_standard_view *view); * * @return A previous content. If it wasn't, return @c NULL. */ -EAPI Elm_Button *ui_standard_view_title_left_btn_unset(ui_standard_view *view); +EAPI Elm_Button *ui_standard_view_unset_title_left_btn(ui_standard_view *view); /** * @brief Set a toolbar below title. @@ -149,7 +149,7 @@ EAPI Elm_Button *ui_standard_view_title_left_btn_unset(ui_standard_view *view); * * @see ui_standard_view_toolbar_get() */ -EAPI bool ui_standard_view_toolbar_set(ui_standard_view *view, Elm_Toolbar *toolbar); +EAPI bool ui_standard_view_set_toolbar(ui_standard_view *view, Elm_Toolbar *toolbar); /** * @brief Return a toolbar of the view. @@ -159,7 +159,7 @@ EAPI bool ui_standard_view_toolbar_set(ui_standard_view *view, Elm_Toolbar *tool * * @see ui_standard_view_toolbar_set() */ -EAPI Elm_Toolbar *ui_standard_view_toolbar_get(ui_standard_view *view); +EAPI Elm_Toolbar *ui_standard_view_get_toolbar(ui_standard_view *view); /** * @brief Unset a toolbar. @@ -168,7 +168,7 @@ EAPI Elm_Toolbar *ui_standard_view_toolbar_get(ui_standard_view *view); * * @return A previous content. If it wasn't, return @c NULL. */ -EAPI Elm_Toolbar *ui_standard_view_toolbar_unset(ui_standard_view *view); +EAPI Elm_Toolbar *ui_standard_view_unset_toolbar(ui_standard_view *view); /** * @brief Control the title visible state. @@ -179,7 +179,7 @@ EAPI Elm_Toolbar *ui_standard_view_toolbar_unset(ui_standard_view *view); * * @return @c true if it succeeds, @c false otherwise. */ -EAPI bool ui_standard_view_title_visible_set(ui_standard_view *view, bool visible, bool anim); +EAPI bool ui_standard_view_set_title_visible(ui_standard_view *view, bool visible, bool anim); #ifdef __cplusplus } diff --git a/src/include/efl/mobile/c/ui_view.h b/src/include/efl/mobile/c/ui_view.h index 69ce29b..d26e722 100644 --- a/src/include/efl/mobile/c/ui_view.h +++ b/src/include/efl/mobile/c/ui_view.h @@ -88,7 +88,7 @@ EAPI ui_view *ui_view_create(const char *name); * * @see ui_view_content_get() */ -EAPI bool ui_view_content_set(ui_view *view, Evas_Object *content); +EAPI bool ui_view_set_content(ui_view *view, Evas_Object *content); /** * @brief Set callback functions for handling view's lifecycle events. @@ -99,7 +99,7 @@ EAPI bool ui_view_content_set(ui_view *view, Evas_Object *content); * * @return @c true if it succeeds, @c false otherwise. */ -EAPI bool ui_view_lifecycle_callbacks_set(ui_view *view, ui_view_lifecycle_callback_s *lifecycle_callback, void *data); +EAPI bool ui_view_set_lifecycle_callbacks(ui_view *view, ui_view_lifecycle_callback_s *lifecycle_callback, void *data); /** * @brief Set callback functions for handling view events. @@ -110,7 +110,7 @@ EAPI bool ui_view_lifecycle_callbacks_set(ui_view *view, ui_view_lifecycle_callb * * @return @c true if it succeeds, @c false otherwise. */ -EAPI bool ui_view_event_callbacks_set(ui_view *view, ui_view_event_callback_s *event_callback, void *data); +EAPI bool ui_view_set_event_callbacks(ui_view *view, ui_view_event_callback_s *event_callback, void *data); /** * @brief Get a base object of ui_view. @@ -121,7 +121,7 @@ EAPI bool ui_view_event_callbacks_set(ui_view *view, ui_view_event_callback_s *e * * @return The base object of ui_view. */ -EAPI Evas_Object* ui_view_base_get(ui_view *view); +EAPI Evas_Object* ui_view_get_base(ui_view *view); /** * @brief Unset a ui_view content. @@ -132,7 +132,7 @@ EAPI Evas_Object* ui_view_base_get(ui_view *view); * * @see ui_view_content_set() */ -EAPI Evas_Object *ui_view_content_unset(ui_view *view); +EAPI Evas_Object *ui_view_unset_content(ui_view *view); /** * @brief Set the indicator mode of a ui_view. @@ -142,7 +142,7 @@ EAPI Evas_Object *ui_view_content_unset(ui_view *view); * * @see ui_view_indicator_get() */ -EAPI void ui_view_indicator_set(ui_view *view, ui_view_indicator indicator); +EAPI void ui_view_set_indicator(ui_view *view, ui_view_indicator indicator); /** * @brief Return the indicator mode of this view. @@ -153,7 +153,7 @@ EAPI void ui_view_indicator_set(ui_view *view, ui_view_indicator indicator); * * @see ui_view_indicator_set() */ -EAPI ui_view_indicator ui_view_indicator_get(ui_view *view); +EAPI ui_view_indicator ui_view_get_indicator(ui_view *view); /** * @brief Set content removable. @@ -165,7 +165,7 @@ EAPI ui_view_indicator ui_view_indicator_get(ui_view *view); * * @see ui_view_removable_content_get() */ -EAPI void ui_view_removable_content_set(ui_view *view, bool remove); +EAPI void ui_view_set_removable_content(ui_view *view, bool remove); /** * @brief Return a state of removable content. @@ -176,7 +176,7 @@ EAPI void ui_view_removable_content_set(ui_view *view, bool remove); * * @see ui_view_removable_content_get() */ -EAPI bool ui_view_removable_content_get(ui_view *view); +EAPI bool ui_view_get_removable_content(ui_view *view); /** * @brief Get the current view's degree. @@ -185,7 +185,7 @@ EAPI bool ui_view_removable_content_get(ui_view *view); * * @return Current rotation degree, -1 if it fails to get degree information. */ -EAPI int ui_view_degree_get(ui_view *view); +EAPI int ui_view_get_degree(ui_view *view); /** * @brief Set transition style of a view. @@ -201,7 +201,7 @@ EAPI int ui_view_degree_get(ui_view *view); * * @see ui_view_transition_style_get() */ -EAPI bool ui_view_transition_style_set(ui_view *view, const char *style); +EAPI bool ui_view_set_transition_style(ui_view *view, const char *style); /** * @brief Return a style name of this view. @@ -212,7 +212,7 @@ EAPI bool ui_view_transition_style_set(ui_view *view, const char *style); * * @see ui_view_transition_style_set() */ -EAPI const char *ui_view_transition_style_get(ui_view *view); +EAPI const char *ui_view_get_transition_style(ui_view *view); /** * @brief Get a ui_menu instance. @@ -221,7 +221,7 @@ EAPI const char *ui_view_transition_style_get(ui_view *view); * * @return The ui_memnu that connected with given @p view. */ -EAPI const ui_menu *ui_view_menu_get(ui_view *view); +EAPI const ui_menu *ui_view_get_menu(ui_view *view); /** * @brief Return a name of this view. @@ -232,7 +232,7 @@ EAPI const ui_menu *ui_view_menu_get(ui_view *view); * * @see ui_view_name_set() */ -EAPI const char *ui_view_name_get(ui_view *view); +EAPI const char *ui_view_get_name(ui_view *view); /** * @brief Return a state of this view. @@ -241,7 +241,7 @@ EAPI const char *ui_view_name_get(ui_view *view); * * @return current state of @p view. */ -EAPI ui_view_state ui_view_state_get(ui_view *view); +EAPI ui_view_state ui_view_get_state(ui_view *view); /** * @brief Return a content of this view. @@ -252,7 +252,7 @@ EAPI ui_view_state ui_view_state_get(ui_view *view); * * @see ui_view_content_set() */ -EAPI Evas_Object *ui_view_content_get(ui_view *view); +EAPI Evas_Object *ui_view_get_content(ui_view *view); /** * @brief A destructor for an ui_view. diff --git a/src/include/efl/mobile/c/ui_viewmgr.h b/src/include/efl/mobile/c/ui_viewmgr.h index d3acc53..ab30e20 100644 --- a/src/include/efl/mobile/c/ui_viewmgr.h +++ b/src/include/efl/mobile/c/ui_viewmgr.h @@ -30,7 +30,7 @@ extern "C" { * @see ui_viewmgr_view_push_insert_after() * @see ui_viewmgr_view_pop() */ -EAPI ui_view *ui_viewmgr_view_push(ui_viewmgr *viewmgr, ui_view *view); +EAPI ui_view *ui_viewmgr_push_view(ui_viewmgr *viewmgr, ui_view *view); /** * @brief Insert a view in this given @p viewmgr view list. Specifically, insert a given @p view right before of the given view, @before. @@ -43,7 +43,7 @@ EAPI ui_view *ui_viewmgr_view_push(ui_viewmgr *viewmgr, ui_view *view); * * @see ui_viewmgr_view_push_insert_after() */ -EAPI bool ui_viewmgr_view_push_insert_before(ui_viewmgr *viewmgr, ui_view *view, ui_view *before); +EAPI bool ui_viewmgr_push_view_insert_before(ui_viewmgr *viewmgr, ui_view *view, ui_view *before); /** * @brief Insert a view in this given @p viewmgr view list. Specifically, insert a given @p view right after of the given view, @after. @@ -56,7 +56,7 @@ EAPI bool ui_viewmgr_view_push_insert_before(ui_viewmgr *viewmgr, ui_view *view, * * @see ui_viewmgr_view_push_insert_before() */ -EAPI bool ui_viewmgr_view_push_insert_after(ui_viewmgr *viewmgr, ui_view *view, ui_view *after); +EAPI bool ui_viewmgr_push_view_insert_after(ui_viewmgr *viewmgr, ui_view *view, ui_view *after); /** * @brief Pop the top(last) view from this given @p viewmgr view list. @@ -73,7 +73,7 @@ EAPI bool ui_viewmgr_view_push_insert_after(ui_viewmgr *viewmgr, ui_view *view, * @see ui_viewmgr_deactivate() * @see ui_viewmgr_view_push() */ -EAPI bool ui_viewmgr_view_pop(ui_viewmgr *viewmgr); +EAPI bool ui_viewmgr_pop_view(ui_viewmgr *viewmgr); /** * @brief Activate this view manager. @@ -110,7 +110,7 @@ EAPI bool ui_viewmgr_deactivate(ui_viewmgr *viewmgr); * * @return The window object of viewmgr */ -EAPI Elm_Win *ui_viewmgr_window_get(ui_viewmgr *viewmgr); +EAPI Elm_Win *ui_viewmgr_get_window(ui_viewmgr *viewmgr); /** * @brief Return a last(top) view. @@ -119,7 +119,7 @@ EAPI Elm_Win *ui_viewmgr_window_get(ui_viewmgr *viewmgr); * * @return The view which is last view of the given @p viewmgr view list */ -EAPI ui_view *ui_viewmgr_last_view_get(ui_viewmgr *viewmgr); +EAPI ui_view *ui_viewmgr_get_last_view(ui_viewmgr *viewmgr); /** * @brief Return a view which is matched with the index @p idx. @@ -136,7 +136,7 @@ EAPI ui_view *ui_viewmgr_last_view_get(ui_viewmgr *viewmgr); * @see ui_viewmgr_view_index_get() * @see ui_viewmgr_view_count_get() */ -EAPI ui_view *ui_viewmgr_view_get_by_idx(ui_viewmgr *viewmgr, int idx); +EAPI ui_view *ui_viewmgr_get_view_by_idx(ui_viewmgr *viewmgr, int idx); /** * @brief Return a view which is matched with the @p name. @@ -150,7 +150,7 @@ EAPI ui_view *ui_viewmgr_view_get_by_idx(ui_viewmgr *viewmgr, int idx); * * @see UiIfaceView::set_name() */ -EAPI ui_view *ui_viewmgr_view_get_by_name(ui_viewmgr *viewmgr, const char *name); +EAPI ui_view *ui_viewmgr_get_view_by_name(ui_viewmgr *viewmgr, const char *name); /** * @brief Get a base object of a ui_viewmgr. @@ -161,7 +161,7 @@ EAPI ui_view *ui_viewmgr_view_get_by_name(ui_viewmgr *viewmgr, const char *name) * * @return The base object of ui_viewmgr. */ -EAPI Evas_Object *ui_viewmgr_base_get(ui_viewmgr *viewmgr); +EAPI Evas_Object *ui_viewmgr_get_base(ui_viewmgr *viewmgr); /** * @brief Return a view index(page) number of the given view. @@ -174,7 +174,7 @@ EAPI Evas_Object *ui_viewmgr_base_get(ui_viewmgr *viewmgr); * * @warning The index number of views are variable since the view list is variable */ -EAPI int ui_viewmgr_view_index_get(ui_viewmgr *viewmgr, const ui_view *view); +EAPI int ui_viewmgr_get_view_index(ui_viewmgr *viewmgr, const ui_view *view); /** * @brief Return the number of views which this @p given viewmgr has. @@ -183,7 +183,7 @@ EAPI int ui_viewmgr_view_index_get(ui_viewmgr *viewmgr, const ui_view *view); * * @return the count of views */ -EAPI int ui_viewmgr_view_count_get(ui_viewmgr *viewmgr); +EAPI int ui_viewmgr_get_view_count(ui_viewmgr *viewmgr); /** * @brief Return whether soft back key is required or not. @@ -192,7 +192,7 @@ EAPI int ui_viewmgr_view_count_get(ui_viewmgr *viewmgr); * * @return @c true if soft key is required, @c false otherwise */ -EAPI bool ui_viewmgr_soft_key_need_get(ui_viewmgr *viewmgr); +EAPI bool ui_viewmgr_get_soft_key_need(ui_viewmgr *viewmgr); /** * @brief Return the ui_viewmgr instance. @@ -201,27 +201,27 @@ EAPI bool ui_viewmgr_soft_key_need_get(ui_viewmgr *viewmgr); * * @return The ui_viewmgr instance. */ -EAPI ui_viewmgr *ui_viewmgr_viewmgr_get(); +EAPI ui_viewmgr *ui_viewmgr_get_viewmgr(); /** * @brief A Convenient Macro to activate the ui_viewmgr. */ -#define UI_VIEWMGR_ACTIVATE() (ui_viewmgr_activate(ui_viewmgr_viewmgr_get())) +#define UI_VIEWMGR_ACTIVATE() (ui_viewmgr_activate(ui_viewmgr_get_viewmgr())) /** * @brief A Convenient Macro function to deactivate the ui_viewmgr. */ -#define UI_VIEWMGR_DEACTIVATE() (ui_viewmgr_deactivate(ui_viewmgr_viewmgr_get())) +#define UI_VIEWMGR_DEACTIVATE() (ui_viewmgr_deactivate(ui_viewmgr_get_viewmgr())) /** * @brief A Convenient Macro function to push a view. */ -#define UI_VIEWMGR_VIEW_PUSH(X) (ui_viewmgr_view_push(ui_viewmgr_viewmgr_get(), (X))) +#define UI_VIEWMGR_PUSH_VIEW(X) (ui_viewmgr_push_view(ui_viewmgr_get_viewmgr(), (X))) /** * @brief A Convenient Macro function to pop a view. */ -#define UI_VIEWMGR_VIEW_POP() (ui_viewmgr_view_pop(ui_viewmgr_viewmgr_get())) +#define UI_VIEWMGR_POP_VIEW() (ui_viewmgr_pop_view(ui_viewmgr_get_viewmgr())) #ifdef __cplusplus } diff --git a/src/lib/efl/mobile/c/ui_menu.cpp b/src/lib/efl/mobile/c/ui_menu.cpp index 0d18611..2df7a56 100644 --- a/src/lib/efl/mobile/c/ui_menu.cpp +++ b/src/lib/efl/mobile/c/ui_menu.cpp @@ -18,19 +18,19 @@ static bool validate_menu(ui_menu *menu) return true; } -EAPI bool ui_menu_content_set(ui_menu *menu, Elm_Ctxpopup *ctxpopup) +EAPI bool ui_menu_set_content(ui_menu *menu, Elm_Ctxpopup *ctxpopup) { if (!validate_menu(menu)) return false; return menu->setContent(ctxpopup); } -EAPI Elm_Ctxpopup *ui_menu_content_get(ui_menu *menu) +EAPI Elm_Ctxpopup *ui_menu_get_content(ui_menu *menu) { if (!validate_menu(menu)) return NULL; return menu->getContent(); } -EAPI Elm_Ctxpopup *ui_menu_content_unset(ui_menu *menu) +EAPI Elm_Ctxpopup *ui_menu_unset_content(ui_menu *menu) { if (!validate_menu(menu)) return NULL; return menu->unsetContent(); @@ -48,25 +48,25 @@ EAPI bool ui_menu_deactivate(ui_menu *menu) return menu->deactivate(); } -EAPI bool ui_menu_activated_get(ui_menu *menu) +EAPI bool ui_menu_get_activated(ui_menu *menu) { if (!validate_menu(menu)) return false; return menu->isActivated(); } -EAPI Evas_Object *ui_menu_base_get(ui_menu *menu) +EAPI Evas_Object *ui_menu_get_base(ui_menu *menu) { if (!validate_menu(menu)) return NULL; return menu->getBase(); } -EAPI int ui_menu_degree_get(ui_menu *menu) +EAPI int ui_menu_get_degree(ui_menu *menu) { if (!validate_menu(menu)) return -1; return menu->getDegree(); } -EAPI ui_view *ui_menu_view_get(ui_menu *menu) +EAPI ui_view *ui_menu_get_view(ui_menu *menu) { if (!validate_menu(menu)) return NULL; return dynamic_cast(menu->getView()); diff --git a/src/lib/efl/mobile/c/ui_popup.cpp b/src/lib/efl/mobile/c/ui_popup.cpp index 79275a0..ff0c314 100644 --- a/src/lib/efl/mobile/c/ui_popup.cpp +++ b/src/lib/efl/mobile/c/ui_popup.cpp @@ -29,19 +29,19 @@ EAPI void ui_popup_destroy(ui_popup *popup) delete(popup); } -EAPI bool ui_popup_content_set(ui_popup *popup, Elm_Popup *content) +EAPI bool ui_popup_set_content(ui_popup *popup, Elm_Popup *content) { if (!validate_popup(popup)) return false; return popup->setContent(content); } -EAPI Elm_Popup *ui_popup_content_get(ui_popup *popup) +EAPI Elm_Popup *ui_popup_get_content(ui_popup *popup) { if (!validate_popup(popup)) return NULL; return popup->getContent(); } -EAPI Elm_Popup *ui_popup_content_unset(ui_popup *popup) +EAPI Elm_Popup *ui_popup_unset_content(ui_popup *popup) { if (!validate_popup(popup)) return NULL; return popup->unsetContent(); @@ -59,25 +59,25 @@ EAPI bool ui_popup_deactivate(ui_popup *popup) return popup->deactivate(); } -EAPI bool ui_popup_activate_get(ui_popup *popup) +EAPI bool ui_popup_get_activate(ui_popup *popup) { if (!validate_popup(popup)) return false; return popup->isActivated(); } -EAPI Evas_Object *ui_popup_base_get(ui_popup *popup) +EAPI Evas_Object *ui_popup_get_base(ui_popup *popup) { if (!validate_popup(popup)) return NULL; return popup->getBase(); } -EAPI int ui_popup_degree_get(ui_popup *popup) +EAPI int ui_popup_get_degree(ui_popup *popup) { if (!validate_popup(popup)) return -1; return popup->getDegree(); } -EAPI ui_view *ui_popup_view_get(ui_popup *popup) +EAPI ui_view *ui_popup_get_view(ui_popup *popup) { if (!validate_popup(popup)) return NULL; return dynamic_cast(popup->getView()); diff --git a/src/lib/efl/mobile/c/ui_standard_view.cpp b/src/lib/efl/mobile/c/ui_standard_view.cpp index d9b6dfe..c5283d2 100644 --- a/src/lib/efl/mobile/c/ui_standard_view.cpp +++ b/src/lib/efl/mobile/c/ui_standard_view.cpp @@ -156,7 +156,7 @@ EAPI ui_standard_view* ui_standard_view_create(const char *name) return new ui_standard_view_capi(name); } -EAPI bool ui_standard_view_content_set(ui_standard_view *view, Evas_Object *content, const char *title, const char *subtitle, Evas_Object *title_left_btn, +EAPI bool ui_standard_view_set_content(ui_standard_view *view, Evas_Object *content, const char *title, const char *subtitle, Evas_Object *title_left_btn, Evas_Object *title_right_btn) { ui_standard_view_capi *capi_view; @@ -164,91 +164,91 @@ EAPI bool ui_standard_view_content_set(ui_standard_view *view, Evas_Object *cont return capi_view->setContent(content, title, subtitle, title_left_btn, title_right_btn); } -EAPI bool ui_standard_view_title_set(ui_standard_view *view, const char *text) +EAPI bool ui_standard_view_set_title(ui_standard_view *view, const char *text) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return false; return capi_view->setTitle(text); } -EAPI bool ui_standard_view_sub_title_set(ui_standard_view *view, const char *text) +EAPI bool ui_standard_view_set_sub_title(ui_standard_view *view, const char *text) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return false; return capi_view->setSubtitle(text); } -EAPI bool ui_standard_view_title_badge_set(ui_standard_view *view, const char *badge_text) +EAPI bool ui_standard_view_set_title_badge(ui_standard_view *view, const char *badge_text) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return false; return capi_view->setTitleBadge(badge_text); } -EAPI bool ui_standard_view_title_right_btn_set(ui_standard_view *view, Evas_Object *title_right_btn) +EAPI bool ui_standard_view_set_title_right_btn(ui_standard_view *view, Evas_Object *title_right_btn) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return false; return capi_view->setTitleRightBtn(title_right_btn); } -EAPI Elm_Button *ui_standard_view_title_right_btn_get(ui_standard_view *view) +EAPI Elm_Button *ui_standard_view_get_title_right_btn(ui_standard_view *view) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return NULL; return capi_view->getTitleRightBtn(); } -EAPI Elm_Button *ui_standard_view_title_right_btn_unset(ui_standard_view *view) +EAPI Elm_Button *ui_standard_view_unset_title_right_btn(ui_standard_view *view) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return NULL; return capi_view->unsetTitleRightBtn(); } -EAPI bool ui_standard_view_title_left_btn_set(ui_standard_view *view, Evas_Object *title_left_btn) +EAPI bool ui_standard_view_set_title_left_btn(ui_standard_view *view, Evas_Object *title_left_btn) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return false; return capi_view->setTitleLeftBtn(title_left_btn); } -EAPI Elm_Button *ui_standard_view_title_left_btn_get(ui_standard_view *view) +EAPI Elm_Button *ui_standard_view_get_title_left_btn(ui_standard_view *view) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return NULL; return capi_view->getTitleLeftBtn(); } -EAPI Elm_Button *ui_standard_view_title_left_btn_unset(ui_standard_view *view) +EAPI Elm_Button *ui_standard_view_unset_title_left_btn(ui_standard_view *view) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return NULL; return capi_view->unsetTitleRightBtn(); } -EAPI bool ui_standard_view_toolbar_set(ui_standard_view *view, Elm_Toolbar *toolbar) +EAPI bool ui_standard_view_set_toolbar(ui_standard_view *view, Elm_Toolbar *toolbar) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return false; return capi_view->setToolbar(toolbar); } -EAPI Elm_Toolbar *ui_standard_view_toolbar_get(ui_standard_view *view) +EAPI Elm_Toolbar *ui_standard_view_get_toolbar(ui_standard_view *view) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return NULL; return capi_view->getToolbar(); } -EAPI Elm_Toolbar *ui_standard_view_toolbar_unset(ui_standard_view *view) +EAPI Elm_Toolbar *ui_standard_view_unset_toolbar(ui_standard_view *view) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return NULL; return capi_view->unsetToolbar(); } -EAPI bool ui_standard_view_title_visible_set(ui_standard_view *view, bool visible, bool anim) +EAPI bool ui_standard_view_set_title_visible(ui_standard_view *view, bool visible, bool anim) { ui_standard_view_capi *capi_view; if (!(capi_view = validate_view(view))) return false; diff --git a/src/lib/efl/mobile/c/ui_view.cpp b/src/lib/efl/mobile/c/ui_view.cpp index abc2a4b..965d26f 100644 --- a/src/lib/efl/mobile/c/ui_view.cpp +++ b/src/lib/efl/mobile/c/ui_view.cpp @@ -147,7 +147,7 @@ EAPI ui_view* ui_view_create(const char *name) return new ui_view_capi(name); } -EAPI bool ui_view_lifecycle_callbacks_set(ui_view *view, ui_view_lifecycle_callback_s *lifecycle_callback, void *data) +EAPI bool ui_view_set_lifecycle_callbacks(ui_view *view, ui_view_lifecycle_callback_s *lifecycle_callback, void *data) { if (!validate_view(view)) return false; @@ -167,7 +167,7 @@ EAPI bool ui_view_lifecycle_callbacks_set(ui_view *view, ui_view_lifecycle_callb return true; } -EAPI bool ui_view_event_callbacks_set(ui_view *view, ui_view_event_callback_s *event_callback, void *data) +EAPI bool ui_view_set_event_callbacks(ui_view *view, ui_view_event_callback_s *event_callback, void *data) { if (!validate_view(view)) return false; @@ -187,79 +187,79 @@ EAPI bool ui_view_event_callbacks_set(ui_view *view, ui_view_event_callback_s *e return true; } -EAPI Evas_Object* ui_view_base_get(ui_view *view) +EAPI Evas_Object* ui_view_get_base(ui_view *view) { if (!validate_view(view)) return NULL; return view->getBase(); } -EAPI Evas_Object *ui_view_content_unset(ui_view *view) +EAPI Evas_Object *ui_view_unset_content(ui_view *view) { if (!validate_view(view)) return NULL; return view->unsetContent(); } -EAPI void ui_view_indicator_set(ui_view *view, ui_view_indicator indicator) +EAPI void ui_view_set_indicator(ui_view *view, ui_view_indicator indicator) { if (!validate_view(view)) return; view->setIndicator(indicator); } -EAPI ui_view_indicator ui_view_indicator_get(ui_view *view) +EAPI ui_view_indicator ui_view_get_indicator(ui_view *view) { if (!validate_view(view)) return UI_VIEW_INDICATOR_UNKNOWN; return view->getIndicator(); } -EAPI void ui_view_removable_content_set(ui_view *view, bool remove) +EAPI void ui_view_set_removable_content(ui_view *view, bool remove) { if (!validate_view(view)) return; view->setRemovableContent(remove); } -EAPI bool ui_view_removable_content_get(ui_view *view) +EAPI bool ui_view_get_removable_content(ui_view *view) { if (!validate_view(view)) return false; return view->getRemovableContent(); } -EAPI int ui_view_degree_get(ui_view *view) +EAPI int ui_view_get_degree(ui_view *view) { if (!validate_view(view)) return -1; return view->getDegree(); } -EAPI bool ui_view_transition_style_set(ui_view *view, const char *style) +EAPI bool ui_view_set_transition_style(ui_view *view, const char *style) { if (!validate_view(view)) return false; return view->setTransitionStyle(style); } -EAPI const char *ui_view_transition_style_get(ui_view *view) +EAPI const char *ui_view_get_transition_style(ui_view *view) { if (!validate_view(view)) return NULL; return view->getTransitionStyle(); } -EAPI const ui_menu *ui_view_menu_get(ui_view *view) +EAPI const ui_menu *ui_view_get_menu(ui_view *view) { if (!validate_view(view)) return NULL; return view->getMenu(); } -EAPI const char *ui_view_name_get(ui_view *view) +EAPI const char *ui_view_get_name(ui_view *view) { if (!validate_view(view)) return NULL; return view->getName(); } -EAPI ui_view_state ui_view_state_get(ui_view *view) +EAPI ui_view_state ui_view_get_state(ui_view *view) { if (!validate_view(view)) return UI_VIEW_STATE_UNKNOWN; return view->getState(); } -EAPI Evas_Object *ui_view_content_get(ui_view *view) +EAPI Evas_Object *ui_view_get_content(ui_view *view) { if (!validate_view(view)) return NULL; return view->getContent(); @@ -272,13 +272,13 @@ EAPI bool ui_view_destroy(ui_view *view) return true; } -EAPI bool ui_view_content_set(ui_view *view, Evas_Object *content) +EAPI bool ui_view_set_content(ui_view *view, Evas_Object *content) { if (!validate_view(view)) return false; return view->setContent(content); } -EAPI const char *ui_view_type_get(ui_view *view) +EAPI const char *ui_view_get_type(ui_view *view) { if (!validate_view(view)) return false; return dynamic_cast(view)->type; diff --git a/src/lib/efl/mobile/c/ui_viewmgr.cpp b/src/lib/efl/mobile/c/ui_viewmgr.cpp index b778dd6..67db397 100644 --- a/src/lib/efl/mobile/c/ui_viewmgr.cpp +++ b/src/lib/efl/mobile/c/ui_viewmgr.cpp @@ -18,7 +18,7 @@ static bool validate_viewmgr(ui_viewmgr *viewmgr) return true; } -EAPI ui_view *ui_viewmgr_view_push(ui_viewmgr *viewmgr, ui_view *view) +EAPI ui_view *ui_viewmgr_push_view(ui_viewmgr *viewmgr, ui_view *view) { if (!viewmgr || !view) { @@ -29,7 +29,7 @@ EAPI ui_view *ui_viewmgr_view_push(ui_viewmgr *viewmgr, ui_view *view) return dynamic_cast(viewmgr->pushView(view)); } -EAPI bool ui_viewmgr_view_insert_before(ui_viewmgr *viewmgr, ui_view *view, ui_view *before) +EAPI bool ui_viewmgr_push_view_insert_before(ui_viewmgr *viewmgr, ui_view *view, ui_view *before) { if (!viewmgr || !view) { @@ -40,7 +40,7 @@ EAPI bool ui_viewmgr_view_insert_before(ui_viewmgr *viewmgr, ui_view *view, ui_v return viewmgr->insertViewBefore(view, before); } -EAPI bool ui_viewmgr_view_insert_after(ui_viewmgr *viewmgr, ui_view *view, ui_view *after) +EAPI bool ui_viewmgr_push_view_insert_after(ui_viewmgr *viewmgr, ui_view *view, ui_view *after) { if (!viewmgr || !view) { @@ -51,7 +51,7 @@ EAPI bool ui_viewmgr_view_insert_after(ui_viewmgr *viewmgr, ui_view *view, ui_vi return viewmgr->insertViewAfter(view, after); } -EAPI bool ui_viewmgr_view_pop(ui_viewmgr *viewmgr) +EAPI bool ui_viewmgr_pop_view(ui_viewmgr *viewmgr) { if (!validate_viewmgr(viewmgr)) return false; return viewmgr->popView(); @@ -69,37 +69,37 @@ EAPI bool ui_viewmgr_deactivate(ui_viewmgr *viewmgr) return viewmgr->deactivate(); } -EAPI Elm_Win *ui_viewmgr_window_get(ui_viewmgr *viewmgr) +EAPI Elm_Win *ui_viewmgr_get_window(ui_viewmgr *viewmgr) { if (!validate_viewmgr(viewmgr)) return NULL; return viewmgr->getWindow(); } -EAPI ui_view *ui_viewmgr_last_view_get(ui_viewmgr *viewmgr) +EAPI ui_view *ui_viewmgr_get_last_view(ui_viewmgr *viewmgr) { if (!validate_viewmgr(viewmgr)) return NULL; return dynamic_cast(viewmgr->getLastView()); } -EAPI ui_view *ui_viewmgr_view_get_by_idx(ui_viewmgr *viewmgr, int idx) +EAPI ui_view *ui_viewmgr_get_view_by_idx(ui_viewmgr *viewmgr, int idx) { if (!validate_viewmgr(viewmgr)) return NULL; return dynamic_cast(viewmgr->getView(idx)); } -EAPI ui_view *ui_viewmgr_view_get_by_name(ui_viewmgr *viewmgr, const char *name) +EAPI ui_view *ui_viewmgr_get_view_by_name(ui_viewmgr *viewmgr, const char *name) { if (!validate_viewmgr(viewmgr)) return NULL; return dynamic_cast(viewmgr->getView(name)); } -EAPI Evas_Object *ui_viewmgr_base_get(ui_viewmgr *viewmgr) +EAPI Evas_Object *ui_viewmgr_get_base(ui_viewmgr *viewmgr) { if (!validate_viewmgr(viewmgr)) return NULL; return viewmgr->getBase(); } -EAPI int ui_viewmgr_view_index_get(ui_viewmgr *viewmgr, const ui_view *view) +EAPI int ui_viewmgr_get_view_index(ui_viewmgr *viewmgr, const ui_view *view) { if (!viewmgr || !view) { @@ -110,20 +110,20 @@ EAPI int ui_viewmgr_view_index_get(ui_viewmgr *viewmgr, const ui_view *view) return viewmgr->getViewIndex(view); } -EAPI int ui_viewmgr_view_count_get(ui_viewmgr *viewmgr) +EAPI int ui_viewmgr_get_view_count(ui_viewmgr *viewmgr) { if (!validate_viewmgr(viewmgr)) return -1; return viewmgr->getViewCount(); } -EAPI bool ui_viewmgr_soft_key_need_get(ui_viewmgr *viewmgr) +EAPI bool ui_viewmgr_get_soft_key_need(ui_viewmgr *viewmgr) { if (!validate_viewmgr(viewmgr)) return false; return viewmgr->needSoftKey(); } -EAPI ui_viewmgr *ui_viewmgr_viewmgr_get() +EAPI ui_viewmgr *ui_viewmgr_get_viewmgr() { return UI_VIEWMGR; }