Elm progress: Fix code to use the new elm_object_text_set/get API.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@60990 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c
index 6a05333..688d2d7 100644 (file)
--- a/src/bin/test_progressbar.c
+++ b/src/bin/test_progressbar.c
@@ -94,7 +94,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
    elm_box_pack_end(bx, pb);
 //   elm_progressbar_horizontal_set(pb, EINA_TRUE);
-//   elm_progressbar_label_set(pb, "Progression %");
+//   elm_object_text_set(pb, "Progression %");
 //   elm_progressbar_unit_format_set(pb, NULL);
    evas_object_show(pb);
    _test_progressbar.pb1 = pb;
@@ -102,7 +102,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    pb = elm_progressbar_add(win);
    evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
    evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_progressbar_label_set(pb, "Infinite bounce");
+   elm_object_text_set(pb, "Infinite bounce");
    elm_progressbar_pulse_set(pb, EINA_TRUE);
    elm_box_pack_end(bx, pb);
    evas_object_show(pb);
@@ -114,7 +114,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    pb = elm_progressbar_add(win);
-   elm_progressbar_label_set(pb, "Label");
+   elm_object_text_set(pb, "Label");
    elm_progressbar_icon_set(pb, ic1);
    elm_progressbar_inverted_set(pb, 1);
    elm_progressbar_unit_format_set(pb, "%1.1f units");
@@ -139,7 +139,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_box_pack_end(hbx, pb);
    elm_progressbar_span_size_set(pb, 60);
-   elm_progressbar_label_set(pb, "percent");
+   elm_object_text_set(pb, "percent");
    evas_object_show(pb);
    _test_progressbar.pb4 = pb;
 
@@ -150,7 +150,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    elm_progressbar_span_size_set(pb, 80);
    elm_progressbar_pulse_set(pb, EINA_TRUE);
    elm_progressbar_unit_format_set(pb, NULL);
-   elm_progressbar_label_set(pb, "Infinite bounce");
+   elm_object_text_set(pb, "Infinite bounce");
    elm_box_pack_end(hbx, pb);
    evas_object_show(pb);
    _test_progressbar.pb5 = pb;
@@ -161,7 +161,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_progressbar_label_set(pb, "Label");
+   elm_object_text_set(pb, "Label");
    elm_progressbar_icon_set(pb, ic2);
    elm_progressbar_inverted_set(pb, 1);
    elm_progressbar_unit_format_set(pb, "%1.2f%%");
@@ -175,7 +175,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
 
    pb = elm_progressbar_add(win);
    elm_object_style_set(pb, "wheel");
-   elm_progressbar_label_set(pb, "Style: wheel");
+   elm_object_text_set(pb, "Style: wheel");
    evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
    evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_box_pack_end(bx, pb);

diff --git a/src/edje_externals/elm_progressbar.c b/src/edje_externals/elm_progressbar.c
index d7bdee3..aa4338e 100644 (file)
--- a/src/edje_externals/elm_progressbar.c
+++ b/src/edje_externals/elm_progressbar.c
@@ -26,7 +26,7 @@ external_progressbar_state_set(void *data __UNUSED__, Evas_Object *obj, const vo
    else return;
 
    if (p->label)
-     elm_progressbar_label_set(obj, p->label);
+     elm_object_text_set(obj, p->label);
    if (p->icon)
      elm_progressbar_icon_set(obj, p->icon);
    if (p->span_exists)
@@ -48,7 +48,7 @@ external_progressbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Ed
      {
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
-            elm_progressbar_label_set(obj, param->s);
+            elm_object_text_set(obj, param->s);
             return EINA_TRUE;
          }
      }
@@ -116,7 +116,7 @@ external_progressbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Ed
      {
        if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
          {
-            param->s = elm_progressbar_label_get(obj);
+            param->s = elm_object_text_get(obj);
             return EINA_TRUE;
          }
      }