dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
legacy/elementary/src/edje_externals/elm.c
View File

@ -23,8 +23,8 @@ external_common_params_parse_internal(size_t params_size, void *data, Evas_Objec
EINA_LIST_FOREACH(params, l, param)
{
if (!strcmp(param->name, "label"))
p->label = param->s;
if (!strcmp(param->name, "label"))
p->label = param->s;
}
return p;
}
@ -37,13 +37,13 @@ external_common_icon_param_parse(Evas_Object **icon, Evas_Object *obj, const Ein
p = edje_external_param_find(params, "icon");
if (p)
{
Evas_Object *parent = evas_object_smart_parent_get(obj);
const char *file;
edje_object_file_get(parent, &file, NULL);
*icon = elm_icon_add(parent);
Evas_Object *parent = evas_object_smart_parent_get(obj);
const char *file;
edje_object_file_get(parent, &file, NULL);
*icon = elm_icon_add(parent);
if (!elm_icon_file_set(*icon, file, p->s))
elm_icon_standard_set(*icon, p->s);
if (!elm_icon_file_set(*icon, file, p->s))
elm_icon_standard_set(*icon, p->s);
}
}

45
legacy/elementary/src/edje_externals/elm_radio.c
View File

@ -18,17 +18,17 @@ external_radio_state_set(void *data, Evas_Object *obj, const void *from_params,
if (!p2)
{
elm_radio_label_set(obj, p1->base.label);
elm_radio_icon_set(obj, p1->icon);
elm_radio_state_value_set(obj, p1->state);
if (p1->group_name)
{
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;
elm_radio_label_set(obj, p1->base.label);
elm_radio_icon_set(obj, p1->icon);
elm_radio_state_value_set(obj, p1->state);
if (p1->group_name)
{
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;
}
elm_radio_label_set(obj, p2->base.label);
@ -36,9 +36,9 @@ external_radio_state_set(void *data, Evas_Object *obj, const void *from_params,
elm_radio_state_value_set(obj, p2->state);
if (p2->group_name)
{
Evas_Object *ed = evas_object_smart_parent_get(obj);
Evas_Object *group = edje_object_part_swallow_get(ed, p2->group_name);
elm_radio_group_add(obj, group);
Evas_Object *ed = evas_object_smart_parent_get(obj);
Evas_Object *group = edje_object_part_swallow_get(ed, p2->group_name);
elm_radio_group_add(obj, group);
}
}
@ -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)
mem->group_name = eina_stringshare_add(param->s);
param = edje_external_param_find(params, "state");
if (param)
mem->state = param->i;
EINA_LIST_FOREACH(params, l, param)
{
if (!strcmp(param->name, "group"))
mem->group_name = eina_stringshare_add(param->s);
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
};

51
legacy/elementary/src/edje_externals/elm_slider.c
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)
mem->span = param->i;
param = edje_external_param_find(params, "min");
if (param)
mem->min = param->d;
param = edje_external_param_find(params, "max");
if (param)
mem->max = param->d;
param = edje_external_param_find(params, "value");
if (param)
mem->value = param->d;
param = edje_external_param_find(params, "inverted");
if (param)
mem->inverted = param->i;
param = edje_external_param_find(params, "horizontal");
if (param)
mem->horizontal = param->i;
param = edje_external_param_find(params, "unit format");
if (param)
mem->unit = eina_stringshare_add(param->s);
param = edje_external_param_find(params, "indicator format");
if (param)
mem->indicator = eina_stringshare_add(param->s);
EINA_LIST_FOREACH(params, l, param)
{
if (!strcmp(param->name, "span"))
mem->span = param->i;
else if (!strcmp(param->name, "min"))
mem->min = param->d;
else if (!strcmp(param->name, "max"))
mem->max = param->d;
else if (!strcmp(param->name, "value"))
mem->value = param->d;
else if (!strcmp(param->name, "inverted"))
mem->inverted = param->i;
else if (!strcmp(param->name, "horizontal"))
mem->horizontal = param->i;
else if (!strcmp(param->name, "unit format"))
mem->unit = eina_stringshare_add(param->s);
else if (!strcmp(param->name, "indicator format"))
mem->indicator = eina_stringshare_add(param->s);
}
return mem;
}

34
legacy/elementary/src/edje_externals/elm_toggle.c
View File

@ -1,6 +1,7 @@
#include "private.h"
#include <string.h>
#include "private.h"
typedef struct _Elm_Params_Toggle
{
Elm_Params base;
@ -19,11 +20,11 @@ external_toggle_state_set(void *data, Evas_Object *obj, const void *from_params,
if (!p2)
{
elm_toggle_label_set(obj, p1->base.label);
elm_toggle_icon_set(obj, p1->icon);
elm_toggle_states_labels_set(obj, p1->st_label_from, p1->st_label_to);
elm_toggle_state_set(obj, p1->state);
return;
elm_toggle_label_set(obj, p1->base.label);
elm_toggle_icon_set(obj, p1->icon);
elm_toggle_states_labels_set(obj, p1->st_label_from, p1->st_label_to);
elm_toggle_state_set(obj, p1->state);
return;
}
elm_toggle_label_set(obj, p2->base.label);
@ -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)
mem->state = param->i;
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, "label off");
if (param)
mem->st_label_to = eina_stringshare_add(param->s);
EINA_LIST_FOREACH(params, l, param)
{
if (!strcmp(param->name, "state"))
mem->state = param->i;
else if (!strcmp(param->name, "label on"))
mem->st_label_from = eina_stringshare_add(param->s);
else if (!strcmp(param->name, "label off"))
mem->st_label_to = eina_stringshare_add(param->s);
}
return mem;
}