From c28915f35fec86ac959e88da4acd3d7da8b4ad5f Mon Sep 17 00:00:00 2001 From: shilpa singh Date: Thu, 8 Mar 2012 18:48:50 +0530 Subject: [PATCH] elementary merging. --- data/themes/widgets/panel.edc | 200 ------------------------------- src/bin/test_colorselector.c | 4 - src/bin/test_panel.c | 38 ------ src/edje_externals/elm_segment_control.c | 7 -- src/lib/elc_player.c | 16 --- src/lib/elm_colorselector.c | 68 ----------- src/lib/elm_colorselector.h | 6 - src/lib/elm_panel.h | 19 --- src/lib/elm_progressbar.h | 30 ----- src/lib/elm_segment_control.c | 54 --------- src/lib/elm_segment_control.h | 13 -- 11 files changed, 455 deletions(-) diff --git a/data/themes/widgets/panel.edc b/data/themes/widgets/panel.edc index c0572d5..8d57f70 100644 --- a/data/themes/widgets/panel.edc +++ b/data/themes/widgets/panel.edc @@ -48,12 +48,6 @@ group { { state: "default" 0.0; color: 255 255 255 0; -<<<<<<< HEAD - rel1.relative: 0.0 0.0; - rel1.offset: 0 0; - rel2.relative: 1.0 1.0; -======= ->>>>>>> remotes/origin/upstream rel2.offset: -1 -1; } description @@ -68,27 +62,6 @@ group { } part { -<<<<<<< HEAD - name: "base"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - rel2.offset: -20 -1; - image - { - normal: "bt_dis_base.png"; - border: 4 4 4 4; - } - } - } - part - { -======= ->>>>>>> remotes/origin/upstream name: "clipper"; type: RECT; mouse_events: 0; @@ -109,21 +82,6 @@ group { } part { -<<<<<<< HEAD - name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "clipper"; - description - { - state: "default" 0.0; - rel1.to: "clipper"; - rel2.to: "clipper"; - } - } - part - { -======= ->>>>>>> remotes/origin/upstream name: "btn"; type: IMAGE; mouse_events: 1; @@ -242,8 +200,6 @@ group { image.normal: "icon_arrow_right.png"; } } -<<<<<<< HEAD -======= part { name: "base"; @@ -274,7 +230,6 @@ group { rel2.to: "clipper"; } } ->>>>>>> remotes/origin/upstream } programs { @@ -412,38 +367,13 @@ group { state: "hidden" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 -1.0; -<<<<<<< HEAD - rel1.offset: 0 21; -======= rel1.offset: 0 -21; ->>>>>>> remotes/origin/upstream rel2.relative: 1.0 0.0; rel2.offset: -1 20; } } part { -<<<<<<< HEAD - name: "base"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - rel2.offset: -1 -20; - image - { - normal: "bt_dis_base.png"; - border: 4 4 4 4; - } - } - } - part - { -======= ->>>>>>> remotes/origin/upstream name: "clipper"; type: RECT; mouse_events: 0; @@ -464,36 +394,12 @@ group { } part { -<<<<<<< HEAD - name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "clipper"; - description - { - state: "default" 0.0; - rel1.to: "clipper"; - rel2.to: "clipper"; - } - } - part - { -======= ->>>>>>> remotes/origin/upstream name: "btn"; type: IMAGE; mouse_events: 1; description { state: "default" 0.0; -<<<<<<< HEAD - max: 32 48; - fixed: 1 1; - align: 0.5 1.0; - rel1 - { - relative: 0.0 1.0; - offset: -2 2; -======= max: 48 32; fixed: 1 1; align: 0.5 0.0; @@ -501,18 +407,13 @@ group { { relative: 0.0 1.0; offset: 0 -6; ->>>>>>> remotes/origin/upstream to_y: "base"; } rel2.to_y: "bg"; image { normal: "bt_base1.png"; -<<<<<<< HEAD - border: 12 4 5 0; -======= border: 12 4 0 5; ->>>>>>> remotes/origin/upstream } fill.smooth: 0; } @@ -611,8 +512,6 @@ group { image.normal: "icon_arrow_down.png"; } } -<<<<<<< HEAD -======= part { name: "base"; @@ -643,7 +542,6 @@ group { rel2.to: "clipper"; } } ->>>>>>> remotes/origin/upstream } programs { @@ -781,33 +679,9 @@ group { state: "hidden" 0.0; inherit: "default" 0.0; rel1.relative: 0.0 1.0; -<<<<<<< HEAD - rel1.offset: 0 20; - rel2.relative: 1.0 2.0; - rel2.offset: -1 21; - } - } - part - { - name: "base"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - rel1.to: "bg"; - rel1.offset: -1 -20; - rel2.to: "bg"; - image - { - normal: "bt_dis_base.png"; - border: 4 4 4 4; - } -======= rel1.offset: -1 -24; rel2.relative: 1.0 2.0; rel2.offset: 0 -21; ->>>>>>> remotes/origin/upstream } } part @@ -832,43 +706,12 @@ group { } part { -<<<<<<< HEAD - name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "clipper"; - description - { - state: "default" 0.0; - rel1.to: "clipper"; - rel2.to: "clipper"; - } - } - part - { -======= ->>>>>>> remotes/origin/upstream name: "btn"; type: IMAGE; mouse_events: 1; description { state: "default" 0.0; -<<<<<<< HEAD - max: 32 48; - fixed: 1 1; - align: 0.5 0.0; - rel1 - { - relative: 0.0 -1.0; - offset: -2 0; - to_y: "base"; - } - rel2.to_y: "bg"; - image - { - normal: "bt_base1.png"; - border: 12 4 0 5; -======= max: 48 32; fixed: 1 1; align: 0.5 0.0; @@ -882,7 +725,6 @@ group { { normal: "bt_base1.png"; border: 4 12 5 0; ->>>>>>> remotes/origin/upstream } fill.smooth: 0; } @@ -981,8 +823,6 @@ group { image.normal: "icon_arrow_up.png"; } } -<<<<<<< HEAD -======= part { name: "base"; @@ -1013,7 +853,6 @@ group { rel2.to: "clipper"; } } ->>>>>>> remotes/origin/upstream } programs { @@ -1158,27 +997,6 @@ group { } part { -<<<<<<< HEAD - name: "base"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - rel1.to: "bg"; - rel1.offset: 20 0; - rel2.to: "bg"; - image - { - normal: "bt_dis_base.png"; - border: 4 4 4 4; - } - } - } - part - { -======= ->>>>>>> remotes/origin/upstream name: "clipper"; type: RECT; mouse_events: 0; @@ -1199,21 +1017,6 @@ group { } part { -<<<<<<< HEAD - name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "clipper"; - description - { - state: "default" 0.0; - rel1.to: "clipper"; - rel2.to: "clipper"; - } - } - part - { -======= ->>>>>>> remotes/origin/upstream name: "btn"; type: IMAGE; mouse_events: 1; @@ -1335,8 +1138,6 @@ group { image.normal: "icon_arrow_left.png"; } } -<<<<<<< HEAD -======= part { name: "base"; @@ -1367,7 +1168,6 @@ group { rel2.to: "clipper"; } } ->>>>>>> remotes/origin/upstream } programs { diff --git a/src/bin/test_colorselector.c b/src/bin/test_colorselector.c index a48b22f..d36452f 100644 --- a/src/bin/test_colorselector.c +++ b/src/bin/test_colorselector.c @@ -92,9 +92,5 @@ test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve evas_object_resize(win, 320, 480); evas_object_show(win); -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream } #endif diff --git a/src/bin/test_panel.c b/src/bin/test_panel.c index c27e3ec..edd86c1 100644 --- a/src/bin/test_panel.c +++ b/src/bin/test_panel.c @@ -4,11 +4,8 @@ #endif #ifndef ELM_LIB_QUICKLAUNCH -<<<<<<< HEAD -======= #define LIST_ITEM_MAX 20 ->>>>>>> remotes/origin/upstream static Elm_Genlist_Item_Class itc; static void _bstatus(void *data, Evas_Object *obj, void *event_info); @@ -20,11 +17,8 @@ static void _item_del(void *data, Evas_Object *obj); static void _fill_list(Evas_Object *obj); static Eina_Bool _dir_has_subs(const char *path); -<<<<<<< HEAD -======= static Eina_List *dirs = NULL; ->>>>>>> remotes/origin/upstream static void _tstatus(void *data, Evas_Object *obj, void *event_info __UNUSED__) { @@ -97,26 +91,6 @@ _fill_list(Evas_Object *obj) { DIR *d; struct dirent *de; -<<<<<<< HEAD - Eina_List *dirs = NULL, *l; - char *real; - - if (!(d = opendir(getenv("HOME")))) return; - while ((de = readdir(d))) - { - char buff[PATH_MAX]; - - if (de->d_name[0] == '.') continue; - snprintf(buff, sizeof(buff), "%s/%s", getenv("HOME"), de->d_name); - if (!ecore_file_is_dir(buff)) continue; - real = ecore_file_realpath(buff); - dirs = eina_list_append(dirs, real); - } - closedir(d); - - dirs = eina_list_sort(dirs, eina_list_count(dirs), EINA_COMPARE_CB(strcoll)); - -======= Eina_List *l; char *real; unsigned int x = 0; @@ -137,7 +111,6 @@ _fill_list(Evas_Object *obj) } closedir(d); } ->>>>>>> remotes/origin/upstream EINA_LIST_FOREACH(dirs, l, real) { Eina_Bool result = EINA_FALSE; @@ -148,17 +121,9 @@ _fill_list(Evas_Object *obj) NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); else elm_genlist_item_append(obj, &itc, eina_stringshare_add(real), -<<<<<<< HEAD - NULL, ELM_GENLIST_ITEM_SUBITEMS, - NULL, NULL); - free(real); - } - eina_list_free(dirs); -======= NULL, ELM_GENLIST_ITEM_TREE, NULL, NULL); } ->>>>>>> remotes/origin/upstream } static Eina_Bool @@ -273,14 +238,11 @@ test_panel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(panel); _fill_list(list); -<<<<<<< HEAD -======= { char *dir; EINA_LIST_FREE(dirs, dir) free(dir); } ->>>>>>> remotes/origin/upstream elm_box_pack_end(vbx, bx); diff --git a/src/edje_externals/elm_segment_control.c b/src/edje_externals/elm_segment_control.c index b12b25f..953feb5 100644 --- a/src/edje_externals/elm_segment_control.c +++ b/src/edje_externals/elm_segment_control.c @@ -53,17 +53,10 @@ external_segment_control_params_parse(void *data __UNUSED__, Evas_Object *obj __ } static Evas_Object *external_segment_control_content_get(void *data __UNUSED__, -<<<<<<< HEAD - const Evas_Object *obj __UNUSED__, const char *content __UNUSED__) -{ - ERR("No content."); - return NULL; -======= const Evas_Object *obj __UNUSED__, const char *content __UNUSED__) { ERR("No content."); return NULL; ->>>>>>> remotes/origin/upstream } static void diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c index 2a2e886..a3949c8 100644 --- a/src/lib/elc_player.c +++ b/src/lib/elc_player.c @@ -101,11 +101,7 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type ty } if (!strcmp(ev->keyname, "space")) { -<<<<<<< HEAD - if (elm_video_is_playing(wd->video)) -======= if (elm_video_is_playing_get(wd->video)) ->>>>>>> remotes/origin/upstream elm_video_pause(wd->video); else elm_video_play(wd->video); @@ -195,11 +191,7 @@ _update_slider(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSE Eina_Bool seekable; if (!wd) return ; -<<<<<<< HEAD - seekable = elm_video_is_seekable(wd->video); -======= seekable = elm_video_is_seekable_get(wd->video); ->>>>>>> remotes/origin/upstream length = elm_video_play_length_get(wd->video); pos = elm_video_play_position_get(wd->video); @@ -497,11 +489,7 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) evas_object_event_callback_add(wd->video, EVAS_CALLBACK_DEL, _track_video, wd); -<<<<<<< HEAD - seekable = elm_video_is_seekable(wd->video); -======= seekable = elm_video_is_seekable_get(wd->video); ->>>>>>> remotes/origin/upstream length = elm_video_play_length_get(wd->video); pos = elm_video_play_position_get(wd->video); @@ -509,11 +497,7 @@ _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) elm_slider_min_max_set(wd->slider, 0, length); elm_slider_value_set(wd->slider, pos); -<<<<<<< HEAD - if (elm_video_is_playing(wd->video)) edje_object_signal_emit(wd->layout, "elm,player,play", "elm"); -======= if (elm_video_is_playing_get(wd->video)) edje_object_signal_emit(wd->layout, "elm,player,play", "elm"); ->>>>>>> remotes/origin/upstream else edje_object_signal_emit(wd->layout, "elm,player,pause", "elm"); evas_object_smart_callback_add(wd->emotion, "frame_decode", diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c index d7ab7e6..8c585d4 100644 --- a/src/lib/elm_colorselector.c +++ b/src/lib/elm_colorselector.c @@ -52,14 +52,6 @@ static void _hsl_to_rgb(void *data); static void _color_with_saturation(void *data); static void _color_with_lightness(void *data); static void _draw_rects(void *data, double x); -<<<<<<< HEAD -static void _arrow_cb(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _colorbar_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _left_button_clicked_cb(void *data, Evas_Object * obj, void *event_info); -static void _left_button_repeat_cb(void *data, Evas_Object * obj, void *event_info); -static void _right_button_clicked_cb(void *data, Evas_Object * obj, void *event_info); -static void _right_button_repeat_cb(void *data, Evas_Object * obj, void *event_info); -======= static void _arrow_cb(void *data, Evas_Object *obj, const char *emission, const char *source); static void _colorbar_cb(void *data, Evas *e, Evas_Object *obj, @@ -72,7 +64,6 @@ static void _right_button_clicked_cb(void *data, Evas_Object * obj, void *event_info); static void _right_button_repeat_cb(void *data, Evas_Object * obj, void *event_info); ->>>>>>> remotes/origin/upstream static void _add_colorbar(Evas_Object *obj); static void _set_color(Evas_Object *obj, int r, int g, int b, int a); @@ -434,12 +425,8 @@ _draw_rects(void *data, double x) } static void -<<<<<<< HEAD -_arrow_cb(void *data, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__) -======= _arrow_cb(void *data, Evas_Object *obj, const char *emission __UNUSED__, const char *source __UNUSED__) ->>>>>>> remotes/origin/upstream { Colorselector_Data *cp = data; double x, y; @@ -471,12 +458,8 @@ _colorbar_cb(void *data, Evas *e, Evas_Object *obj __UNUSED__, void *event_info) } static void -<<<<<<< HEAD -_left_button_clicked_cb(void *data, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) -======= _left_button_clicked_cb(void *data, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) ->>>>>>> remotes/origin/upstream { Colorselector_Data *cp = data; double x, y; @@ -511,12 +494,8 @@ _left_button_clicked_cb(void *data, Evas_Object * obj __UNUSED__, } static void -<<<<<<< HEAD -_left_button_repeat_cb(void *data, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) -======= _left_button_repeat_cb(void *data, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) ->>>>>>> remotes/origin/upstream { Colorselector_Data *cp = data; double x, y; @@ -531,12 +510,8 @@ _left_button_repeat_cb(void *data, Evas_Object * obj __UNUSED__, } static void -<<<<<<< HEAD -_right_button_clicked_cb(void *data, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) -======= _right_button_clicked_cb(void *data, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) ->>>>>>> remotes/origin/upstream { Colorselector_Data *cp = data; double x, y; @@ -571,12 +546,8 @@ _right_button_clicked_cb(void *data, Evas_Object * obj __UNUSED__, } static void -<<<<<<< HEAD -_right_button_repeat_cb(void *data, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) -======= _right_button_repeat_cb(void *data, Evas_Object * obj __UNUSED__, void *event_info __UNUSED__) ->>>>>>> remotes/origin/upstream { Colorselector_Data *cp = data; double x, y; @@ -638,12 +609,8 @@ _add_colorbar(Evas_Object *obj) /* load colorbar image */ wd->cp[i]->bar = edje_object_add(e); -<<<<<<< HEAD - snprintf(buf, sizeof(buf), "%s/%s", colorbar_name, elm_widget_style_get(obj)); -======= snprintf(buf, sizeof(buf), "%s/%s", colorbar_name, elm_widget_style_get(obj)); ->>>>>>> remotes/origin/upstream _elm_theme_object_set(obj, wd->cp[i]->bar, "colorselector", "image", buf); edje_object_part_swallow(wd->cp[i]->colorbar, "elm.bar", @@ -675,12 +642,8 @@ _add_colorbar(Evas_Object *obj) if (i == 3) { wd->cp[i]->bg_rect = edje_object_add(e); -<<<<<<< HEAD - snprintf(buf, sizeof(buf), "%s/%s", colorbar_name, elm_widget_style_get(obj)); -======= snprintf(buf, sizeof(buf), "%s/%s", colorbar_name, elm_widget_style_get(obj)); ->>>>>>> remotes/origin/upstream _elm_theme_object_set(obj, wd->cp[i]->bg_rect, "colorselector", "bg_image", buf); edje_object_part_swallow(wd->cp[i]->colorbar, "elm.bar_bg", @@ -702,27 +665,12 @@ _add_colorbar(Evas_Object *obj) /* load left button */ wd->cp[i]->lbt = elm_button_add(obj); -<<<<<<< HEAD - snprintf(buf, sizeof(buf), "colorselector/left/%s", elm_widget_style_get(obj)); -======= snprintf(buf, sizeof(buf), "colorselector/left/%s", elm_widget_style_get(obj)); ->>>>>>> remotes/origin/upstream elm_object_style_set(wd->cp[i]->lbt, buf); elm_widget_sub_object_add(obj, wd->cp[i]->lbt); edje_object_part_swallow(wd->cp[i]->colorbar, "elm.l_button", wd->cp[i]->lbt); -<<<<<<< HEAD - evas_object_smart_callback_add(wd->cp[i]->lbt, "clicked", _left_button_clicked_cb, wd->cp[i]); - elm_button_autorepeat_set(wd->cp[i]->lbt, EINA_TRUE); - elm_button_autorepeat_initial_timeout_set(wd->cp[i]->lbt, _elm_config->longpress_timeout); - elm_button_autorepeat_gap_timeout_set(wd->cp[i]->lbt, (1.0 / _elm_config->fps)); - evas_object_smart_callback_add(wd->cp[i]->lbt, "repeated",_left_button_repeat_cb, wd->cp[i]); - - /* load right button */ - wd->cp[i]->rbt = elm_button_add(obj); - snprintf(buf, sizeof(buf), "colorselector/right/%s", elm_widget_style_get(obj)); -======= evas_object_smart_callback_add(wd->cp[i]->lbt, "clicked", _left_button_clicked_cb, wd->cp[i]); elm_button_autorepeat_set(wd->cp[i]->lbt, EINA_TRUE); @@ -737,18 +685,10 @@ _add_colorbar(Evas_Object *obj) wd->cp[i]->rbt = elm_button_add(obj); snprintf(buf, sizeof(buf), "colorselector/right/%s", elm_widget_style_get(obj)); ->>>>>>> remotes/origin/upstream elm_object_style_set(wd->cp[i]->rbt, buf); elm_widget_sub_object_add(obj, wd->cp[i]->rbt); edje_object_part_swallow(wd->cp[i]->colorbar, "elm.r_button", wd->cp[i]->rbt); -<<<<<<< HEAD - evas_object_smart_callback_add(wd->cp[i]->rbt, "clicked", _right_button_clicked_cb, wd->cp[i]); - elm_button_autorepeat_set(wd->cp[i]->rbt, EINA_TRUE); - elm_button_autorepeat_initial_timeout_set(wd->cp[i]->rbt, _elm_config->longpress_timeout); - elm_button_autorepeat_gap_timeout_set(wd->cp[i]->rbt, (1.0 / _elm_config->fps)); - evas_object_smart_callback_add(wd->cp[i]->rbt, "repeated",_right_button_repeat_cb, wd->cp[i]); -======= evas_object_smart_callback_add(wd->cp[i]->rbt, "clicked", _right_button_clicked_cb, wd->cp[i]); elm_button_autorepeat_set(wd->cp[i]->rbt, EINA_TRUE); @@ -758,7 +698,6 @@ _add_colorbar(Evas_Object *obj) (1.0 / _elm_config->fps)); evas_object_smart_callback_add(wd->cp[i]->rbt, "repeated", _right_button_repeat_cb, wd->cp[i]); ->>>>>>> remotes/origin/upstream } } @@ -841,11 +780,7 @@ elm_colorselector_color_set(Evas_Object *obj, int r, int g, int b, int a) } EAPI void -<<<<<<< HEAD -elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g, int *b, int*a) -======= elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a) ->>>>>>> remotes/origin/upstream { Widget_Data *wd = elm_widget_data_get(obj); ELM_CHECK_WIDTYPE(obj, widtype); @@ -855,8 +790,6 @@ elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g, int *b, int if (b) *b = wd->b; if (a) *a = wd->a; } -<<<<<<< HEAD -======= EAPI void elm_colorselector_mode_set(Evas_Object *obj, Elm_Colorselector_Mode mode __UNUSED__) @@ -916,4 +849,3 @@ elm_colorselector_palette_name_get(const Evas_Object *obj) //TODO: Implement! return NULL; } ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_colorselector.h b/src/lib/elm_colorselector.h index 21e0d50..19707ec 100644 --- a/src/lib/elm_colorselector.h +++ b/src/lib/elm_colorselector.h @@ -14,8 +14,6 @@ * See @ref tutorial_colorselector. */ -<<<<<<< HEAD -======= typedef enum { ELM_COLORSELECTOR_PALETTE = 0, @@ -23,7 +21,6 @@ typedef enum ELM_COLORSELECTOR_BOTH } Elm_Colorselector_Mode; ->>>>>>> remotes/origin/upstream /** * @brief Add a new colorselector to the parent * @@ -61,8 +58,6 @@ EAPI void elm_colorselector_color_set(Evas_Object *obj, int r, int g, int b, int EAPI void elm_colorselector_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a); /** -<<<<<<< HEAD -======= * Set a Colorselector mode. * Colorselector * @@ -169,6 +164,5 @@ EAPI void elm_colorselector_palette_name_set(Evas_Object *obj EAPI const char *elm_colorselector_palette_name_get(const Evas_Object *obj); /** ->>>>>>> remotes/origin/upstream * @} */ diff --git a/src/lib/elm_panel.h b/src/lib/elm_panel.h index 40e4e60..088168e 100644 --- a/src/lib/elm_panel.h +++ b/src/lib/elm_panel.h @@ -12,11 +12,7 @@ * @li ELM_PANEL_ORIENT_LEFT * @li ELM_PANEL_ORIENT_RIGHT * -<<<<<<< HEAD - * Default contents parts of the panel widget that you can use for are: -======= * Default content parts of the panel widget that you can use for are: ->>>>>>> remotes/origin/upstream * @li "default" - A content of the panel * * Supported elm_object common APIs. @@ -50,11 +46,7 @@ EAPI Evas_Object *elm_panel_add(Evas_Object *parent); /** * @brief Sets the orientation of the panel * -<<<<<<< HEAD - * @param parent The parent object -======= * @param obj The panel object ->>>>>>> remotes/origin/upstream * @param orient The panel orientation. Can be one of the following: * @li ELM_PANEL_ORIENT_TOP * @li ELM_PANEL_ORIENT_LEFT @@ -76,11 +68,7 @@ EAPI Elm_Panel_Orient elm_panel_orient_get(const Evas_Object *obj); * @brief Set the state of the panel. * * @param obj The panel object -<<<<<<< HEAD - * @param hidden If true, the panel will run the animation to contract -======= * @param hidden If true, the panel will run the animation to disappear. ->>>>>>> remotes/origin/upstream */ EAPI void elm_panel_hidden_set(Evas_Object *obj, Eina_Bool hidden); @@ -88,11 +76,7 @@ EAPI void elm_panel_hidden_set(Evas_Object *obj, Eina_Bo * @brief Get the state of the panel. * * @param obj The panel object -<<<<<<< HEAD - * @param hidden If true, the panel is in the "hide" state -======= * @return EINA_TRUE if it is hidden state ->>>>>>> remotes/origin/upstream */ EAPI Eina_Bool elm_panel_hidden_get(const Evas_Object *obj); @@ -104,8 +88,6 @@ EAPI Eina_Bool elm_panel_hidden_get(const Evas_Object *obj); EAPI void elm_panel_toggle(Evas_Object *obj); /** -<<<<<<< HEAD -======= * @brief Set the content of the panel. * * @param obj The panel object @@ -132,6 +114,5 @@ EAPI Evas_Object * elm_panel_content_get(const Evas_Object *obj); EAPI Evas_Object * elm_panel_content_unset(Evas_Object *obj); /** ->>>>>>> remotes/origin/upstream * @} */ diff --git a/src/lib/elm_progressbar.h b/src/lib/elm_progressbar.h index 4f86b56..ce2d217 100644 --- a/src/lib/elm_progressbar.h +++ b/src/lib/elm_progressbar.h @@ -13,30 +13,17 @@ * value. Label, icon and unit strings/objects are @b optional * for progress bars. * -<<<<<<< HEAD - * A progress bar may be @b inverted, in which state it gets its - * values inverted, with high values being on the left or top and - * low values on the right or bottom, as opposed to normally have - * the low values on the former and high values on the latter, - * respectively, for horizontal and vertical modes. -======= * A progress bar may be @b inverted, in which case it gets its * values inverted, i.e., high values being on the left or top and * low values on the right or bottom, for horizontal and vertical modes * respectively. ->>>>>>> remotes/origin/upstream * * The @b span of the progress, as set by * elm_progressbar_span_size_set(), is its length (horizontally or * vertically), unless one puts size hints on the widget to expand * on desired directions, by any container. That length will be -<<<<<<< HEAD - * scaled by the object or applications scaling factor. At any - * point code can query the progress bar for its value with -======= * scaled by the object or applications scaling factor. * Applications can query the progress bar for its value with ->>>>>>> remotes/origin/upstream * elm_progressbar_value_get(). * * Available widget styles for progress bars: @@ -45,15 +32,9 @@ * "pulse" effect is available) * * Default text parts of the progressbar widget that you can use for are: -<<<<<<< HEAD - * @li "default" - Label of the progressabar - * - * Default contents parts of the progressbar widget that you can use for are: -======= * @li "default" - Label of the progressbar * * Default content parts of the progressbar widget that you can use for are: ->>>>>>> remotes/origin/upstream * @li "icon" - An icon of the progressbar * * Supported elm_object common APIs. @@ -90,17 +71,10 @@ EAPI Evas_Object *elm_progressbar_add(Evas_Object *parent); * * By default, progress bars will display values from the low to * high value boundaries. There are, though, contexts in which the -<<<<<<< HEAD - * state of progression of a given task is @b unknown. For those, - * one can set a progress bar widget to a "pulsing state", to give - * the user an idea that some computation is being held, but - * without exact progress values. In the default theme it will -======= * progress of a given task is @b unknown. For such cases, * one can set a progress bar widget to a "pulsing state", to give * the user an idea that some computation is being held, but * without exact progress values. In the default theme, it will ->>>>>>> remotes/origin/upstream * animate its bar with the contents filling in constantly and back * to non-filled, in a loop. To start and stop this pulsing * animation, one has to explicitly call elm_progressbar_pulse(). @@ -220,11 +194,7 @@ EAPI Evas_Coord elm_progressbar_span_size_get(const Evas_Objec * area to be hidden completely. If not, it'll set the format * string for the units label's @b text. The units label is * provided a floating point value, so the units text is up display -<<<<<<< HEAD - * at most one floating point falue. Note that the units label is -======= * at most one floating point value. Note that the units label is ->>>>>>> remotes/origin/upstream * optional. Use a format string such as "%1.2f meters" for * example. * diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c index 6f755b9..cf5ecc8 100644 --- a/src/lib/elm_segment_control.c +++ b/src/lib/elm_segment_control.c @@ -437,20 +437,12 @@ _item_find(const Evas_Object *obj, int idx) static void _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -======= ->>>>>>> remotes/origin/upstream Widget_Data *wd; Elm_Segment_Item *item; if (part && strcmp(part, "default")) return; -<<<<<<< HEAD - item = (Elm_Segment_Item *) it; -======= item = (Elm_Segment_Item *)it; ->>>>>>> remotes/origin/upstream wd = elm_widget_item_data_get(item); if (!wd) return; @@ -467,14 +459,8 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label) static const char * _item_text_get_hook(const Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - if (part && strcmp(part, "default")) return NULL; - return ((Elm_Segment_Item *) it)->label; -======= if (part && strcmp(part, "default")) return NULL; return ((Elm_Segment_Item *)it)->label; ->>>>>>> remotes/origin/upstream } static void @@ -482,19 +468,11 @@ _item_content_set_hook(Elm_Object_Item *it, const char *part, Evas_Object *content) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it); -======= ->>>>>>> remotes/origin/upstream Elm_Segment_Item *item; if (part && strcmp(part, "icon")) return; -<<<<<<< HEAD - item = (Elm_Segment_Item *) it; -======= item = (Elm_Segment_Item *)it; ->>>>>>> remotes/origin/upstream //Remove the existing icon if (item->icon) @@ -517,27 +495,15 @@ _item_content_set_hook(Elm_Object_Item *it, static Evas_Object * _item_content_get_hook(const Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - if (part && strcmp(part, "icon")) return NULL; - return ((Elm_Segment_Item *) it)->icon; -======= if (part && strcmp(part, "icon")) return NULL; return ((Elm_Segment_Item *)it)->icon; ->>>>>>> remotes/origin/upstream } static Eina_Bool _item_del_pre_hook(Elm_Object_Item *it) { -<<<<<<< HEAD - ELM_OBJ_ITEM_CHECK_OR_RETURN(it, EINA_FALSE); - Widget_Data *wd; - Elm_Segment_Item *item = (Elm_Segment_Item *) it; -======= Widget_Data *wd; Elm_Segment_Item *item = (Elm_Segment_Item *)it; ->>>>>>> remotes/origin/upstream wd = elm_widget_item_data_get(item); if (!wd) return EINA_FALSE; @@ -655,11 +621,7 @@ elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon, wd->seg_items = eina_list_append(wd->seg_items, it); _update_list(wd); -<<<<<<< HEAD - return (Elm_Object_Item *) it; -======= return (Elm_Object_Item *)it; ->>>>>>> remotes/origin/upstream } EAPI Elm_Object_Item * @@ -684,11 +646,7 @@ elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, wd->seg_items = eina_list_append(wd->seg_items, it); _update_list(wd); -<<<<<<< HEAD - return (Elm_Object_Item *) it; -======= return (Elm_Object_Item *)it; ->>>>>>> remotes/origin/upstream } EAPI void @@ -709,11 +667,7 @@ elm_segment_control_item_del_at(Evas_Object *obj, int idx) it = _item_find(obj, idx); if (!it) return; -<<<<<<< HEAD - elm_object_item_del((Elm_Object_Item *) it); -======= elm_object_item_del((Elm_Object_Item *)it); ->>>>>>> remotes/origin/upstream } EAPI const char* @@ -779,11 +733,7 @@ elm_segment_control_item_selected_set(Elm_Object_Item *it, Eina_Bool selected) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it); Widget_Data *wd; -<<<<<<< HEAD - Elm_Segment_Item *item = (Elm_Segment_Item *) it; -======= Elm_Segment_Item *item = (Elm_Segment_Item *)it; ->>>>>>> remotes/origin/upstream wd = elm_widget_item_data_get(item); if (!wd) return; @@ -813,9 +763,5 @@ EAPI int elm_segment_control_item_index_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, -1); -<<<<<<< HEAD - return ((Elm_Segment_Item *) it)->seg_index; -======= return ((Elm_Segment_Item *)it)->seg_index; ->>>>>>> remotes/origin/upstream } diff --git a/src/lib/elm_segment_control.h b/src/lib/elm_segment_control.h index 443e0a7..45f5c6f 100644 --- a/src/lib/elm_segment_control.h +++ b/src/lib/elm_segment_control.h @@ -26,11 +26,7 @@ * Available styles for it: * - @c "default" * -<<<<<<< HEAD - * Default contents parts of the segment control items that you can use for are: -======= * Default content parts of the segment control items that you can use for are: ->>>>>>> remotes/origin/upstream * @li "icon" - An icon in a segment control item * * Default text parts of the segment control items that you can use for are: @@ -100,11 +96,7 @@ EAPI Evas_Object *elm_segment_control_add(Evas_Object *parent); * sc = elm_segment_control_add(win); * ic = elm_icon_add(win); * elm_icon_file_set(ic, "path/to/image", NULL); -<<<<<<< HEAD - * elm_icon_scale_set(ic, EINA_TRUE, EINA_TRUE); -======= * elm_icon_resizable_set(ic, EINA_TRUE, EINA_TRUE); ->>>>>>> remotes/origin/upstream * elm_segment_control_item_add(sc, ic, "label"); * evas_object_show(sc); * @endcode @@ -281,13 +273,8 @@ EAPI Elm_Object_Item *elm_segment_control_item_selected_get(const Evas_Object *o * This sets the selected state of the given item @p it. * @c EINA_TRUE for selected, @c EINA_FALSE for not selected. * -<<<<<<< HEAD - * If a new item is selected the previosly selected will be unselected. - * Previoulsy selected item can be get with function -======= * If a new item is selected the previously selected will be unselected. * Selected item can be got with function ->>>>>>> remotes/origin/upstream * elm_segment_control_item_selected_get(). * * The selected item always will be highlighted on segment control. -- 2.7.4