fixed plugin image size problem
[framework/uifw/elementary.git] / src / bin / test_gengrid.c
index a3cc18f..b17c8f9 100644 (file)
-#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;
+static Elm_Gengrid_Item_Class ggic;
+
+Evas_Object *grid_content_get(void *data, Evas_Object *obj, const char *part);
+char *grid_text_get(void *data, Evas_Object *obj __UNUSED__,
+                    const char *part __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__);
+
 typedef struct _Testitem
 {
-   Elm_Gengrid_Item *item;
+   Elm_Object_Item *item;
    const char *path;
    int mode;
    int onoff;
 } Testitem;
 
+struct _api_data
+{
+   unsigned int state;  /* What state we are testing       */
+   Evas_Object *box;           /* Use this to get box content     */
+   Evas_Object *grid;
+};
+typedef struct _api_data api_data;
+
+enum _api_state
+{
+   GRID_ALIGN_SET,
+   GRID_BRING_IN,
+   GRID_NO_SELECT_MODE,
+   GRID_NO_BOUNCE,
+   GRID_PAGE_RELATIVE,
+   GRID_PAGE_SIZE,
+   GRID_TOOLTIP_SET_TEXT,
+   GRID_TOOLTIP_UNSET,
+   GRID_ITEM_CLASS_SET,
+   GRID_ITEM_UPDATE_SET,
+   GRID_PAGE_BRING_IN,
+   GRID_PAGE_SHOW,
+   GRID_TOOLTIP_CONTENT_CB,
+   GRID_TOOLTIP_STYLE_SET,
+   GRID_TOOLTIP_WINDOW_MODE_SET,
+   API_STATE_LAST
+};
+typedef enum _api_state api_state;
+
+static void
+set_api_state(api_data *api)
+{
+   Evas_Object *grid = api->grid;
+
+   /* use elm_box_children_get() to get list of children */
+   switch(api->state)
+     { /* Put all api-changes under switch */
+      case GRID_ALIGN_SET: /* 0 */
+         elm_gengrid_align_set(grid, 0.2, 0.8);
+         break;
+
+      case GRID_BRING_IN: /* 1 */
+         elm_gengrid_item_bring_in(elm_gengrid_first_item_get(grid), ELM_GENGRID_ITEM_SCROLLTO_IN);
+         break;
+
+      case GRID_NO_SELECT_MODE: /* 2 */
+         elm_gengrid_select_mode_set(grid, ELM_OBJECT_SELECT_MODE_NONE);
+         break;
+
+      case GRID_NO_BOUNCE: /* 3 */
+         elm_gengrid_bounce_set(grid, EINA_TRUE, EINA_FALSE);
+         break;
+
+      case GRID_PAGE_RELATIVE: /* 4 */
+         elm_gengrid_bounce_set(grid, EINA_TRUE, EINA_TRUE);
+         elm_gengrid_page_relative_set(grid, 0.5, 0.5);
+         break;
+
+      case GRID_PAGE_SIZE: /* 5 */
+         elm_gengrid_page_size_set(grid, 50, 25);
+         break;
+
+      case GRID_TOOLTIP_SET_TEXT: /* 6 */
+           {
+              Elm_Object_Item *item = elm_gengrid_first_item_get(grid);
+              elm_gengrid_item_tooltip_text_set(item, "This is the first item");
+           }
+         break;
+
+      case GRID_TOOLTIP_UNSET: /* 7 */
+           {
+              Elm_Object_Item *item = elm_gengrid_first_item_get(grid);
+              elm_gengrid_item_tooltip_unset(item);
+           }
+         break;
+
+      case API_STATE_LAST:
+         break;
+
+      default:
+         return;
+     }
+}
+
+static void
+_api_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+{  /* Will add here a SWITCH command containing code to modify test-object */
+   /* in accordance a->state value. */
+   api_data *a = data;
+   char str[128];
+
+   printf("clicked event on API Button: api_state=<%d>\n", a->state);
+   set_api_state(a);
+   a->state++;
+   sprintf(str, "Next API function (%u)", a->state);
+   elm_object_text_set(obj, str);
+   elm_object_disabled_set(obj, a->state == API_STATE_LAST);
+}
+
 static const char *img[9] =
 {
    "panel_01.jpg",
@@ -24,8 +136,15 @@ static const char *img[9] =
    "wood_01.jpg",
 };
 
