From 9397a166b0981cf72e22c95941c095b44ff05e1a Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Thu, 30 Jun 2011 05:58:32 +0000 Subject: [PATCH] Elm slider: Fix the tests to use the new elm_object_text_set/get API. SVN revision: 60863 --- legacy/elementary/src/bin/config.c | 2 +- legacy/elementary/src/bin/test_3d.c | 14 +++++++------- legacy/elementary/src/bin/test_slider.c | 16 ++++++++-------- legacy/elementary/src/bin/test_win_state.c | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/legacy/elementary/src/bin/config.c b/legacy/elementary/src/bin/config.c index 04a903e9bd..4386edc9f7 100644 --- a/legacy/elementary/src/bin/config.c +++ b/legacy/elementary/src/bin/config.c @@ -1236,7 +1236,7 @@ _sample_theme_new(Evas_Object *win) evas_object_show(sp); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Slider"); + elm_object_text_set(sl, "Slider"); elm_slider_span_size_set(sl, 120); elm_slider_min_max_set(sl, 1, 10); elm_slider_value_set(sl, 4); diff --git a/legacy/elementary/src/bin/test_3d.c b/legacy/elementary/src/bin/test_3d.c index fabe91ffa7..70c4777acc 100644 --- a/legacy/elementary/src/bin/test_3d.c +++ b/legacy/elementary/src/bin/test_3d.c @@ -259,7 +259,7 @@ test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U evas_object_show(bx); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Rot X"); + elm_object_text_set(sl, "Rot X"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, 0, 360); @@ -270,7 +270,7 @@ test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Rot Y"); + elm_object_text_set(sl, "Rot Y"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, 0, 360); @@ -281,7 +281,7 @@ test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Rot Z"); + elm_object_text_set(sl, "Rot Z"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, 0, 360); @@ -292,7 +292,7 @@ test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "CX Off"); + elm_object_text_set(sl, "CX Off"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, -320, 320); @@ -304,7 +304,7 @@ test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "CY Off"); + elm_object_text_set(sl, "CY Off"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, -320, 320); @@ -316,7 +316,7 @@ test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Foc"); + elm_object_text_set(sl, "Foc"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, 1, 2000); @@ -328,7 +328,7 @@ test_3d(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U evas_object_show(sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Z0"); + elm_object_text_set(sl, "Z0"); elm_slider_unit_format_set(sl, "%1.0f units"); elm_slider_span_size_set(sl, 360); elm_slider_min_max_set(sl, -2000, 2000); diff --git a/legacy/elementary/src/bin/test_slider.c b/legacy/elementary/src/bin/test_slider.c index 862d0a351d..d34729c427 100644 --- a/legacy/elementary/src/bin/test_slider.c +++ b/legacy/elementary/src/bin/test_slider.c @@ -38,7 +38,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info sl = elm_slider_add(win); sl1 = sl; - elm_slider_label_set(sl, "Horizontal"); + elm_object_text_set(sl, "Horizontal"); elm_slider_icon_set(sl, ic); elm_slider_unit_format_set(sl, "%1.1f units"); elm_slider_span_size_set(sl, 120); @@ -55,7 +55,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Disabled"); + elm_object_text_set(sl, "Disabled"); elm_slider_icon_set(sl, ic); elm_slider_unit_format_set(sl, "%1.1f units"); elm_slider_span_size_set(sl, 120); @@ -74,7 +74,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Horizontal inverted"); + elm_object_text_set(sl, "Horizontal inverted"); elm_slider_end_set(sl, ic); elm_slider_span_size_set(sl, 80); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); @@ -96,7 +96,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Disabled inverted"); + elm_object_text_set(sl, "Disabled inverted"); elm_slider_end_set(sl, ic); elm_slider_span_size_set(sl, 80); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); @@ -114,7 +114,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info sl = elm_slider_add(win); elm_slider_indicator_show_set(sl, EINA_FALSE); - elm_slider_label_set(sl, "Scale doubled"); + elm_object_text_set(sl, "Scale doubled"); elm_slider_unit_format_set(sl, "%3.0f units"); elm_slider_span_size_set(sl, 40); evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5); @@ -141,7 +141,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info sl = elm_slider_add(win); elm_slider_icon_set(sl, ic); - elm_slider_label_set(sl, "Vertical inverted"); + elm_object_text_set(sl, "Vertical inverted"); elm_slider_inverted_set(sl, EINA_TRUE); elm_slider_unit_format_set(sl, "units"); elm_slider_span_size_set(sl, 60); @@ -158,7 +158,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info evas_object_smart_callback_add(sl1, "changed", _change_cb, sl); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Vertical"); + elm_object_text_set(sl, "Vertical"); elm_slider_unit_format_set(sl, "units"); elm_slider_span_size_set(sl, 60); evas_object_size_hint_align_set(sl, 0.5, EVAS_HINT_FILL); @@ -179,7 +179,7 @@ test_slider(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info sl = elm_slider_add(win); elm_slider_icon_set(sl, ic); - elm_slider_label_set(sl, "Disabled vertical"); + elm_object_text_set(sl, "Disabled vertical"); elm_slider_inverted_set(sl, EINA_TRUE); elm_slider_unit_format_set(sl, "units"); elm_slider_span_size_set(sl, 100); diff --git a/legacy/elementary/src/bin/test_win_state.c b/legacy/elementary/src/bin/test_win_state.c index eaf110e9b6..97cc34761c 100644 --- a/legacy/elementary/src/bin/test_win_state.c +++ b/legacy/elementary/src/bin/test_win_state.c @@ -166,7 +166,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Test"); + elm_object_text_set(sl, "Test"); elm_slider_span_size_set(sl, 100); evas_object_size_hint_align_set(sl, 0.5, 0.5); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -299,7 +299,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_ evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL); sl = elm_slider_add(win); - elm_slider_label_set(sl, "Override Redirect"); + elm_object_text_set(sl, "Override Redirect"); elm_slider_span_size_set(sl, 100); evas_object_size_hint_align_set(sl, 0.5, 0.5); evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);