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

elm: change elm_object_content_part_set/get/unset to elm_object_part_content_set/get/unset 

SVN revision: 65349
This commit is contained in:
Boris Faure 2011-11-17 21:02:31 +00:00
parent bb179c2569
commit 1112d30a41
67 changed files with 283 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/elementary/doc/examples.dox
View File

@ -3133,8 +3133,8 @@
* Finally, we have an area in this layout theme, in the bottom part of it,
* reserved for adding an specific widget. Differently from the 2 parts
* described until now, this one can only receive one widget with the call
* elm_object_content_part_set() for the layout. If there was already an item on this specific part,
* it will be deleted (one can use elm_object_content_part_unset() in order to remove
* elm_object_part_content_set() for the layout. If there was already an item on this specific part,
* it will be deleted (one can use elm_object_part_content_unset() in order to remove
* it without deleting). An example of removing it without deleting, but
* manually deleting this widget just after that, can be seen on the callback
* for this button. Actually, the callback defined for this button will clean
@ -3146,7 +3146,7 @@
* Also notice that, for this last added button, we don't have to call
* evas_object_show() on it. This is a particularity of the theme for layouts,
* that will have total control over the properties like size, position,
* visibility and clipping of a widget added with elm_object_content_part_set().
* visibility and clipping of a widget added with elm_object_part_content_set().
* Again, read the Edje documentation to understand this better.
*
* Now we just put the code for the different callbacks specified for each kind

2
legacy/elementary/doc/widgets/widget_preview_bubble2.c
View File

@ -9,7 +9,7 @@ elm_object_text_set(o, "Bubble");
Evas_Object *o2 = elm_icon_add(win);
elm_icon_standard_set(o2, "home");
elm_object_content_part_set(o, "icon", o2);
elm_object_part_content_set(o, "icon", o2);
evas_object_show(o2);
#include "widget_preview_tmpl_foot.c"

2
legacy/elementary/doc/widgets/widget_preview_bubble3.c
View File

@ -7,7 +7,7 @@ evas_object_show(o);
Evas_Object *o2 = elm_icon_add(win);
elm_icon_standard_set(o2, "home");
elm_object_content_part_set(o, "icon", o2);
elm_object_part_content_set(o, "icon", o2);
evas_object_show(o2);
#include "widget_preview_tmpl_foot.c"

2
legacy/elementary/doc/widgets/widget_preview_button2.c
View File

@ -9,7 +9,7 @@ elm_object_text_set(o, "Button");
Evas_Object *o2 = elm_icon_add(win);
elm_icon_standard_set(o2, "home");
elm_object_content_part_set(o, "icon", o2);
elm_object_part_content_set(o, "icon", o2);
evas_object_show(o2);
#include "widget_preview_tmpl_foot.c"

2
legacy/elementary/doc/widgets/widget_preview_button3.c
View File

@ -7,7 +7,7 @@ evas_object_show(o);
Evas_Object *o2 = elm_icon_add(win);
elm_icon_standard_set(o2, "home");
elm_object_content_part_set(o, "icon", o2);
elm_object_part_content_set(o, "icon", o2);
evas_object_show(o2);
#include "widget_preview_tmpl_foot.c"

2
legacy/elementary/doc/widgets/widget_preview_check2.c
View File

@ -9,7 +9,7 @@ elm_object_text_set(o, "Check");
Evas_Object *o2 = elm_icon_add(win);
elm_icon_standard_set(o2, "home");
elm_object_content_part_set(o, "icon", o2);
elm_object_part_content_set(o, "icon", o2);
evas_object_show(o2);
#include "widget_preview_tmpl_foot.c"

2
legacy/elementary/doc/widgets/widget_preview_check3.c
View File

@ -7,7 +7,7 @@ evas_object_show(o);
Evas_Object *o2 = elm_icon_add(win);
elm_icon_standard_set(o2, "home");
elm_object_content_part_set(o, "icon", o2);
elm_object_part_content_set(o, "icon", o2);
evas_object_show(o2);
#include "widget_preview_tmpl_foot.c"

2
legacy/elementary/doc/widgets/widget_preview_layout.c
View File

@ -13,7 +13,7 @@ evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_min_set(icon, 200, 140);
evas_object_show(icon);
elm_object_content_part_set(layout, "elm.swallow.content", icon);
elm_object_part_content_set(layout, "elm.swallow.content", icon);
elm_object_part_text_set(layout, "elm.text.title", "Layout");
#include "widget_preview_tmpl_foot.c"

4
legacy/elementary/doc/widgets/widget_preview_panes.c
View File

@ -10,13 +10,13 @@ elm_object_text_set(bt, "Left");
evas_object_size_hint_weight_set(bt, 1.0, 1.0);
evas_object_size_hint_align_set(bt, -1.0, -1.0);
evas_object_show(bt);
elm_object_content_part_set(panes, "left", bt);
elm_object_part_content_set(panes, "left", bt);
bt = elm_button_add(win);
elm_object_text_set(bt, "Right");
evas_object_size_hint_weight_set(bt, 1.0, 1.0);
evas_object_size_hint_align_set(bt, -1.0, -1.0);
evas_object_show(bt);
elm_object_content_part_set(panes, "right", bt);
elm_object_part_content_set(panes, "right", bt);
#include "widget_preview_tmpl_foot.c"

2
legacy/elementary/doc/widgets/widget_preview_progressbar.c
View File

@ -15,7 +15,7 @@ evas_object_show(ic);
pb = elm_progressbar_add(win);
elm_object_text_set(pb, "Label");
elm_progressbar_span_size_set(pb, 100);
elm_object_content_part_set(pb, "icon", ic);
elm_object_part_content_set(pb, "icon", ic);
elm_progressbar_unit_format_set(pb, "%1.1f units");
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

2
legacy/elementary/src/bin/test.c
View File

@ -548,7 +548,7 @@ add_tests:
ic = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), t->icon);
elm_icon_file_set(ic, buf, NULL);
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
evas_object_show(ic);
}
elm_box_pack_end(tbx2, bt);

6
legacy/elementary/src/bin/test_anchorblock.c
View File

@ -149,7 +149,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_content_part_set(bb, "icon", ic);
elm_object_part_content_set(bb, "icon", ic);
evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL);
evas_object_show(ic);
evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);
@ -176,7 +176,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_content_part_set(bb, "icon", ic);
elm_object_part_content_set(bb, "icon", ic);
evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL);
evas_object_show(ic);
evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);
@ -213,7 +213,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_content_part_set(bb, "icon", ic);
elm_object_part_content_set(bb, "icon", ic);
evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL);
evas_object_show(ic);
evas_object_size_hint_weight_set(bb, EVAS_HINT_EXPAND, 0.0);

4
legacy/elementary/src/bin/test_bg.c
View File

@ -26,10 +26,10 @@ _cb_overlay_changed(void *data, Evas_Object *obj, void *event __UNUSED__)
parent = elm_object_parent_widget_get(o_bg);
over = edje_object_add(evas_object_evas_get(parent));
edje_object_file_set(over, buff, "bg_overlay");
elm_object_content_part_set(o_bg, "overlay", over);
elm_object_part_content_set(o_bg, "overlay", over);
}
else
elm_object_content_part_set(o_bg, "overlay", NULL);
elm_object_part_content_set(o_bg, "overlay", NULL);
}
static void

2
legacy/elementary/src/bin/test_bubble.c
View File

@ -39,7 +39,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_content_part_set(bb, "icon", ic);
elm_object_part_content_set(bb, "icon", ic);
elm_bubble_corner_set(bb, "bottom_right");
evas_object_smart_callback_add(bb, "clicked", _print_clicked, NULL);
evas_object_show(ic);

14
legacy/elementary/src/bin/test_button.c
View File

@ -64,7 +64,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
bt = elm_button_add(win);
elm_object_text_set(bt, "Icon sized to button");
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)1);
evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)1);
elm_box_pack_end(bx, bt);
@ -77,7 +77,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
elm_icon_scale_set(ic, 0, 0);
bt = elm_button_add(win);
elm_object_text_set(bt, "Icon no scale");
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)2);
evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)2);
elm_box_pack_end(bx, bt);
@ -90,7 +90,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
bt = elm_button_add(win);
elm_object_text_set(bt, "Disabled Button");
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
elm_object_disabled_set(bt, 1);
evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)3);
evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)3);
@ -103,7 +103,7 @@ test_button(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);
bt = elm_button_add(win);
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
elm_object_disabled_set(bt, 1);
evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)4);
evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)4);
@ -127,7 +127,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
bt = elm_button_add(win);
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)6);
evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)6);
elm_box_pack_end(bx, bt);
@ -148,7 +148,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
bt = elm_button_add(win);
elm_object_style_set(bt, "anchor");
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)8);
evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)8);
elm_box_pack_end(bx, bt);
@ -162,7 +162,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
bt = elm_button_add(win);
elm_object_access_info_set(bt, "This is some custom text describing this widget");
elm_object_style_set(bt, "anchor");
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
elm_object_disabled_set(bt, 1);
evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)9);
evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)9);

8
legacy/elementary/src/bin/test_check.c
View File

