From ee61840246f4a614f691fc3c83a748267f9f4b4b Mon Sep 17 00:00:00 2001 From: discomfitor Date: Thu, 20 Oct 2011 21:27:15 +0000 Subject: [PATCH] remove all use of elm_toggle_ api git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@64207 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/bin/test.c | 7 +++--- src/bin/test_fileselector_button.c | 14 ++++++++---- src/bin/test_focus.c | 5 ++-- src/bin/test_genlist.c | 7 +++--- src/bin/test_toggle.c | 29 +++++++++++++---------- src/edje_externals/elm_toggle.c | 47 ++++++++++++++++++++++++++------------ 6 files changed, 69 insertions(+), 40 deletions(-) diff --git a/src/bin/test.c b/src/bin/test.c index 3bf5f53..48f7144 100644 --- a/src/bin/test.c +++ b/src/bin/test.c @@ -190,7 +190,7 @@ static void _ui_tg_changed(void *data, Evas_Object *obj, void *event_info) { (void) data; (void) event_info; - elm_mirrored_set(elm_toggle_state_get(obj)); + elm_mirrored_set(elm_check_state_get(obj)); } @@ -267,9 +267,10 @@ my_win_main(char *autorun, Eina_Bool test_win_only) elm_frame_content_set(fr, lb); evas_object_show(lb); - tg = elm_toggle_add(win); + tg = elm_check_add(win); + elm_object_style_set(tg, "toggle"); elm_object_text_set(tg, "UI-Mirroring:"); - elm_toggle_state_set(tg, elm_mirrored_get()); + elm_check_state_set(tg, elm_mirrored_get()); evas_object_smart_callback_add(tg, "changed", _ui_tg_changed, NULL); elm_box_pack_end(bx0, tg); evas_object_show(tg); diff --git a/src/bin/test_fileselector_button.c b/src/bin/test_fileselector_button.c index 8a09c56..9077565 100644 --- a/src/bin/test_fileselector_button.c +++ b/src/bin/test_fileselector_button.c @@ -104,26 +104,30 @@ test_fileselector_button(void *data __UNUSED__, elm_box_pack_end(vbox, hbox); evas_object_show(hbox); - bt = elm_toggle_add(win); + bt = elm_check_add(win); + elm_object_style_set(bt, "toggle"); elm_object_text_set(bt, "current selection text entry"); evas_object_smart_callback_add(bt, "changed", _current_sel_toggle, fs_bt); elm_box_pack_end(hbox, bt); evas_object_show(bt); - bt = elm_toggle_add(win); + bt = elm_check_add(win); + elm_object_style_set(bt, "toggle"); elm_object_text_set(bt, "Inwin mode"); - elm_toggle_state_set (bt, EINA_TRUE); + elm_check_state_set (bt, EINA_TRUE); evas_object_smart_callback_add(bt, "changed", _inwin_mode_toggle, fs_bt); elm_box_pack_end(hbox, bt); evas_object_show(bt); - bt = elm_toggle_add(win); + bt = elm_check_add(win); + elm_object_style_set(bt, "toggle"); elm_object_text_set(bt, "Folder only mode"); evas_object_smart_callback_add(bt, "changed", _folder_only_toggle, fs_bt); elm_box_pack_end(hbox, bt); evas_object_show(bt); - bt = elm_toggle_add(win); + bt = elm_check_add(win); + elm_object_style_set(bt, "toggle"); elm_object_text_set(bt, "Expandable mode"); evas_object_smart_callback_add(bt, "changed", _expandable_toggle, fs_bt); elm_box_pack_end(hbox, bt); diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c index 8e2ec52..f4f52f8 100644 --- a/src/bin/test_focus.c +++ b/src/bin/test_focus.c @@ -102,8 +102,9 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info } { - Evas_Object *tg = elm_toggle_add(win); - elm_toggle_states_labels_set(tg, "Yes", "No"); + Evas_Object *tg = elm_check_add(win); + elm_object_style_set(tg, "toggle"); + elm_check_states_labels_set(tg, "Yes", "No"); elm_box_pack_end(bx, tg); my_show(tg); } diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index 8f94acd..469ecd6 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -1789,7 +1789,7 @@ test_genlist10(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i static void _reorder_tg_changed_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) { - elm_genlist_reorder_mode_set(data, elm_toggle_state_get(obj)); + elm_genlist_reorder_mode_set(data, elm_check_state_get(obj)); } /** @@ -1850,9 +1850,10 @@ test_genlist11(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_show(gl); - tg = elm_toggle_add(win); + tg = elm_check_add(win); + elm_object_style_set(tg, "toggle"); elm_object_text_set(tg, "Reorder Mode:"); - elm_toggle_state_set(tg, elm_mirrored_get()); + elm_check_state_set(tg, elm_mirrored_get()); evas_object_smart_callback_add(tg, "changed", _reorder_tg_changed_cb, gl); elm_box_pack_end(bx, tg); evas_object_show(tg); diff --git a/src/bin/test_toggle.c b/src/bin/test_toggle.c index 7a91f45..57c5f47 100644 --- a/src/bin/test_toggle.c +++ b/src/bin/test_toggle.c @@ -28,13 +28,14 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_icon_file_set(ic, buf, NULL); evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); - tg = elm_toggle_add(win); + tg = elm_check_add(win); + elm_object_style_set(tg, "toggle"); evas_object_size_hint_weight_set(tg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(tg, EVAS_HINT_FILL, 0.5); elm_object_text_set(tg, "Icon sized to toggle"); - elm_toggle_icon_set(tg, ic); - elm_toggle_state_set(tg, 1); - elm_toggle_states_labels_set(tg, "Yes", "No"); + elm_check_icon_set(tg, ic); + elm_check_state_set(tg, 1); + elm_check_states_labels_set(tg, "Yes", "No"); elm_box_pack_end(bx, tg); evas_object_show(tg); evas_object_show(ic); @@ -44,9 +45,10 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); - tg = elm_toggle_add(win); + tg = elm_check_add(win); + elm_object_style_set(tg, "toggle"); elm_object_text_set(tg, "Icon no scale"); - elm_toggle_icon_set(tg, ic); + elm_check_icon_set(tg, ic); elm_box_pack_end(bx, tg); evas_object_show(tg); evas_object_show(ic); @@ -56,17 +58,19 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); - tg = elm_toggle_add(win); + tg = elm_check_add(win); + elm_object_style_set(tg, "toggle"); elm_object_text_set(tg, "Icon no scale"); - elm_toggle_icon_set(tg, ic); + elm_check_icon_set(tg, ic); elm_object_disabled_set(tg, 1); elm_box_pack_end(bx, tg); evas_object_show(tg); evas_object_show(ic); - tg = elm_toggle_add(win); + tg = elm_check_add(win); + elm_object_style_set(tg, "toggle"); elm_object_text_set(tg, "Label Only"); - elm_toggle_states_labels_set(tg, "Big long fun times label", + elm_check_states_labels_set(tg, "Big long fun times label", "Small long happy fun label"); elm_box_pack_end(bx, tg); evas_object_show(tg); @@ -76,8 +80,9 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info elm_icon_file_set(ic, buf, NULL); elm_icon_scale_set(ic, 0, 0); - tg = elm_toggle_add(win); - elm_toggle_icon_set(tg, ic); + tg = elm_check_add(win); + elm_object_style_set(tg, "toggle"); + elm_check_icon_set(tg, ic); elm_box_pack_end(bx, tg); evas_object_show(tg); evas_object_show(ic); diff --git a/src/edje_externals/elm_toggle.c b/src/edje_externals/elm_toggle.c index 99998bd..83b0809 100644 --- a/src/edje_externals/elm_toggle.c +++ b/src/edje_externals/elm_toggle.c @@ -24,22 +24,22 @@ external_toggle_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f if (p->label) elm_object_text_set(obj, p->label); if (p->icon) - elm_toggle_icon_set(obj, p->icon); + elm_check_icon_set(obj, p->icon); if ((p->on) && (p->off)) - elm_toggle_states_labels_set(obj, p->on, p->off); + elm_check_states_labels_set(obj, p->on, p->off); else if ((p->on) || (p->off)) { const char *on, *off; - elm_toggle_states_labels_get(obj, &on, &off); + elm_check_states_labels_get(obj, &on, &off); if (p->on) - elm_toggle_states_labels_set(obj, p->on, off); + elm_check_states_labels_set(obj, p->on, off); else - elm_toggle_states_labels_set(obj, on, p->off); + elm_check_states_labels_set(obj, on, p->off); } if (p->state_exists) - elm_toggle_state_set(obj, p->state); + elm_check_state_set(obj, p->state); } static Eina_Bool @@ -59,7 +59,7 @@ external_toggle_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex { Evas_Object *icon = external_common_param_icon_get(obj, param); if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE; - elm_toggle_icon_set(obj, icon); + elm_check_icon_set(obj, icon); return EINA_TRUE; } } @@ -68,8 +68,8 @@ external_toggle_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { const char *on, *off; - elm_toggle_states_labels_get(obj, &on, &off); - elm_toggle_states_labels_set(obj, param->s, off); + elm_check_states_labels_get(obj, &on, &off); + elm_check_states_labels_set(obj, param->s, off); return EINA_TRUE; } } @@ -78,8 +78,8 @@ external_toggle_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { const char *on, *off; - elm_toggle_states_labels_get(obj, &on, &off); - elm_toggle_states_labels_set(obj, on, param->s); + elm_check_states_labels_get(obj, &on, &off); + elm_check_states_labels_set(obj, on, param->s); return EINA_TRUE; } } @@ -87,7 +87,7 @@ external_toggle_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) { - elm_toggle_state_set(obj, param->i); + elm_check_state_set(obj, param->i); return EINA_TRUE; } } @@ -119,7 +119,7 @@ external_toggle_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { const char *on, *off; - elm_toggle_states_labels_get(obj, &on, &off); + elm_check_states_labels_get(obj, &on, &off); param->s = on; return EINA_TRUE; } @@ -129,7 +129,7 @@ external_toggle_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { const char *on, *off; - elm_toggle_states_labels_get(obj, &on, &off); + elm_check_states_labels_get(obj, &on, &off); param->s = off; return EINA_TRUE; } @@ -138,7 +138,7 @@ external_toggle_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_BOOL) { - param->i = elm_toggle_state_get(obj); + param->i = elm_check_state_get(obj); return EINA_TRUE; } } @@ -209,4 +209,21 @@ static Edje_External_Param_Info external_toggle_params[] = { }; 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") -- 2.7.4