Merge "[elm_datetime.h] Datetime default minimum year is changed to 1902 and document...

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

diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index 5c20db5..b17c8f9 100644 (file)
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -1,9 +1,9 @@
-#include <Elementary.h>
 #include <Elementary_Cursor.h>
 #include "test.h"
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
 static Elm_Gengrid_Item_Class *gic;
@@ -15,7 +15,6 @@ char *grid_text_get(void *data, Evas_Object *obj __UNUSED__,
 Eina_Bool grid_state_get(void *data __UNUSED__, Evas_Object *obj __UNUSED__,
                          const char *part __UNUSED__);
 void grid_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__);
-static Evas_Object *gtt_item_icon(void *data   __UNUSED__, Evas_Object *obj __UNUSED__, Evas_Object *tt, void *item   __UNUSED__);
 
 typedef struct _Testitem
 {
@@ -57,7 +56,7 @@ typedef enum _api_state api_state;
 static void
 set_api_state(api_data *api)
 {
-   Evas_Object *grid = api->box;
+   Evas_Object *grid = api->grid;
 
    /* use elm_box_children_get() to get list of children */
    switch(api->state)
@@ -71,7 +70,7 @@ set_api_state(api_data *api)
          break;
 
       case GRID_NO_SELECT_MODE: /* 2 */
-         elm_gengrid_select_mode_set(grid, ELM_OBJECT_NO_SELECT);
+         elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_NONE);
          break;
 
       case GRID_NO_BOUNCE: /* 3 */
@@ -145,20 +144,6 @@ static const char *cur[4] =
    ELM_CURSOR_CROSS,
 };
 
-static Evas_Object *
-gtt_item_icon(void *data   __UNUSED__,
-              Evas_Object *obj __UNUSED__,
-              Evas_Object *tt,
-              void *item   __UNUSED__)
-{
-   Evas_Object *ic = elm_icon_add(tt);
-   char buf[PATH_MAX];
-   snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
-   return ic;
-}
-
 static int n_current_pic = 0;
 static void
 _horizontal_grid(void *data, Evas_Object *obj, void *event_info __UNUSED__)
@@ -290,7 +275,10 @@ static void
 always_select_mode_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    api_data *api = data;
-   elm_gengrid_always_select_mode_set(api->grid, elm_check_state_get(obj));
+   if (elm_check_state_get(obj))
+     elm_gengrid_select_mode_set(api->grid, ELM_OBJECT_SELECT_MODE_ALWAYS);
+   else
+     elm_gengrid_select_mode_set(api->grid, ELM_OBJECT_SELECT_MODE_DEFAULT);
 }
 
 static void
@@ -424,7 +412,7 @@ cursor_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
    for ((item = elm_gengrid_first_item_get(grid)); item;
         (item = elm_gengrid_item_next_get(item)))
      {
-        if(!elm_check_state_get(obj))
+        if (!elm_check_state_get(obj))
           {
              elm_gengrid_item_cursor_unset(item);
              continue;
@@ -481,19 +469,13 @@ cursor_bt_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
 void
 test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bt, *content_box, *bxx, *bx, *tg;
+   Evas_Object *win, *bt, *content_box, *bxx, *bx, *tg;
    api_data *api = calloc(1, sizeof(api_data));
 
-   win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
-   elm_win_title_set(win, "GenGrid");
+   win = elm_win_util_standard_add("gengrid", "GenGrid");
    elm_win_autodel_set(win, EINA_TRUE);
    evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api);
 
-   bg = elm_bg_add(win);
-   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bg);
-   evas_object_show(bg);
-
    bxx = elm_box_add(win);
    api->box = bxx;
    elm_win_resize_object_add(win, bxx);
@@ -698,17 +680,11 @@ _size_changed(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 void
 test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *grid, *bx, *hbx, *bt, *ck;
+   Evas_Object *win, *grid, *bx, *hbx, *bt, *ck;
 
-   win = elm_win_add(NULL, "gengrid2", ELM_WIN_BASIC);
-   elm_win_title_set(win, "GenGrid2");
+   win = elm_win_util_standard_add("gengrid2", "GenGrid 2");
    elm_win_autodel_set(win, EINA_TRUE);
 
-   bg = elm_bg_add(win);
-   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bg);
-   evas_object_show(bg);
-
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, bx);
@@ -800,20 +776,14 @@ test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 void
 test_gengrid3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *grid;
+   Evas_Object *win, *grid;
    static Testitem ti[144];
    int i, n;
    char buf[PATH_MAX];
 
-   win = elm_win_add(NULL, "gengrid_group", ELM_WIN_BASIC);
-   elm_win_title_set(win, "GenGrid Group");
+   win = elm_win_util_standard_add("gengrid_group", "GenGrid Group");
    elm_win_autodel_set(win, EINA_TRUE);
 
-   bg = elm_bg_add(win);
-   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_win_resize_object_add(win, bg);
-   evas_object_show(bg);
-
    grid = elm_gengrid_add(win);
    elm_gengrid_item_size_set(grid, 150, 150);
    elm_gengrid_group_item_size_set(grid, 31, 31);