-static Elm_Gengrid_Item_Class gic;
+static const char *cur[4] =
+{
+   ELM_CURSOR_CIRCLE,
+   ELM_CURSOR_CLOCK,
+   ELM_CURSOR_COFFEE_MUG,
+   ELM_CURSOR_CROSS,
+};
 
+static int n_current_pic = 0;
 static void
 _horizontal_grid(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
@@ -70,9 +189,9 @@ grid_selected(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 }
 
 static void
-grid_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+grid_double_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
 {
-   printf("Clicked: %p\n", event_info);
+   printf("Double clicked: %p\n", event_info);
 }
 
 static void
@@ -82,6 +201,12 @@ grid_longpress(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 }
 
 static void
+grid_moved(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
+{
+   printf("moved %p\n", event_info);
+}
+
+static void
 grid_item_check_changed(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    Testitem *ti = data;
@@ -90,7 +215,7 @@ grid_item_check_changed(void *data, Evas_Object *obj, void *event_info __UNUSED_
 }
 
 char *
-grid_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
+grid_text_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSED__)
 {
    const Testitem *ti = data;
    char buf[256];
@@ -99,27 +224,26 @@ grid_label_get(void *data, Evas_Object *obj __UNUSED__, const char *part __UNUSE
 }
 
 Evas_Object *
-grid_icon_get(void *data, Evas_Object *obj, const char *part)
+grid_content_get(void *data, Evas_Object *obj, const char *part)
 {
    const Testitem *ti = data;
    if (!strcmp(part, "elm.swallow.icon"))
      {
-
-       Evas_Object *icon = elm_bg_add(obj);
-       elm_bg_file_set(icon, ti->path, NULL);
-       evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-       evas_object_show(icon);
-       return icon;
+        Evas_Object *icon = elm_bg_add(obj);
+        elm_bg_file_set(icon, ti->path, NULL);
+        evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+        evas_object_show(icon);
+        return icon;
      }
    else if (!strcmp(part, "elm.swallow.end"))
      {
-       Evas_Object *ck;
-       ck = elm_check_add(obj);
-       evas_object_propagate_events_set(ck, 0);
-       elm_check_state_set(ck, ti->onoff);
-       evas_object_smart_callback_add(ck, "changed", grid_item_check_changed, data);
-       evas_object_show(ck);
-       return ck;
+        Evas_Object *ck;
+        ck = elm_check_add(obj);
+        evas_object_propagate_events_set(ck, 0);
+        elm_check_state_set(ck, ti->onoff);
+        evas_object_smart_callback_add(ck, "changed", grid_item_check_changed, data);
+        evas_object_show(ck);
+        return ck;
      }
    return NULL;
 }
@@ -141,57 +265,298 @@ grid_sel(void *data, Evas_Object *obj, void *event_info)
    printf("sel item data [%p] on grid obj [%p], pointer [%p]\n", data, obj, event_info);
 }
 
-void
-test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+static void
+_cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   free(data);
+}
+
+static void
+always_select_mode_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   api_data *api = data;
+   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
+multi_select_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *grid;
+   api_data *api = data;
+   elm_gengrid_multi_select_set(api->grid, elm_check_state_get(obj));
+}
+
+static void
+clear_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   api_data *api = data;
+   elm_gengrid_clear(api->grid);
+}
+
+static Evas_Object *
+create_gengrid(Evas_Object *obj, int items)
+{
+   Evas_Object *grid = NULL;
    static Testitem ti[144];
    int i, n;
    char buf[PATH_MAX];
 
-   win = elm_win_add(NULL, "gengrid", ELM_WIN_BASIC);
-   elm_win_title_set(win, "GenGrid");
-   elm_win_autodel_set(win, 1);
-
-   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);
+   grid = elm_gengrid_add(obj);
    elm_gengrid_item_size_set(grid, 150, 150);
    elm_gengrid_horizontal_set(grid, EINA_FALSE);
    elm_gengrid_multi_select_set(grid, EINA_TRUE);
