forked from enlightenment/efl
parent
52ed887687
commit
5c081c834d
|
@ -940,7 +940,7 @@ _config_display_update(Evas_Object *win)
|
||||||
elm_slider_value_set(evas_object_data_get(win,
|
elm_slider_value_set(evas_object_data_get(win,
|
||||||
"edje_collection_cache_slider"),
|
"edje_collection_cache_slider"),
|
||||||
edje_col_c);
|
edje_col_c);
|
||||||
|
|
||||||
// elm_scroll_bounce_enabled_all_set(s_bounce);
|
// elm_scroll_bounce_enabled_all_set(s_bounce);
|
||||||
elm_check_state_set(evas_object_data_get(win, "scroll_bounce_check"),
|
elm_check_state_set(evas_object_data_get(win, "scroll_bounce_check"),
|
||||||
s_bounce);
|
s_bounce);
|
||||||
|
@ -3025,7 +3025,7 @@ status_win(void)
|
||||||
|
|
||||||
ecore_event_handler_add(ELM_EVENT_CONFIG_ALL_CHANGED, _config_all_changed,
|
ecore_event_handler_add(ELM_EVENT_CONFIG_ALL_CHANGED, _config_all_changed,
|
||||||
win);
|
win);
|
||||||
|
|
||||||
evas_object_smart_callback_add(win, "delete,request", config_exit, NULL);
|
evas_object_smart_callback_add(win, "delete,request", config_exit, NULL);
|
||||||
bg = elm_bg_add(win);
|
bg = elm_bg_add(win);
|
||||||
evas_object_size_hint_weight_set(bg, 1.0, 1.0);
|
evas_object_size_hint_weight_set(bg, 1.0, 1.0);
|
||||||
|
|
|
@ -795,7 +795,7 @@ _item_content_set(Elm_Naviframe_Item *navi_it, Evas_Object *content)
|
||||||
_item_sizing_eval(navi_it);
|
_item_sizing_eval(navi_it);
|
||||||
}
|
}
|
||||||
|
|
||||||
//FIXME: need to handle if this function is called while transition
|
//FIXME: need to handle if this function is called while transition
|
||||||
static void
|
static void
|
||||||
_item_style_set(Elm_Naviframe_Item *navi_it, const char *item_style)
|
_item_style_set(Elm_Naviframe_Item *navi_it, const char *item_style)
|
||||||
{
|
{
|
||||||
|
@ -1129,7 +1129,7 @@ elm_naviframe_item_style_set(Elm_Object_Item *it, const char *item_style)
|
||||||
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
|
ELM_OBJ_ITEM_CHECK_OR_RETURN(it);
|
||||||
Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
|
Elm_Naviframe_Item *navi_it = (Elm_Naviframe_Item *) it;
|
||||||
|
|
||||||
//Return if new style is exsiting one.
|
//Return if new style is exsiting one.
|
||||||
if (item_style)
|
if (item_style)
|
||||||
if (!strcmp(item_style, navi_it->style)) return;
|
if (!strcmp(item_style, navi_it->style)) return;
|
||||||
|
|
||||||
|
|
|
@ -316,7 +316,7 @@ _access_state_cb(void *data, Evas_Object *obj, Elm_Widget_Item *item __UNUSED__)
|
||||||
if (wd->ontext)
|
if (wd->ontext)
|
||||||
{
|
{
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "%s: %s", E_("State"), wd->ontext);
|
snprintf(buf, sizeof(buf), "%s: %s", E_("State"), wd->ontext);
|
||||||
return strdup(buf);
|
return strdup(buf);
|
||||||
}
|
}
|
||||||
|
@ -326,7 +326,7 @@ _access_state_cb(void *data, Evas_Object *obj, Elm_Widget_Item *item __UNUSED__)
|
||||||
if (wd->offtext)
|
if (wd->offtext)
|
||||||
{
|
{
|
||||||
char buf[1024];
|
char buf[1024];
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "%s: %s", E_("State"), wd->offtext);
|
snprintf(buf, sizeof(buf), "%s: %s", E_("State"), wd->offtext);
|
||||||
return strdup(buf);
|
return strdup(buf);
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,7 +101,7 @@ static Eina_Bool
|
||||||
_prop_all_update_cb(void *data __UNUSED__)
|
_prop_all_update_cb(void *data __UNUSED__)
|
||||||
{
|
{
|
||||||
_prop_config_set();
|
_prop_config_set();
|
||||||
ecore_x_window_prop_string_set(_root_1st, _atom[ATOM_E_PROFILE],
|
ecore_x_window_prop_string_set(_root_1st, _atom[ATOM_E_PROFILE],
|
||||||
_elm_profile);
|
_elm_profile);
|
||||||
_prop_all_update_timer = NULL;
|
_prop_all_update_timer = NULL;
|
||||||
return EINA_FALSE;
|
return EINA_FALSE;
|
||||||
|
@ -166,13 +166,13 @@ _prop_config_set(void)
|
||||||
{
|
{
|
||||||
unsigned char *config_data = NULL;
|
unsigned char *config_data = NULL;
|
||||||
int size = 0;
|
int size = 0;
|
||||||
|
|
||||||
config_data = eet_data_descriptor_encode(_config_edd, _elm_config, &size);
|
config_data = eet_data_descriptor_encode(_config_edd, _elm_config, &size);
|
||||||
if (config_data)
|
if (config_data)
|
||||||
{
|
{
|
||||||
Ecore_X_Atom atom;
|
Ecore_X_Atom atom;
|
||||||
char buf[512];
|
char buf[512];
|
||||||
|
|
||||||
snprintf(buf, sizeof(buf), "ELM_CONFIG_%s", _elm_profile);
|
snprintf(buf, sizeof(buf), "ELM_CONFIG_%s", _elm_profile);
|
||||||
atom = ecore_x_atom_get(buf);
|
atom = ecore_x_atom_get(buf);
|
||||||
_atom_config = atom;
|
_atom_config = atom;
|
||||||
|
@ -188,7 +188,7 @@ static Eina_Bool
|
||||||
_prop_change_delay_cb(void *data __UNUSED__)
|
_prop_change_delay_cb(void *data __UNUSED__)
|
||||||
{
|
{
|
||||||
char *s;
|
char *s;
|
||||||
|
|
||||||
s = ecore_x_window_prop_string_get(_root_1st, _atom[ATOM_E_PROFILE]);
|
s = ecore_x_window_prop_string_get(_root_1st, _atom[ATOM_E_PROFILE]);
|
||||||
if (s)
|
if (s)
|
||||||
{
|
{
|
||||||
|
@ -1514,9 +1514,9 @@ _elm_config_all_update(void)
|
||||||
if (_prop_all_update_timer) ecore_timer_del(_prop_all_update_timer);
|
if (_prop_all_update_timer) ecore_timer_del(_prop_all_update_timer);
|
||||||
_prop_all_update_timer = ecore_timer_add(0.1, _prop_all_update_cb, NULL);
|
_prop_all_update_timer = ecore_timer_add(0.1, _prop_all_update_cb, NULL);
|
||||||
_prop_config_set();
|
_prop_config_set();
|
||||||
ecore_x_window_prop_string_set(_root_1st, _atom[ATOM_E_PROFILE],
|
ecore_x_window_prop_string_set(_root_1st, _atom[ATOM_E_PROFILE],
|
||||||
_elm_profile);
|
_elm_profile);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -1557,7 +1557,7 @@ _elm_config_shutdown(void)
|
||||||
if (_prop_change_delay_timer) ecore_timer_del(_prop_change_delay_timer);
|
if (_prop_change_delay_timer) ecore_timer_del(_prop_change_delay_timer);
|
||||||
_prop_change_delay_timer = NULL;
|
_prop_change_delay_timer = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
|
#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
|
||||||
if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
|
if (ENGINE_COMPARE(ELM_SOFTWARE_X11) ||
|
||||||
ENGINE_COMPARE(ELM_SOFTWARE_16_X11) ||
|
ENGINE_COMPARE(ELM_SOFTWARE_16_X11) ||
|
||||||
|
|
|
@ -5,7 +5,7 @@ EAPI Evas_Object *
|
||||||
elm_toggle_add(Evas_Object *parent)
|
elm_toggle_add(Evas_Object *parent)
|
||||||
{
|
{
|
||||||
Evas_Object *obj;
|
Evas_Object *obj;
|
||||||
|
|
||||||
obj = elm_check_add(parent);
|
obj = elm_check_add(parent);
|
||||||
elm_object_style_set(obj, "toggle");
|
elm_object_style_set(obj, "toggle");
|
||||||
elm_check_states_labels_set(obj, E_("ON"), E_("OFF"));
|
elm_check_states_labels_set(obj, E_("ON"), E_("OFF"));
|
||||||
|
|
Loading…
Reference in New Issue