edje_externals: Fixed formatting before working on it.

devs/felipealmeida/promises
Daniel Juyung Seo 10 years ago
parent a3c5ee407f
commit 750cd95d10
  1. 64
      legacy/elementary/src/edje_externals/elm.c
  2. 18
      legacy/elementary/src/edje_externals/elm_actionslider.c
  3. 8
      legacy/elementary/src/edje_externals/elm_bg.c
  4. 109
      legacy/elementary/src/edje_externals/elm_bubble.c
  5. 155
      legacy/elementary/src/edje_externals/elm_button.c
  6. 8
      legacy/elementary/src/edje_externals/elm_calendar.c
  7. 96
      legacy/elementary/src/edje_externals/elm_check.c
  8. 244
      legacy/elementary/src/edje_externals/elm_clock.c
  9. 18
      legacy/elementary/src/edje_externals/elm_entry.c
  10. 157
      legacy/elementary/src/edje_externals/elm_fileselector.c
  11. 20
      legacy/elementary/src/edje_externals/elm_fileselector_button.c
  12. 19
      legacy/elementary/src/edje_externals/elm_fileselector_entry.c
  13. 16
      legacy/elementary/src/edje_externals/elm_frame.c
  14. 19
      legacy/elementary/src/edje_externals/elm_gengrid.c
  15. 294
      legacy/elementary/src/edje_externals/elm_genlist.c
  16. 108
      legacy/elementary/src/edje_externals/elm_hoversel.c
  17. 10
      legacy/elementary/src/edje_externals/elm_icon.c
  18. 18
      legacy/elementary/src/edje_externals/elm_index.c
  19. 52
      legacy/elementary/src/edje_externals/elm_label.c
  20. 28
      legacy/elementary/src/edje_externals/elm_list.c
  21. 146
      legacy/elementary/src/edje_externals/elm_map.c
  22. 25
      legacy/elementary/src/edje_externals/elm_multibuttonentry.c
  23. 8
      legacy/elementary/src/edje_externals/elm_naviframe.c
  24. 9
      legacy/elementary/src/edje_externals/elm_notify.c
  25. 3
      legacy/elementary/src/edje_externals/elm_panes.c
  26. 165
      legacy/elementary/src/edje_externals/elm_photocam.c
  27. 263
      legacy/elementary/src/edje_externals/elm_progressbar.c
  28. 135
      legacy/elementary/src/edje_externals/elm_radio.c
  29. 137
      legacy/elementary/src/edje_externals/elm_scroller.c
  30. 17
      legacy/elementary/src/edje_externals/elm_segment_control.c
  31. 344
      legacy/elementary/src/edje_externals/elm_slider.c
  32. 171
      legacy/elementary/src/edje_externals/elm_slideshow.c
  33. 243
      legacy/elementary/src/edje_externals/elm_spinner.c
  34. 78
      legacy/elementary/src/edje_externals/elm_thumb.c
  35. 27
      legacy/elementary/src/edje_externals/elm_toolbar.c
  36. 18
      legacy/elementary/src/edje_externals/elm_video.c
  37. 27
      legacy/elementary/src/edje_externals/elm_web.c

