#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 */
projects / framework / uifw / elementary.git / blobdiff