+   elm_gengrid_reorder_mode_set(grid, EINA_TRUE);
    evas_object_smart_callback_add(grid, "selected", grid_selected, NULL);
-   evas_object_smart_callback_add(grid, "clicked", grid_clicked, NULL);
+   evas_object_smart_callback_add(grid, "clicked,double", grid_double_clicked, NULL);
    evas_object_smart_callback_add(grid, "longpressed", grid_longpress, NULL);
+   evas_object_smart_callback_add(grid, "moved", grid_moved, NULL);
    evas_object_smart_callback_add(grid, "drag,start,up", grid_drag_up, NULL);
    evas_object_smart_callback_add(grid, "drag,start,right", grid_drag_right, NULL);
    evas_object_smart_callback_add(grid, "drag,start,down", grid_drag_down, NULL);
    evas_object_smart_callback_add(grid, "drag,start,left", grid_drag_left, NULL);
    evas_object_smart_callback_add(grid, "drag,stop", grid_drag_stop, NULL);
    evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(grid, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-   gic.item_style = "default";
-   gic.func.label_get = grid_label_get;
-   gic.func.icon_get = grid_icon_get;
-   gic.func.state_get = grid_state_get;
-   gic.func.del = grid_del;
+   gic = elm_gengrid_item_class_new();
+   gic->item_style = "default";
+   gic->func.text_get = grid_text_get;
+   gic->func.content_get = grid_content_get;
+   gic->func.state_get = grid_state_get;
+   gic->func.del = grid_del;
 
    n = 0;
-   for (i = 0; i < 12 * 12; i++)
+   for (i = 0; i < items; i++)
      {
-       snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, img[n]);
-       n = (n + 1) % 9;
-       ti[i].mode = i;
-       ti[i].path = eina_stringshare_add(buf);
-       ti[i].item = elm_gengrid_item_append(grid, &gic, &(ti[i]), grid_sel, NULL);
-       if (!(i % 5))
-         elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
+        snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n]);
+        n = (n + 1) % 9;
+        ti[i].mode = i;
+        ti[i].path = eina_stringshare_add(buf);
+        ti[i].item = elm_gengrid_item_append(grid, gic, &(ti[i]), grid_sel, NULL);
+        if (!(i % 5))
+          elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
      }
+   elm_gengrid_item_class_free(gic);
+
+   return grid;
+}
+
+static void
+restore_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   api_data *api = data;
+   elm_box_clear(api->box);
+   api->grid = create_gengrid(obj, (12 * 12));
+   elm_box_pack_end(api->box, api->grid);
+   evas_object_show(api->grid);
+}
+
+static void
+filled_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   Evas_Object *box = (Evas_Object *)data;
+   Evas_Object *grid;
 
+   elm_box_clear(box);
+   grid = create_gengrid(box, 1);
+   elm_gengrid_filled_set(grid, elm_check_state_get(obj));
+   elm_box_pack_end(box, grid);
    evas_object_show(grid);