@ -32,7 +32,8 @@ external_elm_shutdown(void)
}
static void
_external_obj_del(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
_external_obj_del(void *data EINA_UNUSED, Evas *evas EINA_UNUSED,
Evas_Object *obj, void *event_info EINA_UNUSED)
{
evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
_external_obj_del);
@ -40,7 +41,8 @@ _external_obj_del(void *data EINA_UNUSED, Evas *evas EINA_UNUSED, Evas_Object *o
}
void
external_signal(void *data EINA_UNUSED, Evas_Object *obj, const char *sig, const char *source)
external_signal(void *data EINA_UNUSED, Evas_Object *obj, const char *sig,
const char *source)
{
char *_signal = strdup(sig);
char *p = _signal;
@ -90,14 +92,17 @@ typedef struct {
} Elm_External_Signals_Proxy_Context;
static void
_external_signal_proxy_free_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
_external_signal_proxy_free_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Elm_External_Signals_Proxy_Context *ctxt = data;
free(ctxt);
}
static void
_external_signal_proxy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
_external_signal_proxy_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Elm_External_Signals_Proxy_Context *ctxt = data;
// TODO: Is it worth to check Evas_Smart_Cb_Description and do something
@ -106,7 +111,8 @@ _external_signal_proxy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_
}
Eina_Bool
external_common_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
external_common_param_get(void *data EINA_UNUSED, const Evas_Object *obj,
Edje_External_Param *param)
{
if (!strcmp(param->name, "style"))
{
@ -128,7 +134,8 @@ external_common_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_E
}
Eina_Bool
external_common_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
external_common_param_set(void *data EINA_UNUSED, Evas_Object *obj,
const Edje_External_Param *param)
{
if (!strcmp(param->name, "style"))
{
@ -168,29 +175,31 @@ external_signals_proxy(Evas_Object *obj, Evas_Object *edje, const char *part_nam
for (; cls_count > 0; cls_count--, cls_descs++, ctxt++)
{
const Evas_Smart_Cb_Description *d = *cls_descs;
ctxt->emission = d->name;
ctxt->source = part_name;
ctxt->edje = edje;
evas_object_smart_callback_add
(obj, d->name, _external_signal_proxy_cb, ctxt);
const Evas_Smart_Cb_Description *d = *cls_descs;
ctxt->emission = d->name;
ctxt->source = part_name;
ctxt->edje = edje;
evas_object_smart_callback_add
(obj, d->name, _external_signal_proxy_cb, ctxt);
}
for (; inst_count > 0; inst_count--, inst_descs++, ctxt++)
{
const Evas_Smart_Cb_Description *d = *inst_descs;
ctxt->emission = d->name;
ctxt->source = part_name;
ctxt->edje = edje;
evas_object_smart_callback_add
(obj, d->name, _external_signal_proxy_cb, ctxt);
const Evas_Smart_Cb_Description *d = *inst_descs;
ctxt->emission = d->name;
ctxt->source = part_name;
ctxt->edje = edje;
evas_object_smart_callback_add
(obj, d->name, _external_signal_proxy_cb, ctxt);
}
evas_object_event_callback_add(obj, EVAS_CALLBACK_DEL,
_external_obj_del, NULL);
}
void
external_common_params_parse(void *mem, void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
external_common_params_parse(void *mem, void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
const Eina_List *params)
{
Elm_Params *p;
const Eina_List *l;
@ -210,7 +219,9 @@ external_common_params_parse(void *mem, void *data EINA_UNUSED, Evas_Object *obj
}
void
external_common_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
external_common_state_set(void *data EINA_UNUSED, Evas_Object *obj,
const void *from_params, const void *to_params,
float pos EINA_UNUSED)
{
const Elm_Params *p;
if (to_params) p = to_params;
@ -252,14 +263,16 @@ external_common_param_icon_get(Evas_Object *obj, const Edje_External_Param *p)
}
void
external_common_icon_param_parse(Evas_Object **icon, Evas_Object *obj, const Eina_List *params)
external_common_icon_param_parse(Evas_Object **icon, Evas_Object *obj,
const Eina_List *params)
{
Edje_External_Param *p = edje_external_param_find(params, "icon");
*icon = external_common_param_icon_get(obj, p);
}
Evas_Object *
external_common_param_edje_object_get(Evas_Object *obj, const Edje_External_Param *p)
external_common_param_edje_object_get(Evas_Object *obj,
const Edje_External_Param *p)
{
Evas_Object *edje, *parent_widget, *ret;
const char *file;
@ -299,16 +312,17 @@ external_common_params_free(void *params)
static Edje_External_Type_Info elm_external_types[] =
{
#define DEFINE_TYPE(type_name) \
{"elm/"#type_name, &external_##type_name##_type},
{ "elm/"#type_name, &external_##type_name##_type },
#include "modules.inc"
#undef DEFINE_TYPE
{NULL, NULL}
{ NULL, NULL }
};
static Eina_Bool
elm_mod_init(void)
{
_elm_ext_log_dom = eina_log_domain_register("elm-externals", EINA_COLOR_LIGHTBLUE);
_elm_ext_log_dom = eina_log_domain_register("elm-externals",
EINA_COLOR_LIGHTBLUE);
edje_external_type_array_register(elm_external_types);
return EINA_TRUE;
}

@ -7,7 +7,9 @@ typedef struct _Elm_Params_Actionslider
} Elm_Params_Actionslider;
static void
external_actionslider_state_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const void *from_params, const void *to_params, float pos EINA_UNUSED)
external_actionslider_state_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
const void *from_params, const void *to_params,
float pos EINA_UNUSED)
{
const Elm_Params_Actionslider *p;
@ -20,7 +22,8 @@ external_actionslider_state_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UN
}
static Eina_Bool
external_actionslider_param_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Edje_External_Param *param)
external_actionslider_param_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
const Edje_External_Param *param)
{
if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
&& (!strcmp(param->name, "label")))
@ -36,7 +39,8 @@ external_actionslider_param_set(void *data EINA_UNUSED, Evas_Object *obj EINA_UN
}
static Eina_Bool
external_actionslider_param_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED, Edje_External_Param *param)
external_actionslider_param_get(void *data EINA_UNUSED, const Evas_Object *obj EINA_UNUSED,
Edje_External_Param *param)
{
if ((param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
&& (!strcmp(param->name, "label")))
@ -52,7 +56,8 @@ external_actionslider_param_get(void *data EINA_UNUSED, const Evas_Object *obj E
}
static void *
external_actionslider_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
external_actionslider_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
const Eina_List *params)
{
Elm_Params_Actionslider *mem;
Edje_External_Param *param;
@ -90,11 +95,12 @@ external_actionslider_params_free(void *params)
free(mem);
}
static Edje_External_Param_Info external_actionslider_params[] = {
static Edje_External_Param_Info external_actionslider_params[] =
{
DEFINE_EXTERNAL_COMMON_PARAMS,
EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
};
DEFINE_EXTERNAL_ICON_ADD(actionslider, "actionslider")
DEFINE_EXTERNAL_ICON_ADD(actionslider, "actionslider");
DEFINE_EXTERNAL_TYPE_SIMPLE(actionslider, "Actionslider");

@ -14,7 +14,10 @@ typedef struct _Elm_Params_Bg
if (!strcmp(STR, CHOICES[i])) \
return i;
static const char *_bg_options[] = {"center", "scale", "stretch", "tile", NULL};
static const char *_bg_options[] =
{
"center", "scale", "stretch", "tile", NULL
};
static Elm_Bg_Option
_bg_option_get(const char *option)
@ -144,7 +147,8 @@ external_bg_params_free(void *params)
free(mem);
}
static Edje_External_Param_Info external_bg_params[] = {
static Edje_External_Param_Info external_bg_params[] =
{
DEFINE_EXTERNAL_COMMON_PARAMS,
EDJE_EXTERNAL_PARAM_INFO_STRING("file"),
EDJE_EXTERNAL_PARAM_INFO_STRING("option"),

@ -10,7 +10,9 @@ typedef struct _Elm_Params_Bubble
} Elm_Params_Bubble;
static void
external_bubble_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
external_bubble_state_set(void *data EINA_UNUSED, Evas_Object *obj,
const void *from_params, const void *to_params,
float pos EINA_UNUSED)
{
const Elm_Params_Bubble *p;
@ -26,44 +28,45 @@ external_bubble_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *
}
static Eina_Bool
external_bubble_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
external_bubble_param_set(void *data EINA_UNUSED, Evas_Object *obj,
const Edje_External_Param *param)
{
if (!strcmp(param->name, "label"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
elm_object_text_set(obj, param->s);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
elm_object_text_set(obj, param->s);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "icon"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
Evas_Object *icon = external_common_param_icon_get(obj, param);
if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
Evas_Object *icon = external_common_param_icon_get(obj, param);
if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "info"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
elm_object_part_text_set(obj, "info", param->s);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
elm_object_part_text_set(obj, "info", param->s);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "content"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
Evas_Object *content = \
external_common_param_edje_object_get(obj, param);
if ((strcmp(param->s, "")) && (!content)) return EINA_FALSE;
elm_object_content_set(obj, content);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
Evas_Object *content = \
external_common_param_edje_object_get(obj, param);
if ((strcmp(param->s, "")) && (!content)) return EINA_FALSE;
elm_object_content_set(obj, content);
return EINA_TRUE;
}
}
ERR("unknown parameter '%s' of type '%s'",
@ -73,33 +76,34 @@ external_bubble_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_E
}
static Eina_Bool
external_bubble_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
external_bubble_param_get(void *data EINA_UNUSED, const Evas_Object *obj,
Edje_External_Param *param)
{
if (!strcmp(param->name, "label"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
param->s = elm_object_text_get(obj);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
param->s = elm_object_text_get(obj);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "icon"))
{
/* not easy to get icon name back from live object */
return EINA_FALSE;
/* not easy to get icon name back from live object */
return EINA_FALSE;
}
else if (!strcmp(param->name, "info"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
param->s = elm_object_part_text_get(obj, "info");
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
param->s = elm_object_part_text_get(obj, "info");
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "content"))
{
/* not easy to get content name back from live object */
return EINA_FALSE;
/* not easy to get content name back from live object */
return EINA_FALSE;
}
ERR("unknown parameter '%s' of type '%s'",
@ -109,7 +113,8 @@ external_bubble_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_E
}
static void *
external_bubble_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
external_bubble_params_parse(void *data EINA_UNUSED, Evas_Object *obj,
const Eina_List *params)
{
Elm_Params_Bubble *mem;
Edje_External_Param *param;
@ -123,19 +128,20 @@ external_bubble_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Ein
EINA_LIST_FOREACH(params, l, param)
{
if (!strcmp(param->name, "info"))
mem->info = eina_stringshare_add(param->s);
else if (!strcmp(param->name, "content"))
mem->content = external_common_param_edje_object_get(obj, param);
else if (!strcmp(param->name, "label"))
mem->label = eina_stringshare_add(param->s);
if (!strcmp(param->name, "info"))
mem->info = eina_stringshare_add(param->s);
else if (!strcmp(param->name, "content"))
mem->content = external_common_param_edje_object_get(obj, param);
else if (!strcmp(param->name, "label"))
mem->label = eina_stringshare_add(param->s);
}
return mem;
}
static Evas_Object *external_bubble_content_get(void *data EINA_UNUSED,
const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
const Evas_Object *obj EINA_UNUSED,
const char *content EINA_UNUSED)
{
if (!strcmp(content, "content"))
return elm_object_content_get(obj);
@ -155,7 +161,8 @@ external_bubble_params_free(void *params)
free(params);
}
static Edje_External_Param_Info external_bubble_params[] = {
static Edje_External_Param_Info external_bubble_params[] =
{
DEFINE_EXTERNAL_COMMON_PARAMS,
EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),

@ -14,7 +14,9 @@ typedef struct _Elm_Params_Button
} Elm_Params_Button;
static void
external_button_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
external_button_state_set(void *data EINA_UNUSED, Evas_Object *obj,
const void *from_params, const void *to_params,
float pos EINA_UNUSED)
{
const Elm_Params_Button *p;
@ -35,49 +37,50 @@ external_button_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *
}
static Eina_Bool
external_button_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
external_button_param_set(void *data EINA_UNUSED, Evas_Object *obj,
const Edje_External_Param *param)
{
if (!strcmp(param->name, "label"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
elm_object_text_set(obj, param->s);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
elm_object_text_set(obj, param->s);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "icon"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
Evas_Object *icon = external_common_param_icon_get(obj, param);
if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
Evas_Object *icon = external_common_param_icon_get(obj, param);
if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "autorepeat_initial"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
elm_button_autorepeat_initial_timeout_set(obj, param->d);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
elm_button_autorepeat_initial_timeout_set(obj, param->d);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "autorepeat_gap"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
elm_button_autorepeat_gap_timeout_set(obj, param->d);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
elm_button_autorepeat_gap_timeout_set(obj, param->d);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "autorepeat"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_button_autorepeat_set(obj, param->i);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_button_autorepeat_set(obj, param->i);
return EINA_TRUE;
}
}
ERR("unknown parameter '%s' of type '%s'",
@ -87,44 +90,45 @@ external_button_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_E
}
static Eina_Bool
external_button_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
external_button_param_get(void *data EINA_UNUSED, const Evas_Object *obj,
Edje_External_Param *param)
{
if (!strcmp(param->name, "label"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
param->s = elm_object_text_get(obj);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
param->s = elm_object_text_get(obj);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "icon"))
{
/* not easy to get icon name back from live object */
return EINA_FALSE;
/* not easy to get icon name back from live object */
return EINA_FALSE;
}
else if (!strcmp(param->name, "autorepeat_initial"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
param->d = elm_button_autorepeat_initial_timeout_get(obj);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
param->d = elm_button_autorepeat_initial_timeout_get(obj);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "autorepeat_gap"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
param->d = elm_button_autorepeat_gap_timeout_get(obj);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_DOUBLE)
{
param->d = elm_button_autorepeat_gap_timeout_get(obj);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "autorepeat"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_button_autorepeat_get(obj);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_button_autorepeat_get(obj);
return EINA_TRUE;
}
}
ERR("unknown parameter '%s' of type '%s'",
@ -134,7 +138,8 @@ external_button_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_E
}
static void *
external_button_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
external_button_params_parse(void *data EINA_UNUSED, Evas_Object *obj,
const Eina_List *params)
{
Elm_Params_Button *mem;
Edje_External_Param *param;
@ -148,33 +153,34 @@ external_button_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Ein
EINA_LIST_FOREACH(params, l, param)
{
if (!strcmp(param->name, "autorepeat_initial"))
{
mem->autorepeat_initial = param->d;
mem->autorepeat_initial_exists = EINA_TRUE;
}
if (!strcmp(param->name, "autorepeat_initial"))
{
mem->autorepeat_initial = param->d;
mem->autorepeat_initial_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "autorepeat_gap"))
{
mem->autorepeat_gap = param->d;
mem->autorepeat_gap_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "autorepeat"))
{
mem->autorepeat = !!param->i;
mem->autorepeat_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "label"))
mem->label = eina_stringshare_add(param->s);
{
mem->autorepeat_gap = param->d;
mem->autorepeat_gap_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "autorepeat"))
{
mem->autorepeat = !!param->i;
mem->autorepeat_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "label"))
mem->label = eina_stringshare_add(param->s);
}
return mem;
}
static Evas_Object *external_button_content_get(void *data EINA_UNUSED,
const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
const Evas_Object *obj EINA_UNUSED,
const char *content EINA_UNUSED)
{
ERR("No content.");
return NULL;
ERR("No content.");
return NULL;
}
static void
@ -182,11 +188,12 @@ external_button_params_free(void *params)
{
Elm_Params_Button *mem = params;
if (mem->label)
eina_stringshare_del(mem->label);
eina_stringshare_del(mem->label);
free(params);
}
static Edje_External_Param_Info external_button_params[] = {
static Edje_External_Param_Info external_button_params[] =
{
DEFINE_EXTERNAL_COMMON_PARAMS,
EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),

@ -1,5 +1,4 @@
#include <assert.h>
#include "private.h"
typedef struct _Elm_Params_Calendar
@ -17,9 +16,10 @@ typedef struct _Elm_Params_Calendar
if (!strcmp(STR, CHOICES[i])) \
return i;
static const char *_calendar_select_modes[] = {"default", "always", "none",
"ondemand", NULL};
static const char *_calendar_select_modes[] =
{
"default", "always", "none", "ondemand", NULL
};
static Elm_Calendar_Select_Mode
_calendar_select_mode_get(const char *select_mode)

@ -10,7 +10,9 @@ typedef struct _Elm_Params_Check
} Elm_Params_Check;
static void
external_check_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
external_check_state_set(void *data EINA_UNUSED, Evas_Object *obj,
const void *from_params, const void *to_params,
float pos EINA_UNUSED)
{
const Elm_Params_Check *p;
@ -27,33 +29,34 @@ external_check_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f
}
static Eina_Bool
external_check_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
external_check_param_set(void *data EINA_UNUSED, Evas_Object *obj,
const Edje_External_Param *param)
{
if (!strcmp(param->name, "label"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
elm_object_text_set(obj, param->s);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
elm_object_text_set(obj, param->s);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "icon"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
Evas_Object *icon = external_common_param_icon_get(obj, param);
if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
Evas_Object *icon = external_common_param_icon_get(obj, param);
if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "state"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_check_state_set(obj, param->i);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_check_state_set(obj, param->i);
return EINA_TRUE;
}
}
ERR("unknown parameter '%s' of type '%s'",
@ -63,28 +66,29 @@ external_check_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Ex
}
static Eina_Bool
external_check_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
external_check_param_get(void *data EINA_UNUSED, const Evas_Object *obj,
Edje_External_Param *param)
{
if (!strcmp(param->name, "label"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
param->s = elm_object_text_get(obj);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
{
param->s = elm_object_text_get(obj);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "icon"))
{
/* not easy to get icon name back from live object */
return EINA_FALSE;
/* not easy to get icon name back from live object */
return EINA_FALSE;
}
else if (!strcmp(param->name, "state"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_check_state_get(obj);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_check_state_get(obj);
return EINA_TRUE;
}
}
ERR("unknown parameter '%s' of type '%s'",
@ -94,7 +98,8 @@ external_check_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Ex
}
static void *
external_check_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina_List *params)
external_check_params_parse(void *data EINA_UNUSED, Evas_Object *obj,
const Eina_List *params)
{
Elm_Params_Check *mem;
Edje_External_Param *param;
@ -114,17 +119,18 @@ external_check_params_parse(void *data EINA_UNUSED, Evas_Object *obj, const Eina
mem->state_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "label"))
mem->label = eina_stringshare_add(param->s);
mem->label = eina_stringshare_add(param->s);
}
return mem;
}
static Evas_Object *external_check_content_get(void *data EINA_UNUSED,
const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
const Evas_Object *obj EINA_UNUSED,
const char *content EINA_UNUSED)
{
ERR("No content.");
return NULL;
ERR("No content.");
return NULL;
}
static void
@ -132,17 +138,17 @@ external_check_params_free(void *params)
{
Elm_Params_Check *mem = params;
if (mem->label)
eina_stringshare_del(mem->label);
eina_stringshare_del(mem->label);
free(params);
}
static Edje_External_Param_Info external_check_params[] = {
DEFINE_EXTERNAL_COMMON_PARAMS,
EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
EDJE_EXTERNAL_PARAM_INFO_BOOL_FULL("state", 0, "unchecked", "checked"),
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
DEFINE_EXTERNAL_COMMON_PARAMS,
EDJE_EXTERNAL_PARAM_INFO_STRING("label"),
EDJE_EXTERNAL_PARAM_INFO_STRING("icon"),
EDJE_EXTERNAL_PARAM_INFO_BOOL_FULL("state", 0, "unchecked", "checked"),
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
};
DEFINE_EXTERNAL_ICON_ADD(check, "check")
DEFINE_EXTERNAL_TYPE_SIMPLE(check, "Check")
DEFINE_EXTERNAL_ICON_ADD(check, "check");
DEFINE_EXTERNAL_TYPE_SIMPLE(check, "Check");

@ -13,7 +13,9 @@ typedef struct _Elm_Params_Clock
} Elm_Params_Clock;
static void
external_clock_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
external_clock_state_set(void *data EINA_UNUSED, Evas_Object *obj,
const void *from_params, const void *to_params,
float pos EINA_UNUSED)
{
const Elm_Params_Clock *p;
@ -25,15 +27,15 @@ external_clock_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f
elm_clock_time_set(obj, p->hrs, p->min, p->sec);
else if ((p->hrs_exists) || (p->min_exists) || (p->sec_exists))
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
if (p->hrs_exists)
hrs = p->hrs;
if (p->min_exists)
min = p->min;
if (p->sec_exists)
sec = p->sec;
elm_clock_time_set(obj, hrs, min, sec);
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
if (p->hrs_exists)
hrs = p->hrs;
if (p->min_exists)
min = p->min;
if (p->sec_exists)
sec = p->sec;
elm_clock_time_set(obj, hrs, min, sec);
}
if (p->edit)
elm_clock_edit_set(obj, p->edit);
@ -44,61 +46,62 @@ external_clock_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f
}
static Eina_Bool
external_clock_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
external_clock_param_set(void *data EINA_UNUSED, Evas_Object *obj,
const Edje_External_Param *param)
{
if (!strcmp(param->name, "hours"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
elm_clock_time_set(obj, param->i, min, sec);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
elm_clock_time_set(obj, param->i, min, sec);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "minutes"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
elm_clock_time_set(obj, hrs, param->i, sec);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
elm_clock_time_set(obj, hrs, param->i, sec);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "seconds"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
elm_clock_time_set(obj, hrs, min, param->i);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
elm_clock_time_set(obj, hrs, min, param->i);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "editable"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_clock_edit_set(obj, param->i);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_clock_edit_set(obj, param->i);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "am/pm"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_clock_show_am_pm_set(obj, param->i);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_clock_show_am_pm_set(obj, param->i);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "show seconds"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_clock_show_seconds_set(obj, param->i);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
elm_clock_show_seconds_set(obj, param->i);
return EINA_TRUE;
}
}
ERR("unknown parameter '%s' of type '%s'",
@ -108,64 +111,64 @@ external_clock_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_Ex
}
static Eina_Bool
external_clock_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_External_Param *param)
external_clock_param_get(void *data EINA_UNUSED, const Evas_Object *obj,
Edje_External_Param *param)
{
if (!strcmp(param->name, "hours"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
param->i = hrs;
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
param->i = hrs;
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "minutes"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
param->i = min;
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
param->i = min;
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "seconds"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
param->i = sec;
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_INT)
{
int hrs, min, sec;
elm_clock_time_get(obj, &hrs, &min, &sec);
param->i = sec;
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "editable"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_clock_edit_get(obj);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_clock_edit_get(obj);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "am/pm"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_clock_show_am_pm_get(obj);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_clock_show_am_pm_get(obj);
return EINA_TRUE;
}
}
else if (!strcmp(param->name, "show seconds"))
{
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_clock_show_seconds_get(obj);
return EINA_TRUE;
}
if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL)
{
param->i = elm_clock_show_seconds_get(obj);
return EINA_TRUE;
}
}
ERR("unknown parameter '%s' of type '%s'",
param->name, edje_external_param_type_str(param->type));
@ -173,7 +176,8 @@ external_clock_param_get(void *data EINA_UNUSED, const Evas_Object *obj, Edje_Ex
}
static void *
external_clock_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const Eina_List *params)
external_clock_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
const Eina_List *params)
{
Elm_Params_Clock *mem;
Edje_External_Param *param;
@ -185,37 +189,37 @@ external_clock_params_parse(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
EINA_LIST_FOREACH(params, l, param)
{
if (!strcmp(param->name, "hours"))
{
mem->hrs = param->i;
mem->hrs_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "minutes"))
{
mem->min = param->i;
mem->min_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "seconds"))
{
mem->sec = param->i;
mem->sec_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "editable"))
mem->edit = !!param->i;
else if (!strcmp(param->name, "am/pm"))
mem->ampm = !!param->i;
else if (!strcmp(param->name, "show seconds"))
mem->seconds = !!param->i;
if (!strcmp(param->name, "hours"))
{
mem->hrs = param->i;
mem->hrs_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "minutes"))
{
mem->min = param->i;
mem->min_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "seconds"))
{
mem->sec = param->i;
mem->sec_exists = EINA_TRUE;
}
else if (!strcmp(param->name, "editable"))
mem->edit = !!param->i;
else if (!strcmp(param->name, "am/pm"))
mem->ampm = !!param->i;
else if (!strcmp(param->name, "show seconds"))
mem->seconds = !!param->i;
}
return mem;
}
static Evas_Object *external_clock_content_get(void *data EINA_UNUSED,
const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
const Evas_Object *obj EINA_UNUSED, const char *content EINA_UNUSED)
{
ERR("No content.");
return NULL;
ERR("No content.");
return NULL;
}
static void
@ -227,15 +231,15 @@ external_clock_params_free(void *params)
}
static Edje_External_Param_Info external_clock_params[] = {
DEFINE_EXTERNAL_COMMON_PARAMS,
EDJE_EXTERNAL_PARAM_INFO_INT("hours"),
EDJE_EXTERNAL_PARAM_INFO_INT("minutes"),
EDJE_EXTERNAL_PARAM_INFO_INT("seconds"),
EDJE_EXTERNAL_PARAM_INFO_BOOL("editable"),
EDJE_EXTERNAL_PARAM_INFO_BOOL("am/pm"),
EDJE_EXTERNAL_PARAM_INFO_BOOL("show seconds"),
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
DEFINE_EXTERNAL_COMMON_PARAMS,
EDJE_EXTERNAL_PARAM_INFO_INT("hours"),
EDJE_EXTERNAL_PARAM_INFO_INT("minutes"),
EDJE_EXTERNAL_PARAM_INFO_INT("seconds"),
EDJE_EXTERNAL_PARAM_INFO_BOOL("editable"),
EDJE_EXTERNAL_PARAM_INFO_BOOL("am/pm"),
EDJE_EXTERNAL_PARAM_INFO_BOOL("show seconds"),
EDJE_EXTERNAL_PARAM_INFO_SENTINEL
};
DEFINE_EXTERNAL_ICON_ADD(clock, "clock")
DEFINE_EXTERNAL_TYPE_SIMPLE(clock, "Clock")
DEFINE_EXTERNAL_ICON_ADD(clock, "clock");
DEFINE_EXTERNAL_TYPE_SIMPLE(clock, "Clock");

