From 7f4585b71913f07c46678a46b7950e3d9c10f36c Mon Sep 17 00:00:00 2001 From: Jiyoun Park Date: Fri, 16 Mar 2012 05:46:08 +0000 Subject: [PATCH] remove deprecated code related with elm_toggle_XXX function SVN revision: 69447 --- .../elementary/src/edje_externals/Makefile.am | 1 - .../src/edje_externals/elm_toggle.c | 214 ------------------ legacy/elementary/src/lib/Makefile.am | 1 - legacy/elementary/src/lib/elm_toggle.c | 76 ------- 4 files changed, 292 deletions(-) delete mode 100644 legacy/elementary/src/edje_externals/elm_toggle.c delete mode 100644 legacy/elementary/src/lib/elm_toggle.c diff --git a/legacy/elementary/src/edje_externals/Makefile.am b/legacy/elementary/src/edje_externals/Makefile.am index b321e18473..ba9c9c754c 100644 --- a/legacy/elementary/src/edje_externals/Makefile.am +++ b/legacy/elementary/src/edje_externals/Makefile.am @@ -61,7 +61,6 @@ elm_slider.c \ elm_slideshow.c \ elm_spinner.c \ elm_thumb.c \ -elm_toggle.c \ elm_toolbar.c \ elm_video.c \ elm_web.c diff --git a/legacy/elementary/src/edje_externals/elm_toggle.c b/legacy/elementary/src/edje_externals/elm_toggle.c deleted file mode 100644 index bfcab508fc..0000000000 --- a/legacy/elementary/src/edje_externals/elm_toggle.c +++ /dev/null @@ -1,214 +0,0 @@ -#include - -#include "private.h" - -typedef struct _Elm_Params_Toggle -{ - Elm_Params base; - const char *label; - Evas_Object *icon; - const char *on, *off; - Eina_Bool state:1; - Eina_Bool state_exists:1; -} Elm_Params_Toggle; - -static void -external_toggle_state_set(void *data __UNUSED__, Evas_Object *obj, const void *from_params, const void *to_params, float pos __UNUSED__) -{ - const Elm_Params_Toggle *p; - - if (to_params) p = to_params; - else if (from_params) p = from_params; - else return; - - if (p->label) - elm_object_text_set(obj, p->label); - if (p->icon) - elm_object_part_content_set(obj, "icon", p->icon); - - if (p->on) - elm_object_part_text_set(obj, "on", p->on); - if (p->off) - elm_object_part_text_set(obj, "off", p->off); - - if (p->state_exists) - elm_check_state_set(obj, p->state); -} - -static Eina_Bool -external_toggle_param_set(void *data __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; - } - } - 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; - } - } - else if (!strcmp(param->name, "label on")) - { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_object_part_text_set(obj, "on", param->s); - return EINA_TRUE; - } - } - else if (!strcmp(param->name, "label off")) - { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - elm_object_part_text_set(obj, "off", param->s); - 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; - } - } - - ERR("unknown parameter '%s' of type '%s'", - param->name, edje_external_param_type_str(param->type)); - - return EINA_FALSE; -} - -static Eina_Bool -external_toggle_param_get(void *data __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; - } - } - else if (!strcmp(param->name, "icon")) - { - /* not easy to get icon name back from live object */ - return EINA_FALSE; - } - else if (!strcmp(param->name, "label on")) - { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_object_part_text_get(obj, "on"); - return EINA_TRUE; - } - } - else if (!strcmp(param->name, "label off")) - { - if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) - { - param->s = elm_object_part_text_get(obj, "off"); - return EINA_TRUE; - } - } - else if (!strcmp(param->name, "state")) - { - 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'", - param->name, edje_external_param_type_str(param->type)); - - return EINA_FALSE; -} - -static void * -external_toggle_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const Eina_List *params) -{ - Elm_Params_Toggle *mem; - Edje_External_Param *param; - const Eina_List *l; - - mem = calloc(1, sizeof(Elm_Params_Toggle)); - if (!mem) - return NULL; - - external_common_icon_param_parse(&mem->icon, obj, params); - - EINA_LIST_FOREACH(params, l, param) - { - if (!strcmp(param->name, "state")) { - mem->state = param->i; - mem->state_exists = EINA_TRUE; - } - else if (!strcmp(param->name, "label on")) - mem->on = eina_stringshare_add(param->s); - else if (!strcmp(param->name, "label off")) - mem->off = eina_stringshare_add(param->s); - } - - return mem; -} - -static Evas_Object *external_toggle_content_get(void *data __UNUSED__, - const Evas_Object *obj __UNUSED__, const char *content __UNUSED__) -{ - ERR("No content."); - return NULL; -} - -static void -external_toggle_params_free(void *params) -{ - Elm_Params_Toggle *mem = params; - - if (mem->on) - eina_stringshare_del(mem->on); - if (mem->off) - eina_stringshare_del(mem->off); - if (mem->label) - eina_stringshare_del(mem->label); - free(params); -} - -static Edje_External_Param_Info external_toggle_params[] = { - DEFINE_EXTERNAL_COMMON_PARAMS, - EDJE_EXTERNAL_PARAM_INFO_STRING("label"), - 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_BOOL("state"), - EDJE_EXTERNAL_PARAM_INFO_SENTINEL -}; - -DEFINE_EXTERNAL_ICON_ADD(toggle, "toggle") -#undef DEFINE_EXTERNAL_TYPE_SIMPLE -#define DEFINE_EXTERNAL_TYPE_SIMPLE(type_name, name) \ -static Evas_Object * \ -external_##type_name##_add(void *data __UNUSED__, Evas *evas __UNUSED__, Evas_Object *edje, const Eina_List *params __UNUSED__, const char *part_name) \ -{ \ - Evas_Object *parent, *obj; \ - external_elm_init(); \ - parent = elm_widget_parent_widget_get(edje); \ - if (!parent) parent = edje; \ - obj = elm_check_add(parent); \ - elm_object_style_set(obj, "toggle"); \ - external_signals_proxy(obj, edje, part_name); \ - return obj; \ -} \ - \ -DEFINE_EXTERNAL_TYPE(type_name, name) - -DEFINE_EXTERNAL_TYPE_SIMPLE(toggle, "Toggle") diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am index 0d06909939..b1559657ad 100644 --- a/legacy/elementary/src/lib/Makefile.am +++ b/legacy/elementary/src/lib/Makefile.am @@ -205,7 +205,6 @@ elm_store.c \ elm_table.c \ elm_theme.c \ elm_thumb.c \ -elm_toggle.c \ elm_toolbar.c \ elm_transit.c \ elm_util.c \ diff --git a/legacy/elementary/src/lib/elm_toggle.c b/legacy/elementary/src/lib/elm_toggle.c deleted file mode 100644 index 2d02c80d96..0000000000 --- a/legacy/elementary/src/lib/elm_toggle.c +++ /dev/null @@ -1,76 +0,0 @@ -#include -#include "elm_priv.h" - -EAPI Evas_Object * -elm_toggle_add(Evas_Object *parent) -{ - Evas_Object *obj; - - obj = elm_check_add(parent); - elm_object_style_set(obj, "toggle"); - elm_object_part_text_set(obj, "on", E_("ON")); - elm_object_part_text_set(obj, "off", E_("OFF")); - return obj; -} - -EAPI void -elm_toggle_label_set(Evas_Object *obj, const char *label) -{ - elm_object_text_set(obj, label); -} - -EAPI const char * -elm_toggle_label_get(const Evas_Object *obj) -{ - return elm_object_text_get(obj); -} - -EAPI void -elm_toggle_icon_set(Evas_Object *obj, Evas_Object *icon) -{ - elm_object_part_content_set(obj, "icon", icon); -} - -EAPI Evas_Object * -elm_toggle_icon_get(const Evas_Object *obj) -{ - return elm_object_part_content_get(obj, "icon"); -} - -EAPI Evas_Object * -elm_toggle_icon_unset(Evas_Object *obj) -{ - return elm_object_part_content_unset(obj, "icon"); -} - -EAPI void -elm_toggle_states_labels_set(Evas_Object *obj, const char *onlabel, const char *offlabel) -{ - elm_object_part_text_set(obj, "on", onlabel); - elm_object_part_text_set(obj, "off", offlabel); -} - -EAPI void -elm_toggle_states_labels_get(const Evas_Object *obj, const char **onlabel, const char **offlabel) -{ - if (onlabel) *onlabel = elm_object_part_text_get(obj, "on"); - if (offlabel) *offlabel = elm_object_part_text_get(obj, "off"); -} - -EAPI void -elm_toggle_state_set(Evas_Object *obj, Eina_Bool state) -{ - elm_check_state_set(obj, state); -} - -EAPI Eina_Bool -elm_toggle_state_get(const Evas_Object *obj) -{ - return elm_check_state_get(obj); -} - -EAPI void -elm_toggle_state_pointer_set(Evas_Object *obj, Eina_Bool *statep) -{ - elm_check_state_pointer_set(obj, statep); -}