diff --git a/legacy/elementary/src/bin/config.c b/legacy/elementary/src/bin/config.c index d50ffd00ad..df3d440726 100644 --- a/legacy/elementary/src/bin/config.c +++ b/legacy/elementary/src/bin/config.c @@ -80,7 +80,7 @@ struct _Fonts_Data lb = elm_label_add(win); \ evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); \ evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, 0.5); \ - elm_label_label_set(lb, label); \ + elm_object_text_set(lb, label); \ elm_frame_content_set(pd, lb); \ evas_object_show(lb); \ } \ @@ -555,7 +555,7 @@ _status_basic(Evas_Object *win, evas_object_show(fr); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "Applying configuration change" ); elm_frame_content_set(fr, lb); @@ -2108,7 +2108,7 @@ _profiles_list_selected_cb(void *data, snprintf(buf, sizeof(buf), "Selected profile: %s
", prof_name); - elm_label_label_set(evas_object_data_get(obj, "prof_name_lbl"), buf); + elm_object_text_set(evas_object_data_get(obj, "prof_name_lbl"), buf); en = evas_object_data_get(obj, "prof_desc_entry"); #ifdef ELM_EFREET diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c index 760c789cb1..a439dcfb14 100644 --- a/legacy/elementary/src/bin/test.c +++ b/legacy/elementary/src/bin/test.c @@ -249,7 +249,7 @@ my_win_main(char *autorun) evas_object_show(fr); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "Please select a test from the list below
" "by clicking the test button to show the
" "test window."); diff --git a/legacy/elementary/src/bin/test_bubble.c b/legacy/elementary/src/bin/test_bubble.c index 8f876a29a6..2872a65401 100644 --- a/legacy/elementary/src/bin/test_bubble.c +++ b/legacy/elementary/src/bin/test_bubble.c @@ -47,7 +47,7 @@ test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL); ct = elm_label_add(win); - elm_label_label_set(ct, + elm_object_text_set(ct, "\"The future of the art: R or G or B?\", by Rusty"); elm_bubble_content_set(bb, ct); @@ -62,7 +62,7 @@ test_bubble(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(bb, EVAS_HINT_FILL, EVAS_HINT_FILL); ct = elm_label_add(win); - elm_label_label_set(ct, "Corner: base (top-left) - no icon"); + elm_object_text_set(ct, "Corner: base (top-left) - no icon"); elm_bubble_content_set(bb, ct); elm_box_pack_end(bx, bb); diff --git a/legacy/elementary/src/bin/test_fileselector_button.c b/legacy/elementary/src/bin/test_fileselector_button.c index b6f3f9fbd7..4742f2cfb6 100644 --- a/legacy/elementary/src/bin/test_fileselector_button.c +++ b/legacy/elementary/src/bin/test_fileselector_button.c @@ -129,7 +129,7 @@ test_fileselector_button(void *data __UNUSED__, evas_object_show(bt); lb = elm_label_add(win); - elm_label_label_set(lb, "Last selection:"); + elm_object_text_set(lb, "Last selection:"); elm_box_pack_end(vbox, lb); evas_object_show(lb); diff --git a/legacy/elementary/src/bin/test_fileselector_entry.c b/legacy/elementary/src/bin/test_fileselector_entry.c index b57f799489..d4b09d7874 100644 --- a/legacy/elementary/src/bin/test_fileselector_entry.c +++ b/legacy/elementary/src/bin/test_fileselector_entry.c @@ -130,7 +130,7 @@ test_fileselector_entry(void *data __UNUSED__, evas_object_show(bt); lb = elm_label_add(win); - elm_label_label_set(lb, "Last selection:"); + elm_object_text_set(lb, "Last selection:"); elm_box_pack_end(vbox, lb); evas_object_show(lb); diff --git a/legacy/elementary/src/bin/test_focus.c b/legacy/elementary/src/bin/test_focus.c index 00dd2e3f6b..a7cc1e2987 100644 --- a/legacy/elementary/src/bin/test_focus.c +++ b/legacy/elementary/src/bin/test_focus.c @@ -90,7 +90,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info { Evas_Object *lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "Use Tab and Shift+Tab" ); evas_object_size_hint_weight_set(lb, 0.0, 0.0); diff --git a/legacy/elementary/src/bin/test_genlist.c b/legacy/elementary/src/bin/test_genlist.c index e91e16a83c..101bb7b8b1 100644 --- a/legacy/elementary/src/bin/test_genlist.c +++ b/legacy/elementary/src/bin/test_genlist.c @@ -679,7 +679,7 @@ Evas_Object *gl3_icon_get(void *data, Evas_Object *obj, const char *part) lb = elm_label_add(obj); elm_label_line_wrap_set(lb, 1); elm_label_wrap_width_set(lb, 201); - elm_label_label_set(lb, "ashj ascjscjh n asjkl hcjlh ls hzshnn zjh sh zxjcjsnd h dfw sdv edev efe fwefvv vsd cvs ws wf fvwf wd fwe f we wef we wfe rfwewef wfv wswf wefg sdfws w wsdcfwcf wsc vdv sdsd sdcd cv wsc sdcv wsc d sdcdcsd sdcdsc wdvd sdcsd wscxcv wssvd sd"); + elm_object_text_set(lb, "ashj ascjscjh n asjkl hcjlh ls hzshnn zjh sh zxjcjsnd h dfw sdv edev efe fwefvv vsd cvs ws wf fvwf wd fwe f we wef we wfe rfwewef wfv wswf wefg sdfws w wsdcfwcf wsc vdv sdsd sdcd cv wsc sdcv wsc d sdcdcsd sdcdsc wdvd sdcsd wscxcv wssvd sd"); return lb; } else if (!strcmp(part, "elm.swallow.end")) @@ -1726,7 +1726,7 @@ test_genlist10(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(bx2); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "Sweep genlist items to the right.
" "Test this by changing Mode Type to Slide or Rotate."); elm_box_pack_end(bx2, lb); @@ -1839,7 +1839,7 @@ test_genlist11(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_show(fr); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "Enable reorder mode if you want to move item.
" "Then long press and drag item."); elm_frame_content_set(fr, lb); diff --git a/legacy/elementary/src/bin/test_inwin.c b/legacy/elementary/src/bin/test_inwin.c index 3f0998309e..926f5b26d4 100644 --- a/legacy/elementary/src/bin/test_inwin.c +++ b/legacy/elementary/src/bin/test_inwin.c @@ -21,7 +21,7 @@ test_inwin(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(inwin); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "This is an \"inwin\" - a window in a
" "window. This is handy for quick popups
" "you want centered, taking over the window
" @@ -53,7 +53,7 @@ test_inwin2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(inwin); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "This is an \"inwin\" - a window in a
" "window. This is handy for quick popups
" "you want centered, taking over the window
" diff --git a/legacy/elementary/src/bin/test_label.c b/legacy/elementary/src/bin/test_label.c index 2cd6a8f3f0..1323da7747 100644 --- a/legacy/elementary/src/bin/test_label.c +++ b/legacy/elementary/src/bin/test_label.c @@ -23,7 +23,7 @@ test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "This is a small label" ); evas_object_size_hint_weight_set(lb, 0.0, 0.0); @@ -32,7 +32,7 @@ test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(lb); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "This is a larger label with newlines
" "to make it bigger, bit it won't expand or wrap
" "just be a block of text that can't change its
" @@ -45,7 +45,7 @@ test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info lb = elm_label_add(win); elm_label_line_wrap_set(lb, 1); - elm_label_label_set(lb, + elm_object_text_set(lb, "" "This is more text designed to line-wrap here as " "This object is resized horizontally. As it is " @@ -60,7 +60,7 @@ test_label(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(lb); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "This small label set to wrap" ); evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0); diff --git a/legacy/elementary/src/bin/test_launcher.c b/legacy/elementary/src/bin/test_launcher.c index c9c91293fe..925a8e9fd9 100644 --- a/legacy/elementary/src/bin/test_launcher.c +++ b/legacy/elementary/src/bin/test_launcher.c @@ -273,7 +273,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in lb = elm_label_add(win); elm_object_style_set(lb, "marker"); - elm_label_label_set(lb, names[m]); + elm_object_text_set(lb, names[m]); evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(lb, 0.5, 0.5); elm_table_pack(tb, lb, 1 + i, 1 + (j * 2) + 1, 1, 1); diff --git a/legacy/elementary/src/bin/test_map.c b/legacy/elementary/src/bin/test_map.c index f683dacf1e..9567c42473 100644 --- a/legacy/elementary/src/bin/test_map.c +++ b/legacy/elementary/src/bin/test_map.c @@ -560,7 +560,7 @@ _marker_get(Evas_Object *obj, Elm_Map_Marker *marker __UNUSED__, void *data) elm_box_pack_end(bx, o); Evas_Object *lbl = elm_label_add(obj); - elm_label_label_set(lbl, "Wolves Go !"); + elm_object_text_set(lbl, "Wolves Go !"); evas_object_show(lbl); elm_box_pack_end(bx, lbl); } diff --git a/legacy/elementary/src/bin/test_notify.c b/legacy/elementary/src/bin/test_notify.c index 8772f7bb93..91e6df7e7d 100644 --- a/legacy/elementary/src/bin/test_notify.c +++ b/legacy/elementary/src/bin/test_notify.c @@ -65,7 +65,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, "This position is the default."); + elm_object_text_set(lb, "This position is the default."); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -95,7 +95,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, "Bottom position. This notify use a timeout of 5 sec.
" + elm_object_text_set(lb, "Bottom position. This notify use a timeout of 5 sec.
" "The events outside the window are blocked."); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -124,7 +124,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, "Left position. This notify use a timeout of 10 sec."); + elm_object_text_set(lb, "Left position. This notify use a timeout of 10 sec."); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -152,7 +152,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, "Center position. This notify use a timeout of 10 sec."); + elm_object_text_set(lb, "Center position. This notify use a timeout of 10 sec."); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -178,7 +178,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, "Right position."); + elm_object_text_set(lb, "Right position."); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -204,7 +204,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, "Top Left position."); + elm_object_text_set(lb, "Top Left position."); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -230,7 +230,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, "Top Right position."); + elm_object_text_set(lb, "Top Right position."); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -256,7 +256,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, "Bottom Left position."); + elm_object_text_set(lb, "Bottom Left position."); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -282,7 +282,7 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, "Bottom Right position."); + elm_object_text_set(lb, "Bottom Right position."); elm_box_pack_end(bx, lb); evas_object_show(lb); diff --git a/legacy/elementary/src/bin/test_pager.c b/legacy/elementary/src/bin/test_pager.c index 2b5402e91d..a8a988fd7a 100644 --- a/legacy/elementary/src/bin/test_pager.c +++ b/legacy/elementary/src/bin/test_pager.c @@ -97,7 +97,7 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "This is page 1 in a pager stack.
" "
" "So what is a pager stack? It is a stack
" @@ -149,7 +149,7 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "This is page 2 in a pager stack.
" "
" "This is just like the previous page in
" @@ -177,7 +177,7 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "This is page 3 in a pager stack.
" "
" "This is just like the previous page in
" @@ -254,7 +254,7 @@ my_pager_push(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED lb = elm_label_add(info->win); snprintf(buf, sizeof(buf), "This is page %d in the slide pager

", count++); - elm_label_label_set(lb, buf); + elm_object_text_set(lb, buf); elm_box_pack_end(bx, lb); evas_object_show(lb); @@ -300,7 +300,7 @@ test_pager_slide(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event evas_object_show(bx); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "This is page 1 in a slide pager.
" "
" "The slide pager style is useful for browsing
" diff --git a/legacy/elementary/src/bin/test_scaling.c b/legacy/elementary/src/bin/test_scaling.c index 2a26b5eb1b..ffa4734e0f 100644 --- a/legacy/elementary/src/bin/test_scaling.c +++ b/legacy/elementary/src/bin/test_scaling.c @@ -85,7 +85,7 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in elm_object_scale_set(fr, 0.5); elm_frame_label_set(fr, "Scale: 0.5"); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "Parent frame scale
" "is 0.5. Child should
" "inherit it."); @@ -97,7 +97,7 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in fr = elm_frame_add(win); elm_frame_label_set(fr, "Scale: 1.0"); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "Parent frame scale
" "is 1.0. Child should
" "inherit it."); @@ -110,7 +110,7 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in fr = elm_frame_add(win); elm_frame_label_set(fr, "Scale: 2.0"); lb = elm_label_add(win); - elm_label_label_set(lb, + elm_object_text_set(lb, "Parent frame scale
" "is 2.0. Child should
" "inherit it."); diff --git a/legacy/elementary/src/bin/test_weather.c b/legacy/elementary/src/bin/test_weather.c index 70900fa4b3..6ca11469be 100644 --- a/legacy/elementary/src/bin/test_weather.c +++ b/legacy/elementary/src/bin/test_weather.c @@ -166,7 +166,7 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf lbl = elm_label_add(win); elm_win_resize_object_add(win, lbl); - elm_label_label_set(lbl, "libeweather is required to display the forecast."); + elm_object_text_set(lbl, "libeweather is required to display the forecast."); evas_object_show(lbl); #endif diff --git a/legacy/elementary/src/edje_externals/elm_label.c b/legacy/elementary/src/edje_externals/elm_label.c index 2e891fcbc7..39a3afe28e 100644 --- a/legacy/elementary/src/edje_externals/elm_label.c +++ b/legacy/elementary/src/edje_externals/elm_label.c @@ -15,7 +15,7 @@ external_label_state_set(void *data __UNUSED__, Evas_Object *obj __UNUSED__, con else if (from_params) p = from_params; else return; - if (p->label) elm_label_label_set(obj, p->label); + if (p->label) elm_object_text_set(obj, p->label); } static Eina_Bool @@ -25,7 +25,7 @@ external_label_param_set(void *data __UNUSED__, Evas_Object *obj, const Edje_Ext { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - elm_label_label_set(obj, param->s); + elm_object_text_set(obj, param->s); return EINA_TRUE; } } @@ -43,7 +43,7 @@ external_label_param_get(void *data __UNUSED__, const Evas_Object *obj, Edje_Ext { if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) { - param->s = elm_label_label_get(obj); + param->s = elm_object_text_get(obj); return EINA_TRUE; } } diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c index 7e35b038d7..95c821a4d3 100644 --- a/legacy/elementary/src/lib/elm_gengrid.c +++ b/legacy/elementary/src/lib/elm_gengrid.c @@ -2610,7 +2610,7 @@ _elm_gengrid_item_label_create(void *data, if (!label) return NULL; elm_object_style_set(label, "tooltip"); - elm_label_label_set(label, data); + elm_object_text_set(label, data); return label; } diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c index 32184114b7..acb4c941c2 100644 --- a/legacy/elementary/src/lib/elm_genlist.c +++ b/legacy/elementary/src/lib/elm_genlist.c @@ -4921,7 +4921,7 @@ _elm_genlist_item_label_create(void *data, if (!label) return NULL; elm_object_style_set(label, "tooltip"); - elm_label_label_set(label, data); + elm_object_text_set(label, data); return label; } diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index fde7ed7287..e1819ecad7 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -2466,7 +2466,7 @@ _elm_widget_item_tooltip_label_create(void *data, if (!label) return NULL; elm_object_style_set(label, "tooltip"); - elm_label_label_set(label, data); + elm_object_text_set(label, data); return label; } diff --git a/legacy/elementary/src/lib/els_tooltip.c b/legacy/elementary/src/lib/els_tooltip.c index b7341f13e9..ba4fe4d3c8 100644 --- a/legacy/elementary/src/lib/els_tooltip.c +++ b/legacy/elementary/src/lib/els_tooltip.c @@ -473,7 +473,7 @@ _elm_tooltip_label_create(void *data, Evas_Object *obj) if (!label) return NULL; elm_object_style_set(label, "tooltip"); - elm_label_label_set(label, data); + elm_object_text_set(label, data); return label; }