@ -1,5 +1,4 @@
#include <assert.h>
#include "private.h"
typedef struct _Elm_Params_Entry
@ -29,9 +28,10 @@ typedef struct _Elm_Params_Entry
if (strcmp((STR), (CHOICES)[i]) == 0) \
return i
static const char *entry_line_wrap_choices[] = {"none", "char", "word",
"mixed", NULL};
static const char *entry_line_wrap_choices[] =
{
"none", "char", "word", "mixed", NULL
};
static Elm_Wrap_Type
_entry_line_wrap_choices_setting_get(const char *line_wrap_str)
@ -43,7 +43,9 @@ _entry_line_wrap_choices_setting_get(const char *line_wrap_str)
}
static void
external_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *from_params, const void *to_params, float pos EINA_UNUSED)
external_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj,
const void *from_params, const void *to_params,
float pos EINA_UNUSED)
{
const Elm_Params_Entry *p;
Eina_Bool hbounce, vbounce;
@ -85,7 +87,8 @@ external_entry_state_set(void *data EINA_UNUSED, Evas_Object *obj, const void *f
}
static Eina_Bool
external_entry_param_set(void *data EINA_UNUSED, Evas_Object *obj, const Edje_External_Param *param)
external_entry_param_set(void *data EINA_UNUSED, Evas_Object *obj,
const Edje_External_Param *param)
{