elm bin: Use convenient utility function elm_win_util_standard_add() instead of elm_w...

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

diff --git a/src/bin/test_diskselector.c b/src/bin/test_diskselector.c
index ac546fd..d62dee4 100644 (file)
--- a/src/bin/test_diskselector.c
+++ b/src/bin/test_diskselector.c
@@ -1,9 +1,9 @@
-#include <Elementary.h>
 #include "test.h"
 #include <Elementary_Cursor.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 struct _api_data
 {
@@ -36,7 +36,7 @@ static void
 set_api_state(api_data *api)
 {
    const Eina_List *disks = elm_box_children_get(api->box);
-   if(!eina_list_count(disks))
+   if (!eina_list_count(disks))
      return;
 
    switch(api->state)
@@ -188,7 +188,7 @@ _disk_create(Evas_Object *win, Eina_Bool rnd)
    elm_diskselector_item_append(di, "December", NULL, NULL, NULL);
 
    elm_diskselector_item_selected_set(ds_it, EINA_TRUE);
-   elm_diskselector_round_set(di, rnd);
+   elm_diskselector_round_enabled_set(di, rnd);
 
    return di;
 }
@@ -202,7 +202,7 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
 void
 test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *disk, *ic, *bxx, *bt;
+   Evas_Object *win, *bx, *disk, *ic, *bxx, *bt;
    Elm_Object_Item *ds_it;
    char buf[PATH_MAX];
    api_data *api = calloc(1, sizeof(api_data));
@@ -216,17 +216,10 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
    };
    char date[3];
 
-   win = elm_win_add(NULL, "diskselector", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Disk Selector");
+   win = elm_win_util_standard_add("diskselector", "Disk Selector");
    elm_win_autodel_set(win, EINA_TRUE);
    evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
 
-   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_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   evas_object_show(bg);
-
    bxx = elm_box_add(win);
    elm_win_resize_object_add(win, bxx);
    evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -273,7 +266,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
    elm_box_pack_end(bx, disk);
    evas_object_show(disk);
    evas_object_smart_callback_add(disk, "selected", _print_disk_info_cb, NULL);
-   elm_diskselector_side_label_length_set(disk, 4);
+   elm_diskselector_side_text_max_length_set(disk, 4);
 
    disk = elm_diskselector_add(win);
    ic = elm_icon_add(win);
@@ -287,7 +280,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
    elm_diskselector_item_append(disk, "Thursday", NULL, NULL, NULL);
    elm_diskselector_item_append(disk, "Friday", NULL, NULL, NULL);
    elm_diskselector_item_append(disk, "Saturday", NULL, NULL, NULL);
-   elm_diskselector_round_set(disk, EINA_TRUE);
+   elm_diskselector_round_enabled_set(disk, EINA_TRUE);
    evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(disk, EVAS_HINT_FILL, 0.5);
    elm_box_pack_end(bx, disk);
@@ -306,7 +299,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
    elm_diskselector_item_append(disk, "والشريعة", NULL, NULL, NULL);
    elm_diskselector_item_append(disk, "עִבְרִית", NULL, NULL, NULL);
    elm_diskselector_item_append(disk, "Grüßen", NULL, NULL, NULL);
-   elm_diskselector_round_set(disk, EINA_TRUE);
+   elm_diskselector_round_enabled_set(disk, EINA_TRUE);
    evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(disk, EVAS_HINT_FILL, 0.5);
    elm_box_pack_end(bx, disk);
@@ -326,7 +319,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
      }
 
    elm_diskselector_item_selected_set(ds_it, EINA_TRUE);
-   elm_diskselector_round_set(disk, EINA_TRUE);
+   elm_diskselector_round_enabled_set(disk, EINA_TRUE);
    evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(disk, EVAS_HINT_FILL, 0.5);
    elm_box_pack_end(bx, disk);
@@ -346,7 +339,7 @@ test_diskselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
      }
 
    elm_diskselector_item_selected_set(ds_it, EINA_TRUE);
-   elm_diskselector_round_set(disk, EINA_TRUE);
+   elm_diskselector_round_enabled_set(disk, EINA_TRUE);
    evas_object_size_hint_weight_set(disk, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(disk, EVAS_HINT_FILL, 0.5);
    elm_box_pack_end(bx, disk);