ico_button.png \
ico_check.png \
ico_clock.png \
-ico_colorselector.png\
-ico_datetime.png \
ico_fileselector.png \
ico_fileselector_button.png \
ico_gengrid.png \
ICON("button")
ICON("check")
ICON("clock")
-ICON("colorselector")
-ICON("datetime")
ICON("fileselector")
ICON("fileselector_button")
ICON("gengrid")
test.c \
test_3d.c \
test_actionslider.c \
-<<<<<<< HEAD
-test_anchorblock.c \
-test_anchorview.c \
-=======
->>>>>>> remotes/origin/upstream
test_anim.c \
test_bg.c \
test_box.c \
test_conform.c \
test_ctxpopup.c \
test_cursor.c \
-<<<<<<< HEAD
-test_diskselector.c \
-test_entry.c \
-test_factory.c \
-=======
test_datetime.c \
test_dayselector.c \
test_diskselector.c \
test_entry.c \
test_entry_anchor.c \
test_entry_anchor2.c \
->>>>>>> remotes/origin/upstream
test_fileselector_button.c \
test_fileselector.c \
test_fileselector_entry.c \
test_multibuttonentry.c \
test_naviframe.c \
test_notify.c \
-<<<<<<< HEAD
-test_pager.c \
-=======
->>>>>>> remotes/origin/upstream
test_panel.c \
test_panes.c \
test_photo.c \
test_photocam.c \
-<<<<<<< HEAD
-=======
test_popup.c \
->>>>>>> remotes/origin/upstream
test_progressbar.c \
test_radio.c \
test_scaling.c \
test_win_inline.c \
test_win_socket.c \
test_win_plug.c \
-<<<<<<< HEAD
-test_win_state.c
-=======
test_win_state.c \
test.h
->>>>>>> remotes/origin/upstream
if HAVE_EIO
elementary_test_SOURCES += test_eio.c
elementary_testql_la_SOURCES = $(elementary_test_SOURCES)
elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la \
@ELEMENTARY_EWEATHER_LIBS@ \
-<<<<<<< HEAD
- @EIO_LIBS@ \
- @ELEMENTARY_WEB_LIBS@
-=======
@ELEMENTARY_EDBUS_LIBS@ \
@ELEMENTARY_EFREET_LIBS@ \
@ELEMENTARY_EMAP_LIBS@ \
@EIO_LIBS@ \
@ELEMENTARY_WEB_LIBS@ \
@my_libs@
->>>>>>> remotes/origin/upstream
elementary_testql_la_CFLAGS =
elementary_testql_la_LDFLAGS = -module -avoid-version -no-undefined
elementary_testql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1
elementary_testql_LDFLAGS =
endif
-<<<<<<< HEAD
-=======
EXTRA_DIST = \
test_factory.c
->>>>>>> remotes/origin/upstream
#define ELM_LIST_DISABLE(list) \
do \
{ \
-<<<<<<< HEAD
- const Eina_List *l = elm_list_items_get(list); \
- if (l) \
- { \
- elm_list_item_show(eina_list_data_get(l)); \
-=======
const Eina_List *_l = elm_list_items_get(list); \
if (_l) \
{ \
elm_list_item_show(eina_list_data_get(_l));\
->>>>>>> remotes/origin/upstream
elm_object_disabled_set(list, EINA_TRUE); \
} \
} \
evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); \
evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); \
elm_object_text_set(lb, label); \
-<<<<<<< HEAD
- elm_object_content_set(pd, lb); \
-=======
elm_object_content_set(pd, lb); \
->>>>>>> remotes/origin/upstream
evas_object_show(lb); \
} \
while (0)
static const char *theme_set = NULL;
static const char *finger_size_set = NULL;
static const char *scale_set = NULL;
-<<<<<<< HEAD
-static Fonts_Data fdata = {NULL, NULL, NULL, NULL, NULL, NULL, 0.0};
-=======
static Fonts_Data fndata = {NULL, NULL, NULL, NULL, NULL, NULL, 0.0};
->>>>>>> remotes/origin/upstream
static void
_font_styles_list_sel(void *data __UNUSED__,
Elm_Text_Class_Data *tc_data;
Elm_Font_Size_Data *sd;
-<<<<<<< HEAD
- EINA_LIST_FREE(fdata.text_classes, tc_data)
-=======
EINA_LIST_FREE(fndata.text_classes, tc_data)
->>>>>>> remotes/origin/upstream
{
eina_stringshare_del(tc_data->name);
eina_stringshare_del(tc_data->desc);
free(tc_data);
}
-<<<<<<< HEAD
- elm_font_available_hash_del(fdata.font_hash);
- fdata.font_hash = NULL;
-
- EINA_LIST_FREE(fdata.font_px_list, sd)
-=======
elm_font_available_hash_del(fndata.font_hash);
fndata.font_hash = NULL;
EINA_LIST_FREE(fndata.font_px_list, sd)
->>>>>>> remotes/origin/upstream
{
eina_stringshare_del(sd->size_str);
free(sd);
}
-<<<<<<< HEAD
- EINA_LIST_FREE(fdata.font_scale_list, sd)
-=======
EINA_LIST_FREE(fndata.font_scale_list, sd)
->>>>>>> remotes/origin/upstream
{
eina_stringshare_del(sd->size_str);
free(sd);
}
-<<<<<<< HEAD
- if (fdata.cur_font) eina_stringshare_del(fdata.cur_font);
- fdata.cur_font = NULL;
-
- if (fdata.cur_style) eina_stringshare_del(fdata.cur_style);
- fdata.cur_style = NULL;
-=======
if (fndata.cur_font) eina_stringshare_del(fndata.cur_font);
fndata.cur_font = NULL;
if (fndata.cur_style) eina_stringshare_del(fndata.cur_style);
fndata.cur_style = NULL;
->>>>>>> remotes/origin/upstream
elm_config_save();
elm_exit(); /* exit the program's main loop that runs in elm_run() */
void *event_info __UNUSED__)
{
Eina_Bool val = elm_check_state_get(obj);
-<<<<<<< HEAD
- Eina_Bool sb = elm_scroll_bounce_enabled_get();
-
- if (val == sb) return;
- elm_scroll_bounce_enabled_all_set(val);
-=======
Eina_Bool sb = elm_config_scroll_bounce_enabled_get();
if (val == sb) return;
elm_config_scroll_bounce_enabled_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
/*TODO: enable/disable subordinate sliders (make 'em support it 1st)*/
}
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double bf = elm_scroll_bounce_friction_get();
- double val = elm_slider_value_get(obj);
-
- if (bf == val) return;
- elm_scroll_bounce_friction_all_set(val);
-=======
double bf = elm_config_scroll_bounce_friction_get();
double val = elm_slider_value_get(obj);
if (bf == val) return;
elm_config_scroll_bounce_friction_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double ps = elm_scroll_page_scroll_friction_get();
- double val = elm_slider_value_get(obj);
-
- if (ps == val) return;
- elm_scroll_page_scroll_friction_all_set(val);
-=======
double ps = elm_config_scroll_page_scroll_friction_get();
double val = elm_slider_value_get(obj);
if (ps == val) return;
elm_config_scroll_page_scroll_friction_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double bis = elm_scroll_bring_in_scroll_friction_get();
- double val = elm_slider_value_get(obj);
-
- if (bis == val) return;
- elm_scroll_bring_in_scroll_friction_all_set(val);
-=======
double bis = elm_config_scroll_bring_in_scroll_friction_get();
double val = elm_slider_value_get(obj);
if (bis == val) return;
elm_config_scroll_bring_in_scroll_friction_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double zf = elm_scroll_zoom_friction_get();
- double val = elm_slider_value_get(obj);
-
- if (zf == val) return;
- elm_scroll_zoom_friction_all_set(val);
-=======
double zf = elm_config_scroll_zoom_friction_get();
double val = elm_slider_value_get(obj);
if (zf == val) return;
elm_config_scroll_zoom_friction_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
void *event_info __UNUSED__)
{
Eina_Bool val = elm_check_state_get(obj);
-<<<<<<< HEAD
- Eina_Bool sb = elm_scroll_thumbscroll_enabled_get();
-
- if (val == sb) return;
- elm_scroll_thumbscroll_enabled_all_set(val);
-=======
Eina_Bool sb = elm_config_scroll_thumbscroll_enabled_get();
if (val == sb) return;
elm_config_scroll_thumbscroll_enabled_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
/*TODO: enable/disable subordinate sliders (make 'em support it 1st)*/
}
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double tst = elm_scroll_thumbscroll_threshold_get();
- double val = elm_slider_value_get(obj);
-
- if (tst == val) return;
- elm_scroll_thumbscroll_threshold_all_set(val);
-=======
double tst = elm_config_scroll_thumbscroll_threshold_get();
double val = elm_slider_value_get(obj);
if (tst == val) return;
elm_config_scroll_thumbscroll_threshold_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double tsmt = elm_scroll_thumbscroll_momentum_threshold_get();
- double val = elm_slider_value_get(obj);
-
- if (tsmt == val) return;
- elm_scroll_thumbscroll_momentum_threshold_all_set(val);
-=======
double tsmt = elm_config_scroll_thumbscroll_momentum_threshold_get();
double val = elm_slider_value_get(obj);
if (tsmt == val) return;
elm_config_scroll_thumbscroll_momentum_threshold_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double tsf = elm_scroll_thumbscroll_friction_get();
- double val = elm_slider_value_get(obj);
-
- if (tsf == val) return;
- elm_scroll_thumbscroll_friction_all_set(val);
-=======
double tsf = elm_config_scroll_thumbscroll_friction_get();
double val = elm_slider_value_get(obj);
if (tsf == val) return;
elm_config_scroll_thumbscroll_friction_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double tsbf = elm_scroll_thumbscroll_border_friction_get();
- double val = elm_slider_value_get(obj);
-
- if (tsbf == val) return;
- elm_scroll_thumbscroll_border_friction_all_set(val);
-=======
double tsbf = elm_config_scroll_thumbscroll_border_friction_get();
double val = elm_slider_value_get(obj);
if (tsbf == val) return;
elm_config_scroll_thumbscroll_border_friction_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double tssf = elm_scroll_thumbscroll_sensitivity_friction_get();
- double val = elm_slider_value_get(obj);
-
- if (tssf == val) return;
- elm_scroll_thumbscroll_sensitivity_friction_all_set(val);
-=======
double tssf = elm_config_scroll_thumbscroll_sensitivity_friction_get();
double val = elm_slider_value_get(obj);
if (tssf == val) return;
elm_config_scroll_thumbscroll_sensitivity_friction_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- Eina_Bool cf = elm_cache_flush_enabled_get();
-=======
Eina_Bool cf = elm_config_cache_flush_enabled_get();
->>>>>>> remotes/origin/upstream
Eina_Bool val = elm_check_state_get(obj);
if (cf == val) return;
elm_object_disabled_set((Evas_Object *)data, !val);
-<<<<<<< HEAD
- elm_cache_flush_enabled_all_set(val);
-=======
elm_config_cache_flush_enabled_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double cf = elm_cache_flush_interval_get();
- double val = elm_slider_value_get(obj);
-
- if (cf == val) return;
- elm_cache_flush_interval_all_set(val);
-=======
double cf = elm_config_cache_flush_interval_get();
double val = elm_slider_value_get(obj);
if (cf == val) return;
elm_config_cache_flush_interval_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double font_cache = elm_font_cache_get();
- double val = elm_slider_value_get(obj);
-
- if (font_cache == val) return;
- elm_font_cache_all_set(val * 1024);
-=======
double font_cache = elm_config_cache_font_cache_size_get();
double val = elm_slider_value_get(obj);
if (font_cache == val) return;
elm_config_cache_font_cache_size_set(val * 1024);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double image_cache = elm_image_cache_get();
- double val = elm_slider_value_get(obj);
-
- if (image_cache == val) return;
- elm_image_cache_all_set(val * 1024);
-=======
double image_cache = elm_config_cache_image_cache_size_get();
double val = elm_slider_value_get(obj);
if (image_cache == val) return;
elm_config_cache_image_cache_size_set(val * 1024);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double scale = elm_scale_get();
- double val = elm_slider_value_get(obj);
-
- if (scale == val) return;
- elm_scale_all_set(val);
-=======
double scale = elm_config_scale_get();
double val = elm_slider_value_get(obj);
if (scale == val) return;
elm_config_scale_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double fs = elm_finger_size_get();
- double val = elm_slider_value_get(obj);
-
- if (fs == val) return;
- elm_finger_size_all_set(val);
-=======
double fs = elm_config_finger_size_get();
double val = elm_slider_value_get(obj);
if (fs == val) return;
elm_config_finger_size_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double efc = elm_edje_file_cache_get();
- double val = elm_slider_value_get(obj);
-
- if (efc == val) return;
- elm_edje_file_cache_all_set(val);
-=======
double efc = elm_config_cache_edje_file_cache_size_get();
double val = elm_slider_value_get(obj);
if (efc == val) return;
elm_config_cache_edje_file_cache_size_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- double ecc = elm_edje_collection_cache_get();
- double val = elm_slider_value_get(obj);
-
- if (ecc == val) return;
- elm_edje_collection_cache_all_set(val);
-=======
double ecc = elm_config_cache_edje_collection_cache_size_get();
double val = elm_slider_value_get(obj);
if (ecc == val) return;
elm_config_cache_edje_collection_cache_size_set(val);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
elm_slider_unit_format_set(sl, "%1.2f");
elm_slider_indicator_format_set(sl, "%1.2f");
elm_slider_min_max_set(sl, 0.25, 5.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_scale_get());
-=======
elm_slider_value_set(sl, elm_config_scale_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
evas_object_smart_callback_add(sl, "delay,changed", sc_change, NULL);
sp = elm_separator_add(win);
-<<<<<<< HEAD
- elm_separator_horizontal_set(sp, 1);
-=======
elm_separator_horizontal_set(sp, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(sp, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
elm_box_pack_end(bx, sp);
elm_slider_unit_format_set(sl, "%1.0f");
elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 5, 200);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_finger_size_get());
-=======
elm_slider_value_set(sl, elm_config_finger_size_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
_flip_to(Evas_Object *win,
const char *name)
{
-<<<<<<< HEAD
- Evas_Object *wid, *pager;
- wid = evas_object_data_get(win, name);
- pager = evas_object_data_get(win, "pager");
- elm_pager_content_promote(pager, wid);
-=======
Evas_Object *wid, *naviframe;
wid = evas_object_data_get(win, name);
naviframe = evas_object_data_get(win, "naviframe");
elm_naviframe_item_simple_promote(naviframe, wid);
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
-<<<<<<< HEAD
- Evas_Object *win, *fclasses, *fnames, *fstyles, *fsizes;
-=======
Evas_Object *win, *fclasses;
->>>>>>> remotes/origin/upstream
Elm_Text_Class_Data *tc_data, *tc;
Elm_Object_Item *list_it;
Eina_List *l;
if (!list_it) return;
tc_data = elm_object_item_data_get(list_it);
-<<<<<<< HEAD
- fnames = evas_object_data_get(win, "font_names_list");
- fstyles = evas_object_data_get(win, "font_styles_list");
- fsizes = evas_object_data_get(win, "font_sizes_list");
-
- EINA_LIST_FOREACH(fdata.text_classes, l, tc)
-=======
EINA_LIST_FOREACH(fndata.text_classes, l, tc)
->>>>>>> remotes/origin/upstream
{
eina_stringshare_replace(&tc->font, tc_data->font);
eina_stringshare_replace(&tc->style, tc_data->style);
fstyles = evas_object_data_get(win, "font_styles_list");
fsizes = evas_object_data_get(win, "font_sizes_list");
-<<<<<<< HEAD
- elm_font_overlay_unset(tc_data->name);
-
- eina_stringshare_replace(&fdata.cur_font, NULL);
- eina_stringshare_replace(&tc_data->font, NULL);
- eina_stringshare_replace(&fdata.cur_style, NULL);
- eina_stringshare_replace(&tc_data->style, NULL);
- fdata.cur_size = 0.0;
-=======
elm_config_font_overlay_unset(tc_data->name);
eina_stringshare_replace(&fndata.cur_font, NULL);
eina_stringshare_replace(&fndata.cur_style, NULL);
eina_stringshare_replace(&tc_data->style, NULL);
fndata.cur_size = 0.0;
->>>>>>> remotes/origin/upstream
tc_data->size = 0.0;
ELM_LIST_DISABLE(fnames);
Eina_List *l;
win = data;
-<<<<<<< HEAD
- eina_stringshare_replace(&fdata.cur_font, NULL);
- eina_stringshare_replace(&fdata.cur_style, NULL);
- fdata.cur_size = 0.0;
-
- EINA_LIST_FOREACH(fdata.text_classes, l, tc_data)
- {
- elm_font_overlay_unset(tc_data->name);
-=======
eina_stringshare_replace(&fndata.cur_font, NULL);
eina_stringshare_replace(&fndata.cur_style, NULL);
fndata.cur_size = 0.0;
EINA_LIST_FOREACH(fndata.text_classes, l, tc_data)
{
elm_config_font_overlay_unset(tc_data->name);
->>>>>>> remotes/origin/upstream
eina_stringshare_replace(&tc_data->font, NULL);
eina_stringshare_replace(&tc_data->style, NULL);
Elm_Text_Class_Data *tc_data;
Eina_List *l;
-<<<<<<< HEAD
- EINA_LIST_FOREACH(fdata.text_classes, l, tc_data)
- {
- if (tc_data->font)
- {
- const char *name;
-
- name = elm_font_fontconfig_name_get(tc_data->font,
- tc_data->style);
- elm_font_overlay_set(tc_data->name, name,
- tc_data->size ? tc_data->size : -100);
- elm_font_fontconfig_name_free(name);
- }
- else
- elm_font_overlay_unset(tc_data->name);
- }
-
- elm_config_save();
- elm_font_overlay_all_apply();
-=======
EINA_LIST_FOREACH(fndata.text_classes, l, tc_data)
{
if (tc_data->font)
elm_config_save();
elm_config_font_overlay_apply();
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
/* TODO: apply hinting */
}
Elm_Theme *th;
int fs;
-<<<<<<< HEAD
- scale = elm_scale_get();
- fs = elm_finger_size_get();
- flush_interval = elm_cache_flush_interval_get();
- font_c = elm_font_cache_get();
- image_c = elm_image_cache_get();
- edje_file_c = elm_edje_file_cache_get();
- edje_col_c = elm_edje_collection_cache_get();
-
- s_bounce = elm_scroll_bounce_enabled_get();
- s_bounce_friction = elm_scroll_bounce_friction_get();
- ts = elm_scroll_thumbscroll_enabled_get();
- ts_threshould = elm_scroll_thumbscroll_threshold_get();
- ts_momentum_threshold = elm_scroll_thumbscroll_momentum_threshold_get();
- ts_friction = elm_scroll_thumbscroll_friction_get();
- ts_border_friction = elm_scroll_thumbscroll_border_friction_get();
- ts_sensitivity_friction = elm_scroll_thumbscroll_sensitivity_friction_get();
- page_friction = elm_scroll_page_scroll_friction_get();
- bring_in_friction = elm_scroll_bring_in_scroll_friction_get();
- zoom_friction = elm_scroll_zoom_friction_get();
-
- /* gotta update root windows' atoms */
-// elm_scale_all_set(scale);
- elm_slider_value_set(evas_object_data_get(win, "scale_slider"), scale);
-// elm_finger_size_all_set(fs);
- elm_slider_value_set(evas_object_data_get(win, "fs_slider"), fs);
-
-// elm_cache_flush_interval_all_set(flush_interval);
- elm_slider_value_set(evas_object_data_get(win,
- "cache_flush_interval_slider"),
- flush_interval);
-// elm_font_cache_all_set(font_c);
- elm_slider_value_set(evas_object_data_get(win, "font_cache_slider"),
- font_c / 1024.0);
-// elm_image_cache_all_set(image_c);
- elm_slider_value_set(evas_object_data_get(win, "image_cache_slider"),
- image_c / 1024.0);
-// elm_edje_file_cache_all_set(edje_file_c);
- elm_slider_value_set(evas_object_data_get(win, "edje_file_cache_slider"),
- edje_file_c);
-// elm_edje_collection_cache_all_set(edje_col_c);
-=======
scale = elm_config_scale_get();
fs = elm_config_finger_size_get();
flush_interval = elm_config_cache_flush_interval_get();
image_c / 1024.0);
elm_slider_value_set(evas_object_data_get(win, "edje_file_cache_slider"),
edje_file_c);
->>>>>>> remotes/origin/upstream
elm_slider_value_set(evas_object_data_get(win,
"edje_collection_cache_slider"),
edje_col_c);
-<<<<<<< HEAD
-// elm_scroll_bounce_enabled_all_set(s_bounce);
elm_check_state_set(evas_object_data_get(win, "scroll_bounce_check"),
s_bounce);
-// elm_scroll_bounce_friction_all_set(s_bounce_friction);
elm_slider_value_set(evas_object_data_get(win, "bounce_friction_slider"),
s_bounce_friction);
-// elm_scroll_thumbscroll_enabled_all_set(ts);
elm_check_state_set(evas_object_data_get(win, "thumbscroll_check"), ts);
-// elm_scroll_thumbscroll_threshold_all_set(ts_threshould);
elm_slider_value_set(evas_object_data_get(win,
"thumbscroll_threshold_slider"),
ts_threshould);
-// elm_scroll_thumbscroll_momentum_threshold_all_set(ts_momentum_threshold);
elm_slider_value_set(evas_object_data_get(win,
"ts_momentum_threshold_slider"),
ts_momentum_threshold);
-// elm_scroll_thumbscroll_friction_all_set(ts_friction);
elm_slider_value_set(evas_object_data_get(win,
"thumbscroll_friction_slider"),
ts_friction);
-// elm_scroll_thumbscroll_border_friction_all_set(ts_border_friction);
elm_slider_value_set(evas_object_data_get(win, "ts_border_friction_slider"),
ts_border_friction);
-// elm_scroll_thumbscroll_sensitivity_friction_all_set(ts_sensitivity_friction);
elm_slider_value_set(evas_object_data_get(win, "ts_sensitivity_friction_slider"),
ts_sensitivity_friction);
-// elm_scroll_page_scroll_friction_all_set(page_friction);
elm_slider_value_set(evas_object_data_get(win,
"page_scroll_friction_slider"),
page_friction);
-// elm_scroll_bring_in_scroll_friction_all_set(bring_in_friction);
elm_slider_value_set(evas_object_data_get(win,
"bring_in_scroll_friction_slider"),
bring_in_friction);
-// elm_scroll_zoom_friction_all_set(zoom_friction);
-=======
- elm_check_state_set(evas_object_data_get(win, "scroll_bounce_check"),
- s_bounce);
- elm_slider_value_set(evas_object_data_get(win, "bounce_friction_slider"),
- s_bounce_friction);
- elm_check_state_set(evas_object_data_get(win, "thumbscroll_check"), ts);
- elm_slider_value_set(evas_object_data_get(win,
- "thumbscroll_threshold_slider"),
- ts_threshould);
- elm_slider_value_set(evas_object_data_get(win,
- "ts_momentum_threshold_slider"),
- ts_momentum_threshold);
- elm_slider_value_set(evas_object_data_get(win,
- "thumbscroll_friction_slider"),
- ts_friction);
- elm_slider_value_set(evas_object_data_get(win, "ts_border_friction_slider"),
- ts_border_friction);
- elm_slider_value_set(evas_object_data_get(win, "ts_sensitivity_friction_slider"),
- ts_sensitivity_friction);
- elm_slider_value_set(evas_object_data_get(win,
- "page_scroll_friction_slider"),
- page_friction);
- elm_slider_value_set(evas_object_data_get(win,
- "bring_in_scroll_friction_slider"),
- bring_in_friction);
->>>>>>> remotes/origin/upstream
elm_slider_value_set(evas_object_data_get(win,
"zoom_scroll_friction_slider"),
zoom_friction);
curr_theme = _elm_theme_current_get(elm_theme_get(NULL));
-<<<<<<< HEAD
-// elm_theme_all_set(curr_theme);
-=======
->>>>>>> remotes/origin/upstream
th = elm_theme_new();
elm_theme_set(th, curr_theme);
elm_theme_free(th);
eina_stringshare_del(curr_theme);
-<<<<<<< HEAD
- curr_engine = elm_engine_current_get();
-=======
curr_engine = elm_config_engine_get();
->>>>>>> remotes/origin/upstream
l_items = elm_list_items_get(evas_object_data_get(win, "engines_list"));
EINA_LIST_FOREACH(l_items, l, list_it)
{
_profile_change_do(Evas_Object *win,
const char *profile)
{
-<<<<<<< HEAD
- elm_profile_all_set(profile);
-=======
elm_config_profile_set(profile);
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
_config_display_update(win);
}
li = data;
selection = elm_object_item_data_get(elm_list_selected_item_get(li));
-<<<<<<< HEAD
- if (!strcmp(elm_engine_current_get(), selection))
- return;
-
- elm_engine_set(selection);
-=======
if (!strcmp(elm_config_engine_get(), selection))
return;
elm_config_engine_set(selection);
->>>>>>> remotes/origin/upstream
elm_config_save(); /* make sure new engine has its data dir */
}
li = data;
selection = elm_object_item_data_get(elm_list_selected_item_get(li));
-<<<<<<< HEAD
- profile = elm_profile_current_get();
-=======
profile = elm_config_profile_get();
->>>>>>> remotes/origin/upstream
if (!profile)
{
if (!strcmp(profile, selection))
return;
-<<<<<<< HEAD
- elm_profile_set(selection); /* just here to update info for getters below */
-=======
elm_config_profile_set(selection); /* just here to update info for getters below */
->>>>>>> remotes/origin/upstream
_profile_change_do(elm_object_top_widget_get(li), selection);
elm_config_save(); /* make sure new profile has its data dir */
li = data;
selection = elm_object_item_data_get(elm_list_selected_item_get(li));
-<<<<<<< HEAD
- curr = elm_profile_current_get();
-
- elm_config_save(); /* dump config into old profile's data dir */
-
- pdir = elm_profile_dir_get(selection, EINA_TRUE);
-=======
curr = elm_config_profile_get();
elm_config_save(); /* dump config into old profile's data dir */
pdir = elm_config_profile_dir_get(selection, EINA_TRUE);
->>>>>>> remotes/origin/upstream
if (!pdir)
return;
ecore_file_recursive_rm(pdir);
-<<<<<<< HEAD
- elm_profile_dir_free(pdir);
-=======
elm_config_profile_dir_free(pdir);
->>>>>>> remotes/origin/upstream
elm_config_reload();
th = elm_object_theme_get(sample);
defth = elm_theme_get(th);
-<<<<<<< HEAD
- elm_theme_all_set(defth);
- elm_config_save();
-=======
elm_theme_set(NULL, defth);
elm_config_save();
elm_config_all_flush();
->>>>>>> remotes/origin/upstream
}
static void
{
Evas_Object *win = elm_object_top_widget_get(obj);
Evas_Object *sample = evas_object_data_get(win, "theme_preview");
-<<<<<<< HEAD
- Elm_Theme *th, *sth;
- Elm_Object_Item *list_it;
- const char *defth;
-=======
Elm_Theme *th;
Elm_Object_Item *list_it;
->>>>>>> remotes/origin/upstream
Eina_Strbuf *newth;
Eina_List *l;
if (!sample) return;
tsel = elm_list_selected_items_get(obj);
-<<<<<<< HEAD
- sth = elm_object_theme_get(sample);
- defth = elm_theme_get(sth);
-=======
->>>>>>> remotes/origin/upstream
newth = eina_strbuf_new();
EINA_SAFETY_ON_NULL_RETURN(newth);
th = elm_theme_new();
static void
_status_config_sizing(Evas_Object *win,
-<<<<<<< HEAD
- Evas_Object *pager)
-=======
Evas_Object *naviframe)
->>>>>>> remotes/origin/upstream
{
Evas_Object *lb, *pd, *bx, *sl, *sp;
elm_slider_unit_format_set(sl, "%1.2f");
elm_slider_indicator_format_set(sl, "%1.2f");
elm_slider_min_max_set(sl, 0.25, 5.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_scale_get());
-=======
elm_slider_value_set(sl, elm_config_scale_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
evas_object_smart_callback_add(sl, "delay,changed", sc_change, NULL);
sp = elm_separator_add(win);
-<<<<<<< HEAD
- elm_separator_horizontal_set(sp, 1);
-=======
elm_separator_horizontal_set(sp, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(sp, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
elm_box_pack_end(bx, sp);
elm_slider_unit_format_set(sl, "%1.0f");
elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 5, 200);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_finger_size_get());
-=======
elm_slider_value_set(sl, elm_config_finger_size_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
evas_object_data_set(win, "sizing", bx);
-<<<<<<< HEAD
- elm_pager_content_push(pager, bx);
-=======
elm_naviframe_item_simple_push(naviframe, bx);
->>>>>>> remotes/origin/upstream
}
static Evas_Object *
evas_object_show(rd);
sp = elm_separator_add(win);
-<<<<<<< HEAD
- elm_separator_horizontal_set(sp, 1);
-=======
elm_separator_horizontal_set(sp, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(sp, 1.0, 0.0);
evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
elm_table_pack(base, sp, 0, 2, 2, 1);
static void
_status_config_themes(Evas_Object *win,
-<<<<<<< HEAD
- Evas_Object *pager)
-=======
Evas_Object *naviframe)
->>>>>>> remotes/origin/upstream
{
Evas_Object *tb, *rc, *sc, *sp, *li, *pd, *fr, *bt, *sample;
Eina_List *list, *l;
evas_object_show(fr);
sc = elm_scroller_add(win);
-<<<<<<< HEAD
- elm_scroller_bounce_set(sc, 0, 0);
-=======
elm_scroller_bounce_set(sc, EINA_FALSE, EINA_FALSE);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(sc, 1.0, 1.0);
evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_content_set(fr, sc);
/////////////////////////////////////////////
sp = elm_separator_add(win);
-<<<<<<< HEAD
- elm_separator_horizontal_set(sp, 1);
-=======
elm_separator_horizontal_set(sp, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(sp, 1.0, 0.0);
evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
elm_table_pack(tb, sp, 0, 2, 1, 1);
evas_object_show(bt);
evas_object_data_set(win, "themes", tb);
-<<<<<<< HEAD
- elm_pager_content_push(pager, tb);
-=======
elm_naviframe_item_simple_push(naviframe, tb);
->>>>>>> remotes/origin/upstream
}
static void
_font_preview_update(Evas_Object *win)
{
Evas_Font_Size sz;
-<<<<<<< HEAD
- const char *name;
-
- if (!fdata.cur_font)
- return;
-
- name = elm_font_fontconfig_name_get(fdata.cur_font, fdata.cur_style);
- sz = fdata.cur_size;
-=======
char *name;
if (!fndata.cur_font)
name = elm_font_fontconfig_name_get(fndata.cur_font, fndata.cur_style);
sz = fndata.cur_size;
->>>>>>> remotes/origin/upstream
if (sz < 0)
sz = (-sz * 10) / 100;
EINA_LIST_FOREACH(f_names_items, l, list_it)
{
-<<<<<<< HEAD
- const char *l;
-
- l = elm_object_item_text_get(list_it);
-
- if (tc_data->font && !strcmp(l, tc_data->font))
-=======
const char *s;
s = elm_object_item_text_get(list_it);
if (tc_data->font && !strcmp(s, tc_data->font))
->>>>>>> remotes/origin/upstream
{
elm_list_item_selected_set(list_it, EINA_TRUE);
elm_list_item_show(list_it);
Evas_Object *obj,
void *event_info)
{
-<<<<<<< HEAD
- Evas_Object *style_list, *cls_list, *sizes_list, *win;
-=======
Evas_Object *style_list, *cls_list, *win;
->>>>>>> remotes/origin/upstream
const char *style, *sel_font;
Elm_Text_Class_Data *tc_data;
Elm_Object_Item *list_it, *fc_list_it;
win = elm_object_top_widget_get(obj);
style_list = evas_object_data_get(win, "font_styles_list");
cls_list = evas_object_data_get(win, "font_classes_list");
-<<<<<<< HEAD
- sizes_list = evas_object_data_get(win, "font_sizes_list");
-=======
->>>>>>> remotes/origin/upstream
fc_list_it = elm_list_selected_item_get(cls_list);
if (!fc_list_it) return; /* should not happen, fonts list disabled in
* this case */
-<<<<<<< HEAD
- eina_stringshare_replace(&fdata.cur_font, sel_font);
-
- tc_data = elm_object_item_data_get(fc_list_it);
- if (tc_data->font) eina_stringshare_del(tc_data->font);
- if (fdata.cur_font) tc_data->font = eina_stringshare_ref(fdata.cur_font);
-
- /* load styles list */
- efp = eina_hash_find(fdata.font_hash, sel_font);
-=======
eina_stringshare_replace(&fndata.cur_font, sel_font);
tc_data = elm_object_item_data_get(fc_list_it);
/* load styles list */
efp = eina_hash_find(fndata.font_hash, sel_font);
->>>>>>> remotes/origin/upstream
ELM_LIST_ENABLE(style_list);
elm_list_clear(style_list);
list_it = elm_list_selected_item_get(fc_list);
if (!list_it) return; /* should not happen */
-<<<<<<< HEAD
- eina_stringshare_replace(&fdata.cur_style,
-=======
eina_stringshare_replace(&fndata.cur_style,
->>>>>>> remotes/origin/upstream
elm_object_item_text_get(event_info));
ELM_LIST_ENABLE(fs_list);
tc_data = elm_object_item_data_get(list_it);
eina_stringshare_del(tc_data->style);
-<<<<<<< HEAD
- tc_data->style = eina_stringshare_ref(fdata.cur_style);
-=======
tc_data->style = eina_stringshare_ref(fndata.cur_style);
->>>>>>> remotes/origin/upstream
evas_event_freeze(evas_object_evas_get(fs_list));
edje_freeze();
if (!list_it) return; /* should not happen */
sd = elm_object_item_data_get(event_info);
-<<<<<<< HEAD
- fdata.cur_size = sd->size;
-
- tc_data = elm_object_item_data_get(list_it);
- tc_data->size = fdata.cur_size;
-=======
fndata.cur_size = sd->size;
tc_data = elm_object_item_data_get(list_it);
tc_data->size = fndata.cur_size;
->>>>>>> remotes/origin/upstream
_font_preview_update(win);
}
evas_event_freeze(evas);
edje_freeze();
-<<<<<<< HEAD
- EINA_LIST_FOREACH(fdata.text_classes, l, tc_data)
-=======
EINA_LIST_FOREACH(fndata.text_classes, l, tc_data)
->>>>>>> remotes/origin/upstream
elm_list_item_append(li, tc_data->desc, NULL, NULL,
_font_classes_list_sel, tc_data);
static void
_fonts_data_fill(Evas *evas)
{
-<<<<<<< HEAD
- const Eina_List *fo_list, *text_classes, *l;
-=======
const Eina_List *fo_list, *l;
Eina_List *text_classes;
->>>>>>> remotes/origin/upstream
Elm_Text_Class_Data *tc_data;
Elm_Font_Size_Data *sd;
Elm_Font_Overlay *efo;
int i;
evas_fonts = evas_font_available_list(evas);
-<<<<<<< HEAD
- fdata.font_hash = elm_font_available_hash_add(evas_fonts);
- evas_font_available_list_free(evas, evas_fonts);
-
- text_classes = elm_text_classes_list_get();
- fo_list = elm_font_overlay_list_get();
-=======
fndata.font_hash = elm_font_available_hash_add(evas_fonts);
evas_font_available_list_free(evas, evas_fonts);
text_classes = elm_config_text_classes_list_get();
fo_list = elm_config_font_overlay_list_get();
->>>>>>> remotes/origin/upstream
EINA_LIST_FOREACH(text_classes, l, etc)
{
tc_data->size = efo->size;
}
-<<<<<<< HEAD
- fdata.text_classes = eina_list_append(fdata.text_classes, tc_data);
- }
-
- elm_text_classes_list_free(text_classes);
-
- /* FIXME: hinting later */
- /* fdata.hinting = e_config->font_hinting; */
-=======
fndata.text_classes = eina_list_append(fndata.text_classes, tc_data);
}
/* FIXME: hinting later */
/* fndata.hinting = e_config->font_hinting; */
->>>>>>> remotes/origin/upstream
sd = calloc(1, sizeof(Elm_Font_Size_Data));
sd->size_str = eina_stringshare_add("Tiny");
sd->size = -50;
-<<<<<<< HEAD
- fdata.font_scale_list = eina_list_append(fdata.font_scale_list, sd);
-=======
fndata.font_scale_list = eina_list_append(fndata.font_scale_list, sd);
->>>>>>> remotes/origin/upstream
sd = calloc(1, sizeof(Elm_Font_Size_Data));
sd->size_str = eina_stringshare_add("Small");
sd->size = -80;
-<<<<<<< HEAD
- fdata.font_scale_list = eina_list_append(fdata.font_scale_list, sd);
-=======
fndata.font_scale_list = eina_list_append(fndata.font_scale_list, sd);
->>>>>>> remotes/origin/upstream
sd = calloc(1, sizeof(Elm_Font_Size_Data));
sd->size_str = eina_stringshare_add("Normal");
sd->size = -100;
-<<<<<<< HEAD
- fdata.font_scale_list = eina_list_append(fdata.font_scale_list, sd);
-=======
fndata.font_scale_list = eina_list_append(fndata.font_scale_list, sd);
->>>>>>> remotes/origin/upstream
sd = calloc(1, sizeof(Elm_Font_Size_Data));
sd->size_str = eina_stringshare_add("Big");
sd->size = -150;
-<<<<<<< HEAD
- fdata.font_scale_list = eina_list_append(fdata.font_scale_list, sd);
-=======
fndata.font_scale_list = eina_list_append(fndata.font_scale_list, sd);
->>>>>>> remotes/origin/upstream
sd = calloc(1, sizeof(Elm_Font_Size_Data));
sd->size_str = eina_stringshare_add("Really Big");
sd->size = -190;
-<<<<<<< HEAD
- fdata.font_scale_list = eina_list_append(fdata.font_scale_list, sd);
-=======
fndata.font_scale_list = eina_list_append(fndata.font_scale_list, sd);
->>>>>>> remotes/origin/upstream
sd = calloc(1, sizeof(Elm_Font_Size_Data));
sd->size_str = eina_stringshare_add("Huge");
sd->size = -250;
-<<<<<<< HEAD
- fdata.font_scale_list = eina_list_append(fdata.font_scale_list, sd);
-=======
fndata.font_scale_list = eina_list_append(fndata.font_scale_list, sd);
->>>>>>> remotes/origin/upstream
for (i = 5; i < 51; i++)
{
sd = calloc(1, sizeof(Elm_Font_Size_Data));
sd->size_str = eina_stringshare_add(str);
sd->size = i;
-<<<<<<< HEAD
- fdata.font_px_list = eina_list_append(fdata.font_px_list, sd);
-=======
fndata.font_px_list = eina_list_append(fndata.font_px_list, sd);
->>>>>>> remotes/origin/upstream
}
}
evas_event_freeze(evas);
edje_freeze();
-<<<<<<< HEAD
- EINA_LIST_FOREACH(fdata.font_scale_list, l, size_data)
- elm_list_item_append(size_list, size_data->size_str, NULL, NULL,
- _font_sizes_list_sel, size_data);
-
- EINA_LIST_FOREACH(fdata.font_px_list, l, size_data)
-=======
EINA_LIST_FOREACH(fndata.font_scale_list, l, size_data)
elm_list_item_append(size_list, size_data->size_str, NULL, NULL,
_font_sizes_list_sel, size_data);
EINA_LIST_FOREACH(fndata.font_px_list, l, size_data)
->>>>>>> remotes/origin/upstream
elm_list_item_append(size_list, size_data->size_str, NULL, NULL,
_font_sizes_list_sel, size_data);
evas_event_freeze(evas);
edje_freeze();
-<<<<<<< HEAD
- eina_hash_foreach(fdata.font_hash, _font_list_fill, &names_list);
-=======
eina_hash_foreach(fndata.font_hash, _font_list_fill, &names_list);
->>>>>>> remotes/origin/upstream
names_list = eina_list_sort(names_list, eina_list_count(names_list),
_font_sort_cb);
static void
_status_config_fonts(Evas_Object *win,
-<<<<<<< HEAD
- Evas_Object *pager)
-=======
Evas_Object *naviframe)
->>>>>>> remotes/origin/upstream
{
Evas_Object *base, *fr, *li, *rc, *preview, *sp, *pd, *bt, *bx;
char buf[PATH_MAX];
evas_object_data_set(win, "fonts", base);
-<<<<<<< HEAD
- elm_pager_content_push(pager, base);
-=======
elm_naviframe_item_simple_push(naviframe, base);
->>>>>>> remotes/origin/upstream
}
static void
{
const char *cur_profile = NULL;
const char *sel_profile, *pdir;
-<<<<<<< HEAD
- Eina_Bool cur_selected;
-=======
->>>>>>> remotes/origin/upstream
const char *prof_name;
char buf[PATH_MAX];
Evas_Object *en;
if (!sel_profile)
return;
-<<<<<<< HEAD
- cur_profile = elm_profile_current_get();
- cur_selected = !strcmp(cur_profile, sel_profile);
-
- pdir = elm_profile_dir_get(sel_profile, EINA_TRUE);
- if (!pdir) pdir = elm_profile_dir_get(sel_profile, EINA_FALSE);
-=======
cur_profile = elm_config_profile_get();
pdir = elm_config_profile_dir_get(sel_profile, EINA_TRUE);
if (!pdir) pdir = elm_config_profile_dir_get(sel_profile, EINA_FALSE);
->>>>>>> remotes/origin/upstream
#ifdef ELM_EFREET
snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
desk = efreet_desktop_new(buf);
else
{
if (desk) efreet_desktop_free(desk);
-<<<<<<< HEAD
- pdir = elm_profile_dir_get(sel_profile, EINA_FALSE);
-=======
pdir = elm_config_profile_dir_get(sel_profile, EINA_FALSE);
->>>>>>> remotes/origin/upstream
snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
desk = efreet_desktop_new(buf);
if ((desk) && (desk->name)) prof_name = desk->name;
EINA_FALSE);
elm_object_disabled_set(evas_object_data_get(obj, "prof_use_btn"),
EINA_FALSE);
-<<<<<<< HEAD
- elm_profile_dir_free(pdir);
-=======
elm_config_profile_dir_free(pdir);
->>>>>>> remotes/origin/upstream
}
snprintf(buf, sizeof(buf), "<hilight>Selected profile: %s</><br/>",
elm_list_clear(l_widget);
-<<<<<<< HEAD
- cur_profile = elm_profile_current_get();
-=======
cur_profile = elm_config_profile_get();
->>>>>>> remotes/origin/upstream
EINA_LIST_FOREACH(p_names, l, profile)
{
Elm_Object_Item *list_it;
Evas_Object *ic;
-<<<<<<< HEAD
- pdir = elm_profile_dir_get(profile, EINA_TRUE);
- if (!pdir) pdir = elm_profile_dir_get(profile, EINA_FALSE);
-=======
pdir = elm_config_profile_dir_get(profile, EINA_TRUE);
if (!pdir) pdir = elm_config_profile_dir_get(profile, EINA_FALSE);
->>>>>>> remotes/origin/upstream
label = profile;
#ifdef ELM_EFREET
else
{
if (desk) efreet_desktop_free(desk);
-<<<<<<< HEAD
- pdir = elm_profile_dir_get(profile, EINA_FALSE);
-=======
pdir = elm_config_profile_dir_get(profile, EINA_FALSE);
->>>>>>> remotes/origin/upstream
snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
desk = efreet_desktop_new(buf);
if ((desk) && (desk->name)) label = desk->name;
if (cur_profile && !strcmp(profile, cur_profile))
sel_it = list_it;
-<<<<<<< HEAD
- elm_profile_dir_free(pdir);
-=======
elm_config_profile_dir_free(pdir);
->>>>>>> remotes/origin/upstream
#ifdef ELM_EFREET
if (desk) efreet_desktop_free(desk);
static void
_status_config_profiles(Evas_Object *win,
-<<<<<<< HEAD
- Evas_Object *pager)
-=======
Evas_Object *naviframe)
->>>>>>> remotes/origin/upstream
{
Evas_Object *li, *bx, *fr_bx1, *fr_bx2, *btn_bx, *fr, *lb, *en, *sp, *pd,
*bt;
evas_object_smart_callback_add(li, "unselected", _profiles_list_unselect_cb,
NULL);
-<<<<<<< HEAD
- profs = elm_profile_list_get();
-=======
profs = elm_config_profile_list_get();
->>>>>>> remotes/origin/upstream
evas_object_show(li);
elm_box_pack_end(fr_bx2, li);
_profiles_list_fill(li, profs);
-<<<<<<< HEAD
- elm_profile_list_free(profs);
-=======
elm_config_profile_list_free(profs);
->>>>>>> remotes/origin/upstream
edje_thaw();
evas_event_thaw(evas);
evas_object_data_set(win, "profiles", bx);
-<<<<<<< HEAD
- elm_pager_content_push(pager, bx);
-=======
elm_naviframe_item_simple_push(naviframe, bx);
->>>>>>> remotes/origin/upstream
}
static void
_status_config_scrolling(Evas_Object *win,
-<<<<<<< HEAD
- Evas_Object *pager)
-=======
Evas_Object *naviframe)
->>>>>>> remotes/origin/upstream
{
Evas_Object *lb, *pd, *bx, *sl, *sp, *ck, *sc;
evas_object_data_set(win, "scroll_bounce_check", ck);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5);
-<<<<<<< HEAD
- elm_check_state_set(ck, elm_scroll_bounce_enabled_get());
-=======
elm_check_state_set(ck, elm_config_scroll_bounce_enabled_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, ck);
evas_object_show(ck);
elm_slider_unit_format_set(sl, "%1.2f");
elm_slider_indicator_format_set(sl, "%1.2f");
elm_slider_min_max_set(sl, 0.0, 4.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_scroll_bounce_friction_get());
-=======
elm_slider_value_set(sl, elm_config_scroll_bounce_friction_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
evas_object_data_set(win, "thumbscroll_check", ck);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5);
-<<<<<<< HEAD
- elm_check_state_set(ck, elm_scroll_thumbscroll_enabled_get());
-=======
elm_check_state_set(ck, elm_config_scroll_thumbscroll_enabled_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, ck);
evas_object_show(ck);
elm_slider_unit_format_set(sl, "%1.0f pixels");
elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 8.0, 50.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_scroll_thumbscroll_threshold_get());
-=======
elm_slider_value_set(sl, elm_config_scroll_thumbscroll_threshold_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
elm_slider_unit_format_set(sl, "%1.0f pixels/s");
elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 10.0, 200.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_scroll_thumbscroll_momentum_threshold_get());
-=======
elm_slider_value_set(sl, elm_config_scroll_thumbscroll_momentum_threshold_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
elm_slider_unit_format_set(sl, "%1.1f");
elm_slider_indicator_format_set(sl, "%1.1f");
elm_slider_min_max_set(sl, 0.0, 15.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_scroll_thumbscroll_friction_get());
-=======
elm_slider_value_set(sl, elm_config_scroll_thumbscroll_friction_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
elm_slider_unit_format_set(sl, "%1.2f");
elm_slider_indicator_format_set(sl, "%1.2f");
elm_slider_min_max_set(sl, 0.0, 1.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_scroll_thumbscroll_border_friction_get());
-=======
elm_slider_value_set(sl, elm_config_scroll_thumbscroll_border_friction_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
elm_slider_unit_format_set(sl, "%1.2f");
elm_slider_indicator_format_set(sl, "%1.2f");
elm_slider_min_max_set(sl, 0.1, 1.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_scroll_thumbscroll_sensitivity_friction_get());
-=======
elm_slider_value_set(sl, elm_config_scroll_thumbscroll_sensitivity_friction_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
elm_slider_unit_format_set(sl, "%1.1f");
elm_slider_indicator_format_set(sl, "%1.1f");
elm_slider_min_max_set(sl, 0.0, 5.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_scroll_page_scroll_friction_get());
-=======
elm_slider_value_set(sl, elm_config_scroll_page_scroll_friction_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
elm_slider_unit_format_set(sl, "%1.1f");
elm_slider_indicator_format_set(sl, "%1.1f");
elm_slider_min_max_set(sl, 0.0, 5.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_scroll_bring_in_scroll_friction_get());
-=======
elm_slider_value_set(sl, elm_config_scroll_bring_in_scroll_friction_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
elm_slider_unit_format_set(sl, "%1.1f");
elm_slider_indicator_format_set(sl, "%1.1f");
elm_slider_min_max_set(sl, 0.0, 5.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_scroll_zoom_friction_get());
-=======
elm_slider_value_set(sl, elm_config_scroll_zoom_friction_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
evas_object_data_set(win, "scrolling", sc);
-<<<<<<< HEAD
- elm_pager_content_push(pager, sc);
-=======
elm_naviframe_item_simple_push(naviframe, sc);
->>>>>>> remotes/origin/upstream
}
static char *
if (!e_names)
return;
-<<<<<<< HEAD
- cur_engine = elm_engine_current_get();
-=======
cur_engine = elm_config_engine_get();
->>>>>>> remotes/origin/upstream
EINA_LIST_FOREACH(e_names, l, engine)
{
static void
_status_config_rendering(Evas_Object *win,
-<<<<<<< HEAD
- Evas_Object *pager)
-=======
Evas_Object *naviframe)
->>>>>>> remotes/origin/upstream
{
Evas_Object *li, *bx, *fr, *sp, *pd, *bt;
Eina_List *engines;
evas_object_show(bt);
evas_object_data_set(win, "rendering", bx);
-<<<<<<< HEAD
- elm_pager_content_push(pager, bx);
-=======
elm_naviframe_item_simple_push(naviframe, bx);
->>>>>>> remotes/origin/upstream
}
static void
_status_config_caches(Evas_Object *win,
-<<<<<<< HEAD
- Evas_Object *pager)
-=======
Evas_Object *naviframe)
->>>>>>> remotes/origin/upstream
{
Evas_Object *lb, *pd, *bx, *sl, *sp, *ck;
elm_slider_unit_format_set(sl, "%1.0f ticks");
elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 8.0, 4096.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_cache_flush_interval_get());
- elm_object_disabled_set(sl, !elm_cache_flush_enabled_get());
-=======
elm_slider_value_set(sl, elm_config_cache_flush_interval_get());
elm_object_disabled_set(sl, !elm_config_cache_flush_enabled_get());
->>>>>>> remotes/origin/upstream
ck = elm_check_add(win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5);
elm_object_text_set(ck, "Enable Flushing");
-<<<<<<< HEAD
- elm_check_state_set(ck, elm_cache_flush_enabled_get());
-=======
elm_check_state_set(ck, elm_config_cache_flush_enabled_get());
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", cf_enable, sl);
elm_box_pack_end(bx, ck);
evas_object_show(ck);
evas_object_smart_callback_add(sl, "delay,changed", cf_change, NULL);
sp = elm_separator_add(win);
-<<<<<<< HEAD
- elm_separator_horizontal_set(sp, 1);
-=======
elm_separator_horizontal_set(sp, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(sp, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
elm_box_pack_end(bx, sp);
elm_slider_unit_format_set(sl, "%1.1f MB");
elm_slider_indicator_format_set(sl, "%1.1f");
elm_slider_min_max_set(sl, 0.0, 4.0);
-<<<<<<< HEAD
- elm_slider_value_set(sl, (double)elm_font_cache_get() / 1024.0);
-=======
elm_slider_value_set(sl, (double)elm_config_cache_font_cache_size_get() / 1024.0);
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
evas_object_smart_callback_add(sl, "delay,changed", fc_change, NULL);
sp = elm_separator_add(win);
-<<<<<<< HEAD
- elm_separator_horizontal_set(sp, 1);
-=======
elm_separator_horizontal_set(sp, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(sp, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
elm_box_pack_end(bx, sp);
elm_slider_unit_format_set(sl, "%1.0f MB");
elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 0, 32);
-<<<<<<< HEAD
- elm_slider_value_set(sl, (double)elm_image_cache_get() / 1024.0);
-=======
elm_slider_value_set(sl, (double)elm_config_cache_image_cache_size_get() / 1024.0);
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
evas_object_smart_callback_add(sl, "delay,changed", ic_change, NULL);
sp = elm_separator_add(win);
-<<<<<<< HEAD
- elm_separator_horizontal_set(sp, 1);
-=======
elm_separator_horizontal_set(sp, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(sp, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
elm_box_pack_end(bx, sp);
elm_slider_unit_format_set(sl, "%1.0f files");
elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 0, 32);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_edje_file_cache_get());
-=======
elm_slider_value_set(sl, elm_config_cache_edje_file_cache_size_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
evas_object_smart_callback_add(sl, "delay,changed", efc_change, NULL);
sp = elm_separator_add(win);
-<<<<<<< HEAD
- elm_separator_horizontal_set(sp, 1);
-=======
elm_separator_horizontal_set(sp, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(sp, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0.5);
elm_box_pack_end(bx, sp);
elm_slider_unit_format_set(sl, "%1.0f collections");
elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 0, 128);
-<<<<<<< HEAD
- elm_slider_value_set(sl, elm_edje_collection_cache_get());
-=======
elm_slider_value_set(sl, elm_config_cache_edje_collection_cache_size_get());
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sl);
evas_object_show(sl);
evas_object_data_set(win, "caches", bx);
-<<<<<<< HEAD
- elm_pager_content_push(pager, bx);
-=======
elm_naviframe_item_simple_push(naviframe, bx);
->>>>>>> remotes/origin/upstream
}
static void
_status_config_full(Evas_Object *win,
Evas_Object *bx0)
{
-<<<<<<< HEAD
- Evas_Object *tb, *pager;
- Elm_Object_Item *tb_sizing, *tb_it;
-
- tb = elm_toolbar_add(win);
- elm_toolbar_menu_parent_set(tb, win);
- elm_toolbar_homogeneous_set(tb, 0);
-=======
Evas_Object *tb, *naviframe;
Elm_Object_Item *tb_sizing, *tb_it;
elm_toolbar_select_mode_set(tb, ELM_OBJECT_SELECT_MODE_ALWAYS);
elm_toolbar_menu_parent_set(tb, win);
elm_toolbar_homogeneous_set(tb, EINA_FALSE);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(tb, 1.0, 0.0);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(bx0, tb);
evas_object_show(tb);
-<<<<<<< HEAD
- pager = elm_pager_add(win);
- evas_object_size_hint_align_set(pager, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_weight_set(pager, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_data_set(win, "pager", pager);
-
- _status_config_themes(win, pager);
- _status_config_fonts(win, pager);
- _status_config_profiles(win, pager);
- _status_config_rendering(win, pager);
- _status_config_scrolling(win, pager);
- _status_config_caches(win, pager);
- _status_config_sizing(win, pager);
-
- // FIXME uncomment after flip style fix, please
- //elm_object_style_set(pager, "flip");
- elm_toolbar_item_selected_set(tb_sizing, EINA_TRUE);
- elm_box_pack_end(bx0, pager);
- evas_object_show(pager);
-=======
naviframe = elm_naviframe_add(win);
evas_object_size_hint_align_set(naviframe, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(naviframe, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_toolbar_item_selected_set(tb_sizing, EINA_TRUE);
elm_box_pack_end(bx0, naviframe);
evas_object_show(naviframe);
->>>>>>> remotes/origin/upstream
}
static void
}
if (!interactive)
{
-<<<<<<< HEAD
- if (theme_set)
- {
- elm_theme_all_set(theme_set);
- }
- if (finger_size_set)
- {
- elm_finger_size_all_set(atoi(finger_size_set));
- }
- if (scale_set)
- {
- elm_scale_all_set(atof(scale_set));
- }
- if (quiet)
- {
- elm_exit();
- }
-=======
if (theme_set) elm_theme_set(NULL, theme_set);
if (finger_size_set) elm_config_finger_size_set(atoi(finger_size_set));
if (scale_set) elm_config_scale_set(atof(scale_set));
elm_config_all_flush();
if (quiet) elm_exit();
->>>>>>> remotes/origin/upstream
}
elm_run(); /* and run the program now and handle all events, etc. */
/* if the mainloop that elm_run() runs exists, we exit the app */
struct sockaddr_un client;
socklen_t len;
-<<<<<<< HEAD
- elm_quicklaunch_sub_init(argc, argv);
- elm_quicklaunch_seed();
- len = sizeof(struct sockaddr_un);
- fd = accept(sock, (struct sockaddr *)&client, &len);
-=======
len = sizeof(struct sockaddr_un);
fd = accept(sock, (struct sockaddr *)&client, &len);
elm_quicklaunch_sub_init(argc, argv);
// don't seed since we are doing this AFTER launch request
// elm_quicklaunch_seed();
->>>>>>> remotes/origin/upstream
if (fd >= 0)
{
unsigned long bytes;
#include <Elementary.h>
-<<<<<<< HEAD
-=======
#include "test.h"
->>>>>>> remotes/origin/upstream
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
void test_bg_image(void *data, Evas_Object *obj, void *event_info);
void test_bg_options(void *data, Evas_Object *obj, void *event_info);
void test_icon(void *data, Evas_Object *obj, void *event_info);
-<<<<<<< HEAD
-void test_box_vert(void *data, Evas_Object *obj, void *event_info);
-void test_box_vert2(void *data, Evas_Object *obj, void *event_info);
-void test_box_horiz(void *data, Evas_Object *obj, void *event_info);
-=======
void test_icon_transparent(void *data, Evas_Object *obj, void *event_info);
void test_box_vert(void *data, Evas_Object *obj, void *event_info);
void test_box_vert2(void *data, Evas_Object *obj, void *event_info);
void test_box_pack(void *data, Evas_Object *obj, void *event_info);
void test_box_horiz(void *data, Evas_Object *obj, void *event_info);
void test_box_homo(void *data, Evas_Object *obj, void *event_info);
->>>>>>> remotes/origin/upstream
void test_box_transition(void *data, Evas_Object *obj, void *event_info);
void test_button(void *data, Evas_Object *obj, void *event_info);
void test_cnp(void *data, Evas_Object *obj, void *event_info);
void test_toggle(void *data, Evas_Object *obj, void *event_info);
void test_clock(void *data, Evas_Object *obj, void *event_info);
void test_clock2(void *data, Evas_Object *obj, void *event_info);
-<<<<<<< HEAD
-=======
void test_clock3(void *data, Evas_Object *obj, void *event_info);
->>>>>>> remotes/origin/upstream
void test_check(void *data, Evas_Object *obj, void *event_info);
void test_radio(void *data, Evas_Object *obj, void *event_info);
void test_layout(void *data, Evas_Object *obj, void *event_info);
void test_entry3(void *data, Evas_Object *obj, void *event_info);
void test_entry4(void *data, Evas_Object *obj, void *event_info);
void test_entry5(void *data, Evas_Object *obj, void *event_info);
-<<<<<<< HEAD
-void test_entry_notepad(void *data, Evas_Object *obj, void *event_info);
-void test_multibuttonentry(void *data, Evas_Object *obj, void *event_info);
-void test_anchorview(void *data, Evas_Object *obj, void *event_info);
-void test_anchorblock(void *data, Evas_Object *obj, void *event_info);
-=======
void test_entry6(void *data, Evas_Object *obj, void *event_info);
void test_entry7(void *data, Evas_Object *obj, void *event_info);
void test_entry8(void *data, Evas_Object *obj, void *event_info);
void test_multibuttonentry(void *data, Evas_Object *obj, void *event_info);
void test_entry_anchor2(void *data, Evas_Object *obj, void *event_info);
void test_entry_anchor(void *data, Evas_Object *obj, void *event_info);
->>>>>>> remotes/origin/upstream
void test_toolbar(void *data, Evas_Object *obj, void *event_info);
void test_toolbar2(void *data, Evas_Object *obj, void *event_info);
void test_toolbar3(void *data, Evas_Object *obj, void *event_info);
void test_genlist12(void *data, Evas_Object *obj, void *event_info);
void test_genlist13(void *data, Evas_Object *obj, void *event_info);
void test_genlist14(void *data, Evas_Object *obj, void *event_info);
-<<<<<<< HEAD
-=======
void test_genlist15(void *data, Evas_Object *obj, void *event_info);
void test_genlist16(void *data, Evas_Object *obj, void *event_info);
void test_genlist17(void *data, Evas_Object *obj, void *event_info);
->>>>>>> remotes/origin/upstream
void test_gesture_layer(void *data, Evas_Object *obj, void *event_info);
void test_gesture_layer2(void *data, Evas_Object *obj, void *event_info);
void test_gesture_layer3(void *data, Evas_Object *obj, void *event_info);
void test_table4(void *data, Evas_Object *obj, void *event_info);
void test_table5(void *data, Evas_Object *obj, void *event_info);
void test_table6(void *data, Evas_Object *obj, void *event_info);
-<<<<<<< HEAD
-void test_gengrid(void *data, Evas_Object *obj, void *event_info);
-void test_gengrid2(void *data, Evas_Object *obj, void *event_info);
-void test_gengrid3(void *data, Evas_Object *obj, void *event_info);
-void test_pager(void *data, Evas_Object *obj, void *event_info);
-void test_pager_slide(void *data, Evas_Object *obj, void *event_info);
-=======
void test_table7(void *data, Evas_Object *obj, void *event_info);
void test_gengrid(void *data, Evas_Object *obj, void *event_info);
void test_gengrid2(void *data, Evas_Object *obj, void *event_info);
void test_gengrid3(void *data, Evas_Object *obj, void *event_info);
->>>>>>> remotes/origin/upstream
void test_win_state(void *data, Evas_Object *obj, void *event_info);
void test_win_state2(void *data, Evas_Object *obj, void *event_info);
void test_progressbar(void *data, Evas_Object *obj, void *event_info);
void test_flip4(void *data, Evas_Object *obj, void *event_info);
void test_flip_page(void *data, Evas_Object *obj, void *event_info);
void test_label(void *data, Evas_Object *obj, void *event_info);
-<<<<<<< HEAD
-=======
void test_label2(void *data, Evas_Object *obj, void *event_info);
->>>>>>> remotes/origin/upstream
void test_conformant(void *data, Evas_Object *obj, void *event_info);
void test_conformant2(void *data, Evas_Object *obj, void *event_info);
void test_multi(void *data, Evas_Object *obj, void *event_info);
void test_focus(void *data, Evas_Object *obj, void *event_info);
void test_focus2(void *data, Evas_Object *obj, void *event_info);
void test_focus3(void *data, Evas_Object *obj, void *event_info);
-<<<<<<< HEAD
-=======
void test_focus4(void *data, Evas_Object *obj, void *event_info);
->>>>>>> remotes/origin/upstream
void test_flipselector(void *data, Evas_Object *obj, void *event_info);
void test_diskselector(void *data, Evas_Object *obj, void *event_info);
void test_colorselector(void *data, Evas_Object *obj, void *event_info);
void test_glview(void *data, Evas_Object *obj, void *event_info);
void test_3d(void *data, Evas_Object *obj, void *event_info);
void test_naviframe(void *data, Evas_Object *obj, void *event_info);
-<<<<<<< HEAD
-void test_factory(void *data, Evas_Object *obj, void *event_info);
-=======
//void test_factory(void *data, Evas_Object *obj, void *event_info);
void test_datetime(void *data, Evas_Object *obj, void *event_info);
void test_popup(void *data, Evas_Object *obj, void *event_info);
void test_dayselector(void *data, Evas_Object *obj, void *event_info);
->>>>>>> remotes/origin/upstream
#ifdef HAVE_EMOTION
void test_video(void *data, Evas_Object *obj, void *event_info);
#endif
*p_list = eina_list_sorted_insert(*p_list, elm_test_sort, t);
}
-<<<<<<< HEAD
-static void
-my_win_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- /* called when my_win_main is requested to be deleted */
-=======
void
my_win_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
->>>>>>> remotes/origin/upstream
elm_exit(); /* exit the program's main loop that runs in elm_run() */
}
_ui_tg_changed(void *data, Evas_Object *obj, void *event_info)
{
(void) data; (void) event_info;
-<<<<<<< HEAD
- elm_mirrored_set(elm_check_state_get(obj));
-=======
elm_config_mirrored_set(elm_check_state_get(obj));
->>>>>>> remotes/origin/upstream
}
static void
tg = elm_check_add(win);
elm_object_style_set(tg, "toggle");
elm_object_text_set(tg, "UI-Mirroring:");
-<<<<<<< HEAD
- elm_check_state_set(tg, elm_mirrored_get());
-=======
elm_check_state_set(tg, elm_config_mirrored_get());
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(tg, "changed", _ui_tg_changed, NULL);
elm_box_pack_end(bx0, tg);
evas_object_show(tg);
ADD_TEST(NULL, "Window / Background", "Window Plug", test_win_plug);
//------------------------------//
-<<<<<<< HEAD
- ADD_TEST(NULL, "Images", "Icon Transparent", test_icon);
-=======
ADD_TEST(NULL, "Images", "Icon", test_icon);
ADD_TEST(NULL, "Images", "Icon Transparent", test_icon_transparent);
->>>>>>> remotes/origin/upstream
ADD_TEST(NULL, "Images", "Icon Animation", test_icon_animated);
ADD_TEST(NULL, "Images", "Photocam", test_photocam);
ADD_TEST(NULL, "Images", "Photo", test_photo);
//------------------------------//
ADD_TEST(NULL, "Containers", "Box Vert", test_box_vert);
ADD_TEST(NULL, "Containers", "Box Vert 2", test_box_vert2);
-<<<<<<< HEAD
- ADD_TEST(NULL, "Containers", "Box Horiz", test_box_horiz);
-=======
ADD_TEST(NULL, "Containers", "Box Pack", test_box_pack);
ADD_TEST(NULL, "Containers", "Box Horiz", test_box_horiz);
ADD_TEST(NULL, "Containers", "Box Homogeneous", test_box_homo);
->>>>>>> remotes/origin/upstream
ADD_TEST(NULL, "Containers", "Box Transition", test_box_transition);
ADD_TEST(NULL, "Containers", "Table", test_table);
ADD_TEST(NULL, "Containers", "Table Homogeneous", test_table2);
ADD_TEST(NULL, "Containers", "Table 4", test_table4);
ADD_TEST(NULL, "Containers", "Table 5", test_table5);
ADD_TEST(NULL, "Containers", "Table 6", test_table6);
-<<<<<<< HEAD
-=======
ADD_TEST(NULL, "Containers", "Table 7", test_table7);
->>>>>>> remotes/origin/upstream
ADD_TEST(NULL, "Containers", "Layout", test_layout);
ADD_TEST(NULL, "Containers", "Grid", test_grid);
ADD_TEST(NULL, "Entries", "Entry 3", test_entry3);
ADD_TEST(NULL, "Entries", "Entry 4", test_entry4);
ADD_TEST(NULL, "Entries", "Entry 5", test_entry5);
-<<<<<<< HEAD
- ADD_TEST(NULL, "Entries", "Entry Notepad", test_entry_notepad);
- ADD_TEST(NULL, "Entries", "Multibuttonentry", test_multibuttonentry);
-=======
ADD_TEST(NULL, "Entries", "Entry 6", test_entry6);
ADD_TEST(NULL, "Entries", "Entry 7", test_entry7);
ADD_TEST(NULL, "Entries", "Entry 8", test_entry8);
ADD_TEST(NULL, "Entries", "Multibuttonentry", test_multibuttonentry);
ADD_TEST(NULL, "Entries", "Entry Anchor", test_entry_anchor);
ADD_TEST(NULL, "Entries", "Entry Anchor2", test_entry_anchor2);
->>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Buttons", "Buttons", test_button);
ADD_TEST(NULL, "Lists", "Genlist Eio", test_eio);
#endif
ADD_TEST(NULL, "Lists", "Genlist Textblock", test_genlist12);
-<<<<<<< HEAD
- //ADD_TEST(NULL, "Lists", "Genlist Tree, Insert Sorted", test_genlist13);
- //ADD_TEST(NULL, "Lists", "Genlist Tree, Insert Relative", test_genlist14);
-=======
ADD_TEST(NULL, "Lists", "Genlist Tree, Insert Sorted", test_genlist13);
ADD_TEST(NULL, "Lists", "Genlist Tree, Insert Relative", test_genlist14);
ADD_TEST(NULL, "Lists", "Genlist Edit Mode", test_genlist15);
ADD_TEST(NULL, "Lists", "Genlist Flip Mode", test_genlist16);
ADD_TEST(NULL, "Lists", "Genlist Tree Effect", test_genlist17);
->>>>>>> remotes/origin/upstream
ADD_TEST(NULL, "Lists", "GenGrid", test_gengrid);
ADD_TEST(NULL, "Lists", "GenGrid 2", test_gengrid2);
ADD_TEST(NULL, "Lists", "GenGrid Group", test_gengrid3);
ADD_TEST(NULL, "Selectors", "Hoversel", test_hoversel);
ADD_TEST(NULL, "Selectors", "Radios", test_radio);
ADD_TEST(NULL, "Selectors", "Flip Selector", test_flipselector);
-<<<<<<< HEAD
-=======
ADD_TEST(NULL, "Selectors", "Dayselector", test_dayselector);
->>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Cursors", "Cursor", test_cursor);
ADD_TEST(NULL, "Popups", "Hover 2", test_hover2);
ADD_TEST(NULL, "Popups", "Notify", test_notify);
ADD_TEST(NULL, "Popups", "Tooltip", test_tooltip);
-<<<<<<< HEAD
- ADD_TEST(NULL, "Popups", "Tooltip2", test_tooltip2);
-=======
ADD_TEST(NULL, "Popups", "Tooltip 2", test_tooltip2);
ADD_TEST(NULL, "Popups", "Popup", test_popup);
->>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Times & Dates", "Calendar", test_calendar);
ADD_TEST(NULL, "Times & Dates", "Calendar 2", test_calendar2);
ADD_TEST(NULL, "Times & Dates", "Clock", test_clock);
ADD_TEST(NULL, "Times & Dates", "Clock 2", test_clock2);
-<<<<<<< HEAD
-
- //------------------------------//
- ADD_TEST(NULL, "Text", "Anchorview", test_anchorview);
- ADD_TEST(NULL, "Text", "Anchorblock", test_anchorblock);
- ADD_TEST(NULL, "Text", "Label", test_label);
-=======
ADD_TEST(NULL, "Times & Dates", "Clock 3", test_clock3);
ADD_TEST(NULL, "Times & Dates", "Datetime", test_datetime);
//------------------------------//
ADD_TEST(NULL, "Text", "Label", test_label);
ADD_TEST(NULL, "Text", "Label2", test_label2);
->>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Stored Surface Buffer", "Launcher", test_launcher);
ADD_TEST(NULL, "Focus", "Focus", test_focus);
ADD_TEST(NULL, "Focus", "Focus 2", test_focus2);
ADD_TEST(NULL, "Focus", "Focus 3", test_focus3);
-<<<<<<< HEAD
-
- //------------------------------//
- ADD_TEST(NULL, "Storyboard", "Naviframe", test_naviframe);
- ADD_TEST(NULL, "Storyboard", "Pager", test_pager);
- ADD_TEST(NULL, "Storyboard", "Pager Slide", test_pager_slide);
-=======
ADD_TEST(NULL, "Focus", "Focus 4", test_focus4);
//------------------------------//
ADD_TEST(NULL, "Storyboard", "Naviframe", test_naviframe);
->>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Geographic", "Map", test_map);
//------------------------------//
ADD_TEST(NULL, "Helpers", "Store", test_store);
-<<<<<<< HEAD
- ADD_TEST(NULL, "Helpers", "Factory", test_factory);
-=======
// ADD_TEST(NULL, "Helpers", "Factory", test_factory);
->>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Micellaneous", "Copy And Paste", test_cnp);
}
tt = t;
-<<<<<<< HEAD
- if (test_win_only) return;
-=======
if (test_win_only)
{
EINA_LIST_FREE(tests, t)
return;
}
->>>>>>> remotes/origin/upstream
if (tests)
{
+++ /dev/null
-#include <Elementary.h>
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
-#endif
-#ifndef ELM_LIB_QUICKLAUNCH
-
-static void
-_print_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- printf("bubble clicked\n");
-}
-
-static void
-my_anchorblock_bt(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Evas_Object *av = data;
- elm_anchorblock_hover_end(av);
-}
-
-static void
-my_anchorblock_anchor(void *data, Evas_Object *obj, void *event_info)
-{
- Evas_Object *av = data;
- Elm_Entry_Anchorblock_Info *ei = event_info;
- Evas_Object *bt, *bx;
-
- bt = elm_button_add(obj);
- elm_object_text_set(bt, ei->name);
- elm_object_part_content_set(ei->hover, "middle", bt);
- evas_object_show(bt);
-
- // hints as to where we probably should put hover contents (buttons etc.).
- if (ei->hover_top)
- {
- bx = elm_box_add(obj);
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Top 1");
- elm_box_pack_end(bx, bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
- evas_object_show(bt);
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Top 2");
- elm_box_pack_end(bx, bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
- evas_object_show(bt);
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Top 3");
- elm_box_pack_end(bx, bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
- evas_object_show(bt);
- elm_object_part_content_set(ei->hover, "top", bx);
- evas_object_show(bx);
- }
- if (ei->hover_bottom)
- {
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Bot");
- elm_object_part_content_set(ei->hover, "bottom", bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
- evas_object_show(bt);
- }
- if (ei->hover_left)
- {
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Left");
- elm_object_part_content_set(ei->hover, "left", bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
- evas_object_show(bt);
- }
- if (ei->hover_right)
- {
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Right");
- elm_object_part_content_set(ei->hover, "right", bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
- evas_object_show(bt);
- }
-}
-
-static void
-my_anchorblock_edge_left(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- printf("left\n");
-}
-
-static void
-my_anchorblock_edge_right(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- printf("right\n");
-}
-
-static void
-my_anchorblock_edge_top(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- printf("top\n");
-}
-
-static void
-my_anchorblock_edge_bottom(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- printf("bottom\n");
-}
-
-static void
-my_anchorblock_scroll(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
-{
- Evas_Coord x, y, w, h, vw, vh;
-
- elm_scroller_region_get(obj, &x, &y, &w, &h);
- elm_scroller_child_size_get(obj, &vw, &vh);
- printf("scroll %ix%i +%i+%i in %ix%i\n", w, h, x, y, vw, vh);
-}
-
-void
-test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Evas_Object *win, *bg, *av, *sc, *bx, *bb, *ic;
- char buf[PATH_MAX];
-
- win = elm_win_add(NULL, "anchorblock", ELM_WIN_BASIC);
- elm_win_title_set(win, "Anchorblock");
- elm_win_autodel_set(win, EINA_TRUE);
-
- 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);
-
- sc = elm_scroller_add(win);
- evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, sc);
-
- evas_object_smart_callback_add(sc, "edge_left", my_anchorblock_edge_left, NULL);
- evas_object_smart_callback_add(sc, "edge_right", my_anchorblock_edge_right, NULL);
- evas_object_smart_callback_add(sc, "edge_top", my_anchorblock_edge_top, NULL);
- evas_object_smart_callback_add(sc, "edge_bottom", my_anchorblock_edge_bottom, NULL);
- evas_object_smart_callback_add(sc, "scroll", my_anchorblock_scroll, NULL);
-
- bx = elm_box_add(win);
- evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
- ic = elm_icon_add(win);
- snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
- elm_icon_file_set(ic, buf, NULL);
- elm_icon_scale_set(ic, 0, 0);
- evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
-
- bb = elm_bubble_add(win);
- elm_object_text_set(bb, "Message 3");
- elm_object_part_text_set(bb, "info", "10:32 4/11/2008");
- elm_object_part_content_set(bb, "icon", ic);
- evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL);
- evas_object_show(ic);
- evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL);
- av = elm_anchorblock_add(win);
- elm_anchorblock_hover_style_set(av, "popout");
- elm_anchorblock_hover_parent_set(av, win);
- elm_object_text_set(av,
- "Hi there. This is the most recent message in the "
- "list of messages. It has one <a href=tel:+614321234>+61 432 1234</a> "
- "(phone number) to click on.");
- evas_object_smart_callback_add(av, "anchor,clicked",
- my_anchorblock_anchor, av);
- elm_object_content_set(bb, av);
- evas_object_show(av);
- elm_box_pack_end(bx, bb);
- evas_object_show(bb);
-
- ic = elm_icon_add(win);
- snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
- elm_icon_file_set(ic, buf, NULL);
- evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-
- bb = elm_bubble_add(win);
- elm_object_text_set(bb, "Message 2");
- elm_object_part_text_set(bb, "info", "7:16 27/10/2008");
- elm_object_part_content_set(bb, "icon", ic);
- evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL);
- evas_object_show(ic);
- evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL);
- av = elm_anchorblock_add(win);
- elm_anchorblock_hover_style_set(av, "popout");
- elm_anchorblock_hover_parent_set(av, win);
- elm_object_text_set(av,
- "Hey what are you doing? This is the second last message "
- "Hi there. This is the most recent message in the "
- "list. It's a longer one so it can wrap more and "
- "contains a <a href=contact:john>John</a> contact "
- "link in it to test popups on links. The idea is that "
- "all SMS's are scanned for things that look like phone "
- "numbers or names that are in your contacts list, and "
- "if they are, they become clickable links that pop up "
- "a menus of obvious actions to perform on this piece "
- "of information. This of course can be later explicitly "
- "done by links maybe running local apps or even being "
- "web URL's too that launch the web browser and point it "
- "to that URL. <item relsize=16x16 vsize=full href=emoticon/omg></item>");
- evas_object_smart_callback_add(av, "anchor,clicked", my_anchorblock_anchor, av);
- elm_object_content_set(bb, av);
- evas_object_show(av);
- elm_box_pack_end(bx, bb);
- evas_object_show(bb);
-
- ic = elm_icon_add(win);
- snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
- elm_icon_file_set(ic, buf, NULL);
- elm_icon_scale_set(ic, 0, 0);
- evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
-
- bb = elm_bubble_add(win);
- elm_object_text_set(bb, "Message 1");
- elm_object_part_text_set(bb, "info", "20:47 18/6/2008");
- elm_object_part_content_set(bb, "icon", ic);
- evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL);
- evas_object_show(ic);
- evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
- av = elm_anchorblock_add(win);
- elm_anchorblock_hover_style_set(av, "popout");
- elm_anchorblock_hover_parent_set(av, win);
- elm_object_text_set(av, "This is a short message. <item relsize=16x16 vsize=full href=emoticon/haha></item>");
- evas_object_smart_callback_add(av, "anchor,clicked",
- my_anchorblock_anchor, av);
- elm_object_content_set(bb, av);
- evas_object_show(av);
- elm_box_pack_end(bx, bb);
- evas_object_show(bb);
-
- elm_object_content_set(sc, bx);
- evas_object_show(bx);
-
- evas_object_show(sc);
-
- evas_object_resize(win, 320, 300);
-
- elm_object_focus_set(win, EINA_TRUE);
- evas_object_show(win);
-}
-#endif
+++ /dev/null
-#include <Elementary.h>
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
-#endif
-#ifndef ELM_LIB_QUICKLAUNCH
-static void
-my_anchorview_bt(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Evas_Object *av = data;
- elm_anchorview_hover_end(av);
-}
-
-static void
-my_anchorview_anchor(void *data, Evas_Object *obj, void *event_info)
-{
- Evas_Object *av = data;
- Elm_Entry_Anchorview_Info *ei = event_info;
- Evas_Object *bt, *bx;
-
- bt = elm_button_add(obj);
- elm_object_text_set(bt, ei->name);
- elm_object_part_content_set(ei->hover, "middle", bt);
- evas_object_show(bt);
-
- // hints as to where we probably should put hover contents (buttons etc.).
- if (ei->hover_top)
- {
- bx = elm_box_add(obj);
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Top 1");
- elm_box_pack_end(bx, bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
- evas_object_show(bt);
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Top 2");
- elm_box_pack_end(bx, bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
- evas_object_show(bt);
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Top 3");
- elm_box_pack_end(bx, bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
- evas_object_show(bt);
- elm_object_part_content_set(ei->hover, "top", bx);
- evas_object_show(bx);
- }
- if (ei->hover_bottom)
- {
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Bot");
- elm_object_part_content_set(ei->hover, "bottom", bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
- evas_object_show(bt);
- }
- if (ei->hover_left)
- {
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Left");
- elm_object_part_content_set(ei->hover, "left", bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
- evas_object_show(bt);
- }
- if (ei->hover_right)
- {
- bt = elm_button_add(obj);
- elm_object_text_set(bt, "Right");
- elm_object_part_content_set(ei->hover, "right", bt);
- evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
- evas_object_show(bt);
- }
-}
-
-void
-test_anchorview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Evas_Object *win, *bg, *av;
-
- win = elm_win_add(NULL, "anchorview", ELM_WIN_BASIC);
- elm_win_title_set(win, "Anchorview");
- elm_win_autodel_set(win, EINA_TRUE);
-
- 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);
-
- av = elm_anchorview_add(win);
- elm_anchorview_hover_style_set(av, "popout");
- elm_anchorview_hover_parent_set(av, win);
- elm_object_text_set(av,
- "This is an entry widget in this window that<br/>"
- "uses markup <b>like this</> for styling and<br/>"
- "formatting <em>like this</>, as well as<br/>"
- "<a href=X><link>links in the text</></a>, so enter text<br/>"
- "in here to edit it. By the way, links are<br/>"
- "called <a href=anc-02>Anchors</a> so you will need<br/>"
- "to refer to them this way. <item relsize=16x16 vsize=full href=emoticon/guilty-smile></item>");
- evas_object_size_hint_weight_set(av, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_smart_callback_add(av, "anchor,clicked", my_anchorview_anchor, av);
- elm_win_resize_object_add(win, av);
- evas_object_show(av);
-
- evas_object_resize(win, 320, 300);
-
- elm_object_focus_set(win, EINA_TRUE);
- evas_object_show(win);
-}
-#endif
return EINA_TRUE;
}
-<<<<<<< HEAD
-=======
static int
_compare_cb(const void *data1, const void *data2)
{
elm_object_item_data_get(it2));
}
->>>>>>> remotes/origin/upstream
static void
_ls_main_cb(void *data, Eio_File *handler __UNUSED__, const char *file)
{
eina_stringshare_add(file),
NULL,
ELM_GENLIST_ITEM_NONE,
-<<<<<<< HEAD
- (Eina_Compare_Cb) strcoll,
-=======
_compare_cb,
->>>>>>> remotes/origin/upstream
_sel_file,
NULL);
}
#include <Elementary.h>
-<<<<<<< HEAD
-=======
#include <Elementary_Cursor.h>
#include "test.h"
->>>>>>> remotes/origin/upstream
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
#ifndef ELM_LIB_QUICKLAUNCH
-<<<<<<< HEAD
-=======
static Elm_Gengrid_Item_Class *gic;
static Elm_Gengrid_Item_Class ggic;
const char *part __UNUSED__);
void grid_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__);
->>>>>>> remotes/origin/upstream
typedef struct _Testitem
{
Elm_Object_Item *item;
int onoff;
} Testitem;
-<<<<<<< HEAD
-=======
struct _api_data
{
unsigned int state; /* What state we are testing */
elm_object_disabled_set(obj, a->state == API_STATE_LAST);
}
->>>>>>> remotes/origin/upstream
static const char *img[9] =
{
"panel_01.jpg",
"wood_01.jpg",
};
-<<<<<<< HEAD
-static Elm_Gengrid_Item_Class gic, ggic;
-
-=======
static const char *cur[4] =
{
ELM_CURSOR_CIRCLE,
};
static int n_current_pic = 0;
->>>>>>> remotes/origin/upstream
static void
_horizontal_grid(void *data, Evas_Object *obj, void *event_info __UNUSED__)
{
const Testitem *ti = data;
if (!strcmp(part, "elm.swallow.icon"))
{
-<<<<<<< HEAD
-
- Evas_Object *icon = elm_bg_add(obj);
- elm_bg_file_set(icon, ti->path, NULL);
- evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
- evas_object_show(icon);
- return icon;
- }
- else if (!strcmp(part, "elm.swallow.end"))
- {
- Evas_Object *ck;
- ck = elm_check_add(obj);
- evas_object_propagate_events_set(ck, 0);
- elm_check_state_set(ck, ti->onoff);
- evas_object_smart_callback_add(ck, "changed", grid_item_check_changed, data);
- evas_object_show(ck);
- return ck;
-=======
Evas_Object *icon = elm_bg_add(obj);
elm_bg_file_set(icon, ti->path, NULL);
evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
evas_object_smart_callback_add(ck, "changed", grid_item_check_changed, data);
evas_object_show(ck);
return ck;
->>>>>>> remotes/origin/upstream
}
return NULL;
}
printf("sel item data [%p] on grid obj [%p], pointer [%p]\n", data, obj, event_info);
}
-<<<<<<< HEAD
-void
-test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Evas_Object *win, *bg, *grid;
-=======
static void
_cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
create_gengrid(Evas_Object *obj, int items)
{
Evas_Object *grid = NULL;
->>>>>>> remotes/origin/upstream
static Testitem ti[144];
int i, n;
char buf[PATH_MAX];
-<<<<<<< HEAD
- win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
- elm_win_title_set(win, "GenGrid");
- elm_win_autodel_set(win, EINA_TRUE);
-
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
-
- grid = elm_gengrid_add(win);
-=======
grid = elm_gengrid_add(obj);
->>>>>>> remotes/origin/upstream
elm_gengrid_item_size_set(grid, 150, 150);
elm_gengrid_horizontal_set(grid, EINA_FALSE);
elm_gengrid_multi_select_set(grid, EINA_TRUE);
evas_object_smart_callback_add(grid, "drag,start,left", grid_drag_left, NULL);
evas_object_smart_callback_add(grid, "drag,stop", grid_drag_stop, NULL);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-<<<<<<< HEAD
-
- gic.item_style = "default";
- gic.func.text_get = grid_text_get;
- gic.func.content_get = grid_content_get;
- gic.func.state_get = grid_state_get;
- gic.func.del = grid_del;
-
- n = 0;
- for (i = 0; i < 12 * 12; i++)
- {
- snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n]);
- n = (n + 1) % 9;
- ti[i].mode = i;
- ti[i].path = eina_stringshare_add(buf);
- ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), grid_sel, NULL);
- if (!(i % 5))
- elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
- }
-
- evas_object_show(grid);
- elm_win_resize_object_add(win, grid);
-=======
evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
gic = elm_gengrid_item_class_new();
(void *) api);
elm_box_pack_end(bx, bt);
evas_object_show(bt);
->>>>>>> remotes/origin/upstream
evas_object_resize(win, 600, 600);
evas_object_show(win);
sel = elm_gengrid_selected_item_get(grid);
if (!sel)
return;
-<<<<<<< HEAD
- snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[rand() % 9]);
- ti = malloc(sizeof(*ti));
- ti->mode = 0;
- ti->path = eina_stringshare_add(buf);
- ti->item = elm_gengrid_item_insert_before(grid, &gic, ti, sel, grid_sel,
-=======
snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n_current_pic]);
n_current_pic = ((n_current_pic +1) % 9);
ti = calloc(1, sizeof(*ti));
ti->mode = 0;
ti->path = eina_stringshare_add(buf);
ti->item = elm_gengrid_item_sorted_insert(grid, gic, ti, compare_cb, grid_sel,
->>>>>>> remotes/origin/upstream
NULL);
}
sel = elm_gengrid_selected_item_get(grid);
if (!sel)
return;
-<<<<<<< HEAD
- snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[rand() % 9]);
- ti = malloc(sizeof(*ti));
- ti->mode = 0;
- ti->path = eina_stringshare_add(buf);
- ti->item = elm_gengrid_item_insert_after(grid, &gic, ti, sel, grid_sel,
-=======
snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n_current_pic]);
n_current_pic = ((n_current_pic +1) % 9);
ti = calloc(1, sizeof(*ti));
ti->mode = 0;
ti->path = eina_stringshare_add(buf);
ti->item = elm_gengrid_item_insert_after(grid, gic, ti, sel, grid_sel,
->>>>>>> remotes/origin/upstream
NULL);
}
Evas_Object *grid = data;
char buf[PATH_MAX];
-<<<<<<< HEAD
- snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[rand() % 9]);
- ti = malloc(sizeof(*ti));
- ti->mode = 0;
- ti->path = eina_stringshare_add(buf);
- ti->item = elm_gengrid_item_prepend(grid, &gic, ti, grid_sel, NULL);
-=======
snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n_current_pic]);
n_current_pic = ((n_current_pic +1) % 9);
ti = calloc(1, sizeof(*ti));
ti->mode = 0;
ti->path = eina_stringshare_add(buf);
ti->item = elm_gengrid_item_prepend(grid, gic, ti, grid_sel, NULL);
->>>>>>> remotes/origin/upstream
}
static void
Evas_Object *grid = data;
char buf[PATH_MAX];
-<<<<<<< HEAD
- snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[rand() % 9]);
- ti = malloc(sizeof(*ti));
- ti->mode = 0;
- ti->path = eina_stringshare_add(buf);
- ti->item = elm_gengrid_item_append(grid, &gic, ti, grid_sel, NULL);
-=======
snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n_current_pic]);
n_current_pic = ((n_current_pic +1) % 9);
ti = calloc(1, sizeof(*ti));
ti->mode = 0;
ti->path = eina_stringshare_add(buf);
ti->item = elm_gengrid_item_append(grid, gic, ti, grid_sel, NULL);
->>>>>>> remotes/origin/upstream
}
static void
evas_object_show(bt);
bt = elm_button_add(win);
-<<<<<<< HEAD
-=======
elm_object_text_set(bt, "Sorted insert");
evas_object_smart_callback_add(bt, "clicked", _sorted_bt_clicked, grid);
elm_box_pack_end(hbx, bt);
evas_object_show(bt);
bt = elm_button_add(win);
->>>>>>> remotes/origin/upstream
elm_object_text_set(bt, "Delete");
evas_object_smart_callback_add(bt, "clicked", _delete_bt_clicked, grid);
elm_box_pack_end(hbx, bt);
elm_box_pack_end(hbx, ck);
evas_object_show(ck);
-<<<<<<< HEAD
- gic.item_style = "default";
- gic.func.text_get = grid_text_get;
- gic.func.content_get = grid_content_get;
- gic.func.state_get = grid_state_get;
- gic.func.del = grid_del;
-=======
gic = elm_gengrid_item_class_new();
gic->item_style = "default";
/* item_class_ref is needed for gic. some items can be added in callbacks */
elm_gengrid_item_class_ref(gic);
elm_gengrid_item_class_free(gic);
->>>>>>> remotes/origin/upstream
evas_object_resize(win, 600, 600);
evas_object_show(win);
evas_object_smart_callback_add(grid, "drag,stop", grid_drag_stop, NULL);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-<<<<<<< HEAD
- gic.item_style = "default";
- gic.func.text_get = grid_text_get;
- gic.func.content_get = grid_content_get;
- gic.func.state_get = grid_state_get;
- gic.func.del = grid_del;
-=======
gic = elm_gengrid_item_class_new();
gic->item_style = "default";
gic->func.text_get = grid_text_get;
gic->func.content_get = grid_content_get;
gic->func.state_get = grid_state_get;
gic->func.del = grid_del;
->>>>>>> remotes/origin/upstream
ggic.item_style = "group_index";
ggic.func.text_get = grid_text_get;
ggic.func.state_get = NULL;
ggic.func.del = NULL;
-<<<<<<< HEAD
-
- n = 0;
- for (i = 0; i < 12 * 12; i++)
- {
- snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n]);
- n = (n + 1) % 9;
- ti[i].mode = i;
- ti[i].path = eina_stringshare_add(buf);
- if (i == 0 || i == 18 || i == 53 || i == 100)
- //if (i == 0 || i == 18)
- ti[i].item = elm_gengrid_item_append(grid, &ggic, &(ti[i]), grid_sel, NULL);
- else
- ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), grid_sel, NULL);
- if (!(i % 5))
- elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
- }
-=======
n = 0;
for (i = 0; i < 12 * 12; i++)
{
elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
}
elm_gengrid_item_class_free(gic);
->>>>>>> remotes/origin/upstream
evas_object_show(grid);
elm_win_resize_object_add(win, grid);
#include <Elementary.h>
-<<<<<<< HEAD
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
-#endif
-#ifndef ELM_LIB_QUICKLAUNCH
-=======
#include "test.h"
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
elm_object_disabled_set(obj, a->state == API_STATE_LAST);
}
->>>>>>> remotes/origin/upstream
static void
_ch_grid(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
elm_grid_pack_set(obj, x - 1, y - 1, w + 2, h + 2);
}
-<<<<<<< HEAD
-=======
static void
_cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
free(data);
}
->>>>>>> remotes/origin/upstream
void
test_grid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
win = elm_win_add(NULL, "grid", ELM_WIN_BASIC);
elm_win_title_set(win, "Grid");
elm_win_autodel_set(win, EINA_TRUE);
-<<<<<<< HEAD
-=======
api_data *api = calloc(1, sizeof(api_data));
->>>>>>> remotes/origin/upstream
bg = elm_bg_add(win);
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, bg);
evas_object_show(bg);
-<<<<<<< HEAD
-=======
evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
->>>>>>> remotes/origin/upstream
gd = elm_grid_add(win);
elm_grid_size_set(gd, 100, 100);
elm_win_resize_object_add(win, gd);
evas_object_size_hint_weight_set(gd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-<<<<<<< HEAD
-=======
api->data.grid = gd;
->>>>>>> remotes/origin/upstream
evas_object_show(gd);
en = elm_entry_add(win);
elm_entry_scrollable_set(en, EINA_TRUE);
elm_object_text_set(en, "Entry text");
-<<<<<<< HEAD
- elm_entry_single_line_set(en, 1);
-=======
elm_entry_single_line_set(en, EINA_TRUE);
->>>>>>> remotes/origin/upstream
elm_grid_pack(gd, en, 50, 10, 40, 10);
evas_object_show(en);
en = elm_entry_add(win);
elm_entry_scrollable_set(en, EINA_TRUE);
elm_object_text_set(en, "Entry text 2");
-<<<<<<< HEAD
- elm_entry_single_line_set(en, 1);
-=======
elm_entry_single_line_set(en, EINA_TRUE);
->>>>>>> remotes/origin/upstream
elm_grid_pack(gd, en, 60, 20, 30, 10);
evas_object_show(en);
bt = elm_button_add(win);
-<<<<<<< HEAD
-=======
elm_object_text_set(bt, "Next API function");
evas_object_smart_callback_add(bt, "clicked", _api_bt_clicked, (void *) api);
elm_grid_pack(gd, bt, 30, 0, 40, 10);
evas_object_show(bt);
bt = elm_button_add(win);
->>>>>>> remotes/origin/upstream
elm_object_text_set(bt, "Button");
elm_grid_pack(gd, bt, 0, 0, 20, 20);
evas_object_show(bt);
bt = elm_button_add(win);
elm_object_text_set(bt, "Button");
elm_grid_pack(gd, bt, 10, 10, 40, 20);
-<<<<<<< HEAD
-=======
api->data.child = bt;
->>>>>>> remotes/origin/upstream
evas_object_show(bt);
bt = elm_button_add(win);
#include <Elementary.h>
-<<<<<<< HEAD
-=======
#include "test.h"
->>>>>>> remotes/origin/upstream
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
#ifndef ELM_LIB_QUICKLAUNCH
-<<<<<<< HEAD
-void
-test_inwin(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Evas_Object *win, *bg, *inwin, *lb;
-=======
struct _api_data
{
unsigned int state; /* What state we are testing */
{
Evas_Object *win, *bg, *inwin, *lb, *bxx, *bt;
api_data *api = calloc(1, sizeof(api_data));
->>>>>>> remotes/origin/upstream
win = elm_win_add(NULL, "inwin", ELM_WIN_BASIC);
elm_win_title_set(win, "Inwin");
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_show(bg);
inwin = elm_win_inwin_add(win);
-<<<<<<< HEAD
- evas_object_show(inwin);
-
-=======
api->inwin = inwin;
evas_object_show(inwin);
elm_object_disabled_set(bt, api->state == API_STATE_LAST);
evas_object_show(bt);
->>>>>>> remotes/origin/upstream
lb = elm_label_add(win);
elm_object_text_set(lb,
"This is an \"inwin\" - a window in a<br/>"
"you want centered, taking over the window<br/>"
"until dismissed somehow. Unlike hovers they<br/>"
"don't hover over their target.");
-<<<<<<< HEAD
- elm_win_inwin_content_set(inwin, lb);
-=======
elm_box_pack_end(bxx, lb);
elm_win_inwin_content_set(inwin, bxx);
->>>>>>> remotes/origin/upstream
evas_object_show(lb);
evas_object_resize(win, 320, 240);
EINA_LIST_FOREACH(mbs, l, mb)
{
if (elm_mapbuf_enabled_get(mb))
-<<<<<<< HEAD
- elm_mapbuf_enabled_set(mb, 0);
- else
- elm_mapbuf_enabled_set(mb, 1);
-=======
elm_mapbuf_enabled_set(mb, EINA_FALSE);
else
elm_mapbuf_enabled_set(mb, EINA_TRUE);
->>>>>>> remotes/origin/upstream
}
}
elm_box_horizontal_set(bx, EINA_TRUE);
sc = elm_scroller_add(win);
-<<<<<<< HEAD
- elm_scroller_bounce_set(sc, 1, 0);
-=======
elm_scroller_bounce_set(sc, EINA_TRUE, EINA_FALSE);
->>>>>>> remotes/origin/upstream
elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_scale_set(ic, 0.5);
snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", elm_app_data_dir_get(), n);
elm_icon_file_set(ic, buf, NULL);
-<<<<<<< HEAD
- elm_icon_scale_set(ic, 0, 0);
-=======
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_table_pack(tb, ic, 1 + i, 1 + (j * 2), 1, 1);
ck = elm_check_add(win);
elm_object_text_set(ck, "Map");
-<<<<<<< HEAD
- elm_check_state_set(ck, 0);
-=======
elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", mode_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.05, 0.99);
ck = elm_check_add(win);
elm_object_text_set(ck, "A");
-<<<<<<< HEAD
- elm_check_state_set(ck, 1);
-=======
elm_check_state_set(ck, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", alpha_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.20, 0.99);
ck = elm_check_add(win);
elm_object_text_set(ck, "Smo");
-<<<<<<< HEAD
- elm_check_state_set(ck, 1);
-=======
elm_check_state_set(ck, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", smooth_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.40, 0.99);
ck = elm_check_add(win);
elm_object_text_set(ck, "FS");
-<<<<<<< HEAD
- elm_check_state_set(ck, 0);
-=======
elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", full_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.5, 0.99);
evas_object_data_set(win, "mbs", mbs);
sc = elm_scroller_add(win);
-<<<<<<< HEAD
- elm_scroller_bounce_set(sc, 1, 0);
-=======
elm_scroller_bounce_set(sc, EINA_TRUE, EINA_FALSE);
->>>>>>> remotes/origin/upstream
elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, sc);
ck = elm_check_add(win);
elm_object_text_set(ck, "Map");
-<<<<<<< HEAD
- elm_check_state_set(ck, 0);
-=======
elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", mode_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.05, 0.99);
ck = elm_check_add(win);
elm_object_text_set(ck, "A");
-<<<<<<< HEAD
- elm_check_state_set(ck, 1);
-=======
elm_check_state_set(ck, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", alpha_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.20, 0.99);
ck = elm_check_add(win);
elm_object_text_set(ck, "Smo");
-<<<<<<< HEAD
- elm_check_state_set(ck, 1);
-=======
elm_check_state_set(ck, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", smooth_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.40, 0.99);
ck = elm_check_add(win);
elm_object_text_set(ck, "FS");
-<<<<<<< HEAD
- elm_check_state_set(ck, 0);
-=======
elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", full_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.5, 0.99);
EINA_LIST_FOREACH(mbs, l, mb)
{
if (elm_mapbuf_enabled_get(mb))
-<<<<<<< HEAD
- elm_mapbuf_enabled_set(mb, 0);
-=======
elm_mapbuf_enabled_set(mb, EINA_FALSE);
->>>>>>> remotes/origin/upstream
else
elm_mapbuf_enabled_set(mb, 1);
}
elm_box_horizontal_set(bx, EINA_TRUE);
sc = elm_scroller_add(win);
-<<<<<<< HEAD
- elm_scroller_bounce_set(sc, 1, 0);
-=======
elm_scroller_bounce_set(sc, EINA_TRUE, EINA_FALSE);
->>>>>>> remotes/origin/upstream
elm_scroller_policy_set(sc, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_fill_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_scale_set(ic, 0.5);
snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", elm_app_data_dir_get(), n);
elm_icon_file_set(ic, buf, NULL);
-<<<<<<< HEAD
- elm_icon_scale_set(ic, 0, 0);
-=======
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_object_part_content_set(ly2, "slot", ic);
ck = elm_check_add(win);
elm_object_text_set(ck, "Map");
-<<<<<<< HEAD
- elm_check_state_set(ck, 0);
-=======
elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", l3_mode_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.05, 0.99);
ck = elm_check_add(win);
elm_object_text_set(ck, "FS");
-<<<<<<< HEAD
- elm_check_state_set(ck, 0);
-=======
elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", l3_full_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.5, 0.99);
ck = elm_check_add(win);
elm_object_text_set(ck, "Hid");
-<<<<<<< HEAD
- elm_check_state_set(ck, 0);
-=======
elm_check_state_set(ck, EINA_FALSE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(ck, "changed", l3_hidden_cb, win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, 0.5, 0.99);
+++ /dev/null
-#include <Elementary.h>
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
-#endif
-#ifndef ELM_LIB_QUICKLAUNCH
-typedef struct _Pginfo Pginfo;
-
-struct _Pginfo
-{
- Evas_Object *win, *pager, *pg1, *pg2, *pg3, *pg4;
-};
-
-static void
-my_pager_1(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Pginfo *info = data;
- elm_pager_content_promote(info->pager, info->pg2);
-}
-
-static void
-my_pager_2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Pginfo *info = data;
- elm_pager_content_promote(info->pager, info->pg3);
-}
-
-static void
-my_pager_3(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Pginfo *info = data;
- elm_pager_content_promote(info->pager, info->pg4);
-}
-
-
-static void
-my_pager_4(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Pginfo *info = data;
- elm_pager_content_promote(info->pager, info->pg1);
-}
-
-
-static void
-my_pager_pop(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Pginfo *info = data;
- elm_pager_content_pop(info->pager);
-}
-
-struct style_tuple {
- const char *label;
- const char *name;
-};
-static const struct style_tuple styles[] = {
- { "Default", "default"},
- { "Slide", "slide"},
- { "Slide Invisible", "slide_invisible"},
- { "Fade", "fade"},
- { "Fade Translucide", "fade_translucide"},
- { "Fade Invisible", "fade_invisible"},
- { "Flip", "flip"},
-};
-
-static void
-_style(void *data, Evas_Object *obj, void *event_info __UNUSED__)
-{
- Evas_Object *pg = data;
- elm_object_style_set(pg, styles[elm_radio_value_get(obj)].name);
-}
-
-void
-test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Evas_Object *win, *bg, *pg, *bx, *lb, *bt;
- static Pginfo info;
-
- win = elm_win_add(NULL, "pager", ELM_WIN_BASIC);
- elm_win_title_set(win, "Pager");
- elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
- elm_win_autodel_set(win, EINA_TRUE);
- info.win = win;
-
- 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);
-
- pg = elm_pager_add(win);
- evas_object_size_hint_weight_set(pg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, pg);
- evas_object_show(pg);
-
- info.pager = pg;
-
- bx = elm_box_add(win);
- evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bx);
-
- lb = elm_label_add(win);
- elm_object_text_set(lb,
- "This is page 1 in a pager stack.<br/>"
- "<br/>"
- "So what is a pager stack? It is a stack<br/>"
- "of pages that hold widgets in it. The<br/>"
- "pages can be pushed and popped on and<br/>"
- "off the stack, activated and otherwise<br/>"
- "activated if already in the stack<br/>"
- "(activated means promoted to the top of<br/>"
- "the stack).<br/>"
- "<br/>"
- "The theme may define the animation how<br/>"
- "show and hide of pages. Select one theme style:");
- elm_box_pack_end(bx, lb);
- evas_object_show(lb);
-
- unsigned int i = 0;
- Evas_Object *rdg = NULL, *rd;
- for (i = 0; i < (sizeof(styles) / sizeof(struct style_tuple)); i++)
- {
- rd = elm_radio_add(win);
- elm_object_text_set(rd, styles[i].label);
- elm_radio_state_value_set(rd, i);
- if (rdg)
- elm_radio_group_add(rd, rdg);
- else
- rdg = rd;
- evas_object_smart_callback_add(rd, "changed", _style, pg);
- elm_box_pack_end(bx, rd);
- evas_object_show(rd);
- }
- elm_radio_value_set(rd, 0);
-
- bt = elm_button_add(win);
- elm_object_text_set(bt, "Flip to 2");
- evas_object_smart_callback_add(bt, "clicked", my_pager_1, &info);
- elm_box_pack_end(bx, bt);
- evas_object_show(bt);
-
- bt = elm_button_add(win);
- elm_object_text_set(bt, "Popme");
- evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
- elm_box_pack_end(bx, bt);
- evas_object_show(bt);
- elm_pager_content_push(pg, bx);
- info.pg1 = bx;
-
- bx = elm_box_add(win);
- evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bx);
-
- lb = elm_label_add(win);
- elm_object_text_set(lb,
- "This is page 2 in a pager stack.<br/>"
- "<br/>"
- "This is just like the previous page in<br/>"
- "the pager stack."
- );
- elm_box_pack_end(bx, lb);
- evas_object_show(lb);
-
- bt = elm_button_add(win);
- elm_object_text_set(bt, "Flip to 3");
- evas_object_smart_callback_add(bt, "clicked", my_pager_2, &info);
- elm_box_pack_end(bx, bt);
- evas_object_show(bt);
-
- bt = elm_button_add(win);
- elm_object_text_set(bt, "Popme");
- evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
- elm_box_pack_end(bx, bt);
- evas_object_show(bt);
- elm_pager_content_push(pg, bx);
- info.pg2 = bx;
-
- bx = elm_box_add(win);
- evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bx);
-
- lb = elm_label_add(win);
- elm_object_text_set(lb,
- "This is page 3 in a pager stack.<br/>"
- "<br/>"
- "This is just like the previous page in<br/>"
- "the pager stack.");
- elm_box_pack_end(bx, lb);
- evas_object_show(lb);
-
- bt = elm_button_add(win);
- elm_object_text_set(bt, "Flip to 1");
- evas_object_smart_callback_add(bt, "clicked", my_pager_3, &info);
- elm_box_pack_end(bx, bt);
- evas_object_show(bt);
-
- bt = elm_button_add(win);
- elm_object_text_set(bt, "Popme");
- evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
- elm_box_pack_end(bx, bt);
- evas_object_show(bt);
- elm_pager_content_push(pg, bx);
- info.pg3 = bx;
-
- Evas_Object *ly, *ly2;
- char buf[4096];
-
- ly = elm_layout_add(win);
- snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
- elm_layout_file_set(ly, buf, "test/layout");
- evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(ly);
-
- ly2 = elm_layout_add(win);
- snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
- elm_layout_file_set(ly2, buf, "layout2");
- evas_object_size_hint_weight_set(ly2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- //elm_win_resize_object_add(win, ly2);
- evas_object_show(ly2);
-
- bt = elm_button_add(win);
- elm_object_text_set(bt, "Flip to 1");
- evas_object_smart_callback_add(bt, "clicked", my_pager_4, &info);
- elm_object_part_content_set(ly2, "element1", bt);
- evas_object_show(bt);
-
- bt = elm_button_add(win);
- elm_object_text_set(bt, "Popme");
- evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
- evas_object_show(bt);
- elm_object_part_content_set(ly2, "element2", bt);
-
- elm_object_part_content_set(ly, "swallow", ly2);
- evas_object_show(ly);
-
- elm_pager_content_push(pg, ly);
- info.pg4 = ly2;
-
-
- evas_object_show(win);
-}
-
-static void
-my_pager_push(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Pginfo *info = data;
- Evas_Object *bx, *bt, *lb;
- static int count = 2;
- char buf[32];
-
- bx = elm_box_add(info->win);
- evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bx);
-
- lb = elm_label_add(info->win);
- snprintf(buf, sizeof(buf), "This is page %d in the slide pager<br/><br/>", count++);
- elm_object_text_set(lb, buf);
- elm_box_pack_end(bx, lb);
- evas_object_show(lb);
-
- bt = elm_button_add(info->win);
- elm_object_text_set(bt, "Push a new page");
- evas_object_smart_callback_add(bt, "clicked", my_pager_push, info);
- elm_box_pack_end(bx, bt);
- evas_object_show(bt);
-
- bt = elm_button_add(info->win);
- elm_object_text_set(bt, "Go back (pop)");
- evas_object_smart_callback_add(bt, "clicked", my_pager_pop, info);
- elm_box_pack_end(bx, bt);
- evas_object_show(bt);
- elm_pager_content_push(info->pager, bx);
-}
-
-void
-_hide_finished(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- //To prevent the window size become zero.
- Pginfo *info = data;
- if (elm_pager_content_top_get(info->pager)) return;
- elm_win_resize_object_del(info->win, info->pager);
-}
-
-void
-test_pager_slide(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
-{
- Evas_Object *win, *bg, *pg, *bx, *lb, *bt;
- static Pginfo info;
-
- win = elm_win_add(NULL, "pager", ELM_WIN_BASIC);
- elm_win_title_set(win, "Pager Slide");
- elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
- elm_win_autodel_set(win, EINA_TRUE);
- info.win = win;
-
- 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);
-
- pg = elm_pager_add(win);
- elm_win_resize_object_add(win, pg);
- evas_object_smart_callback_add(pg, "hide,finished",
- _hide_finished, &info);
- elm_object_style_set(pg, "slide");
- evas_object_show(pg);
- info.pager = pg;
- bx = elm_box_add(win);
- evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_show(bx);
-
- lb = elm_label_add(win);
- elm_object_text_set(lb,
- "This is page 1 in a slide pager.<br/>"
- "<br/>"
- "The slide pager style is useful for browsing<br/>"
- "a hierarchy of objects, as it makes clear<br/>"
- "the direction of the browse.<br/>"
- "This is the 'slide' style, also available<br/>"
- "a fully transparent style named 'slide_invisble'.<br/>"
- "<br/>");
- elm_box_pack_end(bx, lb);
- evas_object_show(lb);
-
- bt = elm_button_add(win);
- elm_object_text_set(bt, "Push a new page");
- evas_object_smart_callback_add(bt, "clicked", my_pager_push, &info);
- elm_box_pack_end(bx, bt);
- evas_object_show(bt);
-
- bt = elm_button_add(win);
- elm_object_text_set(bt, "Go back (pop)");
- evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
- elm_box_pack_end(bx, bt);
- evas_object_show(bt);
- elm_pager_content_push(pg, bx);
-
- evas_object_show(win);
-}
-#endif
bx0 = elm_box_add(win);
evas_object_size_hint_weight_set(bx0, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-<<<<<<< HEAD
- elm_box_horizontal_set(bx0, 1);
-=======
elm_box_horizontal_set(bx0, EINA_TRUE);
->>>>>>> remotes/origin/upstream
elm_win_resize_object_add(win, bx0);
evas_object_show(bx0);
evas_object_show(bt);
sp = elm_separator_add(win);
-<<<<<<< HEAD
- elm_separator_horizontal_set(sp, 1); // by default, separator is vertical, we must set it horizontal
-=======
elm_separator_horizontal_set(sp, EINA_TRUE); // by default, separator is vertical, we must set it horizontal
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sp);
evas_object_show(sp);
bt = elm_button_add(win);
elm_object_text_set(bt, "Left lower corner");
-<<<<<<< HEAD
- elm_object_disabled_set(bt, 1);
-=======
elm_object_disabled_set(bt, EINA_TRUE);
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, bt);
evas_object_show(bt);
bt = elm_button_add(win);
elm_object_text_set(bt, "Right upper corner");
-<<<<<<< HEAD
- elm_object_disabled_set(bt, 1);
-=======
elm_object_disabled_set(bt, EINA_TRUE);
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, bt);
evas_object_show(bt);
sp = elm_separator_add(win);
-<<<<<<< HEAD
- elm_separator_horizontal_set(sp, 1);
-=======
elm_separator_horizontal_set(sp, EINA_TRUE);
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx, sp);
evas_object_show(sp);
weather[0] = eweather_object_add(evas_object_evas_get(win));
evas_object_size_hint_weight_set(weather[0], EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(weather[0], -1.0, -1.0);
-<<<<<<< HEAD
- elm_flip_content_front_set(fl, weather[0]);
-=======
elm_object_part_content_set(fl, "front", weather[0]);
->>>>>>> remotes/origin/upstream
evas_object_show(weather[0]);
module[1] = NULL;
eweather = eweather_object_eweather_get(weather[1]);
evas_object_size_hint_weight_set(weather[1], EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(weather[1], -1.0, -1.0);
-<<<<<<< HEAD
- elm_flip_content_back_set(fl, weather[1]);
-=======
elm_object_part_content_set(fl, "back", weather[1]);
->>>>>>> remotes/origin/upstream
evas_object_show(weather[1]);
evas_object_show(fl);
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
elm_object_text_set(en, "This is a single line");
elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-<<<<<<< HEAD
- elm_entry_single_line_set(en, 1);
-=======
elm_entry_single_line_set(en, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_show(en);
elm_box_pack_end(bx, en);
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
elm_object_text_set(en, "Entry 2");
elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-<<<<<<< HEAD
- elm_entry_single_line_set(en, 1);
-=======
elm_entry_single_line_set(en, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_show(en);
elm_box_pack_end(bx, en);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
-<<<<<<< HEAD
- elm_icon_scale_set(ic, 0, 0);
-=======
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
bb = elm_bubble_add(win);
evas_object_show(ic);
evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL);
-<<<<<<< HEAD
- av = elm_anchorblock_add(win);
- elm_anchorblock_hover_style_set(av, "popout");
- elm_anchorblock_hover_parent_set(av, win);
- elm_object_text_set(av,
- "Hi there. This is the most recent message in the "
- "list of messages. It has one <a href=tel:+614321234>+61 432 1234</a> "
- "(phone number) to click on.");
-=======
av = elm_entry_add(win);
elm_entry_anchor_hover_style_set(av, "popout");
elm_entry_anchor_hover_parent_set(av, win);
"Hi there. This is the most recent message in the "
"list of messages. It has one <a href=tel:+614321234>+61 432 1234</a> "
"(phone number) to click on.");
->>>>>>> remotes/origin/upstream
elm_object_content_set(bb, av);
evas_object_show(av);
elm_box_pack_end(bx, bb);
evas_object_show(ic);
evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL);
-<<<<<<< HEAD
- av = elm_anchorblock_add(win);
- elm_anchorblock_hover_style_set(av, "popout");
- elm_anchorblock_hover_parent_set(av, win);
- elm_object_text_set(av,
- "Hey what are you doing? This is the second last message "
- "Hi there. This is the most recent message in the "
- "list. It's a longer one so it can wrap more and "
- "contains a <a href=contact:john>John</a> contact "
- "link in it to test popups on links. The idea is that "
- "all SMS's are scanned for things that look like phone "
- "numbers or names that are in your contacts list, and "
- "if they are, they become clickable links that pop up "
- "a menus of obvious actions to perform on this piece "
- "of information. This of course can be later explicitly "
- "done by links maybe running local apps or even being "
- "web URL's too that launch the web browser and point it "
- "to that URL. <item relsize=16x16 vsize=full href=emoticon/omg></item>");
-=======
av = elm_entry_add(win);
elm_entry_anchor_hover_style_set(av, "popout");
elm_entry_anchor_hover_parent_set(av, win);
"done by links maybe running local apps or even being "
"web URL's too that launch the web browser and point it "
"to that URL. <item relsize=16x16 vsize=full href=emoticon/omg></item>");
->>>>>>> remotes/origin/upstream
elm_object_content_set(bb, av);
evas_object_show(av);
elm_box_pack_end(bx, bb);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
-<<<<<<< HEAD
- elm_icon_scale_set(ic, 0, 0);
-=======
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
bb = elm_bubble_add(win);
evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL);
-<<<<<<< HEAD
- av = elm_anchorblock_add(win);
- elm_anchorblock_hover_style_set(av, "popout");
- elm_anchorblock_hover_parent_set(av, win);
-=======
av = elm_entry_add(win);
elm_entry_anchor_hover_style_set(av, "popout");
elm_entry_anchor_hover_parent_set(av, win);
->>>>>>> remotes/origin/upstream
elm_object_text_set(av, "This is a short message. <item relsize=16x16 vsize=full href=emoticon/haha></item>");
elm_object_content_set(bb, av);
evas_object_show(av);
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(bg);
-<<<<<<< HEAD
-
- plug = elm_plug_add(win);
- if (!elm_plug_connect(plug, "ello", 0, EINA_FALSE))
- {
- printf("Cannot connect plug\n");
- return;
- }
-
-=======
plug = elm_plug_add(win);
if (!elm_plug_connect(plug, "ello", 0, EINA_FALSE))
{
printf("Cannot connect plug\n");
return;
}
->>>>>>> remotes/origin/upstream
evas_object_resize(plug, 380, 500);
evas_object_move(plug, 10, 10);
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
elm_object_text_set(en, "This is a single line");
elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-<<<<<<< HEAD
- elm_entry_single_line_set(en, 1);
-=======
elm_entry_single_line_set(en, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_show(en);
elm_box_pack_end(bx, en);
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
elm_object_text_set(en, "Entry 2");
elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
-<<<<<<< HEAD
- elm_entry_single_line_set(en, 1);
-=======
elm_entry_single_line_set(en, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_show(en);
elm_box_pack_end(bx, en);
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
-<<<<<<< HEAD
- elm_icon_scale_set(ic, 0, 0);
-=======
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
bb = elm_bubble_add(win);
evas_object_show(ic);
evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL);
-<<<<<<< HEAD
- av = elm_anchorblock_add(win);
- elm_anchorblock_hover_style_set(av, "popout");
- elm_anchorblock_hover_parent_set(av, win);
-=======
av = elm_entry_add(win);
elm_entry_anchor_hover_style_set(av, "popout");
elm_entry_anchor_hover_parent_set(av, win);
->>>>>>> remotes/origin/upstream
elm_object_text_set(av,
"Hi there. This is the most recent message in the "
"list of messages. It has one <a href=tel:+614321234>+61 432 1234</a> "
evas_object_show(ic);
evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL);
-<<<<<<< HEAD
- av = elm_anchorblock_add(win);
- elm_anchorblock_hover_style_set(av, "popout");
- elm_anchorblock_hover_parent_set(av, win);
-=======
av = elm_entry_add(win);
elm_entry_anchor_hover_style_set(av, "popout");
elm_entry_anchor_hover_parent_set(av, win);
->>>>>>> remotes/origin/upstream
elm_object_text_set(av,
"Hey what are you doing? This is the second last message "
"Hi there. This is the most recent message in the "
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
-<<<<<<< HEAD
- elm_icon_scale_set(ic, 0, 0);
-=======
elm_icon_resizable_set(ic, 0, 0);
->>>>>>> remotes/origin/upstream
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
bb = elm_bubble_add(win);
evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL);
-<<<<<<< HEAD
- av = elm_anchorblock_add(win);
- elm_anchorblock_hover_style_set(av, "popout");
- elm_anchorblock_hover_parent_set(av, win);
-=======
av = elm_entry_add(win);
elm_entry_anchor_hover_style_set(av, "popout");
elm_entry_anchor_hover_parent_set(av, win);
->>>>>>> remotes/origin/upstream
elm_object_text_set(av, "This is a short message. <item relsize=16x16 vsize=full href=emoticon/haha></item>");
elm_object_content_set(bb, av);
evas_object_show(av);
elm_box_pack_end(bx, lb);
evas_object_show(lb);
-<<<<<<< HEAD
-
-
-=======
->>>>>>> remotes/origin/upstream
evas_object_resize(win, 320, 300);
evas_object_show(bx);
win_socket = elm_win_add(NULL, "Window Socket", ELM_WIN_SOCKET_IMAGE);
if (!elm_win_socket_listen(win_socket, "ello", 0, EINA_FALSE))
-<<<<<<< HEAD
- {
- printf("Fail to elm win socket listen \n");
- evas_object_del(win_socket);
- evas_object_del(win);
- return;
- }
-=======
{
printf("Fail to elm win socket listen \n");
evas_object_del(win_socket);
evas_object_del(win);
return;
}
->>>>>>> remotes/origin/upstream
elm_win_title_set(win_socket, "Window Socket");
elm_win_autodel_set(win_socket, EINA_TRUE);
evas_object_show(win_socket);
evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _win_del,
-<<<<<<< HEAD
- win_socket);
-=======
win_socket);
->>>>>>> remotes/origin/upstream
}
#endif
elm_slider_indicator_format_set(sl, "%3.0f");
elm_slider_min_max_set(sl, 50, 150);
elm_slider_value_set(sl, 50);
-<<<<<<< HEAD
- elm_slider_inverted_set(sl, 1);
-=======
elm_slider_inverted_set(sl, EINA_TRUE);
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx2, sl);
evas_object_show(sl);
char buf[PATH_MAX];
win = elm_win_add(NULL, "window-states2", ELM_WIN_BASIC);
-<<<<<<< HEAD
- elm_win_override_set(win, 1);
-=======
elm_win_override_set(win, EINA_TRUE);
->>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(win, "moved", my_win_move, NULL);
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _win_resize, NULL);
elm_win_title_set(win, "Window States 2");
elm_slider_indicator_format_set(sl, "%3.0f");
elm_slider_min_max_set(sl, 50, 150);
elm_slider_value_set(sl, 50);
-<<<<<<< HEAD
- elm_slider_inverted_set(sl, 1);
-=======
elm_slider_inverted_set(sl, EINA_TRUE);
->>>>>>> remotes/origin/upstream
elm_box_pack_end(bx2, sl);
evas_object_show(sl);
modules.inc \
elm.c \
elm_actionslider.c \
-<<<<<<< HEAD
-elm_anchorblock.c \
-elm_anchorview.c \
-=======
->>>>>>> remotes/origin/upstream
elm_bubble.c \
elm_button.c \
elm_calendar.c \
elm_check.c \
elm_clock.c \
-<<<<<<< HEAD
-elm_colorpalette.c \
-elm_datefield.c \
-=======
->>>>>>> remotes/origin/upstream
elm_entry.c \
elm_fileselector.c \
elm_fileselector_button.c \
elm_map.c \
elm_multibuttonentry.c \
elm_naviframe.c \
-<<<<<<< HEAD
-elm_nocontents.c \
elm_notify.c \
-elm_page_control.c \
-elm_pager.c \
-=======
-elm_notify.c \
->>>>>>> remotes/origin/upstream
elm_panes.c \
elm_photocam.c \
elm_progressbar.c \
elm_radio.c \
elm_scroller.c \
-<<<<<<< HEAD
-elm_searchbar.c \
-=======
->>>>>>> remotes/origin/upstream
elm_segment_control.c \
elm_slider.c \
elm_slideshow.c \
elm_video.c \
elm_web.c
-<<<<<<< HEAD
-module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la
-=======
module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
->>>>>>> remotes/origin/upstream
module_la_LDFLAGS = -no-undefined -module -avoid-version -shared -fPIC
}
void
-<<<<<<< HEAD
-external_signal(void *data __UNUSED__, Evas_Object *obj, const char *signal, const char *source)
-{
- char *_signal = strdup(signal);
- char *p = _signal;
- Evas_Object *content;
-
- while((*p!='\0') && (*p!=']'))
- p++;
-
-
- if((*p=='\0') || (*(p+1)!=':'))
- {
- ERR("Invalid External Signal received: '%s' '%s'\n", signal, source);
- free(_signal);
- return ;
- }
-
- *p = '\0';
- p+=2; //jump ']' and ':'
-
- Edje_External_Type *type = evas_object_data_get(obj, "Edje_External_Type");
- if (!type->content_get)
- {
- ERR("external type '%s' from module '%s' does not provide content_get()",
- type->module_name, type->module);
- free(_signal);
- return ;
- }
-
- content = type->content_get(type->data, obj, _signal);
- free(_signal);
- if(content)
- edje_object_signal_emit(content, signal + (p - _signal), source);
-=======
external_signal(void *data __UNUSED__, Evas_Object *obj, const char *sig, const char *source)
{
char *_signal = strdup(sig);
free(_signal);
if(content)
edje_object_signal_emit(content, sig + (p - _signal), source);
->>>>>>> remotes/origin/upstream
}
const char *
+++ /dev/null
-#include "private.h"
-
-typedef struct _Elm_Params_Anchorblock
-{
- Elm_Params base;
- const char *text;
-} Elm_Params_Anchorblock;
-
-static void
-external_anchorblock_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
-{
- const Elm_Params_Anchorblock *p;
-
- if (to_params) p = to_params;
- else if (from_params) p = from_params;
- else return;
-
- if (p->text)
- {
- elm_object_text_set(obj, p->text);
- }
-}
-
-static Eina_Bool
-external_anchorblock_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
-{
- if (!strcmp(param->name, "text"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
- {
- elm_object_text_set(obj, param->s);
- return EINA_TRUE;
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_anchorblock_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
-{
- if (!strcmp(param->name, "text"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
- {
- param->s = elm_object_text_get(obj);
- return EINA_TRUE;
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static void *
-external_anchorblock_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
-{
- Elm_Params_Anchorblock *mem;
- Edje_External_Param *param;
- const Eina_List *l;
-
- mem = ELM_NEW(Elm_Params_Anchorblock);
- if (!mem)
- return NULL;
-
- EINA_LIST_FOREACH(params, l, param)
- {
- if (!strcmp(param->name, "text"))
- mem->text = eina_stringshare_add(param->s);
- }
-
- return mem;
-}
-
-static Evas_Object *external_anchorblock_content_get(void *data __UNUSED__,
- const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
-{
- ERR("No content.");
- return NULL;
-}
-
-static void
-external_anchorblock_params_free(void *params)
-{
- Elm_Params_Anchorblock *mem = params;
-
- if (mem->text)
- eina_stringshare_del(mem->text);
- free(mem);
-}
-
-static Edje_External_Param_Info external_anchorblock_params[] = {
- DEFINE_EXTERNAL_COMMON_PARAMS,
- EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("text", "some text"),
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(anchorblock, "anchorblock")
-DEFINE_EXTERNAL_TYPE_SIMPLE(anchorblock, "Anchorblock");
+++ /dev/null
-#include "private.h"
-
-typedef struct _Elm_Params_Anchorview
-{
- Elm_Params base;
- const char *text;
-} Elm_Params_Anchorview;
-
-static void
-external_anchorview_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
-{
- const Elm_Params_Anchorview *p;
-
- if (to_params) p = to_params;
- else if (from_params) p = from_params;
- else return;
-
- if (p->text)
- {
- elm_object_text_set(obj, p->text);
- }
-}
-
-static Eina_Bool
-external_anchorview_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
-{
- if (!strcmp(param->name, "text"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
- {
- elm_object_text_set(obj, param->s);
- return EINA_TRUE;
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_anchorview_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
-{
- if (!strcmp(param->name, "text"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
- {
- param->s = elm_object_text_get(obj);
- return EINA_TRUE;
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static void *
-external_anchorview_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
-{
- Elm_Params_Anchorview *mem;
- Edje_External_Param *param;
- const Eina_List *l;
-
- mem = ELM_NEW(Elm_Params_Anchorview);
- if (!mem)
- return NULL;
-
- EINA_LIST_FOREACH(params, l, param)
- {
- if (!strcmp(param->name, "text"))
- mem->text = eina_stringshare_add(param->s);
- }
-
- return mem;
-}
-
-static Evas_Object *external_anchorview_content_get(void *data __UNUSED__,
- const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
-{
- ERR("No content.");
- return NULL;
-}
-
-static void
-external_anchorview_params_free(void *params)
-{
- Elm_Params_Anchorview *mem = params;
-
- if (mem->text)
- eina_stringshare_del(mem->text);
- free(mem);
-}
-
-static Edje_External_Param_Info external_anchorview_params[] = {
- DEFINE_EXTERNAL_COMMON_PARAMS,
- EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("text", "some text"),
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(anchorview, "anchorview")
-DEFINE_EXTERNAL_TYPE_SIMPLE(anchorview, "Anchorview");
+++ /dev/null
-#include "private.h"
-
-typedef struct _Elm_Params_colorpalette
-{
- unsigned int row, col;
- Elm_Colorpalette_Color *color;
- char *color_set;
- int color_num;
-} Elm_Params_colorpalette;
-
-static void
-external_colorpalette_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
-{
- const Elm_Params_colorpalette *p;
- if (to_params) p = to_params;
- else if (from_params) p = from_params;
- else return;
- if ((p->row > 0)&&( p->col > 0))
- elm_colorpalette_row_column_set(obj, p->row, p->col);
- if (p->color_num)
- elm_colorpalette_color_set(obj, p->color_num, p->color);
-}
-
-static Eina_Bool
-external_colorpalette_param_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Edje_External_Param *param)
-{
- if (!strcmp(param->name, "row"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- //No EAPI for row set
- return EINA_FALSE;
- }
- }
- else if (!strcmp(param->name, "col"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- //No EAPI for column set
- return EINA_FALSE;
- }
- }
- else if (!strcmp(param->name,"color_num"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
- {
- //No EAPI for colour_number set
- return EINA_FALSE;
- }
- }
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_colorpalette_param_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, Edje_External_Param *param __UNUSED__)
-{
- //FIXME:getter functions not provided
- return EINA_FALSE;
-}
-
-static void *
-external_colorpalette_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
-{
- Elm_Params_colorpalette *mem;
- Edje_External_Param *param;
- const Eina_List *l;
- int k,m,ll;
- k = m = ll = 0;
- char test[5];
- int d = 0;
- char *s = NULL;
- mem = calloc(1, sizeof(Elm_Params_colorpalette));
- if (!mem)
- return NULL;
-
- EINA_LIST_FOREACH(params, l, param)
- {
- if (!strcmp(param->name, "row"))
- {
- mem->row = param->i;
- }
- else if (!strcmp(param->name, "col"))
- {
- mem->col = param->i;
- }
- else if (!strcmp(param->name, "color_num"))
- {
- mem->color_num = param->i;
- }
- else if (!strcmp(param->name, "color_set"))
- {
- mem->color = calloc(mem->color_num, sizeof(Elm_Colorpalette_Color));
- s = (char*)param->i;
- while (k < (mem->color_num) && (ll <= (int)strlen(s)))
- {
- if (d == 0)
- {
- while(s[ll]!=':')
- test[m++] = s[ll++];
- test[m] = 0;
- ll++;
- m = 0;
- mem->color[k].r = atoi(test);
- d++;
- }
- if (d == 1)
- {
- while(s[ll]!=':')
- test[m++] = s[ll++];
- test[m] = 0;
- ll++;
- m = 0;
- mem->color[k].g = atoi(test);
- d++;
- }
- if (d == 2)
- {
- while(s[ll]!='/' && m<3)
- test[m++] = s[ll++];
- test[m] = 0;
- ll++;
- m = 0;
- mem->color[k].b = atoi(test);
- d = 0;
- }
- }
- k++;
- }
- }
- return mem;
-}
-
-static Evas_Object *
-external_colorpalette_content_get(void *data __UNUSED__,
- const Evas_Object *obj __UNUSED__,
- const char *content __UNUSED__)
-{
- ERR("No content.");
- return NULL;
-}
-
-static void
-external_colorpalette_params_free(void *params)
-{
- Elm_Params_colorpalette *mem = params;
- if (mem->color)
- free(mem->color);
- if (mem->color_set)
- free(mem->color_set);
- free(params);
-}
-
-static Edje_External_Param_Info external_colorpalette_params[] = {
- DEFINE_EXTERNAL_COMMON_PARAMS,
- EDJE_EXTERNAL_PARAM_INFO_INT("row"),
- EDJE_EXTERNAL_PARAM_INFO_INT("col"),
- EDJE_EXTERNAL_PARAM_INFO_INT("r"),
- EDJE_EXTERNAL_PARAM_INFO_INT("g"),
- EDJE_EXTERNAL_PARAM_INFO_INT("b"),
- EDJE_EXTERNAL_PARAM_INFO_STRING("color_set"),
- EDJE_EXTERNAL_PARAM_INFO_INT("color_num"),
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(colorpalette, "colorpalette");
-DEFINE_EXTERNAL_TYPE_SIMPLE(colorpalette, "colorpalette");
+++ /dev/null
-/*
- * elm_colorpicker.c
- *
- * Created on: Nov 12, 2010
- * Author: Amit
- */
-
-
-#include "private.h"
-
-typedef struct _Elm_Params_colorpicker
-{
- unsigned int r, g, b;
-} Elm_Params_colorpicker ;
-
-static void
-external_colorpicker_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
-{
- const Elm_Params_colorpicker *p;
- if (to_params) p = to_params;
- else if (from_params) p = from_params;
- else return;
-
- if((p->r >= 0)&&( p->g >= 0)&& (p->b >= 0))
- elm_colorpicker_color_set(obj, p->r, p->g, p->b) ;
-}
-
-static Eina_Bool
-external_colorpicker_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
-{
- //Cannot set particular parameter
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_colorpicker_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
-{
- if (!strcmp(param->name, "r"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- elm_colorpicker_color_get( obj,&(param->i),NULL, NULL) ;
- return EINA_TRUE;
- }
- }
-
- if (!strcmp(param->name, "g"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- elm_colorpicker_color_get( obj,NULL,&(param->i), NULL) ;
- return EINA_TRUE;
- }
- }
- if (!strcmp(param->name, "b"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- elm_colorpicker_color_get( obj,NULL, NULL,&(param->i)) ;
- return EINA_TRUE;
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static void *
-external_colorpicker_params_parse(void *data __UNUSED__, Evas_Object *obj, const Eina_List *params)
-{
- Elm_Params_colorpicker *mem;
- Edje_External_Param *param;
- const Eina_List *l;
- mem = calloc(1, sizeof(Elm_Params_colorpicker));
- if (!mem)
- return NULL;
-
- EINA_LIST_FOREACH(params, l, param)
- {
- if (!strcmp(param->name, "r"))
- {
- mem->r = param->i;
- }
- else if (!strcmp(param->name, "g"))
- {
- mem->g = param->i;
- }
- else if (!strcmp(param->name, "b"))
- {
- mem->b = param->i;
- }
-
- }
-
- return mem;
- }
-
-static Evas_Object *external_colorpicker_content_get(void *data __UNUSED__,
- const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
-{
- ERR("No content.");
- return NULL;
-}
-
-static void
-external_colorpicker_params_free(void *params)
-{
- Elm_Params_colorpicker *mem = params;
-
- free(mem);
-}
-
-static Edje_External_Param_Info external_colorpicker_params[] = {
- DEFINE_EXTERNAL_COMMON_PARAMS,
- EDJE_EXTERNAL_PARAM_INFO_INT("r"),
- EDJE_EXTERNAL_PARAM_INFO_INT("g"),
- EDJE_EXTERNAL_PARAM_INFO_INT("b"),
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(colorpicker, "colorpicker");
-DEFINE_EXTERNAL_TYPE_SIMPLE(colorpicker, "colorpicker");
-
+++ /dev/null
-#include "private.h"
-
-#define ITEM_COUNT 6
-
-char *item_value_param[] = { "year", "month", "date", "hour", "minute", "ampm"};
-char *item_max_param[] = { "year_max", "month_max", "date_max",
- "hour_max", "minute_max", "ampm_max" };
-char *item_min_param[] = { "year_min", "month_min", "date_min",
- "hour_min", "minute_min", "ampm_min" };
-char *item_enable_param[] = { "year_enable", "month_enable", "date_enable",
- "hour_enable", "minute_enable", "ampm_enable" };
-char *item_max_absolute_param[] = { "year_max_abs", "month_max_abs", "date_max_abs",
- "hour_max_abs", "minute_max_abs", "ampm_max_abs" };
-char *item_min_absolute_param[] = { "year_min_abs", "month_min_abs", "date_min_abs",
- "hour_min_abs", "minute_min_abs", "ampm_min_abs" };
-
-typedef struct _Elm_Params_Datefield
-{
- Elm_Params base;
- const char *format;
- int item_value[ITEM_COUNT];
- int item_max[ITEM_COUNT];
- int item_min[ITEM_COUNT];
- Eina_Bool item_enable[ITEM_COUNT];
- Eina_Bool item_max_absolute[ITEM_COUNT];
- Eina_Bool item_min_absolute[ITEM_COUNT];
- Eina_Bool item_value_set[ITEM_COUNT];
- Eina_Bool item_max_set[ITEM_COUNT];
- Eina_Bool item_min_set[ITEM_COUNT];
- Eina_Bool item_enable_set[ITEM_COUNT];
- Eina_Bool item_max_absolute_set[ITEM_COUNT];
- Eina_Bool item_min_absolute_set[ITEM_COUNT];
-} Elm_Params_Datefield;
-
-static void
-external_datefield_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
-{
- const Elm_Params_Datefield *p;
- int i;
-
- if (to_params) p = to_params;
- else if (from_params) p = from_params;
- else return;
-
- if (p->format)
- elm_datefield_format_set(obj, p->format);
- for (i = 0; i < ITEM_COUNT; i++)
- {
- if (p->item_value_set[i])
- elm_datefield_item_value_set(obj, (ELM_DATEFIELD_YEAR+i), p->item_value[i]);
- }
- for (i = 0; i < ITEM_COUNT; i++)
- {
- if (p->item_enable_set[i])
- elm_datefield_item_enabled_set(obj, (ELM_DATEFIELD_YEAR+i), p->item_enable[i]);
- }
- for (i = 0; i < ITEM_COUNT; i++)
- {
- if ((p->item_max_set[i]) && (p->item_max_absolute_set[i]))
- elm_datefield_item_max_set(obj, (ELM_DATEFIELD_YEAR+i), p->item_max[i], p->item_max_absolute[i]);
- else if ((p->item_max_set[i]) && !(p->item_max_absolute_set[i]))
- elm_datefield_item_max_set(obj, (ELM_DATEFIELD_YEAR+i), p->item_max[i],
- elm_datefield_item_max_is_absolute(obj,(ELM_DATEFIELD_YEAR+i)));
- else if (!(p->item_max_set[i]) && (p->item_max_absolute_set[i]))
- elm_datefield_item_max_set(obj, (ELM_DATEFIELD_YEAR+i), elm_datefield_item_max_get
- (obj, (ELM_DATEFIELD_YEAR+i)), p->item_max_absolute[i]);
- }
- for (i = 0; i < ITEM_COUNT; i++)
- {
- if ((p->item_min_set[i]) && (p->item_min_absolute_set[i]))
- elm_datefield_item_min_set(obj, (ELM_DATEFIELD_YEAR+i), p->item_min[i], p->item_min_absolute[i]);
- else if ((p->item_min_set[i]) && !(p->item_min_absolute_set[i]))
- elm_datefield_item_min_set(obj, (ELM_DATEFIELD_YEAR+i), p->item_min[i],
- elm_datefield_item_min_is_absolute(obj,(ELM_DATEFIELD_YEAR+i)));
- else if (!(p->item_min_set[i]) && (p->item_min_absolute_set[i]))
- elm_datefield_item_min_set(obj, (ELM_DATEFIELD_YEAR+i), elm_datefield_item_min_get
- (obj, (ELM_DATEFIELD_YEAR+i)), p->item_min_absolute[i]);
- }
-}
-
-static Eina_Bool
-external_datefield_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
-{
- int i;
- if (!strcmp(param->name, "format"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
- {
- elm_datefield_format_set(obj, param->s);
- return EINA_TRUE;
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_value_param[i]))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- elm_datefield_item_value_set(obj, (ELM_DATEFIELD_YEAR+i), param->i);
- return EINA_TRUE;
- }
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_max_param[i]))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- Eina_Bool max_abs;
- max_abs = elm_datefield_item_max_is_absolute(obj, (ELM_DATEFIELD_YEAR+i));
- elm_datefield_item_max_set(obj, (ELM_DATEFIELD_YEAR+i), param->i, max_abs);
- return EINA_TRUE;
- }
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_min_param[i]))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- Eina_Bool min_abs;
- min_abs = elm_datefield_item_min_is_absolute(obj, (ELM_DATEFIELD_YEAR+i));
- elm_datefield_item_min_set(obj, (ELM_DATEFIELD_YEAR+i), param->i, min_abs);
- return EINA_TRUE;
- }
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_enable_param[i]))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
- {
- elm_datefield_item_enabled_set(obj, (ELM_DATEFIELD_YEAR+i), param->i);
- return EINA_TRUE;
- }
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_max_absolute_param[i]))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
- {
- int max;
- max = elm_datefield_item_max_get(obj, (ELM_DATEFIELD_YEAR+i));
- elm_datefield_item_max_set(obj, (ELM_DATEFIELD_YEAR+i), max, param->i);
- return EINA_TRUE;
- }
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_min_absolute_param[i]))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
- {
- int min;
- min = elm_datefield_item_min_get(obj, (ELM_DATEFIELD_YEAR+i));
- elm_datefield_item_min_set(obj, (ELM_DATEFIELD_YEAR+i), min, param->i);
- return EINA_TRUE;
- }
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_datefield_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
-{
- int i;
-
- if (!strcmp(param->name, "format"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
- {
- param->s = elm_datefield_format_get(obj);
- return EINA_TRUE;
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_value_param[i]))
- {
- param->i = elm_datefield_item_value_get(obj, (ELM_DATEFIELD_YEAR+i));
- return EINA_TRUE;
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_max_param[i]))
- {
- param->i = elm_datefield_item_max_get(obj, (ELM_DATEFIELD_YEAR+i));
- return EINA_TRUE;
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_min_param[i]))
- {
- param->i = elm_datefield_item_min_get(obj, (ELM_DATEFIELD_YEAR+i));
- return EINA_TRUE;
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_enable_param[i]))
- {
- param->i = elm_datefield_item_enabled_get(obj, (ELM_DATEFIELD_YEAR+i));
- return EINA_TRUE;
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_max_absolute_param[i]))
- {
- param->i = elm_datefield_item_max_is_absolute(obj, (ELM_DATEFIELD_YEAR+i));
- return EINA_TRUE;
- }
- }
- for (i =0 ; i < ITEM_COUNT; i++)
- {
- if (!strcmp(param->name, item_min_absolute_param[i]))
- {
- param->i = elm_datefield_item_min_is_absolute(obj, (ELM_DATEFIELD_YEAR+i));
- return EINA_TRUE;
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static void *
-external_datefield_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
-{
- Elm_Params_Datefield *mem;
- Edje_External_Param *param;
- const Eina_List *l;
- int i;
-
- mem = calloc(1, sizeof(Elm_Params_Datefield));
- if (!mem)
- return NULL;
-
- EINA_LIST_FOREACH(params, l, param)
- {
- if (!strcmp(param->name, "format"))
- mem->format = eina_stringshare_add(param->s);
- for (i = 0; i < ITEM_COUNT; i ++)
- {
- if (!strcmp(param->name, item_value_param[i]))
- {
- mem->item_value[i] = param->i;
- mem->item_value_set[i] = EINA_TRUE;
- }
- }
- for (i = 0; i < ITEM_COUNT; i ++)
- {
- if (!strcmp(param->name, item_max_param[i]))
- {
- mem->item_max[i] = param->i;
- mem->item_max_set[i] = EINA_TRUE;
- }
- }
- for (i = 0; i < ITEM_COUNT; i ++)
- {
- if (!strcmp(param->name, item_min_param[i]))
- {
- mem->item_min[i] = param->i;
- mem->item_min_set[i] = EINA_TRUE;
- }
- }
- for (i = 0; i < ITEM_COUNT; i ++)
- {
- if (!strcmp(param->name, item_enable_param[i]))
- {
- mem->item_enable[i] = param->i;
- mem->item_enable_set[i] = EINA_TRUE;
- }
- }
- for (i = 0; i < ITEM_COUNT; i ++)
- {
- if (!strcmp(param->name, item_max_absolute_param[i]))
- {
- mem->item_max_absolute[i] = param->i;
- mem->item_max_absolute_set[i] = EINA_TRUE;
- }
- }
- for (i = 0; i < ITEM_COUNT; i ++)
- {
- if (!strcmp(param->name, item_min_absolute_param[i]))
- {
- mem->item_min_absolute[i] = param->i;
- mem->item_min_absolute_set[i] = EINA_TRUE;
- }
- }
- }
-
- return mem;
-}
-
-static Evas_Object *external_datefield_content_get(void *data __UNUSED__,
- const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
-{
- ERR("so content");
- return NULL;
-}
-
-static void
-external_datefield_params_free(void *params)
-{
- Elm_Params_Datefield *mem = params;
-
- if (mem->format)
- eina_stringshare_del(mem->format);
-
- free(mem);
-}
-
-static Edje_External_Param_Info external_datefield_params[] = {
- DEFINE_EXTERNAL_COMMON_PARAMS,
- EDJE_EXTERNAL_PARAM_INFO_STRING("format"),
- EDJE_EXTERNAL_PARAM_INFO_INT("year"),
- EDJE_EXTERNAL_PARAM_INFO_INT("month"),
- EDJE_EXTERNAL_PARAM_INFO_INT("date"),
- EDJE_EXTERNAL_PARAM_INFO_INT("hour"),
- EDJE_EXTERNAL_PARAM_INFO_INT("minute"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("ampm"),
- EDJE_EXTERNAL_PARAM_INFO_INT("year_max"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("year_max_abs"),
- EDJE_EXTERNAL_PARAM_INFO_INT("month_max"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("month_max_abs"),
- EDJE_EXTERNAL_PARAM_INFO_INT("date_max"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("date_max_abs"),
- EDJE_EXTERNAL_PARAM_INFO_INT("hour_max"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("hour_max_abs"),
- EDJE_EXTERNAL_PARAM_INFO_INT("minute_max"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("minute_max_abs"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("ampm_max"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("ampm_max_abs"),
- EDJE_EXTERNAL_PARAM_INFO_INT("year_min"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("year_min_abs"),
- EDJE_EXTERNAL_PARAM_INFO_INT("month_min"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("month_min_abs"),
- EDJE_EXTERNAL_PARAM_INFO_INT("date_min"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("date_min_abs"),
- EDJE_EXTERNAL_PARAM_INFO_INT("hour_min"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("hour_min_abs"),
- EDJE_EXTERNAL_PARAM_INFO_INT("minute_min"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("minute_min_abs"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("ampm_min"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("ampm_min_abs"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("year_enable"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("month_enable"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("date_enable"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("hour_enable"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("minute_enable"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("ampm_enable"),
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(datefield, "datefield");
-DEFINE_EXTERNAL_TYPE_SIMPLE(datefield, "Datefield");
if (p->multi_exists)
elm_gengrid_multi_select_set(obj, p->multi);
if (p->no_select_exists)
-<<<<<<< HEAD
- elm_gengrid_no_select_mode_set (obj, p->no_select);
- if (p->always_select_exists)
- elm_gengrid_always_select_mode_set (obj, p->always_select);
-=======
{
if (p->no_select)
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
else
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
}
->>>>>>> remotes/origin/upstream
if (p->h_bounce_exists)
{
Eina_Bool h_bounce, v_bounce;
else if (p->align_x_exists || p->align_y_exists)
{
double x, y;
-<<<<<<< HEAD
- elm_gengrid_align_get(obj, &x, &y);
- if (p->align_x_exists)
- elm_gengrid_align_set(obj, p->align_x, y);
- else
- elm_gengrid_align_set(obj, x, p->align_y);
-=======
elm_gengrid_align_get(obj, &x, &y);
if (p->align_x_exists)
elm_gengrid_align_set(obj, p->align_x, y);
else
elm_gengrid_align_set(obj, x, p->align_y);
->>>>>>> remotes/origin/upstream
}
if (p->horizontal_exists)
{
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
-<<<<<<< HEAD
- elm_gengrid_no_select_mode_set(obj, param->i);
-=======
if (param->i)
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_NONE);
else
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
->>>>>>> remotes/origin/upstream
return EINA_TRUE;
}
}
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
-<<<<<<< HEAD
- elm_gengrid_always_select_mode_set(obj, param->i);
-=======
if (param->i)
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_ALWAYS);
else
elm_gengrid_select_mode_set (obj, ELM_OBJECT_SELECT_MODE_DEFAULT);
->>>>>>> remotes/origin/upstream
return EINA_TRUE;
}
}
}
}
else if (!strcmp(param->name, "align x")
-<<<<<<< HEAD
- && param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
- {
- double x, y;
- elm_gengrid_align_get(obj, &x, &y);
- elm_gengrid_align_set(obj, param->d, y);
- return EINA_TRUE;
- }
- else if (!strcmp(param->name, "align y")
- && param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
- {
- double x, y;
- elm_gengrid_align_get(obj, &x, &y);
- elm_gengrid_align_set(obj, x, param->d);
- return EINA_TRUE;
-=======
&& param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
double x, y;
elm_gengrid_align_get(obj, &x, &y);
elm_gengrid_align_set(obj, x, param->d);
return EINA_TRUE;
->>>>>>> remotes/origin/upstream
}
ERR("unknown parameter '%s' of type '%s'",
param->name, edje_external_param_type_str(param->type));
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
-<<<<<<< HEAD
- param->i = elm_gengrid_no_select_mode_get(obj);
-=======
if (elm_gengrid_select_mode_get (obj) ==
ELM_OBJECT_SELECT_MODE_NONE)
param->i = EINA_TRUE;
else
param->i = EINA_FALSE;
->>>>>>> remotes/origin/upstream
return EINA_TRUE;
}
}
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
-<<<<<<< HEAD
- param->i = elm_gengrid_always_select_mode_get(obj);
-=======
if (elm_gengrid_select_mode_get (obj) ==
ELM_OBJECT_SELECT_MODE_ALWAYS)
param->i = EINA_TRUE;
else
param->i = EINA_FALSE;
->>>>>>> remotes/origin/upstream
return EINA_TRUE;
}
}
}
}
else if (!strcmp(param->name, "align x")
-<<<<<<< HEAD
- && param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
- {
- double x, y;
- elm_gengrid_align_get(obj, &x, &y);
- param->d = x;
- return EINA_TRUE;
- }
- else if (!strcmp(param->name, "align y")
- && param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
- {
- double x, y;
- elm_gengrid_align_get(obj, &x, &y);
- param->d = y;
- return EINA_TRUE;
-=======
&& param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
double x, y;
elm_gengrid_align_get(obj, &x, &y);
param->d = y;
return EINA_TRUE;
->>>>>>> remotes/origin/upstream
}
ERR("unknown parameter '%s' of type '%s'",
param->name, edje_external_param_type_str(param->type));
mem->horizontal = !!param->i;
mem->horizontal_exists = EINA_TRUE;
}
-<<<<<<< HEAD
- else if (!strcmp(param->name, "align x"))
- {
- mem->align_x = param->d;
- mem->align_x_exists = EINA_TRUE;
- }
- else if (!strcmp(param->name, "align y"))
- {
- mem->align_y = param->d;
- mem->align_y_exists = EINA_TRUE;
- }
-=======
else if (!strcmp(param->name, "align x"))
{
mem->align_x = param->d;
mem->align_y = param->d;
mem->align_y_exists = EINA_TRUE;
}
->>>>>>> remotes/origin/upstream
}
return mem;
+++ /dev/null
-#include "private.h"
-
-typedef struct _Elm_Params_Nocontents
-{
- Elm_Params base;
-}Elm_Params_Nocontents;
-
-static void
-external_nocontents_state_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
- const void *from_params, const void *to_params,
- float pos __UNUSED__)
-{
- const Elm_Params_Nocontents *p;
-
- if (to_params) p = to_params;
- else if (from_params) p = from_params;
- else return;
-
- //if (p->base.label) elm_nocontents_label_set(obj, p->base.label);
-}
-
-static Eina_Bool
-external_nocontents_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
-{
- if (!strcmp(param->name, "label"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
- {
- elm_nocontents_label_set(obj, param->s);
- return EINA_TRUE;
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_nocontents_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
-{
- if (!strcmp(param->name, "label"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
- {
- param->s = elm_nocontents_label_get(obj);
- return EINA_TRUE;
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static void *
-external_nocontents_params_parse(void *data __UNUSED__,
- Evas_Object *obj __UNUSED__,
- const Eina_List *params __UNUSED__)
-{
- Elm_Params_Nocontents *mem;
-
- mem = ELM_NEW(Elm_Params_Nocontents);
- if (!mem)
- return NULL;
-
- return mem;
-}
-
-static Evas_Object *external_nocontents_content_get(void *data __UNUSED__,
- const Evas_Object *obj __UNUSED__,
- const char *content __UNUSED__)
-{
- ERR("so content");
- return NULL;
-}
-
-static void
-external_nocontents_params_free(void *params)
-{
- free(params);
-}
-
-static Edje_External_Param_Info external_nocontents_params[] = {
- DEFINE_EXTERNAL_COMMON_PARAMS,
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(nocontents, "nocontents");
-DEFINE_EXTERNAL_TYPE_SIMPLE(nocontents, "Nocontents");
+++ /dev/null
-#include "private.h"
-
-
-static void
-external_notepad_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
-{
- /* TODO: to be expanded */
-}
-
-static Eina_Bool
-external_notepad_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
-{
- /* TODO: to be expanded */
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_notepad_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
-{
- /* TODO: to be expanded */
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static void *
-external_notepad_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
-{
- /* TODO: to be expanded */
-
- return NULL;
-}
-
-static Evas_Object *external_notepad_content_get(void *data __UNUSED__,
- const Evas_Object *obj, const char *content)
-{
- ERR("so content");
- return NULL;
-}
-
-static void
-external_notepad_params_free(void *params)
-{
-}
-
-static Edje_External_Param_Info external_notepad_params[] = {
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(notepad, "notepad")
-DEFINE_EXTERNAL_TYPE_SIMPLE(notepad, "Notepad");
+++ /dev/null
-#include <assert.h>
-
-#include "private.h"
-
-typedef struct _Elm_Params_Icon
-{
- Eina_Bool page_count_exists;
- unsigned int page_count;
- Eina_Bool page_id_exists;
- unsigned int page_id;
-} Elm_Params_Icon;
-
-static unsigned int page_count_bk;
-
-static void
-external_page_control_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
-{
- const Elm_Params_Icon *p;
-
- if (to_params) p = to_params;
- else if (from_params) p = from_params;
- else return;
-
- if (p->page_count_exists)
- {
- elm_page_control_page_count_set(obj, p->page_count);
- page_count_bk = p->page_count;
- }
- if (p->page_id_exists)
- elm_page_control_page_id_set(obj, p->page_id-1);
-}
-
-static Eina_Bool
-external_page_control_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
-{
- if (!strcmp(param->name, "page count")
- && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- elm_page_control_page_count_set(obj, param->i);
- page_count_bk = param->i;
- return EINA_TRUE;
- }
- else if (!strcmp(param->name, "page id")
- && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- elm_page_control_page_id_set(obj, param->i-1);
- return EINA_TRUE;
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_page_control_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
-{
- if (!strcmp(param->name, "page count")
- && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- param->i = page_count_bk;
- return EINA_TRUE;
- }
- else if (!strcmp(param->name, "page id")
- && param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
- {
- param->i = elm_page_control_page_id_get((Evas_Object *)obj);
- return EINA_TRUE;
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static void *
-external_page_control_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
-{
- Elm_Params_Icon *mem;
- Edje_External_Param *param;
- const Eina_List *l;
-
- mem = calloc(1, sizeof(Elm_Params_Icon));
- if (!mem)
- return NULL;
-
- EINA_LIST_FOREACH(params, l, param)
- {
- if (!strcmp(param->name, "page count"))
- {
- mem->page_count = param->i;
- mem->page_count_exists = EINA_TRUE;
- }
- else if (!strcmp(param->name, "page id"))
- {
- mem->page_id = param->i;
- mem->page_id_exists = EINA_TRUE;
- }
- }
-
- return mem;
-}
-
-static Evas_Object *external_page_control_content_get(void *data __UNUSED__,
- const Evas_Object *obj __UNUSED__,
- const char *content __UNUSED__)
-{
- ERR("so content");
- return NULL;
-}
-
-static void
-external_page_control_params_free(void *params)
-{
- Elm_Params_Icon *mem = params;
-
- free(mem);
-}
-
-static Edje_External_Param_Info external_page_control_params[] = {
- EDJE_EXTERNAL_PARAM_INFO_INT("page count"),
- EDJE_EXTERNAL_PARAM_INFO_INT("page id"),
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(page_control, "page_control");
-DEFINE_EXTERNAL_TYPE_SIMPLE(page_control, "Page_control");
-
+++ /dev/null
-#include "private.h"
-
-typedef struct _Elm_Params_Pager
-{
- Elm_Params base;
-} Elm_Params_Pager;
-
-static void
-external_pager_state_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const void *from_params __UNUSED__, const void *to_params __UNUSED__, float pos __UNUSED__)
-{
-}
-
-static Eina_Bool
-external_pager_param_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Edje_External_Param *param)
-{
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_pager_param_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, Edje_External_Param *param)
-{
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static void *
-external_pager_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params __UNUSED__)
-{
- Elm_Params_Pager *mem;
-
- mem = ELM_NEW(Elm_Params_Pager);
- if (!mem)
- return NULL;
-
- return mem;
-}
-
-static Evas_Object *external_pager_content_get(void *data __UNUSED__,
- const Evas_Object *obj __UNUSED__, const char *content __UNUSED__)
-{
- ERR("No content.");
- return NULL;
-}
-
-static void
-external_pager_params_free(void *params)
-{
- Elm_Params_Pager *mem = params;
-
- free(mem);
-}
-
-static Edje_External_Param_Info external_pager_params[] = {
- DEFINE_EXTERNAL_COMMON_PARAMS,
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(pager, "pager")
-DEFINE_EXTERNAL_TYPE_SIMPLE(pager, "Pager");
+++ /dev/null
-#include "private.h"
-
-static void
-external_picker_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
-{
- ERR("no params");
-}
-
-static Eina_Bool
-external_picker_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
-{
- ERR("no params");
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_picker_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
-{
- ERR("no params");
- return EINA_FALSE;
-}
-
-static void *
-external_picker_params_parse(void *data, Evas_Object *obj, const Eina_List *params)
-{
- ERR("no params");
- return NULL;
-}
-
-static Evas_Object *external_picker_content_get(void *data __UNUSED__,
- const Evas_Object *obj, const char *content)
-{
- ERR("so content");
- return NULL;
-}
-
-static void
-external_picker_params_free(void *params)
-{
-}
-
-static Edje_External_Param_Info external_picker_params[] = {
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(picker, "picker");
-DEFINE_EXTERNAL_TYPE_SIMPLE(picker, "Picker");
-
-
-
+++ /dev/null
-#include "private.h"
-
-typedef struct _Elm_Params_Searchbar
-{
- Elm_Params base;
- Eina_Bool cancel_button_exists:1;
- Eina_Bool cancel_button_visible:1;
- Eina_Bool cancel_button_animation:1;
- Eina_Bool cancel_button_animation_exists:1;
- Eina_Bool boundary_rect_exists:1;
- Eina_Bool boundary_rect:1;
- const char *text;
-} Elm_Params_Searchbar;
-
-static void
-external_searchbar_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
-{
- const Elm_Params_Searchbar *p;
-
- if (to_params) p = to_params;
- else if (from_params) p = from_params;
- else return;
-
- if (p->cancel_button_exists)
- elm_searchbar_cancel_button_set(obj, p->cancel_button_visible);
- if (p->cancel_button_animation_exists)
- elm_searchbar_cancel_button_animation_set(obj, p->cancel_button_animation);
- if (p->boundary_rect_exists)
- elm_searchbar_boundary_rect_set(obj, p->boundary_rect);
- if (p->text)
- elm_object_text_set(obj, p->text);
-}
-
-static Eina_Bool
-external_searchbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
-{
- if (!strcmp(param->name, "cancel_button_visible"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
- {
- elm_searchbar_cancel_button_set(obj, param->i);
- return EINA_TRUE;
- }
- }
- else if (!strcmp(param->name, "cancel_button_animation"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
- {
- elm_searchbar_cancel_button_animation_set(obj, param->i);
- return EINA_TRUE;
- }
- }
- else if (!strcmp(param->name, "boundary_rect"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
- {
- elm_searchbar_boundary_rect_set(obj, param->i);
- return EINA_TRUE;
- }
- }
- else if (!strcmp(param->name, "text"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
- {
- elm_object_text_set(obj, param->s);
- return EINA_TRUE;
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_searchbar_param_get(void *data __UNUSED__, const Evas_Object *obj __UNUSED__, Edje_External_Param *param)
-{
- if (!strcmp(param->name, "cancel_button_visible"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
- {
- return param->i;
- }
- }
- else if (!strcmp(param->name, "cancel_button_animation"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
- {
- return param->i;
- }
- }
- else if (!strcmp(param->name, "boundary_rect"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
- {
- return param->i;
- }
- }
- else if (!strcmp(param->name, "text"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
- {
- param->s = elm_object_text_get(obj);
- return EINA_TRUE;
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static void *
-external_searchbar_params_parse(void *data __UNUSED__,
- Evas_Object *obj __UNUSED__,
- const Eina_List *params)
-{
- Elm_Params_Searchbar *mem = NULL;
- Edje_External_Param *param;
- const Eina_List *l;
-
- mem = calloc(1, sizeof(Elm_Params_Searchbar));
- if (!mem)
- return NULL;
-
- EINA_LIST_FOREACH(params, l, param)
- {
- if (!strcmp(param->name, "cancel_button_visible"))
- {
- mem->cancel_button_visible = !!param->i;
- mem->cancel_button_exists = EINA_TRUE;
- }
- if (!strcmp(param->name, "cancel_button_animation"))
- {
- mem->cancel_button_animation = !!param->i;
- mem->cancel_button_animation_exists = EINA_TRUE;
- }
- if (!strcmp(param->name, "boundary_rect"))
- {
- mem->boundary_rect = !!param->i;
- mem->boundary_rect_exists = EINA_TRUE;
- }
- else if (!strcmp(param->name, "text"))
- {
- mem->text = eina_stringshare_add(param->s);
- }
- }
-
- return mem;
-}
-
-static Evas_Object *external_searchbar_content_get(void *data __UNUSED__,
- const Evas_Object *obj __UNUSED__,
- const char *content __UNUSED__)
-{
- ERR("so content");
- return NULL;
-}
-
-static void
-external_searchbar_params_free(void *params)
-{
- Elm_Params_Searchbar *mem = params;
- if (mem->text)
- eina_stringshare_del(mem->text);
- free(params);
-}
-
-static Edje_External_Param_Info external_searchbar_params[] = {
- DEFINE_EXTERNAL_COMMON_PARAMS,
- EDJE_EXTERNAL_PARAM_INFO_BOOL("cancel_button_visible"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("cancel_button_animation"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("boundary_rect"),
- EDJE_EXTERNAL_PARAM_INFO_STRING("text"),
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(searchbar, "searchbar");
-DEFINE_EXTERNAL_TYPE_SIMPLE(searchbar, "Searchbar");
+++ /dev/null
-#include <assert.h>
-
-#include "private.h"
-
-typedef struct _Elm_Params_Timepicker
-{
- Eina_Bool show_am_pm:1;
- Eina_Bool show_am_pm_exists:1;
- Eina_Bool show_seconds:1;
- Eina_Bool show_seconds_exists:1;
-} Elm_Params_Timepicker;
-
-static unsigned int page_count_bk;
-
-static void
-external_timepicker_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__)
-{
- const Elm_Params_Timepicker *p;
-
- if (to_params) p = to_params;
- else if (from_params) p = from_params;
- else return;
-
- if (p->show_am_pm_exists)
- elm_timepicker_show_am_pm_set(obj, p->show_am_pm);
- if (p->show_seconds_exists)
- elm_timepicker_show_seconds_set(obj, p->show_seconds);
-
-}
-
-static Eina_Bool
-external_timepicker_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_External_Param *param)
-{
- if (!strcmp(param->name, "show am_pm"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
- {
- elm_timepicker_show_am_pm_set(obj, param->i);
- return EINA_TRUE;
- }
- }
- else if (!strcmp(param->name, "show seconds"))
- {
- if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
- {
- elm_timepicker_show_seconds_set(obj, param->i);
- return EINA_TRUE;
- }
- }
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static Eina_Bool
-external_timepicker_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_External_Param *param)
-{
-
- ERR("unknown parameter '%s' of type '%s'",
- param->name, edje_external_param_type_str(param->type));
-
- return EINA_FALSE;
-}
-
-static void *
-external_timepicker_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params)
-{
- Elm_Params_Timepicker *mem;
- Edje_External_Param *param;
- const Eina_List *l;
-
- mem = calloc(1, sizeof(Elm_Params_Timepicker));
- if (!mem)
- return NULL;
-
- EINA_LIST_FOREACH(params, l, param)
- {
- if (!strcmp(param->name, "show am_pm"))
- {
- mem->show_am_pm = !!param->i;
- mem->show_am_pm_exists = EINA_TRUE;
- }
- else if (!strcmp(param->name, "show seconds"))
- {
- mem->show_seconds = !!param->i;
- mem->show_seconds_exists = EINA_TRUE;
- }
- }
-
- return mem;
-}
-
-static Evas_Object *external_timepicker_content_get(void *data __UNUSED__,
- const Evas_Object *obj, const char *content)
-{
- ERR("so content");
- return NULL;
-}
-
-static void
-external_timepicker_params_free(void *params)
-{
- Elm_Params_Timepicker *mem = params;
-
- free(mem);
-}
-
-static Edje_External_Param_Info external_timepicker_params[] = {
- EDJE_EXTERNAL_PARAM_INFO_BOOL("show am_pm"),
- EDJE_EXTERNAL_PARAM_INFO_BOOL("show seconds"),
- EDJE_EXTERNAL_PARAM_INFO_SENTINEL
-};
-
-DEFINE_EXTERNAL_ICON_ADD(timepicker, "timepicker");
-DEFINE_EXTERNAL_TYPE_SIMPLE(timepicker, "Picker");
-
else return;
if (p->file) elm_video_file_set(obj, p->file);
-<<<<<<< HEAD
- if (p->uri) elm_video_uri_set(obj, p->uri);
-=======
if (p->uri) elm_video_file_set(obj, p->uri);
->>>>>>> remotes/origin/upstream
if (p->play_exists && p->play) elm_video_play(obj);
if (p->pause_exists && p->pause) elm_video_pause(obj);
if (p->stop_exists && p->stop) elm_video_stop(obj);
else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
&& (!strcmp(param->name, "uri")))
{
-<<<<<<< HEAD
- elm_video_uri_set(obj, param->s);
-=======
elm_video_file_set(obj, param->s);
->>>>>>> remotes/origin/upstream
return EINA_TRUE;
}
else if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
DEFINE_TYPE(actionslider)
-<<<<<<< HEAD
-DEFINE_TYPE(anchorblock)
-DEFINE_TYPE(anchorview)
DEFINE_TYPE(bubble)
DEFINE_TYPE(button)
-DEFINE_TYPE(calendar)
DEFINE_TYPE(check)
DEFINE_TYPE(clock)
-DEFINE_TYPE(colorpalette)
-DEFINE_TYPE(datefield)
-=======
-DEFINE_TYPE(bubble)
-DEFINE_TYPE(button)
-DEFINE_TYPE(check)
-DEFINE_TYPE(clock)
->>>>>>> remotes/origin/upstream
DEFINE_TYPE(entry)
DEFINE_TYPE(fileselector)
DEFINE_TYPE(fileselector_button)
DEFINE_TYPE(map)
DEFINE_TYPE(multibuttonentry)
DEFINE_TYPE(naviframe)
-<<<<<<< HEAD
-DEFINE_TYPE(nocontents)
-DEFINE_TYPE(page_control)
-DEFINE_TYPE(pager)
-=======
->>>>>>> remotes/origin/upstream
DEFINE_TYPE(panes)
DEFINE_TYPE(photocam)
DEFINE_TYPE(progressbar)
DEFINE_TYPE(radio)
-<<<<<<< HEAD
-DEFINE_TYPE(searchbar)
-=======
->>>>>>> remotes/origin/upstream
DEFINE_TYPE(slider)
DEFINE_TYPE(slideshow)
DEFINE_TYPE(spinner)
projects / framework / uifw / elementary.git / commitdiff
