enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

rename a whole host of config-related functions to be elm_config_* 

now. yes - no deprecation. no time to do that.



SVN revision: 68810
This commit is contained in:
Carsten Haitzler 2012-03-06 12:04:25 +00:00
parent 342dc04638
commit 7a5a301a63
15 changed files with 337 additions and 350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

222
legacy/elementary/src/bin/config.c
View File

@ -149,10 +149,10 @@ sb_change(void *data __UNUSED__,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
Eina_Bool val = elm_check_state_get(obj); Eina_Bool val = elm_check_state_get(obj);
Eina_Bool sb = elm_scroll_bounce_enabled_get(); Eina_Bool sb = elm_config_scroll_bounce_enabled_get();
if (val == sb) return; if (val == sb) return;
elm_scroll_bounce_enabled_set(val); elm_config_scroll_bounce_enabled_set(val);
elm_config_all_flush(); elm_config_all_flush();
/*TODO: enable/disable subordinate sliders (make 'em support it 1st)*/ /*TODO: enable/disable subordinate sliders (make 'em support it 1st)*/
@ -175,11 +175,11 @@ bf_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double bf = elm_scroll_bounce_friction_get(); double bf = elm_config_scroll_bounce_friction_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (bf == val) return; if (bf == val) return;
elm_scroll_bounce_friction_set(val); elm_config_scroll_bounce_friction_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -200,11 +200,11 @@ ps_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double ps = elm_scroll_page_scroll_friction_get(); double ps = elm_config_scroll_page_scroll_friction_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (ps == val) return; if (ps == val) return;
elm_scroll_page_scroll_friction_set(val); elm_config_scroll_page_scroll_friction_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -225,11 +225,11 @@ bis_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double bis = elm_scroll_bring_in_scroll_friction_get(); double bis = elm_config_scroll_bring_in_scroll_friction_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (bis == val) return; if (bis == val) return;
elm_scroll_bring_in_scroll_friction_set(val); elm_config_scroll_bring_in_scroll_friction_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -250,11 +250,11 @@ zf_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double zf = elm_scroll_zoom_friction_get(); double zf = elm_config_scroll_zoom_friction_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (zf == val) return; if (zf == val) return;
elm_scroll_zoom_friction_set(val); elm_config_scroll_zoom_friction_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -264,10 +264,10 @@ ts_change(void *data __UNUSED__,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
Eina_Bool val = elm_check_state_get(obj); Eina_Bool val = elm_check_state_get(obj);
Eina_Bool sb = elm_scroll_thumbscroll_enabled_get(); Eina_Bool sb = elm_config_scroll_thumbscroll_enabled_get();
if (val == sb) return; if (val == sb) return;
elm_scroll_thumbscroll_enabled_set(val); elm_config_scroll_thumbscroll_enabled_set(val);
elm_config_all_flush(); elm_config_all_flush();
/*TODO: enable/disable subordinate sliders (make 'em support it 1st)*/ /*TODO: enable/disable subordinate sliders (make 'em support it 1st)*/
@ -290,11 +290,11 @@ tst_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double tst = elm_scroll_thumbscroll_threshold_get(); double tst = elm_config_scroll_thumbscroll_threshold_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (tst == val) return; if (tst == val) return;
elm_scroll_thumbscroll_threshold_set(val); elm_config_scroll_thumbscroll_threshold_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -315,11 +315,11 @@ tsmt_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double tsmt = elm_scroll_thumbscroll_momentum_threshold_get(); double tsmt = elm_config_scroll_thumbscroll_momentum_threshold_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (tsmt == val) return; if (tsmt == val) return;
elm_scroll_thumbscroll_momentum_threshold_set(val); elm_config_scroll_thumbscroll_momentum_threshold_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -340,11 +340,11 @@ tsf_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double tsf = elm_scroll_thumbscroll_friction_get(); double tsf = elm_config_scroll_thumbscroll_friction_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (tsf == val) return; if (tsf == val) return;
elm_scroll_thumbscroll_friction_set(val); elm_config_scroll_thumbscroll_friction_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -365,11 +365,11 @@ tsbf_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double tsbf = elm_scroll_thumbscroll_border_friction_get(); double tsbf = elm_config_scroll_thumbscroll_border_friction_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (tsbf == val) return; if (tsbf == val) return;
elm_scroll_thumbscroll_border_friction_set(val); elm_config_scroll_thumbscroll_border_friction_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -390,11 +390,11 @@ tssf_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double tssf = elm_scroll_thumbscroll_sensitivity_friction_get(); double tssf = elm_config_scroll_thumbscroll_sensitivity_friction_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (tssf == val) return; if (tssf == val) return;
elm_scroll_thumbscroll_sensitivity_friction_set(val); elm_config_scroll_thumbscroll_sensitivity_friction_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -403,12 +403,12 @@ cf_enable(void *data,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
Eina_Bool cf = elm_cache_flush_enabled_get(); Eina_Bool cf = elm_config_cache_flush_enabled_get();
Eina_Bool val = elm_check_state_get(obj); Eina_Bool val = elm_check_state_get(obj);
if (cf == val) return; if (cf == val) return;
elm_object_disabled_set((Evas_Object *)data, !val); elm_object_disabled_set((Evas_Object *)data, !val);
elm_cache_flush_enabled_set(val); elm_config_cache_flush_enabled_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -429,11 +429,11 @@ cf_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double cf = elm_cache_flush_interval_get(); double cf = elm_config_cache_flush_interval_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (cf == val) return; if (cf == val) return;
elm_cache_flush_interval_set(val); elm_config_cache_flush_interval_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -454,11 +454,11 @@ fc_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double font_cache = elm_cache_font_cache_size_get(); double font_cache = elm_config_cache_font_cache_size_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (font_cache == val) return; if (font_cache == val) return;
elm_cache_font_cache_size_set(val * 1024); elm_config_cache_font_cache_size_set(val * 1024);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -479,11 +479,11 @@ ic_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double image_cache = elm_cache_image_cache_size_get(); double image_cache = elm_config_cache_image_cache_size_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (image_cache == val) return; if (image_cache == val) return;
elm_cache_image_cache_size_set(val * 1024); elm_config_cache_image_cache_size_set(val * 1024);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -504,11 +504,11 @@ sc_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double scale = elm_scale_get(); double scale = elm_config_scale_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (scale == val) return; if (scale == val) return;
elm_scale_set(val); elm_config_scale_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -529,11 +529,11 @@ fs_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double fs = elm_finger_size_get(); double fs = elm_config_finger_size_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (fs == val) return; if (fs == val) return;
elm_finger_size_set(val); elm_config_finger_size_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -554,11 +554,11 @@ efc_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double efc = elm_cache_edje_file_cache_size_get(); double efc = elm_config_cache_edje_file_cache_size_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (efc == val) return; if (efc == val) return;
elm_cache_edje_file_cache_size_set(val); elm_config_cache_edje_file_cache_size_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -579,11 +579,11 @@ ecc_change(void *data __UNUSED__,
Evas_Object *obj, Evas_Object *obj,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
double ecc = elm_cache_edje_collection_cache_size_get(); double ecc = elm_config_cache_edje_collection_cache_size_get();
double val = elm_slider_value_get(obj); double val = elm_slider_value_get(obj);
if (ecc == val) return; if (ecc == val) return;
elm_cache_edje_collection_cache_size_set(val); elm_config_cache_edje_collection_cache_size_set(val);
elm_config_all_flush(); elm_config_all_flush();
} }
@ -633,7 +633,7 @@ _status_config(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.2f"); elm_slider_unit_format_set(sl, "%1.2f");
elm_slider_indicator_format_set(sl, "%1.2f"); elm_slider_indicator_format_set(sl, "%1.2f");
elm_slider_min_max_set(sl, 0.25, 5.0); elm_slider_min_max_set(sl, 0.25, 5.0);
elm_slider_value_set(sl, elm_scale_get()); elm_slider_value_set(sl, elm_config_scale_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -656,7 +656,7 @@ _status_config(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.0f"); elm_slider_unit_format_set(sl, "%1.0f");
elm_slider_indicator_format_set(sl, "%1.0f"); elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 5, 200); elm_slider_min_max_set(sl, 5, 200);
elm_slider_value_set(sl, elm_finger_size_get()); elm_slider_value_set(sl, elm_config_finger_size_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -814,7 +814,7 @@ _font_overlay_reset(void *data,
fstyles = evas_object_data_get(win, "font_styles_list"); fstyles = evas_object_data_get(win, "font_styles_list");
fsizes = evas_object_data_get(win, "font_sizes_list"); fsizes = evas_object_data_get(win, "font_sizes_list");
elm_font_overlay_unset(tc_data->name); elm_config_font_overlay_unset(tc_data->name);
eina_stringshare_replace(&fdata.cur_font, NULL); eina_stringshare_replace(&fdata.cur_font, NULL);
eina_stringshare_replace(&tc_data->font, NULL); eina_stringshare_replace(&tc_data->font, NULL);
@ -847,7 +847,7 @@ _font_overlay_reset_all(void *data,
EINA_LIST_FOREACH(fdata.text_classes, l, tc_data) EINA_LIST_FOREACH(fdata.text_classes, l, tc_data)
{ {
elm_font_overlay_unset(tc_data->name); elm_config_font_overlay_unset(tc_data->name);
eina_stringshare_replace(&tc_data->font, NULL); eina_stringshare_replace(&tc_data->font, NULL);
eina_stringshare_replace(&tc_data->style, NULL); eina_stringshare_replace(&tc_data->style, NULL);
@ -885,16 +885,16 @@ _font_overlay_change(void *data __UNUSED__,
name = elm_font_fontconfig_name_get(tc_data->font, name = elm_font_fontconfig_name_get(tc_data->font,
tc_data->style); tc_data->style);
elm_font_overlay_set(tc_data->name, name, elm_config_font_overlay_set(tc_data->name, name,
tc_data->size ? tc_data->size : -100); tc_data->size ? tc_data->size : -100);
elm_font_fontconfig_name_free(name); elm_font_fontconfig_name_free(name);
} }
else else
elm_font_overlay_unset(tc_data->name); elm_config_font_overlay_unset(tc_data->name);
} }
elm_config_save(); elm_config_save();
elm_font_overlay_apply(); elm_config_font_overlay_apply();
elm_config_all_flush(); elm_config_all_flush();
/* TODO: apply hinting */ /* TODO: apply hinting */
@ -913,25 +913,25 @@ _config_display_update(Evas_Object *win)
Elm_Theme *th; Elm_Theme *th;
int fs; int fs;
scale = elm_scale_get(); scale = elm_config_scale_get();
fs = elm_finger_size_get(); fs = elm_config_finger_size_get();
flush_interval = elm_cache_flush_interval_get(); flush_interval = elm_config_cache_flush_interval_get();
font_c = elm_cache_font_cache_size_get(); font_c = elm_config_cache_font_cache_size_get();
image_c = elm_cache_image_cache_size_get(); image_c = elm_config_cache_image_cache_size_get();
edje_file_c = elm_cache_edje_file_cache_size_get(); edje_file_c = elm_config_cache_edje_file_cache_size_get();
edje_col_c = elm_cache_edje_collection_cache_size_get(); edje_col_c = elm_config_cache_edje_collection_cache_size_get();
s_bounce = elm_scroll_bounce_enabled_get(); s_bounce = elm_config_scroll_bounce_enabled_get();
s_bounce_friction = elm_scroll_bounce_friction_get(); s_bounce_friction = elm_config_scroll_bounce_friction_get();
ts = elm_scroll_thumbscroll_enabled_get(); ts = elm_config_scroll_thumbscroll_enabled_get();
ts_threshould = elm_scroll_thumbscroll_threshold_get(); ts_threshould = elm_config_scroll_thumbscroll_threshold_get();
ts_momentum_threshold = elm_scroll_thumbscroll_momentum_threshold_get(); ts_momentum_threshold = elm_config_scroll_thumbscroll_momentum_threshold_get();
ts_friction = elm_scroll_thumbscroll_friction_get(); ts_friction = elm_config_scroll_thumbscroll_friction_get();
ts_border_friction = elm_scroll_thumbscroll_border_friction_get(); ts_border_friction = elm_config_scroll_thumbscroll_border_friction_get();
ts_sensitivity_friction = elm_scroll_thumbscroll_sensitivity_friction_get(); ts_sensitivity_friction = elm_config_scroll_thumbscroll_sensitivity_friction_get();
page_friction = elm_scroll_page_scroll_friction_get(); page_friction = elm_config_scroll_page_scroll_friction_get();
bring_in_friction = elm_scroll_bring_in_scroll_friction_get(); bring_in_friction = elm_config_scroll_bring_in_scroll_friction_get();
zoom_friction = elm_scroll_zoom_friction_get(); zoom_friction = elm_config_scroll_zoom_friction_get();
/* gotta update root windows' atoms */ /* gotta update root windows' atoms */
elm_slider_value_set(evas_object_data_get(win, "scale_slider"), scale); elm_slider_value_set(evas_object_data_get(win, "scale_slider"), scale);
@ -986,7 +986,7 @@ _config_display_update(Evas_Object *win)
elm_theme_free(th); elm_theme_free(th);
eina_stringshare_del(curr_theme); eina_stringshare_del(curr_theme);
curr_engine = elm_engine_get(); curr_engine = elm_config_engine_get();
l_items = elm_list_items_get(evas_object_data_get(win, "engines_list")); l_items = elm_list_items_get(evas_object_data_get(win, "engines_list"));
EINA_LIST_FOREACH(l_items, l, list_it) EINA_LIST_FOREACH(l_items, l, list_it)
{ {
@ -1002,7 +1002,7 @@ static void
_profile_change_do(Evas_Object *win, _profile_change_do(Evas_Object *win,
const char *profile) const char *profile)
{ {
elm_profile_set(profile); elm_config_profile_set(profile);
elm_config_all_flush(); elm_config_all_flush();
_config_display_update(win); _config_display_update(win);
} }
@ -1028,10 +1028,10 @@ _engine_use(void *data,
li = data; li = data;
selection = elm_object_item_data_get(elm_list_selected_item_get(li)); selection = elm_object_item_data_get(elm_list_selected_item_get(li));
if (!strcmp(elm_engine_get(), selection)) if (!strcmp(elm_config_engine_get(), selection))
return; return;
elm_engine_set(selection); elm_config_engine_set(selection);
elm_config_save(); /* make sure new engine has its data dir */ elm_config_save(); /* make sure new engine has its data dir */
} }
@ -1046,7 +1046,7 @@ _profile_use(void *data,
li = data; li = data;
selection = elm_object_item_data_get(elm_list_selected_item_get(li)); selection = elm_object_item_data_get(elm_list_selected_item_get(li));
profile = elm_profile_current_get(); profile = elm_config_profile_get();
if (!profile) if (!profile)
{ {
@ -1057,7 +1057,7 @@ _profile_use(void *data,
if (!strcmp(profile, selection)) if (!strcmp(profile, selection))
return; return;
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 */
_profile_change_do(elm_object_top_widget_get(li), selection); _profile_change_do(elm_object_top_widget_get(li), selection);
elm_config_save(); /* make sure new profile has its data dir */ elm_config_save(); /* make sure new profile has its data dir */
@ -1082,16 +1082,16 @@ _profile_reset(void *data,
li = data; li = data;
selection = elm_object_item_data_get(elm_list_selected_item_get(li)); selection = elm_object_item_data_get(elm_list_selected_item_get(li));
curr = elm_profile_current_get(); curr = elm_config_profile_get();
elm_config_save(); /* dump config into old profile's data dir */ elm_config_save(); /* dump config into old profile's data dir */
pdir = elm_profile_dir_get(selection, EINA_TRUE); pdir = elm_config_profile_dir_get(selection, EINA_TRUE);
if (!pdir) if (!pdir)
return; return;
ecore_file_recursive_rm(pdir); ecore_file_recursive_rm(pdir);
elm_profile_dir_free(pdir); elm_config_profile_dir_free(pdir);
elm_config_reload(); elm_config_reload();
@ -1178,7 +1178,7 @@ _status_config_sizing(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.2f"); elm_slider_unit_format_set(sl, "%1.2f");
elm_slider_indicator_format_set(sl, "%1.2f"); elm_slider_indicator_format_set(sl, "%1.2f");
elm_slider_min_max_set(sl, 0.25, 5.0); elm_slider_min_max_set(sl, 0.25, 5.0);
elm_slider_value_set(sl, elm_scale_get()); elm_slider_value_set(sl, elm_config_scale_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -1202,7 +1202,7 @@ _status_config_sizing(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.0f"); elm_slider_unit_format_set(sl, "%1.0f");
elm_slider_indicator_format_set(sl, "%1.0f"); elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 5, 200); elm_slider_min_max_set(sl, 5, 200);
elm_slider_value_set(sl, elm_finger_size_get()); elm_slider_value_set(sl, elm_config_finger_size_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -1747,8 +1747,8 @@ _fonts_data_fill(Evas *evas)
fdata.font_hash = elm_font_available_hash_add(evas_fonts); fdata.font_hash = elm_font_available_hash_add(evas_fonts);
evas_font_available_list_free(evas, evas_fonts); evas_font_available_list_free(evas, evas_fonts);
text_classes = elm_text_classes_list_get(); text_classes = elm_config_text_classes_list_get();
fo_list = elm_font_overlay_list_get(); fo_list = elm_config_font_overlay_list_get();
EINA_LIST_FOREACH(text_classes, l, etc) EINA_LIST_FOREACH(text_classes, l, etc)
{ {
@ -1782,7 +1782,7 @@ _fonts_data_fill(Evas *evas)
fdata.text_classes = eina_list_append(fdata.text_classes, tc_data); fdata.text_classes = eina_list_append(fdata.text_classes, tc_data);
} }
elm_text_classes_list_free(text_classes); elm_config_text_classes_list_free(text_classes);
/* FIXME: hinting later */ /* FIXME: hinting later */
/* fdata.hinting = e_config->font_hinting; */ /* fdata.hinting = e_config->font_hinting; */
@ -2136,10 +2136,10 @@ _profiles_list_selected_cb(void *data,
if (!sel_profile) if (!sel_profile)
return; return;
cur_profile = elm_profile_current_get(); cur_profile = elm_config_profile_get();
pdir = elm_profile_dir_get(sel_profile, EINA_TRUE); pdir = elm_config_profile_dir_get(sel_profile, EINA_TRUE);
if (!pdir) pdir = elm_profile_dir_get(sel_profile, EINA_FALSE); if (!pdir) pdir = elm_config_profile_dir_get(sel_profile, EINA_FALSE);
#ifdef ELM_EFREET #ifdef ELM_EFREET
snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir); snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
desk = efreet_desktop_new(buf); desk = efreet_desktop_new(buf);
@ -2147,7 +2147,7 @@ _profiles_list_selected_cb(void *data,
else else
{ {
if (desk) efreet_desktop_free(desk); if (desk) efreet_desktop_free(desk);
pdir = elm_profile_dir_get(sel_profile, EINA_FALSE); pdir = elm_config_profile_dir_get(sel_profile, EINA_FALSE);
snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir); snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
desk = efreet_desktop_new(buf); desk = efreet_desktop_new(buf);
if ((desk) && (desk->name)) prof_name = desk->name; if ((desk) && (desk->name)) prof_name = desk->name;
@ -2167,7 +2167,7 @@ _profiles_list_selected_cb(void *data,
EINA_FALSE); EINA_FALSE);
elm_object_disabled_set(evas_object_data_get(obj, "prof_use_btn"), elm_object_disabled_set(evas_object_data_get(obj, "prof_use_btn"),
EINA_FALSE); EINA_FALSE);
elm_profile_dir_free(pdir); elm_config_profile_dir_free(pdir);
} }
snprintf(buf, sizeof(buf), "<hilight>Selected profile: %s</><br/>", snprintf(buf, sizeof(buf), "<hilight>Selected profile: %s</><br/>",
@ -2200,7 +2200,7 @@ _profiles_list_fill(Evas_Object *l_widget,
elm_list_clear(l_widget); elm_list_clear(l_widget);
cur_profile = elm_profile_current_get(); cur_profile = elm_config_profile_get();
EINA_LIST_FOREACH(p_names, l, profile) EINA_LIST_FOREACH(p_names, l, profile)
{ {
@ -2212,8 +2212,8 @@ _profiles_list_fill(Evas_Object *l_widget,
Elm_Object_Item *list_it; Elm_Object_Item *list_it;
Evas_Object *ic; Evas_Object *ic;
pdir = elm_profile_dir_get(profile, EINA_TRUE); pdir = elm_config_profile_dir_get(profile, EINA_TRUE);
if (!pdir) pdir = elm_profile_dir_get(profile, EINA_FALSE); if (!pdir) pdir = elm_config_profile_dir_get(profile, EINA_FALSE);
label = profile; label = profile;
#ifdef ELM_EFREET #ifdef ELM_EFREET
@ -2223,7 +2223,7 @@ _profiles_list_fill(Evas_Object *l_widget,
else else
{ {
if (desk) efreet_desktop_free(desk); if (desk) efreet_desktop_free(desk);
pdir = elm_profile_dir_get(profile, EINA_FALSE); pdir = elm_config_profile_dir_get(profile, EINA_FALSE);
snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir); snprintf(buf, sizeof(buf), "%s/profile.desktop", pdir);
desk = efreet_desktop_new(buf); desk = efreet_desktop_new(buf);
if ((desk) && (desk->name)) label = desk->name; if ((desk) && (desk->name)) label = desk->name;
@ -2256,7 +2256,7 @@ _profiles_list_fill(Evas_Object *l_widget,
if (cur_profile && !strcmp(profile, cur_profile)) if (cur_profile && !strcmp(profile, cur_profile))
sel_it = list_it; sel_it = list_it;
elm_profile_dir_free(pdir); elm_config_profile_dir_free(pdir);
#ifdef ELM_EFREET #ifdef ELM_EFREET
if (desk) efreet_desktop_free(desk); if (desk) efreet_desktop_free(desk);
@ -2321,7 +2321,7 @@ _status_config_profiles(Evas_Object *win,
evas_object_smart_callback_add(li, "unselected", _profiles_list_unselect_cb, evas_object_smart_callback_add(li, "unselected", _profiles_list_unselect_cb,
NULL); NULL);
profs = elm_profile_list_get(); profs = elm_config_profile_list_get();
evas_object_show(li); evas_object_show(li);
elm_box_pack_end(fr_bx2, li); elm_box_pack_end(fr_bx2, li);
@ -2414,7 +2414,7 @@ _status_config_profiles(Evas_Object *win,
_profiles_list_fill(li, profs); _profiles_list_fill(li, profs);
elm_profile_list_free(profs); elm_config_profile_list_free(profs);
edje_thaw(); edje_thaw();
evas_event_thaw(evas); evas_event_thaw(evas);
@ -2448,7 +2448,7 @@ _status_config_scrolling(Evas_Object *win,
evas_object_data_set(win, "scroll_bounce_check", ck); 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_weight_set(ck, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5);
elm_check_state_set(ck, elm_scroll_bounce_enabled_get()); elm_check_state_set(ck, elm_config_scroll_bounce_enabled_get());
elm_box_pack_end(bx, ck); elm_box_pack_end(bx, ck);
evas_object_show(ck); evas_object_show(ck);
@ -2466,7 +2466,7 @@ _status_config_scrolling(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.2f"); elm_slider_unit_format_set(sl, "%1.2f");
elm_slider_indicator_format_set(sl, "%1.2f"); elm_slider_indicator_format_set(sl, "%1.2f");
elm_slider_min_max_set(sl, 0.0, 4.0); elm_slider_min_max_set(sl, 0.0, 4.0);
elm_slider_value_set(sl, elm_scroll_bounce_friction_get()); elm_slider_value_set(sl, elm_config_scroll_bounce_friction_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2487,7 +2487,7 @@ _status_config_scrolling(Evas_Object *win,
evas_object_data_set(win, "thumbscroll_check", ck); evas_object_data_set(win, "thumbscroll_check", ck);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5);
elm_check_state_set(ck, elm_scroll_thumbscroll_enabled_get()); elm_check_state_set(ck, elm_config_scroll_thumbscroll_enabled_get());
elm_box_pack_end(bx, ck); elm_box_pack_end(bx, ck);
evas_object_show(ck); evas_object_show(ck);
@ -2506,7 +2506,7 @@ _status_config_scrolling(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.0f pixels"); elm_slider_unit_format_set(sl, "%1.0f pixels");
elm_slider_indicator_format_set(sl, "%1.0f"); elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 8.0, 50.0); elm_slider_min_max_set(sl, 8.0, 50.0);
elm_slider_value_set(sl, elm_scroll_thumbscroll_threshold_get()); elm_slider_value_set(sl, elm_config_scroll_thumbscroll_threshold_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2527,7 +2527,7 @@ _status_config_scrolling(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.0f pixels/s"); elm_slider_unit_format_set(sl, "%1.0f pixels/s");
elm_slider_indicator_format_set(sl, "%1.0f"); elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 10.0, 200.0); elm_slider_min_max_set(sl, 10.0, 200.0);
elm_slider_value_set(sl, elm_scroll_thumbscroll_momentum_threshold_get()); elm_slider_value_set(sl, elm_config_scroll_thumbscroll_momentum_threshold_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2548,7 +2548,7 @@ _status_config_scrolling(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.1f"); elm_slider_unit_format_set(sl, "%1.1f");
elm_slider_indicator_format_set(sl, "%1.1f"); elm_slider_indicator_format_set(sl, "%1.1f");
elm_slider_min_max_set(sl, 0.0, 15.0); elm_slider_min_max_set(sl, 0.0, 15.0);
elm_slider_value_set(sl, elm_scroll_thumbscroll_friction_get()); elm_slider_value_set(sl, elm_config_scroll_thumbscroll_friction_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2570,7 +2570,7 @@ _status_config_scrolling(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.2f"); elm_slider_unit_format_set(sl, "%1.2f");
elm_slider_indicator_format_set(sl, "%1.2f"); elm_slider_indicator_format_set(sl, "%1.2f");
elm_slider_min_max_set(sl, 0.0, 1.0); elm_slider_min_max_set(sl, 0.0, 1.0);
elm_slider_value_set(sl, elm_scroll_thumbscroll_border_friction_get()); elm_slider_value_set(sl, elm_config_scroll_thumbscroll_border_friction_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2590,7 +2590,7 @@ _status_config_scrolling(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.2f"); elm_slider_unit_format_set(sl, "%1.2f");
elm_slider_indicator_format_set(sl, "%1.2f"); elm_slider_indicator_format_set(sl, "%1.2f");
elm_slider_min_max_set(sl, 0.1, 1.0); elm_slider_min_max_set(sl, 0.1, 1.0);
elm_slider_value_set(sl, elm_scroll_thumbscroll_sensitivity_friction_get()); elm_slider_value_set(sl, elm_config_scroll_thumbscroll_sensitivity_friction_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2617,7 +2617,7 @@ _status_config_scrolling(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.1f"); elm_slider_unit_format_set(sl, "%1.1f");
elm_slider_indicator_format_set(sl, "%1.1f"); elm_slider_indicator_format_set(sl, "%1.1f");
elm_slider_min_max_set(sl, 0.0, 5.0); elm_slider_min_max_set(sl, 0.0, 5.0);
elm_slider_value_set(sl, elm_scroll_page_scroll_friction_get()); elm_slider_value_set(sl, elm_config_scroll_page_scroll_friction_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2637,7 +2637,7 @@ _status_config_scrolling(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.1f"); elm_slider_unit_format_set(sl, "%1.1f");
elm_slider_indicator_format_set(sl, "%1.1f"); elm_slider_indicator_format_set(sl, "%1.1f");
elm_slider_min_max_set(sl, 0.0, 5.0); elm_slider_min_max_set(sl, 0.0, 5.0);
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());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2658,7 +2658,7 @@ _status_config_scrolling(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.1f"); elm_slider_unit_format_set(sl, "%1.1f");
elm_slider_indicator_format_set(sl, "%1.1f"); elm_slider_indicator_format_set(sl, "%1.1f");
elm_slider_min_max_set(sl, 0.0, 5.0); elm_slider_min_max_set(sl, 0.0, 5.0);
elm_slider_value_set(sl, elm_scroll_zoom_friction_get()); elm_slider_value_set(sl, elm_config_scroll_zoom_friction_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2736,7 +2736,7 @@ _engines_list_fill(Evas_Object *l_widget,
if (!e_names) if (!e_names)
return; return;
cur_engine = elm_engine_get(); cur_engine = elm_config_engine_get();
EINA_LIST_FOREACH(e_names, l, engine) EINA_LIST_FOREACH(e_names, l, engine)
{ {
@ -2838,14 +2838,14 @@ _status_config_caches(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.0f ticks"); elm_slider_unit_format_set(sl, "%1.0f ticks");
elm_slider_indicator_format_set(sl, "%1.0f"); elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 8.0, 4096.0); elm_slider_min_max_set(sl, 8.0, 4096.0);
elm_slider_value_set(sl, elm_cache_flush_interval_get()); elm_slider_value_set(sl, elm_config_cache_flush_interval_get());
elm_object_disabled_set(sl, !elm_cache_flush_enabled_get()); elm_object_disabled_set(sl, !elm_config_cache_flush_enabled_get());
ck = elm_check_add(win); ck = elm_check_add(win);
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5); evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5);
elm_object_text_set(ck, "Enable Flushing"); elm_object_text_set(ck, "Enable Flushing");
elm_check_state_set(ck, elm_cache_flush_enabled_get()); elm_check_state_set(ck, elm_config_cache_flush_enabled_get());
evas_object_smart_callback_add(ck, "changed", cf_enable, sl); evas_object_smart_callback_add(ck, "changed", cf_enable, sl);
elm_box_pack_end(bx, ck); elm_box_pack_end(bx, ck);
evas_object_show(ck); evas_object_show(ck);
@ -2873,7 +2873,7 @@ _status_config_caches(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.1f MB"); elm_slider_unit_format_set(sl, "%1.1f MB");
elm_slider_indicator_format_set(sl, "%1.1f"); elm_slider_indicator_format_set(sl, "%1.1f");
elm_slider_min_max_set(sl, 0.0, 4.0); elm_slider_min_max_set(sl, 0.0, 4.0);
elm_slider_value_set(sl, (double)elm_cache_font_cache_size_get() / 1024.0); elm_slider_value_set(sl, (double)elm_config_cache_font_cache_size_get() / 1024.0);
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2897,7 +2897,7 @@ _status_config_caches(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.0f MB"); elm_slider_unit_format_set(sl, "%1.0f MB");
elm_slider_indicator_format_set(sl, "%1.0f"); elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 0, 32); elm_slider_min_max_set(sl, 0, 32);
elm_slider_value_set(sl, (double)elm_cache_image_cache_size_get() / 1024.0); elm_slider_value_set(sl, (double)elm_config_cache_image_cache_size_get() / 1024.0);
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2921,7 +2921,7 @@ _status_config_caches(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.0f files"); elm_slider_unit_format_set(sl, "%1.0f files");
elm_slider_indicator_format_set(sl, "%1.0f"); elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 0, 32); elm_slider_min_max_set(sl, 0, 32);
elm_slider_value_set(sl, elm_cache_edje_file_cache_size_get()); elm_slider_value_set(sl, elm_config_cache_edje_file_cache_size_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -2945,7 +2945,7 @@ _status_config_caches(Evas_Object *win,
elm_slider_unit_format_set(sl, "%1.0f collections"); elm_slider_unit_format_set(sl, "%1.0f collections");
elm_slider_indicator_format_set(sl, "%1.0f"); elm_slider_indicator_format_set(sl, "%1.0f");
elm_slider_min_max_set(sl, 0, 128); elm_slider_min_max_set(sl, 0, 128);
elm_slider_value_set(sl, elm_cache_edje_collection_cache_size_get()); elm_slider_value_set(sl, elm_config_cache_edje_collection_cache_size_get());
elm_box_pack_end(bx, sl); elm_box_pack_end(bx, sl);
evas_object_show(sl); evas_object_show(sl);
@ -3114,8 +3114,8 @@ elm_main(int argc,
if (!interactive) if (!interactive)
{ {
if (theme_set) elm_theme_set(NULL, theme_set); if (theme_set) elm_theme_set(NULL, theme_set);
if (finger_size_set) elm_finger_size_set(atoi(finger_size_set)); if (finger_size_set) elm_config_finger_size_set(atoi(finger_size_set));
if (scale_set) elm_scale_set(atof(scale_set)); if (scale_set) elm_config_scale_set(atof(scale_set));
elm_config_all_flush(); elm_config_all_flush();

4
legacy/elementary/src/bin/test.c
View File

@ -215,7 +215,7 @@ static void
_ui_tg_changed(void *data, Evas_Object *obj, void *event_info) _ui_tg_changed(void *data, Evas_Object *obj, void *event_info)
{ {
(void) data; (void) event_info; (void) data; (void) event_info;
elm_mirrored_set(elm_check_state_get(obj)); elm_config_mirrored_set(elm_check_state_get(obj));
} }
static void static void
@ -304,7 +304,7 @@ my_win_main(char *autorun, Eina_Bool test_win_only)
tg = elm_check_add(win); tg = elm_check_add(win);
elm_object_style_set(tg, "toggle"); elm_object_style_set(tg, "toggle");
elm_object_text_set(tg, "UI-Mirroring:"); elm_object_text_set(tg, "UI-Mirroring:");
elm_check_state_set(tg, elm_mirrored_get()); elm_check_state_set(tg, elm_config_mirrored_get());
evas_object_smart_callback_add(tg, "changed", _ui_tg_changed, NULL); evas_object_smart_callback_add(tg, "changed", _ui_tg_changed, NULL);
elm_box_pack_end(bx0, tg); elm_box_pack_end(bx0, tg);
evas_object_show(tg); evas_object_show(tg);

4
legacy/elementary/src/bin/test_cursor.c
View File

@ -359,14 +359,14 @@ test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
elm_box_pack_end(bx, o); elm_box_pack_end(bx, o);
evas_object_show(o); evas_object_show(o);
elm_cursor_engine_only_set(0); elm_config_cursor_engine_only_set(EINA_FALSE);
o = elm_button_add(win); o = elm_button_add(win);
elm_object_cursor_set(o, "hand2"); elm_object_cursor_set(o, "hand2");
elm_object_text_set(o, "hand 2 engine only config false"); elm_object_text_set(o, "hand 2 engine only config false");
elm_box_pack_end(bx, o); elm_box_pack_end(bx, o);
evas_object_show(o); evas_object_show(o);
elm_cursor_engine_only_set(1); elm_config_cursor_engine_only_set(EINA_TRUE);
o = elm_button_add(win); o = elm_button_add(win);
elm_object_cursor_set(o, "hand2"); elm_object_cursor_set(o, "hand2");
elm_object_text_set(o, "hand 2 engine only config true"); elm_object_text_set(o, "hand 2 engine only config true");

8
legacy/elementary/src/bin/test_focus3.c
View File

@ -115,13 +115,13 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
static void static void
highlight_enabled_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) highlight_enabled_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{ {
elm_focus_highlight_enabled_set(elm_check_state_get(obj)); elm_config_focus_highlight_enabled_set(elm_check_state_get(obj));
} }
static void static void
highlight_animate_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) highlight_animate_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{ {
elm_focus_highlight_animate_set(elm_check_state_get(obj)); elm_config_focus_highlight_animate_set(elm_check_state_get(obj));
} }
static void static void
@ -208,8 +208,8 @@ test_focus4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
win = elm_win_util_standard_add("focus4", "Focus 4"); win = elm_win_util_standard_add("focus4", "Focus 4");
elm_win_autodel_set(win, EINA_TRUE); elm_win_autodel_set(win, EINA_TRUE);
elm_win_focus_highlight_enabled_set(win, EINA_TRUE); elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
elm_focus_highlight_enabled_set(EINA_TRUE); elm_config_focus_highlight_enabled_set(EINA_TRUE);
elm_focus_highlight_animate_set(EINA_TRUE); elm_config_focus_highlight_animate_set(EINA_TRUE);
/* First Example - Using Focus Highlight */ /* First Example - Using Focus Highlight */
gd = elm_grid_add(win); gd = elm_grid_add(win);

2
legacy/elementary/src/bin/test_genlist.c
View File

@ -1945,7 +1945,7 @@ test_genlist11(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
tg = elm_check_add(win); tg = elm_check_add(win);
elm_object_style_set(tg, "toggle"); elm_object_style_set(tg, "toggle");
elm_object_text_set(tg, "Reorder Mode:"); elm_object_text_set(tg, "Reorder Mode:");
elm_check_state_set(tg, elm_mirrored_get()); elm_check_state_set(tg, elm_config_mirrored_get());
evas_object_smart_callback_add(tg, "changed", _reorder_tg_changed_cb, gl); evas_object_smart_callback_add(tg, "changed", _reorder_tg_changed_cb, gl);
elm_box_pack_end(bx, tg); elm_box_pack_end(bx, tg);
evas_object_show(tg); evas_object_show(tg);

6
legacy/elementary/src/bin/test_glview_simple.c
View File

@ -239,9 +239,11 @@ test_glview_simple(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
if (!(gld = calloc(1, sizeof(GLData)))) return; if (!(gld = calloc(1, sizeof(GLData)))) return;
// Set the engine to opengl_x11 // Set the engine to opengl_x11
elm_engine_set("opengl_x11"); elm_config_preferred_engine_set("opengl_x11");
win = elm_win_add(NULL, "glview simple", ELM_WIN_BASIC); win = elm_win_add(NULL, "glview simple", ELM_WIN_BASIC);
// Set preferred engine back to default from config
elm_config_preferred_engine_set(NULL);
elm_win_title_set(win, "GLView Simple"); elm_win_title_set(win, "GLView Simple");
elm_win_autodel_set(win, EINA_TRUE); elm_win_autodel_set(win, EINA_TRUE);

3
legacy/elementary/src/lib/elc_fileselector.c
View File

@ -891,7 +891,8 @@ elm_fileselector_add(Evas_Object *parent)
evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
s = elm_finger_size_get() * 2; // XXX: will fail for dynamic finger size changing
s = _elm_config->finger_size * 2;
elm_gengrid_item_size_set(grid, s, s); elm_gengrid_item_size_set(grid, s, s);
elm_gengrid_align_set(grid, 0.0, 0.0); elm_gengrid_align_set(grid, 0.0, 0.0);

6
legacy/elementary/src/lib/elc_multibuttonentry.c
View File

@ -462,7 +462,7 @@ _shrink_mode_set(Evas_Object *obj, int shrink)
wd->rect_for_end= evas_object_rectangle_add(e); wd->rect_for_end= evas_object_rectangle_add(e);
evas_object_color_set(wd->rect_for_end, 0, 0, 0, 0); evas_object_color_set(wd->rect_for_end, 0, 0, 0, 0);
} }
evas_object_size_hint_min_set(wd->rect_for_end, rectSize, closed_height * elm_scale_get() ); evas_object_size_hint_min_set(wd->rect_for_end, rectSize, closed_height * _elm_config->scale);
elm_box_pack_end(wd->box, wd->rect_for_end); elm_box_pack_end(wd->box, wd->rect_for_end);
evas_object_show(wd->rect_for_end); evas_object_show(wd->rect_for_end);
@ -1161,7 +1161,9 @@ _view_init(Evas_Object *obj)
if (size_str) button_min_height = (Evas_Coord)atoi(size_str); if (size_str) button_min_height = (Evas_Coord)atoi(size_str);
wd->end_type = MULTIBUTTONENTRY_CLOSED_IMAGE; wd->end_type = MULTIBUTTONENTRY_CLOSED_IMAGE;
evas_object_size_hint_min_set(wd->end, button_min_width * elm_scale_get(), button_min_height * elm_scale_get()); evas_object_size_hint_min_set(wd->end,
button_min_width * _elm_config->scale,
button_min_height * _elm_config->scale);
elm_widget_sub_object_add(obj, wd->end); elm_widget_sub_object_add(obj, wd->end);
} }
} }

2
legacy/elementary/src/lib/elc_popup.c
View File

@ -497,7 +497,7 @@ _scroller_size_calc(Evas_Object *obj)
action_area_height = edje_object_data_get( action_area_height = edje_object_data_get(
elm_layout_edje_get(wd->action_area), "action_area_height"); elm_layout_edje_get(wd->action_area), "action_area_height");
if (action_area_height) h_action_area = (int)(atoi(action_area_height) if (action_area_height) h_action_area = (int)(atoi(action_area_height)
* elm_scale_get()* elm_object_scale_get(obj)); * _elm_config->scale * elm_object_scale_get(obj));
} }
h_content = h - (h_title + h_action_area); h_content = h - (h_title + h_action_area);
wd->max_sc_h = h_content; wd->max_sc_h = h_content;

166
legacy/elementary/src/lib/elm_config.c
View File

@ -1395,26 +1395,26 @@ _env_get(void)
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_mirrored_get(void) elm_config_mirrored_get(void)
{ {
return _elm_config->is_mirrored; return _elm_config->is_mirrored;
} }
EAPI void EAPI void
elm_mirrored_set(Eina_Bool mirrored) elm_config_mirrored_set(Eina_Bool mirrored)
{ {
_elm_config->is_mirrored = mirrored; _elm_config->is_mirrored = mirrored;
_elm_rescale(); _elm_rescale();
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_cursor_engine_only_get(void) elm_config_cursor_engine_only_get(void)
{ {
return _elm_config->cursor_engine_only; return _elm_config->cursor_engine_only;
} }
EAPI void EAPI void
elm_cursor_engine_only_set(Eina_Bool engine_only) elm_config_cursor_engine_only_set(Eina_Bool engine_only)
{ {
engine_only = !!engine_only; engine_only = !!engine_only;
_elm_config->cursor_engine_only = engine_only; _elm_config->cursor_engine_only = engine_only;
@ -1433,25 +1433,27 @@ elm_tooltip_delay_set(double delay)
return EINA_TRUE; return EINA_TRUE;
} }
EAPI double elm_config_tooltip_delay_get(void) EAPI double
elm_config_tooltip_delay_get(void)
{ {
return _elm_config->tooltip_delay; return _elm_config->tooltip_delay;
} }
EAPI void elm_config_tooltip_delay_set(double delay) EAPI void
elm_config_tooltip_delay_set(double delay)
{ {
if (delay < 0.0) return; if (delay < 0.0) return;
_elm_config->tooltip_delay = delay; _elm_config->tooltip_delay = delay;
} }
EAPI double EAPI double
elm_scale_get(void) elm_config_scale_get(void)
{ {
return _elm_config->scale; return _elm_config->scale;
} }
EAPI void EAPI void
elm_scale_set(double scale) elm_config_scale_set(double scale)
{ {
if (_elm_config->scale == scale) return; if (_elm_config->scale == scale) return;
_elm_config->scale = scale; _elm_config->scale = scale;
@ -1459,13 +1461,13 @@ elm_scale_set(double scale)
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_password_show_last_get(void) elm_config_password_show_last_get(void)
{ {
return _elm_config->password_show_last; return _elm_config->password_show_last;
} }
EAPI void EAPI void
elm_password_show_last_set(Eina_Bool password_show_last) elm_config_password_show_last_set(Eina_Bool password_show_last)
{ {
if (_elm_config->password_show_last == password_show_last) return; if (_elm_config->password_show_last == password_show_last) return;
_elm_config->password_show_last = password_show_last; _elm_config->password_show_last = password_show_last;
@ -1473,13 +1475,13 @@ elm_password_show_last_set(Eina_Bool password_show_last)
} }
EAPI double EAPI double
elm_password_show_last_timeout_get(void) elm_config_password_show_last_timeout_get(void)
{ {
return _elm_config->password_show_last_timeout; return _elm_config->password_show_last_timeout;
} }
EAPI void EAPI void
elm_password_show_last_timeout_set(double password_show_last_timeout) elm_config_password_show_last_timeout_set(double password_show_last_timeout)
{ {
if (_elm_config->password_show_last_timeout == password_show_last_timeout) return; if (_elm_config->password_show_last_timeout == password_show_last_timeout) return;
_elm_config->password_show_last_timeout = password_show_last_timeout; _elm_config->password_show_last_timeout = password_show_last_timeout;
@ -1499,32 +1501,32 @@ elm_config_reload(void)
} }
EAPI const char * EAPI const char *
elm_profile_current_get(void) elm_config_profile_get(void)
{ {
return _elm_config_current_profile_get(); return _elm_config_current_profile_get();
} }
EAPI const char * EAPI const char *
elm_profile_dir_get(const char *profile, elm_config_profile_dir_get(const char *profile,
Eina_Bool is_user) Eina_Bool is_user)
{ {
return _elm_config_profile_dir_get(profile, is_user); return _elm_config_profile_dir_get(profile, is_user);
} }
EAPI void EAPI void
elm_profile_dir_free(const char *p_dir) elm_config_profile_dir_free(const char *p_dir)
{ {
free((void *)p_dir); free((void *)p_dir);
} }
EAPI Eina_List * EAPI Eina_List *
elm_profile_list_get(void) elm_config_profile_list_get(void)
{ {
return _elm_config_profiles_list(); return _elm_config_profiles_list();
} }
EAPI void EAPI void
elm_profile_list_free(Eina_List *l) elm_config_profile_list_free(Eina_List *l)
{ {
const char *dir; const char *dir;
@ -1533,20 +1535,20 @@ elm_profile_list_free(Eina_List *l)
} }
EAPI void EAPI void
elm_profile_set(const char *profile) elm_config_profile_set(const char *profile)
{ {
EINA_SAFETY_ON_NULL_RETURN(profile); EINA_SAFETY_ON_NULL_RETURN(profile);
_elm_config_profile_set(profile); _elm_config_profile_set(profile);
} }
EAPI const char * EAPI const char *
elm_engine_get(void) elm_config_engine_get(void)
{ {
return _elm_config->engine; return _elm_config->engine;
} }
EAPI void EAPI void
elm_engine_set(const char *engine) elm_config_engine_set(const char *engine)
{ {
EINA_SAFETY_ON_NULL_RETURN(engine); EINA_SAFETY_ON_NULL_RETURN(engine);
@ -1554,25 +1556,25 @@ elm_engine_set(const char *engine)
} }
EAPI Eina_List * EAPI Eina_List *
elm_text_classes_list_get(void) elm_config_text_classes_list_get(void)
{ {
return _elm_config_text_classes_get(); return _elm_config_text_classes_get();
} }
EAPI void EAPI void
elm_text_classes_list_free(Eina_List *list) elm_config_text_classes_list_free(Eina_List *list)
{ {
_elm_config_text_classes_free(list); _elm_config_text_classes_free(list);
} }
EAPI const Eina_List * EAPI const Eina_List *
elm_font_overlay_list_get(void) elm_config_font_overlay_list_get(void)
{ {
return _elm_config_font_overlays_list(); return _elm_config_font_overlays_list();
} }
EAPI void EAPI void
elm_font_overlay_set(const char *text_class, elm_config_font_overlay_set(const char *text_class,
const char *font, const char *font,
Evas_Font_Size size) Evas_Font_Size size)
{ {
@ -1581,26 +1583,26 @@ elm_font_overlay_set(const char *text_class,
} }
EAPI void EAPI void
elm_font_overlay_unset(const char *text_class) elm_config_font_overlay_unset(const char *text_class)
{ {
EINA_SAFETY_ON_NULL_RETURN(text_class); EINA_SAFETY_ON_NULL_RETURN(text_class);
_elm_config_font_overlay_remove(text_class); _elm_config_font_overlay_remove(text_class);
} }
EAPI void EAPI void
elm_font_overlay_apply(void) elm_config_font_overlay_apply(void)
{ {
_elm_config_font_overlay_apply(); _elm_config_font_overlay_apply();
} }
EAPI Evas_Coord EAPI Evas_Coord
elm_finger_size_get(void) elm_config_finger_size_get(void)
{ {
return _elm_config->finger_size; return _elm_config->finger_size;
} }
EAPI void EAPI void
elm_finger_size_set(Evas_Coord size) elm_config_finger_size_set(Evas_Coord size)
{ {
if (_elm_config->finger_size == size) return; if (_elm_config->finger_size == size) return;
_elm_config->finger_size = size; _elm_config->finger_size = size;
@ -1608,13 +1610,13 @@ elm_finger_size_set(Evas_Coord size)
} }
EAPI int EAPI int
elm_cache_flush_interval_get(void) elm_config_cache_flush_interval_get(void)
{ {
return _elm_config->cache_flush_poll_interval; return _elm_config->cache_flush_poll_interval;
} }
EAPI void EAPI void
elm_cache_flush_interval_set(int size) elm_config_cache_flush_interval_set(int size)
{ {
if (_elm_config->cache_flush_poll_interval == size) return; if (_elm_config->cache_flush_poll_interval == size) return;
_elm_config->cache_flush_poll_interval = size; _elm_config->cache_flush_poll_interval = size;
@ -1623,13 +1625,13 @@ elm_cache_flush_interval_set(int size)
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_cache_flush_enabled_get(void) elm_config_cache_flush_enabled_get(void)
{ {
return _elm_config->cache_flush_enable; return _elm_config->cache_flush_enable;
} }
EAPI void EAPI void
elm_cache_flush_enabled_set(Eina_Bool enabled) elm_config_cache_flush_enabled_set(Eina_Bool enabled)
{ {
enabled = !!enabled; enabled = !!enabled;
if (_elm_config->cache_flush_enable == enabled) return; if (_elm_config->cache_flush_enable == enabled) return;
@ -1641,11 +1643,11 @@ elm_cache_flush_enabled_set(Eina_Bool enabled)
EINA_DEPRECATED EAPI int EINA_DEPRECATED EAPI int
elm_font_cache_get(void) elm_font_cache_get(void)
{ {
return elm_cache_font_cache_size_get(); return elm_config_cache_font_cache_size_get();
} }
EAPI int EAPI int
elm_cache_font_cache_size_get(void) elm_config_cache_font_cache_size_get(void)
{ {
return _elm_config->font_cache; return _elm_config->font_cache;
} }
@ -1653,11 +1655,11 @@ elm_cache_font_cache_size_get(void)
EINA_DEPRECATED EAPI void EINA_DEPRECATED EAPI void
elm_font_cache_set(int size) elm_font_cache_set(int size)
{ {
elm_cache_font_cache_size_set(size); elm_config_cache_font_cache_size_set(size);
} }
EAPI void EAPI void
elm_cache_font_cache_size_set(int size) elm_config_cache_font_cache_size_set(int size)
{ {
if (_elm_config->font_cache == size) return; if (_elm_config->font_cache == size) return;
_elm_config->font_cache = size; _elm_config->font_cache = size;
@ -1668,11 +1670,11 @@ elm_cache_font_cache_size_set(int size)
EINA_DEPRECATED EAPI int EINA_DEPRECATED EAPI int
elm_image_cache_get(void) elm_image_cache_get(void)
{ {
return elm_cache_image_cache_size_get(); return elm_config_cache_image_cache_size_get();
} }
EAPI int EAPI int
elm_cache_image_cache_size_get(void) elm_config_cache_image_cache_size_get(void)
{ {
return _elm_config->image_cache; return _elm_config->image_cache;
} }
@ -1680,11 +1682,11 @@ elm_cache_image_cache_size_get(void)
EINA_DEPRECATED EAPI void EINA_DEPRECATED EAPI void
elm_image_cache_set(int size) elm_image_cache_set(int size)
{ {
elm_cache_image_cache_size_set(size); elm_config_cache_image_cache_size_set(size);
} }
EAPI void EAPI void
elm_cache_image_cache_size_set(int size) elm_config_cache_image_cache_size_set(int size)
{ {
if (_elm_config->image_cache == size) return; if (_elm_config->image_cache == size) return;
_elm_config->image_cache = size; _elm_config->image_cache = size;
@ -1695,11 +1697,11 @@ elm_cache_image_cache_size_set(int size)
EINA_DEPRECATED EAPI int EINA_DEPRECATED EAPI int
elm_edje_file_cache_get(void) elm_edje_file_cache_get(void)
{ {
return elm_cache_edje_file_cache_size_get(); return elm_config_cache_edje_file_cache_size_get();
} }
EAPI int EAPI int
elm_cache_edje_file_cache_size_get() elm_config_cache_edje_file_cache_size_get()
{ {
return _elm_config->edje_cache; return _elm_config->edje_cache;
} }
@ -1707,11 +1709,11 @@ elm_cache_edje_file_cache_size_get()
EINA_DEPRECATED EAPI void EINA_DEPRECATED EAPI void
elm_edje_file_cache_set(int size) elm_edje_file_cache_set(int size)
{ {
elm_cache_edje_file_cache_size_set(size); elm_config_cache_edje_file_cache_size_set(size);
} }
EAPI void EAPI void
elm_cache_edje_file_cache_size_set(int size) elm_config_cache_edje_file_cache_size_set(int size)
{ {
if (_elm_config->edje_cache == size) return; if (_elm_config->edje_cache == size) return;
_elm_config->edje_cache = size; _elm_config->edje_cache = size;
@ -1722,11 +1724,11 @@ elm_cache_edje_file_cache_size_set(int size)
EINA_DEPRECATED EAPI int EINA_DEPRECATED EAPI int
elm_edje_collection_cache_get(void) elm_edje_collection_cache_get(void)
{ {
return elm_cache_edje_collection_cache_size_get(); return elm_config_cache_edje_collection_cache_size_get();
} }
EAPI int EAPI int
elm_cache_edje_collection_cache_size_get(void) elm_config_cache_edje_collection_cache_size_get(void)
{ {
return _elm_config->edje_collection_cache; return _elm_config->edje_collection_cache;
} }
@ -1734,11 +1736,11 @@ elm_cache_edje_collection_cache_size_get(void)
EINA_DEPRECATED EAPI void EINA_DEPRECATED EAPI void
elm_edje_collection_cache_set(int size) elm_edje_collection_cache_set(int size)
{ {
elm_cache_edje_collection_cache_size_set(size); elm_config_cache_edje_collection_cache_size_set(size);
} }
EAPI void EAPI void
elm_cache_edje_collection_cache_size_set(int size) elm_config_cache_edje_collection_cache_size_set(int size)
{ {
if (_elm_config->edje_collection_cache == size) return; if (_elm_config->edje_collection_cache == size) return;
_elm_config->edje_collection_cache = size; _elm_config->edje_collection_cache = size;
@ -1747,145 +1749,145 @@ elm_cache_edje_collection_cache_size_set(int size)
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_focus_highlight_enabled_get(void) elm_config_focus_highlight_enabled_get(void)
{ {
return _elm_config->focus_highlight_enable; return _elm_config->focus_highlight_enable;
} }
EAPI void EAPI void
elm_focus_highlight_enabled_set(Eina_Bool enable) elm_config_focus_highlight_enabled_set(Eina_Bool enable)
{ {
_elm_config->focus_highlight_enable = !!enable; _elm_config->focus_highlight_enable = !!enable;
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_focus_highlight_animate_get(void) elm_config_focus_highlight_animate_get(void)
{ {
return _elm_config->focus_highlight_animate; return _elm_config->focus_highlight_animate;
} }
EAPI void EAPI void
elm_focus_highlight_animate_set(Eina_Bool animate) elm_config_focus_highlight_animate_set(Eina_Bool animate)
{ {
_elm_config->focus_highlight_animate = !!animate; _elm_config->focus_highlight_animate = !!animate;
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_scroll_bounce_enabled_get(void) elm_config_scroll_bounce_enabled_get(void)
{ {
return _elm_config->thumbscroll_bounce_enable; return _elm_config->thumbscroll_bounce_enable;
} }
EAPI void EAPI void
elm_scroll_bounce_enabled_set(Eina_Bool enabled) elm_config_scroll_bounce_enabled_set(Eina_Bool enabled)
{ {
_elm_config->thumbscroll_bounce_enable = enabled; _elm_config->thumbscroll_bounce_enable = enabled;
} }
EAPI double EAPI double
elm_scroll_bounce_friction_get(void) elm_config_scroll_bounce_friction_get(void)
{ {
return _elm_config->thumbscroll_bounce_friction; return _elm_config->thumbscroll_bounce_friction;
} }
EAPI void EAPI void
elm_scroll_bounce_friction_set(double friction) elm_config_scroll_bounce_friction_set(double friction)
{ {
_elm_config->thumbscroll_bounce_friction = friction; _elm_config->thumbscroll_bounce_friction = friction;
} }
EAPI double EAPI double
elm_scroll_page_scroll_friction_get(void) elm_config_scroll_page_scroll_friction_get(void)
{ {
return _elm_config->page_scroll_friction; return _elm_config->page_scroll_friction;
} }
EAPI void EAPI void
elm_scroll_page_scroll_friction_set(double friction) elm_config_scroll_page_scroll_friction_set(double friction)
{ {
_elm_config->page_scroll_friction = friction; _elm_config->page_scroll_friction = friction;
} }
EAPI double EAPI double
elm_scroll_bring_in_scroll_friction_get(void) elm_config_scroll_bring_in_scroll_friction_get(void)
{ {
return _elm_config->bring_in_scroll_friction; return _elm_config->bring_in_scroll_friction;
} }
EAPI void EAPI void
elm_scroll_bring_in_scroll_friction_set(double friction) elm_config_scroll_bring_in_scroll_friction_set(double friction)
{ {
_elm_config->bring_in_scroll_friction = friction; _elm_config->bring_in_scroll_friction = friction;
} }
EAPI double EAPI double
elm_scroll_zoom_friction_get(void) elm_config_scroll_zoom_friction_get(void)
{ {
return _elm_config->zoom_friction; return _elm_config->zoom_friction;
} }
EAPI void EAPI void
elm_scroll_zoom_friction_set(double friction) elm_config_scroll_zoom_friction_set(double friction)
{ {
_elm_config->zoom_friction = friction; _elm_config->zoom_friction = friction;
} }
EAPI Eina_Bool EAPI Eina_Bool
elm_scroll_thumbscroll_enabled_get(void) elm_config_scroll_thumbscroll_enabled_get(void)
{ {
return _elm_config->thumbscroll_enable; return _elm_config->thumbscroll_enable;
} }
EAPI void EAPI void
elm_scroll_thumbscroll_enabled_set(Eina_Bool enabled) elm_config_scroll_thumbscroll_enabled_set(Eina_Bool enabled)
{ {
_elm_config->thumbscroll_enable = enabled; _elm_config->thumbscroll_enable = enabled;
} }
EAPI unsigned int EAPI unsigned int
elm_scroll_thumbscroll_threshold_get(void) elm_config_scroll_thumbscroll_threshold_get(void)
{ {
return _elm_config->thumbscroll_threshold; return _elm_config->thumbscroll_threshold;
} }
EAPI void EAPI void
elm_scroll_thumbscroll_threshold_set(unsigned int threshold) elm_config_scroll_thumbscroll_threshold_set(unsigned int threshold)
{ {
_elm_config->thumbscroll_threshold = threshold; _elm_config->thumbscroll_threshold = threshold;
} }
EAPI double EAPI double
elm_scroll_thumbscroll_momentum_threshold_get(void) elm_config_scroll_thumbscroll_momentum_threshold_get(void)
{ {
return _elm_config->thumbscroll_momentum_threshold; return _elm_config->thumbscroll_momentum_threshold;
} }
EAPI void EAPI void
elm_scroll_thumbscroll_momentum_threshold_set(double threshold) elm_config_scroll_thumbscroll_momentum_threshold_set(double threshold)
{ {
_elm_config->thumbscroll_momentum_threshold = threshold; _elm_config->thumbscroll_momentum_threshold = threshold;
} }
EAPI double EAPI double
elm_scroll_thumbscroll_friction_get(void) elm_config_scroll_thumbscroll_friction_get(void)
{ {
return _elm_config->thumbscroll_friction; return _elm_config->thumbscroll_friction;
} }
EAPI void EAPI void
elm_scroll_thumbscroll_friction_set(double friction) elm_config_scroll_thumbscroll_friction_set(double friction)
{ {
_elm_config->thumbscroll_friction = friction; _elm_config->thumbscroll_friction = friction;
} }
EAPI double EAPI double
elm_scroll_thumbscroll_border_friction_get(void) elm_config_scroll_thumbscroll_border_friction_get(void)
{ {
return _elm_config->thumbscroll_border_friction; return _elm_config->thumbscroll_border_friction;
} }
EAPI void EAPI void
elm_scroll_thumbscroll_border_friction_set(double friction) elm_config_scroll_thumbscroll_border_friction_set(double friction)
{ {
if (friction < 0.0) friction = 0.0; if (friction < 0.0) friction = 0.0;
if (friction > 1.0) friction = 1.0; if (friction > 1.0) friction = 1.0;
@ -1893,13 +1895,13 @@ elm_scroll_thumbscroll_border_friction_set(double friction)
} }
EAPI double EAPI double
elm_scroll_thumbscroll_sensitivity_friction_get(void) elm_config_scroll_thumbscroll_sensitivity_friction_get(void)
{ {
return _elm_config->thumbscroll_sensitivity_friction; return _elm_config->thumbscroll_sensitivity_friction;
} }
EAPI void EAPI void
elm_scroll_thumbscroll_sensitivity_friction_set(double friction) elm_config_scroll_thumbscroll_sensitivity_friction_set(double friction)
{ {
if (friction < 0.1) friction = 0.1; if (friction < 0.1) friction = 0.1;
if (friction > 1.0) friction = 1.0; if (friction > 1.0) friction = 1.0;
@ -1907,13 +1909,13 @@ elm_scroll_thumbscroll_sensitivity_friction_set(double friction)
} }
EAPI void EAPI void
elm_longpress_timeout_set(double longpress_timeout) elm_config_longpress_timeout_set(double longpress_timeout)
{ {
_elm_config->longpress_timeout = longpress_timeout; _elm_config->longpress_timeout = longpress_timeout;
} }
EAPI double EAPI double
elm_longpress_timeout_get(void) elm_config_longpress_timeout_get(void)
{ {
return _elm_config->longpress_timeout; return _elm_config->longpress_timeout;
} }
@ -2056,15 +2058,21 @@ _elm_config_engine_set(const char *engine)
} }
EAPI const char * EAPI const char *
elm_preferred_engine_get(void) elm_config_preferred_engine_get(void)
{ {
return _elm_preferred_engine; return _elm_preferred_engine;
} }
EAPI void EAPI void
elm_preferred_engine_set(const char *engine) elm_config_preferred_engine_set(const char *engine)
{ {
eina_stringshare_replace(&(_elm_preferred_engine), engine); if (engine)
eina_stringshare_replace(&(_elm_preferred_engine), engine);
else
{
if (_elm_preferred_engine) eina_stringshare_del(_elm_preferred_engine);
_elm_preferred_engine = eina_stringshare_add(_elm_config->engine);
}
} }
void void

230
legacy/elementary/src/lib/elm_config.h
View File

@ -43,34 +43,8 @@ EAPI void elm_config_reload(void);
/** /**
* Flush all config settings then apply those settings to all applications * Flush all config settings then apply those settings to all applications
* using elementary on the current display. * using elementary on the current display.
* Following functions will update the config settings
* @li elm_cache_flush_interval_set()
* @li elm_cache_flush_enabled_set()
* @li elm_edje_file_cache_set()
* @li elm_edje_collection_cache_set()
* @li elm_finger_size_set()
* @li elm_focus_highlight_enabled_set()
* @li elm_focus_highlight_animate_set()
* @li elm_font_overlay_set()
* @li elm_font_cache_set()
* @li elm_image_cache_set()
* @li elm_profile_set()
* @li elm_scale_set()
* @li elm_scroll_bounce_enabled_set()
* @li elm_scroll_bounce_friction_set()
* @li elm_scroll_page_scroll_friction_set()
* @li elm_scroll_bring_in_scroll_friction_set()
* @li elm_scroll_zoom_friction_set()
* @li elm_scroll_thumbscroll_enabled_set()
* @li elm_scroll_thumbscroll_threshold_set()
* @li elm_scroll_thumbscroll_momentum_threshold_set()
* @li elm_scroll_thumbscroll_friction_set()
* @li elm_scroll_thumbscroll_border_friction_set()
* @li elm_scroll_thumbscroll_sensitivity_friction_set()
* @li elm_theme_set()
* *
* @ingroup Config * @ingroup Config
*
*/ */
EAPI void elm_config_all_flush(void); EAPI void elm_config_all_flush(void);
@ -100,7 +74,7 @@ EAPI void elm_config_all_flush(void);
* @return The profile's name * @return The profile's name
* @ingroup Profile * @ingroup Profile
*/ */
EAPI const char *elm_profile_current_get(void); EAPI const char *elm_config_profile_get(void);
/** /**
* Get an Elementary's profile directory path in the filesystem. One * Get an Elementary's profile directory path in the filesystem. One
@ -113,19 +87,19 @@ EAPI const char *elm_profile_current_get(void);
* @return The profile's directory path. * @return The profile's directory path.
* @ingroup Profile * @ingroup Profile
* *
* @note You must free it with elm_profile_dir_free(). * @note You must free it with elm_config_profile_dir_free().
*/ */
EAPI const char *elm_profile_dir_get(const char *profile, Eina_Bool is_user); EAPI const char *elm_config_profile_dir_get(const char *profile, Eina_Bool is_user);
/** /**
* Free an Elementary's profile directory path, as returned by * Free an Elementary's profile directory path, as returned by
* elm_profile_dir_get(). * elm_config_profile_dir_get().
* *
* @param p_dir The profile's path * @param p_dir The profile's path
* @ingroup Profile * @ingroup Profile
* *
*/ */
EAPI void elm_profile_dir_free(const char *p_dir); EAPI void elm_config_profile_dir_free(const char *p_dir);
/** /**
* Get Elementary's list of available profiles. * Get Elementary's list of available profiles.
@ -135,18 +109,18 @@ EAPI void elm_profile_dir_free(const char *p_dir);
* @ingroup Profile * @ingroup Profile
* *
* @note One must free this list, after usage, with the function * @note One must free this list, after usage, with the function
* elm_profile_list_free(). * elm_config_profile_list_free().
*/ */
EAPI Eina_List *elm_profile_list_get(void); EAPI Eina_List *elm_config_profile_list_get(void);
/** /**
* Free Elementary's list of available profiles. * Free Elementary's list of available profiles.
* *
* @param l The profiles list, as returned by elm_profile_list_get(). * @param l The profiles list, as returned by elm_config_profile_list_get().
* @ingroup Profile * @ingroup Profile
* *
*/ */
EAPI void elm_profile_list_free(Eina_List *l); EAPI void elm_config_profile_list_free(Eina_List *l);
/** /**
* Set Elementary's profile. * Set Elementary's profile.
@ -159,7 +133,7 @@ EAPI void elm_profile_list_free(Eina_List *l);
* @ingroup Profile * @ingroup Profile
* *
*/ */
EAPI void elm_profile_set(const char *profile); EAPI void elm_config_profile_set(const char *profile);
/** /**
* @} * @}
@ -183,7 +157,7 @@ EAPI void elm_profile_set(const char *profile);
* This is the default behavior for touch screens, in general. * This is the default behavior for touch screens, in general.
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI Eina_Bool elm_scroll_bounce_enabled_get(void); EAPI Eina_Bool elm_config_scroll_bounce_enabled_get(void);
/** /**
* Set whether scrollers should bounce when they reach their * Set whether scrollers should bounce when they reach their
@ -191,10 +165,10 @@ EAPI Eina_Bool elm_scroll_bounce_enabled_get(void);
* *
* @param enabled the thumb scroll bouncing state * @param enabled the thumb scroll bouncing state
* *
* @see elm_thumbscroll_bounce_enabled_get() * @see elm_config_scroll_bounce_enabled_get()
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI void elm_scroll_bounce_enabled_set(Eina_Bool enabled); EAPI void elm_config_scroll_bounce_enabled_set(Eina_Bool enabled);
/** /**
* Get the amount of inertia a scroller will impose at bounce * Get the amount of inertia a scroller will impose at bounce
@ -204,7 +178,7 @@ EAPI void elm_scroll_bounce_enabled_set(Eina_Bool enabled);
* *
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI double elm_scroll_bounce_friction_get(void); EAPI double elm_config_scroll_bounce_friction_get(void);
/** /**
* Set the amount of inertia a scroller will impose at bounce * Set the amount of inertia a scroller will impose at bounce
@ -212,10 +186,10 @@ EAPI double elm_scroll_bounce_friction_get(void);
* *
* @param friction the thumb scroll bounce friction * @param friction the thumb scroll bounce friction
* *
* @see elm_thumbscroll_bounce_friction_get() * @see elm_config_scroll_bounce_friction_get()
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI void elm_scroll_bounce_friction_set(double friction); EAPI void elm_config_scroll_bounce_friction_set(double friction);
/** /**
* Get the amount of inertia a <b>paged</b> scroller will impose at * Get the amount of inertia a <b>paged</b> scroller will impose at
@ -225,7 +199,7 @@ EAPI void elm_scroll_bounce_friction_set(double friction);
* *
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI double elm_scroll_page_scroll_friction_get(void); EAPI double elm_config_scroll_page_scroll_friction_get(void);
/** /**
* Set the amount of inertia a <b>paged</b> scroller will impose at * Set the amount of inertia a <b>paged</b> scroller will impose at
@ -233,10 +207,10 @@ EAPI double elm_scroll_page_scroll_friction_get(void);
* *
* @param friction the page scroll friction * @param friction the page scroll friction
* *
* @see elm_thumbscroll_page_scroll_friction_get() * @see elm_config_scroll_page_scroll_friction_get()
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI void elm_scroll_page_scroll_friction_set(double friction); EAPI void elm_config_scroll_page_scroll_friction_set(double friction);
/** /**
* Get the amount of inertia a scroller will impose at region bring * Get the amount of inertia a scroller will impose at region bring
@ -246,7 +220,7 @@ EAPI void elm_scroll_page_scroll_friction_set(double friction);
* *
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI double elm_scroll_bring_in_scroll_friction_get(void); EAPI double elm_config_scroll_bring_in_scroll_friction_get(void);
/** /**
* Set the amount of inertia a scroller will impose at region bring * Set the amount of inertia a scroller will impose at region bring
@ -254,10 +228,10 @@ EAPI double elm_scroll_bring_in_scroll_friction_get(void);
* *
* @param friction the bring in scroll friction * @param friction the bring in scroll friction
* *
* @see elm_thumbscroll_bring_in_scroll_friction_get() * @see elm_config_scroll_bring_in_scroll_friction_get()
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI void elm_scroll_bring_in_scroll_friction_set(double friction); EAPI void elm_config_scroll_bring_in_scroll_friction_set(double friction);
/** /**
* Get the amount of inertia scrollers will impose at animations * Get the amount of inertia scrollers will impose at animations
@ -267,7 +241,7 @@ EAPI void elm_scroll_bring_in_scroll_friction_set(double friction);
* *
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI double elm_scroll_zoom_friction_get(void); EAPI double elm_config_scroll_zoom_friction_get(void);
/** /**
* Set the amount of inertia scrollers will impose at animations * Set the amount of inertia scrollers will impose at animations
@ -275,10 +249,10 @@ EAPI double elm_scroll_zoom_friction_get(void);
* *
* @param friction the zoom friction * @param friction the zoom friction
* *
* @see elm_thumbscroll_zoom_friction_get() * @see elm_config_scroll_zoom_friction_get()
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI void elm_scroll_zoom_friction_set(double friction); EAPI void elm_config_scroll_zoom_friction_set(double friction);
/** /**
* Get whether scrollers should be draggable from any point in their * Get whether scrollers should be draggable from any point in their
@ -292,7 +266,7 @@ EAPI void elm_scroll_zoom_friction_set(double friction);
* *
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI Eina_Bool elm_scroll_thumbscroll_enabled_get(void); EAPI Eina_Bool elm_config_scroll_thumbscroll_enabled_get(void);
/** /**
* Set whether scrollers should be draggable from any point in their * Set whether scrollers should be draggable from any point in their
@ -300,10 +274,10 @@ EAPI Eina_Bool elm_scroll_thumbscroll_enabled_get(void);
* *
* @param enabled the thumb scroll state * @param enabled the thumb scroll state
* *
* @see elm_thumbscroll_enabled_get() * @see elm_config_scroll_thumbscroll_enabled_get()
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI void elm_scroll_thumbscroll_enabled_set(Eina_Bool enabled); EAPI void elm_config_scroll_thumbscroll_enabled_set(Eina_Bool enabled);
/** /**
* Get the number of pixels one should travel while dragging a * Get the number of pixels one should travel while dragging a
@ -315,7 +289,7 @@ EAPI void elm_scroll_thumbscroll_enabled_set(Eina_Bool enabled);
* of their inherent imprecision. * of their inherent imprecision.
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI unsigned int elm_scroll_thumbscroll_threshold_get(void); EAPI unsigned int elm_config_scroll_thumbscroll_threshold_get(void);
/** /**
* Set the number of pixels one should travel while dragging a * Set the number of pixels one should travel while dragging a
@ -323,10 +297,10 @@ EAPI unsigned int elm_scroll_thumbscroll_threshold_get(void);
* *
* @param threshold the thumb scroll threshold * @param threshold the thumb scroll threshold
* *
* @see elm_thumbscroll_threshold_get() * @see elm_config_thumbscroll_threshold_get()
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI void elm_scroll_thumbscroll_threshold_set(unsigned int threshold); EAPI void elm_config_scroll_thumbscroll_threshold_set(unsigned int threshold);
/** /**
* Get the minimum speed of mouse cursor movement which will trigger * Get the minimum speed of mouse cursor movement which will trigger
@ -337,7 +311,7 @@ EAPI void elm_scroll_thumbscroll_threshold_set(unsigned int threshold);
* *
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI double elm_scroll_thumbscroll_momentum_threshold_get(void); EAPI double elm_config_scroll_thumbscroll_momentum_threshold_get(void);
/** /**
* Set the minimum speed of mouse cursor movement which will trigger * Set the minimum speed of mouse cursor movement which will trigger
@ -346,10 +320,10 @@ EAPI double elm_scroll_thumbscroll_momentum_threshold_get(void);
* *
* @param threshold the thumb scroll momentum threshold * @param threshold the thumb scroll momentum threshold
* *
* @see elm_thumbscroll_momentum_threshold_get() * @see elm_config_thumbscroll_momentum_threshold_get()
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI void elm_scroll_thumbscroll_momentum_threshold_set(double threshold); EAPI void elm_config_scroll_thumbscroll_momentum_threshold_set(double threshold);
/** /**
* Get the amount of inertia a scroller will impose at self scrolling * Get the amount of inertia a scroller will impose at self scrolling
@ -359,7 +333,7 @@ EAPI void elm_scroll_thumbscroll_momentum_threshold_set(double threshold
* *
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI double elm_scroll_thumbscroll_friction_get(void); EAPI double elm_config_scroll_thumbscroll_friction_get(void);
/** /**
* Set the amount of inertia a scroller will impose at self scrolling * Set the amount of inertia a scroller will impose at self scrolling
@ -367,10 +341,10 @@ EAPI double elm_scroll_thumbscroll_friction_get(void);
* *
* @param friction the thumb scroll friction * @param friction the thumb scroll friction
* *
* @see elm_thumbscroll_friction_get() * @see elm_config_thumbscroll_friction_get()
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI void elm_scroll_thumbscroll_friction_set(double friction); EAPI void elm_config_scroll_thumbscroll_friction_set(double friction);
/** /**
* Get the amount of lag between your actual mouse cursor dragging * Get the amount of lag between your actual mouse cursor dragging
@ -381,7 +355,7 @@ EAPI void elm_scroll_thumbscroll_friction_set(double friction);
* *
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI double elm_scroll_thumbscroll_border_friction_get(void); EAPI double elm_config_scroll_thumbscroll_border_friction_get(void);
/** /**
* Set the amount of lag between your actual mouse cursor dragging * Set the amount of lag between your actual mouse cursor dragging
@ -392,12 +366,12 @@ EAPI double elm_scroll_thumbscroll_border_friction_get(void);
* perfect synchrony between two movements, @c 1.0 for maximum * perfect synchrony between two movements, @c 1.0 for maximum
* lag. * lag.
* *
* @see elm_thumbscroll_border_friction_get() * @see elm_config_thumbscroll_border_friction_get()
* @note parameter value will get bound to 0.0 - 1.0 interval, always * @note parameter value will get bound to 0.0 - 1.0 interval, always
* *
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI void elm_scroll_thumbscroll_border_friction_set(double friction); EAPI void elm_config_scroll_thumbscroll_border_friction_set(double friction);
/** /**
* Get the sensitivity amount which is be multiplied by the length of * Get the sensitivity amount which is be multiplied by the length of
@ -407,7 +381,7 @@ EAPI void elm_scroll_thumbscroll_border_friction_set(double friction);
* *
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI double elm_scroll_thumbscroll_sensitivity_friction_get(void); EAPI double elm_config_scroll_thumbscroll_sensitivity_friction_get(void);
/** /**
* Set the sensitivity amount which is be multiplied by the length of * Set the sensitivity amount which is be multiplied by the length of
@ -417,12 +391,12 @@ EAPI double elm_scroll_thumbscroll_sensitivity_friction_get(void);
* minimum sensitivity, @c 1.0 for maximum sensitivity. 0.25 * minimum sensitivity, @c 1.0 for maximum sensitivity. 0.25
* is proper. * is proper.
* *
* @see elm_thumbscroll_sensitivity_friction_get() * @see elm_config_thumbscroll_sensitivity_friction_get()
* @note parameter value will get bound to 0.1 - 1.0 interval, always * @note parameter value will get bound to 0.1 - 1.0 interval, always
* *
* @ingroup Scrolling * @ingroup Scrolling
*/ */
EAPI void elm_scroll_thumbscroll_sensitivity_friction_set(double friction); EAPI void elm_config_scroll_thumbscroll_sensitivity_friction_set(double friction);
/** /**
* @} * @}
@ -434,7 +408,7 @@ EAPI void elm_scroll_thumbscroll_sensitivity_friction_set(double frictio
* @return Timeout for long press event * @return Timeout for long press event
* @ingroup Longpress * @ingroup Longpress
*/ */
EAPI double elm_longpress_timeout_get(void); EAPI double elm_config_longpress_timeout_get(void);
/** /**
* Set the duration for occurring long press event. * Set the duration for occurring long press event.
@ -442,7 +416,7 @@ EAPI double elm_longpress_timeout_get(void);
* @param lonpress_timeout Timeout for long press event * @param lonpress_timeout Timeout for long press event
* @ingroup Longpress * @ingroup Longpress
*/ */
EAPI void elm_longpress_timeout_set(double longpress_timeout); EAPI void elm_config_longpress_timeout_set(double longpress_timeout);
/** /**
* Get the duration after which tooltip will be shown. * Get the duration after which tooltip will be shown.
@ -466,7 +440,7 @@ EAPI void elm_config_tooltip_delay_set(double delay);
* @return 1 if only engine cursors should be used * @return 1 if only engine cursors should be used
* @ingroup Cursors * @ingroup Cursors
*/ */
EAPI Eina_Bool elm_cursor_engine_only_get(void); EAPI Eina_Bool elm_config_cursor_engine_only_get(void);
/** /**
* Set the configured cursor engine only usage * Set the configured cursor engine only usage
@ -478,7 +452,7 @@ EAPI Eina_Bool elm_cursor_engine_only_get(void);
* look for them on theme before. * look for them on theme before.
* @ingroup Cursors * @ingroup Cursors
*/ */
EAPI void elm_cursor_engine_only_set(Eina_Bool engine_only); EAPI void elm_config_cursor_engine_only_set(Eina_Bool engine_only);
/** /**
* Get the global scaling factor * Get the global scaling factor
@ -489,7 +463,7 @@ EAPI void elm_cursor_engine_only_set(Eina_Bool engine_only);
* @return The scaling factor * @return The scaling factor
* @ingroup Scaling * @ingroup Scaling
*/ */
EAPI double elm_scale_get(void); EAPI double elm_config_scale_get(void);
/** /**
* Set the global scaling factor * Set the global scaling factor
@ -500,7 +474,7 @@ EAPI double elm_scale_get(void);
* @param scale The scaling factor to set * @param scale The scaling factor to set
* @ingroup Scaling * @ingroup Scaling
*/ */
EAPI void elm_scale_set(double scale); EAPI void elm_config_scale_set(double scale);
/** /**
* @defgroup Password_last_show Password show last * @defgroup Password_last_show Password show last
@ -525,7 +499,7 @@ EAPI void elm_scale_set(double scale);
* *
* @ingroup Password_last_show * @ingroup Password_last_show
*/ */
EAPI Eina_Bool elm_password_show_last_get(void); EAPI Eina_Bool elm_config_password_show_last_get(void);
/** /**
* Set show last setting in password mode. * Set show last setting in password mode.
@ -533,10 +507,10 @@ EAPI Eina_Bool elm_password_show_last_get(void);
* This enables or disables show last setting of password mode. * This enables or disables show last setting of password mode.
* *
* @param password_show_last If EINA_TRUE enables "show last" in password mode. * @param password_show_last If EINA_TRUE enables "show last" in password mode.
* @see elm_password_show_last_timeout_set() * @see elm_config_password_show_last_timeout_set()
* @ingroup Password_last_show * @ingroup Password_last_show
*/ */
EAPI void elm_password_show_last_set(Eina_Bool password_show_last); EAPI void elm_config_password_show_last_set(Eina_Bool password_show_last);
/** /**
* Gets the timeout value in "show last" password mode. * Gets the timeout value in "show last" password mode.
@ -547,7 +521,7 @@ EAPI void elm_password_show_last_set(Eina_Bool password_show_last);
* @return The timeout value of "show last" password mode. * @return The timeout value of "show last" password mode.
* @ingroup Password_last_show * @ingroup Password_last_show
*/ */
EAPI double elm_password_show_last_timeout_get(void); EAPI double elm_config_password_show_last_timeout_get(void);
/** /**
* Set's the timeout value in "show last" password mode. * Set's the timeout value in "show last" password mode.
@ -556,10 +530,10 @@ EAPI double elm_password_show_last_timeout_get(void);
* mode will be visible. * mode will be visible.
* *
* @param password_show_last_timeout The timeout value. * @param password_show_last_timeout The timeout value.
* @see elm_password_show_last_set() * @see elm_config_password_show_last_set()
* @ingroup Password_last_show * @ingroup Password_last_show
*/ */
EAPI void elm_password_show_last_timeout_set(double password_show_last_timeout); EAPI void elm_config_password_show_last_timeout_set(double password_show_last_timeout);
/** /**
* @} * @}
@ -601,9 +575,9 @@ EAPI void elm_password_show_last_timeout_set(double password_show_last_time
* This gets the global rendering engine that is applied to all Elementary * This gets the global rendering engine that is applied to all Elementary
* applications. * applications.
* *
* @see elm_engine_set() * @see elm_config_engine_set()
*/ */
EAPI const char *elm_engine_get(void); EAPI const char *elm_config_engine_get(void);
/** /**
* @brief Set Elementary's rendering engine for use. * @brief Set Elementary's rendering engine for use.
@ -615,7 +589,7 @@ EAPI const char *elm_engine_get(void);
* *
* @see elm_win_add() * @see elm_win_add()
*/ */
EAPI void elm_engine_set(const char *engine); EAPI void elm_config_engine_set(const char *engine);
/** /**
* @brief Get Elementary's preferred engine to use. * @brief Get Elementary's preferred engine to use.
@ -627,9 +601,9 @@ EAPI void elm_engine_set(const char *engine);
* applications and is PREFERRED by the application. This can (and will) * applications and is PREFERRED by the application. This can (and will)
* override the engine configured for all applications which. * override the engine configured for all applications which.
* *
* @see elm_preferred_engine_set() * @see elm_config_preferred_engine_set()
*/ */
EAPI const char *elm_preferred_engine_get(void); EAPI const char *elm_config_preferred_engine_get(void);
/** /**
* @brief Set Elementary's preferred rendering engine for use. * @brief Set Elementary's preferred rendering engine for use.
@ -642,7 +616,7 @@ EAPI const char *elm_preferred_engine_get(void);
* *
* @see elm_win_add() * @see elm_win_add()
*/ */
EAPI void elm_preferred_engine_set(const char *engine); EAPI void elm_config_preferred_engine_set(const char *engine);
typedef struct _Elm_Text_Class typedef struct _Elm_Text_Class
{ {
@ -665,20 +639,20 @@ typedef struct _Elm_Font_Overlay
* *
* Release the list with elm_text_classes_list_free(). * Release the list with elm_text_classes_list_free().
*/ */
EAPI Eina_List *elm_text_classes_list_get(void); EAPI Eina_List *elm_config_text_classes_list_get(void);
/** /**
* Free Elementary's list of supported text classes. * Free Elementary's list of supported text classes.
* *
* @ingroup Fonts * @ingroup Fonts
* *
* @see elm_text_classes_list_get(). * @see elm_config_text_classes_list_get().
*/ */
EAPI void elm_text_classes_list_free(Eina_List *list); EAPI void elm_config_text_classes_list_free(Eina_List *list);
/** /**
* Get Elementary's list of font overlays, set with * Get Elementary's list of font overlays, set with
* elm_font_overlay_set(). * elm_config_font_overlay_set().
* *
* @return The font overlays list, with @c Elm_Font_Overlay blobs as * @return The font overlays list, with @c Elm_Font_Overlay blobs as
* data. * data.
@ -689,9 +663,9 @@ EAPI void elm_text_classes_list_free(Eina_List *list);
* overriding the default font properties for that class coming from * overriding the default font properties for that class coming from
* the theme in use. There is no need to free this list. * the theme in use. There is no need to free this list.
* *
* @see elm_font_overlay_set() and elm_font_overlay_unset(). * @see elm_config_font_overlay_set() and elm_config_font_overlay_unset().
*/ */
EAPI const Eina_List *elm_font_overlay_list_get(void); EAPI const Eina_List *elm_config_font_overlay_list_get(void);
/** /**
* Set a font overlay for a given Elementary text class. * Set a font overlay for a given Elementary text class.
@ -703,10 +677,10 @@ EAPI const Eina_List *elm_font_overlay_list_get(void);
* @ingroup Fonts * @ingroup Fonts
* *
* @p font has to be in the format returned by * @p font has to be in the format returned by
* elm_font_fontconfig_name_get(). @see elm_font_overlay_list_get() * elm_font_fontconfig_name_get(). @see elm_config_font_overlay_list_get()
* and elm_font_overlay_unset(). * and elm_config_font_overlay_unset().
*/ */
EAPI void elm_font_overlay_set(const char *text_class, const char *font, Evas_Font_Size size); EAPI void elm_config_font_overlay_set(const char *text_class, const char *font, Evas_Font_Size size);
/** /**
* Unset a font overlay for a given Elementary text class. * Unset a font overlay for a given Elementary text class.
@ -718,17 +692,17 @@ EAPI void elm_font_overlay_set(const char *text_class, const char *f
* This will bring back text elements belonging to text class * This will bring back text elements belonging to text class
* @p text_class back to their default font settings. * @p text_class back to their default font settings.
*/ */
EAPI void elm_font_overlay_unset(const char *text_class); EAPI void elm_config_font_overlay_unset(const char *text_class);
/** /**
* Apply the changes made with elm_font_overlay_set() and * Apply the changes made with elm_config_font_overlay_set() and
* elm_font_overlay_unset() on the current Elementary window. * elm_config_font_overlay_unset() on the current Elementary window.
* *
* @ingroup Fonts * @ingroup Fonts
* *
* This applies all font overlays set to all objects in the UI. * This applies all font overlays set to all objects in the UI.
*/ */
EAPI void elm_font_overlay_apply(void); EAPI void elm_config_font_overlay_apply(void);
/** /**
* Get the configured "finger size" * Get the configured "finger size"
@ -739,7 +713,7 @@ EAPI void elm_font_overlay_apply(void);
* *
* @ingroup Fingers * @ingroup Fingers
*/ */
EAPI Evas_Coord elm_finger_size_get(void); EAPI Evas_Coord elm_config_finger_size_get(void);
/** /**
* Set the configured finger size * Set the configured finger size
@ -749,7 +723,7 @@ EAPI Evas_Coord elm_finger_size_get(void);
* @param size The finger size * @param size The finger size
* @ingroup Fingers * @ingroup Fingers
*/ */
EAPI void elm_finger_size_set(Evas_Coord size); EAPI void elm_config_finger_size_set(Evas_Coord size);
/** /**
@ -763,7 +737,7 @@ EAPI void elm_finger_size_set(Evas_Coord size);
* *
* @see elm_cache_all_flush() * @see elm_cache_all_flush()
*/ */
EAPI int elm_cache_flush_interval_get(void); EAPI int elm_config_cache_flush_interval_get(void);
/** /**
* Set the configured cache flush interval time * Set the configured cache flush interval time
@ -775,14 +749,14 @@ EAPI int elm_cache_flush_interval_get(void);
* *
* @see elm_cache_all_flush() * @see elm_cache_all_flush()
*/ */
EAPI void elm_cache_flush_interval_set(int size); EAPI void elm_config_cache_flush_interval_set(int size);
/** /**
* Get the configured cache flush enabled state * Get the configured cache flush enabled state
* *
* This gets the globally configured cache flush state - if it is enabled * This gets the globally configured cache flush state - if it is enabled
* or not. When cache flushing is enabled, elementary will regularly * or not. When cache flushing is enabled, elementary will regularly
* (see elm_cache_flush_interval_get() ) flush caches and dump data out of * (see elm_config_cache_flush_interval_get() ) flush caches and dump data out of
* memory and allow usage to re-seed caches and data in memory where it * memory and allow usage to re-seed caches and data in memory where it
* can do so. An idle application will thus minimize its memory usage as * can do so. An idle application will thus minimize its memory usage as
* data will be freed from memory and not be re-loaded as it is idle and * data will be freed from memory and not be re-loaded as it is idle and
@ -793,7 +767,7 @@ EAPI void elm_cache_flush_interval_set(int size);
* *
* @see elm_cache_all_flush() * @see elm_cache_all_flush()
*/ */
EAPI Eina_Bool elm_cache_flush_enabled_get(void); EAPI Eina_Bool elm_config_cache_flush_enabled_get(void);
/** /**
* Set the configured cache flush enabled state * Set the configured cache flush enabled state
@ -805,7 +779,7 @@ EAPI Eina_Bool elm_cache_flush_enabled_get(void);
* *
* @see elm_cache_all_flush() * @see elm_cache_all_flush()
*/ */
EAPI void elm_cache_flush_enabled_set(Eina_Bool enabled); EAPI void elm_config_cache_flush_enabled_set(Eina_Bool enabled);
/** /**
* Get the configured font cache size * Get the configured font cache size
@ -815,7 +789,7 @@ EAPI void elm_cache_flush_enabled_set(Eina_Bool enabled);
* @return The font cache size * @return The font cache size
* @ingroup Caches * @ingroup Caches
*/ */
EAPI int elm_cache_font_cache_size_get(void); EAPI int elm_config_cache_font_cache_size_get(void);
/** /**
* Set the configured font cache size * Set the configured font cache size
@ -825,7 +799,7 @@ EAPI int elm_cache_font_cache_size_get(void);
* @param size The font cache size * @param size The font cache size
* @ingroup Caches * @ingroup Caches
*/ */
EAPI void elm_cache_font_cache_size_set(int size); EAPI void elm_config_cache_font_cache_size_set(int size);
/** /**
* Get the configured image cache size * Get the configured image cache size
@ -835,7 +809,7 @@ EAPI void elm_cache_font_cache_size_set(int size);
* @return The image cache size * @return The image cache size
* @ingroup Caches * @ingroup Caches
*/ */
EAPI int elm_cache_image_cache_size_get(void); EAPI int elm_config_cache_image_cache_size_get(void);
/** /**
* Set the configured image cache size * Set the configured image cache size
@ -845,7 +819,7 @@ EAPI int elm_cache_image_cache_size_get(void);
* @param size The image cache size * @param size The image cache size
* @ingroup Caches * @ingroup Caches
*/ */
EAPI void elm_cache_image_cache_size_set(int size); EAPI void elm_config_cache_image_cache_size_set(int size);
/** /**
@ -857,7 +831,7 @@ EAPI void elm_cache_image_cache_size_set(int size);
* @return The edje file cache size * @return The edje file cache size
* @ingroup Caches * @ingroup Caches
*/ */
EAPI int elm_cache_edje_file_cache_size_get(void); EAPI int elm_config_cache_edje_file_cache_size_get(void);
/** /**
* Set the configured edje file cache size * Set the configured edje file cache size
@ -868,7 +842,7 @@ EAPI int elm_cache_edje_file_cache_size_get(void);
* @param size The edje file cache size * @param size The edje file cache size
* @ingroup Caches * @ingroup Caches
*/ */
EAPI void elm_cache_edje_file_cache_size_set(int size); EAPI void elm_config_cache_edje_file_cache_size_set(int size);
/** /**
* Get the configured edje collections (groups) cache size. * Get the configured edje collections (groups) cache size.
@ -879,7 +853,7 @@ EAPI void elm_cache_edje_file_cache_size_set(int size);
* @return The edje collections cache size * @return The edje collections cache size
* @ingroup Caches * @ingroup Caches
*/ */
EAPI int elm_cache_edje_collection_cache_size_get(void); EAPI int elm_config_cache_edje_collection_cache_size_get(void);
/** /**
* Set the configured edje collections (groups) cache size * Set the configured edje collections (groups) cache size
@ -890,17 +864,17 @@ EAPI int elm_cache_edje_collection_cache_size_get(void);
* @param size The edje collections cache size * @param size The edje collections cache size
* @ingroup Caches * @ingroup Caches
*/ */
EAPI void elm_cache_edje_collection_cache_size_set(int size); EAPI void elm_config_cache_edje_collection_cache_size_set(int size);
/** /**
* Get the enable status of the focus highlight * Get the enable status of the focus highlight
* *
* This gets whether the highlight on focused objects is enabled or not * This gets whether the highlight on focused objects is enabled or not
* *
* @see elm_focus_highlight_enabled_set() * @see elm_config_focus_highlight_enabled_set()
* @ingroup Focus * @ingroup Focus
*/ */
EAPI Eina_Bool elm_focus_highlight_enabled_get(void); EAPI Eina_Bool elm_config_focus_highlight_enabled_get(void);
/** /**
* Set the enable status of the focus highlight * Set the enable status of the focus highlight
@ -916,7 +890,7 @@ EAPI Eina_Bool elm_focus_highlight_enabled_get(void);
* *
* @ingroup Focus * @ingroup Focus
*/ */
EAPI void elm_focus_highlight_enabled_set(Eina_Bool enable); EAPI void elm_config_focus_highlight_enabled_set(Eina_Bool enable);
/** /**
* Get the enable status of the highlight animation * Get the enable status of the highlight animation
@ -928,7 +902,7 @@ EAPI void elm_focus_highlight_enabled_set(Eina_Bool enable);
* *
* @ingroup Focus * @ingroup Focus
*/ */
EAPI Eina_Bool elm_focus_highlight_animate_get(void); EAPI Eina_Bool elm_config_focus_highlight_animate_get(void);
/** /**
* Set the enable status of the highlight animation * Set the enable status of the highlight animation
@ -945,7 +919,23 @@ EAPI Eina_Bool elm_focus_highlight_animate_get(void);
* *
* @ingroup Focus * @ingroup Focus
*/ */
EAPI void elm_focus_highlight_animate_set(Eina_Bool animate); EAPI void elm_config_focus_highlight_animate_set(Eina_Bool animate);
/**
* Get the system mirrored mode. This determines the default mirrored mode
* of widgets.
*
* @return EINA_TRUE if mirrored is set, EINA_FALSE otherwise
*/
EAPI Eina_Bool elm_config_mirrored_get(void);
/**
* Set the system mirrored mode. This determines the default mirrored mode
* of widgets.
*
* @param mirrored EINA_TRUE to set mirrored mode, EINA_FALSE to unset it.
*/
EAPI void elm_config_mirrored_set(Eina_Bool mirrored);
/** /**
* @} * @}

10
legacy/elementary/src/lib/elm_gesture_layer.c
View File

@ -588,7 +588,7 @@ _clear_if_finished(Evas_Object *obj)
static Eina_Bool static Eina_Bool
_inside(Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2) _inside(Evas_Coord x1, Evas_Coord y1, Evas_Coord x2, Evas_Coord y2)
{ {
int w = elm_finger_size_get() >> 1; /* Finger size devided by 2 */ int w = _elm_config->finger_size >> 1; /* Finger size devided by 2 */
if (x1 < (x2 - w)) if (x1 < (x2 - w))
return EINA_FALSE; return EINA_FALSE;
@ -2198,7 +2198,7 @@ _n_line_test(Evas_Object *obj, Pointer_Event *pe, void *event_info,
/* We report ABORT if lines length are NOT matching when fingers are up */ /* We report ABORT if lines length are NOT matching when fingers are up */
if ((longest_line_len - shortest_line_len) > (elm_finger_size_get()*2)) if ((longest_line_len - shortest_line_len) > (_elm_config->finger_size * 2))
{ {
ev_flag = _set_state(gesture, ELM_GESTURE_STATE_ABORT, &st->info, ev_flag = _set_state(gesture, ELM_GESTURE_STATE_ABORT, &st->info,
EINA_FALSE); EINA_FALSE);
@ -3524,9 +3524,9 @@ elm_gesture_layer_add(Evas_Object *parent)
elm_widget_disable_hook_set(obj, _disable_hook); elm_widget_disable_hook_set(obj, _disable_hook);
wd->target = NULL; wd->target = NULL;
wd->line_min_length =_elm_config->glayer_line_min_length * elm_finger_size_get(); wd->line_min_length =_elm_config->glayer_line_min_length * _elm_config->finger_size;
wd->zoom_distance_tolerance = _elm_config->glayer_zoom_distance_tolerance * elm_finger_size_get(); wd->zoom_distance_tolerance = _elm_config->glayer_zoom_distance_tolerance * _elm_config->finger_size;
wd->line_distance_tolerance = _elm_config->glayer_line_distance_tolerance * elm_finger_size_get(); wd->line_distance_tolerance = _elm_config->glayer_line_distance_tolerance * _elm_config->finger_size;
wd->zoom_finger_factor = _elm_config->glayer_zoom_finger_factor; wd->zoom_finger_factor = _elm_config->glayer_zoom_finger_factor;
wd->zoom_wheel_factor = _elm_config->glayer_zoom_wheel_factor; /* mouse wheel zoom steps */ wd->zoom_wheel_factor = _elm_config->glayer_zoom_wheel_factor; /* mouse wheel zoom steps */
wd->rotate_angular_tolerance = _elm_config->glayer_rotate_angular_tolerance; wd->rotate_angular_tolerance = _elm_config->glayer_rotate_angular_tolerance;

16
legacy/elementary/src/lib/elm_mirroring.h
View File

@ -12,22 +12,6 @@
* @{ * @{
*/ */
/**
* Get the system mirrored mode. This determines the default mirrored mode
* of widgets.
*
* @return EINA_TRUE if mirrored is set, EINA_FALSE otherwise
*/
EAPI Eina_Bool elm_mirrored_get(void);
/**
* Set the system mirrored mode. This determines the default mirrored mode
* of widgets.
*
* @param mirrored EINA_TRUE to set mirrored mode, EINA_FALSE to unset it.
*/
EAPI void elm_mirrored_set(Eina_Bool mirrored);
/** /**
* Get the widget's mirrored mode. * Get the widget's mirrored mode.
* *

6
legacy/elementary/src/lib/elm_widget.c
View File

@ -502,7 +502,7 @@ elm_widget_add(Evas *evas)
Evas_Object *obj; Evas_Object *obj;
_smart_init(); _smart_init();
obj = evas_object_smart_add(evas, _e_smart); obj = evas_object_smart_add(evas, _e_smart);
elm_widget_mirrored_set(obj, elm_mirrored_get()); elm_widget_mirrored_set(obj, elm_config_mirrored_get());
return obj; return obj;
} }
@ -776,7 +776,7 @@ void
_elm_widget_mirrored_reload(Evas_Object *obj) _elm_widget_mirrored_reload(Evas_Object *obj)
{ {
API_ENTRY return; API_ENTRY return;
Eina_Bool mirrored = elm_mirrored_get(); Eina_Bool mirrored = elm_config_mirrored_get();
if (elm_widget_mirrored_automatic_get(obj) && (sd->is_mirrored != mirrored)) if (elm_widget_mirrored_automatic_get(obj) && (sd->is_mirrored != mirrored))
{ {
sd->is_mirrored = mirrored; sd->is_mirrored = mirrored;
@ -815,7 +815,7 @@ elm_widget_mirrored_automatic_set(Evas_Object *obj,
if (automatic) if (automatic)
{ {
elm_widget_mirrored_set(obj, elm_mirrored_get()); elm_widget_mirrored_set(obj, elm_config_mirrored_get());
} }
} }
} }

2
legacy/elementary/src/lib/elm_win.c
View File

@ -1743,7 +1743,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
CRITICAL(engine " engine creation failed. Trying default."); \ CRITICAL(engine " engine creation failed. Trying default."); \
win->ee = ecore_evas_new(NULL, 0, 0, 1, 1, NULL); \ win->ee = ecore_evas_new(NULL, 0, 0, 1, 1, NULL); \
if (win->ee) \ if (win->ee) \
elm_engine_set(ecore_evas_engine_name_get(win->ee)); \ elm_config_preferred_engine_set(ecore_evas_engine_name_get(win->ee)); \
} while (0) } while (0)
#define ENGINE_COMPARE(name) (_elm_preferred_engine && !strcmp(_elm_preferred_engine, name)) #define ENGINE_COMPARE(name) (_elm_preferred_engine && !strcmp(_elm_preferred_engine, name))