@ -40,7 +40,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5);
elm_object_text_set(ck, "Icon sized to check");
elm_object_content_part_set(ck, "icon", ic);
elm_object_part_content_set(ck, "icon", ic);
elm_check_state_set(ck, 1);
elm_box_pack_end(bx, ck);
evas_object_show(ck);
@ -54,7 +54,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
elm_icon_scale_set(ic, 0, 0);
ck = elm_check_add(win);
elm_object_text_set(ck, "Icon no scale");
elm_object_content_part_set(ck, "icon", ic);
elm_object_part_content_set(ck, "icon", ic);
elm_box_pack_end(bx, ck);
evas_object_show(ck);
evas_object_show(ic);
@ -74,7 +74,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5);
elm_object_text_set(ck, "Disabled check");
elm_object_content_part_set(ck, "icon", ic);
elm_object_part_content_set(ck, "icon", ic);
elm_check_state_set(ck, 1);
elm_box_pack_end(bx, ck);
elm_object_disabled_set(ck, 1);
@ -86,7 +86,7 @@ test_check(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
elm_icon_file_set(ic, buf, NULL);
elm_icon_scale_set(ic, 0, 0);
ck = elm_check_add(win);
elm_object_content_part_set(ck, "icon", ic);
elm_object_part_content_set(ck, "icon", ic);
elm_box_pack_end(bx, ck);
evas_object_show(ck);
evas_object_show(ic);

2
legacy/elementary/src/bin/test_colorselector.c
View File

@ -60,7 +60,7 @@ test_colorselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
re = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_show(re);
elm_object_content_part_set(ly, "ColorPreview", re);
elm_object_part_content_set(ly, "ColorPreview", re);
fr = elm_frame_add(win);
evas_object_size_hint_weight_set(fr, 1.0, 0);

4
legacy/elementary/src/bin/test_cursor.c
View File

@ -451,11 +451,11 @@ test_cursor4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
elm_layout_file_set(ly, buf, "test/layout/swallow");
bt = elm_button_add(win);
elm_object_text_set(bt, "Cursor over obj");
elm_object_content_part_set(ly, "swallow1", bt);
elm_object_part_content_set(ly, "swallow1", bt);
elm_object_cursor_set(bt, ELM_CURSOR_PIRATE);
bt = elm_button_add(win);
elm_object_text_set(bt, "Cursor over part");
elm_object_content_part_set(ly, "swallow2", bt);
elm_object_part_content_set(ly, "swallow2", bt);
elm_layout_part_cursor_set(ly, "swallow2", ELM_CURSOR_PIRATE);
elm_box_pack_end(bx, ly);
evas_object_show(ly);

6
legacy/elementary/src/bin/test_entry.c
View File

@ -1305,7 +1305,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
elm_entry_entry_set(en, "This is a single line");
elm_entry_single_line_set(en, 1);
elm_object_content_part_set(ly, "element1", en);
elm_object_part_content_set(ly, "element1", en);
evas_object_show(en);
en = elm_entry_add(win);
@ -1318,7 +1318,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
"use it more flexibly.");
evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_content_part_set(ly, "element2", en);
elm_object_part_content_set(ly, "element2", en);
evas_object_show(en);
en = elm_entry_add(win);
@ -1339,7 +1339,7 @@ test_entry4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
"good testing to see if entry widgets work as advertised."
);
evas_object_smart_callback_add(en, "anchor,clicked", scrolled_anchor_test, en);
elm_object_content_part_set(ly, "element3", en);
elm_object_part_content_set(ly, "element3", en);
evas_object_show(en);
evas_object_show(win);

6
legacy/elementary/src/bin/test_flip.c
View File

@ -104,15 +104,15 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
bt = elm_button_add(ly);
elm_object_text_set(bt, "Button 1");
elm_object_content_part_set(ly, "element1", bt);
elm_object_part_content_set(ly, "element1", bt);
bt = elm_button_add(ly);
elm_object_text_set(bt, "Button 2");
elm_object_content_part_set(ly, "element2", bt);
elm_object_part_content_set(ly, "element2", bt);
bt = elm_button_add(ly);
elm_object_text_set(bt, "Button 3");
elm_object_content_part_set(ly, "element3", bt);
elm_object_part_content_set(ly, "element3", bt);
evas_object_show(fl);

4
legacy/elementary/src/bin/test_focus.c
View File

@ -262,7 +262,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL,
EVAS_HINT_FILL);
evas_object_size_hint_weight_set(bx2, 0.0, 0.0);
elm_object_content_part_set(ly, "element1", bx2);
elm_object_part_content_set(ly, "element1", bx2);
my_show(bx2);
for (i = 3; i; i--)
@ -284,7 +284,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL,
EVAS_HINT_FILL);
evas_object_size_hint_weight_set(bx2, 0.0, 0.0);
elm_object_content_part_set(ly, "element2", bx2);
elm_object_part_content_set(ly, "element2", bx2);
my_show(bx2);
{

6
legacy/elementary/src/bin/test_focus2.c
View File

@ -102,7 +102,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
bt1 = bt = elm_button_add(ly);
elm_object_text_set(bt, "Button 1");
elm_object_content_part_set(ly, "element1", bt);
elm_object_part_content_set(ly, "element1", bt);
en = elm_entry_add(ly);
elm_entry_scrollable_set(en, EINA_TRUE);
@ -111,11 +111,11 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
elm_entry_scrollbar_policy_set(en, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
elm_entry_entry_set(en, "Scrolled Entry that should get focus");
elm_entry_single_line_set(en, 1);
elm_object_content_part_set(ly, "element2", en);
elm_object_part_content_set(ly, "element2", en);
bt = elm_button_add(ly);
elm_object_text_set(bt, "Button 2");
elm_object_content_part_set(ly, "element3", bt);
elm_object_part_content_set(ly, "element3", bt);
bt = elm_button_add(PARENT);
elm_object_text_set(bt, "Give focus to layout");

2
legacy/elementary/src/bin/test_gesture_layer.c
View File

@ -392,7 +392,7 @@ test_gesture_layer(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
Evas_Object *postit = elm_layout_add(win);
snprintf(buf, sizeof(buf), "%s/objects/postit_ent.edj", elm_app_data_dir_get());
elm_layout_file_set(postit, buf, "main");
elm_object_content_part_set(postit, "ent", en);
elm_object_part_content_set(postit, "ent", en);
photo_array[ind++] = photo_object_add(win, postit, NULL, 50, 50, 382, 400, 355);

14
legacy/elementary/src/bin/test_launcher.c
View File

@ -408,17 +408,17 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
bt = elm_button_add(win);
elm_object_text_set(bt, "Button 1");
elm_object_content_part_set(ly, "element1", bt);
elm_object_part_content_set(ly, "element1", bt);
evas_object_show(bt);
bt = elm_button_add(win);
elm_object_text_set(bt, "Button 2");
elm_object_content_part_set(ly, "element2", bt);
elm_object_part_content_set(ly, "element2", bt);
evas_object_show(bt);
bt = elm_button_add(win);
elm_object_text_set(bt, "Button 3");
elm_object_content_part_set(ly, "element3", bt);
elm_object_part_content_set(ly, "element3", bt);
evas_object_show(bt);
mb = elm_mapbuf_add(win);
@ -595,7 +595,7 @@ l3_tim_cb(void *data)
slx = (int)(long)evas_object_data_get(data, "slx");
sly = (int)(long)evas_object_data_get(data, "sly");
snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly);
elm_object_content_part_unset(ly, buf);
elm_object_part_content_unset(ly, buf);
edje_object_signal_emit(elm_layout_edje_get(ly2), "drag", "app");
return EINA_FALSE;
}
@ -671,7 +671,7 @@ l3_ic_up_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *e
slx = (int)(long)evas_object_data_get(obj, "slx");
sly = (int)(long)evas_object_data_get(obj, "sly");
snprintf(buf, sizeof(buf), "slot.%i.%i", slx, sly);
elm_object_content_part_set(ly, buf, ly2);
elm_object_part_content_set(ly, buf, ly2);
list = (Eina_List *)evas_object_data_get
(elm_object_top_widget_get(obj), "mbs");
EINA_LIST_FOREACH(list, l, mb)
@ -812,7 +812,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
elm_icon_scale_set(ic, 0, 0);
evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(ic, 0.5, 0.5);
elm_object_content_part_set(ly2, "slot", ic);
elm_object_part_content_set(ly2, "slot", ic);
evas_object_show(ic);
evas_object_event_callback_add(ic, EVAS_CALLBACK_DEL, l3_ic_del_cb, ic);
@ -830,7 +830,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
evas_object_data_set(ic, "sly", (void *)(long)(j));
snprintf(buf, sizeof(buf), "slot.%i.%i", i, j);
elm_object_content_part_set(ly, buf, ly2);
elm_object_part_content_set(ly, buf, ly2);
evas_object_show(ly2);
n++; if (n > 23) n = 0;

6
legacy/elementary/src/bin/test_layout.c
View File

@ -60,19 +60,19 @@ test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
bt = elm_button_add(win);
elm_object_text_set(bt, "Button 1");
elm_object_content_part_set(ly, "element1", bt);
elm_object_part_content_set(ly, "element1", bt);
evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
evas_object_show(bt);
bt = elm_button_add(win);
elm_object_text_set(bt, "Button 2");
elm_object_content_part_set(ly, "element2", bt);
elm_object_part_content_set(ly, "element2", bt);
evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
evas_object_show(bt);
bt = elm_button_add(win);
elm_object_text_set(bt, "Button 3");
elm_object_content_part_set(ly, "element3", bt);
elm_object_part_content_set(ly, "element3", bt);
evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
evas_object_show(bt);

2
legacy/elementary/src/bin/test_map.c
View File

@ -546,7 +546,7 @@ _marker_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data)
evas_object_show(icon);
Evas_Object *o = elm_button_add(obj);
elm_object_content_part_set(o, "icon", icon);
elm_object_part_content_set(o, "icon", icon);
evas_object_show(o);
elm_box_pack_end(bx, o);
}

