From: Jeonghyun Yun Date: Thu, 8 Mar 2012 07:33:09 +0000 (+0900) Subject: src/examples conflict fixed X-Git-Tag: REL_F_I9500_20120317_1~18^2~41^2~9^2^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9103a1e71a002b60eceaa1a49e56adeca9bd5687;p=framework%2Fuifw%2Felementary.git src/examples conflict fixed --- diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index 660c083..bc496d5 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -34,10 +34,6 @@ EDJE_FLAGS = $(EDJE_FLAGS_$(V)) SRCS = \ actionslider_example_01.c \ -<<<<<<< HEAD - anchorblock_example_01.c \ -======= ->>>>>>> remotes/origin/upstream bubble_example_01.c \ button_example_01.c \ check_example_01.c \ @@ -64,10 +60,7 @@ SRCS = \ calendar_example_04.c \ calendar_example_05.c \ calendar_example_06.c \ -<<<<<<< HEAD -======= datetime_example.c \ ->>>>>>> remotes/origin/upstream map_example_01.c \ map_example_02.c \ map_example_03.c \ @@ -76,10 +69,7 @@ SRCS = \ toolbar_example_03.c \ spinner_example.c \ clock_example.c \ -<<<<<<< HEAD -======= dayselector_example.c \ ->>>>>>> remotes/origin/upstream mapbuf_example.c \ conformant_example_01.c \ conformant_example_02.c \ @@ -110,10 +100,6 @@ SRCS = \ slider_example.c \ panes_example.c \ ctxpopup_example_01.c \ -<<<<<<< HEAD - pager_example_01.c \ -======= ->>>>>>> remotes/origin/upstream separator_example_01.c \ radio_example_01.c \ panel_example_01.c \ @@ -123,12 +109,9 @@ SRCS = \ progressbar_example.c \ notify_example_01.c \ photocam_example_01.c \ -<<<<<<< HEAD -======= popup_example_01.c \ popup_example_02.c \ popup_example_03.c \ ->>>>>>> remotes/origin/upstream inwin_example.c \ scroller_example_01.c \ table_example_01.c \ @@ -164,10 +147,6 @@ clean-local: examples_PROGRAMS += \ actionslider_example_01 \ -<<<<<<< HEAD - anchorblock_example_01 \ -======= ->>>>>>> remotes/origin/upstream bubble_example_01 \ button_example_01 \ check_example_01 \ @@ -194,10 +173,7 @@ examples_PROGRAMS += \ calendar_example_04 \ calendar_example_05 \ calendar_example_06 \ -<<<<<<< HEAD -======= datetime_example \ ->>>>>>> remotes/origin/upstream map_example_01 \ map_example_02 \ map_example_03 \ @@ -206,10 +182,7 @@ examples_PROGRAMS += \ toolbar_example_03 \ spinner_example \ clock_example \ -<<<<<<< HEAD -======= dayselector_example \ ->>>>>>> remotes/origin/upstream mapbuf_example \ conformant_example_01 \ conformant_example_02 \ @@ -233,10 +206,6 @@ examples_PROGRAMS += \ fileselector_entry_example \ index_example_01 \ index_example_02 \ -<<<<<<< HEAD - pager_example_01 \ -======= ->>>>>>> remotes/origin/upstream separator_example_01 \ radio_example_01 \ toggle_example_01 \ @@ -252,12 +221,9 @@ examples_PROGRAMS += \ progressbar_example \ notify_example_01 \ photocam_example_01 \ -<<<<<<< HEAD -======= popup_example_01 \ popup_example_02 \ popup_example_03 \ ->>>>>>> remotes/origin/upstream inwin_example \ scroller_example_01 \ table_example_01 \ @@ -301,10 +267,7 @@ SCREENSHOTS = \ calendar_example_04:calendar_example_04.png:0.0 \ calendar_example_05:calendar_example_05.png:0.0 \ calendar_example_06:calendar_example_06.png:0.0 \ -<<<<<<< HEAD -======= datetime_example:datetime_example.png:0.0 \ ->>>>>>> remotes/origin/upstream map_example_01:map_example_01.png:2 \ map_example_02:map_example_02.png:2.5 \ map_example_03:map_example_03.png:2 \ @@ -313,10 +276,7 @@ SCREENSHOTS = \ toolbar_example_03:toolbar_example_03.png:1 \ spinner_example:spinner_example.png:0.0 \ clock_example:clock_example.png:0.5 \ -<<<<<<< HEAD -======= dayselector_example:dayselector_example.png:0.0 \ ->>>>>>> remotes/origin/upstream mapbuf_example:mapbuf_example.png:0.0 \ image_example_01:image_example_01.png:0.0 \ diskselector_example_01:diskselector_example_01.png:0.2 \ @@ -335,10 +295,6 @@ SCREENSHOTS = \ slider_example:slider_example.png:0.0 \ panes_example:panes_example.png:0.0 \ ctxpopup_example_01:ctxpopup_example_01.png:0.0 \ -<<<<<<< HEAD - pager_example_01:pager_example_01.png:0.0 \ -======= ->>>>>>> remotes/origin/upstream separator_example_01:separator_example_01.png:0.0 \ radio_example_01:radio_example_01.png:0.0 \ toggle_example_01:toggle_example_01.png:0.0 \ @@ -354,13 +310,10 @@ SCREENSHOTS = \ progressbar_example:progressbar_example.png:0.0 \ notify_example_01:notify_example_01.png:0.0 \ notify_example_01:notify_example_01_a.png:6.0 \ -<<<<<<< HEAD -======= popup_example_01:popup_example_01.png:1.0 \ popup_example_01:popup_example_01_a.png:6.0 \ popup_example_02:popup_example_02.png:0.2 \ popup_example_03:popup_example_03.png:0.2 \ ->>>>>>> remotes/origin/upstream slideshow_example:slideshow_example.png:1.0 \ photocam_example_01:photocam_example_01.png:3 \ scroller_example_01:scroller_example_01.png:0.0 \ diff --git a/src/examples/anchorblock_example_01.c b/src/examples/anchorblock_example_01.c deleted file mode 100644 index 06440c5..0000000 --- a/src/examples/anchorblock_example_01.c +++ /dev/null @@ -1,254 +0,0 @@ -/* - * gcc -o anchorblock_example_01 anchorblock_example_01.c `pkg-config --cflags --libs elementary` - */ -#include -#ifdef HAVE_CONFIG_H -# include "elementary_config.h" -#else -# define __UNUSED__ -#endif - -static void _anchorblock_clicked_cb(void *data, Evas_Object *obj, void *ev); -static void _anchorview_clicked_cb(void *data, Evas_Object *obj, void *ev); - -int -elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) -{ - Evas_Object *win, *box, *o, *frame; - const char *anchortext = - "Example of some markup text, a long one at that, using anchors in" - "different ways, like some random text.
" - "Something more useful is to have actions over urls, either in direct" - "form: " - "http://www.enlightenment.org or with " - "more random text.
" - "In any case, the href part of the anchor is what you will receive on" - "the callback, so it's a good idea to keep anything needed to identify" - "whatever is linked at in there.
" - "Playing to be a phone, we can also identify contacts from our address" - "list, like this dude here Thomas Anderson, or" - "phone numbers +61 432 1234."; - - elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - - win = elm_win_add(NULL, "Anchortwins example", ELM_WIN_BASIC); - elm_win_title_set(win, "Anchortwins example"); - elm_win_autodel_set(win, EINA_TRUE); - evas_object_resize(win, 320, 300); - evas_object_show(win); - - o = elm_bg_add(win); - evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, o); - evas_object_show(o); - - box = elm_box_add(win); - evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_win_resize_object_add(win, box); - evas_object_show(box); - - frame = elm_frame_add(win); - elm_object_text_set(frame, "Anchorblock"); - evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(frame); - elm_box_pack_end(box, frame); - - o = elm_anchorblock_add(win); - elm_anchorblock_hover_style_set(o, "popout"); - elm_anchorblock_hover_parent_set(o, win); - elm_object_text_set(o, anchortext); - evas_object_smart_callback_add(o, "anchor,clicked", _anchorblock_clicked_cb, - NULL); - evas_object_show(o); - elm_object_content_set(frame, o); - - frame = elm_frame_add(win); - elm_object_text_set(frame, "Anchorview"); - evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(frame); - elm_box_pack_end(box, frame); - - o = elm_anchorview_add(win); - elm_anchorview_hover_parent_set(o, frame); - elm_anchorview_bounce_set(o, EINA_FALSE, EINA_TRUE); - elm_object_text_set(o, anchortext); - evas_object_smart_callback_add(o, "anchor,clicked", _anchorview_clicked_cb, - NULL); - evas_object_show(o); - elm_object_content_set(frame, o); - - elm_run(); - - return 0; -} -ELM_MAIN(); - -static void _anchor_buttons_create(Evas_Object *ao, Elm_Entry_Anchorblock_Info *info, Evas_Smart_Cb btn_end_cb); - -static void -_btn_anchorblock_end_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -{ - elm_anchorblock_hover_end((Evas_Object *)data); -} - -static void -_anchorblock_clicked_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) -{ - Elm_Entry_Anchorblock_Info *info = event_info; - _anchor_buttons_create(obj, info, _btn_anchorblock_end_cb); -} - -static void -_btn_anchorview_end_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -{ - elm_anchorview_hover_end((Evas_Object *)data); -} - -static void -_anchorview_clicked_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) -{ - /* should be an Elm_Entry_Anchorview_Info, but since both of them are - * the same, it simplifies code in this example to use one only */ - Elm_Entry_Anchorblock_Info *info = event_info; - _anchor_buttons_create(obj, info, _btn_anchorview_end_cb); -} - -static void -_btn_clicked_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -{ - const char *lbl = elm_object_text_get(obj); - printf("%s: %s\n", lbl, (char *)data); - eina_stringshare_del(data); -} - -static void -_anchor_buttons_create(Evas_Object *ao, Elm_Entry_Anchorblock_Info *info, Evas_Smart_Cb btn_end_cb) -{ - Evas_Object *btn, *secondary = NULL, *box = NULL; - char *p; - const char *str; - - btn = elm_button_add(ao); - evas_object_show(btn); - - p = strchr(info->name, ':'); - if (!p) - { - elm_object_text_set(btn, "Nothing to see here"); - evas_object_smart_callback_add(btn, "clicked", btn_end_cb, ao); - elm_object_part_content_set(info->hover, "middle", btn); - return; - } - - str = eina_stringshare_add(p + 1); - if (!strncmp(info->name, "tel:", 4)) - { - Evas_Object *o; - elm_object_text_set(btn, "Call"); - - secondary = elm_button_add(ao); - elm_object_text_set(secondary, "Send SMS"); - evas_object_show(secondary); - evas_object_smart_callback_add(secondary, "clicked", btn_end_cb, ao); - evas_object_smart_callback_add(secondary, "clicked", _btn_clicked_cb, - str); - - box = elm_box_add(ao); - evas_object_show(box); - - o = elm_button_add(ao); - elm_object_text_set(o, "Add to contacts"); - elm_box_pack_end(box, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", btn_end_cb, ao); - evas_object_smart_callback_add(o, "clicked", _btn_clicked_cb, str); - - o = elm_button_add(ao); - elm_object_text_set(o, "Send MMS"); - elm_box_pack_end(box, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", btn_end_cb, ao); - evas_object_smart_callback_add(o, "clicked", _btn_clicked_cb, str); - } - else if (!strncmp(info->name, "contact:", 8)) - { - Evas_Object *o; - elm_object_text_set(btn, "Call"); - - secondary = elm_button_add(ao); - elm_object_text_set(secondary, "Send SMS"); - evas_object_show(secondary); - evas_object_smart_callback_add(secondary, "clicked", btn_end_cb, ao); - evas_object_smart_callback_add(secondary, "clicked", _btn_clicked_cb, - str); - - box = elm_box_add(ao); - evas_object_show(box); - - o = elm_button_add(ao); - elm_object_text_set(o, "Send MMS"); - elm_box_pack_end(box, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", btn_end_cb, ao); - evas_object_smart_callback_add(o, "clicked", _btn_clicked_cb, str); - } - else if (!strncmp(info->name, "mailto:", 7)) - { - elm_object_text_set(btn, "Send E-Mail"); - - secondary = elm_button_add(ao); - elm_object_text_set(secondary, "Add to contacts"); - evas_object_show(secondary); - evas_object_smart_callback_add(secondary, "clicked", btn_end_cb, ao); - evas_object_smart_callback_add(secondary, "clicked", _btn_clicked_cb, - str); - } - else if (!strncmp(info->name, "url:", 4)) - { - Evas_Object *o; - elm_object_text_set(btn, "Launch in browser"); - - box = elm_box_add(ao); - evas_object_show(box); - - o = elm_button_add(ao); - elm_object_text_set(o, "Send as mail to..."); - elm_box_pack_end(box, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", btn_end_cb, ao); - evas_object_smart_callback_add(o, "clicked", _btn_clicked_cb, str); - - o = elm_button_add(ao); - elm_object_text_set(o, "Send as SMS to..."); - elm_box_pack_end(box, o); - evas_object_show(o); - evas_object_smart_callback_add(o, "clicked", btn_end_cb, ao); - evas_object_smart_callback_add(o, "clicked", _btn_clicked_cb, str); - } - - evas_object_smart_callback_add(btn, "clicked", btn_end_cb, ao); - evas_object_smart_callback_add(btn, "clicked", _btn_clicked_cb, str); - elm_object_part_content_set(info->hover, "middle", btn); - - if (secondary) - { - if (info->hover_right) - elm_object_part_content_set(info->hover, "right", secondary); - else if (info->hover_left) - elm_object_part_content_set(info->hover, "left", secondary); - else - evas_object_del(secondary); - } - - if (box) - { - if (info->hover_bottom) - elm_object_part_content_set(info->hover, "bottom", box); - else if (info->hover_top) - elm_object_part_content_set(info->hover, "top", box); - else - evas_object_del(box); - } -} diff --git a/src/examples/general_funcs_example.c b/src/examples/general_funcs_example.c index ecca8f6..70aee4b 100644 --- a/src/examples/general_funcs_example.c +++ b/src/examples/general_funcs_example.c @@ -39,11 +39,7 @@ _btn_focus_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) { -<<<<<<< HEAD - elm_object_focus(d.btn); -======= elm_object_focus_set(d.btn, EINA_TRUE); ->>>>>>> remotes/origin/upstream } static void @@ -52,11 +48,7 @@ _btn_unfocus_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__) { -<<<<<<< HEAD - elm_object_unfocus(d.btn); -======= elm_object_focus_set(d.btn, EINA_FALSE); ->>>>>>> remotes/origin/upstream } static void @@ -128,11 +120,7 @@ elm_main(int argc __UNUSED__, elm_object_content_set(frame, d.btn); fprintf(stdout, "Elementary's finger size is set to %d pixels\n.", -<<<<<<< HEAD - elm_finger_size_get()); -======= elm_config_finger_size_get()); ->>>>>>> remotes/origin/upstream elm_coords_finger_size_adjust(0, NULL, 3, &h); /* so, button will be 3 fingers tall */ evas_object_size_hint_min_set(d.btn, 0, h); diff --git a/src/examples/gengrid_example.c b/src/examples/gengrid_example.c index db89ae4..d55daba 100644 --- a/src/examples/gengrid_example.c +++ b/src/examples/gengrid_example.c @@ -35,13 +35,8 @@ static const char *imgs[9] = "wood_01.jpg", }; -<<<<<<< HEAD -static Elm_Gengrid_Item_Class gic; -Evas_Object *before_bt, *after_bt; -======= static Elm_Gengrid_Item_Class *gic = NULL; static Evas_Object *before_bt, *after_bt; ->>>>>>> remotes/origin/upstream static void _on_done(void *data __UNUSED__, @@ -71,14 +66,10 @@ _always_select_change(void *data, Evas_Object *grid = data; Eina_Bool always = elm_check_state_get(obj); -<<<<<<< HEAD - elm_gengrid_always_select_mode_set(grid, always); -======= if (always) elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_ALWAYS); else elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_DEFAULT); ->>>>>>> remotes/origin/upstream fprintf(stdout, "\"Always select\" mode for gengrid items is now %s\n", always ? "on" : "off"); @@ -134,14 +125,10 @@ _no_sel_change(void *data, Evas_Object *grid = data; Eina_Bool no_sel = elm_check_state_get(obj); -<<<<<<< HEAD - elm_gengrid_no_select_mode_set(grid, no_sel); -======= if (no_sel) elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_NONE); else elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_DEFAULT); ->>>>>>> remotes/origin/upstream fprintf(stdout, "Selection for gengrid items is now %s\n", no_sel ? "disabled" : "enabled"); @@ -189,11 +176,7 @@ _before_bt_clicked(void *data, return; it = _item_new(); -<<<<<<< HEAD - elm_gengrid_item_insert_before(grid, &gic, it, sel, _grid_sel, NULL); -======= elm_gengrid_item_insert_before(grid, gic, it, sel, _grid_sel, NULL); ->>>>>>> remotes/origin/upstream } /* "insert after" callback */ @@ -211,11 +194,7 @@ _after_bt_clicked(void *data, return; it = _item_new(); -<<<<<<< HEAD - elm_gengrid_item_insert_after(grid, &gic, it, sel, _grid_sel, NULL); -======= elm_gengrid_item_insert_after(grid, gic, it, sel, _grid_sel, NULL); ->>>>>>> remotes/origin/upstream } /* prepend an item */ @@ -228,11 +207,7 @@ _prepend_bt_clicked(void *data, Evas_Object *grid = data; it = _item_new(); -<<<<<<< HEAD - elm_gengrid_item_prepend(grid, &gic, it, _grid_sel, NULL); -======= elm_gengrid_item_prepend(grid, gic, it, _grid_sel, NULL); ->>>>>>> remotes/origin/upstream } /* append an item */ @@ -244,11 +219,7 @@ _append_bt_clicked(void *data, Evas_Object *grid = data; Example_Item *it = _item_new(); -<<<<<<< HEAD - elm_gengrid_item_append(grid, &gic, it, _grid_sel, NULL); -======= elm_gengrid_item_append(grid, gic, it, _grid_sel, NULL); ->>>>>>> remotes/origin/upstream } /* delete items */ @@ -272,11 +243,7 @@ _bring_1st_clicked(void *data, if (!gg_it) return; -<<<<<<< HEAD - elm_gengrid_item_bring_in(gg_it); -======= elm_gengrid_item_bring_in(gg_it, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream } /* show last item */ @@ -289,11 +256,7 @@ _show_last_clicked(void *data, if (!gg_it) return; -<<<<<<< HEAD - elm_gengrid_item_show(gg_it); -======= elm_gengrid_item_show(gg_it, ELM_GENGRID_ITEM_SCROLLTO_IN); ->>>>>>> remotes/origin/upstream } /* disable selected item */ @@ -647,13 +610,6 @@ elm_main(int argc __UNUSED__, _page_change_cb(grid, sl, NULL); evas_object_smart_callback_add(sl, "changed", _page_change_cb, grid); -<<<<<<< HEAD - gic.item_style = "default"; - gic.func.text_get = _grid_label_get; - gic.func.content_get = _grid_content_get; - gic.func.state_get = _grid_state_get; - gic.func.del = _grid_del; -======= if (!gic) { gic = elm_gengrid_item_class_new(); @@ -663,7 +619,6 @@ elm_main(int argc __UNUSED__, gic->func.state_get = _grid_state_get; gic->func.del = _grid_del; } // we only create the first time its needed. we dont unref/free ->>>>>>> remotes/origin/upstream _append_bt_clicked(grid, NULL, NULL); _append_bt_clicked(grid, NULL, NULL); diff --git a/src/examples/inwin_example.c b/src/examples/inwin_example.c index 7d06de6..7ec74ae 100644 --- a/src/examples/inwin_example.c +++ b/src/examples/inwin_example.c @@ -146,11 +146,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_smart_callback_add(o, "clicked", _btn_click_cb, NULL); -<<<<<<< HEAD - if (!strncmp(elm_engine_current_get(), "shot", 4)) -======= if (!strncmp(elm_config_engine_get(), "shot", 4)) ->>>>>>> remotes/origin/upstream ecore_timer_add(0.1, _screenshot_hack_cb, o); elm_run(); diff --git a/src/examples/mapbuf_example.c b/src/examples/mapbuf_example.c index 214be7e..a6df9cf 100644 --- a/src/examples/mapbuf_example.c +++ b/src/examples/mapbuf_example.c @@ -81,11 +81,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) { ic = elm_icon_add(win); elm_icon_standard_set(ic, "home"); -<<<<<<< HEAD - elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE); -======= elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE); ->>>>>>> remotes/origin/upstream evas_object_show(ic); elm_table_pack(tb, ic, i, j, 1, 1); } diff --git a/src/examples/pager_example_01.c b/src/examples/pager_example_01.c deleted file mode 100644 index 87b5fb2..0000000 --- a/src/examples/pager_example_01.c +++ /dev/null @@ -1,82 +0,0 @@ -//Compile with: -//gcc -g `pkg-config --cflags --libs elementary` pager_example_01.c -o pager_example_01 - -#include -#ifdef HAVE_CONFIG_H -# include "elementary_config.h" -#endif - -static void _promote(void *data, Evas_Object *obj, void *event_info); -static Evas_Object *pager; - -EAPI_MAIN int -elm_main(int argc, char **argv) -{ - Evas_Object *win, *bg, *rect, *bt; - - win = elm_win_add(NULL, "pager", ELM_WIN_BASIC); - elm_win_title_set(win, "Pager"); - elm_win_autodel_set(win, EINA_TRUE); - elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_show(bg); - - pager = elm_pager_add(win); - elm_object_style_set(pager, "fade"); - evas_object_resize(pager, 180, 160); - evas_object_move(pager, 10, 10); - evas_object_show(pager); - - rect = evas_object_rectangle_add(evas_object_evas_get(win)); - evas_object_color_set(rect, 0, 0, 255, 255); - evas_object_show(rect); - elm_pager_content_push(pager, rect); - - bt = elm_button_add(win); - elm_object_text_set(bt, "blue"); - evas_object_resize(bt, 50, 20); - evas_object_move(bt, 10, 170); - evas_object_show(bt); - evas_object_smart_callback_add(bt, "clicked", _promote, rect); - - rect = evas_object_rectangle_add(evas_object_evas_get(win)); - evas_object_color_set(rect, 0, 255, 0, 255); - evas_object_show(rect); - elm_pager_content_push(pager, rect); - - bt = elm_button_add(win); - elm_object_text_set(bt, "green"); - evas_object_resize(bt, 60, 20); - evas_object_move(bt, 70, 170); - evas_object_show(bt); - evas_object_smart_callback_add(bt, "clicked", _promote, rect); - - rect = evas_object_rectangle_add(evas_object_evas_get(win)); - evas_object_color_set(rect, 255, 0, 0, 255); - evas_object_show(rect); - elm_pager_content_push(pager, rect); - - bt = elm_button_add(win); - elm_object_text_set(bt, "red"); - evas_object_resize(bt, 50, 20); - evas_object_move(bt, 140, 170); - evas_object_show(bt); - evas_object_smart_callback_add(bt, "clicked", _promote, rect); - - evas_object_resize(win, 200, 200); - evas_object_show(win); - - elm_run(); - - return 0; -} -ELM_MAIN() - -static void -_promote(void *data, Evas_Object *obj, void *event_info) -{ - if(elm_pager_content_top_get(pager) != data) - elm_pager_content_promote(pager, data); -} diff --git a/src/examples/theme_example_01.c b/src/examples/theme_example_01.c index 8176205..327edac 100644 --- a/src/examples/theme_example_01.c +++ b/src/examples/theme_example_01.c @@ -11,11 +11,7 @@ static void btn_extension_click_cb(void *data __UNUSED__, Evas_Object *btn, void *ev __UNUSED__) { -<<<<<<< HEAD - const char *lbl = elm_button_label_get(btn); -======= const char *lbl = elm_object_text_get(btn); ->>>>>>> remotes/origin/upstream if (!strncmp(lbl, "Load", 4)) { diff --git a/src/examples/win_example.c b/src/examples/win_example.c index b8ed5c5..b7dd170 100644 --- a/src/examples/win_example.c +++ b/src/examples/win_example.c @@ -211,11 +211,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) o = elm_icon_add(win2); elm_icon_file_set(o, PACKAGE_DATA_DIR "/images/logo.png", NULL); -<<<<<<< HEAD - elm_icon_scale_set(o, 0, 0); -======= elm_icon_resizable_set(o, 0, 0); ->>>>>>> remotes/origin/upstream elm_icon_no_scale_set(o, EINA_TRUE); elm_win_resize_object_add(win2, o); evas_object_show(o);