enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

elementary/widget - for consistency, revised internal func names. 

SVN revision: 83865
This commit is contained in:
ChunEon Park 2013-02-13 11:02:36 +00:00
parent eb70a1ea43
commit f45b4efac0
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/elementary/src/lib/elm_general.h
View File

@ -317,7 +317,7 @@ EAPI int elm_policy_get(unsigned int policy);
*
* Changing language with this function will make Elementary run through
* all its widgets, translating strings set with
* elm_object_domain_translatable_text_part_set(). This way, an entire
* elm_object_domain_translatable_part_text_set(). This way, an entire
* UI can have its language changed without having to restart the program.
*
* For more complex cases, like having formatted strings that need

4
legacy/elementary/src/lib/elm_main.c
View File

@ -1074,14 +1074,14 @@ EAPI void
elm_object_part_text_set(Evas_Object *obj, const char *part, const char *label)
{
EINA_SAFETY_ON_NULL_RETURN(obj);
elm_widget_text_part_set(obj, part, label);
elm_widget_part_text_set(obj, part, label);
}
EAPI const char *
elm_object_part_text_get(const Evas_Object *obj, const char *part)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
return elm_widget_text_part_get(obj, part);
return elm_widget_part_text_get(obj, part);
}
EAPI void

20
legacy/elementary/src/lib/elm_widget.c
View File

@ -3568,16 +3568,16 @@ _elm_widget_theme_set(Eo *obj, void *_pd, va_list *list)
}
EAPI void
elm_widget_text_part_set(Evas_Object *obj,
elm_widget_part_text_set(Evas_Object *obj,
const char *part,
const char *label)
{
ELM_WIDGET_CHECK(obj);
eo_do(obj, elm_wdg_text_part_set(part, label));
eo_do(obj, elm_wdg_part_text_set(part, label));
}
static void
_elm_widget_text_part_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
_elm_widget_part_text_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
const char *part = va_arg(*list, const char *);
const char *label = va_arg(*list, const char *);
@ -3586,17 +3586,17 @@ _elm_widget_text_part_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
}
EAPI const char *
elm_widget_text_part_get(const Evas_Object *obj,
elm_widget_part_text_get(const Evas_Object *obj,
const char *part)
{
ELM_WIDGET_CHECK(obj) NULL;
const char *ret = NULL;
eo_do((Eo *) obj, elm_wdg_text_part_get(part, &ret));
eo_do((Eo *) obj, elm_wdg_part_text_get(part, &ret));
return ret;
}
static void
_elm_widget_text_part_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
_elm_widget_part_text_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
{
const char *part = va_arg(*list, const char *);
const char **ret = va_arg(*list, const char **);
@ -3678,7 +3678,7 @@ _elm_widget_domain_translatable_part_text_set(Eo *obj, void *_pd, va_list *list)
if (label && label[0])
label = dgettext(domain, label);
#endif
elm_widget_text_part_set(obj, part, label);
elm_widget_part_text_set(obj, part, label);
}
EAPI const char *
@ -3745,7 +3745,7 @@ _elm_widget_translate(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list
EINA_LIST_FOREACH(sd->translate_strings, l, ts)
{
const char *s = dgettext(ts->domain, ts->string);
elm_widget_text_part_set(obj, ts->id, s);
elm_widget_part_text_set(obj, ts->id, s);
}
#endif
}
@ -5484,8 +5484,8 @@ _class_constructor(Eo_Class *klass)
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCALE_SET), _elm_widget_scale_set),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_SCALE_GET), _elm_widget_scale_get),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_SET), _elm_widget_text_part_set),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_GET), _elm_widget_text_part_get),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_SET), _elm_widget_part_text_set),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_GET), _elm_widget_part_text_get),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_DOMAIN_TRANSLATABLE_PART_TEXT_SET), _elm_widget_domain_translatable_part_text_set),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATABLE_PART_TEXT_GET), _elm_widget_translatable_part_text_get),
EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_ACCESS_INFO_SET), _elm_widget_access_info_set),

12
legacy/elementary/src/lib/elm_widget.h
View File

@ -682,8 +682,8 @@ EAPI void elm_widget_focus_tree_unfocusable_handle(Evas_Object *obj)
EAPI void elm_widget_focus_disabled_handle(Evas_Object *obj);
EAPI unsigned int elm_widget_focus_order_get(const Evas_Object *obj);
EAPI void elm_widget_activate(Evas_Object *obj, Elm_Activate act);
EAPI void elm_widget_text_part_set(Evas_Object *obj, const char *part, const char *label);
EAPI const char *elm_widget_text_part_get(const Evas_Object *obj, const char *part);
EAPI void elm_widget_part_text_set(Evas_Object *obj, const char *part, const char *label);
EAPI const char *elm_widget_part_text_get(const Evas_Object *obj, const char *part);
EAPI void elm_widget_domain_translatable_part_text_set(Evas_Object *obj, const char *part, const char *domain, const char *text);
EAPI const char *elm_widget_translatable_part_text_get(const Evas_Object *obj, const char *part);
EAPI void elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content);
@ -1774,7 +1774,7 @@ typedef void * (*list_data_get_func_type)(const Eina_List * l);
/**
* @def elm_wdg_text_part_set
* @def elm_wdg_part_text_set
* @since 1.8
*
* No description supplied by the EAPI.
@ -1783,10 +1783,10 @@ typedef void * (*list_data_get_func_type)(const Eina_List * l);
* @param[in] label
*
*/
#define elm_wdg_text_part_set(part, label) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_SET), EO_TYPECHECK(const char *, part), EO_TYPECHECK(const char *, label)
#define elm_wdg_part_text_set(part, label) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_SET), EO_TYPECHECK(const char *, part), EO_TYPECHECK(const char *, label)
/**
* @def elm_wdg_text_part_get
* @def elm_wdg_part_text_get
* @since 1.8
*
* No description supplied by the EAPI.
@ -1795,7 +1795,7 @@ typedef void * (*list_data_get_func_type)(const Eina_List * l);
* @param[out] ret
*
*/
#define elm_wdg_text_part_get(part, ret) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_GET), EO_TYPECHECK(const char *, part), EO_TYPECHECK(const char **, ret)
#define elm_wdg_part_text_get(part, ret) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TEXT_PART_GET), EO_TYPECHECK(const char *, part), EO_TYPECHECK(const char **, ret)
/**