From: sumanth Date: Fri, 9 Mar 2012 05:57:50 +0000 (+0530) Subject: [svn merge ] actionslider,calendar,clock,conformant,slider widgets related... X-Git-Tag: REL_F_I9500_20120317_1~18^2~40 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bf9dba9bee06a000d0474b9a4a18f8717cfeab2;p=framework%2Fuifw%2Felementary.git [svn merge ] actionslider,calendar,clock,conformant,slider widgets related merge conflicts are fixed. --- diff --git a/src/bin/test_actionslider.c b/src/bin/test_actionslider.c index 39fe5c1..bdaf5d1 100644 --- a/src/bin/test_actionslider.c +++ b/src/bin/test_actionslider.c @@ -6,10 +6,6 @@ static void _pos_selected_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info) { -<<<<<<< HEAD - printf("Selection: %s\n", (char *)event_info); - printf("Label selected: %s\n", elm_actionslider_selected_label_get(obj)); -======= Elm_Actionslider_Pos ipos, mpos, epos; printf("Selection: %s\n", (char *)event_info); @@ -70,7 +66,6 @@ static void _pos_selected_cb(void *data __UNUSED__, Evas_Object *obj, void *even printf("right "); printf("\n"); } ->>>>>>> remotes/origin/upstream } static void diff --git a/src/bin/test_calendar.c b/src/bin/test_calendar.c index c3d1690..045f49c 100644 --- a/src/bin/test_calendar.c +++ b/src/bin/test_calendar.c @@ -3,8 +3,6 @@ # include "elementary_config.h" #endif #ifndef ELM_LIB_QUICKLAUNCH -<<<<<<< HEAD -======= struct _api_data { unsigned int state; /* What state we are testing */ @@ -114,37 +112,24 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e { free(data); } ->>>>>>> remotes/origin/upstream /* A simple test, just displaying calendar in it's default state */ void test_calendar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { -<<<<<<< HEAD - Evas_Object *win, *bg, *cal; -======= Evas_Object *win, *bg, *cal, *bx, *bxx, *bt; api_data *api = calloc(1, sizeof(api_data)); ->>>>>>> remotes/origin/upstream win = elm_win_add(NULL, "calendar", ELM_WIN_BASIC); elm_win_title_set(win, "Calendar"); 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 - cal = elm_calendar_add(win); - elm_win_resize_object_add(win, cal); - evas_object_size_hint_weight_set(cal, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); -======= 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); @@ -174,7 +159,6 @@ test_calendar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_calendar_selected_time_set(cal, gmtime(&the_time)); elm_calendar_min_max_year_set(cal, 2010, 2012); ->>>>>>> remotes/origin/upstream evas_object_show(cal); evas_object_show(win); @@ -188,31 +172,13 @@ _print_cal_info(Evas_Object *cal, Evas_Object *en) int year_min, year_max; Eina_Bool sel_enabled; const char **wds; -<<<<<<< HEAD - struct tm stime; - - if (!elm_calendar_selected_time_get(cal, &stime)) -======= struct tm stm; if (!elm_calendar_selected_time_get(cal, &stm)) ->>>>>>> remotes/origin/upstream return; interval = elm_calendar_interval_get(cal); elm_calendar_min_max_year_get(cal, &year_min, &year_max); -<<<<<<< HEAD - sel_enabled = elm_calendar_day_selection_enabled_get(cal); - wds = elm_calendar_weekdays_names_get(cal); - - snprintf(info, sizeof(info), - " Day: %i, Mon: %i, Year %i, WeekDay: %i
" - " Interval: %0.2f, Year_Min: %i, Year_Max %i, Sel Enabled : %i
" - " Weekdays: %s, %s, %s, %s, %s, %s, %s
", - stime.tm_mday, stime.tm_mon, stime.tm_year + 1900, stime.tm_wday, - interval, year_min, year_max, sel_enabled, - wds[0], wds[1], wds[2], wds[3], wds[4], wds[5], wds[6]); -======= sel_enabled = !elm_calendar_day_selection_disabled_get(cal); wds = elm_calendar_weekdays_names_get(cal); @@ -223,7 +189,6 @@ _print_cal_info(Evas_Object *cal, Evas_Object *en) stm.tm_mday, stm.tm_mon, stm.tm_year + 1900, stm.tm_wday, interval, year_min, year_max, sel_enabled, wds[0], wds[1], wds[2], wds[3], wds[4], wds[5], wds[6]); ->>>>>>> remotes/origin/upstream elm_object_text_set(en, info); } @@ -235,17 +200,10 @@ _print_cal_info_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) } static char * -<<<<<<< HEAD -_format_month_year(struct tm *stime) -{ - char buf[32]; - if (!strftime(buf, sizeof(buf), "%b %y", stime)) return NULL; -======= _format_month_year(struct tm *stm) { char buf[32]; if (!strftime(buf, sizeof(buf), "%b %y", stm)) return NULL; ->>>>>>> remotes/origin/upstream return strdup(buf); } @@ -294,11 +252,7 @@ test_calendar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i cal2 = elm_calendar_add(win); evas_object_size_hint_weight_set(cal2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(cal2, EVAS_HINT_FILL, EVAS_HINT_FILL); -<<<<<<< HEAD - elm_calendar_day_selection_enabled_set(cal2, EINA_FALSE); -======= elm_calendar_day_selection_disabled_set(cal2, EINA_TRUE); ->>>>>>> remotes/origin/upstream evas_object_show(cal2); elm_box_pack_end(bxh, cal2); @@ -350,11 +304,7 @@ test_calendar2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i current_time = time(NULL) - 5 * 84600; localtime_r(¤t_time, &selected_time); mark = elm_calendar_mark_add(cal, "holiday", &selected_time, -<<<<<<< HEAD - ELM_CALENDAR_WEEKLY); -======= ELM_CALENDAR_WEEKLY); ->>>>>>> remotes/origin/upstream current_time = time(NULL) + 1 * 84600; localtime_r(¤t_time, &selected_time); diff --git a/src/bin/test_clock.c b/src/bin/test_clock.c index 2efc535..6940242 100644 --- a/src/bin/test_clock.c +++ b/src/bin/test_clock.c @@ -1,15 +1,6 @@ #include #ifdef HAVE_CONFIG_H # include "elementary_config.h" -<<<<<<< HEAD -#endif -#ifndef ELM_LIB_QUICKLAUNCH -void -test_clock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) -{ - Evas_Object *win, *bg, *bx, *ck; - unsigned int digedit; -======= #include "test.h" #endif #ifndef ELM_LIB_QUICKLAUNCH @@ -108,28 +99,17 @@ test_clock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info Evas_Object *win, *bg, *bx, *ck, *bt, *bxx; unsigned int digedit; api_data *api = calloc(1, sizeof(api_data)); ->>>>>>> remotes/origin/upstream win = elm_win_add(NULL, "clock", ELM_WIN_BASIC); elm_win_title_set(win, "Clock"); 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 - bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bx); - evas_object_show(bx); - -======= 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); @@ -149,20 +129,11 @@ test_clock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_box_pack_end(bxx, bx); ->>>>>>> remotes/origin/upstream - ck = elm_clock_add(win); - elm_box_pack_end(bx, ck); - evas_object_show(ck); - ck = elm_clock_add(win); -<<<<<<< HEAD - elm_clock_show_am_pm_set(ck, 1); elm_box_pack_end(bx, ck); evas_object_show(ck); ck = elm_clock_add(win); - elm_clock_show_seconds_set(ck, 1); -======= elm_clock_show_am_pm_set(ck, EINA_TRUE); elm_box_pack_end(bx, ck); elm_clock_time_set(ck, 17, 25, 0); @@ -170,21 +141,10 @@ test_clock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info ck = elm_clock_add(win); elm_clock_show_seconds_set(ck, EINA_TRUE); ->>>>>>> remotes/origin/upstream - elm_box_pack_end(bx, ck); - evas_object_show(ck); - - ck = elm_clock_add(win); -<<<<<<< HEAD - elm_clock_show_seconds_set(ck, 1); - elm_clock_show_am_pm_set(ck, 1); elm_box_pack_end(bx, ck); evas_object_show(ck); ck = elm_clock_add(win); - elm_clock_show_seconds_set(ck, 1); - elm_clock_show_am_pm_set(ck, 0); -======= elm_clock_show_seconds_set(ck, EINA_TRUE); elm_clock_show_am_pm_set(ck, EINA_TRUE); elm_box_pack_end(bx, ck); @@ -194,40 +154,25 @@ test_clock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info ck = elm_clock_add(win); elm_clock_show_seconds_set(ck, EINA_TRUE); elm_clock_show_am_pm_set(ck, EINA_FALSE); ->>>>>>> remotes/origin/upstream elm_clock_time_set(ck, 23, 59, 57); elm_box_pack_end(bx, ck); evas_object_show(ck); ck = elm_clock_add(win); -<<<<<<< HEAD - elm_clock_edit_set(ck, 1); - elm_clock_show_seconds_set(ck, 1); - elm_clock_show_am_pm_set(ck, 1); -======= elm_clock_edit_set(ck, EINA_TRUE); elm_clock_show_seconds_set(ck, EINA_TRUE); elm_clock_show_am_pm_set(ck, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_clock_time_set(ck, 10, 11, 12); elm_box_pack_end(bx, ck); evas_object_show(ck); ck = elm_clock_add(win); -<<<<<<< HEAD - elm_clock_show_seconds_set(ck, 1); - elm_clock_edit_set(ck, 1); - digedit = ELM_CLOCK_HOUR_UNIT | ELM_CLOCK_MIN_UNIT | ELM_CLOCK_SEC_UNIT; - elm_clock_digit_edit_set(ck, digedit); - elm_box_pack_end(bx, ck); -======= elm_clock_show_seconds_set(ck, EINA_TRUE); elm_clock_edit_set(ck, EINA_TRUE); digedit = ELM_CLOCK_EDIT_HOUR_UNIT | ELM_CLOCK_EDIT_MIN_UNIT | ELM_CLOCK_EDIT_SEC_UNIT; elm_clock_edit_mode_set(ck, digedit); elm_box_pack_end(bx, ck); elm_clock_time_set(ck, 0, 0, 0); ->>>>>>> remotes/origin/upstream evas_object_show(ck); evas_object_show(win); @@ -238,15 +183,6 @@ _edit_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__) { Evas_Object *ck = data; -<<<<<<< HEAD - if (!elm_clock_edit_get(ck)) { - elm_object_text_set(obj, "Done"); - elm_clock_edit_set(ck, 1); - return; - } - elm_object_text_set(obj, "Edit"); - elm_clock_edit_set(ck, 0); -======= if (!elm_clock_edit_get(ck)) { elm_object_text_set(obj, "Done"); @@ -255,7 +191,6 @@ _edit_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__) } elm_object_text_set(obj, "Edit"); elm_clock_edit_set(ck, EINA_FALSE); ->>>>>>> remotes/origin/upstream } static void @@ -263,15 +198,6 @@ _hmode_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__) { Evas_Object *ck = data; -<<<<<<< HEAD - if (!elm_clock_show_am_pm_get(ck)) { - elm_object_text_set(obj, "24h"); - elm_clock_show_am_pm_set(ck, 1); - return; - } - elm_object_text_set(obj, "12h"); - elm_clock_show_am_pm_set(ck, 0); -======= if (!elm_clock_show_am_pm_get(ck)) { elm_object_text_set(obj, "24h"); @@ -280,42 +206,24 @@ _hmode_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__) } elm_object_text_set(obj, "12h"); elm_clock_show_am_pm_set(ck, EINA_FALSE); ->>>>>>> remotes/origin/upstream } void test_clock2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { -<<<<<<< HEAD - Evas_Object *win, *bg, *bx, *hbx, *ck, *bt; -======= Evas_Object *win, *bg, *bx, *hbx, *ck, *bt, *bxx; api_data *api = calloc(1, sizeof(api_data)); ->>>>>>> remotes/origin/upstream win = elm_win_add(NULL, "clock2", ELM_WIN_BASIC); elm_win_title_set(win, "Clock 2"); 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 - bx = elm_box_add(win); - evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(win, bx); - evas_object_show(bx); - - ck = elm_clock_add(win); - elm_clock_show_seconds_set(ck, 1); - elm_clock_show_am_pm_set(ck, 1); -======= 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); @@ -341,7 +249,6 @@ test_clock2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_clock_edit_mode_set(ck, ELM_CLOCK_EDIT_DEFAULT); elm_clock_show_seconds_set(ck, EINA_TRUE); elm_clock_show_am_pm_set(ck, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, ck); evas_object_show(ck); @@ -366,8 +273,6 @@ test_clock2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(win); } -<<<<<<< HEAD -======= void test_clock3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { @@ -419,5 +324,4 @@ test_clock3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(win); } ->>>>>>> remotes/origin/upstream #endif diff --git a/src/bin/test_conform.c b/src/bin/test_conform.c index 52c8d2d..1e5d417 100644 --- a/src/bin/test_conform.c +++ b/src/bin/test_conform.c @@ -12,11 +12,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC); elm_win_title_set(win, "Conformant"); elm_win_autodel_set(win, EINA_TRUE); -<<<<<<< HEAD - elm_win_conformant_set(win, 1); -======= elm_win_conformant_set(win, EINA_TRUE); ->>>>>>> remotes/origin/upstream bg = elm_bg_add(win); elm_win_resize_object_add(win, bg); @@ -34,13 +30,8 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event en = elm_entry_add(win); elm_entry_scrollable_set(en, EINA_TRUE); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); - elm_entry_bounce_set(en, 1, 0); -======= elm_entry_single_line_set(en, EINA_TRUE); elm_entry_bounce_set(en, EINA_TRUE, EINA_FALSE); ->>>>>>> remotes/origin/upstream elm_object_text_set(en, "This is the top entry here"); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); @@ -56,13 +47,8 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event en = elm_entry_add(win); elm_entry_scrollable_set(en, EINA_TRUE); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); - elm_entry_bounce_set(en, 1, 0); -======= elm_entry_single_line_set(en, EINA_TRUE); elm_entry_bounce_set(en, EINA_TRUE, EINA_FALSE); ->>>>>>> remotes/origin/upstream elm_object_text_set(en, "This is the middle entry here"); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); @@ -78,11 +64,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event en = elm_entry_add(win); elm_entry_scrollable_set(en, EINA_TRUE); -<<<<<<< HEAD - elm_entry_bounce_set(en, 0, 1); -======= elm_entry_bounce_set(en, EINA_FALSE, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_object_text_set(en, "This is a multi-line entry at the bottom
" "This can contain more than 1 line of text and be " @@ -108,11 +90,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event static void popobj(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) { -<<<<<<< HEAD - elm_pager_content_pop(data); -======= elm_naviframe_item_pop(data); ->>>>>>> remotes/origin/upstream } void @@ -123,11 +101,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event win = elm_win_add(NULL, "conformant2", ELM_WIN_BASIC); elm_win_title_set(win, "Conformant 2"); elm_win_autodel_set(win, EINA_TRUE); -<<<<<<< HEAD - elm_win_conformant_set(win, 1); -======= elm_win_conformant_set(win, EINA_TRUE); ->>>>>>> remotes/origin/upstream bg = elm_bg_add(win); elm_win_resize_object_add(win, bg); @@ -142,13 +116,8 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event en = elm_entry_add(win); elm_entry_scrollable_set(en, EINA_TRUE); -<<<<<<< HEAD - elm_entry_single_line_set(en, 1); - elm_entry_bounce_set(en, 1, 0); -======= elm_entry_single_line_set(en, EINA_TRUE); elm_entry_bounce_set(en, EINA_TRUE, EINA_FALSE); ->>>>>>> remotes/origin/upstream elm_object_text_set(en, "This is the top entry here"); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5); @@ -156,22 +125,14 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_show(en); btn = elm_button_add(win); -<<<<<<< HEAD - elm_object_focus_allow_set(btn, 0); -======= elm_object_focus_allow_set(btn, EINA_FALSE); ->>>>>>> remotes/origin/upstream elm_object_text_set(btn, "Delete Below"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, btn); evas_object_show(btn); -<<<<<<< HEAD - pg = elm_pager_add(win); -======= pg = elm_naviframe_add(win); ->>>>>>> remotes/origin/upstream evas_object_size_hint_weight_set(pg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(pg, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_pack_end(bx, pg); @@ -182,11 +143,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event conform = elm_conformant_add(win); evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(conform, EVAS_HINT_FILL, EVAS_HINT_FILL); -<<<<<<< HEAD - elm_pager_content_push(pg, conform); -======= elm_naviframe_item_simple_push(pg, conform); ->>>>>>> remotes/origin/upstream evas_object_show(conform); bx = elm_box_add(win); @@ -195,11 +152,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event en = elm_entry_add(win); elm_entry_scrollable_set(en, EINA_TRUE); -<<<<<<< HEAD - elm_entry_bounce_set(en, 0, 1); -======= elm_entry_bounce_set(en, EINA_FALSE, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_object_text_set(en, "This entry and button below get deleted."); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -207,11 +160,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event elm_box_pack_end(bx, en); btn = elm_button_add(win); -<<<<<<< HEAD - elm_object_focus_allow_set(btn, 0); -======= elm_object_focus_allow_set(btn, EINA_FALSE); ->>>>>>> remotes/origin/upstream elm_object_text_set(btn, "Delete this bottom bit 1"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -226,11 +175,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event conform = elm_conformant_add(win); evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(conform, EVAS_HINT_FILL, EVAS_HINT_FILL); -<<<<<<< HEAD - elm_pager_content_push(pg, conform); -======= elm_naviframe_item_simple_push(pg, conform); ->>>>>>> remotes/origin/upstream evas_object_show(conform); bx = elm_box_add(win); @@ -239,11 +184,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event en = elm_entry_add(win); elm_entry_scrollable_set(en, EINA_TRUE); -<<<<<<< HEAD - elm_entry_bounce_set(en, 0, 1); -======= elm_entry_bounce_set(en, EINA_FALSE, EINA_TRUE); ->>>>>>> remotes/origin/upstream elm_object_text_set(en, "This entry and button below get deleted."); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); @@ -251,11 +192,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event elm_box_pack_end(bx, en); btn = elm_button_add(win); -<<<<<<< HEAD - elm_object_focus_allow_set(btn, 0); -======= elm_object_focus_allow_set(btn, EINA_FALSE); ->>>>>>> remotes/origin/upstream elm_object_text_set(btn, "Delete this bottom bit 2"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/edje_externals/elm_calendar.c b/src/edje_externals/elm_calendar.c index d04580e..8eb791a 100644 --- a/src/edje_externals/elm_calendar.c +++ b/src/edje_externals/elm_calendar.c @@ -32,11 +32,7 @@ external_calendar_state_set(void *data __UNUSED__, Evas_Object *obj, elm_calendar_min_max_year_set(obj, min, p->year_max); } if (p->sel_exists) -<<<<<<< HEAD - elm_calendar_day_selection_enabled_set(obj, p->sel_enable); -======= elm_calendar_day_selection_disabled_set(obj, !p->sel_enable); ->>>>>>> remotes/origin/upstream } static Eina_Bool @@ -47,31 +43,6 @@ external_calendar_param_set(void *data __UNUSED__, Evas_Object *obj, if (!strcmp(param->name, "year_min")) { -<<<<<<< HEAD - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - elm_calendar_min_max_year_get(obj, NULL, &max); - elm_calendar_min_max_year_set(obj, param->i, max); - return EINA_TRUE; - } - } - else if (!strcmp(param->name, "year_max")) - { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - elm_calendar_min_max_year_get(obj, &min, NULL); - elm_calendar_min_max_year_set(obj, min,param->i); - return EINA_TRUE; - } - } - else if (!strcmp(param->name, "sel_enable")) - { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - elm_calendar_day_selection_enabled_set(obj,param->i ); - return EINA_TRUE; - } -======= if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) { elm_calendar_min_max_year_get(obj, NULL, &max); @@ -95,7 +66,6 @@ external_calendar_param_set(void *data __UNUSED__, Evas_Object *obj, elm_calendar_day_selection_disabled_set(obj,!param->i ); return EINA_TRUE; } ->>>>>>> remotes/origin/upstream } ERR("unknown parameter '%s' of type '%s'", @@ -112,29 +82,6 @@ external_calendar_param_get(void *data __UNUSED__, const Evas_Object *obj, if (!strcmp(param->name, "year_min")) { -<<<<<<< HEAD - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - elm_calendar_min_max_year_get(obj, &(param->i) ,&max); - return EINA_TRUE; - } - } - else if (!strcmp(param->name, "year_max")) - { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) - { - elm_calendar_min_max_year_get(obj, &min,&(param->i)); - return EINA_TRUE; - } - } - else if (!strcmp(param->name, "sel_enable")) - { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) - { - param->i = elm_calendar_day_selection_enabled_get(obj); - return EINA_TRUE; - } -======= if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT) { elm_calendar_min_max_year_get(obj, &(param->i) ,&max); @@ -156,7 +103,6 @@ external_calendar_param_get(void *data __UNUSED__, const Evas_Object *obj, param->i = !elm_calendar_day_selection_disabled_get(obj); return EINA_TRUE; } ->>>>>>> remotes/origin/upstream } ERR("unknown parameter '%s' of type '%s'", @@ -181,17 +127,6 @@ external_calendar_params_parse(void *data __UNUSED__, EINA_LIST_FOREACH(params, l, param) { if (!strcmp(param->name, "year_min")) -<<<<<<< HEAD - mem->year_min = param->i; - - else if(!strcmp(param->name, "year_max")) - mem->year_max = param->i; - - else if (!strcmp(param->name, "sel_enable")) - { - mem->sel_enable = param->i; - mem->sel_exists = EINA_TRUE; -======= mem->year_min = param->i; else if(!strcmp(param->name, "year_max")) @@ -201,7 +136,6 @@ external_calendar_params_parse(void *data __UNUSED__, { mem->sel_enable = param->i; mem->sel_exists = EINA_TRUE; ->>>>>>> remotes/origin/upstream } } diff --git a/src/examples/calendar_example_05.c b/src/examples/calendar_example_05.c index 21e1cb8..e48a9e8 100644 --- a/src/examples/calendar_example_05.c +++ b/src/examples/calendar_example_05.c @@ -30,11 +30,7 @@ _print_cal_info_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __U interval = elm_calendar_interval_get(obj); elm_calendar_min_max_year_get(obj, &year_min, &year_max); -<<<<<<< HEAD - sel_enabled = elm_calendar_day_selection_enabled_get(obj); -======= sel_enabled = !elm_calendar_day_selection_disabled_get(obj); ->>>>>>> remotes/origin/upstream wds = elm_calendar_weekdays_names_get(obj); printf("Day: %i, Mon: %i, Year %i, WeekDay: %i
\n" diff --git a/src/examples/clock_example.c b/src/examples/clock_example.c index e8c36eb..b510b17 100644 --- a/src/examples/clock_example.c +++ b/src/examples/clock_example.c @@ -75,13 +75,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) ck = elm_clock_add(win); elm_clock_show_seconds_set(ck, EINA_TRUE); elm_clock_edit_set(ck, EINA_TRUE); -<<<<<<< HEAD - digedit = ELM_CLOCK_HOUR_UNIT | ELM_CLOCK_MIN_UNIT | ELM_CLOCK_SEC_UNIT; - elm_clock_digit_edit_set(ck, digedit); -======= digedit = ELM_CLOCK_EDIT_HOUR_UNIT | ELM_CLOCK_EDIT_MIN_UNIT | ELM_CLOCK_EDIT_SEC_UNIT; elm_clock_edit_mode_set(ck, digedit); ->>>>>>> remotes/origin/upstream elm_box_pack_end(bx, ck); evas_object_show(ck); diff --git a/src/examples/slider_example.c b/src/examples/slider_example.c index 2356e47..8852d1a 100644 --- a/src/examples/slider_example.c +++ b/src/examples/slider_example.c @@ -84,20 +84,12 @@ 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 elm_object_part_content_set(sl, "icon", ic); ic = elm_icon_add(win); 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_part_content_set(sl, "end", ic); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c index b55fd5b..c8a488a 100644 --- a/src/lib/elm_actionslider.c +++ b/src/lib/elm_actionslider.c @@ -14,10 +14,7 @@ struct _Widget_Data Ecore_Animator *button_animator; double final_position; Eina_Bool mouse_down : 1; -<<<<<<< HEAD Eina_Bool mouse_hold : 1; -======= ->>>>>>> remotes/origin/upstream }; static const char *widtype = NULL; @@ -235,10 +232,7 @@ _drag_button_up_cb(void *data, Evas_Object *o __UNUSED__, const char *emission _ if (!wd) return; wd->mouse_down = EINA_FALSE; -<<<<<<< HEAD if (wd->mouse_hold == EINA_TRUE) return; -======= ->>>>>>> remotes/origin/upstream edje_object_part_drag_value_get(wd->as, "elm.drag_button_base", &position, NULL); @@ -398,10 +392,7 @@ elm_actionslider_add(Evas_Object *parent) elm_widget_text_get_hook_set(obj, _elm_actionslider_label_get); wd->mouse_down = EINA_FALSE; -<<<<<<< HEAD wd->mouse_hold = EINA_FALSE; -======= ->>>>>>> remotes/origin/upstream wd->enabled_position = ELM_ACTIONSLIDER_ALL; wd->as = edje_object_add(e); @@ -515,17 +506,6 @@ elm_actionslider_selected_label_get(const Evas_Object *obj) return NULL; } -<<<<<<< HEAD - -EAPI void -elm_actionslider_hold(Evas_Object *obj, Eina_Bool flag) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - - wd->mouse_hold = flag; -} // Deprecated APIs @@ -573,5 +553,12 @@ elm_actionslider_indicator_label_get(Evas_Object *obj) return _elm_actionslider_label_get(obj, NULL); } -======= ->>>>>>> remotes/origin/upstream +EAPI void +elm_actionslider_hold(Evas_Object *obj, Eina_Bool flag) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; + + wd->mouse_hold = flag; +} diff --git a/src/lib/elm_actionslider.h b/src/lib/elm_actionslider.h index f0d2c04..51ed2f9 100644 --- a/src/lib/elm_actionslider.h +++ b/src/lib/elm_actionslider.h @@ -28,11 +28,7 @@ * "right" or "center"). * * Default text parts of the actionslider widget that you can use for are: -<<<<<<< HEAD - * @li "indicator" - A indicator label of the actionslider -======= * @li "indicator" - An indicator label of the actionslider ->>>>>>> remotes/origin/upstream * @li "left" - A left label of the actionslider * @li "right" - A right label of the actionslider * @li "center" - A center label of the actionslider @@ -121,21 +117,8 @@ EAPI void elm_actionslider_enabled_pos_set(Evas_Object *o */ EAPI Elm_Actionslider_Pos elm_actionslider_enabled_pos_get(const Evas_Object *obj); -/** -<<<<<<< HEAD - * Hold actionslider object movement. - * - * @param[in] obj The actionslider object - * @param[in] flag Actionslider hold/release - * (EINA_TURE = hold/EIN_FALSE = release) - * - * @ingroup Actionslider - */ -EAPI void elm_actionslider_hold(Evas_Object *obj, Eina_Bool flag); - - /* - * Deprecated APIs + * Deprecated API support */ typedef enum @@ -147,7 +130,5 @@ typedef enum } Elm_Actionslider_Label_Pos; /** -======= ->>>>>>> remotes/origin/upstream * @} */ diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c index 08bc6da..c822cf2 100644 --- a/src/lib/elm_calendar.c +++ b/src/lib/elm_calendar.c @@ -26,11 +26,7 @@ struct _Widget_Data int year_min, year_max, spin_speed; int today_it, selected_it, first_day_it; Ecore_Timer *spin, *update_timer; -<<<<<<< HEAD - char * (*format_func) (struct tm *selected_time); -======= Elm_Calendar_Format_Cb format_func; ->>>>>>> remotes/origin/upstream const char *weekdays[7]; struct tm current_time, selected_time; Day_Color day_color[42]; // EINA_DEPRECATED @@ -43,11 +39,7 @@ struct _Elm_Calendar_Mark Eina_List *node; struct tm mark_time; const char *mark_type; -<<<<<<< HEAD - Elm_Calendar_Mark_Repeat repeat; -======= Elm_Calendar_Mark_Repeat_Type repeat; ->>>>>>> remotes/origin/upstream }; static const char *widtype = NULL; @@ -77,11 +69,7 @@ static int _days_in_month[2][12] = }; static Elm_Calendar_Mark * -<<<<<<< HEAD -_mark_new(Evas_Object *obj, const char *mark_type, struct tm *mark_time, Elm_Calendar_Mark_Repeat repeat) -======= _mark_new(Evas_Object *obj, const char *mark_type, struct tm *mark_time, Elm_Calendar_Mark_Repeat_Type repeat) ->>>>>>> remotes/origin/upstream { Widget_Data *wd = elm_widget_data_get(obj); Elm_Calendar_Mark *mark; @@ -209,7 +197,6 @@ _text_day_color_update(Widget_Data *wd, int pos) edje_object_signal_emit(wd->calendar, emission, "elm"); } -<<<<<<< HEAD // EINA_DEPRECATED static void _text_day_color_set(Widget_Data *wd, Day_Color col, int pos) @@ -220,8 +207,6 @@ _text_day_color_set(Widget_Data *wd, Day_Color col, int pos) _text_day_color_update(wd, pos); } -======= ->>>>>>> remotes/origin/upstream static void _set_month_year(Widget_Data *wd) { @@ -241,11 +226,7 @@ _set_month_year(Widget_Data *wd) static void _populate(Evas_Object *obj) { -<<<<<<< HEAD - int maxdays, day, mon, year, i; -======= int maxdays, day, mon, yr, i; ->>>>>>> remotes/origin/upstream Elm_Calendar_Mark *mark; char part[12], day_s[3]; struct tm first_day; @@ -259,11 +240,7 @@ _populate(Evas_Object *obj) maxdays = _maxdays_get(&wd->selected_time); mon = wd->selected_time.tm_mon; -<<<<<<< HEAD - year = wd->selected_time.tm_year; -======= yr = wd->selected_time.tm_year; ->>>>>>> remotes/origin/upstream _set_month_year(wd); @@ -323,11 +300,7 @@ _populate(Evas_Object *obj) if ((day == wd->current_time.tm_mday) && (mon == wd->current_time.tm_mon) -<<<<<<< HEAD - && (year == wd->current_time.tm_year)) -======= && (yr == wd->current_time.tm_year)) ->>>>>>> remotes/origin/upstream _today(wd, i); if (day == wd->selected_time.tm_mday) @@ -745,10 +718,6 @@ elm_calendar_add(Evas_Object *parent) Widget_Data *wd; int i, t; Evas *e; -<<<<<<< HEAD - struct tm weekday_time; -======= ->>>>>>> remotes/origin/upstream ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL); @@ -796,12 +765,7 @@ elm_calendar_add(Evas_Object *parent) * just make it larger. :| */ char buf[20]; /* I don't know of a better way of doing it */ -<<<<<<< HEAD - gmtime_r(&weekday, &weekday_time); - if (strftime(buf, sizeof(buf), "%a", &weekday_time)) -======= if (strftime(buf, sizeof(buf), "%a", gmtime(&weekday))) ->>>>>>> remotes/origin/upstream { wd->weekdays[i] = eina_stringshare_add(buf); } @@ -904,16 +868,6 @@ elm_calendar_min_max_year_get(const Evas_Object *obj, int *min, int *max) if (max) *max = wd->year_max + 1900; } -<<<<<<< HEAD -EAPI void -elm_calendar_day_selection_enabled_set(Evas_Object *obj, Eina_Bool enabled) -{ - ELM_CHECK_WIDTYPE(obj, widtype); - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return; - wd->selection_enabled = enabled; - if (enabled) -======= EINA_DEPRECATED EAPI void elm_calendar_day_selection_enabled_set(Evas_Object *obj, Eina_Bool enabled) { @@ -928,21 +882,11 @@ elm_calendar_day_selection_disabled_set(Evas_Object *obj, Eina_Bool disabled) if (!wd) return; wd->selection_enabled = (!disabled); if (!disabled) ->>>>>>> remotes/origin/upstream _select(wd, wd->selected_it); else _unselect(wd, wd->selected_it); } -<<<<<<< HEAD -EAPI Eina_Bool -elm_calendar_day_selection_enabled_get(const Evas_Object *obj) -{ - ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; - Widget_Data *wd = elm_widget_data_get(obj); - if (!wd) return EINA_FALSE; - return wd->selection_enabled; -======= EINA_DEPRECATED EAPI Eina_Bool elm_calendar_day_selection_enabled_get(const Evas_Object *obj) { @@ -956,7 +900,6 @@ elm_calendar_day_selection_disabled_get(const Evas_Object *obj) Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return EINA_FALSE; return (!wd->selection_enabled); ->>>>>>> remotes/origin/upstream } EAPI void @@ -984,11 +927,7 @@ elm_calendar_selected_time_get(const Evas_Object *obj, struct tm *selected_time) } EAPI void -<<<<<<< HEAD -elm_calendar_format_function_set(Evas_Object *obj, char * (*format_function) (struct tm *selected_time)) -======= elm_calendar_format_function_set(Evas_Object *obj, Elm_Calendar_Format_Cb format_function) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); @@ -998,11 +937,7 @@ elm_calendar_format_function_set(Evas_Object *obj, Elm_Calendar_Format_Cb format } EAPI Elm_Calendar_Mark * -<<<<<<< HEAD -elm_calendar_mark_add(Evas_Object *obj, const char *mark_type, struct tm *mark_time, Elm_Calendar_Mark_Repeat repeat) -======= elm_calendar_mark_add(Evas_Object *obj, const char *mark_type, struct tm *mark_time, Elm_Calendar_Mark_Repeat_Type repeat) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); @@ -1060,7 +995,6 @@ elm_calendar_marks_draw(Evas_Object *obj) if (!wd) return; _populate(obj); } -<<<<<<< HEAD EINA_DEPRECATED EAPI void elm_calendar_text_saturday_color_set(Evas_Object *obj, int pos) @@ -1088,5 +1022,3 @@ elm_calendar_text_weekday_color_set(Evas_Object *obj, int pos) if (!wd) return; _text_day_color_set(wd, DAY_WEEKDAY, pos); } -======= ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_calendar.h b/src/lib/elm_calendar.h index 37c994e..5abfe91 100644 --- a/src/lib/elm_calendar.h +++ b/src/lib/elm_calendar.h @@ -1,6 +1,4 @@ /** -<<<<<<< HEAD -======= * @defgroup Calendar Calendar * * This is a Calendar widget. Calender widget helps applications to flexibly @@ -24,16 +22,10 @@ */ /** ->>>>>>> remotes/origin/upstream * @addtogroup Calendar * @{ */ -<<<<<<< HEAD -/** - * @enum _Elm_Calendar_Mark_Repeat - * @typedef Elm_Calendar_Mark_Repeat -======= typedef enum { ELM_CALENDAR_UNIQUE, /**< Default value. Marks will be displayed only on event day. */ @@ -46,7 +38,6 @@ typedef enum /** * @enum _Elm_Calendar_Mark_Repeat_Type * @typedef Elm_Calendar_Mark_Repeat_Type ->>>>>>> remotes/origin/upstream * * Event periodicity, used to define if a mark should be repeated * @b beyond event's day. It's set when a mark is added. @@ -55,39 +46,17 @@ typedef enum * there will be marks every week after this date. Marks will be displayed * at 13th, 20th, 27th, 3rd June ... * -<<<<<<< HEAD - * Values don't work as bitmask, only one can be choosen. - * - * Supported elm_object common APIs. - * @li elm_object_signal_emit - * @li elm_object_signal_callback_add - * @li elm_object_signal_callback_del -======= * Values don't work as bitmask, only one can be chosen. ->>>>>>> remotes/origin/upstream * * @see elm_calendar_mark_add() * * @ingroup Calendar */ -<<<<<<< HEAD -typedef enum -{ - ELM_CALENDAR_UNIQUE, /**< Default value. Marks will be displayed only on event day. */ - ELM_CALENDAR_DAILY, /**< Marks will be displayed everyday after event day (inclusive). */ - ELM_CALENDAR_WEEKLY, /**< Marks will be displayed every week after event day (inclusive) - i.e. each seven days. */ - ELM_CALENDAR_MONTHLY, /**< Marks will be displayed every month day that coincides to event day. E.g.: if an event is set to 30th Jan, no marks will be displayed on Feb, but will be displayed on 30th Mar*/ - ELM_CALENDAR_ANNUALLY /**< Marks will be displayed every year that coincides to event day (and month). E.g. an event added to 30th Jan 2012 will be repeated on 30th Jan 2013. */ -} Elm_Calendar_Mark_Repeat; -======= typedef _Elm_Calendar_Mark_Repeat_Type Elm_Calendar_Mark_Repeat_Type; ->>>>>>> remotes/origin/upstream typedef struct _Elm_Calendar_Mark Elm_Calendar_Mark; /**< Item handle for a calendar mark. Created with elm_calendar_mark_add() and deleted with elm_calendar_mark_del(). */ /** -<<<<<<< HEAD -======= * @typedef Elm_Calendar_Format_Cb * * This callback type is used to format the string that will be used @@ -101,7 +70,6 @@ typedef struct _Elm_Calendar_Mark Elm_Calendar_Mark; /**< Item handle for a c typedef char * (*Elm_Calendar_Format_Cb)(struct tm *stime); /** ->>>>>>> remotes/origin/upstream * Add a new calendar widget to the given parent Elementary * (container) object. * @@ -172,11 +140,7 @@ EAPI void elm_calendar_weekdays_names_set(Evas_Object *obj, cons * @param min The minimum year, greater than 1901; * @param max The maximum year; * -<<<<<<< HEAD - * Maximum must be greater than minimum, except if you don't wan't to set -======= * Maximum must be greater than minimum, except if you don't want to set ->>>>>>> remotes/origin/upstream * maximum year. * Default values are 1902 and -1. * @@ -212,13 +176,8 @@ EAPI void elm_calendar_min_max_year_get(const Evas_Object *obj, * Enable or disable day selection * * @param obj The calendar object. -<<<<<<< HEAD - * @param enabled @c EINA_TRUE to enable selection or @c EINA_FALSE to - * disable it. -======= * @param disabled @c EINA_TRUE to disable selection or @c EINA_FALSE to * enable it. ->>>>>>> remotes/origin/upstream * * Enabled by default. If disabled, the user still can select months, * but not days. Selected days are highlighted on calendar. @@ -227,28 +186,12 @@ EAPI void elm_calendar_min_max_year_get(const Evas_Object *obj, * When a day is selected, or month is changed, smart callbacks for * signal "changed" will be called. * -<<<<<<< HEAD - * @see elm_calendar_day_selection_enable_get() -======= * @see elm_calendar_day_selection_disabled_get() ->>>>>>> remotes/origin/upstream * * @ref calendar_example_04 * * @ingroup Calendar */ -<<<<<<< HEAD -EAPI void elm_calendar_day_selection_enabled_set(Evas_Object *obj, Eina_Bool enabled); - -/** - * Get a value whether day selection is enabled or not. - * - * @see elm_calendar_day_selection_enable_set() for details. - * - * @param obj The calendar object. - * @return EINA_TRUE means day selection is enabled. EINA_FALSE indicates - * it's disabled. If @p obj is NULL, EINA_FALSE is returned. -======= EAPI void elm_calendar_day_selection_disabled_set(Evas_Object *obj, Eina_Bool disabled); /** @@ -259,17 +202,12 @@ EAPI void elm_calendar_day_selection_disabled_set(Evas_Object *o * it's enabled. If @p obj is NULL, EINA_FALSE is returned. * * @see elm_calendar_day_selection_disabled_set() for details. ->>>>>>> remotes/origin/upstream * * @ref calendar_example_05 * * @ingroup Calendar */ -<<<<<<< HEAD -EAPI Eina_Bool elm_calendar_day_selection_enabled_get(const Evas_Object *obj); -======= EAPI Eina_Bool elm_calendar_day_selection_disabled_get(const Evas_Object *obj); ->>>>>>> remotes/origin/upstream /** * Set selected date to be highlighted on calendar. @@ -294,11 +232,7 @@ EAPI void elm_calendar_selected_time_set(Evas_Object *obj, struc * * @param obj The calendar object * @param selected_time A @b tm struct to point to selected date -<<<<<<< HEAD - * @return EINA_FALSE means an error ocurred and returned time shouldn't -======= * @return EINA_FALSE means an error occurred and returned time shouldn't ->>>>>>> remotes/origin/upstream * be considered. * * Get date selected by the user or set by function @@ -344,11 +278,7 @@ EAPI Eina_Bool elm_calendar_selected_time_get(const Evas_Object *obj, * * @ingroup Calendar */ -<<<<<<< HEAD -EAPI void elm_calendar_format_function_set(Evas_Object *obj, char *(*format_function)(struct tm *stime)); -======= EAPI void elm_calendar_format_function_set(Evas_Object *obj, Elm_Calendar_Format_Cb format_func); ->>>>>>> remotes/origin/upstream /** * Add a new mark to the calendar @@ -399,11 +329,7 @@ EAPI void elm_calendar_format_function_set(Evas_Object *obj, Elm * * @ingroup Calendar */ -<<<<<<< HEAD -EAPI Elm_Calendar_Mark *elm_calendar_mark_add(Evas_Object *obj, const char *mark_type, struct tm *mark_time, Elm_Calendar_Mark_Repeat repeat); -======= EAPI Elm_Calendar_Mark *elm_calendar_mark_add(Evas_Object *obj, const char *mark_type, struct tm *mark_time, Elm_Calendar_Mark_Repeat_Type repeat); ->>>>>>> remotes/origin/upstream /** * Delete mark from the calendar. @@ -458,11 +384,7 @@ EAPI const Eina_List *elm_calendar_marks_get(const Evas_Object *obj); * this function. * * When the month is changed, i.e. user selects next or previous month, -<<<<<<< HEAD - * marks will be drawed. -======= * marks will be drawn. ->>>>>>> remotes/origin/upstream * * @see elm_calendar_mark_add() * @see elm_calendar_mark_del() diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c index 55451a4..3bd0b2d 100644 --- a/src/lib/elm_clock.c +++ b/src/lib/elm_clock.c @@ -1,10 +1,7 @@ #include #include "elm_priv.h" -<<<<<<< HEAD -======= #define DEFAULT_FIRST_INTERVAL 0.85 ->>>>>>> remotes/origin/upstream typedef struct _Widget_Data Widget_Data; struct _Widget_Data @@ -14,11 +11,7 @@ struct _Widget_Data Eina_Bool seconds : 1; Eina_Bool am_pm : 1; Eina_Bool edit : 1; -<<<<<<< HEAD - Elm_Clock_Digedit digedit; -======= Elm_Clock_Edit_Mode digedit; ->>>>>>> remotes/origin/upstream int hrs, min, sec, timediff; Evas_Object *digit[6]; Evas_Object *ampm; @@ -31,11 +24,7 @@ struct _Widget_Data Eina_Bool seconds : 1; Eina_Bool am_pm : 1; Eina_Bool edit : 1; -<<<<<<< HEAD - Elm_Clock_Digedit digedit; -======= Elm_Clock_Edit_Mode digedit; ->>>>>>> remotes/origin/upstream } cur; }; @@ -553,13 +542,8 @@ elm_clock_add(Evas_Object *parent) wd->cur.seconds = EINA_TRUE; wd->cur.am_pm = EINA_TRUE; wd->cur.edit = EINA_TRUE; -<<<<<<< HEAD - wd->cur.digedit = ELM_CLOCK_NONE; - wd->first_interval = 0.85; -======= wd->cur.digedit = ELM_CLOCK_EDIT_DEFAULT; wd->first_interval = DEFAULT_FIRST_INTERVAL; ->>>>>>> remotes/origin/upstream wd->timediff = 0; _time_update(obj); @@ -603,13 +587,8 @@ elm_clock_edit_set(Evas_Object *obj, Eina_Bool edit) wd->edit = edit; if (!edit) _timediff_set(wd); -<<<<<<< HEAD - if ((edit) && (wd->digedit == ELM_CLOCK_NONE)) - elm_clock_digit_edit_set(obj, ELM_CLOCK_ALL); -======= if ((edit) && (wd->digedit == ELM_CLOCK_EDIT_DEFAULT)) elm_clock_edit_mode_set(obj, ELM_CLOCK_EDIT_ALL); ->>>>>>> remotes/origin/upstream else _time_update(obj); } @@ -624,33 +603,20 @@ elm_clock_edit_get(const Evas_Object *obj) } EAPI void -<<<<<<< HEAD -elm_clock_digit_edit_set(Evas_Object *obj, Elm_Clock_Digedit digedit) -======= elm_clock_edit_mode_set(Evas_Object *obj, Elm_Clock_Edit_Mode digedit) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; wd->digedit = digedit; -<<<<<<< HEAD - if (digedit == ELM_CLOCK_NONE) -======= if (digedit == ELM_CLOCK_EDIT_DEFAULT) ->>>>>>> remotes/origin/upstream elm_clock_edit_set(obj, EINA_FALSE); else _time_update(obj); } -<<<<<<< HEAD -EAPI Elm_Clock_Digedit -elm_clock_digit_edit_get(const Evas_Object *obj) -======= EAPI Elm_Clock_Edit_Mode elm_clock_edit_mode_get(const Evas_Object *obj) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype) 0; Widget_Data *wd = elm_widget_data_get(obj); @@ -664,11 +630,7 @@ elm_clock_show_am_pm_set(Evas_Object *obj, Eina_Bool am_pm) ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - wd->am_pm = am_pm; -======= wd->am_pm = !!am_pm; ->>>>>>> remotes/origin/upstream _time_update(obj); } @@ -687,11 +649,7 @@ elm_clock_show_seconds_set(Evas_Object *obj, Eina_Bool seconds) ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - wd->seconds = seconds; -======= wd->seconds = !!seconds; ->>>>>>> remotes/origin/upstream _time_update(obj); } @@ -705,28 +663,16 @@ elm_clock_show_seconds_get(const Evas_Object *obj) } EAPI void -<<<<<<< HEAD -elm_clock_interval_set(Evas_Object *obj, double interval) -======= elm_clock_first_interval_set(Evas_Object *obj, double interval) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype); Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; -<<<<<<< HEAD - wd->first_interval = interval; -} - -EAPI double -elm_clock_interval_get(const Evas_Object *obj) -======= wd->first_interval = !!interval; } EAPI double elm_clock_first_interval_get(const Evas_Object *obj) ->>>>>>> remotes/origin/upstream { ELM_CHECK_WIDTYPE(obj, widtype) 0.0; Widget_Data *wd = elm_widget_data_get(obj); diff --git a/src/lib/elm_clock.h b/src/lib/elm_clock.h index deb308d..ecf5c1f 100644 --- a/src/lib/elm_clock.h +++ b/src/lib/elm_clock.h @@ -10,15 +10,9 @@ * * A newly created clock will fetch system's time (already * considering local time adjustments) to start with, and will tick -<<<<<<< HEAD - * accondingly. It may or may not show seconds. - * - * Clocks have an @b edition mode. When in it, the sheets will -======= * accordingly. It may or may not show seconds. * * Clocks have an @b edition mode. When in it, the sheets will ->>>>>>> remotes/origin/upstream * display extra arrow indications on the top and bottom and the * user may click on them to raise or lower the time values. After * it's told to exit edition mode, it will keep ticking with that @@ -26,11 +20,7 @@ * * Also, when under edition mode, user clicks on the cited arrows * which are @b held for some time will make the clock to flip the -<<<<<<< HEAD - * sheet, thus editing the time, continuosly and automatically for -======= * sheet, thus editing the time, continuously and automatically for ->>>>>>> remotes/origin/upstream * the user. The interval between sheet flips will keep growing in * time, so that it helps the user to reach a time which is distant * from the one set. @@ -45,11 +35,7 @@ * Supported elm_object common APIs. * @li elm_object_signal_emit * @li elm_object_signal_callback_add -<<<<<<< HEAD - * @li elm_object_signal_callbacka_del -======= * @li elm_object_signal_callback_del ->>>>>>> remotes/origin/upstream * * Here is an example on its usage: * @li @ref clock_example @@ -62,25 +48,6 @@ /** * Identifiers for which clock digits should be editable, when a -<<<<<<< HEAD - * clock widget is in edition mode. Values may be ORed together to - * make a mask, naturally. - * - * @see elm_clock_edit_set() - * @see elm_clock_digit_edit_set() - */ -typedef enum -{ - ELM_CLOCK_NONE = 0, /**< Default value. Means that all digits are editable, when in edition mode. */ - ELM_CLOCK_HOUR_DECIMAL = 1 << 0, /**< Decimal algarism of hours value should be editable */ - ELM_CLOCK_HOUR_UNIT = 1 << 1, /**< Unit algarism of hours value should be editable */ - ELM_CLOCK_MIN_DECIMAL = 1 << 2, /**< Decimal algarism of minutes value should be editable */ - ELM_CLOCK_MIN_UNIT = 1 << 3, /**< Unit algarism of minutes value should be editable */ - ELM_CLOCK_SEC_DECIMAL = 1 << 4, /**< Decimal algarism of seconds value should be editable */ - ELM_CLOCK_SEC_UNIT = 1 << 5, /**< Unit algarism of seconds value should be editable */ - ELM_CLOCK_ALL = (1 << 6) - 1 /**< All digits should be editable */ -} Elm_Clock_Digedit; -======= * clock widget is in edition mode. Values may be OR-ed together to * make a mask, naturally. * @@ -98,7 +65,6 @@ typedef enum ELM_CLOCK_EDIT_SEC_UNIT = 1 << 5, /**< Unit algarism of seconds value should be editable */ ELM_CLOCK_EDIT_ALL = (1 << 6) - 1 /**< All digits should be editable */ } Elm_Clock_Edit_Mode; ->>>>>>> remotes/origin/upstream /** * Add a new clock widget to the given parent Elementary @@ -119,11 +85,7 @@ EAPI Evas_Object *elm_clock_add(Evas_Object *parent); * @param obj The clock widget object * @param hrs The hours to set * @param min The minutes to set -<<<<<<< HEAD - * @param sec The secondes to set -======= * @param sec The seconds to set ->>>>>>> remotes/origin/upstream * * This function updates the time that is showed by the clock * widget. @@ -171,11 +133,7 @@ EAPI void elm_clock_time_get(const Evas_Object *obj, int *hrs, int * This function makes a clock's time to be editable or not by * user interaction. When in edition mode, clocks @b stop * ticking, until one brings them back to canonical mode. The -<<<<<<< HEAD - * elm_clock_digit_edit_set() function will influence which digits -======= * elm_clock_edit_mode_set() function will influence which digits ->>>>>>> remotes/origin/upstream * of the clock will be editable. By default, all of them will be * (#ELM_CLOCK_NONE). * @@ -210,29 +168,17 @@ EAPI Eina_Bool elm_clock_edit_get(const Evas_Object *obj); * * @param obj The clock object * @param digedit Bit mask indicating the digits to be editable -<<<<<<< HEAD - * (values in #Elm_Clock_Digedit). -======= * (values in #Elm_Clock_Edit_Mode). ->>>>>>> remotes/origin/upstream * * If the @p digedit param is #ELM_CLOCK_NONE, editing will be * disabled on @p obj (same effect as elm_clock_edit_set(), with @c * EINA_FALSE). * -<<<<<<< HEAD - * @see elm_clock_digit_edit_get() - * - * @ingroup Clock - */ -EAPI void elm_clock_digit_edit_set(Evas_Object *obj, Elm_Clock_Digedit digedit); -======= * @see elm_clock_edit_mode_get() * * @ingroup Clock */ EAPI void elm_clock_edit_mode_set(Evas_Object *obj, Elm_Clock_Edit_Mode digedit); ->>>>>>> remotes/origin/upstream /** * Retrieve what digits of the given clock widget should be @@ -240,15 +186,6 @@ EAPI void elm_clock_edit_mode_set(Evas_Object *obj, Elm_Clock_Edit_ * * @param obj The clock object * @return Bit mask indicating the digits to be editable -<<<<<<< HEAD - * (values in #Elm_Clock_Digedit). - * - * @see elm_clock_digit_edit_set() for more details - * - * @ingroup Clock - */ -EAPI Elm_Clock_Digedit elm_clock_digit_edit_get(const Evas_Object *obj); -======= * (values in #Elm_Clock_Edit_Mode). * * @see elm_clock_edit_mode_set() for more details @@ -256,7 +193,6 @@ EAPI Elm_Clock_Digedit elm_clock_digit_edit_get(const Evas_Object *obj); * @ingroup Clock */ EAPI Elm_Clock_Edit_Mode elm_clock_edit_mode_get(const Evas_Object *obj); ->>>>>>> remotes/origin/upstream /** * Set if the given clock widget must show hours in military or @@ -326,19 +262,11 @@ EAPI void elm_clock_show_seconds_set(Evas_Object *obj, Eina_Bool se EAPI Eina_Bool elm_clock_show_seconds_get(const Evas_Object *obj); /** -<<<<<<< HEAD - * Set the interval on time updates for an user mouse button hold - * on clock widgets' time edition. - * - * @param obj The clock object - * @param interval The (first) interval value in seconds -======= * Set the first interval on time updates for a user mouse button hold * on clock widgets' time edition. * * @param obj The clock object * @param interval The first interval value in seconds ->>>>>>> remotes/origin/upstream * * This interval value is @b decreased while the user holds the * mouse pointer either incrementing or decrementing a given the @@ -355,26 +283,6 @@ EAPI Eina_Bool elm_clock_show_seconds_get(const Evas_Object *obj); * The default starting interval value for automatic flips is * @b 0.85 seconds. * -<<<<<<< HEAD - * @see elm_clock_interval_get() - * - * @ingroup Clock - */ -EAPI void elm_clock_interval_set(Evas_Object *obj, double interval); - -/** - * Get the interval on time updates for an user mouse button hold - * on clock widgets' time edition. - * - * @param obj The clock object - * @return The (first) interval value, in seconds, set on it - * - * @see elm_clock_interval_set() for more details - * - * @ingroup Clock - */ -EAPI double elm_clock_interval_get(const Evas_Object *obj); -======= * @see elm_clock_first_interval_get() * * @ingroup Clock @@ -393,7 +301,6 @@ EAPI void elm_clock_first_interval_set(Evas_Object *obj, double int * @ingroup Clock */ EAPI double elm_clock_first_interval_get(const Evas_Object *obj); ->>>>>>> remotes/origin/upstream /** * @} diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c index 54ae68c..455e748 100644 --- a/src/lib/elm_conform.c +++ b/src/lib/elm_conform.c @@ -13,17 +13,11 @@ typedef struct _Widget_Data Widget_Data; struct _Widget_Data { Evas_Object *base; -<<<<<<< HEAD Evas_Object *shelf, *panel, *virtualkeypad, *sliding_win; Evas_Object *content; Evas_Object *scroller; Evas_Object *layout; int is_sliding_win_visible; -======= - Evas_Object *shelf, *panel, *virtualkeypad; - Evas_Object *content; - Evas_Object *scroller; ->>>>>>> remotes/origin/upstream #ifdef HAVE_ELEMENTARY_X Ecore_Event_Handler *prop_hdl; Ecore_X_Virtual_Keyboard_State vkb_state; @@ -44,12 +38,8 @@ enum _Conformant_Part_Type { ELM_CONFORM_INDICATOR_PART = 1, ELM_CONFORM_SOFTKEY_PART = 2, -<<<<<<< HEAD ELM_CONFORM_VIRTUAL_KEYPAD_PART = 4, ELM_CONFORM_SLIDING_WIN_PART = 8 -======= - ELM_CONFORM_VIRTUAL_KEYPAD_PART = 4 ->>>>>>> remotes/origin/upstream }; #define SUB_TYPE_COUNT 2 @@ -243,10 +233,6 @@ _conformant_part_geometry_env_get(const char *part, int *sx, int *sy, int *sw, i return EINA_TRUE; } -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream static void _conformant_part_size_set(Evas_Object *obj, Evas_Object *sobj, Evas_Coord sx, Evas_Coord sy, Evas_Coord sw, Evas_Coord sh) @@ -363,7 +349,6 @@ _swallow_conformant_parts(Evas_Object *obj) edje_object_part_swallow(wd->base, "elm.swallow.virtualkeypad", wd->virtualkeypad); -<<<<<<< HEAD if (!wd->sliding_win) { wd->sliding_win = evas_object_rectangle_add(evas_object_evas_get(obj)); @@ -377,8 +362,6 @@ _swallow_conformant_parts(Evas_Object *obj) #endif evas_object_color_set(wd->sliding_win, 0, 0, 0, 0); -======= ->>>>>>> remotes/origin/upstream if (!wd->panel) { wd->panel = evas_object_rectangle_add(evas_object_evas_get(obj)); @@ -404,30 +387,18 @@ _changed_size_hints(void *data, Evas *e __UNUSED__, } static void -<<<<<<< HEAD _sub_del(void *data, Evas_Object *obj __UNUSED__, void *event_info) { Widget_Data *wd = elm_widget_data_get(data); -======= -_sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info) -{ - Widget_Data *wd = elm_widget_data_get(obj); ->>>>>>> remotes/origin/upstream Evas_Object *sub = event_info; if (!wd) return; if (sub == wd->content) { evas_object_event_callback_del_full(sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, -<<<<<<< HEAD _changed_size_hints, data); wd->content = NULL; _sizing_eval(data); -======= - _changed_size_hints, obj); - wd->content = NULL; - _sizing_eval(obj); ->>>>>>> remotes/origin/upstream } } @@ -493,12 +464,8 @@ _conformant_move_resize_event_cb(void *data __UNUSED__, Evas *e __UNUSED__, if (!wd) return; part_type = (ELM_CONFORM_INDICATOR_PART | ELM_CONFORM_SOFTKEY_PART | -<<<<<<< HEAD ELM_CONFORM_VIRTUAL_KEYPAD_PART | ELM_CONFORM_SLIDING_WIN_PART); -======= - ELM_CONFORM_VIRTUAL_KEYPAD_PART); ->>>>>>> remotes/origin/upstream _conformant_part_sizing_eval(obj, part_type); } @@ -512,12 +479,8 @@ _content_resize_event_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj if (!wd) return; #ifdef HAVE_ELEMENTARY_X -<<<<<<< HEAD if ((wd->vkb_state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) && (!wd->is_sliding_win_visible)) return; -======= - if (wd->vkb_state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) return; ->>>>>>> remotes/origin/upstream #endif if (wd->show_region_job) ecore_job_del(wd->show_region_job); @@ -605,12 +568,8 @@ _prop_change(void *data, int type __UNUSED__, void *event) part_type = (ELM_CONFORM_INDICATOR_PART | ELM_CONFORM_SOFTKEY_PART | -<<<<<<< HEAD ELM_CONFORM_VIRTUAL_KEYPAD_PART | ELM_CONFORM_SLIDING_WIN_PART); -======= - ELM_CONFORM_VIRTUAL_KEYPAD_PART); ->>>>>>> remotes/origin/upstream _conformant_part_sizing_eval(data, part_type); } else if (ev->atom == ECORE_X_ATOM_E_ILLUME_INDICATOR_GEOMETRY) @@ -619,19 +578,13 @@ _prop_change(void *data, int type __UNUSED__, void *event) _conformant_part_sizing_eval(data, ELM_CONFORM_SOFTKEY_PART); else if (ev->atom == ECORE_X_ATOM_E_ILLUME_KEYBOARD_GEOMETRY) _conformant_part_sizing_eval(data, ELM_CONFORM_VIRTUAL_KEYPAD_PART); -<<<<<<< HEAD else if (ev->atom == ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_GEOMETRY) _conformant_part_sizing_eval(data, ELM_CONFORM_SLIDING_WIN_PART); -======= ->>>>>>> remotes/origin/upstream else if (ev->atom == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE) { Ecore_X_Window zone; -<<<<<<< HEAD -======= printf("Keyboard Geometry Changed\n"); ->>>>>>> remotes/origin/upstream zone = ecore_x_e_illume_zone_get(ev->win); wd->vkb_state = ecore_x_e_virtual_keyboard_state_get(zone); if (wd->vkb_state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) @@ -642,7 +595,6 @@ _prop_change(void *data, int type __UNUSED__, void *event) else _update_autoscroll_objs(data); } -<<<<<<< HEAD else if (ev->atom == ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE) { Ecore_X_Window zone; @@ -658,8 +610,6 @@ _prop_change(void *data, int type __UNUSED__, void *event) else _update_autoscroll_objs(data); } -======= ->>>>>>> remotes/origin/upstream return ECORE_CALLBACK_PASS_ON; } @@ -690,16 +640,12 @@ elm_conformant_add(Evas_Object *parent) _elm_theme_object_set(obj, wd->base, "conformant", "base", "default"); elm_widget_resize_object_set(obj, wd->base); -<<<<<<< HEAD wd->layout = elm_layout_add(obj); edje_object_part_swallow(wd->base, "elm.swallow.content", wd->layout); elm_layout_theme_set(wd->layout, "conformant", "layout", "content"); _swallow_conformant_parts(obj); -======= - _swallow_conformant_parts(obj); ->>>>>>> remotes/origin/upstream #ifdef HAVE_ELEMENTARY_X Evas_Object *top = elm_widget_top_get(obj); Ecore_X_Window xwin = elm_win_xwindow_get(top); @@ -711,30 +657,20 @@ elm_conformant_add(Evas_Object *parent) wd->vkb_state = ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF; } // FIXME: get kbd region prop -<<<<<<< HEAD - -#endif -======= #endif ->>>>>>> remotes/origin/upstream evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _conformant_move_resize_event_cb, obj); evas_object_event_callback_add(obj, EVAS_CALLBACK_MOVE, _conformant_move_resize_event_cb, obj); -<<<<<<< HEAD evas_object_smart_callback_add(wd->layout, "sub-object-del", _sub_del, obj); -======= - evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj); ->>>>>>> remotes/origin/upstream _mirrored_set(obj, elm_widget_mirrored_get(obj)); _sizing_eval(obj); return obj; } -<<<<<<< HEAD EAPI void elm_conformant_content_set(Evas_Object *obj, Evas_Object *content) { @@ -753,10 +689,7 @@ elm_conformant_content_unset(Evas_Object *obj) return _content_unset_hook(obj, NULL); } -EAPI Evas_Object * -======= EINA_DEPRECATED EAPI Evas_Object * ->>>>>>> remotes/origin/upstream elm_conformant_content_area_get(const Evas_Object *obj) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; @@ -765,9 +698,6 @@ elm_conformant_content_area_get(const Evas_Object *obj) if (!wd) return NULL; /*Finger waggle warning*/ _elm_dangerous_call_check(__FUNCTION__); -<<<<<<< HEAD + return wd->layout; -======= - return (Evas_Object *)edje_object_part_object_get(wd->base, "elm.swallow.content"); ->>>>>>> remotes/origin/upstream } diff --git a/src/lib/elm_conform.h b/src/lib/elm_conform.h index 0106460..3daf72a 100644 --- a/src/lib/elm_conform.h +++ b/src/lib/elm_conform.h @@ -19,11 +19,7 @@ * Available styles for it: * - @c "default" * -<<<<<<< HEAD - * Default contents parts of the conformant widget that you can use for are: -======= * Default content parts of the conformant widget that you can use for are: ->>>>>>> remotes/origin/upstream * @li "default" - A content of the conformant * * See how to use this widget in this example: @@ -49,18 +45,5 @@ EAPI Evas_Object *elm_conformant_add(Evas_Object *parent); /** -<<<<<<< HEAD - * Returns the Evas_Object that represents the content area. - * - * @param obj The conformant object. - * @return The content area of the widget. - * - * @ingroup Conformant - */ -EAPI Evas_Object *elm_conformant_content_area_get(const Evas_Object *obj); - -/** -======= ->>>>>>> remotes/origin/upstream * @} */ diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h index 74bf55e..baf8b09 100644 --- a/src/lib/elm_deprecated.h +++ b/src/lib/elm_deprecated.h @@ -443,6 +443,17 @@ EINA_DEPRECATED EAPI void elm_actionslider_indicator_label_set(Evas_Objec EINA_DEPRECATED EAPI const char *elm_actionslider_indicator_label_get(Evas_Object *obj); /** + * Hold actionslider object movement. + * + * @param[in] obj The actionslider object + * @param[in] flag Actionslider hold/release + * (EINA_TURE = hold/EIN_FALSE = release) + * + * @ingroup Actionslider + */ +EINA_DEPRECATED EAPI void elm_actionslider_hold(Evas_Object *obj, Eina_Bool flag); + +/** * Set the overlay object used for the background object. * * @param obj The bg object diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index 0bf95d8..26c630c 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -189,13 +189,10 @@ _theme_hook(Evas_Object *obj) _elm_theme_object_set(obj, wd->slider, "slider", "horizontal", elm_widget_style_get(obj)); else _elm_theme_object_set(obj, wd->slider, "slider", "vertical", elm_widget_style_get(obj)); -<<<<<<< HEAD if (elm_widget_disabled_get(obj)) edje_object_signal_emit(wd->slider, "elm,state,disabled", "elm"); else edje_object_signal_emit(wd->slider, "elm,state,enabled", "elm"); -======= ->>>>>>> remotes/origin/upstream if (wd->icon) { edje_object_part_swallow(wd->slider, "elm.swallow.content", wd->icon); @@ -208,11 +205,7 @@ _theme_hook(Evas_Object *obj) if (wd->labels) { eina_hash_foreach(wd->labels, _labels_foreach_text_set, wd); -<<<<<<< HEAD - edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm"); -======= edje_object_signal_emit(wd->slider, "elm,state,text,visible", "elm"); ->>>>>>> remotes/origin/upstream } if (wd->units) @@ -400,7 +393,6 @@ _indicator_set(Evas_Object *obj) static void _drag(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { -<<<<<<< HEAD Widget_Data *wd = elm_widget_data_get((Evas_Object*)data); if (elm_widget_disabled_get(data)) return; _val_fetch(data); @@ -408,40 +400,26 @@ _drag(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, _indicator_set(data); edje_object_signal_emit(wd->slider, "elm,state,drag", "elm"); edje_object_message_signal_process(wd->slider); -======= - _val_fetch(data); - _units_set(data); - _indicator_set(data); ->>>>>>> remotes/origin/upstream } static void _drag_start(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { -<<<<<<< HEAD Widget_Data *wd = elm_widget_data_get((Evas_Object*)data); if (elm_widget_disabled_get(data)) return; -======= ->>>>>>> remotes/origin/upstream _val_fetch(data); evas_object_smart_callback_call(data, SIG_DRAG_START, NULL); _units_set(data); _indicator_set(data); elm_widget_scroll_freeze_push(data); -<<<<<<< HEAD edje_object_signal_emit(wd->slider, "elm,state,drag", "elm"); edje_object_message_signal_process(wd->slider); -======= ->>>>>>> remotes/origin/upstream } static void _drag_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { -<<<<<<< HEAD if (elm_widget_disabled_get(data)) return; -======= ->>>>>>> remotes/origin/upstream _val_fetch(data); evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL); _units_set(data); @@ -452,10 +430,7 @@ _drag_stop(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSE static void _drag_step(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { -<<<<<<< HEAD if (elm_widget_disabled_get(data)) return; -======= ->>>>>>> remotes/origin/upstream _val_fetch(data); _units_set(data); _indicator_set(data); @@ -466,10 +441,7 @@ _drag_up(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED_ { double step; Widget_Data *wd; -<<<<<<< HEAD if (elm_widget_disabled_get(data)) return; -======= ->>>>>>> remotes/origin/upstream wd = elm_widget_data_get(data); step = 0.05; @@ -484,10 +456,7 @@ _drag_down(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSE { double step; Widget_Data *wd; -<<<<<<< HEAD if (elm_widget_disabled_get(data)) return; -======= ->>>>>>> remotes/origin/upstream wd = elm_widget_data_get(data); step = -0.05; @@ -504,20 +473,14 @@ _spacer_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi Evas_Event_Mouse_Down *ev = event_info; Evas_Coord x, y, w, h; double button_x = 0.0, button_y = 0.0; -<<<<<<< HEAD if (elm_widget_disabled_get(data)) return; -======= ->>>>>>> remotes/origin/upstream wd->spacer_down = EINA_TRUE; wd->val2 = wd->val; evas_object_geometry_get(wd->spacer, &x, &y, &w, &h); wd->downx = ev->canvas.x - x; wd->downy = ev->canvas.y - y; -<<<<<<< HEAD edje_object_part_drag_value_get(wd->slider, "elm.dragable.slider", &button_x, &button_y); -======= ->>>>>>> remotes/origin/upstream if (wd->horizontal) { button_x = ((double)ev->canvas.x - (double)x) / (double)w; @@ -536,11 +499,8 @@ _spacer_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi _units_set(data); _indicator_set(data); edje_object_signal_emit(wd->slider, "elm,state,indicator,show", "elm"); -<<<<<<< HEAD edje_object_signal_emit(wd->slider, "elm,state,drag", "elm"); edje_object_message_signal_process(wd->slider); -======= ->>>>>>> remotes/origin/upstream } static void @@ -548,22 +508,14 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi { Widget_Data *wd = elm_widget_data_get(data); Evas_Event_Mouse_Move *ev = event_info; -<<<<<<< HEAD - Evas_Coord x, y, w, h, d = 0; - double button_x = 0.0, button_y = 0.0; - if (elm_widget_disabled_get(data)) return; - - if (wd->spacer_down) - { -======= Evas_Coord x, y, w, h; double button_x = 0.0, button_y = 0.0; + if (elm_widget_disabled_get(data)) return; if (wd->spacer_down) { Evas_Coord d = 0; ->>>>>>> remotes/origin/upstream evas_object_geometry_get(wd->spacer, &x, &y, &w, &h); if (wd->horizontal) d = abs(ev->cur.canvas.x - x - wd->downx); else d = abs(ev->cur.canvas.y - y - wd->downy); @@ -572,19 +524,11 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi if (!wd->frozen) { elm_widget_scroll_freeze_push(data); -<<<<<<< HEAD wd->frozen = EINA_TRUE; } ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD; } -======= - wd->frozen = 1; - } - ev->event_flags &= ~EVAS_EVENT_FLAG_ON_HOLD; - } - ->>>>>>> remotes/origin/upstream if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) { if (wd->spacer_down) wd->spacer_down = EINA_FALSE; @@ -595,11 +539,7 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi if (wd->frozen) { elm_widget_scroll_freeze_pop(data); -<<<<<<< HEAD wd->frozen = EINA_FALSE; -======= - wd->frozen = 0; ->>>>>>> remotes/origin/upstream } edje_object_signal_emit(wd->slider, "elm,state,indicator,hide", "elm"); elm_slider_value_set(data, wd->val2); @@ -621,11 +561,8 @@ _spacer_move_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi _val_fetch(data); _units_set(data); _indicator_set(data); -<<<<<<< HEAD edje_object_signal_emit(wd->slider, "elm,state,drag", "elm"); edje_object_message_signal_process(wd->slider); -======= ->>>>>>> remotes/origin/upstream } } @@ -633,16 +570,10 @@ static void _spacer_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { Widget_Data *wd = elm_widget_data_get(data); -<<<<<<< HEAD if (elm_widget_disabled_get(data)) return; if (!wd->spacer_down) return; wd->spacer_down = EINA_FALSE; -======= - - if (!wd->spacer_down) return; - if (wd->spacer_down) wd->spacer_down = EINA_FALSE; ->>>>>>> remotes/origin/upstream _val_fetch(data); evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL); _units_set(data); @@ -650,11 +581,7 @@ _spacer_up_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void if (wd->frozen) { elm_widget_scroll_freeze_pop(data); -<<<<<<< HEAD wd->frozen = EINA_FALSE; -======= - wd->frozen = 0; ->>>>>>> remotes/origin/upstream } edje_object_signal_emit(wd->slider, "elm,state,indicator,hide", "elm"); } @@ -709,10 +636,6 @@ _elm_slider_label_get(const Evas_Object *obj, const char *part) { ELM_CHECK_WIDTYPE(obj, widtype) NULL; Widget_Data *wd = elm_widget_data_get(obj); -<<<<<<< HEAD - -======= ->>>>>>> remotes/origin/upstream if (!wd) return NULL; if (!wd->labels) return NULL; @@ -1074,10 +997,7 @@ elm_slider_value_set(Evas_Object *obj, double val) wd->val = val; if (wd->val < wd->val_min) wd->val = wd->val_min; if (wd->val > wd->val_max) wd->val = wd->val_max; -<<<<<<< HEAD edje_object_signal_emit(wd->slider, "elm,state,drag", "elm"); -======= ->>>>>>> remotes/origin/upstream _val_set(obj); _units_set(obj); _indicator_set(obj); diff --git a/src/lib/elm_slider.h b/src/lib/elm_slider.h index e6c8786..c42bd09 100644 --- a/src/lib/elm_slider.h +++ b/src/lib/elm_slider.h @@ -5,11 +5,7 @@ * @image html img/widget/slider/preview-00.png * @image latex img/widget/slider/preview-00.eps width=\textwidth * -<<<<<<< HEAD - * The slider adds a dragable “slider” widget for selecting the value of -======= * The slider adds a draggable “slider” widget for selecting the value of ->>>>>>> remotes/origin/upstream * something within a range. * * A slider can be horizontal or vertical. It can contain an Icon and has a @@ -43,21 +39,12 @@ * Available styles for it: * - @c "default" * -<<<<<<< HEAD - * Default contents parts of the slider widget that you can use for are: - * @li "icon" - An icon of the slider - * @li "end" - A end part content of the slider - * - * Default text parts of the silder widget that you can use for are: - * @li "default" - Label of the silder -======= * Default content parts of the slider widget that you can use for are: * @li "icon" - An icon of the slider * @li "end" - A end part content of the slider * * Default text parts of the slider widget that you can use for are: * @li "default" - Label of the slider ->>>>>>> remotes/origin/upstream * * Supported elm_object common APIs. * @li elm_object_disabled_set @@ -300,13 +287,8 @@ EAPI void elm_slider_min_max_set(Evas_Object *obj, doubl * Get the minimum and maximum values of the slider. * * @param obj The slider object. -<<<<<<< HEAD - * @param min Pointer where to store the minimum value. - * @param max Pointer where to store the maximum value. -======= * @param min Pointer to store the minimum value. * @param max Pointer to store the maximum value. ->>>>>>> remotes/origin/upstream * * @note If only one value is needed, the other pointer can be passed * as @c NULL.