forked from enlightenment/efl
Rename some parametes, use defaults, use info
SVN revision: 44274
This commit is contained in:
parent
02cb10c6e5
commit
3d6a80c5f8
|
@ -60,6 +60,7 @@ external_check_params_free(void *params)
|
|||
static Edje_External_Param_Info external_check_params[] = {
|
||||
DEFINE_EXTERNAL_COMMON_PARAMS,
|
||||
EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_INT("state"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
|
||||
};
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@ external_radio_state_set(void *data, Evas_Object *obj, const void *from_params,
|
|||
{
|
||||
Evas_Object *ed = evas_object_smart_parent_get(obj);
|
||||
Evas_Object *group = edje_object_part_swallow_get(ed, p1->group_name);
|
||||
if (group)
|
||||
elm_radio_group_add(obj, group);
|
||||
}
|
||||
return;
|
||||
|
@ -53,7 +54,7 @@ external_radio_params_parse(void *data, Evas_Object *obj, const Eina_List *param
|
|||
|
||||
external_common_icon_param_parse(&mem->icon, obj, params);
|
||||
|
||||
param = edje_external_param_find(params, "param group");
|
||||
param = edje_external_param_find(params, "group");
|
||||
if (param)
|
||||
mem->group_name = eina_stringshare_add(param->s);
|
||||
|
||||
|
@ -79,6 +80,8 @@ external_radio_params_free(void *params)
|
|||
static Edje_External_Param_Info external_radio_params[] = {
|
||||
DEFINE_EXTERNAL_COMMON_PARAMS,
|
||||
EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_STRING("group"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_INT("state"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
|
||||
};
|
||||
|
||||
|
|
|
@ -77,11 +77,11 @@ external_slider_params_parse(void *data, Evas_Object *obj, const Eina_List *para
|
|||
if (param)
|
||||
mem->horizontal = param->i;
|
||||
|
||||
param = edje_external_param_find(params, "unit");
|
||||
param = edje_external_param_find(params, "unit format");
|
||||
if (param)
|
||||
mem->unit = eina_stringshare_add(param->s);
|
||||
|
||||
param = edje_external_param_find(params, "indicator");
|
||||
param = edje_external_param_find(params, "indicator format");
|
||||
if (param)
|
||||
mem->indicator = eina_stringshare_add(param->s);
|
||||
|
||||
|
@ -105,6 +105,14 @@ external_slider_params_free(void *params)
|
|||
static Edje_External_Param_Info external_slider_params[] = {
|
||||
DEFINE_EXTERNAL_COMMON_PARAMS,
|
||||
EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_DOUBLE("min"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_DOUBLE_DEFAULT("max", 10.0),
|
||||
EDJE_EXTERNAL_PARAM_INFO_DOUBLE("value"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_INT("horizontal"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_INT("inverted"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_INT("span"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("unit format", "%1.2f"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("indicator format", "%1.2f"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
|
||||
};
|
||||
|
||||
|
|
|
@ -48,11 +48,11 @@ external_toggle_params_parse(void *data, Evas_Object *obj, const Eina_List *para
|
|||
if (param)
|
||||
mem->state = param->i;
|
||||
|
||||
param = edje_external_param_find(params, "state label from");
|
||||
param = edje_external_param_find(params, "label on");
|
||||
if (param)
|
||||
mem->st_label_from = eina_stringshare_add(param->s);
|
||||
|
||||
param = edje_external_param_find(params, "state label to");
|
||||
param = edje_external_param_find(params, "label off");
|
||||
if (param)
|
||||
mem->st_label_to = eina_stringshare_add(param->s);
|
||||
|
||||
|
@ -76,6 +76,9 @@ external_toggle_params_free(void *params)
|
|||
static Edje_External_Param_Info external_toggle_params[] = {
|
||||
DEFINE_EXTERNAL_COMMON_PARAMS,
|
||||
EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("label on", "ON"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("label off", "OFF"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_INT("state"),
|
||||
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
|
||||
};
|
||||
|
||||
|
|
|
@ -71,4 +71,4 @@ DEFINE_EXTERNAL_TYPE(type_name, name)
|
|||
|
||||
|
||||
#define DEFINE_EXTERNAL_COMMON_PARAMS \
|
||||
EDJE_EXTERNAL_PARAM_INFO_STRING("label")
|
||||
EDJE_EXTERNAL_PARAM_INFO_STRING_DEFAULT("label", "label goes here")
|
||||
|
|
Loading…
Reference in New Issue