From da23378b0289feb1a0afd3f77791f738d8e222e8 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Thu, 8 Mar 2012 22:08:01 +0900 Subject: [PATCH] [Migration] Conflict Fix: ctxpopup, diskselector, flipselector, spinner, tooltip (theme, doc and bin only) --- data/themes/widgets/ctxpopup.edc | 53 ----------------------------- data/themes/widgets/flipselector.edc | 18 ---------- doc/widgets/widget_preview_ctxpopup.c | 12 ------- src/bin/test_ctxpopup.c | 4 --- src/bin/test_diskselector.c | 62 ---------------------------------- src/bin/test_flipselector.c | 33 ------------------ src/bin/test_spinner.c | 10 ------ src/bin/test_tooltip.c | 44 ------------------------ src/examples/ctxpopup_example_01.c | 4 --- src/examples/diskselector_example_01.c | 5 --- 10 files changed, 245 deletions(-) diff --git a/data/themes/widgets/ctxpopup.edc b/data/themes/widgets/ctxpopup.edc index 669997b..c07990c 100644 --- a/data/themes/widgets/ctxpopup.edc +++ b/data/themes/widgets/ctxpopup.edc @@ -424,10 +424,7 @@ group { name: "elm/ctxpopup/bg/default"; source: "elm"; action: STATE_SET "default" 0.0; target: "ctxpopup_bg"; -<<<<<<< HEAD -======= transition: LINEAR 0.25; ->>>>>>> remotes/origin/upstream } } } @@ -624,44 +621,26 @@ group { name: "elm/ctxpopup/base/default"; rel1 { to:"base"; relative: 0 0; } rel2 { to:"base"; relative: 0 1; } } -<<<<<<< HEAD - description { state: "up" 0.0; -======= description { state: "show_up" 0.0; ->>>>>>> remotes/origin/upstream color: 255 255 255 0; rel1 { to:"arrow_area_down"; relative: 0 1; } rel2 { to:"arrow_area_down"; relative: 1 1; } } -<<<<<<< HEAD - description { state: "left" 0.0; -======= description { state: "show_left" 0.0; ->>>>>>> remotes/origin/upstream color: 255 255 255 0; rel1 { to:"arrow_area_right"; relative: 1 0; } rel2 { to:"arrow_area_right"; relative: 1 1; } } -<<<<<<< HEAD - description { state: "right" 0.0; -======= description { state: "show_right" 0.0; ->>>>>>> remotes/origin/upstream color: 255 255 255 0; rel1 { to:"arrow_area_left"; relative: 0 0; } rel2 { to:"arrow_area_left"; relative: 0 1; } } -<<<<<<< HEAD - description { state: "down" 0.0; -======= description { state: "show_down" 0.0; ->>>>>>> remotes/origin/upstream color: 255 255 255 0; rel1 { to:"arrow_area_up"; relative: 0 0; } rel2 { to:"arrow_area_up"; relative: 1 0; } } -<<<<<<< HEAD -======= description { state: "hide_up" 0.0; color: 255 255 255 255; rel1 { to:"arrow_area_down"; relative: 0 1; } @@ -682,7 +661,6 @@ group { name: "elm/ctxpopup/base/default"; rel1 { to:"arrow_area_up"; relative: 0 0; } rel2 { to:"arrow_area_up"; relative: 1 0; } } ->>>>>>> remotes/origin/upstream description { state: "visible" 0.0; color: 255 255 255 255; rel1 { to_x:"arrow_area_left"; to_y:"arrow_area_up"; } @@ -698,36 +676,6 @@ group { name: "elm/ctxpopup/base/default"; transition: LINEAR 0.25; target: "ctxpopup_clip"; } -<<<<<<< HEAD - program { name: "up"; - signal: "elm,state,show,up"; - source: "elm"; - action: STATE_SET "up" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - } - program { name: "left"; - signal: "elm,state,show,left"; - source: "elm"; - action: STATE_SET "left" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - } - program { name: "right"; - signal: "elm,state,show,right"; - source: "elm"; - action: STATE_SET "right" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - } - program { name: "down"; - signal: "elm,state,show,down"; - source: "elm"; - action: STATE_SET "down" 0.0; - transition: LINEAR 0.25; - target: "ctxpopup_clip"; - } -======= program { name: "show_up"; signal: "elm,state,show,up"; source: "elm"; @@ -792,7 +740,6 @@ group { name: "elm/ctxpopup/base/default"; action: SIGNAL_EMIT "elm,action,hide,finished" ""; } ->>>>>>> remotes/origin/upstream } } /////////////////////////////////////////////////////////////////////////////// diff --git a/data/themes/widgets/flipselector.edc b/data/themes/widgets/flipselector.edc index 0039af2..99d9cf1 100644 --- a/data/themes/widgets/flipselector.edc +++ b/data/themes/widgets/flipselector.edc @@ -379,10 +379,7 @@ group { name: "elm/flipselector/base/default"; part { name: "arrow_top"; mouse_events: 0; -<<<<<<< HEAD -======= clip_to: "disclip"; ->>>>>>> remotes/origin/upstream scale: 1; description { state: "default" 0.0; min: 15 15; @@ -399,10 +396,7 @@ group { name: "elm/flipselector/base/default"; } part { name: "arrow_bottom"; mouse_events: 0; -<<<<<<< HEAD -======= clip_to: "disclip"; ->>>>>>> remotes/origin/upstream scale: 1; description { state: "default" 0.0; min: 15 15; @@ -422,10 +416,7 @@ group { name: "elm/flipselector/base/default"; type: RECT; mouse_events: 0; name: "top_clipper"; -<<<<<<< HEAD -======= clip_to: "disclip"; ->>>>>>> remotes/origin/upstream description { state: "default" 0.0; rel1.to: "t"; @@ -438,10 +429,7 @@ group { name: "elm/flipselector/base/default"; type: RECT; mouse_events: 0; name: "bottom_clipper"; -<<<<<<< HEAD -======= clip_to: "disclip"; ->>>>>>> remotes/origin/upstream description { state: "default" 0.0; rel1.to: "b"; @@ -449,8 +437,6 @@ group { name: "elm/flipselector/base/default"; visible: 1; } } -<<<<<<< HEAD -======= part { type: RECT; @@ -480,7 +466,6 @@ group { name: "elm/flipselector/base/default"; } } ->>>>>>> remotes/origin/upstream } programs { @@ -535,8 +520,6 @@ group { name: "elm/flipselector/base/default"; source: "b"; action: SIGNAL_EMIT "elm,action,down,stop" ""; } -<<<<<<< HEAD -======= program { name: "disable"; signal: "elm,state,disabled"; source: "elm"; @@ -551,6 +534,5 @@ group { name: "elm/flipselector/base/default"; target: "disclip"; target: "event_blocker"; } ->>>>>>> remotes/origin/upstream } } diff --git a/doc/widgets/widget_preview_ctxpopup.c b/doc/widgets/widget_preview_ctxpopup.c index 4bb4f014..e8492f8 100644 --- a/doc/widgets/widget_preview_ctxpopup.c +++ b/doc/widgets/widget_preview_ctxpopup.c @@ -8,29 +8,17 @@ Evas_Object *ctxpopup = elm_ctxpopup_add(o); Evas_Object *ic = elm_icon_add(ctxpopup); 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 elm_ctxpopup_item_append(ctxpopup, "Go to home folder", ic, NULL, NULL); ic = elm_icon_add(ctxpopup); elm_icon_standard_set(ic, "delete"); -<<<<<<< HEAD -elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE); -======= elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE); ->>>>>>> remotes/origin/upstream elm_ctxpopup_item_append(ctxpopup, "Delete file", ic, NULL, NULL); ic = elm_icon_add(ctxpopup); elm_icon_standard_set(ic, "folder"); -<<<<<<< HEAD -elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE); -======= elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE); ->>>>>>> remotes/origin/upstream Elm_Object_Item *it = elm_ctxpopup_item_append(ctxpopup, "Navigate to folder", ic, NULL, NULL); elm_object_item_disabled_set(it, EINA_TRUE); diff --git a/src/bin/test_ctxpopup.c b/src/bin/test_ctxpopup.c index 569cc70..4adf964 100644 --- a/src/bin/test_ctxpopup.c +++ b/src/bin/test_ctxpopup.c @@ -81,11 +81,7 @@ _ctxpopup_item_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even { \ ic = elm_icon_add(obj); \ elm_icon_standard_set(ic, _icon); \ -<<<<<<< HEAD - elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE); \ -======= elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE); \ ->>>>>>> remotes/origin/upstream } \ else \ ic = NULL; \ diff --git a/src/bin/test_diskselector.c b/src/bin/test_diskselector.c index 894908e..621abde 100644 --- a/src/bin/test_diskselector.c +++ b/src/bin/test_diskselector.c @@ -1,15 +1,10 @@ #include -<<<<<<< HEAD -======= #include "test.h" #include ->>>>>>> remotes/origin/upstream #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif #ifndef ELM_LIB_QUICKLAUNCH -<<<<<<< HEAD -======= struct _api_data { unsigned int state; /* What state we are testing */ @@ -146,7 +141,6 @@ _api_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__) elm_object_text_set(obj, str); elm_object_disabled_set(obj, a->state == API_STATE_LAST); } ->>>>>>> remotes/origin/upstream static void _disk_sel(void *data __UNUSED__, Evas_Object * obj __UNUSED__, void *event_info) @@ -173,11 +167,7 @@ _print_disk_info_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev } static Evas_Object * -<<<<<<< HEAD -_disk_create(Evas_Object *win, Eina_Bool round) -======= _disk_create(Evas_Object *win, Eina_Bool rnd) ->>>>>>> remotes/origin/upstream { Elm_Object_Item *ds_it; Evas_Object *di; @@ -198,23 +188,11 @@ _disk_create(Evas_Object *win, Eina_Bool rnd) elm_diskselector_item_append(di, "December", NULL, NULL, NULL); elm_diskselector_item_selected_set(ds_it, EINA_TRUE); -<<<<<<< HEAD - elm_diskselector_round_set(di, round); -======= elm_diskselector_round_enabled_set(di, rnd); ->>>>>>> remotes/origin/upstream return di; } -<<<<<<< HEAD -void -test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -{ - Evas_Object *win, *bg, *bx, *disk, *ic; - Elm_Object_Item *ds_it; - char buf[PATH_MAX]; -======= static void _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -228,7 +206,6 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even Elm_Object_Item *ds_it; char buf[PATH_MAX]; api_data *api = calloc(1, sizeof(api_data)); ->>>>>>> remotes/origin/upstream int idx = 0; char *month_list[] = { @@ -242,10 +219,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC); elm_win_title_set(win, "Disk Selector"); elm_win_autodel_set(win, EINA_TRUE); -<<<<<<< HEAD -======= evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); ->>>>>>> remotes/origin/upstream bg = elm_bg_add(win); elm_win_resize_object_add(win, bg); @@ -253,22 +227,15 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(bg); -<<<<<<< HEAD -======= bxx = elm_box_add(win); elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bxx); ->>>>>>> remotes/origin/upstream bx = elm_box_add(win); elm_win_resize_object_add(win, bx); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); -<<<<<<< HEAD - evas_object_show(bx); - -======= api->box = bx; evas_object_show(bx); @@ -281,7 +248,6 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even elm_box_pack_end(bxx, bx); ->>>>>>> remotes/origin/upstream disk = _disk_create(win, EINA_TRUE); evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(disk, EVAS_HINT_FILL, 0.5); @@ -307,21 +273,13 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even elm_box_pack_end(bx, disk); evas_object_show(disk); evas_object_smart_callback_add(disk, "selected", _print_disk_info_cb, NULL); -<<<<<<< HEAD - elm_diskselector_side_label_length_set(disk, 4); -======= elm_diskselector_side_text_max_length_set(disk, 4); ->>>>>>> remotes/origin/upstream disk = elm_diskselector_add(win); ic = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); -<<<<<<< HEAD - elm_icon_scale_set(ic, 1, 1); -======= elm_icon_resizable_set(ic, 1, 1); ->>>>>>> remotes/origin/upstream elm_diskselector_item_append(disk, "Sunday", ic, NULL, NULL); elm_diskselector_item_append(disk, "Monday", NULL, NULL, NULL); elm_diskselector_item_append(disk, "Tuesday", NULL, NULL, NULL); @@ -329,11 +287,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even elm_diskselector_item_append(disk, "Thursday", NULL, NULL, NULL); elm_diskselector_item_append(disk, "Friday", NULL, NULL, NULL); elm_diskselector_item_append(disk, "Saturday", NULL, NULL, NULL); -<<<<<<< HEAD - elm_diskselector_round_set(disk, EINA_TRUE); -======= elm_diskselector_round_enabled_set(disk, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(disk, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx, disk); @@ -344,11 +298,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even ic = elm_icon_add(win); snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); -<<<<<<< HEAD - elm_icon_scale_set(ic, 1, 1); -======= elm_icon_resizable_set(ic, 1, 1); ->>>>>>> remotes/origin/upstream elm_diskselector_item_append(disk, "머리스타일", ic, NULL, NULL); elm_diskselector_item_append(disk, "プロが伝授する", NULL, NULL, NULL); elm_diskselector_item_append(disk, "生上访要求政府", NULL, NULL, NULL); @@ -356,11 +306,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even elm_diskselector_item_append(disk, "والشريعة", NULL, NULL, NULL); elm_diskselector_item_append(disk, "עִבְרִית", NULL, NULL, NULL); elm_diskselector_item_append(disk, "Grüßen", NULL, NULL, NULL); -<<<<<<< HEAD - elm_diskselector_round_set(disk, EINA_TRUE); -======= elm_diskselector_round_enabled_set(disk, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(disk, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx, disk); @@ -380,11 +326,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even } elm_diskselector_item_selected_set(ds_it, EINA_TRUE); -<<<<<<< HEAD - elm_diskselector_round_set(disk, EINA_TRUE); -======= elm_diskselector_round_enabled_set(disk, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(disk, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx, disk); @@ -404,11 +346,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even } elm_diskselector_item_selected_set(ds_it, EINA_TRUE); -<<<<<<< HEAD - elm_diskselector_round_set(disk, EINA_TRUE); -======= elm_diskselector_round_enabled_set(disk, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(disk, EVAS_HINT_FILL, 0.5); elm_box_pack_end(bx, disk); diff --git a/src/bin/test_flipselector.c b/src/bin/test_flipselector.c index 4b84d4f..3361287 100644 --- a/src/bin/test_flipselector.c +++ b/src/bin/test_flipselector.c @@ -23,15 +23,6 @@ _unsel_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) } void -<<<<<<< HEAD -_third_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -{ - Elm_Object_Item *it; - Evas_Object *fp = data; - it = elm_flipselector_first_item_get(fp); - it = elm_flipselector_item_next_get(it); - it = elm_flipselector_item_next_get(it); -======= _last_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Elm_Object_Item *it; @@ -48,7 +39,6 @@ _third_from_end_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __U it = elm_flipselector_last_item_get(fp); it = elm_flipselector_item_prev_get(it); it = elm_flipselector_item_prev_get(it); ->>>>>>> remotes/origin/upstream elm_flipselector_item_selected_set(it, EINA_TRUE); } @@ -65,8 +55,6 @@ _overflow_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf } void -<<<<<<< HEAD -======= slider_change_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) { Evas_Object *fl = (Evas_Object *)data; @@ -90,16 +78,11 @@ flip_prev_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED_ } void ->>>>>>> remotes/origin/upstream test_flipselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { char buf[8]; unsigned int i; -<<<<<<< HEAD - Evas_Object *win, *bg, *bx, *fp, *bt; -======= Evas_Object *win, *bg, *bx, *fp, *bt, *bx2, *sl; ->>>>>>> remotes/origin/upstream static const char *lbl[] = { "Elementary", "Evas", @@ -135,36 +118,21 @@ test_flipselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even elm_box_pack_end(bx, fp); evas_object_show(fp); -<<<<<<< HEAD -======= bx2 = elm_box_add(win); evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_box_horizontal_set(bx2, EINA_TRUE); elm_box_pack_end(bx, bx2); evas_object_show(bx2); ->>>>>>> remotes/origin/upstream fp = elm_flipselector_add(win); evas_object_smart_callback_add(fp, "underflowed", _overflow_cb, NULL); evas_object_smart_callback_add(fp, "overflowed", _underflow_cb, NULL); evas_object_size_hint_weight_set(fp, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); -<<<<<<< HEAD - for (i = 2099; i >= 1990; i--) -======= for (i = 1990; i <= 2099; i++) ->>>>>>> remotes/origin/upstream { snprintf(buf, 8, "%d", i); elm_flipselector_item_append(fp, buf, _sel_cb, NULL); } -<<<<<<< HEAD - elm_box_pack_end(bx, fp); - evas_object_show(fp); - - bt = elm_button_add(win); - elm_object_text_set(bt, "Select 2097"); - evas_object_smart_callback_add(bt, "clicked", _third_cb, fp); -======= bt = elm_button_add(win); elm_object_text_set(bt, "Flip Prev"); @@ -202,7 +170,6 @@ test_flipselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even bt = elm_button_add(win); elm_object_text_set(bt, "Select 2097"); evas_object_smart_callback_add(bt, "clicked", _third_from_end_cb, fp); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, bt); evas_object_show(bt); diff --git a/src/bin/test_spinner.c b/src/bin/test_spinner.c index f4cdea7..a413d43 100644 --- a/src/bin/test_spinner.c +++ b/src/bin/test_spinner.c @@ -55,11 +55,7 @@ test_spinner(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf sp = elm_spinner_add(win); elm_spinner_label_format_set(sp, "Disabled %.0f"); -<<<<<<< HEAD - elm_object_disabled_set(sp, 1); -======= elm_object_disabled_set(sp, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_spinner_min_max_set(sp, -50.0, 250.0); evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5); evas_object_size_hint_weight_set(sp, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -67,11 +63,6 @@ test_spinner(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf evas_object_show(sp); sp = elm_spinner_add(win); -<<<<<<< HEAD - elm_spinner_min_max_set(sp, 1, 12); - elm_spinner_label_format_set(sp, "%.0f"); - elm_spinner_step_set(sp, 1.0); -======= elm_spinner_wrap_set(sp, EINA_TRUE); elm_spinner_min_max_set(sp, 1, 12); elm_spinner_value_set(sp, 1); @@ -79,7 +70,6 @@ test_spinner(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf elm_spinner_base_set(sp, 1); elm_spinner_round_set(sp, 1); elm_spinner_label_format_set(sp, "%.0f"); ->>>>>>> remotes/origin/upstream elm_spinner_editable_set(sp, EINA_FALSE); elm_spinner_special_value_add(sp, 1, "January"); elm_spinner_special_value_add(sp, 2, "February"); diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c index 57f581d..fb3ed3d 100644 --- a/src/bin/test_tooltip.c +++ b/src/bin/test_tooltip.c @@ -6,11 +6,7 @@ typedef struct _Testitem { -<<<<<<< HEAD Elm_Object_Item *item; -======= - Elm_Object_Item *item; ->>>>>>> remotes/origin/upstream const char *path; int mode; int onoff; @@ -56,19 +52,6 @@ gltt_exp(void *data __UNUSED__, void *event_info) { Elm_Object_Item *glit = event_info; -<<<<<<< HEAD - Evas_Object *gl = elm_genlist_item_genlist_get(glit); - int val = (int) elm_object_item_data_get(glit); - Elm_Object_Item *glit1, *glit2, *glit3; - - val *= 10; - glit1 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 1), glit, - ELM_GENLIST_ITEM_NONE, NULL, NULL); - glit2 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 2), glit, - ELM_GENLIST_ITEM_NONE, NULL, NULL); - glit3 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 3), glit, - ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL); -======= Evas_Object *gl = elm_object_item_widget_get(glit); int val = (int)(long) elm_object_item_data_get(glit); Elm_Object_Item *glit1, *glit2, *glit3; @@ -80,7 +63,6 @@ gltt_exp(void *data __UNUSED__, ELM_GENLIST_ITEM_NONE, NULL, NULL); glit3 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 3), glit, ELM_GENLIST_ITEM_TREE, NULL, NULL); ->>>>>>> remotes/origin/upstream elm_genlist_item_tooltip_text_set(glit1, "Testing A"); elm_genlist_item_tooltip_text_set(glit2, "Testing B"); @@ -135,11 +117,7 @@ _tt_item_icon(void *data __UNUSED__, snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); -<<<<<<< HEAD - elm_icon_scale_set(ic, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream evas_object_resize(ic, 64, 64); return ic; } @@ -154,11 +132,7 @@ _tt_item_icon2(void *data __UNUSED__, char buf[PATH_MAX]; snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); -<<<<<<< HEAD - elm_icon_scale_set(ic, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream return ic; } @@ -274,11 +248,7 @@ _tt_icon(void *data __UNUSED__, snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); -<<<<<<< HEAD - elm_icon_scale_set(ic, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream evas_object_resize(ic, 64, 64); return ic; } @@ -292,11 +262,7 @@ _tt_icon2(void *data __UNUSED__, char buf[PATH_MAX]; snprintf(buf, sizeof(buf), "%s/images/icon_00.png", elm_app_data_dir_get()); elm_icon_file_set(ic, buf, NULL); -<<<<<<< HEAD - elm_icon_scale_set(ic, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream evas_object_resize(ic, 64, 64); return ic; } @@ -515,11 +481,7 @@ test_tooltip(void *data __UNUSED__, ELM_SCROLLER_POLICY_OFF); elm_object_text_set(se, "Hello, some scrolled entry here!"); elm_object_tooltip_text_set(se, "Type something here!"); -<<<<<<< HEAD - elm_entry_single_line_set(se, 1); -======= elm_entry_single_line_set(se, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, se); evas_object_show(se); @@ -630,15 +592,9 @@ test_tooltip2(void *data __UNUSED__, itct.func.text_get = gltt_text_get; glit1 = elm_genlist_item_append(gl, &itct, (void *)1, NULL, -<<<<<<< HEAD - ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL); - glit2 = elm_genlist_item_append(gl, &itct, (void *)2, NULL, - ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL); -======= ELM_GENLIST_ITEM_TREE, NULL, NULL); glit2 = elm_genlist_item_append(gl, &itct, (void *)2, NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); ->>>>>>> remotes/origin/upstream glit3 = elm_genlist_item_append(gl, &itct, (void *)3, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); diff --git a/src/examples/ctxpopup_example_01.c b/src/examples/ctxpopup_example_01.c index 994dbc4..939920b 100644 --- a/src/examples/ctxpopup_example_01.c +++ b/src/examples/ctxpopup_example_01.c @@ -16,11 +16,7 @@ Elm_Object_Item *item_new(Evas_Object *ctxpopup, const char * label, const char { Evas_Object *ic = elm_icon_add(ctxpopup); elm_icon_standard_set(ic, icon); -<<<<<<< HEAD - elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE); -======= elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE); ->>>>>>> remotes/origin/upstream return elm_ctxpopup_item_append(ctxpopup, label, ic, _ctxpopup_item_cb, NULL); } diff --git a/src/examples/diskselector_example_01.c b/src/examples/diskselector_example_01.c index 06afd7d..58c4d39 100644 --- a/src/examples/diskselector_example_01.c +++ b/src/examples/diskselector_example_01.c @@ -71,13 +71,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) elm_box_pack_end(bx, ds); for (i = 0; i < sizeof(lbl) / sizeof(lbl[0]); i++) elm_diskselector_item_append(ds, lbl[i], NULL, NULL, NULL); -<<<<<<< HEAD - elm_diskselector_round_set(ds, EINA_TRUE); - elm_diskselector_side_label_length_set(ds, 2); -======= elm_diskselector_round_enabled_set(ds, EINA_TRUE); elm_diskselector_side_text_max_length_set(ds, 2); ->>>>>>> remotes/origin/upstream evas_object_show(ds); /* display more than 3 items */ -- 2.7.4