summaryrefslogtreecommitdiff
path: root/legacy/elementary/src
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2011-07-04 10:13:56 +0000
committerTom Hacohen <tom@stosb.com>2011-07-04 10:13:56 +0000
commitc344fb3ed4721cfb487a295850f894b7da973882 (patch)
treec7824ad8a3835ac0834402cdb9028c5f0f0ae7a5 /legacy/elementary/src
parentb46a821d5d940505326270e7ece5e363e7d3ee0e (diff)
Elm progress: Fix code to use the new elm_object_text_set/get API.
SVN revision: 60990
Diffstat (limited to 'legacy/elementary/src')
-rw-r--r--legacy/elementary/src/bin/test_progressbar.c14
-rw-r--r--legacy/elementary/src/edje_externals/elm_progressbar.c6
2 files changed, 10 insertions, 10 deletions
diff --git a/legacy/elementary/src/bin/test_progressbar.c b/legacy/elementary/src/bin/test_progressbar.c
index 6a05333..688d2d7 100644
--- a/legacy/elementary/src/bin/test_progressbar.c
+++ b/legacy/elementary/src/bin/test_progressbar.c
@@ -94,7 +94,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
94 evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5); 94 evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
95 elm_box_pack_end(bx, pb); 95 elm_box_pack_end(bx, pb);
96// elm_progressbar_horizontal_set(pb, EINA_TRUE); 96// elm_progressbar_horizontal_set(pb, EINA_TRUE);
97// elm_progressbar_label_set(pb, "Progression %"); 97// elm_object_text_set(pb, "Progression %");
98// elm_progressbar_unit_format_set(pb, NULL); 98// elm_progressbar_unit_format_set(pb, NULL);
99 evas_object_show(pb); 99 evas_object_show(pb);
100 _test_progressbar.pb1 = pb; 100 _test_progressbar.pb1 = pb;
@@ -102,7 +102,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
102 pb = elm_progressbar_add(win); 102 pb = elm_progressbar_add(win);
103 evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5); 103 evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
104 evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 104 evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
105 elm_progressbar_label_set(pb, "Infinite bounce"); 105 elm_object_text_set(pb, "Infinite bounce");
106 elm_progressbar_pulse_set(pb, EINA_TRUE); 106 elm_progressbar_pulse_set(pb, EINA_TRUE);
107 elm_box_pack_end(bx, pb); 107 elm_box_pack_end(bx, pb);
108 evas_object_show(pb); 108 evas_object_show(pb);
@@ -114,7 +114,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
114 evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); 114 evas_object_size_hint_aspect_set(ic1, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
115 115
116 pb = elm_progressbar_add(win); 116 pb = elm_progressbar_add(win);
117 elm_progressbar_label_set(pb, "Label"); 117 elm_object_text_set(pb, "Label");
118 elm_progressbar_icon_set(pb, ic1); 118 elm_progressbar_icon_set(pb, ic1);
119 elm_progressbar_inverted_set(pb, 1); 119 elm_progressbar_inverted_set(pb, 1);
120 elm_progressbar_unit_format_set(pb, "%1.1f units"); 120 elm_progressbar_unit_format_set(pb, "%1.1f units");
@@ -139,7 +139,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
139 evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 139 evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
140 elm_box_pack_end(hbx, pb); 140 elm_box_pack_end(hbx, pb);
141 elm_progressbar_span_size_set(pb, 60); 141 elm_progressbar_span_size_set(pb, 60);
142 elm_progressbar_label_set(pb, "percent"); 142 elm_object_text_set(pb, "percent");
143 evas_object_show(pb); 143 evas_object_show(pb);
144 _test_progressbar.pb4 = pb; 144 _test_progressbar.pb4 = pb;
145 145
@@ -150,7 +150,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
150 elm_progressbar_span_size_set(pb, 80); 150 elm_progressbar_span_size_set(pb, 80);
151 elm_progressbar_pulse_set(pb, EINA_TRUE); 151 elm_progressbar_pulse_set(pb, EINA_TRUE);
152 elm_progressbar_unit_format_set(pb, NULL); 152 elm_progressbar_unit_format_set(pb, NULL);
153 elm_progressbar_label_set(pb, "Infinite bounce"); 153 elm_object_text_set(pb, "Infinite bounce");
154 elm_box_pack_end(hbx, pb); 154 elm_box_pack_end(hbx, pb);
155 evas_object_show(pb); 155 evas_object_show(pb);
156 _test_progressbar.pb5 = pb; 156 _test_progressbar.pb5 = pb;
@@ -161,7 +161,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
161 161
162 pb = elm_progressbar_add(win); 162 pb = elm_progressbar_add(win);
163 elm_progressbar_horizontal_set(pb, EINA_FALSE); 163 elm_progressbar_horizontal_set(pb, EINA_FALSE);
164 elm_progressbar_label_set(pb, "Label"); 164 elm_object_text_set(pb, "Label");
165 elm_progressbar_icon_set(pb, ic2); 165 elm_progressbar_icon_set(pb, ic2);
166 elm_progressbar_inverted_set(pb, 1); 166 elm_progressbar_inverted_set(pb, 1);
167 elm_progressbar_unit_format_set(pb, "%1.2f%%"); 167 elm_progressbar_unit_format_set(pb, "%1.2f%%");
@@ -175,7 +175,7 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
175 175
176 pb = elm_progressbar_add(win); 176 pb = elm_progressbar_add(win);
177 elm_object_style_set(pb, "wheel"); 177 elm_object_style_set(pb, "wheel");
178 elm_progressbar_label_set(pb, "Style: wheel"); 178 elm_object_text_set(pb, "Style: wheel");
179 evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5); 179 evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
180 evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 180 evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
181 elm_box_pack_end(bx, pb); 181 elm_box_pack_end(bx, pb);
diff --git a/legacy/elementary/src/edje_externals/elm_progressbar.c b/legacy/elementary/src/edje_externals/elm_progressbar.c
index d7bdee3..aa4338e 100644
--- a/legacy/elementary/src/edje_externals/elm_progressbar.c
+++ b/legacy/elementary/src/edje_externals/elm_progressbar.c
@@ -26,7 +26,7 @@ external_progressbar_state_set(void *data __UNUSED__, Evas_Object *obj, const vo
26 else return; 26 else return;
27 27
28 if (p->label) 28 if (p->label)
29 elm_progressbar_label_set(obj, p->label); 29 elm_object_text_set(obj, p->label);
30 if (p->icon) 30 if (p->icon)
31 elm_progressbar_icon_set(obj, p->icon); 31 elm_progressbar_icon_set(obj, p->icon);
32 if (p->span_exists) 32 if (p->span_exists)
@@ -48,7 +48,7 @@ external_progressbar_param_set(void *data __UNUSED__, Evas_Object *obj, const Ed
48 { 48 {
49 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) 49 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
50 { 50 {
51 elm_progressbar_label_set(obj, param->s); 51 elm_object_text_set(obj, param->s);
52 return EINA_TRUE; 52 return EINA_TRUE;
53 } 53 }
54 } 54 }
@@ -116,7 +116,7 @@ external_progressbar_param_get(void *data __UNUSED__, const Evas_Object *obj, Ed
116 { 116 {
117 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING) 117 if (param->type == EDJE_EXTERNAL_PARAM_TYPE_STRING)
118 { 118 {
119 param->s = elm_progressbar_label_get(obj); 119 param->s = elm_object_text_get(obj);
120 return EINA_TRUE; 120 return EINA_TRUE;
121 } 121 }
122 } 122 }