From: Rajeev Ranjan Date: Thu, 8 Mar 2012 09:51:18 +0000 (+0530) Subject: SVN Merging for button, radio, check and toggle X-Git-Tag: REL_F_I9500_20120317_1~18^2~41^2~3^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=662c450babff44fbf1282406d81730a53fa72640;p=framework%2Fuifw%2Felementary.git SVN Merging for button, radio, check and toggle --- diff --git a/data/themes/widgets/button.edc b/data/themes/widgets/button.edc index 92d122f..11dcd42 100644 --- a/data/themes/widgets/button.edc +++ b/data/themes/widgets/button.edc @@ -1,8 +1,5 @@ group { name: "elm/button/base/default"; -<<<<<<< HEAD -======= alias: "elm/button/base/popup_button/default"; ->>>>>>> remotes/origin/upstream images { image: "bt_base1.png" COMP; image: "bt_base2.png" COMP; diff --git a/src/bin/test_button.c b/src/bin/test_button.c index 4581452..84385d4 100644 --- a/src/bin/test_button.c +++ b/src/bin/test_button.c @@ -18,11 +18,7 @@ _bt_repeated(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED_ static void _bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { -<<<<<<< HEAD - int param = (int)(data); -======= int param = (int)(long)(data); ->>>>>>> remotes/origin/upstream printf("clicked event on Button:%d\n", param); } @@ -30,11 +26,7 @@ _bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__ static void _bt_unpressed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { -<<<<<<< HEAD - int param = (int)(data); -======= int param = (int)(long)(data); ->>>>>>> remotes/origin/upstream printf("unpressed event on Button:%d\n", param); } @@ -82,11 +74,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info ic = elm_icon_add(bx); 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 bt = elm_button_add(win); elm_object_text_set(bt, "Icon no scale"); elm_object_part_content_set(bt, "icon", ic); @@ -103,11 +91,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info bt = elm_button_add(win); elm_object_text_set(bt, "Disabled Button"); elm_object_part_content_set(bt, "icon", ic); -<<<<<<< HEAD - elm_object_disabled_set(bt, 1); -======= elm_object_disabled_set(bt, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)3); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)3); elm_box_pack_end(bx, bt); @@ -120,11 +104,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bt = elm_button_add(win); elm_object_part_content_set(bt, "icon", ic); -<<<<<<< HEAD - elm_object_disabled_set(bt, 1); -======= elm_object_disabled_set(bt, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)4); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)4); elm_box_pack_end(bx, bt); @@ -137,11 +117,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)5); elm_box_pack_end(bx, bt); evas_object_smart_callback_add(bt, "repeated", _bt_repeated, NULL); -<<<<<<< HEAD - elm_button_autorepeat_set(bt, 1); -======= elm_button_autorepeat_set(bt, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_button_autorepeat_initial_timeout_set(bt, 2.0); elm_button_autorepeat_gap_timeout_set(bt, 0.5); evas_object_show(bt); @@ -149,11 +125,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream bt = elm_button_add(win); elm_object_part_content_set(bt, "icon", ic); evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)6); @@ -191,11 +163,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_object_access_info_set(bt, "This is some custom text describing this widget"); elm_object_style_set(bt, "anchor"); elm_object_part_content_set(bt, "icon", ic); -<<<<<<< HEAD - elm_object_disabled_set(bt, 1); -======= elm_object_disabled_set(bt, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)9); evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)9); elm_box_pack_end(bx, bt); diff --git a/src/bin/test_check.c b/src/bin/test_check.c index 36321f7..bbbcc15 100644 --- a/src/bin/test_check.c +++ b/src/bin/test_check.c @@ -3,12 +3,9 @@ # include "elementary_config.h" #endif #ifndef ELM_LIB_QUICKLAUNCH -<<<<<<< HEAD -======= static Eina_Bool eb; ->>>>>>> remotes/origin/upstream static void changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) { @@ -18,15 +15,12 @@ changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) printf("ck2 %p is now %i\n", ck2, elm_check_state_get(ck2)); } -<<<<<<< HEAD -======= static void state_changed_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { printf("State Pointer Value: %d\n", eb); } ->>>>>>> remotes/origin/upstream void test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -66,11 +60,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream ck = elm_check_add(win); elm_object_text_set(ck, "Icon no scale"); elm_object_part_content_set(ck, "icon", ic); @@ -85,8 +75,6 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_box_pack_end(bx, ck); evas_object_show(ck); -<<<<<<< HEAD -======= ck = elm_check_add(win); elm_object_text_set(ck, "Using State Pointer"); elm_check_state_pointer_set(ck, &eb); @@ -99,7 +87,6 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(ck); evas_object_smart_callback_add(ck, "changed", state_changed_cb, NULL); ->>>>>>> remotes/origin/upstream 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); @@ -118,11 +105,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream ck = elm_check_add(win); elm_object_part_content_set(ck, "icon", ic); elm_box_pack_end(bx, ck); diff --git a/src/bin/test_fileselector_button.c b/src/bin/test_fileselector_button.c index 387bae2..ed565bd 100644 --- a/src/bin/test_fileselector_button.c +++ b/src/bin/test_fileselector_button.c @@ -1,15 +1,10 @@ #include -<<<<<<< HEAD -======= #include "test.h" ->>>>>>> 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 */ @@ -88,7 +83,6 @@ create_dir_struct(void) if (fp) fclose(fp); } ->>>>>>> remotes/origin/upstream static void _file_chosen(void *data, Evas_Object *obj __UNUSED__, @@ -150,47 +144,30 @@ _expandable_toggle(void *data, printf("Expandable flag set to: %s\n", value ? "false" : "true"); } -<<<<<<< HEAD -======= static void _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { free(data); } ->>>>>>> remotes/origin/upstream void test_fileselector_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { -<<<<<<< HEAD - Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_bt, *en, *lb; -======= Evas_Object *win, *bg, *vbox, *hbox, *ic, *bt, *fs_bt, *en, *lb, *bxx; api_data *api = calloc(1, sizeof(api_data)); ->>>>>>> remotes/origin/upstream win = elm_win_add(NULL, "fileselector-button", ELM_WIN_BASIC); elm_win_title_set(win, "File Selector Button"); 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); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(bg); -<<<<<<< HEAD - vbox = elm_box_add(win); - elm_win_resize_object_add(win, vbox); - evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(vbox); - -======= 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); @@ -210,7 +187,6 @@ test_fileselector_button(void *data __UNUSED__, elm_box_pack_end(bxx, vbox); create_dir_struct(); /* Create a dir struct in /tmp */ ->>>>>>> remotes/origin/upstream /* file selector button */ ic = elm_icon_add(win); elm_icon_standard_set(ic, "file"); @@ -218,10 +194,7 @@ test_fileselector_button(void *data __UNUSED__, fs_bt = elm_fileselector_button_add(win); elm_object_text_set(fs_bt, "Select a file"); elm_object_part_content_set(fs_bt, "icon", ic); -<<<<<<< HEAD -======= elm_fileselector_button_path_set(fs_bt, "/tmp/test_fs_bt"); ->>>>>>> remotes/origin/upstream elm_box_pack_end(vbox, fs_bt); evas_object_show(fs_bt); @@ -277,8 +250,4 @@ test_fileselector_button(void *data __UNUSED__, evas_object_resize(win, 400, 400); evas_object_show(win); } -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream #endif diff --git a/src/bin/test_radio.c b/src/bin/test_radio.c index 59b175f..f806bdc 100644 --- a/src/bin/test_radio.c +++ b/src/bin/test_radio.c @@ -42,11 +42,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream rd = elm_radio_add(win); elm_radio_state_value_set(rd, 1); @@ -68,22 +64,14 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_radio_state_value_set(rd, 3); elm_radio_group_add(rd, rdg); elm_object_text_set(rd, "Disabled"); -<<<<<<< HEAD - elm_object_disabled_set(rd, 1); -======= elm_object_disabled_set(rd, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, rd); evas_object_show(rd); 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, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream rd = elm_radio_add(win); elm_radio_state_value_set(rd, 4); @@ -96,21 +84,13 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream rd = elm_radio_add(win); elm_radio_state_value_set(rd, 5); elm_radio_group_add(rd, rdg); elm_object_part_content_set(rd, "icon", ic); -<<<<<<< HEAD - elm_object_disabled_set(rd, 1); -======= elm_object_disabled_set(rd, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, rd); evas_object_show(rd); evas_object_show(ic); diff --git a/src/bin/test_toggle.c b/src/bin/test_toggle.c index ca0a335..f91a410 100644 --- a/src/bin/test_toggle.c +++ b/src/bin/test_toggle.c @@ -34,11 +34,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(tg, EVAS_HINT_FILL, 0.5); elm_object_text_set(tg, "Icon sized to toggle"); elm_object_part_content_set(tg, "icon", ic); -<<<<<<< HEAD - elm_check_state_set(tg, 1); -======= elm_check_state_set(tg, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_object_part_text_set(tg, "on", "Yes"); elm_object_part_text_set(tg, "off", "No"); elm_box_pack_end(bx, tg); @@ -48,11 +44,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream tg = elm_check_add(win); elm_object_style_set(tg, "toggle"); @@ -65,21 +57,13 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream tg = elm_check_add(win); elm_object_style_set(tg, "toggle"); elm_object_text_set(tg, "Icon no scale"); elm_object_part_content_set(tg, "icon", ic); -<<<<<<< HEAD - elm_object_disabled_set(tg, 1); -======= elm_object_disabled_set(tg, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, tg); evas_object_show(tg); evas_object_show(ic); @@ -95,11 +79,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info 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, 0, 0); -======= elm_icon_resizable_set(ic, 0, 0); ->>>>>>> remotes/origin/upstream tg = elm_check_add(win); elm_object_style_set(tg, "toggle"); diff --git a/src/edje_externals/elm_button.c b/src/edje_externals/elm_button.c index 08941b1..9d056df 100644 --- a/src/edje_externals/elm_button.c +++ b/src/edje_externals/elm_button.c @@ -5,15 +5,12 @@ typedef struct _Elm_Params_Button Elm_Params base; const char *label; Evas_Object *icon; -<<<<<<< HEAD -======= double autorepeat_initial; double autorepeat_gap; Eina_Bool autorepeat:1; Eina_Bool autorepeat_exists:1; Eina_Bool autorepeat_gap_exists:1; Eina_Bool autorepeat_initial_exists:1; ->>>>>>> remotes/origin/upstream } Elm_Params_Button; static void @@ -29,15 +26,12 @@ external_button_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f elm_object_text_set(obj, p->label); if (p->icon) elm_object_part_content_set(obj, "icon", p->icon); -<<<<<<< HEAD -======= if (p->autorepeat_gap_exists) elm_button_autorepeat_gap_timeout_set(obj, p->autorepeat_gap); if (p->autorepeat_initial_exists) elm_button_autorepeat_initial_timeout_set(obj, p->autorepeat_initial); if (p->autorepeat_exists) elm_button_autorepeat_set(obj, p->autorepeat); ->>>>>>> remotes/origin/upstream } static Eina_Bool @@ -61,8 +55,6 @@ external_button_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex return EINA_TRUE; } } -<<<<<<< HEAD -======= else if (!strcmp(param->name, "autorepeat_initial")) { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) @@ -87,7 +79,6 @@ external_button_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex return EINA_TRUE; } } ->>>>>>> remotes/origin/upstream ERR("unknown parameter '%s' of type '%s'", param->name, edje_external_param_type_str(param->type)); @@ -111,8 +102,6 @@ external_button_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex /* not easy to get icon name back from live object */ return EINA_FALSE; } -<<<<<<< HEAD -======= else if (!strcmp(param->name, "autorepeat_initial")) { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE) @@ -137,7 +126,6 @@ external_button_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex return EINA_TRUE; } } ->>>>>>> remotes/origin/upstream ERR("unknown parameter '%s' of type '%s'", param->name, edje_external_param_type_str(param->type)); @@ -160,13 +148,6 @@ external_button_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina EINA_LIST_FOREACH(params, l, param) { -<<<<<<< HEAD - if (!strcmp(param->name, "label")) - { - mem->label = eina_stringshare_add(param->s); - break; - } -======= if (!strcmp(param->name, "autorepeat_initial")) { mem->autorepeat_initial = param->d; @@ -184,7 +165,6 @@ external_button_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina } else if (!strcmp(param->name, "label")) mem->label = eina_stringshare_add(param->s); ->>>>>>> remotes/origin/upstream } return mem; @@ -210,12 +190,9 @@ static Edje_External_Param_Info external_button_params[] = { DEFINE_EXTERNAL_COMMON_PARAMS, EDJE_EXTERNAL_PARAM_INFO_STRING("label"), EDJE_EXTERNAL_PARAM_INFO_STRING("icon"), -<<<<<<< HEAD -======= EDJE_EXTERNAL_PARAM_INFO_DOUBLE("autorepeat_initial"), EDJE_EXTERNAL_PARAM_INFO_DOUBLE("autorepeat_gap"), EDJE_EXTERNAL_PARAM_INFO_BOOL("autorepeat"), ->>>>>>> remotes/origin/upstream EDJE_EXTERNAL_PARAM_INFO_SENTINEL }; diff --git a/src/examples/button_example_01.c b/src/examples/button_example_01.c index 78dfc00..b49eafe 100644 --- a/src/examples/button_example_01.c +++ b/src/examples/button_example_01.c @@ -77,11 +77,7 @@ _btn_options_cb(void *data, Evas_Object *btn, void *ev __UNUSED__) char *ptr; double t; App_Data *app = data; -<<<<<<< HEAD - const char *lbl = elm_button_label_get(btn); -======= const char *lbl = elm_object_text_get(btn); ->>>>>>> remotes/origin/upstream ptr = strchr(lbl, ':'); ptr += 2; diff --git a/src/lib/elc_fileselector_button.c b/src/lib/elc_fileselector_button.c index 625a492..452498d 100644 --- a/src/lib/elc_fileselector_button.c +++ b/src/lib/elc_fileselector_button.c @@ -349,21 +349,6 @@ elm_fileselector_button_add(Evas_Object *parent) return obj; } -<<<<<<< HEAD -EAPI void -elm_fileselector_button_label_set(Evas_Object *obj, - const char *label) -{ - _elm_fileselector_button_label_set(obj, NULL, label); -} - -EAPI const char * -elm_fileselector_button_label_get(const Evas_Object *obj) -{ - return _elm_fileselector_button_label_get(obj, NULL); -} -======= ->>>>>>> remotes/origin/upstream EAPI void elm_fileselector_button_window_title_set(Evas_Object *obj, @@ -533,26 +518,3 @@ elm_fileselector_button_inwin_mode_get(const Evas_Object *obj) if (!wd) return EINA_FALSE; return wd->inwin_mode; } -<<<<<<< HEAD - -EAPI void -elm_fileselector_button_icon_set(Evas_Object *obj, - Evas_Object *icon) -{ - _content_set_hook(obj, NULL, icon); -} - -EAPI Evas_Object * -elm_fileselector_button_icon_get(const Evas_Object *obj) -{ - return _content_get_hook(obj, NULL); -} - -EAPI Evas_Object * -elm_fileselector_button_icon_unset(Evas_Object *obj) -{ - return _content_unset_hook(obj, NULL); -} - -======= ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elc_fileselector_button.h b/src/lib/elc_fileselector_button.h index 04b8195..73c9651 100644 --- a/src/lib/elc_fileselector_button.h +++ b/src/lib/elc_fileselector_button.h @@ -16,11 +16,7 @@ * * This widget encapsulates operations on its internal file * selector on its own API. There is less control over its file -<<<<<<< HEAD - * selector than that one would have instatiating one directly. -======= * selector than that one would have instantiating one directly. ->>>>>>> remotes/origin/upstream * * The following styles are available for this button: * @li @c "default" @@ -37,11 +33,7 @@ * are: * @li "default" - Label of the fileselector_button * -<<<<<<< HEAD - * Default contents parts of the fileselector_button widget that you can use for -======= * Default content parts of the fileselector_button widget that you can use for ->>>>>>> remotes/origin/upstream * are: * @li "icon" - Icon of the fileselector_button * @@ -77,19 +69,11 @@ EAPI Evas_Object *elm_fileselector_button_add(Evas_Object *parent * @param obj The file selector button widget * @param title The title string * -<<<<<<< HEAD - * This will change the window's title, when the file selector pops - * out after a click on the button. Those windows have the default - * (unlocalized) value of @c "Select a file" as titles. - * - * @note It will only take any effect if the file selector -======= * This will change the popup window's title, when the file selector pops * out after a click on the button. Those windows have the default * (unlocalized) value of @c "Select a file" as titles. * * @note It will only take effect if the file selector ->>>>>>> remotes/origin/upstream * button widget is @b not under "inwin mode". * * @see elm_fileselector_button_window_title_get() @@ -97,11 +81,7 @@ EAPI Evas_Object *elm_fileselector_button_add(Evas_Object *parent EAPI void elm_fileselector_button_window_title_set(Evas_Object *obj, const char *title); /** -<<<<<<< HEAD - * Get the title set for a given file selector button widget's -======= * Get the title for a given file selector button widget's ->>>>>>> remotes/origin/upstream * window * * @param obj The file selector button widget diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c index 451b6dd..cdd5330 100644 --- a/src/lib/elm_button.c +++ b/src/lib/elm_button.c @@ -468,40 +468,6 @@ elm_button_add(Evas_Object *parent) } EAPI void -<<<<<<< HEAD -elm_button_label_set(Evas_Object *obj, const char *label) -{ - _elm_button_label_set(obj, NULL, label); -} - -EAPI const char * -elm_button_label_get(const Evas_Object *obj) -{ - return _elm_button_label_get(obj, NULL); -} - - -EAPI void -elm_button_icon_set(Evas_Object *obj, Evas_Object *icon) -{ - _content_set_hook(obj, "icon", icon); -} - -EAPI Evas_Object * -elm_button_icon_get(const Evas_Object *obj) -{ - return _content_get_hook(obj, "icon"); -} - -EAPI Evas_Object * -elm_button_icon_unset(Evas_Object *obj) -{ - return _content_unset_hook(obj, "icon"); -} - -EAPI void -======= ->>>>>>> remotes/origin/upstream elm_button_autorepeat_set(Evas_Object *obj, Eina_Bool on) { ELM_CHECK_WIDTYPE(obj, widtype); diff --git a/src/lib/elm_button.h b/src/lib/elm_button.h index b28715a..feb5acb 100644 --- a/src/lib/elm_button.h +++ b/src/lib/elm_button.h @@ -11,20 +11,12 @@ * This is a push-button. Press it and run some function. It can contain * a simple label and icon object and it also has an autorepeat feature. * -<<<<<<< HEAD - * This widgets emits the following signals: -======= * This widget emits the following signals: ->>>>>>> remotes/origin/upstream * @li "clicked": the user clicked the button (press/release). * @li "repeated": the user pressed the button without releasing it. * @li "pressed": button was pressed. * @li "unpressed": button was released after being pressed. -<<<<<<< HEAD - * In all three cases, the @c event parameter of the callback will be -======= * In all cases, the @c event parameter of the callback will be ->>>>>>> remotes/origin/upstream * @c NULL. * * Also, defined in the default theme, the button has the following styles @@ -35,16 +27,11 @@ * @li hoversel_vertical: Internally used by @ref Hoversel to give a * continuous look across its options. * @li hoversel_vertical_entry: Another internal for @ref Hoversel. -<<<<<<< HEAD - * - * Default contents parts of the button widget that you can use for are: -======= * @li naviframe: Internally used by @ref Naviframe for its back button. * @li colorselector: Internally used by @ref Colorselector * for its left and right buttons. * * Default content parts of the button widget that you can use for are: ->>>>>>> remotes/origin/upstream * @li "icon" - An icon of the button * * Default text parts of the button widget that you can use for are: @@ -104,11 +91,7 @@ EAPI Eina_Bool elm_button_autorepeat_get(const Evas_Object *o * * Sets the timeout, in seconds, since the button is pressed until the * first @c repeated signal is emitted. If @p t is 0.0 or less, there -<<<<<<< HEAD - * won't be any delay and the even will be fired the moment the button is -======= * won't be any delay and the event will be fired the moment the button is ->>>>>>> remotes/origin/upstream * pressed. * * @param obj The button object diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c index 7d1dd83..65c50b6 100644 --- a/src/lib/elm_check.c +++ b/src/lib/elm_check.c @@ -13,33 +13,13 @@ struct _Widget_Data }; static const char *widtype = NULL; -<<<<<<< HEAD -======= static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src, Evas_Callback_Type type, void *event_info); ->>>>>>> remotes/origin/upstream static void _del_hook(Evas_Object *obj); static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl); static void _theme_hook(Evas_Object *obj); static void _disable_hook(Evas_Object *obj); static void _sizing_eval(Evas_Object *obj); -<<<<<<< HEAD -static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void _sub_del(void *data, Evas_Object *obj, void *event_info); -static void _signal_check_off(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _signal_check_on(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _signal_check_toggle(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _on_focus_hook(void *data, Evas_Object *obj); -static void _activate_hook(Evas_Object *obj); -static void _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content); -static Evas_Object *_content_get_hook(const Evas_Object *obj, const char *part); -static Evas_Object *_content_unset_hook(Evas_Object *obj, const char *part); - -static void _activate(Evas_Object *obj); -static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src, - Evas_Callback_Type type, void *event_info); - -======= static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info); static void _sub_del(void *data, Evas_Object *obj, void *event_info); @@ -56,7 +36,6 @@ static void _content_set_hook(Evas_Object *obj, const char *part, static Evas_Object *_content_get_hook(const Evas_Object *obj, const char *part); static Evas_Object *_content_unset_hook(Evas_Object *obj, const char *part); static void _activate(Evas_Object *obj); ->>>>>>> remotes/origin/upstream static const char SIG_CHANGED[] = "changed"; static const Evas_Smart_Cb_Description _signals[] = { {SIG_CHANGED, ""}, @@ -64,12 +43,8 @@ static const Evas_Smart_Cb_Description _signals[] = { }; static Eina_Bool -<<<<<<< HEAD -_event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type type, void *event_info) -======= _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, Evas_Callback_Type type, void *event_info) ->>>>>>> remotes/origin/upstream { if (type != EVAS_CALLBACK_KEY_DOWN) return EINA_FALSE; Evas_Event_Key_Down *ev = event_info; @@ -84,10 +59,6 @@ _event_hook(Evas_Object *obj, Evas_Object *src __UNUSED__, return EINA_TRUE; } -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream static void _del_hook(Evas_Object *obj) { @@ -127,7 +98,6 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl) static void _theme_hook(Evas_Object *obj) { -<<<<<<< HEAD unsigned int counter = 0; unsigned int i = 1; unsigned int length = 0; @@ -137,11 +107,6 @@ _theme_hook(Evas_Object *obj) char s1[PATH_MAX] = {'\0',}; Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - -======= - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; ->>>>>>> remotes/origin/upstream _elm_widget_mirrored_reload(obj); _mirrored_set(obj, elm_widget_mirrored_get(obj)); _elm_theme_object_set(obj, wd->chk, "check", "base", elm_widget_style_get(obj)); @@ -164,8 +129,6 @@ _theme_hook(Evas_Object *obj) edje_object_signal_emit(wd->chk, "elm,state,disabled", "elm"); edje_object_message_signal_process(wd->chk); edje_object_scale_set(wd->chk, elm_widget_scale_get(obj) * _elm_config->scale); -<<<<<<< HEAD - //introduced internationalization of additional text parts used in style while (1) { @@ -183,8 +146,6 @@ _theme_hook(Evas_Object *obj) strncpy(buffer, str + counter, sizeof(buffer)); edje_object_part_text_set(wd->chk, s1, E_(buffer)); } -======= ->>>>>>> remotes/origin/upstream _sizing_eval(obj); } @@ -273,8 +234,6 @@ _activate_hook(Evas_Object *obj) } static void -<<<<<<< HEAD -======= _signal_emit_hook(Evas_Object *obj, const char *emission, const char *source) { Widget_Data *wd = elm_widget_data_get(obj); @@ -300,7 +259,6 @@ _signal_callback_del_hook(Evas_Object *obj, const char *emission, const char *so } static void ->>>>>>> remotes/origin/upstream _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content) { ELM_CHECK_WIDTYPE(obj, widtype); @@ -500,12 +458,9 @@ elm_check_add(Evas_Object *parent) elm_widget_can_focus_set(obj, EINA_TRUE); elm_widget_activate_hook_set(obj, _activate_hook); elm_widget_event_hook_set(obj, _event_hook); -<<<<<<< HEAD -======= elm_widget_signal_emit_hook_set(obj, _signal_emit_hook); elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook); elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook); ->>>>>>> remotes/origin/upstream elm_widget_text_set_hook_set(obj, _elm_check_label_set); elm_widget_text_get_hook_set(obj, _elm_check_label_get); elm_widget_content_set_hook_set(obj, _content_set_hook); @@ -542,53 +497,6 @@ elm_check_add(Evas_Object *parent) } EAPI void -<<<<<<< HEAD -elm_check_label_set(Evas_Object *obj, const char *label) -{ - _elm_check_label_set(obj, NULL, label); -} - -EAPI const char * -elm_check_label_get(const Evas_Object *obj) -{ - return _elm_check_label_get(obj, NULL); -} - -EAPI void -elm_check_states_labels_set(Evas_Object *obj, const char *ontext, const char *offtext) -{ - _elm_check_label_set(obj, "on", ontext); - _elm_check_label_set(obj, "off", offtext); -} - -EAPI void -elm_check_states_labels_get(const Evas_Object *obj, const char **ontext, const char **offtext) -{ - if (ontext) *ontext = _elm_check_label_get(obj, "on"); - if (offtext) *offtext = _elm_check_label_get(obj, "off"); -} - -EAPI void -elm_check_icon_set(Evas_Object *obj, Evas_Object *icon) -{ - _content_set_hook(obj, "icon", icon); -} - -EAPI Evas_Object * -elm_check_icon_get(const Evas_Object *obj) -{ - return _content_get_hook(obj, "icon"); -} - -EAPI Evas_Object * -elm_check_icon_unset(Evas_Object *obj) -{ - return _content_unset_hook(obj, "icon"); -} - -EAPI void -======= ->>>>>>> remotes/origin/upstream elm_check_state_set(Evas_Object *obj, Eina_Bool state) { ELM_CHECK_WIDTYPE(obj, widtype); diff --git a/src/lib/elm_check.h b/src/lib/elm_check.h index 5715366..3ade50d 100644 --- a/src/lib/elm_check.h +++ b/src/lib/elm_check.h @@ -20,17 +20,10 @@ * for it to modify. * * Signals that you can add callbacks for are: -<<<<<<< HEAD - * "changed" - This is called whenever the user changes the state of one of - * the check object(event_info is NULL). - * - * Default contents parts of the check widget that you can use for are: -======= * "changed" - This is called whenever the user changes the state of the check * objects(event_info is NULL). * * Default content parts of the check widget that you can use for are: ->>>>>>> remotes/origin/upstream * @li "icon" - An icon of the check * * Default text parts of the check widget that you can use for are: @@ -46,12 +39,9 @@ * @li elm_object_part_content_set * @li elm_object_part_content_get * @li elm_object_part_content_unset -<<<<<<< HEAD -======= * @li elm_object_signal_emit * @li elm_object_signal_callback_add * @li elm_object_signal_callback_del ->>>>>>> remotes/origin/upstream * * @ref tutorial_check should give you a firm grasp of how to use this widget. * @@ -72,15 +62,9 @@ EAPI Evas_Object * elm_check_add(Evas_Object *parent); * @param obj The check object * @param state The state to use (1 == on, 0 == off) * -<<<<<<< HEAD - * This sets the state of the check. If set - * with elm_check_state_pointer_set() the state of that variable is also - * changed. Calling this @b doesn't cause the "changed" signal to be emited. -======= * This sets the state of the check. If set with elm_check_state_pointer_set() * the state of that variable is also changed. Calling this @b doesn't cause * the "changed" signal to be emitted. ->>>>>>> remotes/origin/upstream */ EAPI void elm_check_state_set(Evas_Object *obj, Eina_Bool state); diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c index 128ada6..3d7617c 100644 --- a/src/lib/elm_radio.c +++ b/src/lib/elm_radio.c @@ -528,8 +528,6 @@ elm_radio_value_pointer_set(Evas_Object *obj, int *valuep) wd->group->valuep = NULL; } } -<<<<<<< HEAD -======= EAPI Evas_Object * elm_radio_selected_object_get(Evas_Object *obj) @@ -550,4 +548,3 @@ elm_radio_selected_object_get(Evas_Object *obj) } return NULL; } ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_radio.h b/src/lib/elm_radio.h index 17c8c97..2bd5bc1 100644 --- a/src/lib/elm_radio.h +++ b/src/lib/elm_radio.h @@ -9,10 +9,6 @@ * * A radio object contains an indicator, an optional Label and an optional * icon object. While it's possible to have a group of only one radio they, -<<<<<<< HEAD - * are normally used in groups of 2 or more. To add a radio to a group use - * elm_radio_group_add(). The radio object(s) will select from one of a set -======= * are normally used in groups of 2 or more. * * elm_radio objects are grouped in a slightly different, compared to other @@ -22,7 +18,6 @@ * object. * * The radio object(s) will select from one of a set ->>>>>>> remotes/origin/upstream * of integer values, so any value they are configuring needs to be mapped to * a set of integers. To configure what value that radio object represents, * use elm_radio_state_value_set() to set the integer it represents. To set @@ -41,11 +36,7 @@ * Default text parts of the radio widget that you can use for are: * @li "default" - Label of the radio * -<<<<<<< HEAD - * Default contents parts of the radio widget that you can use for are: -======= * Default content parts of the radio widget that you can use for are: ->>>>>>> remotes/origin/upstream * @li "icon" - An icon of the radio * * Supported elm_object common APIs. @@ -105,15 +96,9 @@ EAPI void elm_radio_state_value_set(Evas_Object *obj, in EAPI int elm_radio_state_value_get(const Evas_Object *obj); /** -<<<<<<< HEAD - * @brief Set the value of the radio. - * - * @param obj The radio object -======= * @brief Set the value of the radio group. * * @param obj The radio object (any radio object of the group). ->>>>>>> remotes/origin/upstream * @param value The value to use for the group * * This sets the value of the radio group and will also set the value if @@ -122,30 +107,18 @@ EAPI int elm_radio_state_value_get(const Evas_Object *o EAPI void elm_radio_value_set(Evas_Object *obj, int value); /** -<<<<<<< HEAD - * @brief Get the state of the radio object - * - * @param obj The radio object -======= * @brief Get the value of the radio group * * @param obj The radio object (any radio object of the group). ->>>>>>> remotes/origin/upstream * @return The integer state */ EAPI int elm_radio_value_get(const Evas_Object *obj); /** -<<<<<<< HEAD - * @brief Set a convenience pointer to a integer to change - * - * @param obj The radio object -======= * @brief Set a convenience pointer to a integer to change when radio group * value changes. * * @param obj The radio object (any object of a group) ->>>>>>> remotes/origin/upstream * @param valuep Pointer to the integer to modify * * This sets a pointer to a integer, that, in addition to the radio objects @@ -158,8 +131,6 @@ EAPI int elm_radio_value_get(const Evas_Object *obj); EAPI void elm_radio_value_pointer_set(Evas_Object *obj, int *valuep); /** -<<<<<<< HEAD -======= * @brief Get the selected radio object. * * @param obj Any radio object (any object of a group) @@ -168,6 +139,5 @@ EAPI void elm_radio_value_pointer_set(Evas_Object *obj, EAPI Evas_Object *elm_radio_selected_object_get(Evas_Object *obj); /** ->>>>>>> remotes/origin/upstream * @} */