style, better parsing, some parameter names changed

SVN revision: 44302
This commit is contained in:
Iván Briano 2009-12-09 04:37:48 +00:00
parent 0c8c726601
commit bf5af093fa
4 changed files with 68 additions and 78 deletions

View File

@ -47,6 +47,7 @@ external_radio_params_parse(void *data, Evas_Object *obj, const Eina_List *param
{
Elm_Params_Radio *mem;
Edje_External_Param *param;
const Eina_List *l;
mem = external_common_params_parse(Elm_Params_Radio, data, obj, params);
if (!mem)
@ -54,13 +55,13 @@ 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, "group");
if (param)
EINA_LIST_FOREACH(params, l, param)
{
if (!strcmp(param->name, "group"))
mem->group_name = eina_stringshare_add(param->s);
param = edje_external_param_find(params, "state");
if (param)
else if (!strcmp(param->name, "value"))
mem->state = param->i;
}
return mem;
}
@ -81,7 +82,7 @@ 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_INT("value"),
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
};

View File

@ -47,6 +47,7 @@ external_slider_params_parse(void *data, Evas_Object *obj, const Eina_List *para
{
Elm_Params_Slider *mem;
Edje_External_Param *param;
const Eina_List *l;
mem = external_common_params_parse(Elm_Params_Slider, data, obj, params);
if (!mem)
@ -54,37 +55,25 @@ external_slider_params_parse(void *data, Evas_Object *obj, const Eina_List *para
external_common_icon_param_parse(&mem->icon, obj, params);
param = edje_external_param_find(params, "span");
if (param)
EINA_LIST_FOREACH(params, l, param)
{
if (!strcmp(param->name, "span"))
mem->span = param->i;
param = edje_external_param_find(params, "min");
if (param)
else if (!strcmp(param->name, "min"))
mem->min = param->d;
param = edje_external_param_find(params, "max");
if (param)
else if (!strcmp(param->name, "max"))
mem->max = param->d;
param = edje_external_param_find(params, "value");
if (param)
else if (!strcmp(param->name, "value"))
mem->value = param->d;
param = edje_external_param_find(params, "inverted");
if (param)
else if (!strcmp(param->name, "inverted"))
mem->inverted = param->i;
param = edje_external_param_find(params, "horizontal");
if (param)
else if (!strcmp(param->name, "horizontal"))
mem->horizontal = param->i;
param = edje_external_param_find(params, "unit format");
if (param)
else if (!strcmp(param->name, "unit format"))
mem->unit = eina_stringshare_add(param->s);
param = edje_external_param_find(params, "indicator format");
if (param)
else if (!strcmp(param->name, "indicator format"))
mem->indicator = eina_stringshare_add(param->s);
}
return mem;
}

View File

@ -1,6 +1,7 @@
#include "private.h"
#include <string.h>
#include "private.h"
typedef struct _Elm_Params_Toggle
{
Elm_Params base;
@ -37,6 +38,7 @@ external_toggle_params_parse(void *data, Evas_Object *obj, const Eina_List *para
{
Elm_Params_Toggle *mem;
Edje_External_Param *param;
const Eina_List *l;
mem = external_common_params_parse(Elm_Params_Toggle, data, obj, params);
if (!mem)
@ -44,17 +46,15 @@ external_toggle_params_parse(void *data, Evas_Object *obj, const Eina_List *para
external_common_icon_param_parse(&mem->icon, obj, params);
param = edje_external_param_find(params, "state");
if (param)
EINA_LIST_FOREACH(params, l, param)
{
if (!strcmp(param->name, "state"))
mem->state = param->i;
param = edje_external_param_find(params, "label on");
if (param)
else if (!strcmp(param->name, "label on"))
mem->st_label_from = eina_stringshare_add(param->s);
param = edje_external_param_find(params, "label off");
if (param)
else if (!strcmp(param->name, "label off"))
mem->st_label_to = eina_stringshare_add(param->s);
}
return mem;
}