Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...

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

diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c
index 584929d..4bc3f9f 100644 (file)
--- a/src/bin/test_cursor.c
+++ b/src/bin/test_cursor.c
@@ -5,6 +5,8 @@
 #endif
 #ifndef ELM_LIB_QUICKLAUNCH
 
 #endif
 #ifndef ELM_LIB_QUICKLAUNCH
 

+// XXX: show all type of cursors in the elementary_test. this needs to be the first test
+

 typedef struct _Testitem
 {
    Elm_Object_Item *item;
 typedef struct _Testitem
 {
    Elm_Object_Item *item;


@@ -56,7 +58,7 @@ glt_exp(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
    glit2 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 2), glit,
                                    ELM_GENLIST_ITEM_NONE, NULL, NULL);
    glit3 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 3), glit,
    glit2 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 2), glit,
                                    ELM_GENLIST_ITEM_NONE, NULL, NULL);
    glit3 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 3), glit,

-                                   ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+                                   ELM_GENLIST_ITEM_TREE, NULL, NULL);

 
    elm_genlist_item_cursor_set(glit1, ELM_CURSOR_HAND2);
    elm_genlist_item_cursor_set(glit2, ELM_CURSOR_HAND2);
 
    elm_genlist_item_cursor_set(glit1, ELM_CURSOR_HAND2);
    elm_genlist_item_cursor_set(glit2, ELM_CURSOR_HAND2);


@@ -202,12 +204,12 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
    tb_it = elm_toolbar_item_append(o, NULL, "Bogosity", NULL, NULL);
    evas_object_size_hint_weight_set(o, 0.0, 0.0);
    evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0);
    tb_it = elm_toolbar_item_append(o, NULL, "Bogosity", NULL, NULL);

-   elm_toolbar_item_cursor_set(tb_it, ELM_CURSOR_BOGOSITY);
+   elm_object_item_cursor_set(tb_it, ELM_CURSOR_BOGOSITY);

    tb_it = elm_toolbar_item_append(o, NULL, "Unset", NULL, NULL);
    tb_it = elm_toolbar_item_append(o, NULL, "Unset", NULL, NULL);

-   elm_toolbar_item_cursor_set(tb_it, ELM_CURSOR_BOGOSITY);
-   elm_toolbar_item_cursor_unset(tb_it);
+   elm_object_item_cursor_set(tb_it, ELM_CURSOR_BOGOSITY);
+   elm_object_item_cursor_unset(tb_it);

    tb_it = elm_toolbar_item_append(o, NULL, "Xterm", NULL, NULL);
    tb_it = elm_toolbar_item_append(o, NULL, "Xterm", NULL, NULL);

-   elm_toolbar_item_cursor_set(tb_it, ELM_CURSOR_XTERM);
+   elm_object_item_cursor_set(tb_it, ELM_CURSOR_XTERM);

    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 


@@ -234,9 +236,9 @@ test_cursor2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    itct.func.text_get = glt_text_get;
 
    glit1 = elm_genlist_item_append(gl, &itct, (void *) 1, NULL,
    itct.func.text_get = glt_text_get;
 
    glit1 = elm_genlist_item_append(gl, &itct, (void *) 1, NULL,

-                                   ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+                                   ELM_GENLIST_ITEM_TREE, NULL, NULL);

    glit2 = elm_genlist_item_append(gl, &itct, (void *) 2, NULL,
    glit2 = elm_genlist_item_append(gl, &itct, (void *) 2, NULL,

-                                   ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+                                   ELM_GENLIST_ITEM_TREE, NULL, NULL);

    glit3 = elm_genlist_item_append(gl, &itct, (void *) 3, NULL,
                                    ELM_GENLIST_ITEM_NONE, NULL, NULL);
 
    glit3 = elm_genlist_item_append(gl, &itct, (void *) 3, NULL,
                                    ELM_GENLIST_ITEM_NONE, NULL, NULL);
 


@@ -310,7 +312,7 @@ test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, ELM_CURSOR_HAND1);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, ELM_CURSOR_HAND1);

-   elm_object_cursor_engine_only_set(o, EINA_FALSE);
+   elm_object_cursor_theme_search_enabled_set(o, EINA_FALSE);

    elm_object_text_set(o, "hand1");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
    elm_object_text_set(o, "hand1");
    elm_box_pack_end(bx, o);
    evas_object_show(o);


@@ -323,21 +325,21 @@ test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, ELM_CURSOR_HAND2);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, ELM_CURSOR_HAND2);

-   elm_object_cursor_engine_only_set(o, EINA_FALSE);
+   elm_object_cursor_theme_search_enabled_set(o, EINA_FALSE);

    elm_object_text_set(o, "hand2");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand3");
    elm_object_text_set(o, "hand2");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand3");

-   elm_object_cursor_engine_only_set(o, EINA_FALSE);
+   elm_object_cursor_theme_search_enabled_set(o, EINA_FALSE);

    elm_object_text_set(o, "hand3");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand3");
    elm_object_text_set(o, "hand3");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand3");

-   elm_object_cursor_engine_only_set(o, EINA_FALSE);
+   elm_object_cursor_theme_search_enabled_set(o, EINA_FALSE);

    elm_object_cursor_style_set(o, "transparent");
    elm_object_text_set(o, "hand3 transparent");
    elm_box_pack_end(bx, o);
    elm_object_cursor_style_set(o, "transparent");
    elm_object_text_set(o, "hand3 transparent");
    elm_box_pack_end(bx, o);


@@ -345,7 +347,7 @@ test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand3");
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand3");

-   elm_object_cursor_engine_only_set(o, EINA_FALSE);
+   elm_object_cursor_theme_search_enabled_set(o, EINA_FALSE);

    elm_object_cursor_unset(o);
    elm_object_text_set(o, "unset");
    elm_box_pack_end(bx, o);
    elm_object_cursor_unset(o);
    elm_object_text_set(o, "unset");
    elm_box_pack_end(bx, o);


@@ -357,14 +359,14 @@ test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 

-   elm_cursor_engine_only_set(0);
+   elm_config_cursor_engine_only_set(EINA_FALSE);

    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand2");
    elm_object_text_set(o, "hand 2 engine only config false");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand2");
    elm_object_text_set(o, "hand 2 engine only config false");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 

-   elm_cursor_engine_only_set(1);
+   elm_config_cursor_engine_only_set(EINA_TRUE);

    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand2");
    elm_object_text_set(o, "hand 2 engine only config true");
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand2");
    elm_object_text_set(o, "hand 2 engine only config true");