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);
printf("right ");
printf("\n");
}
->>>>>>> remotes/origin/upstream
}
static void
# include "elementary_config.h"
#endif
#ifndef ELM_LIB_QUICKLAUNCH
-<<<<<<< HEAD
-=======
struct _api_data
{
unsigned int state; /* What state we are testing */
{
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);
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);
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<br/>"
- " Interval: %0.2f, Year_Min: %i, Year_Max %i, Sel Enabled : %i<br/>"
- " Weekdays: %s, %s, %s, %s, %s, %s, %s<br/>",
- 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);
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);
}
}
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);
}
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);
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);
#include <Elementary.h>
#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
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);
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);
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);
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);
{
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");
}
elm_object_text_set(obj, "Edit");
elm_clock_edit_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
}
static void
{
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");
}
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);
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);
evas_object_show(win);
}
-<<<<<<< HEAD
-=======
void
test_clock3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
evas_object_show(win);
}
->>>>>>> remotes/origin/upstream
#endif
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);
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);
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);
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<br/>"
"This can contain more than 1 line of text and be "
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
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);
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);
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);
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);
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);
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);
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);
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);
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);
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
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);
elm_calendar_day_selection_disabled_set(obj,!param->i );
return EINA_TRUE;
}
->>>>>>> remotes/origin/upstream
}
ERR("unknown parameter '%s' of type '%s'",
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);
param->i = !elm_calendar_day_selection_disabled_get(obj);
return EINA_TRUE;
}
->>>>>>> remotes/origin/upstream
}
ERR("unknown parameter '%s' of type '%s'",
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"))
{
mem->sel_enable = param->i;
mem->sel_exists = EINA_TRUE;
->>>>>>> remotes/origin/upstream
}
}
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<br>\n"
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);
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);
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;
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);
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);
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
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;
+}
* "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
*/
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
} Elm_Actionslider_Label_Pos;
/**
-=======
->>>>>>> remotes/origin/upstream
* @}
*/
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
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;
};
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;
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)
_text_day_color_update(wd, pos);
}
-=======
->>>>>>> remotes/origin/upstream
static void
_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;
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);
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)
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);
* 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);
}
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)
{
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)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return EINA_FALSE;
return (!wd->selection_enabled);
->>>>>>> remotes/origin/upstream
}
EAPI void
}
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);
}
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);
if (!wd) return;
_populate(obj);
}
-<<<<<<< HEAD
EINA_DEPRECATED EAPI void
elm_calendar_text_saturday_color_set(Evas_Object *obj, int pos)
if (!wd) return;
_text_day_color_set(wd, DAY_WEEKDAY, pos);
}
-=======
->>>>>>> remotes/origin/upstream
/**
-<<<<<<< HEAD
-=======
* @defgroup Calendar Calendar
*
* This is a Calendar widget. Calender widget helps applications to flexibly
*/
/**
->>>>>>> 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. */
/**
* @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.
* 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
typedef char * (*Elm_Calendar_Format_Cb)(struct tm *stime);
/**
->>>>>>> remotes/origin/upstream
* Add a new calendar widget to the given parent Elementary
* (container) object.
*
* @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.
*
* 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.
* 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);
/**
* 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.
*
* @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
*
* @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
*
* @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.
* 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()
#include <Elementary.h>
#include "elm_priv.h"
-<<<<<<< HEAD
-=======
#define DEFAULT_FIRST_INTERVAL 0.85
->>>>>>> remotes/origin/upstream
typedef struct _Widget_Data Widget_Data;
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;
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;
};
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);
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);
}
}
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);
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);
}
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);
}
}
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);
*
* 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
*
* 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.
* 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
/**
* 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.
*
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
* @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.
* This function makes a clock's time to be editable or not <b>by
* user interaction</b>. 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).
*
*
* @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
*
* @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
* @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
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
* 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
* @ingroup Clock
*/
EAPI double elm_clock_first_interval_get(const Evas_Object *obj);
->>>>>>> remotes/origin/upstream
/**
* @}
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;
{
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
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)
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));
#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));
}
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
}
}
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);
}
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);
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)
_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)
else
_update_autoscroll_objs(data);
}
-<<<<<<< HEAD
else if (ev->atom == ECORE_X_ATOM_E_ILLUME_SLIDING_WIN_STATE)
{
Ecore_X_Window zone;
else
_update_autoscroll_objs(data);
}
-=======
->>>>>>> remotes/origin/upstream
return ECORE_CALLBACK_PASS_ON;
}
_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);
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)
{
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;
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
}
* 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:
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
* @}
*/
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
_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);
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)
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);
_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);
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);
{
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;
{
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;
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;
_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
{
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);
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;
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);
_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
}
}
_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);
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_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;
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);
* @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
* 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
* 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.
projects / framework / uifw / elementary.git / commitdiff