-   elm_win_resize_object_add(win, grid);
+}
+
+static void
+filled_bt_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *win, *box, *content_box, *grid, *tg;
+
+   win = elm_win_util_standard_add("test filled", "Test Filled");
+   elm_win_autodel_set(win, EINA_TRUE);
+
+   box = elm_box_add(win);
+   elm_win_resize_object_add(win, box);
+   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(box);
+
+   content_box = elm_box_add(win);
+   elm_win_resize_object_add(win, content_box);
+   evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND,
+                                    EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(content_box, EVAS_HINT_FILL,
+                                   EVAS_HINT_FILL);
+   elm_box_pack_end(box, content_box);
+   evas_object_show(content_box);
+
+   grid = create_gengrid(win, 1);
+   elm_box_pack_end(content_box, grid);
+   evas_object_show(grid);
+
+   tg = elm_check_add(win);
+   elm_object_text_set(tg, "Filled");
+   evas_object_smart_callback_add(tg, "changed", filled_cb, content_box);
+   elm_box_pack_end(box, tg);
+   evas_object_show(tg);
+
+   evas_object_resize(win, 450, 200);
+   evas_object_show(win);
+}
+
+static void
+cursor_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
+{
+   Evas_Object *grid = (Evas_Object *)data;
+   Elm_Object_Item *item = NULL;
+   int i = 0;
+
+   for ((item = elm_gengrid_first_item_get(grid)); item;
+        (item = elm_gengrid_item_next_get(item)))
+     {
+        if (!elm_check_state_get(obj))
+          {
+             elm_gengrid_item_cursor_unset(item);
+             continue;
+          }
+
+        elm_gengrid_item_cursor_set(item, cur[i]);
+        elm_gengrid_item_cursor_engine_only_set(item, EINA_FALSE);
+        i++;
+     }
+}
+
+static void
+cursor_bt_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *win, *box, *content_box, *hbox, *grid, *tg;
+
+   win = elm_win_util_standard_add("test cursor", "Test Cursor");
+   elm_win_autodel_set(win, EINA_TRUE);
+
+   box = elm_box_add(win);
+   elm_win_resize_object_add(win, box);
+   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(box);
+
+   content_box = elm_box_add(win);
+   elm_win_resize_object_add(win, content_box);
+   evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND,
+                                    EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(content_box, EVAS_HINT_FILL,
+                                   EVAS_HINT_FILL);
+   elm_box_pack_end(box, content_box);
+   evas_object_show(content_box);
+
+   grid = create_gengrid(win, 4);
+   elm_box_pack_end(content_box, grid);
+   evas_object_show(grid);
+
+   hbox = elm_box_add(win);
+   elm_box_horizontal_set(hbox, EINA_TRUE);
+
+   tg = elm_check_add(win);
+   elm_object_text_set(tg, "Cursor");
+   evas_object_smart_callback_add(tg, "changed", cursor_cb, grid);
+   elm_box_pack_end(hbox, tg);
+   evas_object_show(tg);
+
+   elm_box_pack_end(box, hbox);
+   evas_object_show(hbox);
+
+   evas_object_resize(win, 450, 450);
+   evas_object_show(win);
+}
+
+void
+test_gengrid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *win, *bt, *content_box, *bxx, *bx, *tg;
+   api_data *api = calloc(1, sizeof(api_data));
+
+   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);
+
+   bxx = elm_box_add(win);
+   api->box = bxx;
+   elm_win_resize_object_add(win, bxx);
+   evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_show(bxx);
+
+   content_box = elm_box_add(win);
+   api->box = content_box;
+   evas_object_size_hint_weight_set(content_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(content_box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(content_box);
+
+   /* Create GenGrid */
+   api->grid = create_gengrid(win, (12 * 12));
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Next API function");
+   evas_object_smart_callback_add(bt, "clicked", _api_bt_clicked,
+                                  (void *)api);
+   elm_box_pack_end(bxx, bt);
+   elm_object_disabled_set(bt, api->state == API_STATE_LAST);
+   evas_object_show(bt);
+
+   elm_box_pack_end(content_box, api->grid);
+   elm_box_pack_end(bxx, content_box);
+   evas_object_show(api->grid);
+
+   bx = elm_box_add(win);
+   elm_box_horizontal_set(bx, EINA_TRUE);
+   elm_box_pack_end(bxx, bx);
+   evas_object_show(bx);
+
+   /* Gengrid Always Select Mode Test */
+   tg = elm_check_add(win);
+   evas_object_size_hint_weight_set(tg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(tg, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_object_text_set(tg, "Always Select Mode");
+   evas_object_smart_callback_add(tg, "changed", always_select_mode_cb,
+                                  (void *)api);
+   elm_box_pack_end(bx, tg);
+   evas_object_show(tg);
+
+   tg = elm_check_add(win);
+   evas_object_size_hint_weight_set(tg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(tg, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_object_text_set(tg, "Multi Select Mode");
+   elm_check_state_set(tg, EINA_TRUE);
+   evas_object_smart_callback_add(tg, "changed", multi_select_cb,
+                                  (void *)api);
+   elm_box_pack_end(bx, tg);
+   evas_object_show(tg);
+
+   /* Gengrid Clear Test */
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Clear");
+   evas_object_smart_callback_add(bt, "clicked", clear_bt_clicked,
+                                  (void *)api);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Restore");
+   evas_object_smart_callback_add(bt, "clicked", restore_bt_clicked,
+                                  (void *) api);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+
+   /* Gengrid Filled Test */
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Check Filled");
+   evas_object_smart_callback_add(bt, "clicked", filled_bt_clicked, NULL);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
+
+   /* Item Cursor Test */
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Check Cursor");
+   evas_object_smart_callback_add(bt, "clicked", cursor_bt_clicked,
+                                  (void *) api);
+   elm_box_pack_end(bx, bt);
+   evas_object_show(bt);
 
    evas_object_resize(win, 600, 600);
    evas_object_show(win);
@@ -202,17 +567,42 @@ _before_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __U
 {
    Testitem *ti;
    Evas_Object *grid = data;
-   Elm_Gengrid_Item *sel;
+   Elm_Object_Item *sel;
    char buf[PATH_MAX];
 
    sel = elm_gengrid_selected_item_get(grid);
    if (!sel)
        return;
-   snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, img[rand() % 9]);
-   ti = malloc(sizeof(*ti));
+   snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n_current_pic]);
+   n_current_pic = ((n_current_pic +1) % 9);
+   ti = calloc(1, sizeof(*ti));
    ti->mode = 0;
    ti->path = eina_stringshare_add(buf);
-   ti->item = elm_gengrid_item_insert_before(grid, &gic, ti, sel, grid_sel,
+   ti->item = elm_gengrid_item_insert_before(grid, gic, ti, sel, grid_sel,
+                                             NULL);
+}
+
+static int
+compare_cb(const void *data1, const void *data2)
+{
+   Testitem *ti1 = (Testitem *)data1;
+   Testitem *ti2 = (Testitem *)data2;
+   return strlen(ti1->path) - strlen(ti2->path);
+}
+
+static void
+_sorted_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Testitem *ti;
+   Evas_Object *grid = data;
+   char buf[PATH_MAX];
+
+   snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n_current_pic]);
+   n_current_pic = ((n_current_pic +1) % 9);
+   ti = calloc(1, sizeof(*ti));
+   ti->mode = 0;
+   ti->path = eina_stringshare_add(buf);
+   ti->item = elm_gengrid_item_sorted_insert(grid, gic, ti, compare_cb, grid_sel,
                                              NULL);
 }
 
@@ -221,32 +611,47 @@ _after_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UN
 {
    Testitem *ti;
    Evas_Object *grid = data;
-   Elm_Gengrid_Item *sel;
+   Elm_Object_Item *sel;
    char buf[PATH_MAX];
 
    sel = elm_gengrid_selected_item_get(grid);
    if (!sel)
        return;
-   snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, img[rand() % 9]);
-   ti = malloc(sizeof(*ti));
+   snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n_current_pic]);
+   n_current_pic = ((n_current_pic +1) % 9);
+   ti = calloc(1, sizeof(*ti));
    ti->mode = 0;
    ti->path = eina_stringshare_add(buf);