4
legacy/elementary/src/bin/test_naviframe.c
View File

@ -83,7 +83,7 @@ _page4(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
bt = elm_button_add(nf);
evas_object_smart_callback_add(bt, "clicked", _page5, nf);
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
content = _content_new(nf, img4);
@ -152,7 +152,7 @@ _page2(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
elm_app_data_dir_get());
elm_icon_file_set(ic, buf, NULL);
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
content = _content_new(nf, img2);

6
legacy/elementary/src/bin/test_pager.c
View File

@ -218,16 +218,16 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
bt = elm_button_add(win);
elm_object_text_set(bt, "Flip to 1");
evas_object_smart_callback_add(bt, "clicked", my_pager_4, &info);
elm_object_content_part_set(ly2, "element1", bt);
elm_object_part_content_set(ly2, "element1", bt);
evas_object_show(bt);
bt = elm_button_add(win);
elm_object_text_set(bt, "Popme");
evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
evas_object_show(bt);
elm_object_content_part_set(ly2, "element2", bt);
elm_object_part_content_set(ly2, "element2", bt);
elm_object_content_part_set(ly, "swallow", ly2);
elm_object_part_content_set(ly, "swallow", ly2);
evas_object_show(ly);
elm_pager_content_push(pg, ly);

8
legacy/elementary/src/bin/test_panes.c
View File

@ -73,7 +73,7 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_weight_set(bt, 1.0, 1.0);
evas_object_size_hint_align_set(bt, -1.0, -1.0);
evas_object_show(bt);
elm_object_content_part_set(panes, "left", bt);
elm_object_part_content_set(panes, "left", bt);
//
//
@ -88,7 +88,7 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_smart_callback_add(panes_h, "press", _press, panes_h);
evas_object_smart_callback_add(panes_h, "unpress", _unpress, panes_h);
elm_object_content_part_set(panes, "right", panes_h);
elm_object_part_content_set(panes, "right", panes_h);
//
//
@ -97,7 +97,7 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(bt);
elm_object_content_part_set(panes_h, "left", bt);
elm_object_part_content_set(panes_h, "left", bt);
//
//
@ -106,7 +106,7 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(bt);
elm_object_content_part_set(panes_h, "right", bt);
elm_object_part_content_set(panes_h, "right", bt);
//

4
legacy/elementary/src/bin/test_progressbar.c
View File

@ -115,7 +115,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
pb = elm_progressbar_add(win);
elm_object_text_set(pb, "Label");
elm_object_content_part_set(pb, "icon", ic1);
elm_object_part_content_set(pb, "icon", ic1);
elm_progressbar_inverted_set(pb, 1);
elm_progressbar_unit_format_set(pb, "%1.1f units");
elm_progressbar_span_size_set(pb, 200);
@ -162,7 +162,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
pb = elm_progressbar_add(win);
elm_progressbar_horizontal_set(pb, EINA_FALSE);
elm_object_text_set(pb, "Label");
elm_object_content_part_set(pb, "icon", ic2);
elm_object_part_content_set(pb, "icon", ic2);
elm_progressbar_inverted_set(pb, 1);
elm_progressbar_unit_format_set(pb, "%1.2f%%");
elm_progressbar_span_size_set(pb, 200);

8
legacy/elementary/src/bin/test_radio.c
View File

@ -33,7 +33,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_weight_set(rd, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(rd, EVAS_HINT_FILL, 0.5);
elm_object_text_set(rd, "Icon sized to radio");
elm_object_content_part_set(rd, "icon", ic);
elm_object_part_content_set(rd, "icon", ic);
elm_box_pack_end(bx, rd);
evas_object_show(rd);
evas_object_show(ic);
@ -48,7 +48,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
elm_radio_state_value_set(rd, 1);
elm_radio_group_add(rd, rdg);
elm_object_text_set(rd, "Icon no scale");
elm_object_content_part_set(rd, "icon", ic);
elm_object_part_content_set(rd, "icon", ic);
elm_box_pack_end(bx, rd);
evas_object_show(rd);
evas_object_show(ic);
@ -76,7 +76,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
rd = elm_radio_add(win);
elm_radio_state_value_set(rd, 4);
elm_radio_group_add(rd, rdg);
elm_object_content_part_set(rd, "icon", ic);
elm_object_part_content_set(rd, "icon", ic);
elm_box_pack_end(bx, rd);
evas_object_show(rd);
evas_object_show(ic);
@ -89,7 +89,7 @@ test_radio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
rd = elm_radio_add(win);
elm_radio_state_value_set(rd, 5);
elm_radio_group_add(rd, rdg);
elm_object_content_part_set(rd, "icon", ic);
elm_object_part_content_set(rd, "icon", ic);
elm_object_disabled_set(rd, 1);
elm_box_pack_end(bx, rd);
evas_object_show(rd);

8
legacy/elementary/src/bin/test_segment_control.c
View File

@ -93,10 +93,10 @@ test_segment_control(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *e
elm_segment_control_item_add(segment4, NULL, "Disabled");
elm_object_disabled_set(segment4, EINA_TRUE);
elm_object_content_part_set(in_layout, "segment1", segment1);
elm_object_content_part_set(in_layout, "segment2", segment2);
elm_object_content_part_set(in_layout, "segment3", segment3);
elm_object_content_part_set(in_layout, "segment4", segment4);
elm_object_part_content_set(in_layout, "segment1", segment1);
elm_object_part_content_set(in_layout, "segment2", segment2);
elm_object_part_content_set(in_layout, "segment3", segment3);
elm_object_part_content_set(in_layout, "segment4", segment4);
evas_object_show(in_layout);

12
legacy/elementary/src/bin/test_slider.c
View File

@ -39,7 +39,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
sl = elm_slider_add(win);
sl1 = sl;
elm_object_text_set(sl, "Horizontal");
elm_object_content_part_set(sl, "icon", ic);
elm_object_part_content_set(sl, "icon", ic);
elm_slider_unit_format_set(sl, "%1.1f units");
elm_slider_span_size_set(sl, 120);
evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
@ -56,7 +56,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
sl = elm_slider_add(win);
elm_object_text_set(sl, "Disabled");
elm_object_content_part_set(sl, "icon", ic);
elm_object_part_content_set(sl, "icon", ic);
elm_slider_unit_format_set(sl, "%1.1f units");
elm_slider_span_size_set(sl, 120);
elm_slider_min_max_set(sl, 50, 150);
@ -75,7 +75,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
sl = elm_slider_add(win);
elm_object_text_set(sl, "Horizontal inverted");
elm_object_content_part_set(sl, "end", ic);
elm_object_part_content_set(sl, "end", ic);
elm_slider_span_size_set(sl, 80);
evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@ -97,7 +97,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
sl = elm_slider_add(win);
elm_object_text_set(sl, "Disabled inverted");
elm_object_content_part_set(sl, "end", ic);
elm_object_part_content_set(sl, "end", ic);
elm_slider_span_size_set(sl, 80);
evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@ -140,7 +140,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
sl = elm_slider_add(win);
elm_object_content_part_set(sl, "icon", ic);
elm_object_part_content_set(sl, "icon", ic);
elm_object_text_set(sl, "Vertical inverted");
elm_slider_inverted_set(sl, EINA_TRUE);
elm_slider_unit_format_set(sl, "units");
@ -178,7 +178,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_HORIZONTAL, 1, 1);
sl = elm_slider_add(win);
elm_object_content_part_set(sl, "icon", ic);
elm_object_part_content_set(sl, "icon", ic);
elm_object_text_set(sl, "Disabled vertical");
elm_slider_inverted_set(sl, EINA_TRUE);
elm_slider_unit_format_set(sl, "units");

8
legacy/elementary/src/bin/test_toggle.c
View File

@ -33,7 +33,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
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_object_content_part_set(tg, "icon", ic);
elm_object_part_content_set(tg, "icon", ic);
elm_check_state_set(tg, 1);
elm_object_part_text_set(tg, "on", "Yes");
elm_object_part_text_set(tg, "off", "No");
@ -49,7 +49,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
tg = elm_check_add(win);
elm_object_style_set(tg, "toggle");
elm_object_text_set(tg, "Icon no scale");
elm_object_content_part_set(tg, "icon", ic);
elm_object_part_content_set(tg, "icon", ic);
elm_box_pack_end(bx, tg);
evas_object_show(tg);
evas_object_show(ic);
@ -62,7 +62,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
tg = elm_check_add(win);
elm_object_style_set(tg, "toggle");
elm_object_text_set(tg, "Icon no scale");
elm_object_content_part_set(tg, "icon", ic);
elm_object_part_content_set(tg, "icon", ic);
elm_object_disabled_set(tg, 1);
elm_box_pack_end(bx, tg);
evas_object_show(tg);
@ -83,7 +83,7 @@ test_toggle(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
tg = elm_check_add(win);
elm_object_style_set(tg, "toggle");
elm_object_content_part_set(tg, "icon", ic);
elm_object_part_content_set(tg, "icon", ic);
elm_box_pack_end(bx, tg);
evas_object_show(tg);
evas_object_show(ic);

10
legacy/elementary/src/bin/test_transit.c
View File

@ -262,7 +262,7 @@ test_transit(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
bt = elm_button_add(win);
elm_object_text_set(bt, "ImageAnimation Effect");
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
elm_box_pack_end(bx, bt);
evas_object_show(bt);
evas_object_show(ic);
@ -392,7 +392,7 @@ test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_max_set(ic, 50, 50);
bt = elm_button_add(win);
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
elm_object_text_set(bt, "Before Button - Blend Effect");
evas_object_move(bt, 25, 125);
evas_object_resize(bt, 250, 50);
@ -404,7 +404,7 @@ test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_max_set(ic, 50, 50);
bt2 = elm_button_add(win);
elm_object_content_part_set(bt2, "icon", ic);
elm_object_part_content_set(bt2, "icon", ic);
elm_object_text_set(bt2, "After Button - Blend Effect");
evas_object_move(bt2, 25, 125);
evas_object_resize(bt2, 250, 50);
@ -438,7 +438,7 @@ test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_max_set(ic, 50, 50);
bt = elm_button_add(win);
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
elm_object_text_set(bt, "Before Button - Fade Effect");
evas_object_move(bt, 25, 125);
evas_object_resize(bt, 250, 50);
@ -450,7 +450,7 @@ test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_max_set(ic, 50, 50);
bt2 = elm_button_add(win);
elm_object_content_part_set(bt2, "icon", ic);
elm_object_part_content_set(bt2, "icon", ic);
elm_object_text_set(bt2, "After Button - Fade Effect");
evas_object_move(bt2, 25, 125);
evas_object_resize(bt2, 250, 50);

6
legacy/elementary/src/bin/test_win_inline.c
View File

@ -55,7 +55,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_content_part_set(bb, "icon", ic);
elm_object_part_content_set(bb, "icon", ic);
evas_object_show(ic);
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);
@ -79,7 +79,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_content_part_set(bb, "icon", ic);
elm_object_part_content_set(bb, "icon", ic);
evas_object_show(ic);
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);
@ -114,7 +114,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_content_part_set(bb, "icon", ic);
elm_object_part_content_set(bb, "icon", ic);
evas_object_show(ic);
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);

4
legacy/elementary/src/edje_externals/elm_bubble.c
View File

@ -20,7 +20,7 @@ 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);
elm_object_part_content_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);
}
@ -42,7 +42,7 @@ external_bubble_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_object_content_part_set(obj, "icon", icon);
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
}

