fixed plugin image size problem

[framework/uifw/elementary.git] / src / bin / test_progressbar.c

diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c
index fd9ddf8..6eed552 100644 (file)
--- a/src/bin/test_progressbar.c
+++ b/src/bin/test_progressbar.c
@@ -1,7 +1,7 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 typedef struct Progressbar
 {
@@ -71,19 +71,13 @@ my_progressbar_destroy(void *data __UNUSED__, Evas_Object *obj, void *event_info
 void
 test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *pb, *bx, *hbx, *bt, *bt_bx, *ic1, *ic2;
+   Evas_Object *win, *pb, *bx, *hbx, *bt, *bt_bx, *ic1, *ic2;
    char buf[PATH_MAX];
 
-   win = elm_win_add(NULL, "progressbar", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Progressbar");
+   win = elm_win_util_standard_add("progressbar", "Progressbar");
    evas_object_smart_callback_add(win, "delete,request",
                                   my_progressbar_destroy, NULL);
 
-   bg = elm_bg_add(win);
-   elm_win_resize_object_add(win, bg);
-   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_show(bg);
-
    bx = elm_box_add(win);
    elm_win_resize_object_add(win, bx);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -94,7 +88,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,20 +96,20 @@ 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);
    _test_progressbar.pb2 = pb;
 
    ic1 = elm_icon_add(win);
-   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", PACKAGE_DATA_DIR);
+   snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_icon_file_set(ic1, buf, NULL);
    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_progressbar_icon_set(pb, ic1);
+   elm_object_text_set(pb, "Label");
+   elm_object_part_content_set(pb, "icon", ic1);
    elm_progressbar_inverted_set(pb, 1);
    elm_progressbar_unit_format_set(pb, "%1.1f units");
    elm_progressbar_span_size_set(pb, 200);
@@ -139,7 +133,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 +144,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,8 +155,8 @@ 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_progressbar_icon_set(pb, ic2);
+   elm_object_text_set(pb, "Label");
+   elm_object_part_content_set(pb, "icon", ic2);
    elm_progressbar_inverted_set(pb, 1);
    elm_progressbar_unit_format_set(pb, "%1.2f%%");
    elm_progressbar_span_size_set(pb, 200);
@@ -175,7 +169,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);
@@ -183,19 +177,19 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    _test_progressbar.pb7 = pb;
 
    bt_bx = elm_box_add(win);
-   elm_box_horizontal_set(bt_bx, 1);
+   elm_box_horizontal_set(bt_bx, EINA_TRUE);
    evas_object_size_hint_weight_set(bt_bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_box_pack_end(bx, bt_bx);
    evas_object_show(bt_bx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Start");
+   elm_object_text_set(bt, "Start");
    evas_object_smart_callback_add(bt, "clicked", my_progressbar_test_start, NULL);
    elm_box_pack_end(bt_bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Stop");
+   elm_object_text_set(bt, "Stop");
    evas_object_smart_callback_add(bt, "clicked", my_progressbar_test_stop, NULL);
    elm_box_pack_end(bt_bx, bt);
    evas_object_show(bt);