From c876ed441e55b0d661ecbb8a33151c03d61bfda4 Mon Sep 17 00:00:00 2001 From: tasn Date: Mon, 4 Jul 2011 10:14:14 +0000 Subject: [PATCH] Elm bubble: Fix code to use the new elm_object_text_set/get API. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@60996 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/bin/test_anchorblock.c | 12 ++++++------ src/bin/test_bubble.c | 8 ++++---- src/bin/test_focus.c | 2 +- src/bin/test_win_inline.c | 12 ++++++------ src/edje_externals/elm_bubble.c | 12 ++++++------ 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/bin/test_anchorblock.c b/src/bin/test_anchorblock.c index 450e388..009336a 100644 --- a/src/bin/test_anchorblock.c +++ b/src/bin/test_anchorblock.c @@ -147,8 +147,8 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1); bb = elm_bubble_add(win); - elm_bubble_label_set(bb, "Message 3"); - elm_bubble_info_set(bb, "10:32 4/11/2008"); + elm_object_text_set(bb, "Message 3"); + elm_object_text_part_set(bb, "info", "10:32 4/11/2008"); elm_bubble_icon_set(bb, ic); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); evas_object_show(ic); @@ -174,8 +174,8 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bb = elm_bubble_add(win); - elm_bubble_label_set(bb, "Message 2"); - elm_bubble_info_set(bb, "7:16 27/10/2008"); + elm_object_text_set(bb, "Message 2"); + elm_object_text_part_set(bb, "info", "7:16 27/10/2008"); elm_bubble_icon_set(bb, ic); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); evas_object_show(ic); @@ -211,8 +211,8 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1); bb = elm_bubble_add(win); - elm_bubble_label_set(bb, "Message 1"); - elm_bubble_info_set(bb, "20:47 18/6/2008"); + elm_object_text_set(bb, "Message 1"); + elm_object_text_part_set(bb, "info", "20:47 18/6/2008"); elm_bubble_icon_set(bb, ic); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); evas_object_show(ic); diff --git a/src/bin/test_bubble.c b/src/bin/test_bubble.c index 2872a65..b104342 100644 --- a/src/bin/test_bubble.c +++ b/src/bin/test_bubble.c @@ -37,8 +37,8 @@ test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1); bb = elm_bubble_add(win); - elm_bubble_label_set(bb, "Message 1"); - elm_bubble_info_set(bb, "Corner: bottom_right"); + elm_object_text_set(bb, "Message 1"); + elm_object_text_part_set(bb, "info", "Corner: bottom_right"); elm_bubble_icon_set(bb, ic); elm_bubble_corner_set(bb, "bottom_right"); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); @@ -55,8 +55,8 @@ test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bb); bb = elm_bubble_add(win); - elm_bubble_label_set(bb, "Message 2"); - elm_bubble_info_set(bb, "10:32 4/11/2008"); + elm_object_text_set(bb, "Message 2"); + elm_object_text_part_set(bb, "info", "10:32 4/11/2008"); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c index 931f729..34bc94c 100644 --- a/src/bin/test_focus.c +++ b/src/bin/test_focus.c @@ -346,7 +346,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info { Evas_Object *fr = elm_bubble_add(win); - elm_bubble_label_set(fr, "Bubble"); + elm_object_text_set(fr, "Bubble"); evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/bin/test_win_inline.c b/src/bin/test_win_inline.c index 0450c56..e4122f3 100644 --- a/src/bin/test_win_inline.c +++ b/src/bin/test_win_inline.c @@ -53,8 +53,8 @@ fill(Evas_Object *win, Eina_Bool do_bg) evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1); bb = elm_bubble_add(win); - elm_bubble_label_set(bb, "Message 3"); - elm_bubble_info_set(bb, "10:32 4/11/2008"); + elm_object_text_set(bb, "Message 3"); + elm_object_text_part_set(bb, "info", "10:32 4/11/2008"); elm_bubble_icon_set(bb, ic); evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); @@ -77,8 +77,8 @@ fill(Evas_Object *win, Eina_Bool do_bg) evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); bb = elm_bubble_add(win); - elm_bubble_label_set(bb, "Message 2"); - elm_bubble_info_set(bb, "7:16 27/10/2008"); + elm_object_text_set(bb, "Message 2"); + elm_object_text_part_set(bb, "info", "7:16 27/10/2008"); elm_bubble_icon_set(bb, ic); evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); @@ -112,8 +112,8 @@ fill(Evas_Object *win, Eina_Bool do_bg) evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1); bb = elm_bubble_add(win); - elm_bubble_label_set(bb, "Message 1"); - elm_bubble_info_set(bb, "20:47 18/6/2008"); + elm_object_text_set(bb, "Message 1"); + elm_object_text_part_set(bb, "info", "20:47 18/6/2008"); elm_bubble_icon_set(bb, ic); evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); diff --git a/src/edje_externals/elm_bubble.c b/src/edje_externals/elm_bubble.c index 1de2e82..d13099e 100644 --- a/src/edje_externals/elm_bubble.c +++ b/src/edje_externals/elm_bubble.c @@ -18,9 +18,9 @@ external_bubble_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f else if (from_params) p = from_params; else return; - if (p->label) elm_bubble_label_set(obj, p->label); + if (p->label) elm_object_text_set(obj, p->label); if (p->icon) elm_bubble_icon_set(obj, p->icon); - if (p->info) elm_bubble_info_set(obj, p->info); + if (p->info) elm_object_text_part_set(obj, "info", p->info); if (p->content) elm_bubble_content_set(obj, p->content); } @@ -31,7 +31,7 @@ external_bubble_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - elm_bubble_label_set(obj, param->s); + elm_object_text_set(obj, param->s); return EINA_TRUE; } } @@ -49,7 +49,7 @@ external_bubble_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ex { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - elm_bubble_info_set(obj, param->s); + elm_object_text_part_set(obj, "info", param->s); return EINA_TRUE; } } @@ -78,7 +78,7 @@ external_bubble_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - param->s = elm_bubble_label_get(obj); + param->s = elm_object_text_get(obj); return EINA_TRUE; } } @@ -91,7 +91,7 @@ external_bubble_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ex { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - param->s = elm_bubble_info_get(obj); + param->s = elm_object_text_part_get(obj, "info"); return EINA_TRUE; } } -- 2.7.4