4
legacy/elementary/src/edje_externals/elm_button.c
View File

@ -19,7 +19,7 @@ external_button_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);
elm_object_part_content_set(obj, "icon", p->icon);
}
static Eina_Bool
@ -39,7 +39,7 @@ external_button_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_object_content_part_set(obj, "icon", icon);
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
}

4
legacy/elementary/src/edje_externals/elm_check.c
View File

@ -21,7 +21,7 @@ external_check_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
if (p->label)
elm_object_text_set(obj, p->label);
if (p->icon)
elm_object_content_part_set(obj, "icon", p->icon);
elm_object_part_content_set(obj, "icon", p->icon);
if (p->state_exists)
elm_check_state_set(obj, p->state);
}
@ -43,7 +43,7 @@ external_check_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
{
Evas_Object *icon = external_common_param_icon_get(obj, param);
if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
elm_object_content_part_set(obj, "icon", icon);
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
}

12
legacy/elementary/src/edje_externals/elm_panes.c
View File

@ -27,10 +27,10 @@ static void external_panes_state_set(void *data __UNUSED__,
else return;
if (p->content_left)
elm_object_content_part_set(obj, "left", p->content_left);
elm_object_part_content_set(obj, "left", p->content_left);
if (p->content_right)
elm_object_content_part_set(obj, "right", p->content_right);
elm_object_part_content_set(obj, "right", p->content_right);
if (p->is_left_size)
elm_panes_content_left_size_set(obj, p->left_size);
@ -51,7 +51,7 @@ static Eina_Bool external_panes_param_set(void *data __UNUSED__,
Evas_Object *content = external_common_param_edje_object_get(obj, param);
if ((strcmp(param->s, "")) && (!content))
return EINA_FALSE;
elm_object_content_part_set(obj, "left", content);
elm_object_part_content_set(obj, "left", content);
return EINA_TRUE;
}
else if ((!strcmp(param->name, "content right"))
@ -60,7 +60,7 @@ static Eina_Bool external_panes_param_set(void *data __UNUSED__,
Evas_Object *content = external_common_param_edje_object_get(obj, param);
if ((strcmp(param->s, "")) && (!content))
return EINA_FALSE;
elm_object_content_part_set(obj, "right", content);
elm_object_part_content_set(obj, "right", content);
return EINA_TRUE;
}
else if ((!strcmp(param->name, "horizontal"))
@ -170,9 +170,9 @@ external_panes_content_get(void *data __UNUSED__, const Evas_Object *obj,
const char *content)
{
if (!strcmp(content, "left"))
return elm_object_content_part_get(obj, "left");
return elm_object_part_content_get(obj, "left");
else if (!strcmp(content, "right"))
return elm_object_content_part_get(obj, "right");
return elm_object_part_content_get(obj, "right");
ERR("unknown content '%s'", content);

4
legacy/elementary/src/edje_externals/elm_progressbar.c
View File

@ -28,7 +28,7 @@ external_progressbar_state_set(void *data __UNUSED__, Evas_Object *obj, const vo
if (p->label)
elm_object_text_set(obj, p->label);
if (p->icon)
elm_object_content_part_set(obj, "icon", p->icon);
elm_object_part_content_set(obj, "icon", p->icon);
if (p->span_exists)
elm_progressbar_span_size_set(obj, p->span);
if (p->value_exists)
@ -58,7 +58,7 @@ external_progressbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Ed
{
Evas_Object *icon = external_common_param_icon_get(obj, param);
if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
elm_object_content_part_set(obj, "icon", icon);
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
}

4
legacy/elementary/src/edje_externals/elm_radio.c
View File

@ -22,7 +22,7 @@ external_radio_state_set(void *data __UNUSED__, Evas_Object *obj, const void *fr
if (p->label)
elm_object_text_set(obj, p->label);
if (p->icon)
elm_object_content_part_set(obj, "icon", p->icon);
elm_object_part_content_set(obj, "icon", p->icon);
if (p->value_exists)
elm_radio_state_value_set(obj, p->value);
if (p->group_name)
@ -50,7 +50,7 @@ external_radio_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext
{
Evas_Object *icon = external_common_param_icon_get(obj, param);
if ((strcmp(param->s, "")) && (!icon)) return EINA_FALSE;
elm_object_content_part_set(obj, "icon", icon);
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
}

4
legacy/elementary/src/edje_externals/elm_slider.c
View File

@ -30,7 +30,7 @@ external_slider_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);
elm_object_part_content_set(obj, "icon", p->icon);
if (p->span_exists)
elm_slider_span_size_set(obj, p->span);
if ((p->min_exists) && (p->max_exists))
@ -73,7 +73,7 @@ external_slider_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_object_content_part_set(obj, "icon", icon);
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
}

4
legacy/elementary/src/edje_externals/elm_toggle.c
View File

@ -24,7 +24,7 @@ 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_object_content_part_set(obj, "icon", p->icon);
elm_object_part_content_set(obj, "icon", p->icon);
if (p->on)
elm_object_part_text_set(obj, "on", p->on);
@ -52,7 +52,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_object_content_part_set(obj, "icon", icon);
elm_object_part_content_set(obj, "icon", icon);
return EINA_TRUE;
}
}

4
legacy/elementary/src/examples/bg_example_03.c
View File

@ -38,10 +38,10 @@ _cb_overlay_changed(void *data, Evas_Object *obj, void *event __UNUSED__)
parent = elm_object_parent_widget_get(o_bg);
over = edje_object_add(evas_object_evas_get(parent));
edje_object_file_set(over, buff, "bg_overlay");
elm_object_content_part_set(o_bg, "overlay", over);
elm_object_part_content_set(o_bg, "overlay", over);
}
else
elm_object_content_part_set(o_bg, "overlay", NULL);
elm_object_part_content_set(o_bg, "overlay", NULL);
}
static void

2
legacy/elementary/src/examples/bubble_example_01.c
View File

