#include <Elementary.h>
+<<<<<<< HEAD
+=======
+#include "test.h"
+>>>>>>> remotes/origin/upstream
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
void test_bg_image(void *data, Evas_Object *obj, void *event_info);
void test_bg_options(void *data, Evas_Object *obj, void *event_info);
void test_icon(void *data, Evas_Object *obj, void *event_info);
+<<<<<<< HEAD
void test_box_vert(void *data, Evas_Object *obj, void *event_info);
void test_box_vert2(void *data, Evas_Object *obj, void *event_info);
void test_box_horiz(void *data, Evas_Object *obj, void *event_info);
+=======
+void test_icon_transparent(void *data, Evas_Object *obj, void *event_info);
+void test_box_vert(void *data, Evas_Object *obj, void *event_info);
+void test_box_vert2(void *data, Evas_Object *obj, void *event_info);
+void test_box_pack(void *data, Evas_Object *obj, void *event_info);
+void test_box_horiz(void *data, Evas_Object *obj, void *event_info);
+void test_box_homo(void *data, Evas_Object *obj, void *event_info);
+>>>>>>> remotes/origin/upstream
void test_box_transition(void *data, Evas_Object *obj, void *event_info);
void test_button(void *data, Evas_Object *obj, void *event_info);
void test_cnp(void *data, Evas_Object *obj, void *event_info);
void test_toggle(void *data, Evas_Object *obj, void *event_info);
void test_clock(void *data, Evas_Object *obj, void *event_info);
void test_clock2(void *data, Evas_Object *obj, void *event_info);
+<<<<<<< HEAD
+=======
+void test_clock3(void *data, Evas_Object *obj, void *event_info);
+>>>>>>> remotes/origin/upstream
void test_check(void *data, Evas_Object *obj, void *event_info);
void test_radio(void *data, Evas_Object *obj, void *event_info);
void test_layout(void *data, Evas_Object *obj, void *event_info);
void test_entry3(void *data, Evas_Object *obj, void *event_info);
void test_entry4(void *data, Evas_Object *obj, void *event_info);
void test_entry5(void *data, Evas_Object *obj, void *event_info);
+<<<<<<< HEAD
void test_entry_notepad(void *data, Evas_Object *obj, void *event_info);
void test_multibuttonentry(void *data, Evas_Object *obj, void *event_info);
void test_anchorview(void *data, Evas_Object *obj, void *event_info);
void test_anchorblock(void *data, Evas_Object *obj, void *event_info);
+=======
+void test_entry6(void *data, Evas_Object *obj, void *event_info);
+void test_entry7(void *data, Evas_Object *obj, void *event_info);
+void test_entry8(void *data, Evas_Object *obj, void *event_info);
+void test_entry_notepad(void *data, Evas_Object *obj, void *event_info);
+void test_multibuttonentry(void *data, Evas_Object *obj, void *event_info);
+void test_entry_anchor2(void *data, Evas_Object *obj, void *event_info);
+void test_entry_anchor(void *data, Evas_Object *obj, void *event_info);
+>>>>>>> remotes/origin/upstream
void test_toolbar(void *data, Evas_Object *obj, void *event_info);
void test_toolbar2(void *data, Evas_Object *obj, void *event_info);
void test_toolbar3(void *data, Evas_Object *obj, void *event_info);
void test_genlist12(void *data, Evas_Object *obj, void *event_info);
void test_genlist13(void *data, Evas_Object *obj, void *event_info);
void test_genlist14(void *data, Evas_Object *obj, void *event_info);
+<<<<<<< HEAD
+=======
+void test_genlist15(void *data, Evas_Object *obj, void *event_info);
+void test_genlist16(void *data, Evas_Object *obj, void *event_info);
+void test_genlist17(void *data, Evas_Object *obj, void *event_info);
+>>>>>>> remotes/origin/upstream
void test_gesture_layer(void *data, Evas_Object *obj, void *event_info);
void test_gesture_layer2(void *data, Evas_Object *obj, void *event_info);
void test_gesture_layer3(void *data, Evas_Object *obj, void *event_info);
void test_table4(void *data, Evas_Object *obj, void *event_info);
void test_table5(void *data, Evas_Object *obj, void *event_info);
void test_table6(void *data, Evas_Object *obj, void *event_info);
+<<<<<<< HEAD
void test_gengrid(void *data, Evas_Object *obj, void *event_info);
void test_gengrid2(void *data, Evas_Object *obj, void *event_info);
void test_gengrid3(void *data, Evas_Object *obj, void *event_info);
void test_pager(void *data, Evas_Object *obj, void *event_info);
void test_pager_slide(void *data, Evas_Object *obj, void *event_info);
+=======
+void test_table7(void *data, Evas_Object *obj, void *event_info);
+void test_gengrid(void *data, Evas_Object *obj, void *event_info);
+void test_gengrid2(void *data, Evas_Object *obj, void *event_info);
+void test_gengrid3(void *data, Evas_Object *obj, void *event_info);
+>>>>>>> remotes/origin/upstream
void test_win_state(void *data, Evas_Object *obj, void *event_info);
void test_win_state2(void *data, Evas_Object *obj, void *event_info);
void test_progressbar(void *data, Evas_Object *obj, void *event_info);
void test_flip4(void *data, Evas_Object *obj, void *event_info);
void test_flip_page(void *data, Evas_Object *obj, void *event_info);
void test_label(void *data, Evas_Object *obj, void *event_info);
+<<<<<<< HEAD
+=======
+void test_label2(void *data, Evas_Object *obj, void *event_info);
+>>>>>>> remotes/origin/upstream
void test_conformant(void *data, Evas_Object *obj, void *event_info);
void test_conformant2(void *data, Evas_Object *obj, void *event_info);
void test_multi(void *data, Evas_Object *obj, void *event_info);
void test_focus(void *data, Evas_Object *obj, void *event_info);
void test_focus2(void *data, Evas_Object *obj, void *event_info);
void test_focus3(void *data, Evas_Object *obj, void *event_info);
+<<<<<<< HEAD
+=======
+void test_focus4(void *data, Evas_Object *obj, void *event_info);
+>>>>>>> remotes/origin/upstream
void test_flipselector(void *data, Evas_Object *obj, void *event_info);
void test_diskselector(void *data, Evas_Object *obj, void *event_info);
void test_colorselector(void *data, Evas_Object *obj, void *event_info);
void test_glview(void *data, Evas_Object *obj, void *event_info);
void test_3d(void *data, Evas_Object *obj, void *event_info);
void test_naviframe(void *data, Evas_Object *obj, void *event_info);
+<<<<<<< HEAD
void test_factory(void *data, Evas_Object *obj, void *event_info);
+=======
+//void test_factory(void *data, Evas_Object *obj, void *event_info);
+void test_datetime(void *data, Evas_Object *obj, void *event_info);
+void test_popup(void *data, Evas_Object *obj, void *event_info);
+void test_dayselector(void *data, Evas_Object *obj, void *event_info);
+>>>>>>> remotes/origin/upstream
#ifdef HAVE_EMOTION
void test_video(void *data, Evas_Object *obj, void *event_info);
#endif
*p_list = eina_list_sorted_insert(*p_list, elm_test_sort, t);
}
+<<<<<<< HEAD
static void
my_win_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
/* called when my_win_main is requested to be deleted */
+=======
+void
+my_win_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
+{
+>>>>>>> remotes/origin/upstream
elm_exit(); /* exit the program's main loop that runs in elm_run() */
}
_ui_tg_changed(void *data, Evas_Object *obj, void *event_info)
{
(void) data; (void) event_info;
+<<<<<<< HEAD
elm_mirrored_set(elm_check_state_get(obj));
+=======
+ elm_config_mirrored_set(elm_check_state_get(obj));
+>>>>>>> remotes/origin/upstream
}
static void
tg = elm_check_add(win);
elm_object_style_set(tg, "toggle");
elm_object_text_set(tg, "UI-Mirroring:");
+<<<<<<< HEAD
elm_check_state_set(tg, elm_mirrored_get());
+=======
+ elm_check_state_set(tg, elm_config_mirrored_get());
+>>>>>>> remotes/origin/upstream
evas_object_smart_callback_add(tg, "changed", _ui_tg_changed, NULL);
elm_box_pack_end(bx0, tg);
evas_object_show(tg);
ADD_TEST(NULL, "Window / Background", "Window Plug", test_win_plug);
//------------------------------//
+<<<<<<< HEAD
ADD_TEST(NULL, "Images", "Icon Transparent", test_icon);
+=======
+ ADD_TEST(NULL, "Images", "Icon", test_icon);
+ ADD_TEST(NULL, "Images", "Icon Transparent", test_icon_transparent);
+>>>>>>> remotes/origin/upstream
ADD_TEST(NULL, "Images", "Icon Animation", test_icon_animated);
ADD_TEST(NULL, "Images", "Photocam", test_photocam);
ADD_TEST(NULL, "Images", "Photo", test_photo);
//------------------------------//
ADD_TEST(NULL, "Containers", "Box Vert", test_box_vert);
ADD_TEST(NULL, "Containers", "Box Vert 2", test_box_vert2);
+<<<<<<< HEAD
+ ADD_TEST(NULL, "Containers", "Box Horiz", test_box_horiz);
+=======
+ ADD_TEST(NULL, "Containers", "Box Pack", test_box_pack);
ADD_TEST(NULL, "Containers", "Box Horiz", test_box_horiz);
+ ADD_TEST(NULL, "Containers", "Box Homogeneous", test_box_homo);
+>>>>>>> remotes/origin/upstream
ADD_TEST(NULL, "Containers", "Box Transition", test_box_transition);
ADD_TEST(NULL, "Containers", "Table", test_table);
ADD_TEST(NULL, "Containers", "Table Homogeneous", test_table2);
ADD_TEST(NULL, "Containers", "Table 4", test_table4);
ADD_TEST(NULL, "Containers", "Table 5", test_table5);
ADD_TEST(NULL, "Containers", "Table 6", test_table6);
+<<<<<<< HEAD
+=======
+ ADD_TEST(NULL, "Containers", "Table 7", test_table7);
+>>>>>>> remotes/origin/upstream
ADD_TEST(NULL, "Containers", "Layout", test_layout);
ADD_TEST(NULL, "Containers", "Grid", test_grid);
ADD_TEST(NULL, "Entries", "Entry 3", test_entry3);
ADD_TEST(NULL, "Entries", "Entry 4", test_entry4);
ADD_TEST(NULL, "Entries", "Entry 5", test_entry5);
+<<<<<<< HEAD
ADD_TEST(NULL, "Entries", "Entry Notepad", test_entry_notepad);
ADD_TEST(NULL, "Entries", "Multibuttonentry", test_multibuttonentry);
+=======
+ ADD_TEST(NULL, "Entries", "Entry 6", test_entry6);
+ ADD_TEST(NULL, "Entries", "Entry 7", test_entry7);
+ ADD_TEST(NULL, "Entries", "Entry 8", test_entry8);
+ ADD_TEST(NULL, "Entries", "Entry Notepad", test_entry_notepad);
+ ADD_TEST(NULL, "Entries", "Multibuttonentry", test_multibuttonentry);
+ ADD_TEST(NULL, "Entries", "Entry Anchor", test_entry_anchor);
+ ADD_TEST(NULL, "Entries", "Entry Anchor2", test_entry_anchor2);
+>>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Buttons", "Buttons", test_button);
ADD_TEST(NULL, "Lists", "Genlist Eio", test_eio);
#endif
ADD_TEST(NULL, "Lists", "Genlist Textblock", test_genlist12);
+<<<<<<< HEAD
//ADD_TEST(NULL, "Lists", "Genlist Tree, Insert Sorted", test_genlist13);
//ADD_TEST(NULL, "Lists", "Genlist Tree, Insert Relative", test_genlist14);
+=======
+ ADD_TEST(NULL, "Lists", "Genlist Tree, Insert Sorted", test_genlist13);
+ ADD_TEST(NULL, "Lists", "Genlist Tree, Insert Relative", test_genlist14);
+ ADD_TEST(NULL, "Lists", "Genlist Edit Mode", test_genlist15);
+ ADD_TEST(NULL, "Lists", "Genlist Flip Mode", test_genlist16);
+ ADD_TEST(NULL, "Lists", "Genlist Tree Effect", test_genlist17);
+>>>>>>> remotes/origin/upstream
ADD_TEST(NULL, "Lists", "GenGrid", test_gengrid);
ADD_TEST(NULL, "Lists", "GenGrid 2", test_gengrid2);
ADD_TEST(NULL, "Lists", "GenGrid Group", test_gengrid3);
ADD_TEST(NULL, "Selectors", "Hoversel", test_hoversel);
ADD_TEST(NULL, "Selectors", "Radios", test_radio);
ADD_TEST(NULL, "Selectors", "Flip Selector", test_flipselector);
+<<<<<<< HEAD
+=======
+ ADD_TEST(NULL, "Selectors", "Dayselector", test_dayselector);
+>>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Cursors", "Cursor", test_cursor);
ADD_TEST(NULL, "Popups", "Hover 2", test_hover2);
ADD_TEST(NULL, "Popups", "Notify", test_notify);
ADD_TEST(NULL, "Popups", "Tooltip", test_tooltip);
+<<<<<<< HEAD
ADD_TEST(NULL, "Popups", "Tooltip2", test_tooltip2);
+=======
+ ADD_TEST(NULL, "Popups", "Tooltip 2", test_tooltip2);
+ ADD_TEST(NULL, "Popups", "Popup", test_popup);
+>>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Times & Dates", "Calendar", test_calendar);
ADD_TEST(NULL, "Times & Dates", "Calendar 2", test_calendar2);
ADD_TEST(NULL, "Times & Dates", "Clock", test_clock);
ADD_TEST(NULL, "Times & Dates", "Clock 2", test_clock2);
+<<<<<<< HEAD
//------------------------------//
ADD_TEST(NULL, "Text", "Anchorview", test_anchorview);
ADD_TEST(NULL, "Text", "Anchorblock", test_anchorblock);
ADD_TEST(NULL, "Text", "Label", test_label);
+=======
+ ADD_TEST(NULL, "Times & Dates", "Clock 3", test_clock3);
+ ADD_TEST(NULL, "Times & Dates", "Datetime", test_datetime);
+
+ //------------------------------//
+ ADD_TEST(NULL, "Text", "Label", test_label);
+ ADD_TEST(NULL, "Text", "Label2", test_label2);
+>>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Stored Surface Buffer", "Launcher", test_launcher);
ADD_TEST(NULL, "Focus", "Focus", test_focus);
ADD_TEST(NULL, "Focus", "Focus 2", test_focus2);
ADD_TEST(NULL, "Focus", "Focus 3", test_focus3);
+<<<<<<< HEAD
//------------------------------//
ADD_TEST(NULL, "Storyboard", "Naviframe", test_naviframe);
ADD_TEST(NULL, "Storyboard", "Pager", test_pager);
ADD_TEST(NULL, "Storyboard", "Pager Slide", test_pager_slide);
+=======
+ ADD_TEST(NULL, "Focus", "Focus 4", test_focus4);
+
+ //------------------------------//
+ ADD_TEST(NULL, "Storyboard", "Naviframe", test_naviframe);
+>>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Geographic", "Map", test_map);
//------------------------------//
ADD_TEST(NULL, "Helpers", "Store", test_store);
+<<<<<<< HEAD
ADD_TEST(NULL, "Helpers", "Factory", test_factory);
+=======
+// ADD_TEST(NULL, "Helpers", "Factory", test_factory);
+>>>>>>> remotes/origin/upstream
//------------------------------//
ADD_TEST(NULL, "Micellaneous", "Copy And Paste", test_cnp);
}
tt = t;
+<<<<<<< HEAD
if (test_win_only) return;
+=======
+ if (test_win_only)
+ {
+ EINA_LIST_FREE(tests, t)
+ free (t);
+
+ return;
+ }
+>>>>>>> remotes/origin/upstream
if (tests)
{