From cb7fcefb004dbf5ccf167aea9b6295aee3afb895 Mon Sep 17 00:00:00 2001 From: hermet Date: Wed, 16 Nov 2011 12:51:53 +0000 Subject: [PATCH] elementary - modified content_set/get/unset part names to be simple names. Previous part names are just the swallow part names but in modified version, the part names chaned to simpler meaning names to use. i.e for button elm_object_content_part_set(button, "elm.swallow.icon", icon); -> elm_object_content_part_set(button, "icon", icon); git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@65295 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/bin/test_anchorblock.c | 6 +++--- src/bin/test_bubble.c | 2 +- src/bin/test_win_inline.c | 6 +++--- src/edje_externals/elm_bubble.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/bin/test_anchorblock.c b/src/bin/test_anchorblock.c index fe51eff..aa27371 100644 --- a/src/bin/test_anchorblock.c +++ b/src/bin/test_anchorblock.c @@ -148,7 +148,7 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 3"); - elm_object_part_text_set(bb, "info", "10:32 4/11/2008"); + elm_object_text_part_set(bb, "info", "10:32 4/11/2008"); elm_object_content_part_set(bb, "icon", ic); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); evas_object_show(ic); @@ -175,7 +175,7 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 2"); - elm_object_part_text_set(bb, "info", "7:16 27/10/2008"); + elm_object_text_part_set(bb, "info", "7:16 27/10/2008"); elm_object_content_part_set(bb, "icon", ic); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); evas_object_show(ic); @@ -212,7 +212,7 @@ test_anchorblock(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 1"); - elm_object_part_text_set(bb, "info", "20:47 18/6/2008"); + elm_object_text_part_set(bb, "info", "20:47 18/6/2008"); elm_object_content_part_set(bb, "icon", 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 c4b2cbf..0d83cd4 100644 --- a/src/bin/test_bubble.c +++ b/src/bin/test_bubble.c @@ -38,7 +38,7 @@ test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 1"); - elm_object_part_text_set(bb, "info", "Corner: bottom_right"); + elm_object_text_part_set(bb, "info", "Corner: bottom_right"); elm_object_content_part_set(bb, "icon", ic); elm_bubble_corner_set(bb, "bottom_right"); evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL); diff --git a/src/bin/test_win_inline.c b/src/bin/test_win_inline.c index 804a059..f7f99be 100644 --- a/src/bin/test_win_inline.c +++ b/src/bin/test_win_inline.c @@ -54,7 +54,7 @@ fill(Evas_Object *win, Eina_Bool do_bg) bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 3"); - elm_object_part_text_set(bb, "info", "10:32 4/11/2008"); + elm_object_text_part_set(bb, "info", "10:32 4/11/2008"); elm_object_content_part_set(bb, "icon", ic); evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); @@ -78,7 +78,7 @@ fill(Evas_Object *win, Eina_Bool do_bg) bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 2"); - elm_object_part_text_set(bb, "info", "7:16 27/10/2008"); + elm_object_text_part_set(bb, "info", "7:16 27/10/2008"); elm_object_content_part_set(bb, "icon", ic); evas_object_show(ic); evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0); @@ -113,7 +113,7 @@ fill(Evas_Object *win, Eina_Bool do_bg) bb = elm_bubble_add(win); elm_object_text_set(bb, "Message 1"); - elm_object_part_text_set(bb, "info", "20:47 18/6/2008"); + elm_object_text_part_set(bb, "info", "20:47 18/6/2008"); elm_object_content_part_set(bb, "icon", 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 b79b693..76858a2 100644 --- a/src/edje_externals/elm_bubble.c +++ b/src/edje_externals/elm_bubble.c @@ -21,8 +21,8 @@ external_bubble_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_object_content_part_set(obj, "icon", p->icon); - if (p->info) elm_object_part_text_set(obj, "info", p->info); - if (p->content) elm_object_content_set(obj, p->content); + if (p->info) elm_object_text_part_set(obj, "info", p->info); + if (p->content) elm_bubble_content_set(obj, p->content); } static Eina_Bool -- 2.7.4