@ -40,7 +40,7 @@ elm_main(int argc, char **argv)
evas_object_show(icon);
bubble = elm_bubble_add(win);
elm_object_content_part_set(bubble, "icon", icon);
elm_object_part_content_set(bubble, "icon", icon);
elm_bubble_info_set(bubble, "INFO");
elm_object_text_set(bubble, "LABEL");
elm_bubble_content_set(bubble, label);

14
legacy/elementary/src/examples/button_example_01.c
View File

@ -24,7 +24,7 @@ static void
_btn_cursors_release_cb(void *data, Evas_Object *btn __UNUSED__, void *ev __UNUSED__)
{
App_Data *app = data;
elm_object_content_part_set(app->mid, "icon", app->icon_still);
elm_object_part_content_set(app->mid, "icon", app->icon_still);
app->icon_still = NULL;
}
@ -40,7 +40,7 @@ _btn_cursors_move_cb(void *data, Evas_Object *btn, void *ev __UNUSED__)
app->icon_still = elm_object_content_unset(app->mid);
icon = elm_icon_add(app->mid);
elm_icon_standard_set(icon, "chat");
elm_object_content_part_set(app->mid, "icon", icon);
elm_object_part_content_set(app->mid, "icon", icon);
}
evas_object_size_hint_align_get(app->mid, &ax, &ay);
@ -185,7 +185,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
icon = elm_icon_add(win);
elm_icon_standard_set(icon, "arrow_up");
elm_object_content_part_set(btn, "icon", icon);
elm_object_part_content_set(btn, "icon", icon);
data.cursors.up = btn;
@ -210,7 +210,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
icon = elm_icon_add(win);
elm_icon_standard_set(icon, "arrow_left");
elm_object_content_part_set(btn, "icon", icon);
elm_object_part_content_set(btn, "icon", icon);
data.cursors.left = btn;
@ -221,7 +221,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
icon = elm_icon_add(win);
elm_icon_standard_set(icon, "close");
elm_object_content_part_set(btn, "icon", icon);
elm_object_part_content_set(btn, "icon", icon);
data.mid = btn;
@ -239,7 +239,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
icon = elm_icon_add(win);
elm_icon_standard_set(icon, "arrow_right");
elm_object_content_part_set(btn, "icon", icon);
elm_object_part_content_set(btn, "icon", icon);
data.cursors.right = btn;
@ -257,7 +257,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
icon = elm_icon_add(win);
elm_icon_standard_set(icon, "arrow_down");
elm_object_content_part_set(btn, "icon", icon);
elm_object_part_content_set(btn, "icon", icon);
data.cursors.down = btn;

2
legacy/elementary/src/examples/check_example_01.c
View File

@ -40,7 +40,7 @@ elm_main(int argc, char **argv)
cb2 = elm_check_add(win);
elm_object_text_set(cb2, "another checkbox");
elm_check_state_set(cb2, EINA_TRUE);
elm_object_content_part_set(cb2, "icon", icon);
elm_object_part_content_set(cb2, "icon", icon);
evas_object_move(cb2, 10, 50);
evas_object_resize(cb2, 200, 30);
evas_object_show(cb2);

2
legacy/elementary/src/examples/entry_example.c
View File

@ -553,7 +553,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
icon = elm_layout_add(win);
elm_layout_theme_set(icon, "entry", "emoticon/haha", "default");
elm_object_content_part_set(o, "icon", icon);
elm_object_part_content_set(o, "icon", icon);
evas_object_smart_callback_add(o, "clicked", _image_insert_cb, &app);

4
legacy/elementary/src/examples/layout_example_01.c
View File

@ -52,7 +52,7 @@ _swallow_btn_cb(void *data, Evas_Object *btn __UNUSED__, void *event_info __UNUS
elm_layout_table_clear(layout, TABLE, EINA_TRUE);
elm_layout_box_remove_all(layout, BOX, EINA_TRUE);
item = elm_object_content_part_unset(layout, SWALLOW);
item = elm_object_part_content_unset(layout, SWALLOW);
evas_object_del(item);
}
@ -139,7 +139,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
bt2 = elm_button_add(win);
elm_object_text_set(bt2, "Delete All");
elm_object_content_part_set(layout, SWALLOW, bt2);
elm_object_part_content_set(layout, SWALLOW, bt2);
evas_object_smart_callback_add(bt2, "clicked", _swallow_btn_cb, layout);
evas_object_size_hint_min_set(bg, 160, 160);

4
legacy/elementary/src/examples/layout_example_02.c
View File