-   ti->item = elm_gengrid_item_insert_after(grid, &gic, ti, sel, grid_sel,
+   ti->item = elm_gengrid_item_insert_after(grid, gic, ti, sel, grid_sel,
                                             NULL);
 }
 
 static void
+_delete_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *grid = data;
+   Eina_List *l, *l2, *l3;
+   Elm_Object_Item *gg_it;
+
+   l = (Eina_List*)elm_gengrid_selected_items_get(grid);
+   if (!l) return;
+   EINA_LIST_FOREACH_SAFE(l, l2, l3, gg_it)
+     elm_object_item_del(gg_it);
+}
+
+static void
 _prepend_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Testitem *ti;
    Evas_Object *grid = data;
    char buf[PATH_MAX];
 
-   snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, img[rand() % 9]);
-   ti = malloc(sizeof(*ti));
+   snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n_current_pic]);
+   n_current_pic = ((n_current_pic +1) % 9);
+   ti = calloc(1, sizeof(*ti));
    ti->mode = 0;
    ti->path = eina_stringshare_add(buf);
-   ti->item = elm_gengrid_item_prepend(grid, &gic, ti, grid_sel, NULL);
+   ti->item = elm_gengrid_item_prepend(grid, gic, ti, grid_sel, NULL);
 }
 
 static void
