From: Enlightenment S. <no-...@en...> - 2011-06-30 05:58:39
|
Log: Elm slider: Fix the tests to use the new elm_object_text_set/get API. Author: tasn Date: 2011-06-29 22:58:32 -0700 (Wed, 29 Jun 2011) New Revision: 60863 Trac: http://trac.enlightenment.org/e/changeset/60863 Modified: trunk/elementary/src/bin/config.c trunk/elementary/src/bin/test_3d.c trunk/elementary/src/bin/test_slider.c trunk/elementary/src/bin/test_win_state.c Modified: trunk/elementary/src/bin/config.c =================================================================== --- trunk/elementary/src/bin/config.c 2011-06-30 05:58:29 UTC (rev 60862) +++ trunk/elementary/src/bin/config.c 2011-06-30 05:58:32 UTC (rev 60863) @@ -1236,7 +1236,7 @@ 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); Modified: trunk/elementary/src/bin/test_3d.c =================================================================== --- trunk/elementary/src/bin/test_3d.c 2011-06-30 05:58:29 UTC (rev 60862) +++ trunk/elementary/src/bin/test_3d.c 2011-06-30 05:58:32 UTC (rev 60863) @@ -259,7 +259,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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); Modified: trunk/elementary/src/bin/test_slider.c =================================================================== --- trunk/elementary/src/bin/test_slider.c 2011-06-30 05:58:29 UTC (rev 60862) +++ trunk/elementary/src/bin/test_slider.c 2011-06-30 05:58:32 UTC (rev 60863) @@ -38,7 +38,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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); Modified: trunk/elementary/src/bin/test_win_state.c =================================================================== --- trunk/elementary/src/bin/test_win_state.c 2011-06-30 05:58:29 UTC (rev 60862) +++ trunk/elementary/src/bin/test_win_state.c 2011-06-30 05:58:32 UTC (rev 60863) @@ -166,7 +166,7 @@ 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 @@ 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); |