@ -23,7 +23,7 @@ static void
_signal_cb(void *data, Evas_Object *o, const char *emission, const char *source __UNUSED__)
{
struct _App *app = data;
Evas_Object *icon = elm_object_content_part_get(o, "elm.swallow.content");
Evas_Object *icon = elm_object_part_content_get(o, "elm.swallow.content");
printf("signal received\n");
@ -70,7 +70,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
icon = elm_icon_add(win);
elm_icon_standard_set(icon, images[app.current]);
evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_content_part_set(layout, "elm.swallow.content", icon);
elm_object_part_content_set(layout, "elm.swallow.content", icon);
elm_object_signal_callback_add(layout, "elm,action,back", "", _signal_cb, &app);
elm_object_signal_callback_add(layout, "elm,action,next", "", _signal_cb, &app);

2
legacy/elementary/src/examples/layout_example_03.c
View File

@ -83,7 +83,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
elm_object_text_set(btn, "Enlarge me!");
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_content_part_set(layout, SWALLOW, btn);
elm_object_part_content_set(layout, SWALLOW, btn);
evas_object_smart_callback_add(btn, "clicked", _swallow_btn_cb, layout);
evas_object_size_hint_min_set(bg, 160, 160);

8
legacy/elementary/src/examples/panes_example.c
View File

@ -86,7 +86,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(bt);
elm_object_content_part_set(panes, "left", bt);
elm_object_part_content_set(panes, "left", bt);
panes_h = elm_panes_add(win);
elm_panes_horizontal_set(panes_h, EINA_TRUE);
@ -94,21 +94,21 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(panes_h, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(panes_h);
elm_object_content_part_set(panes, "right", panes_h);
elm_object_part_content_set(panes, "right", panes_h);
bt = elm_button_add(win);
elm_object_text_set(bt, "Up");
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(bt);
elm_object_content_part_set(panes_h, "left", bt);
elm_object_part_content_set(panes_h, "left", bt);
bt = elm_button_add(win);
elm_object_text_set(bt, "Down");
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(bt);
elm_object_content_part_set(panes_h, "right", bt);
elm_object_part_content_set(panes_h, "right", bt);
evas_object_smart_callback_add(panes, "clicked", _clicked, panes);
evas_object_smart_callback_add(panes, "clicked,double", _clicked_double,

4
legacy/elementary/src/examples/progressbar_example.c
View File

@ -143,7 +143,7 @@ elm_main(int argc __UNUSED__,
/* pb with label, icon, custom unit label and span size set */
pb = elm_progressbar_add(win);
elm_object_text_set(pb, "Label");
elm_object_content_part_set(pb, "icon", ic1);
elm_object_part_content_set(pb, "icon", ic1);
elm_progressbar_inverted_set(pb, EINA_TRUE);
elm_progressbar_unit_format_set(pb, "%1.1f units");
elm_progressbar_span_size_set(pb, 200);
@ -192,7 +192,7 @@ elm_main(int argc __UNUSED__,
pb = elm_progressbar_add(win);
elm_progressbar_horizontal_set(pb, EINA_FALSE);
elm_object_text_set(pb, "Label");
elm_object_content_part_set(pb, "icon", ic2);
elm_object_part_content_set(pb, "icon", ic2);
elm_progressbar_inverted_set(pb, EINA_TRUE);
elm_progressbar_unit_format_set(pb, "%1.2f%%");
elm_progressbar_span_size_set(pb, 200);

4
legacy/elementary/src/examples/radio_example_01.c
View File

@ -37,7 +37,7 @@ elm_main(int argc, char **argv)
elm_radio_value_pointer_set(radio, &val);
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "home");
elm_object_content_part_set(radio, "icon", ic);
elm_object_part_content_set(radio, "icon", ic);
elm_box_pack_end(bx, radio);
evas_object_size_hint_weight_set(radio, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(radio, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -51,7 +51,7 @@ elm_main(int argc, char **argv)
elm_radio_group_add(radio, group);
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "file");
elm_object_content_part_set(radio, "icon", ic);
elm_object_part_content_set(radio, "icon", ic);
elm_box_pack_end(bx, radio);
evas_object_size_hint_weight_set(radio, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(radio, EVAS_HINT_FILL, EVAS_HINT_FILL);

4
legacy/elementary/src/examples/slider_example.c
View File

@ -85,12 +85,12 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "home");
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
elm_object_content_part_set(sl, "icon", ic);
elm_object_part_content_set(sl, "icon", ic);
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "folder");
elm_icon_scale_set(ic, EINA_FALSE, EINA_FALSE);
elm_object_content_part_set(sl, "end", ic);
elm_object_part_content_set(sl, "end", ic);
evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

2
legacy/elementary/src/examples/transit_example_03.c
View File

@ -227,7 +227,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
icon = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/icon_07.png", PACKAGE_DATA_DIR);
elm_icon_file_set(icon, buf, NULL);
elm_object_content_part_set(obj, "icon", icon);
elm_object_part_content_set(obj, "icon", icon);
evas_object_move(obj, 160, 60);
evas_object_resize(obj, 250, 100);
evas_object_show(obj);

4
legacy/elementary/src/examples/transit_example_04.c
View File

@ -132,7 +132,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
icon = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/icon_07.png", PACKAGE_DATA_DIR);
elm_icon_file_set(icon, buf, NULL);
elm_object_content_part_set(obj, "icon", icon);
elm_object_part_content_set(obj, "icon", icon);
evas_object_move(obj, 160, 60);
evas_object_resize(obj, 250, 100);
evas_object_show(obj);
@ -145,7 +145,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__)
icon = elm_icon_add(win);
snprintf(buf, sizeof(buf), "%s/images/icon_08.png", PACKAGE_DATA_DIR);
elm_icon_file_set(icon, buf, NULL);
elm_object_content_part_set(obj, "icon", icon);
elm_object_part_content_set(obj, "icon", icon);
evas_object_move(obj, 160, 60);
evas_object_resize(obj, 250, 100);

16
legacy/elementary/src/examples/web_example.c
View File

@ -405,7 +405,7 @@ _win_search_trigger_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
ic = elm_icon_add(ad->win);
elm_icon_standard_set(ic, "arrow_up");
elm_object_content_part_set(btn, "icon", ic);
elm_object_part_content_set(btn, "icon", ic);
evas_object_smart_callback_add(btn, "clicked", _search_prev_cb, ad);
@ -415,7 +415,7 @@ _win_search_trigger_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
ic = elm_icon_add(ad->win);
elm_icon_standard_set(ic, "arrow_down");
elm_object_content_part_set(btn, "icon", ic);
elm_object_part_content_set(btn, "icon", ic);
evas_object_smart_callback_add(btn, "clicked", _search_next_cb, ad);
@ -425,7 +425,7 @@ _win_search_trigger_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED
ic = elm_icon_add(ad->win);
elm_icon_standard_set(ic, "close");
elm_object_content_part_set(btn, "icon", ic);
elm_object_part_content_set(btn, "icon", ic);
evas_object_smart_callback_add(btn, "clicked", _search_close_cb, ad);
@ -523,7 +523,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "arrow_left");
elm_object_content_part_set(btn, "icon", ic);
elm_object_part_content_set(btn, "icon", ic);
evas_object_smart_callback_add(btn, "clicked", _nav_back_cb, ad);
@ -535,7 +535,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "refresh");
elm_object_content_part_set(btn, "icon", ic);
elm_object_part_content_set(btn, "icon", ic);
evas_object_smart_callback_add(btn, "clicked", _nav_refresh_cb, ad);
@ -547,7 +547,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "arrow_right");
elm_object_content_part_set(btn, "icon", ic);
elm_object_part_content_set(btn, "icon", ic);
evas_object_smart_callback_add(btn, "clicked", _nav_fwd_cb, ad);
@ -564,7 +564,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "file");
elm_object_content_part_set(btn, "icon", ic);
elm_object_part_content_set(btn, "icon", ic);
evas_object_smart_callback_add(btn, "clicked", _add_tab_cb, ad);
@ -586,7 +586,7 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__)
ic = elm_icon_add(win);
elm_icon_standard_set(ic, "close");
elm_object_content_part_set(btn, "icon", ic);
elm_object_part_content_set(btn, "icon", ic);
pager = elm_pager_add(win);
evas_object_size_hint_weight_set(pager, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

150
legacy/elementary/src/lib/Elementary.h.in
View File

@ -1076,6 +1076,19 @@ extern "C" {
#define elm_object_translatable_text_get(obj) elm_object_translatable_text_part_get((obj), NULL)
/**
* Set a content of an object
*
* @param obj The Elementary object
* @param part The content part name to set (NULL for the default content)
* @param content The new content of the object
*
* @note Elementary objects may have many contents
* @deprecated Use elm_object_part_content_set instead.
* @ingroup General
*/
EINA_DEPRECATED EAPI void elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content);
/**
* Set a content of an object
*
@ -1087,9 +1100,22 @@ extern "C" {
*
* @ingroup General
*/
EAPI void elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content);
EAPI void elm_object_part_content_set(Evas_Object *obj, const char *part, Evas_Object *content);
#define elm_object_content_set(obj, content) elm_object_content_part_set((obj), NULL, (content))
#define elm_object_content_set(obj, content) elm_object_part_content_set((obj), NULL, (content))
/**
* Get a content of an object
*
* @param obj The Elementary object
* @param item The content part name to get (NULL for the default content)
* @return content of the object or NULL for any error
*
* @note Elementary objects may have many contents
* @deprecated Use elm_object_part_content_get instead.
* @ingroup General
*/
EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_get(const Evas_Object *obj, const char *part);
/**
* Get a content of an object
@ -1102,9 +1128,21 @@ extern "C" {
*
* @ingroup General
*/
EAPI Evas_Object *elm_object_content_part_get(const Evas_Object *obj, const char *part);
EAPI Evas_Object *elm_object_part_content_get(const Evas_Object *obj, const char *part);
#define elm_object_content_get(obj) elm_object_content_part_get((obj), NULL)
#define elm_object_content_get(obj) elm_object_part_content_get((obj), NULL)
/**
* Unset a content of an object
*
* @param obj The Elementary object
* @param item The content part name to unset (NULL for the default content)
*
* @note Elementary objects may have many contents
* @deprecated Use elm_object_part_content_unset instead.
* @ingroup General
*/
EINA_DEPRECATED EAPI Evas_Object *elm_object_content_part_unset(Evas_Object *obj, const char *part);
/**
* Unset a content of an object
@ -1116,9 +1154,9 @@ extern "C" {
*
* @ingroup General
*/
EAPI Evas_Object *elm_object_content_part_unset(Evas_Object *obj, const char *part);
EAPI Evas_Object *elm_object_part_content_unset(Evas_Object *obj, const char *part);
#define elm_object_content_unset(obj) elm_object_content_part_unset((obj), NULL)
#define elm_object_content_unset(obj) elm_object_part_content_unset((obj), NULL)
/**
* Set the text to read out when in accessibility mode
@ -4694,7 +4732,7 @@ extern "C" {
* deleted, even if you set the new one to NULL. If you want to keep that
* old content object, use the elm_bg_overlay_unset() function.
*
* @deprecated use elm_object_content_part_set() instead
* @deprecated use elm_object_part_content_set() instead
*
* @ingroup Bg
*/
@ -4709,7 +4747,7 @@ extern "C" {
*
* Return the content object which is set for this widget
*
* @deprecated use elm_object_content_part_get() instead
* @deprecated use elm_object_part_content_get() instead
*
* @ingroup Bg
*/
@ -4723,7 +4761,7 @@ extern "C" {
*
* Unparent and return the overlay object which was set for this widget
*
* @deprecated use elm_object_content_part_unset() instead
* @deprecated use elm_object_part_content_unset() instead
*
* @ingroup Bg
*/
@ -6113,7 +6151,7 @@ extern "C" {
*
* @param obj The button object
* @param icon The icon object for the button
* @deprecated use elm_object_content_part_set() instead.
* @deprecated use elm_object_part_content_set() instead.
*/
EINA_DEPRECATED EAPI void elm_button_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1);
/**
@ -6126,7 +6164,7 @@ extern "C" {
* @param obj The button object
* @return The icon object that is being used
*
* @deprecated use elm_object_content_part_get() instead
* @deprecated use elm_object_part_content_get() instead
*/
EINA_DEPRECATED EAPI Evas_Object *elm_button_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
/**
@ -6139,7 +6177,7 @@ extern "C" {
*
* @param obj The button object
* @return The icon object that was being used
* @deprecated use elm_object_content_part_unset() instead.
* @deprecated use elm_object_part_content_unset() instead.
*/
EINA_DEPRECATED EAPI Evas_Object *elm_button_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);
/**
@ -7569,7 +7607,7 @@ extern "C" {
* If you want to keep that old content object, use the
* elm_toggle_icon_unset() function.
*
* @deprecated use elm_object_content_part_set() instead.
* @deprecated use elm_object_part_content_set() instead.
*/
EINA_DEPRECATED EAPI void elm_toggle_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1);
/**
@ -7582,7 +7620,7 @@ extern "C" {
*
* @see elm_toggle_icon_set()
*
* @deprecated use elm_object_content_part_get() instead.
* @deprecated use elm_object_part_content_get() instead.
*/
EINA_DEPRECATED EAPI Evas_Object *elm_toggle_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
/**
@ -7595,7 +7633,7 @@ extern "C" {
*
* @see elm_toggle_icon_set()
*
* @deprecated use elm_object_content_part_unset() instead.
* @deprecated use elm_object_part_content_unset() instead.
*/
EINA_DEPRECATED EAPI Evas_Object *elm_toggle_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);
/**
@ -9817,7 +9855,7 @@ extern "C" {
* column or row span if necessary.
*
* Again, we could have this design by adding a @ref Table widget to the @c
* SWALLOW part using elm_object_content_part_set(). The same difference happens
* SWALLOW part using elm_object_part_content_set(). The same difference happens
* here when choosing to use the Layout Table (a @c TABLE part) instead of
* the @ref Table plus @c SWALLOW part. It's just a matter of convenience.
*
@ -9913,7 +9951,7 @@ extern "C" {
*
* Once the content object is set, a previously set one will be deleted.
* If you want to keep that old content object, use the
* elm_object_content_part_unset() function.
* elm_object_part_content_unset() function.
*
* @note In an Edje theme, the part used as a content container is called @c
* SWALLOW. This is why the parameter name is called @p swallow, but it is
@ -9921,10 +9959,10 @@ extern "C" {
* elm_layout_box_append().
*
* @see elm_layout_box_append()
* @see elm_object_content_part_get()
* @see elm_object_content_part_unset()
* @see elm_object_part_content_get()
* @see elm_object_part_content_unset()
* @see @ref secBox
* @deprecated use elm_object_content_part_set() instead
* @deprecated use elm_object_part_content_set() instead
*
* @ingroup Layout
*/
@ -9937,7 +9975,7 @@ extern "C" {
*
* @return The swallowed object or NULL if none or an error occurred
*
* @deprecated use elm_object_content_part_get() instead
* @deprecated use elm_object_part_content_get() instead
*
* @ingroup Layout
*/
@ -9951,7 +9989,7 @@ extern "C" {
*
* Unparent and return the content object which was set for this part.
*
* @deprecated use elm_object_content_part_unset() instead
* @deprecated use elm_object_part_content_unset() instead
*
* @ingroup Layout
*/
@ -10071,7 +10109,7 @@ extern "C" {
*
* The object will be removed from the box part and its lifetime will
* not be handled by the layout anymore. This is equivalent to
* elm_object_content_part_unset() for box.
* elm_object_part_content_unset() for box.
*
* @see elm_layout_box_append()
* @see elm_layout_box_remove_all()
@ -10142,7 +10180,7 @@ extern "C" {
*
* The object will be unpacked from the table part and its lifetime
* will not be handled by the layout anymore. This is equivalent to
* elm_object_content_part_unset() for table.
* elm_object_part_content_unset() for table.
*
* @see elm_layout_table_pack()
* @see elm_layout_table_clear()
@ -10179,7 +10217,7 @@ extern "C" {
*
* This returns the edje object. It is not expected to be used to then
* swallow objects via edje_object_part_swallow() for example. Use
* elm_object_content_part_set() instead so child object handling and sizing is
* elm_object_part_content_set() instead so child object handling and sizing is
* done properly.
*
* @note This function should only be used if you really need to call some
@ -10190,7 +10228,7 @@ extern "C" {
* @see elm_object_signal_callback_add()
* @see elm_object_signal_emit()
* @see elm_object_part_text_set()
* @see elm_object_content_part_set()
* @see elm_object_part_content_set()
* @see elm_layout_box_append()
* @see elm_layout_table_pack()
* @see elm_layout_data_get()
@ -10355,7 +10393,7 @@ extern "C" {
#define elm_layout_icon_set(_ly, _obj) \
do { \
const char *sig; \
elm_object_content_part_set((_ly), "elm.swallow.icon", (_obj)); \
elm_object_part_content_set((_ly), "elm.swallow.icon", (_obj)); \
if ((_obj)) sig = "elm,state,icon,visible"; \
else sig = "elm,state,icon,hidden"; \
elm_object_signal_emit((_ly), sig, "elm"); \
@ -10369,7 +10407,7 @@ extern "C" {
* @ingroup Layout
*/
#define elm_layout_icon_get(_ly) \
elm_object_content_part_get((_ly), "elm.swallow.icon")
elm_object_part_content_get((_ly), "elm.swallow.icon")
/**
* @def elm_layout_end_set
@ -10381,7 +10419,7 @@ extern "C" {
#define elm_layout_end_set(_ly, _obj) \
do { \
const char *sig; \
elm_object_content_part_set((_ly), "elm.swallow.end", (_obj)); \
elm_object_part_content_set((_ly), "elm.swallow.end", (_obj)); \
if ((_obj)) sig = "elm,state,end,visible"; \
else sig = "elm,state,end,hidden"; \
elm_object_signal_emit((_ly), sig, "elm"); \
@ -10395,7 +10433,7 @@ extern "C" {
* @ingroup Layout
*/
#define elm_layout_end_get(_ly) \
elm_object_content_part_get((_ly), "elm.swallow.end")
elm_object_part_content_get((_ly), "elm.swallow.end")
/**
* @def elm_layout_label_set
@ -12524,7 +12562,7 @@ extern "C" {
* @param obj The bubble object
* @param icon The given icon for the bubble
*
* @deprecated use elm_object_content_part_set() instead
* @deprecated use elm_object_part_content_set() instead
*
*/
EINA_DEPRECATED EAPI void elm_bubble_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1);
@ -12536,7 +12574,7 @@ extern "C" {
*
* This function gets the icon shown on the top left of bubble.
*
* @deprecated use elm_object_content_part_get() instead
* @deprecated use elm_object_part_content_get() instead
*
*/
EINA_DEPRECATED EAPI Evas_Object *elm_bubble_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
@ -12548,7 +12586,7 @@ extern "C" {
* @param obj The bubble object
* @return The icon that was being used
*
* @deprecated use elm_object_content_part_unset() instead
* @deprecated use elm_object_part_content_unset() instead
*
*/
EINA_DEPRECATED EAPI Evas_Object *elm_bubble_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);
@ -17466,7 +17504,7 @@ extern "C" {
* it won't get properly displayed.
*
* @ingroup Slider
* @deprecated use elm_object_content_part_set() instead.
* @deprecated use elm_object_part_content_set() instead.
*/
EINA_DEPRECATED EAPI void elm_slider_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1);
@ -17485,7 +17523,7 @@ extern "C" {
*
* @see elm_slider_icon_set() for more details
* @see elm_slider_icon_get()
* @deprecated use elm_object_content_part_unset() instead.
* @deprecated use elm_object_part_content_unset() instead.
*
* @ingroup Slider
*/
@ -17504,7 +17542,7 @@ extern "C" {
* @see elm_slider_icon_set() for more details
* @see elm_slider_icon_unset()
*
* @deprecated use elm_object_content_part_get() instead.
* @deprecated use elm_object_part_content_get() instead.
*
* @ingroup Slider
*/
@ -17526,7 +17564,7 @@ extern "C" {
* @warning If the object being set does not have minimum size hints set,
* it won't get properly displayed.
*
* @deprecated use elm_object_content_part_set() instead.
* @deprecated use elm_object_part_content_set() instead.
*
* @ingroup Slider
*/
@ -17548,7 +17586,7 @@ extern "C" {
* @see elm_slider_end_set() for more details.
* @see elm_slider_end_get()
*
* @deprecated use elm_object_content_part_unset() instead
* @deprecated use elm_object_part_content_unset() instead
* instead.
*
* @ingroup Slider
@ -17569,7 +17607,7 @@ extern "C" {
* @see elm_slider_end_unset()
*
*
* @deprecated use elm_object_content_part_get() instead
* @deprecated use elm_object_part_content_get() instead
* instead.
*
* @ingroup Slider
@ -19891,7 +19929,7 @@ extern "C" {
* If you want to keep that old content object, use the
* elm_object_content_unset() function.
*
* @deprecated use elm_object_content_part_set() instead.
* @deprecated use elm_object_part_content_set() instead.
*
*/
EINA_DEPRECATED EAPI void elm_check_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1);
@ -19901,7 +19939,7 @@ extern "C" {
* @param obj The check object
* @return The icon object
*
* @deprecated use elm_object_content_part_get() instead.
* @deprecated use elm_object_part_content_get() instead.
*
*/
EINA_DEPRECATED EAPI Evas_Object *elm_check_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
@ -19913,7 +19951,7 @@ extern "C" {
*
* Unparent and return the icon object which was set for this widget.
*
* @deprecated use elm_object_content_part_unset() instead.
* @deprecated use elm_object_part_content_unset() instead.
*
*/
EINA_DEPRECATED EAPI Evas_Object *elm_check_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);
@ -20025,7 +20063,7 @@ extern "C" {
* want to keep that old content object, use the elm_radio_icon_unset()
* function.
*
* @deprecated use elm_object_content_part_set() instead.
* @deprecated use elm_object_part_content_set() instead.
*
*/
EINA_DEPRECATED EAPI void elm_radio_icon_set(Evas_Object *obj, Evas_Object *icon) EINA_ARG_NONNULL(1);
@ -20037,7 +20075,7 @@ extern "C" {
*
* @see elm_radio_icon_set()
*
* @deprecated use elm_object_content_part_get() instead.
* @deprecated use elm_object_part_content_get() instead.
*
*/
EINA_DEPRECATED EAPI Evas_Object *elm_radio_icon_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
@ -20050,7 +20088,7 @@ extern "C" {
* Unparent and return the icon object which was set for this widget.
*
* @see elm_radio_icon_set()
* @deprecated use elm_object_content_part_unset() instead.
* @deprecated use elm_object_part_content_unset() instead.
*
*/
EINA_DEPRECATED EAPI Evas_Object *elm_radio_icon_unset(Evas_Object *obj) EINA_ARG_NONNULL(1);
@ -21273,7 +21311,7 @@ extern "C" {
* elm_progressbar_icon_unset() function.
*
* @see elm_progressbar_icon_get()
* @deprecated use elm_object_content_part_set() instead.
* @deprecated use elm_object_part_content_set() instead.
*
* @ingroup Progressbar
*/
@ -21287,7 +21325,7 @@ extern "C" {
* otherwise (and on errors)
*
* @see elm_progressbar_icon_set() for more details
* @deprecated use elm_object_content_part_get() instead.
* @deprecated use elm_object_part_content_get() instead.
*
* @ingroup Progressbar
*/
@ -21304,7 +21342,7 @@ extern "C" {
* for this widget, previously, on success.
*
* @see elm_progressbar_icon_set() for more details
* @deprecated use elm_object_content_part_unset() instead.
* @deprecated use elm_object_part_content_unset() instead.
*
* @ingroup Progressbar
*/
@ -24054,7 +24092,7 @@ extern "C" {
* @see elm_panes_content_left_get()
* @see elm_panes_content_right_set() to set content on the other side.
*
* @deprecated use elm_object_content_part_set() instead
* @deprecated use elm_object_part_content_set() instead
*
* @ingroup Panes
*/
@ -24076,7 +24114,7 @@ extern "C" {
* @see elm_panes_content_right_get()
* @see elm_panes_content_left_set() to set content on the other side.
*
* @deprecated use elm_object_content_part_set() instead
* @deprecated use elm_object_part_content_set() instead
*
* @ingroup Panes
*/
@ -24092,7 +24130,7 @@ extern "C" {
*
* @see elm_panes_content_left_set() for details.
*
* @deprecated use elm_object_content_part_get() instead
* @deprecated use elm_object_part_content_get() instead
*
* @ingroup Panes
*/
@ -24108,7 +24146,7 @@ extern "C" {
*
* @see elm_panes_content_right_set() for details.
*
* @deprecated use elm_object_content_part_get() instead
* @deprecated use elm_object_part_content_get() instead
*
* @ingroup Panes
*/
@ -24125,7 +24163,7 @@ extern "C" {
* @see elm_panes_content_left_set() for details.
* @see elm_panes_content_left_get().
*
* @deprecated use elm_object_content_part_unset() instead
* @deprecated use elm_object_part_content_unset() instead
*
* @ingroup Panes
*/
@ -24143,7 +24181,7 @@ extern "C" {
* @see elm_panes_content_right_set() for details.
* @see elm_panes_content_right_get().
*
* @deprecated use elm_object_content_part_unset() instead
* @deprecated use elm_object_part_content_unset() instead
*
* @ingroup Panes
*/
@ -28228,7 +28266,7 @@ extern "C" {
*
* This function inserts a new player widget on the canvas.
*
* @see elm_object_content_part_set()
* @see elm_object_part_content_set()
*
* @ingroup Video
*/
@ -28246,7 +28284,7 @@ extern "C" {
*
* @see elm_player_add()
* @see elm_video_add()
* @deprecated use elm_object_content_part_set() instead
* @deprecated use elm_object_part_content_set() instead
*
* @ingroup Video
*/

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

@ -839,7 +839,7 @@ elm_fileselector_add(Evas_Object *parent)
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
bt = elm_button_add(parent);
elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Up"));
evas_object_size_hint_align_set(bt, 0.0, 0.0);
@ -854,7 +854,7 @@ elm_fileselector_add(Evas_Object *parent)
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
bt = elm_button_add(parent);
elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
elm_object_domain_translatable_text_set(bt, PACKAGE, N_("Home"));
evas_object_size_hint_align_set(bt, 0.0, 0.0);

6
legacy/elementary/src/lib/elc_fileselector_button.c
View File

@ -512,7 +512,7 @@ elm_fileselector_button_icon_set(Evas_Object *obj,
evas_object_del(icon);
return;
}
elm_object_content_part_set(wd->btn, "icon", icon);
elm_object_part_content_set(wd->btn, "icon", icon);
}
EAPI Evas_Object *
@ -521,7 +521,7 @@ elm_fileselector_button_icon_get(const Evas_Object *obj)
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
return elm_object_content_part_get(wd->btn, "icon");
return elm_object_part_content_get(wd->btn, "icon");
}
EAPI Evas_Object *
@ -530,6 +530,6 @@ elm_fileselector_button_icon_unset(Evas_Object *obj)
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
return elm_object_content_part_unset(wd->btn, "icon");
return elm_object_part_content_unset(wd->btn, "icon");
}

8
legacy/elementary/src/lib/elc_hoversel.c
View File

@ -206,7 +206,7 @@ _activate(Evas_Object *obj)
elm_icon_file_set(ic, item->icon_file, item->icon_group);
else if (item->icon_type == ELM_ICON_STANDARD)
elm_icon_standard_set(ic, item->icon_file);
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
evas_object_show(ic);
}
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@ -374,7 +374,7 @@ elm_hoversel_icon_set(Evas_Object *obj, Evas_Object *icon)
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
elm_object_content_part_set(wd->btn, "icon", icon);
elm_object_part_content_set(wd->btn, "icon", icon);
}
EAPI Evas_Object *
@ -383,7 +383,7 @@ elm_hoversel_icon_get(const Evas_Object *obj)
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if ((!wd) || (!wd->btn)) return NULL;
return elm_object_content_part_get(wd->btn, "icon");
return elm_object_part_content_get(wd->btn, "icon");
}
EAPI Evas_Object *
@ -392,7 +392,7 @@ elm_hoversel_icon_unset(Evas_Object *obj)
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if ((!wd) || (!wd->btn)) return NULL;
return elm_object_content_part_unset(wd->btn, "icon");
return elm_object_part_content_unset(wd->btn, "icon");
}
EAPI void

2
legacy/elementary/src/lib/elc_player.c
View File

@ -418,7 +418,7 @@ _player_button_add(Evas_Object *parent, Evas_Object *obj, Evas_Object *layout, c
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
bt = elm_button_add(parent);
elm_widget_mirrored_automatic_set(bt, EINA_FALSE);
elm_object_content_part_set(bt, "icon", ic);
elm_object_part_content_set(bt, "icon", ic);
evas_object_size_hint_align_set(bt, 0.0, 0.0);
elm_object_style_set(bt, "anchor");
evas_object_smart_callback_add(bt, "clicked", func, obj);

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

@ -964,6 +964,13 @@ elm_object_translatable_text_part_get(const Evas_Object *obj, const char *part)
return elm_widget_translatable_text_part_get(obj, part);
}
EAPI void
elm_object_part_content_set(Evas_Object *obj, const char *part, Evas_Object *content)
{
EINA_SAFETY_ON_NULL_RETURN(obj);
elm_widget_content_part_set(obj, part, content);
}
EAPI void
elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content)
{
@ -971,6 +978,14 @@ elm_object_content_part_set(Evas_Object *obj, const char *part, Evas_Object *con
elm_widget_content_part_set(obj, part, content);
}
EAPI Evas_Object *
elm_object_part_content_get(const Evas_Object *obj, const char *part)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
return elm_widget_content_part_get(obj, part);
}
EAPI Evas_Object *
elm_object_content_part_get(const Evas_Object *obj, const char *part)
{
@ -978,6 +993,14 @@ elm_object_content_part_get(const Evas_Object *obj, const char *part)
return elm_widget_content_part_get(obj, part);
}
EAPI Evas_Object *
elm_object_part_content_unset(Evas_Object *obj, const char *part)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(obj, NULL);
return elm_widget_content_part_unset(obj, part);
}
EAPI Evas_Object *
elm_object_content_part_unset(Evas_Object *obj, const char *part)
{

2
legacy/elementary/src/lib/elm_map.c
View File

@ -2489,7 +2489,7 @@ _group_object_create(Marker_Group *group)
group->obj = elm_layout_add(group->wd->obj);
elm_layout_theme_set(group->obj, "map/marker", style, elm_widget_style_get(group->wd->obj));
if (icon) elm_object_content_part_set(group->obj, "elm.icon", icon);
if (icon) elm_object_part_content_set(group->obj, "elm.icon", icon);
evas_object_smart_member_add(group->obj, group->wd->pan_smart);
elm_widget_sub_object_add(group->wd->obj, group->obj);

6
legacy/elementary/src/lib/elm_toggle.c
View File

@ -28,19 +28,19 @@ elm_toggle_label_get(const Evas_Object *obj)
EAPI void
elm_toggle_icon_set(Evas_Object *obj, Evas_Object *icon)
{
elm_object_content_part_set(obj, "icon", icon);
elm_object_part_content_set(obj, "icon", icon);
}
EAPI Evas_Object *
elm_toggle_icon_get(const Evas_Object *obj)
{
return elm_object_content_part_get(obj, "icon");
return elm_object_part_content_get(obj, "icon");
}
EAPI Evas_Object *
elm_toggle_icon_unset(Evas_Object *obj)
{
return elm_object_content_part_unset(obj, "icon");
return elm_object_part_content_unset(obj, "icon");
}
EAPI void