@@ -256,11 +661,12 @@ _append_bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __U
    Evas_Object *grid = data;
    char buf[PATH_MAX];
 
-   snprintf(buf, sizeof(buf), "%s/images/%s", PACKAGE_DATA_DIR, img[rand() % 9]);
-   ti = malloc(sizeof(*ti));
+   snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n_current_pic]);
+   n_current_pic = ((n_current_pic +1) % 9);
+   ti = calloc(1, sizeof(*ti));
    ti->mode = 0;
    ti->path = eina_stringshare_add(buf);
-   ti->item = elm_gengrid_item_append(grid, &gic, ti, grid_sel, NULL);
+   ti->item = elm_gengrid_item_append(grid, gic, ti, grid_sel, NULL);
 }
 
 static void
@@ -274,16 +680,10 @@ _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");
-   elm_win_autodel_set(win, 1);
-
-   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);
+   win = elm_win_util_standard_add("gengrid2", "GenGrid 2");
+   elm_win_autodel_set(win, EINA_TRUE);
 
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -307,29 +707,41 @@ test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(hbx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Append");
+   elm_object_text_set(bt, "Append");
    evas_object_smart_callback_add(bt, "clicked", _append_bt_clicked, grid);
    elm_box_pack_end(hbx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Prepend");
+   elm_object_text_set(bt, "Prepend");
    evas_object_smart_callback_add(bt, "clicked", _prepend_bt_clicked, grid);
    elm_box_pack_end(hbx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Insert before");
+   elm_object_text_set(bt, "Insert before");
    evas_object_smart_callback_add(bt, "clicked", _before_bt_clicked, grid);
    elm_box_pack_end(hbx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Insert after");
+   elm_object_text_set(bt, "Insert after");
    evas_object_smart_callback_add(bt, "clicked", _after_bt_clicked, grid);
    elm_box_pack_end(hbx, bt);
    evas_object_show(bt);
 
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Sorted insert");
+   evas_object_smart_callback_add(bt, "clicked", _sorted_bt_clicked, grid);
+   elm_box_pack_end(hbx, bt);
+   evas_object_show(bt);
+
+   bt = elm_button_add(win);
+   elm_object_text_set(bt, "Delete");
+   evas_object_smart_callback_add(bt, "clicked", _delete_bt_clicked, grid);
+   elm_box_pack_end(hbx, bt);
+   evas_object_show(bt);
+
    bt = elm_spinner_add(win);
    elm_spinner_min_max_set(bt, 10, 1024);
    elm_spinner_value_set(bt, 150);
@@ -340,18 +752,91 @@ test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    ck = elm_check_add(win);
-   elm_check_label_set(ck, "Horizontal Mode");
+   elm_object_text_set(ck, "Horizontal Mode");
    evas_object_smart_callback_add(ck, "changed", _horizontal_grid, grid);
    elm_box_pack_end(hbx, ck);
    evas_object_show(ck);
 
-   gic.item_style = "default";
-   gic.func.label_get = grid_label_get;
-   gic.func.icon_get = grid_icon_get;
-   gic.func.state_get = grid_state_get;
-   gic.func.del = grid_del;
+   gic = elm_gengrid_item_class_new();
+
+   gic->item_style = "default";
+   gic->func.text_get = grid_text_get;
+   gic->func.content_get = grid_content_get;
+   gic->func.state_get = grid_state_get;
+   gic->func.del = grid_del;
+
+   /* item_class_ref is needed for gic. some items can be added in callbacks */
+   elm_gengrid_item_class_ref(gic);
+   elm_gengrid_item_class_free(gic);
+
+   evas_object_resize(win, 600, 600);
+   evas_object_show(win);
+}
+
+void
+test_gengrid3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+   Evas_Object *win, *grid;
+   static Testitem ti[144];
+   int i, n;
+   char buf[PATH_MAX];
+
+   win = elm_win_util_standard_add("gengrid_group", "GenGrid Group");
+   elm_win_autodel_set(win, EINA_TRUE);
+
+   grid = elm_gengrid_add(win);
+   elm_gengrid_item_size_set(grid, 150, 150);
+   elm_gengrid_group_item_size_set(grid, 31, 31);
+   //elm_gengrid_horizontal_set(grid, EINA_TRUE);
+   elm_gengrid_horizontal_set(grid, EINA_FALSE);
+   elm_gengrid_multi_select_set(grid, EINA_TRUE);
+   elm_gengrid_reorder_mode_set(grid, EINA_TRUE);
+   evas_object_smart_callback_add(grid, "selected", grid_selected, NULL);
+   evas_object_smart_callback_add(grid, "clicked,double", grid_double_clicked, NULL);
+   evas_object_smart_callback_add(grid, "longpressed", grid_longpress, NULL);
+   evas_object_smart_callback_add(grid, "moved", grid_moved, NULL);
+   evas_object_smart_callback_add(grid, "drag,start,up", grid_drag_up, NULL);
+   evas_object_smart_callback_add(grid, "drag,start,right", grid_drag_right, NULL);
+   evas_object_smart_callback_add(grid, "drag,start,down", grid_drag_down, NULL);
+   evas_object_smart_callback_add(grid, "drag,start,left", grid_drag_left, NULL);
+   evas_object_smart_callback_add(grid, "drag,stop", grid_drag_stop, NULL);
+   evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+   gic = elm_gengrid_item_class_new();
+   gic->item_style = "default";
+   gic->func.text_get = grid_text_get;
+   gic->func.content_get = grid_content_get;
+   gic->func.state_get = grid_state_get;
+   gic->func.del = grid_del;
+
+   ggic.item_style = "group_index";
+   ggic.func.text_get = grid_text_get;
+   ggic.func.content_get = NULL;
+   ggic.func.state_get = NULL;
+   ggic.func.del = NULL;
+
+   n = 0;
+   for (i = 0; i < 12 * 12; i++)
+     {
+        snprintf(buf, sizeof(buf), "%s/images/%s", elm_app_data_dir_get(), img[n]);
+        n = (n + 1) % 9;
+        ti[i].mode = i;
+        ti[i].path = eina_stringshare_add(buf);
+        if (i == 0 || i == 18 || i == 53 || i == 100)
+          //if (i == 0 || i == 18)
+          ti[i].item = elm_gengrid_item_append(grid, &ggic, &(ti[i]), grid_sel, NULL);
+        else
+          ti[i].item = elm_gengrid_item_append(grid, gic, &(ti[i]), grid_sel, NULL);
+        if (!(i % 5))
+          elm_gengrid_item_selected_set(ti[i].item, EINA_TRUE);
+     }
+   elm_gengrid_item_class_free(gic);
+
+   evas_object_show(grid);
+   elm_win_resize_object_add(win, grid);
 
    evas_object_resize(win, 600, 600);
    evas_object_show(win);
 }
+
 #endif