yakov pushed a commit to branch master.

http://git.enlightenment.org/tools/erigo.git/commit/?id=8bc428fd177da69bbf38b44531a44003d35b25f0

commit 8bc428fd177da69bbf38b44531a44003d35b25f0
Author: Yakov Goldberg <yako...@samsung.com>
Date:   Thu Feb 11 17:57:29 2016 +0200

    Update tests
---
 src/tests/data/demo.c.ref                   | 663 ++++++++++++++--------------
 src/tests/data/demo.egui                    |  16 +-
 src/tests/data/demo.h.ref                   |  44 +-
 src/tests/data/test_resources_cbs.c.ref     |  13 +-
 src/tests/data/test_resources_edjes.c.ref   |  11 +-
 src/tests/data/test_resources_images.c.ref  |  11 +-
 src/tests/data/test_settings.c.ref          |   2 -
 src/tests/data/test_widgets.c.ref           |   9 +-
 src/tests/data/test_widgets_create_cb.c.ref |  20 +-
 src/tests/data/test_widgets_modify_cb.c.ref |  11 +-
 10 files changed, 422 insertions(+), 378 deletions(-)

diff --git a/src/tests/data/demo.c.ref b/src/tests/data/demo.c.ref
index 3ce0acc..78488d7 100644
--- a/src/tests/data/demo.c.ref
+++ b/src/tests/data/demo.c.ref
@@ -81,6 +81,13 @@ _rmview_toolbar_clicked(void *data, Eo *obj, const 
Eo_Event_Description *desc, v
    #error "Please define EGUI_LAYOUT_EDJE_PATH"
 #endif
 
+static Eina_Bool
+_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   free(data);
+   return EINA_TRUE;
+}
+
 Egui_Layout_Cb_Item_Widgets *
 egui_layout_cb_item_create(Eo *__main_parent)
 {
@@ -112,7 +119,7 @@ egui_layout_cb_item_create(Eo *__main_parent)
    pub_widgets->cb_wdgs_hsel = cb_wdgs_hsel;
    eo_do(cb_wdgs_hsel, evas_obj_size_hint_weight_set(0.000000, 0.000000));
    eo_do(cb_wdgs_hsel, evas_obj_size_hint_align_set(0.500000, 0.500000));
-
+   eo_do(cb_item, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
@@ -123,8 +130,8 @@ egui_layout_gvc_win_create(Eo *__main_parent)
    Egui_Layout_Gvc_Win_Widgets *pub_widgets = calloc(1, sizeof(*pub_widgets));
 
    Eo *gvc_win;
-   Eo *gvc_img;
    Eo *gvc_logo;
+   Eo *gvc_img;
 
 
    gvc_win = eo_add(ELM_WIN_CLASS, __main_parent, 
elm_obj_win_name_set("Graph"),
@@ -132,17 +139,17 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(gvc_win, elm_obj_win_title_set("Graph View"));
    eo_do(gvc_win, elm_obj_win_autodel_set(EINA_TRUE));
    eo_do(gvc_win, efl_gfx_size_set(400, 400));
+   gvc_logo = eo_add(EVAS_IMAGE_CLASS, gvc_win);
+   eo_do(gvc_logo, efl_file_set(erigo_icon, NULL));
+   eo_do(gvc_logo, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(gvc_win, elm_obj_win_icon_object_set(gvc_logo));
    gvc_img = eo_add(ELM_IMAGE_CLASS, gvc_win);
    pub_widgets->gvc_img = gvc_img;
    eo_do(gvc_img, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(gvc_img, efl_gfx_visible_set(EINA_TRUE));
    eo_do(gvc_win, elm_obj_win_resize_object_add(gvc_img));
-   gvc_logo = eo_add(EVAS_IMAGE_CLASS, gvc_win);
-   eo_do(gvc_logo, efl_file_set(erigo_icon, NULL));
-   eo_do(gvc_logo, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(gvc_win, elm_obj_win_icon_object_set(gvc_logo));
    eo_do(gvc_win, efl_gfx_visible_set(EINA_TRUE));
-
+   eo_do(gvc_win, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
@@ -153,17 +160,17 @@ egui_layout_fs_win_create(Eo *__main_parent)
    Egui_Layout_Fs_Win_Widgets *pub_widgets = calloc(1, sizeof(*pub_widgets));
 
    Eo *fs_win;
+   Eo *fs_logo;
    Eo *bg2;
    Eo *fs_table;
+   Eo *fs_project_name_box;
+   Eo *fs_project_name_label;
+   Eo *fs_project_name_entry;
    Eo *fs_radio_box;
    Eo *fs_radio_label;
    Eo *fs_radio_c;
    Eo *fs_radio_cpp;
-   Eo *fs_project_name_box;
-   Eo *fs_project_name_label;
-   Eo *fs_project_name_entry;
    Eo *fileselector;
-   Eo *fs_logo;
 
 
    fs_win = eo_add(ELM_WIN_CLASS, __main_parent, elm_obj_win_name_set(NULL),
@@ -173,6 +180,10 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fs_win, elm_obj_win_autodel_set(EINA_TRUE));
    eo_do(fs_win, efl_gfx_size_set(300, 450));
    eo_do(fs_win, elm_obj_win_modal_set(EINA_TRUE));
+   fs_logo = eo_add(EVAS_IMAGE_CLASS, fs_win);
+   eo_do(fs_logo, efl_file_set(erigo_icon, NULL));
+   eo_do(fs_logo, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(fs_win, elm_obj_win_icon_object_set(fs_logo));
    bg2 = eo_add(ELM_BG_CLASS, fs_win);
    eo_do(bg2, elm_obj_bg_color_set(80, 80, 80, 255));
    eo_do(bg2, evas_obj_size_hint_weight_set(1.000000, 1.000000));
@@ -185,6 +196,25 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fs_table, elm_obj_table_padding_set(6, 7));
    eo_do(fs_win, elm_obj_win_resize_object_add(bg2));
    eo_do(fs_win, elm_obj_win_resize_object_add(fs_table));
+   fs_project_name_box = eo_add(ELM_BOX_CLASS, fs_table);
+   pub_widgets->fs_project_name_box = fs_project_name_box;
+   eo_do(fs_project_name_box, evas_obj_size_hint_weight_set(1.000000, 
0.000000));
+   eo_do(fs_project_name_box, evas_obj_size_hint_align_set(-1.000000, 
0.000000));
+   eo_do(fs_project_name_box, elm_obj_box_horizontal_set(EINA_TRUE));
+   fs_project_name_label = eo_add(ELM_LABEL_CLASS, fs_project_name_box);
+   eo_do(fs_project_name_label, elm_obj_widget_part_text_set(NULL, "Project 
Name:  "));
+   eo_do(fs_project_name_label, efl_gfx_visible_set(EINA_TRUE));
+   fs_project_name_entry = eo_add(ELM_ENTRY_CLASS, fs_project_name_box);
+   pub_widgets->fs_project_name_entry = fs_project_name_entry;
+   eo_do(fs_project_name_entry, evas_obj_size_hint_weight_set(1.000000, 
0.000000));
+   eo_do(fs_project_name_entry, evas_obj_size_hint_align_set(-1.000000, 
0.000000));
+   eo_do(fs_project_name_entry, elm_obj_entry_scrollable_set(EINA_TRUE));
+   eo_do(fs_project_name_entry, elm_obj_entry_single_line_set(EINA_TRUE));
+   eo_do(fs_project_name_entry, 
elm_interface_scrollable_policy_set(ELM_SCROLLER_POLICY_OFF, 
ELM_SCROLLER_POLICY_OFF));
+   eo_do(fs_project_name_entry, elm_obj_widget_part_text_set(NULL, "New 
Project"));
+   eo_do(fs_project_name_entry, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(fs_project_name_box, elm_obj_box_pack_end(fs_project_name_label));
+   eo_do(fs_project_name_box, elm_obj_box_pack_end(fs_project_name_entry));
    fs_radio_box = eo_add(ELM_BOX_CLASS, fs_table);
    pub_widgets->fs_radio_box = fs_radio_box;
    eo_do(fs_radio_box, evas_obj_size_hint_weight_set(1.000000, 0.000000));
@@ -206,25 +236,6 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fs_radio_box, elm_obj_box_pack_end(fs_radio_label));
    eo_do(fs_radio_box, elm_obj_box_pack_end(fs_radio_c));
    eo_do(fs_radio_box, elm_obj_box_pack_end(fs_radio_cpp));
-   fs_project_name_box = eo_add(ELM_BOX_CLASS, fs_table);
-   pub_widgets->fs_project_name_box = fs_project_name_box;
-   eo_do(fs_project_name_box, evas_obj_size_hint_weight_set(1.000000, 
0.000000));
-   eo_do(fs_project_name_box, evas_obj_size_hint_align_set(-1.000000, 
0.000000));
-   eo_do(fs_project_name_box, elm_obj_box_horizontal_set(EINA_TRUE));
-   fs_project_name_label = eo_add(ELM_LABEL_CLASS, fs_project_name_box);
-   eo_do(fs_project_name_label, elm_obj_widget_part_text_set(NULL, "Project 
Name:  "));
-   eo_do(fs_project_name_label, efl_gfx_visible_set(EINA_TRUE));
-   fs_project_name_entry = eo_add(ELM_ENTRY_CLASS, fs_project_name_box);
-   pub_widgets->fs_project_name_entry = fs_project_name_entry;
-   eo_do(fs_project_name_entry, evas_obj_size_hint_weight_set(1.000000, 
0.000000));
-   eo_do(fs_project_name_entry, evas_obj_size_hint_align_set(-1.000000, 
0.000000));
-   eo_do(fs_project_name_entry, elm_obj_entry_scrollable_set(EINA_TRUE));
-   eo_do(fs_project_name_entry, elm_obj_entry_single_line_set(EINA_TRUE));
-   eo_do(fs_project_name_entry, 
elm_interface_scrollable_policy_set(ELM_SCROLLER_POLICY_OFF, 
ELM_SCROLLER_POLICY_OFF));
-   eo_do(fs_project_name_entry, elm_obj_widget_part_text_set(NULL, "New 
Project"));
-   eo_do(fs_project_name_entry, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(fs_project_name_box, elm_obj_box_pack_end(fs_project_name_label));
-   eo_do(fs_project_name_box, elm_obj_box_pack_end(fs_project_name_entry));
    fileselector = eo_add(ELM_FILESELECTOR_CLASS, fs_table);
    pub_widgets->fileselector = fileselector;
    eo_do(fileselector, evas_obj_size_hint_weight_set(1.000000, 1.000000));
@@ -233,12 +244,8 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fs_table, elm_obj_table_pack(fs_radio_box, 0, 0, 1, 1));
    eo_do(fs_table, elm_obj_table_pack(fs_project_name_box, 0, 0, 1, 1));
    eo_do(fs_table, elm_obj_table_pack(fileselector, 0, 1, 1, 1));
-   fs_logo = eo_add(EVAS_IMAGE_CLASS, fs_win);
-   eo_do(fs_logo, efl_file_set(erigo_icon, NULL));
-   eo_do(fs_logo, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(fs_win, elm_obj_win_icon_object_set(fs_logo));
    eo_do(fs_win, efl_gfx_visible_set(EINA_TRUE));
-
+   eo_do(fs_win, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
@@ -263,6 +270,7 @@ egui_layout_rm_win_create(Eo *__main_parent)
    Egui_Layout_Rm_Win_Widgets *pub_widgets = calloc(1, sizeof(*pub_widgets));
 
    Eo *rm_win;
+   Eo *rm_logo;
    Eo *rm_bg;
    Eo *rm_vbox;
    Eo *rm_toolbar;
@@ -276,12 +284,11 @@ egui_layout_rm_win_create(Eo *__main_parent)
    Eo *rm_buttons_box;
    Eo *rm_alias_entry;
    Eo *rm_value_entry;
-   Eo *rm_button_add;
    Eo *rm_image_fileselector;
    Eo *rm_edje_box;
    Eo *rm_edje_fs_edj;
    Eo *rm_edje_fs_edc;
-   Eo *rm_logo;
+   Eo *rm_button_add;
 
 
    rm_win = eo_add(ELM_WIN_CLASS, __main_parent, elm_obj_win_name_set(NULL),
@@ -292,6 +299,10 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(rm_win, efl_gfx_size_set(640, 480));
    eo_do(rm_win, elm_obj_win_modal_set(EINA_TRUE));
    eo_do(rm_win, eo_event_callback_add(ELM_WIN_EVENT_DELETE_REQUEST, 
rm_win_delete_request, NULL));
+   rm_logo = eo_add(EVAS_IMAGE_CLASS, rm_win);
+   eo_do(rm_logo, efl_file_set(erigo_icon, NULL));
+   eo_do(rm_logo, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(rm_win, elm_obj_win_icon_object_set(rm_logo));
    rm_bg = eo_add(ELM_BG_CLASS, rm_win);
    eo_do(rm_bg, elm_obj_bg_color_set(80, 80, 80, 255));
    eo_do(rm_bg, evas_obj_size_hint_weight_set(1.000000, 1.000000));
@@ -357,14 +368,6 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(rm_value_entry, elm_obj_entry_single_line_set(EINA_TRUE));
    eo_do(rm_value_entry, 
elm_interface_scrollable_policy_set(ELM_SCROLLER_POLICY_OFF, 
ELM_SCROLLER_POLICY_OFF));
    eo_do(rm_value_entry, efl_gfx_visible_set(EINA_TRUE));
-   rm_button_add = eo_add(ELM_BUTTON_CLASS, rm_buttons_box);
-   pub_widgets->rm_button_add = rm_button_add;
-   eo_do(rm_button_add, elm_obj_widget_part_text_set(NULL, "Add Resource"));
-   eo_do(rm_button_add, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(rm_button_add, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
rm_button_add_clicked, NULL));
-   eo_do(rm_buttons_box, elm_obj_box_pack_end(rm_alias_entry));
-   eo_do(rm_buttons_box, elm_obj_box_pack_end(rm_value_entry));
-   eo_do(rm_buttons_box, elm_obj_box_pack_end(rm_button_add));
    rm_image_fileselector = eo_add(ELM_FILESELECTOR_ENTRY_CLASS, 
rm_buttons_box);
    pub_widgets->rm_image_fileselector = rm_image_fileselector;
    eo_do(rm_image_fileselector, evas_obj_size_hint_weight_set(1.000000, 
1.000000));
@@ -386,12 +389,16 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(rm_edje_fs_edc, elm_obj_widget_part_text_set(NULL, "..."));
    eo_do(rm_edje_box, elm_obj_box_pack_end(rm_edje_fs_edj));
    eo_do(rm_edje_box, elm_obj_box_pack_end(rm_edje_fs_edc));
-   rm_logo = eo_add(EVAS_IMAGE_CLASS, rm_win);
-   eo_do(rm_logo, efl_file_set(erigo_icon, NULL));
-   eo_do(rm_logo, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(rm_win, elm_obj_win_icon_object_set(rm_logo));
+   rm_button_add = eo_add(ELM_BUTTON_CLASS, rm_buttons_box);
+   pub_widgets->rm_button_add = rm_button_add;
+   eo_do(rm_button_add, elm_obj_widget_part_text_set(NULL, "Add Resource"));
+   eo_do(rm_button_add, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(rm_button_add, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
rm_button_add_clicked, NULL));
+   eo_do(rm_buttons_box, elm_obj_box_pack_end(rm_alias_entry));
+   eo_do(rm_buttons_box, elm_obj_box_pack_end(rm_value_entry));
+   eo_do(rm_buttons_box, elm_obj_box_pack_end(rm_button_add));
    eo_do(rm_win, efl_gfx_visible_set(EINA_TRUE));
-
+   eo_do(rm_win, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
@@ -437,6 +444,7 @@ egui_layout_settings_win_create(Eo *__main_parent)
    Egui_Layout_Settings_Win_Widgets *pub_widgets = calloc(1, 
sizeof(*pub_widgets));
 
    Eo *settings_win;
+   Eo *settings_logo;
    Eo *settings_bg;
    Eo *settings_table;
    Eo *settings_toolbar;
@@ -456,7 +464,6 @@ egui_layout_settings_win_create(Eo *__main_parent)
    Eo *custom_theme_buttons;
    Eo *cutom_theme_fs_bt;
    Eo *custom_theme_del_bt;
-   Eo *settings_logo;
 
 
    settings_win = eo_add(ELM_WIN_CLASS, __main_parent, 
elm_obj_win_name_set(NULL),
@@ -467,6 +474,10 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(settings_win, efl_gfx_size_set(640, 480));
    eo_do(settings_win, elm_obj_win_modal_set(EINA_TRUE));
    eo_do(settings_win, eo_event_callback_add(ELM_WIN_EVENT_DELETE_REQUEST, 
settings_win_delete_request, NULL));
+   settings_logo = eo_add(EVAS_IMAGE_CLASS, settings_win);
+   eo_do(settings_logo, efl_file_set(erigo_icon, NULL));
+   eo_do(settings_logo, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(settings_win, elm_obj_win_icon_object_set(settings_logo));
    settings_bg = eo_add(ELM_BG_CLASS, settings_win);
    eo_do(settings_bg, elm_obj_bg_color_set(80, 80, 80, 255));
    eo_do(settings_bg, evas_obj_size_hint_weight_set(1.000000, 1.000000));
@@ -582,12 +593,8 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(custom_theme_del_bt, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
custom_theme_del_bt_clicked, NULL));
    eo_do(custom_theme_buttons, elm_obj_box_pack_end(cutom_theme_fs_bt));
    eo_do(custom_theme_buttons, elm_obj_box_pack_end(custom_theme_del_bt));
-   settings_logo = eo_add(EVAS_IMAGE_CLASS, settings_win);
-   eo_do(settings_logo, efl_file_set(erigo_icon, NULL));
-   eo_do(settings_logo, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(settings_win, elm_obj_win_icon_object_set(settings_logo));
    eo_do(settings_win, efl_gfx_visible_set(EINA_TRUE));
-
+   eo_do(settings_win, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
@@ -670,16 +677,16 @@ callbacksview_up_btn_clicked(void *data EINA_UNUSED, Eo 
*obj EINA_UNUSED, const
 }
 
 static Eina_Bool
-contentview_up_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+itemview_down_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   _contentview_up_btn_clicked(data, obj, desc, event_info);
+   _itemview_down_btn_clicked(data, obj, desc, event_info);
    return EINA_TRUE;
 }
 
 static Eina_Bool
-itemview_down_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+contentview_up_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   _itemview_down_btn_clicked(data, obj, desc, event_info);
+   _contentview_up_btn_clicked(data, obj, desc, event_info);
    return EINA_TRUE;
 }
 
@@ -689,6 +696,7 @@ egui_layout_main_win_create(Eo *__main_parent)
    Egui_Layout_Main_Win_Widgets *pub_widgets = calloc(1, sizeof(*pub_widgets));
 
    Eo *main_win;
+   Eo *main_logo;
    Eo *canvas_bg;
    Eo *main_box;
    Eo *toolbar;
@@ -709,9 +717,6 @@ egui_layout_main_win_create(Eo *__main_parent)
    Eo *left_pane_layout;
    Eo *left_pane_bg;
    Eo *left_panel_box;
-   Eo *theme_selector_box;
-   Eo *theme_selector_label;
-   Eo *theme_selector_hoversel;
    Eo *fctr_scroll;
    Eo *fctr_scroll_box;
    Eo *fctr_table_sep_0;
@@ -745,21 +750,21 @@ egui_layout_main_win_create(Eo *__main_parent)
    Eo *fctr_actionslider_it;
    Eo *fctr_actionslider_image;
    Eo *fctr_actionslider_label;
-   Eo *fctr_clock_it;
-   Eo *fctr_clock_image;
-   Eo *fctr_clock_label;
-   Eo *fctr_dayselector_it;
-   Eo *fctr_dayselector_image;
-   Eo *fctr_dayselector_label;
-   Eo *fctr_calendar_it;
-   Eo *fctr_calendar_image;
-   Eo *fctr_calendar_label;
    Eo *fctr_bubble_it;
    Eo *fctr_bubble_image;
    Eo *fctr_bubble_label;
+   Eo *fctr_calendar_it;
+   Eo *fctr_calendar_image;
+   Eo *fctr_calendar_label;
    Eo *fctr_colorselector_it;
    Eo *fctr_colorselector_image;
    Eo *fctr_colorselector_label;
+   Eo *fctr_dayselector_it;
+   Eo *fctr_dayselector_image;
+   Eo *fctr_dayselector_label;
+   Eo *fctr_clock_it;
+   Eo *fctr_clock_image;
+   Eo *fctr_clock_label;
    Eo *fctr_entry_it;
    Eo *fctr_entry_image;
    Eo *fctr_entry_label;
@@ -797,27 +802,27 @@ egui_layout_main_win_create(Eo *__main_parent)
    Eo *fctr_box_it;
    Eo *fctr_box_image;
    Eo *fctr_box_label;
+   Eo *fctr_genlist_it;
+   Eo *fctr_genlist_image;
+   Eo *fctr_genlist_label;
+   Eo *fctr_gengrid_it;
+   Eo *fctr_gengrid_image;
+   Eo *fctr_gengrid_label;
+   Eo *fctr_naviframe_it;
+   Eo *fctr_naviframe_image;
+   Eo *fctr_naviframe_label;
    Eo *fctr_table_it;
    Eo *fctr_table_image;
    Eo *fctr_table_label;
    Eo *fctr_layout_it;
    Eo *fctr_layout_image;
    Eo *fctr_layout_label;
-   Eo *fctr_naviframe_it;
-   Eo *fctr_naviframe_image;
-   Eo *fctr_naviframe_label;
    Eo *fctr_panes_it;
    Eo *fctr_panes_image;
    Eo *fctr_panes_label;
    Eo *fctr_conformant_it;
    Eo *fctr_conformant_image;
    Eo *fctr_conformant_label;
-   Eo *fctr_genlist_it;
-   Eo *fctr_genlist_image;
-   Eo *fctr_genlist_label;
-   Eo *fctr_gengrid_it;
-   Eo *fctr_gengrid_image;
-   Eo *fctr_gengrid_label;
    Eo *fctr_grid_it;
    Eo *fctr_grid_image;
    Eo *fctr_grid_label;
@@ -828,15 +833,15 @@ egui_layout_main_win_create(Eo *__main_parent)
    Eo *fctr_menu_it;
    Eo *fctr_menu_image;
    Eo *fctr_menu_label;
-   Eo *fctr_toolbar_it;
-   Eo *fctr_toolbar_image;
-   Eo *fctr_toolbar_label;
    Eo *fctr_diskselector_it;
    Eo *fctr_diskselector_image;
    Eo *fctr_diskselector_label;
    Eo *fctr_ctxpopup_it;
    Eo *fctr_ctxpopup_image;
    Eo *fctr_ctxpopup_label;
+   Eo *fctr_toolbar_it;
+   Eo *fctr_toolbar_image;
+   Eo *fctr_toolbar_label;
    Eo *fctr_table_sep_6;
    Eo *fctr_table_label_4;
    Eo *fctr_table_sep_7;
@@ -844,27 +849,30 @@ egui_layout_main_win_create(Eo *__main_parent)
    Eo *fctr_evas_image_it;
    Eo *fctr_evas_image_image;
    Eo *fctr_evas_image_label;
+   Eo *theme_selector_box;
+   Eo *theme_selector_label;
+   Eo *theme_selector_hoversel;
    Eo *right_panes;
    Eo *right_pane_layout;
    Eo *right_pane_bg;
    Eo *right_panel_box;
    Eo *right_panes_internal;
    Eo *objtree_table;
+   Eo *objtree_list;
    Eo *objtree_filter_box;
    Eo *objtree_filter_label;
    Eo *objtree_filter_entry;
-   Eo *objtree_list;
    Eo *propsview_table;
+   Eo *propsview_filter_box;
+   Eo *propsview_filter_label;
+   Eo *propsview_filter_entry;
+   Eo *properties_list;
+   Eo *description_list;
    Eo *propsview_toolbar;
    Elm_Object_Item *propsview_toolbar_desc_it;
    Elm_Object_Item *propsview_toolbar_prop_it;
    Elm_Object_Item *propsview_toolbar_cb_it;
    Elm_Object_Item *propsview_toolbar_cont_it;
-   Eo *propsview_filter_box;
-   Eo *propsview_filter_label;
-   Eo *propsview_filter_entry;
-   Eo *description_list;
-   Eo *properties_list;
    Eo *callbacksview_box;
    Eo *callbacksview_list;
    Eo *callbacksview_buttons_box;
@@ -873,26 +881,25 @@ egui_layout_main_win_create(Eo *__main_parent)
    Eo *callbacksview_down_btn;
    Eo *callbacksview_down_btn_icon;
    Eo *callbacksview_del_btn;
+   Eo *contentview_box;
+   Eo *contentview_list;
+   Eo *contentview_buttons_box;
+   Eo *contentview_del_btn;
+   Eo *contentview_down_btn;
+   Eo *contentview_down_btn_icon;
+   Eo *contentview_up_btn;
+   Eo *contentview_up_btn_icon;
    Eo *itemview_box;
    Eo *itemview_list;
    Eo *itemview_buttons_box;
    Eo *itemview_add_item_but;
    Eo *itemview_add_item_nested_but;
    Eo *itemview_add_separator_but;
+   Eo *itemview_del_item_but;
    Eo *itemview_up_btn;
    Eo *itemview_up_btn_icon;
    Eo *itemview_down_btn;
    Eo *itemview_down_btn_icon;
-   Eo *itemview_del_item_but;
-   Eo *contentview_box;
-   Eo *contentview_list;
-   Eo *contentview_buttons_box;
-   Eo *contentview_up_btn;
-   Eo *contentview_up_btn_icon;
-   Eo *contentview_down_btn;
-   Eo *contentview_down_btn_icon;
-   Eo *contentview_del_btn;
-   Eo *main_logo;
 
 
    main_win = eo_add(ELM_WIN_CLASS, __main_parent, elm_obj_win_name_set(NULL),
@@ -900,6 +907,10 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    pub_widgets->main_win = main_win;
    eo_do(main_win, elm_obj_win_title_set("Erigo - No project"));
    eo_do(main_win, efl_gfx_size_set(1108, 837));
+   main_logo = eo_add(EVAS_IMAGE_CLASS, main_win);
+   eo_do(main_logo, efl_file_set(erigo_icon, NULL));
+   eo_do(main_logo, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(main_win, elm_obj_win_icon_object_set(main_logo));
    canvas_bg = eo_add(ELM_BG_CLASS, main_win);
    pub_widgets->canvas_bg = canvas_bg;
    eo_do(canvas_bg, efl_file_set(res_canvas_bg, NULL));
@@ -971,33 +982,11 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(left_panel_box, efl_gfx_visible_set(EINA_TRUE));
    eo_do(left_pane_layout, elm_obj_container_content_set("erigo.swallow.bg", 
left_pane_bg));
    eo_do(left_pane_layout, 
elm_obj_container_content_set("erigo.swallow.content", left_panel_box));
-   theme_selector_box = eo_add(ELM_BOX_CLASS, left_panel_box);
-   eo_do(theme_selector_box, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(theme_selector_box, elm_obj_box_horizontal_set(EINA_TRUE));
-   eo_do(theme_selector_box, evas_obj_size_hint_align_set(-1.000000, 
0.000000));
-   eo_do(theme_selector_box, evas_obj_size_hint_weight_set(1.000000, 
0.000000));
-   theme_selector_label = eo_add(ELM_LABEL_CLASS, theme_selector_box);
-   eo_do(theme_selector_label, evas_obj_size_hint_weight_set(1.000000, 
1.000000));
-   eo_do(theme_selector_label, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(theme_selector_label, efl_gfx_size_set(60, 30));
-   eo_do(theme_selector_label, elm_obj_widget_part_text_set(NULL, "Select 
Theme:"));
-   theme_selector_hoversel = eo_add(ELM_HOVERSEL_CLASS, theme_selector_box);
-   pub_widgets->theme_selector_hoversel = theme_selector_hoversel;
-   eo_do(theme_selector_hoversel, evas_obj_size_hint_weight_set(1.000000, 
1.000000));
-   eo_do(theme_selector_hoversel, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(theme_selector_hoversel, efl_gfx_size_set(73, 30));
-   eo_do(theme_selector_hoversel, elm_obj_widget_part_text_set(NULL, 
"default"));
-   eo_do(theme_selector_hoversel, elm_obj_hoversel_hover_parent_set(hor_box));
-   eo_do(theme_selector_hoversel, 
eo_event_callback_add(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, 
theme_selector_hoversel_selected, NULL));
-   eo_do(theme_selector_box, elm_obj_box_pack_end(theme_selector_label));
-   eo_do(theme_selector_box, elm_obj_box_pack_end(theme_selector_hoversel));
    fctr_scroll = eo_add(ELM_SCROLLER_CLASS, left_panel_box);
    eo_do(fctr_scroll, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(fctr_scroll, evas_obj_size_hint_align_set(-1.000000, -1.000000));
    eo_do(fctr_scroll, elm_interface_scrollable_bounce_allow_set(EINA_FALSE, 
EINA_TRUE));
    eo_do(fctr_scroll, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(left_panel_box, elm_obj_box_pack_end(theme_selector_box));
-   eo_do(left_panel_box, elm_obj_box_pack_end(fctr_scroll));
    fctr_scroll_box = eo_add(ELM_BOX_CLASS, fctr_scroll);
    eo_do(fctr_scroll_box, evas_obj_size_hint_weight_set(1.000000, 0.000000));
    eo_do(fctr_scroll_box, evas_obj_size_hint_align_set(-1.000000, 0.000000));
@@ -1144,48 +1133,6 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fctr_actionslider_label, efl_gfx_visible_set(EINA_TRUE));
    eo_do(fctr_actionslider_it, elm_obj_box_pack_end(fctr_actionslider_image));
    eo_do(fctr_actionslider_it, elm_obj_box_pack_end(fctr_actionslider_label));
-   fctr_clock_it = eo_add(ELM_BOX_CLASS, fctr_table);
-   pub_widgets->fctr_clock_it = fctr_clock_it;
-   eo_do(fctr_clock_it, elm_obj_box_horizontal_set(EINA_TRUE));
-   eo_do(fctr_clock_it, elm_obj_box_padding_set(7, 0));
-   eo_do(fctr_clock_it, efl_gfx_visible_set(EINA_TRUE));
-   fctr_clock_image = eo_add(ELM_IMAGE_CLASS, fctr_clock_it);
-   eo_do(fctr_clock_image, evas_obj_size_hint_min_set(25, 25));
-   eo_do(fctr_clock_image, elm_obj_image_resizable_set(EINA_TRUE, EINA_TRUE));
-   eo_do(fctr_clock_image, efl_gfx_visible_set(EINA_TRUE));
-   fctr_clock_label = eo_add(ELM_LABEL_CLASS, fctr_clock_it);
-   eo_do(fctr_clock_label, elm_obj_widget_part_text_set(NULL, "Clock"));
-   eo_do(fctr_clock_label, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(fctr_clock_it, elm_obj_box_pack_end(fctr_clock_image));
-   eo_do(fctr_clock_it, elm_obj_box_pack_end(fctr_clock_label));
-   fctr_dayselector_it = eo_add(ELM_BOX_CLASS, fctr_table);
-   pub_widgets->fctr_dayselector_it = fctr_dayselector_it;
-   eo_do(fctr_dayselector_it, elm_obj_box_horizontal_set(EINA_TRUE));
-   eo_do(fctr_dayselector_it, elm_obj_box_padding_set(7, 0));
-   eo_do(fctr_dayselector_it, efl_gfx_visible_set(EINA_TRUE));
-   fctr_dayselector_image = eo_add(ELM_IMAGE_CLASS, fctr_dayselector_it);
-   eo_do(fctr_dayselector_image, evas_obj_size_hint_min_set(25, 25));
-   eo_do(fctr_dayselector_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
-   eo_do(fctr_dayselector_image, efl_gfx_visible_set(EINA_TRUE));
-   fctr_dayselector_label = eo_add(ELM_LABEL_CLASS, fctr_dayselector_it);
-   eo_do(fctr_dayselector_label, elm_obj_widget_part_text_set(NULL, 
"Dayselector"));
-   eo_do(fctr_dayselector_label, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(fctr_dayselector_it, elm_obj_box_pack_end(fctr_dayselector_image));
-   eo_do(fctr_dayselector_it, elm_obj_box_pack_end(fctr_dayselector_label));
-   fctr_calendar_it = eo_add(ELM_BOX_CLASS, fctr_table);
-   pub_widgets->fctr_calendar_it = fctr_calendar_it;
-   eo_do(fctr_calendar_it, elm_obj_box_horizontal_set(EINA_TRUE));
-   eo_do(fctr_calendar_it, elm_obj_box_padding_set(7, 0));
-   eo_do(fctr_calendar_it, efl_gfx_visible_set(EINA_TRUE));
-   fctr_calendar_image = eo_add(ELM_IMAGE_CLASS, fctr_calendar_it);
-   eo_do(fctr_calendar_image, evas_obj_size_hint_min_set(25, 25));
-   eo_do(fctr_calendar_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
-   eo_do(fctr_calendar_image, efl_gfx_visible_set(EINA_TRUE));
-   fctr_calendar_label = eo_add(ELM_LABEL_CLASS, fctr_calendar_it);
-   eo_do(fctr_calendar_label, elm_obj_widget_part_text_set(NULL, "Calendar"));
-   eo_do(fctr_calendar_label, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(fctr_calendar_it, elm_obj_box_pack_end(fctr_calendar_image));
-   eo_do(fctr_calendar_it, elm_obj_box_pack_end(fctr_calendar_label));
    fctr_bubble_it = eo_add(ELM_BOX_CLASS, fctr_table);
    pub_widgets->fctr_bubble_it = fctr_bubble_it;
    eo_do(fctr_bubble_it, elm_obj_box_horizontal_set(EINA_TRUE));
@@ -1200,6 +1147,20 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fctr_bubble_label, elm_obj_widget_part_text_set(NULL, "Bubble"));
    eo_do(fctr_bubble_it, elm_obj_box_pack_end(fctr_bubble_image));
    eo_do(fctr_bubble_it, elm_obj_box_pack_end(fctr_bubble_label));
+   fctr_calendar_it = eo_add(ELM_BOX_CLASS, fctr_table);
+   pub_widgets->fctr_calendar_it = fctr_calendar_it;
+   eo_do(fctr_calendar_it, elm_obj_box_horizontal_set(EINA_TRUE));
+   eo_do(fctr_calendar_it, elm_obj_box_padding_set(7, 0));
+   eo_do(fctr_calendar_it, efl_gfx_visible_set(EINA_TRUE));
+   fctr_calendar_image = eo_add(ELM_IMAGE_CLASS, fctr_calendar_it);
+   eo_do(fctr_calendar_image, evas_obj_size_hint_min_set(25, 25));
+   eo_do(fctr_calendar_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
+   eo_do(fctr_calendar_image, efl_gfx_visible_set(EINA_TRUE));
+   fctr_calendar_label = eo_add(ELM_LABEL_CLASS, fctr_calendar_it);
+   eo_do(fctr_calendar_label, elm_obj_widget_part_text_set(NULL, "Calendar"));
+   eo_do(fctr_calendar_label, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(fctr_calendar_it, elm_obj_box_pack_end(fctr_calendar_image));
+   eo_do(fctr_calendar_it, elm_obj_box_pack_end(fctr_calendar_label));
    fctr_colorselector_it = eo_add(ELM_BOX_CLASS, fctr_table);
    pub_widgets->fctr_colorselector_it = fctr_colorselector_it;
    eo_do(fctr_colorselector_it, elm_obj_box_horizontal_set(EINA_TRUE));
@@ -1214,6 +1175,34 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fctr_colorselector_label, efl_gfx_visible_set(EINA_TRUE));
    eo_do(fctr_colorselector_it, 
elm_obj_box_pack_end(fctr_colorselector_image));
    eo_do(fctr_colorselector_it, 
elm_obj_box_pack_end(fctr_colorselector_label));
+   fctr_dayselector_it = eo_add(ELM_BOX_CLASS, fctr_table);
+   pub_widgets->fctr_dayselector_it = fctr_dayselector_it;
+   eo_do(fctr_dayselector_it, elm_obj_box_horizontal_set(EINA_TRUE));
+   eo_do(fctr_dayselector_it, elm_obj_box_padding_set(7, 0));
+   eo_do(fctr_dayselector_it, efl_gfx_visible_set(EINA_TRUE));
+   fctr_dayselector_image = eo_add(ELM_IMAGE_CLASS, fctr_dayselector_it);
+   eo_do(fctr_dayselector_image, evas_obj_size_hint_min_set(25, 25));
+   eo_do(fctr_dayselector_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
+   eo_do(fctr_dayselector_image, efl_gfx_visible_set(EINA_TRUE));
+   fctr_dayselector_label = eo_add(ELM_LABEL_CLASS, fctr_dayselector_it);
+   eo_do(fctr_dayselector_label, elm_obj_widget_part_text_set(NULL, 
"Dayselector"));
+   eo_do(fctr_dayselector_label, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(fctr_dayselector_it, elm_obj_box_pack_end(fctr_dayselector_image));
+   eo_do(fctr_dayselector_it, elm_obj_box_pack_end(fctr_dayselector_label));
+   fctr_clock_it = eo_add(ELM_BOX_CLASS, fctr_table);
+   pub_widgets->fctr_clock_it = fctr_clock_it;
+   eo_do(fctr_clock_it, elm_obj_box_horizontal_set(EINA_TRUE));
+   eo_do(fctr_clock_it, elm_obj_box_padding_set(7, 0));
+   eo_do(fctr_clock_it, efl_gfx_visible_set(EINA_TRUE));
+   fctr_clock_image = eo_add(ELM_IMAGE_CLASS, fctr_clock_it);
+   eo_do(fctr_clock_image, evas_obj_size_hint_min_set(25, 25));
+   eo_do(fctr_clock_image, elm_obj_image_resizable_set(EINA_TRUE, EINA_TRUE));
+   eo_do(fctr_clock_image, efl_gfx_visible_set(EINA_TRUE));
+   fctr_clock_label = eo_add(ELM_LABEL_CLASS, fctr_clock_it);
+   eo_do(fctr_clock_label, elm_obj_widget_part_text_set(NULL, "Clock"));
+   eo_do(fctr_clock_label, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(fctr_clock_it, elm_obj_box_pack_end(fctr_clock_image));
+   eo_do(fctr_clock_it, elm_obj_box_pack_end(fctr_clock_label));
    fctr_entry_it = eo_add(ELM_BOX_CLASS, fctr_table);
    pub_widgets->fctr_entry_it = fctr_entry_it;
    eo_do(fctr_entry_it, elm_obj_box_horizontal_set(EINA_TRUE));
@@ -1407,6 +1396,48 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fctr_box_label, efl_gfx_visible_set(EINA_TRUE));
    eo_do(fctr_box_it, elm_obj_box_pack_end(fctr_box_image));
    eo_do(fctr_box_it, elm_obj_box_pack_end(fctr_box_label));
+   fctr_genlist_it = eo_add(ELM_BOX_CLASS, fctr_table_containers);
+   pub_widgets->fctr_genlist_it = fctr_genlist_it;
+   eo_do(fctr_genlist_it, elm_obj_box_horizontal_set(EINA_TRUE));
+   eo_do(fctr_genlist_it, elm_obj_box_padding_set(7, 0));
+   eo_do(fctr_genlist_it, efl_gfx_visible_set(EINA_TRUE));
+   fctr_genlist_image = eo_add(ELM_IMAGE_CLASS, fctr_genlist_it);
+   eo_do(fctr_genlist_image, evas_obj_size_hint_min_set(25, 25));
+   eo_do(fctr_genlist_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
+   eo_do(fctr_genlist_image, efl_gfx_visible_set(EINA_TRUE));
+   fctr_genlist_label = eo_add(ELM_LABEL_CLASS, fctr_genlist_it);
+   eo_do(fctr_genlist_label, elm_obj_widget_part_text_set(NULL, "Genlist"));
+   eo_do(fctr_genlist_label, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(fctr_genlist_it, elm_obj_box_pack_end(fctr_genlist_image));
+   eo_do(fctr_genlist_it, elm_obj_box_pack_end(fctr_genlist_label));
+   fctr_gengrid_it = eo_add(ELM_BOX_CLASS, fctr_table_containers);
+   pub_widgets->fctr_gengrid_it = fctr_gengrid_it;
+   eo_do(fctr_gengrid_it, elm_obj_box_horizontal_set(EINA_TRUE));
+   eo_do(fctr_gengrid_it, elm_obj_box_padding_set(7, 0));
+   eo_do(fctr_gengrid_it, efl_gfx_visible_set(EINA_TRUE));
+   fctr_gengrid_image = eo_add(ELM_IMAGE_CLASS, fctr_gengrid_it);
+   eo_do(fctr_gengrid_image, evas_obj_size_hint_min_set(25, 25));
+   eo_do(fctr_gengrid_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
+   eo_do(fctr_gengrid_image, efl_gfx_visible_set(EINA_TRUE));
+   fctr_gengrid_label = eo_add(ELM_LABEL_CLASS, fctr_gengrid_it);
+   eo_do(fctr_gengrid_label, elm_obj_widget_part_text_set(NULL, "Gengrid"));
+   eo_do(fctr_gengrid_label, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(fctr_gengrid_it, elm_obj_box_pack_end(fctr_gengrid_image));
+   eo_do(fctr_gengrid_it, elm_obj_box_pack_end(fctr_gengrid_label));
+   fctr_naviframe_it = eo_add(ELM_BOX_CLASS, fctr_table_containers);
+   pub_widgets->fctr_naviframe_it = fctr_naviframe_it;
+   eo_do(fctr_naviframe_it, elm_obj_box_horizontal_set(EINA_TRUE));
+   eo_do(fctr_naviframe_it, elm_obj_box_padding_set(7, 0));
+   eo_do(fctr_naviframe_it, efl_gfx_visible_set(EINA_TRUE));
+   fctr_naviframe_image = eo_add(ELM_IMAGE_CLASS, fctr_naviframe_it);
+   eo_do(fctr_naviframe_image, evas_obj_size_hint_min_set(25, 25));
+   eo_do(fctr_naviframe_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
+   eo_do(fctr_naviframe_image, efl_gfx_visible_set(EINA_TRUE));
+   fctr_naviframe_label = eo_add(ELM_LABEL_CLASS, fctr_naviframe_it);
+   eo_do(fctr_naviframe_label, elm_obj_widget_part_text_set(NULL, 
"Naviframe"));
+   eo_do(fctr_naviframe_label, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(fctr_naviframe_it, elm_obj_box_pack_end(fctr_naviframe_image));
+   eo_do(fctr_naviframe_it, elm_obj_box_pack_end(fctr_naviframe_label));
    fctr_table_it = eo_add(ELM_BOX_CLASS, fctr_table_containers);
    pub_widgets->fctr_table_it = fctr_table_it;
    eo_do(fctr_table_it, elm_obj_box_horizontal_set(EINA_TRUE));
@@ -1435,20 +1466,6 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fctr_layout_label, efl_gfx_visible_set(EINA_TRUE));
    eo_do(fctr_layout_it, elm_obj_box_pack_end(fctr_layout_image));
    eo_do(fctr_layout_it, elm_obj_box_pack_end(fctr_layout_label));
-   fctr_naviframe_it = eo_add(ELM_BOX_CLASS, fctr_table_containers);
-   pub_widgets->fctr_naviframe_it = fctr_naviframe_it;
-   eo_do(fctr_naviframe_it, elm_obj_box_horizontal_set(EINA_TRUE));
-   eo_do(fctr_naviframe_it, elm_obj_box_padding_set(7, 0));
-   eo_do(fctr_naviframe_it, efl_gfx_visible_set(EINA_TRUE));
-   fctr_naviframe_image = eo_add(ELM_IMAGE_CLASS, fctr_naviframe_it);
-   eo_do(fctr_naviframe_image, evas_obj_size_hint_min_set(25, 25));
-   eo_do(fctr_naviframe_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
-   eo_do(fctr_naviframe_image, efl_gfx_visible_set(EINA_TRUE));
-   fctr_naviframe_label = eo_add(ELM_LABEL_CLASS, fctr_naviframe_it);
-   eo_do(fctr_naviframe_label, elm_obj_widget_part_text_set(NULL, 
"Naviframe"));
-   eo_do(fctr_naviframe_label, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(fctr_naviframe_it, elm_obj_box_pack_end(fctr_naviframe_image));
-   eo_do(fctr_naviframe_it, elm_obj_box_pack_end(fctr_naviframe_label));
    fctr_panes_it = eo_add(ELM_BOX_CLASS, fctr_table_containers);
    pub_widgets->fctr_panes_it = fctr_panes_it;
    eo_do(fctr_panes_it, elm_obj_box_horizontal_set(EINA_TRUE));
@@ -1468,6 +1485,14 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fctr_conformant_it, elm_obj_box_horizontal_set(EINA_TRUE));
    eo_do(fctr_conformant_it, elm_obj_box_padding_set(7, 0));
    eo_do(fctr_conformant_it, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_box_it, 0, 0, 1, 1));
+   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_table_it, 0, 1, 1, 1));
+   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_layout_it, 0, 3, 1, 
1));
+   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_naviframe_it, 0, 4, 1, 
1));
+   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_panes_it, 0, 5, 1, 1));
+   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_conformant_it, 0, 6, 
1, 1));
+   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_genlist_it, 0, 7, 1, 
1));
+   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_gengrid_it, 0, 8, 1, 
1));
    fctr_conformant_image = eo_add(ELM_IMAGE_CLASS, fctr_conformant_it);
    eo_do(fctr_conformant_image, evas_obj_size_hint_min_set(25, 25));
    eo_do(fctr_conformant_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
@@ -1477,42 +1502,6 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fctr_conformant_label, efl_gfx_visible_set(EINA_TRUE));
    eo_do(fctr_conformant_it, elm_obj_box_pack_end(fctr_conformant_image));
    eo_do(fctr_conformant_it, elm_obj_box_pack_end(fctr_conformant_label));
-   fctr_genlist_it = eo_add(ELM_BOX_CLASS, fctr_table_containers);
-   pub_widgets->fctr_genlist_it = fctr_genlist_it;
-   eo_do(fctr_genlist_it, elm_obj_box_horizontal_set(EINA_TRUE));
-   eo_do(fctr_genlist_it, elm_obj_box_padding_set(7, 0));
-   eo_do(fctr_genlist_it, efl_gfx_visible_set(EINA_TRUE));
-   fctr_genlist_image = eo_add(ELM_IMAGE_CLASS, fctr_genlist_it);
-   eo_do(fctr_genlist_image, evas_obj_size_hint_min_set(25, 25));
-   eo_do(fctr_genlist_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
-   eo_do(fctr_genlist_image, efl_gfx_visible_set(EINA_TRUE));
-   fctr_genlist_label = eo_add(ELM_LABEL_CLASS, fctr_genlist_it);
-   eo_do(fctr_genlist_label, elm_obj_widget_part_text_set(NULL, "Genlist"));
-   eo_do(fctr_genlist_label, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(fctr_genlist_it, elm_obj_box_pack_end(fctr_genlist_image));
-   eo_do(fctr_genlist_it, elm_obj_box_pack_end(fctr_genlist_label));
-   fctr_gengrid_it = eo_add(ELM_BOX_CLASS, fctr_table_containers);
-   pub_widgets->fctr_gengrid_it = fctr_gengrid_it;
-   eo_do(fctr_gengrid_it, elm_obj_box_horizontal_set(EINA_TRUE));
-   eo_do(fctr_gengrid_it, elm_obj_box_padding_set(7, 0));
-   eo_do(fctr_gengrid_it, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_box_it, 0, 0, 1, 1));
-   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_table_it, 0, 1, 1, 1));
-   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_layout_it, 0, 3, 1, 
1));
-   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_naviframe_it, 0, 4, 1, 
1));
-   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_panes_it, 0, 5, 1, 1));
-   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_conformant_it, 0, 6, 
1, 1));
-   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_genlist_it, 0, 7, 1, 
1));
-   eo_do(fctr_table_containers, elm_obj_table_pack(fctr_gengrid_it, 0, 8, 1, 
1));
-   fctr_gengrid_image = eo_add(ELM_IMAGE_CLASS, fctr_gengrid_it);
-   eo_do(fctr_gengrid_image, evas_obj_size_hint_min_set(25, 25));
-   eo_do(fctr_gengrid_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
-   eo_do(fctr_gengrid_image, efl_gfx_visible_set(EINA_TRUE));
-   fctr_gengrid_label = eo_add(ELM_LABEL_CLASS, fctr_gengrid_it);
-   eo_do(fctr_gengrid_label, elm_obj_widget_part_text_set(NULL, "Gengrid"));
-   eo_do(fctr_gengrid_label, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(fctr_gengrid_it, elm_obj_box_pack_end(fctr_gengrid_image));
-   eo_do(fctr_gengrid_it, elm_obj_box_pack_end(fctr_gengrid_label));
    fctr_grid_it = eo_add(ELM_BOX_CLASS, fctr_table_containers);
    pub_widgets->fctr_grid_it = fctr_grid_it;
    eo_do(fctr_grid_it, elm_obj_box_horizontal_set(EINA_TRUE));
@@ -1556,20 +1545,6 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fctr_menu_label, efl_gfx_visible_set(EINA_TRUE));
    eo_do(fctr_menu_it, elm_obj_box_pack_end(fctr_menu_image));
    eo_do(fctr_menu_it, elm_obj_box_pack_end(fctr_menu_label));
-   fctr_toolbar_it = eo_add(ELM_BOX_CLASS, fctr_table_item_widgets);
-   pub_widgets->fctr_toolbar_it = fctr_toolbar_it;
-   eo_do(fctr_toolbar_it, elm_obj_box_horizontal_set(EINA_TRUE));
-   eo_do(fctr_toolbar_it, elm_obj_box_padding_set(7, 0));
-   eo_do(fctr_toolbar_it, efl_gfx_visible_set(EINA_TRUE));
-   fctr_toolbar_image = eo_add(ELM_IMAGE_CLASS, fctr_toolbar_it);
-   eo_do(fctr_toolbar_image, evas_obj_size_hint_min_set(25, 25));
-   eo_do(fctr_toolbar_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
-   eo_do(fctr_toolbar_image, efl_gfx_visible_set(EINA_TRUE));
-   fctr_toolbar_label = eo_add(ELM_LABEL_CLASS, fctr_toolbar_it);
-   eo_do(fctr_toolbar_label, elm_obj_widget_part_text_set(NULL, "Toolbar"));
-   eo_do(fctr_toolbar_label, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(fctr_toolbar_it, elm_obj_box_pack_end(fctr_toolbar_image));
-   eo_do(fctr_toolbar_it, elm_obj_box_pack_end(fctr_toolbar_label));
    fctr_diskselector_it = eo_add(ELM_BOX_CLASS, fctr_table_item_widgets);
    pub_widgets->fctr_diskselector_it = fctr_diskselector_it;
    eo_do(fctr_diskselector_it, elm_obj_box_horizontal_set(EINA_TRUE));
@@ -1589,10 +1564,6 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fctr_ctxpopup_it, elm_obj_box_horizontal_set(EINA_TRUE));
    eo_do(fctr_ctxpopup_it, elm_obj_box_padding_set(7, 0));
    eo_do(fctr_ctxpopup_it, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(fctr_table_item_widgets, elm_obj_table_pack(fctr_menu_it, 0, 0, 1, 
1));
-   eo_do(fctr_table_item_widgets, elm_obj_table_pack(fctr_toolbar_it, 0, 1, 1, 
1));
-   eo_do(fctr_table_item_widgets, elm_obj_table_pack(fctr_diskselector_it, 0, 
2, 1, 1));
-   eo_do(fctr_table_item_widgets, elm_obj_table_pack(fctr_ctxpopup_it, 0, 3, 
1, 1));
    fctr_ctxpopup_image = eo_add(ELM_IMAGE_CLASS, fctr_ctxpopup_it);
    eo_do(fctr_ctxpopup_image, evas_obj_size_hint_min_set(25, 25));
    eo_do(fctr_ctxpopup_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
@@ -1602,6 +1573,24 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fctr_ctxpopup_label, efl_gfx_visible_set(EINA_TRUE));
    eo_do(fctr_ctxpopup_it, elm_obj_box_pack_end(fctr_ctxpopup_image));
    eo_do(fctr_ctxpopup_it, elm_obj_box_pack_end(fctr_ctxpopup_label));
+   fctr_toolbar_it = eo_add(ELM_BOX_CLASS, fctr_table_item_widgets);
+   pub_widgets->fctr_toolbar_it = fctr_toolbar_it;
+   eo_do(fctr_toolbar_it, elm_obj_box_horizontal_set(EINA_TRUE));
+   eo_do(fctr_toolbar_it, elm_obj_box_padding_set(7, 0));
+   eo_do(fctr_toolbar_it, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(fctr_table_item_widgets, elm_obj_table_pack(fctr_menu_it, 0, 0, 1, 
1));
+   eo_do(fctr_table_item_widgets, elm_obj_table_pack(fctr_toolbar_it, 0, 1, 1, 
1));
+   eo_do(fctr_table_item_widgets, elm_obj_table_pack(fctr_diskselector_it, 0, 
2, 1, 1));
+   eo_do(fctr_table_item_widgets, elm_obj_table_pack(fctr_ctxpopup_it, 0, 3, 
1, 1));
+   fctr_toolbar_image = eo_add(ELM_IMAGE_CLASS, fctr_toolbar_it);
+   eo_do(fctr_toolbar_image, evas_obj_size_hint_min_set(25, 25));
+   eo_do(fctr_toolbar_image, elm_obj_image_resizable_set(EINA_TRUE, 
EINA_TRUE));
+   eo_do(fctr_toolbar_image, efl_gfx_visible_set(EINA_TRUE));
+   fctr_toolbar_label = eo_add(ELM_LABEL_CLASS, fctr_toolbar_it);
+   eo_do(fctr_toolbar_label, elm_obj_widget_part_text_set(NULL, "Toolbar"));
+   eo_do(fctr_toolbar_label, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(fctr_toolbar_it, elm_obj_box_pack_end(fctr_toolbar_image));
+   eo_do(fctr_toolbar_it, elm_obj_box_pack_end(fctr_toolbar_label));
    fctr_table_sep_6 = eo_add(ELM_SEPARATOR_CLASS, fctr_scroll_box);
    eo_do(fctr_table_sep_6, elm_obj_separator_horizontal_set(EINA_TRUE));
    eo_do(fctr_table_sep_6, efl_gfx_visible_set(EINA_TRUE));
@@ -1648,6 +1637,28 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(fctr_evas_image_label, efl_gfx_visible_set(EINA_TRUE));
    eo_do(fctr_evas_image_it, elm_obj_box_pack_end(fctr_evas_image_image));
    eo_do(fctr_evas_image_it, elm_obj_box_pack_end(fctr_evas_image_label));
+   theme_selector_box = eo_add(ELM_BOX_CLASS, left_panel_box);
+   eo_do(theme_selector_box, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(theme_selector_box, elm_obj_box_horizontal_set(EINA_TRUE));
+   eo_do(theme_selector_box, evas_obj_size_hint_align_set(-1.000000, 
0.000000));
+   eo_do(theme_selector_box, evas_obj_size_hint_weight_set(1.000000, 
0.000000));
+   eo_do(left_panel_box, elm_obj_box_pack_end(theme_selector_box));
+   eo_do(left_panel_box, elm_obj_box_pack_end(fctr_scroll));
+   theme_selector_label = eo_add(ELM_LABEL_CLASS, theme_selector_box);
+   eo_do(theme_selector_label, evas_obj_size_hint_weight_set(1.000000, 
1.000000));
+   eo_do(theme_selector_label, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(theme_selector_label, efl_gfx_size_set(60, 30));
+   eo_do(theme_selector_label, elm_obj_widget_part_text_set(NULL, "Select 
Theme:"));
+   theme_selector_hoversel = eo_add(ELM_HOVERSEL_CLASS, theme_selector_box);
+   pub_widgets->theme_selector_hoversel = theme_selector_hoversel;
+   eo_do(theme_selector_hoversel, evas_obj_size_hint_weight_set(1.000000, 
1.000000));
+   eo_do(theme_selector_hoversel, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(theme_selector_hoversel, efl_gfx_size_set(73, 30));
+   eo_do(theme_selector_hoversel, elm_obj_widget_part_text_set(NULL, 
"default"));
+   eo_do(theme_selector_hoversel, elm_obj_hoversel_hover_parent_set(hor_box));
+   eo_do(theme_selector_hoversel, 
eo_event_callback_add(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, 
theme_selector_hoversel_selected, NULL));
+   eo_do(theme_selector_box, elm_obj_box_pack_end(theme_selector_label));
+   eo_do(theme_selector_box, elm_obj_box_pack_end(theme_selector_hoversel));
    right_panes = eo_add(ELM_PANES_CLASS, hor_box);
    pub_widgets->right_panes = right_panes;
    eo_do(right_panes, evas_obj_size_hint_weight_set(1.000000, 1.000000));
@@ -1683,12 +1694,19 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(objtree_table, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(objtree_table, evas_obj_size_hint_align_set(-1.000000, -1.000000));
    eo_do(objtree_table, efl_gfx_visible_set(EINA_TRUE));
+   objtree_list = eo_add(ELM_GENLIST_CLASS, objtree_table);
+   pub_widgets->objtree_list = objtree_list;
+   eo_do(objtree_list, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(objtree_list, evas_obj_size_hint_weight_set(1.000000, 1.000000));
+   eo_do(objtree_list, evas_obj_size_hint_align_set(-1.000000, -1.000000));
    objtree_filter_box = eo_add(ELM_BOX_CLASS, objtree_table);
    pub_widgets->objtree_filter_box = objtree_filter_box;
    eo_do(objtree_filter_box, elm_obj_box_horizontal_set(EINA_TRUE));
    eo_do(objtree_filter_box, evas_obj_size_hint_weight_set(1.000000, 
0.000000));
    eo_do(objtree_filter_box, evas_obj_size_hint_align_set(-1.000000, 
0.000000));
    eo_do(objtree_filter_box, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(objtree_table, elm_obj_table_pack(objtree_filter_box, 0, 0, 1, 1));
+   eo_do(objtree_table, elm_obj_table_pack(objtree_list, 0, 1, 1, 1));
    objtree_filter_label = eo_add(ELM_LABEL_CLASS, objtree_filter_box);
    eo_do(objtree_filter_label, elm_obj_widget_part_text_set(NULL, "Search Menu 
:"));
    eo_do(objtree_filter_label, evas_obj_size_hint_weight_set(0.000000, 
1.000000));
@@ -1705,13 +1723,6 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(objtree_filter_entry, efl_gfx_visible_set(EINA_TRUE));
    eo_do(objtree_filter_box, elm_obj_box_pack_end(objtree_filter_label));
    eo_do(objtree_filter_box, elm_obj_box_pack_end(objtree_filter_entry));
-   objtree_list = eo_add(ELM_GENLIST_CLASS, objtree_table);
-   pub_widgets->objtree_list = objtree_list;
-   eo_do(objtree_list, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(objtree_list, evas_obj_size_hint_weight_set(1.000000, 1.000000));
-   eo_do(objtree_list, evas_obj_size_hint_align_set(-1.000000, -1.000000));
-   eo_do(objtree_table, elm_obj_table_pack(objtree_filter_box, 0, 0, 1, 1));
-   eo_do(objtree_table, elm_obj_table_pack(objtree_list, 0, 1, 1, 1));
    propsview_table = eo_add(ELM_TABLE_CLASS, right_panes_internal);
    pub_widgets->propsview_table = propsview_table;
    eo_do(propsview_table, evas_obj_size_hint_weight_set(1.000000, 1.000000));
@@ -1719,23 +1730,6 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(propsview_table, efl_gfx_visible_set(EINA_TRUE));
    eo_do(right_panes_internal, elm_obj_container_content_set("left", 
objtree_table));
    eo_do(right_panes_internal, elm_obj_container_content_set("right", 
propsview_table));
-   propsview_toolbar = eo_add(ELM_TOOLBAR_CLASS, propsview_table);
-   pub_widgets->propsview_toolbar = propsview_toolbar;
-   eo_do(propsview_toolbar, elm_obj_widget_style_set("item_horizontal"));
-   eo_do(propsview_toolbar, 
elm_obj_toolbar_shrink_mode_set(ELM_TOOLBAR_SHRINK_MENU));
-   eo_do(propsview_toolbar, 
elm_obj_toolbar_select_mode_set(ELM_OBJECT_SELECT_MODE_ALWAYS));
-   eo_do(propsview_toolbar, elm_obj_toolbar_icon_size_set(16));
-   eo_do(propsview_toolbar, evas_obj_size_hint_weight_set(1.000000, 0.000000));
-   eo_do(propsview_toolbar, evas_obj_size_hint_align_set(-1.000000, 0.000000));
-   eo_do(propsview_toolbar, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(propsview_toolbar, propsview_toolbar_desc_it = 
elm_obj_toolbar_item_append("fonts", "Description", (Evas_Smart_Cb) 
_proplayout_toolbar_clicked, NULL));
-   pub_widgets->propsview_toolbar_desc_it = propsview_toolbar_desc_it;
-   eo_do(propsview_toolbar, propsview_toolbar_prop_it = 
elm_obj_toolbar_item_append("package_settings", "Properties", (Evas_Smart_Cb) 
_proplayout_toolbar_clicked, NULL));
-   pub_widgets->propsview_toolbar_prop_it = propsview_toolbar_prop_it;
-   eo_do(propsview_toolbar, propsview_toolbar_cb_it = 
elm_obj_toolbar_item_append("call-start", "Callbacks", (Evas_Smart_Cb) 
_proplayout_toolbar_clicked, NULL));
-   pub_widgets->propsview_toolbar_cb_it = propsview_toolbar_cb_it;
-   eo_do(propsview_toolbar, propsview_toolbar_cont_it = 
elm_obj_toolbar_item_append("folder-open", "Content", (Evas_Smart_Cb) 
_proplayout_toolbar_clicked, NULL));
-   pub_widgets->propsview_toolbar_cont_it = propsview_toolbar_cont_it;
    propsview_filter_box = eo_add(ELM_BOX_CLASS, propsview_table);
    pub_widgets->propsview_filter_box = propsview_filter_box;
    eo_do(propsview_filter_box, elm_obj_box_horizontal_set(EINA_TRUE));
@@ -1758,14 +1752,31 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(propsview_filter_entry, efl_gfx_visible_set(EINA_TRUE));
    eo_do(propsview_filter_box, elm_obj_box_pack_end(propsview_filter_label));
    eo_do(propsview_filter_box, elm_obj_box_pack_end(propsview_filter_entry));
-   description_list = eo_add(ELM_GENLIST_CLASS, propsview_table);
-   pub_widgets->description_list = description_list;
-   eo_do(description_list, evas_obj_size_hint_weight_set(1.000000, 1.000000));
-   eo_do(description_list, evas_obj_size_hint_align_set(-1.000000, -1.000000));
    properties_list = eo_add(ELM_GENLIST_CLASS, propsview_table);
    pub_widgets->properties_list = properties_list;
    eo_do(properties_list, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(properties_list, evas_obj_size_hint_align_set(-1.000000, -1.000000));
+   description_list = eo_add(ELM_GENLIST_CLASS, propsview_table);
+   pub_widgets->description_list = description_list;
+   eo_do(description_list, evas_obj_size_hint_weight_set(1.000000, 1.000000));
+   eo_do(description_list, evas_obj_size_hint_align_set(-1.000000, -1.000000));
+   propsview_toolbar = eo_add(ELM_TOOLBAR_CLASS, propsview_table);
+   pub_widgets->propsview_toolbar = propsview_toolbar;
+   eo_do(propsview_toolbar, elm_obj_widget_style_set("item_horizontal"));
+   eo_do(propsview_toolbar, 
elm_obj_toolbar_shrink_mode_set(ELM_TOOLBAR_SHRINK_MENU));
+   eo_do(propsview_toolbar, 
elm_obj_toolbar_select_mode_set(ELM_OBJECT_SELECT_MODE_ALWAYS));
+   eo_do(propsview_toolbar, elm_obj_toolbar_icon_size_set(16));
+   eo_do(propsview_toolbar, evas_obj_size_hint_weight_set(1.000000, 0.000000));
+   eo_do(propsview_toolbar, evas_obj_size_hint_align_set(-1.000000, 0.000000));
+   eo_do(propsview_toolbar, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(propsview_toolbar, propsview_toolbar_desc_it = 
elm_obj_toolbar_item_append("fonts", "Description", (Evas_Smart_Cb) 
_proplayout_toolbar_clicked, NULL));
+   pub_widgets->propsview_toolbar_desc_it = propsview_toolbar_desc_it;
+   eo_do(propsview_toolbar, propsview_toolbar_prop_it = 
elm_obj_toolbar_item_append("package_settings", "Properties", (Evas_Smart_Cb) 
_proplayout_toolbar_clicked, NULL));
+   pub_widgets->propsview_toolbar_prop_it = propsview_toolbar_prop_it;
+   eo_do(propsview_toolbar, propsview_toolbar_cb_it = 
elm_obj_toolbar_item_append("call-start", "Callbacks", (Evas_Smart_Cb) 
_proplayout_toolbar_clicked, NULL));
+   pub_widgets->propsview_toolbar_cb_it = propsview_toolbar_cb_it;
+   eo_do(propsview_toolbar, propsview_toolbar_cont_it = 
elm_obj_toolbar_item_append("folder-open", "Content", (Evas_Smart_Cb) 
_proplayout_toolbar_clicked, NULL));
+   pub_widgets->propsview_toolbar_cont_it = propsview_toolbar_cont_it;
    callbacksview_box = eo_add(ELM_BOX_CLASS, propsview_table);
    pub_widgets->callbacksview_box = callbacksview_box;
    eo_do(callbacksview_box, efl_gfx_visible_set(EINA_FALSE));
@@ -1812,11 +1823,64 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(callbacksview_buttons_box, 
elm_obj_box_pack_end(callbacksview_up_btn));
    eo_do(callbacksview_buttons_box, 
elm_obj_box_pack_end(callbacksview_down_btn));
    eo_do(callbacksview_buttons_box, 
elm_obj_box_pack_end(callbacksview_del_btn));
+   contentview_box = eo_add(ELM_BOX_CLASS, propsview_table);
+   pub_widgets->contentview_box = contentview_box;
+   eo_do(contentview_box, efl_gfx_visible_set(EINA_FALSE));
+   eo_do(contentview_box, evas_obj_size_hint_weight_set(1.000000, 1.000000));
+   eo_do(contentview_box, evas_obj_size_hint_align_set(-1.000000, -1.000000));
+   contentview_list = eo_add(ELM_GENLIST_CLASS, contentview_box);
+   pub_widgets->contentview_list = contentview_list;
+   eo_do(contentview_list, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(contentview_list, evas_obj_size_hint_weight_set(1.000000, 1.000000));
+   eo_do(contentview_list, evas_obj_size_hint_align_set(-1.000000, -1.000000));
+   contentview_buttons_box = eo_add(ELM_BOX_CLASS, contentview_box);
+   pub_widgets->contentview_buttons_box = contentview_buttons_box;
+   eo_do(contentview_buttons_box, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(contentview_buttons_box, elm_obj_box_horizontal_set(EINA_TRUE));
+   eo_do(contentview_buttons_box, evas_obj_size_hint_weight_set(1.000000, 
0.000000));
+   eo_do(contentview_buttons_box, evas_obj_size_hint_align_set(-1.000000, 
0.000000));
+   eo_do(contentview_box, elm_obj_box_pack_end(contentview_list));
+   eo_do(contentview_box, elm_obj_box_pack_end(contentview_buttons_box));
+   contentview_del_btn = eo_add(ELM_BUTTON_CLASS, contentview_buttons_box);
+   pub_widgets->contentview_del_btn = contentview_del_btn;
+   eo_do(contentview_del_btn, elm_obj_widget_part_text_set(NULL, "X"));
+   eo_do(contentview_del_btn, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(contentview_del_btn, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
contentview_del_btn_clicked, NULL));
+   contentview_down_btn = eo_add(ELM_BUTTON_CLASS, contentview_buttons_box);
+   pub_widgets->contentview_down_btn = contentview_down_btn;
+   eo_do(contentview_down_btn, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(contentview_down_btn, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
contentview_down_btn_clicked, NULL));
+   contentview_down_btn_icon = eo_add(ELM_ICON_CLASS, contentview_down_btn);
+   eo_do(contentview_down_btn_icon, evas_obj_size_hint_weight_set(1.000000, 
1.000000));
+   eo_do(contentview_down_btn_icon, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(contentview_down_btn_icon, efl_gfx_size_set(40, 40));
+   eo_do(contentview_down_btn_icon, efl_file_set(move_down_icon, NULL));
+   eo_do(contentview_down_btn, elm_obj_container_content_set(NULL, 
contentview_down_btn_icon));
+   contentview_up_btn = eo_add(ELM_BUTTON_CLASS, contentview_buttons_box);
+   pub_widgets->contentview_up_btn = contentview_up_btn;
+   eo_do(contentview_up_btn, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(contentview_up_btn, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
contentview_up_btn_clicked, NULL));
+   eo_do(contentview_buttons_box, elm_obj_box_pack_end(contentview_up_btn));
+   eo_do(contentview_buttons_box, elm_obj_box_pack_end(contentview_down_btn));
+   eo_do(contentview_buttons_box, elm_obj_box_pack_end(contentview_del_btn));
+   contentview_up_btn_icon = eo_add(ELM_ICON_CLASS, contentview_up_btn);
+   eo_do(contentview_up_btn_icon, evas_obj_size_hint_weight_set(1.000000, 
1.000000));
+   eo_do(contentview_up_btn_icon, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(contentview_up_btn_icon, efl_gfx_size_set(40, 40));
+   eo_do(contentview_up_btn_icon, efl_file_set(move_up_icon, NULL));
+   eo_do(contentview_up_btn, elm_obj_container_content_set(NULL, 
contentview_up_btn_icon));
    itemview_box = eo_add(ELM_BOX_CLASS, propsview_table);
    pub_widgets->itemview_box = itemview_box;
    eo_do(itemview_box, efl_gfx_visible_set(EINA_FALSE));
    eo_do(itemview_box, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(itemview_box, evas_obj_size_hint_align_set(-1.000000, -1.000000));
+   eo_do(propsview_table, elm_obj_table_pack(propsview_toolbar, 0, 0, 1, 1));
+   eo_do(propsview_table, elm_obj_table_pack(propsview_filter_box, 0, 1, 1, 
1));
+   eo_do(propsview_table, elm_obj_table_pack(description_list, 0, 2, 1, 1));
+   eo_do(propsview_table, elm_obj_table_pack(properties_list, 0, 2, 1, 1));
+   eo_do(propsview_table, elm_obj_table_pack(callbacksview_box, 0, 2, 1, 1));
+   eo_do(propsview_table, elm_obj_table_pack(itemview_box, 0, 2, 1, 1));
+   eo_do(propsview_table, elm_obj_table_pack(contentview_box, 0, 2, 1, 1));
    itemview_list = eo_add(ELM_GENLIST_CLASS, itemview_box);
    pub_widgets->itemview_list = itemview_list;
    eo_do(itemview_list, efl_gfx_visible_set(EINA_TRUE));
@@ -1844,6 +1908,10 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(itemview_add_separator_but, elm_obj_widget_part_text_set(NULL, "Add 
Separator"));
    eo_do(itemview_add_separator_but, efl_gfx_visible_set(EINA_TRUE));
    eo_do(itemview_add_separator_but, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
itemview_add_separator_but_clicked, NULL));
+   itemview_del_item_but = eo_add(ELM_BUTTON_CLASS, itemview_buttons_box);
+   eo_do(itemview_del_item_but, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(itemview_del_item_but, elm_obj_widget_part_text_set(NULL, "X"));
+   eo_do(itemview_del_item_but, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
itemview_del_item_but_clicked, NULL));
    itemview_up_btn = eo_add(ELM_BUTTON_CLASS, itemview_buttons_box);
    eo_do(itemview_up_btn, efl_gfx_visible_set(EINA_TRUE));
    eo_do(itemview_up_btn, efl_gfx_size_set(73, 30));
@@ -1858,81 +1926,20 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(itemview_down_btn, efl_gfx_visible_set(EINA_TRUE));
    eo_do(itemview_down_btn, efl_gfx_size_set(73, 30));
    eo_do(itemview_down_btn, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
itemview_down_btn_clicked, NULL));
-   itemview_down_btn_icon = eo_add(ELM_ICON_CLASS, itemview_down_btn);
-   eo_do(itemview_down_btn_icon, evas_obj_size_hint_weight_set(1.000000, 
1.000000));
-   eo_do(itemview_down_btn_icon, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(itemview_down_btn_icon, efl_gfx_size_set(40, 40));
-   eo_do(itemview_down_btn_icon, efl_file_set(move_down_icon, NULL));
-   eo_do(itemview_down_btn, elm_obj_container_content_set(NULL, 
itemview_down_btn_icon));
-   itemview_del_item_but = eo_add(ELM_BUTTON_CLASS, itemview_buttons_box);
-   eo_do(itemview_del_item_but, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(itemview_del_item_but, elm_obj_widget_part_text_set(NULL, "X"));
-   eo_do(itemview_del_item_but, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
itemview_del_item_but_clicked, NULL));
    eo_do(itemview_buttons_box, elm_obj_box_pack_end(itemview_add_item_but));
    eo_do(itemview_buttons_box, 
elm_obj_box_pack_end(itemview_add_item_nested_but));
    eo_do(itemview_buttons_box, 
elm_obj_box_pack_end(itemview_add_separator_but));
    eo_do(itemview_buttons_box, elm_obj_box_pack_end(itemview_up_btn));
    eo_do(itemview_buttons_box, elm_obj_box_pack_end(itemview_down_btn));
    eo_do(itemview_buttons_box, elm_obj_box_pack_end(itemview_del_item_but));
-   contentview_box = eo_add(ELM_BOX_CLASS, propsview_table);
-   pub_widgets->contentview_box = contentview_box;
-   eo_do(contentview_box, efl_gfx_visible_set(EINA_FALSE));
-   eo_do(contentview_box, evas_obj_size_hint_weight_set(1.000000, 1.000000));
-   eo_do(contentview_box, evas_obj_size_hint_align_set(-1.000000, -1.000000));
-   eo_do(propsview_table, elm_obj_table_pack(propsview_toolbar, 0, 0, 1, 1));
-   eo_do(propsview_table, elm_obj_table_pack(propsview_filter_box, 0, 1, 1, 
1));
-   eo_do(propsview_table, elm_obj_table_pack(description_list, 0, 2, 1, 1));
-   eo_do(propsview_table, elm_obj_table_pack(properties_list, 0, 2, 1, 1));
-   eo_do(propsview_table, elm_obj_table_pack(callbacksview_box, 0, 2, 1, 1));
-   eo_do(propsview_table, elm_obj_table_pack(itemview_box, 0, 2, 1, 1));
-   eo_do(propsview_table, elm_obj_table_pack(contentview_box, 0, 2, 1, 1));
-   contentview_list = eo_add(ELM_GENLIST_CLASS, contentview_box);
-   pub_widgets->contentview_list = contentview_list;
-   eo_do(contentview_list, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(contentview_list, evas_obj_size_hint_weight_set(1.000000, 1.000000));
-   eo_do(contentview_list, evas_obj_size_hint_align_set(-1.000000, -1.000000));
-   contentview_buttons_box = eo_add(ELM_BOX_CLASS, contentview_box);
-   pub_widgets->contentview_buttons_box = contentview_buttons_box;
-   eo_do(contentview_buttons_box, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(contentview_buttons_box, elm_obj_box_horizontal_set(EINA_TRUE));
-   eo_do(contentview_buttons_box, evas_obj_size_hint_weight_set(1.000000, 
0.000000));
-   eo_do(contentview_buttons_box, evas_obj_size_hint_align_set(-1.000000, 
0.000000));
-   eo_do(contentview_box, elm_obj_box_pack_end(contentview_list));
-   eo_do(contentview_box, elm_obj_box_pack_end(contentview_buttons_box));
-   contentview_up_btn = eo_add(ELM_BUTTON_CLASS, contentview_buttons_box);
-   pub_widgets->contentview_up_btn = contentview_up_btn;
-   eo_do(contentview_up_btn, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(contentview_up_btn, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
contentview_up_btn_clicked, NULL));
-   contentview_up_btn_icon = eo_add(ELM_ICON_CLASS, contentview_up_btn);
-   eo_do(contentview_up_btn_icon, evas_obj_size_hint_weight_set(1.000000, 
1.000000));
-   eo_do(contentview_up_btn_icon, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(contentview_up_btn_icon, efl_gfx_size_set(40, 40));
-   eo_do(contentview_up_btn_icon, efl_file_set(move_up_icon, NULL));
-   eo_do(contentview_up_btn, elm_obj_container_content_set(NULL, 
contentview_up_btn_icon));
-   contentview_down_btn = eo_add(ELM_BUTTON_CLASS, contentview_buttons_box);
-   pub_widgets->contentview_down_btn = contentview_down_btn;
-   eo_do(contentview_down_btn, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(contentview_down_btn, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
contentview_down_btn_clicked, NULL));
-   contentview_down_btn_icon = eo_add(ELM_ICON_CLASS, contentview_down_btn);
-   eo_do(contentview_down_btn_icon, evas_obj_size_hint_weight_set(1.000000, 
1.000000));
-   eo_do(contentview_down_btn_icon, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(contentview_down_btn_icon, efl_gfx_size_set(40, 40));
-   eo_do(contentview_down_btn_icon, efl_file_set(move_down_icon, NULL));
-   eo_do(contentview_down_btn, elm_obj_container_content_set(NULL, 
contentview_down_btn_icon));
-   contentview_del_btn = eo_add(ELM_BUTTON_CLASS, contentview_buttons_box);
-   pub_widgets->contentview_del_btn = contentview_del_btn;
-   eo_do(contentview_del_btn, elm_obj_widget_part_text_set(NULL, "X"));
-   eo_do(contentview_del_btn, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(contentview_del_btn, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
contentview_del_btn_clicked, NULL));
-   eo_do(contentview_buttons_box, elm_obj_box_pack_end(contentview_up_btn));
-   eo_do(contentview_buttons_box, elm_obj_box_pack_end(contentview_down_btn));
-   eo_do(contentview_buttons_box, elm_obj_box_pack_end(contentview_del_btn));
-   main_logo = eo_add(EVAS_IMAGE_CLASS, main_win);
-   eo_do(main_logo, efl_file_set(erigo_icon, NULL));
-   eo_do(main_logo, efl_gfx_visible_set(EINA_TRUE));
-   eo_do(main_win, elm_obj_win_icon_object_set(main_logo));
+   itemview_down_btn_icon = eo_add(ELM_ICON_CLASS, itemview_down_btn);
+   eo_do(itemview_down_btn_icon, evas_obj_size_hint_weight_set(1.000000, 
1.000000));
+   eo_do(itemview_down_btn_icon, efl_gfx_visible_set(EINA_TRUE));
+   eo_do(itemview_down_btn_icon, efl_gfx_size_set(40, 40));
+   eo_do(itemview_down_btn_icon, efl_file_set(move_down_icon, NULL));
+   eo_do(itemview_down_btn, elm_obj_container_content_set(NULL, 
itemview_down_btn_icon));
    eo_do(main_win, efl_gfx_visible_set(EINA_TRUE));
-
+   eo_do(main_win, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
diff --git a/src/tests/data/demo.egui b/src/tests/data/demo.egui
index a65dadb..85f328a 100644
--- a/src/tests/data/demo.egui
+++ b/src/tests/data/demo.egui
@@ -268,7 +268,7 @@
         "Evas.Object.size_hint_align":[-1, 0],
         "Elm.Entry.scrollable":[true],
         "Elm.Entry.single_line":[true],
-        "Elm_Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
+        "Elm.Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
         "Elm.Widget.part_text":[null, "New Project"],
         "Efl.Gfx.Base.visible":[true]
       }
@@ -490,7 +490,7 @@
         "Efl.Gfx.Base.visible":[true],
         "Evas.Object.size_hint_weight":[1, 1],
         "Evas.Object.size_hint_align":[-1, -1],
-        "Elm_Interface_Scrollable.bounce_allow":[false, true]
+        "Elm.Interface_Scrollable.bounce_allow":[false, true]
       },
       "Contains":
       {
@@ -544,7 +544,7 @@
         "Evas.Object.size_hint_align":[-1, 0],
         "Elm.Entry.scrollable":[true],
         "Elm.Entry.single_line":[true],
-        "Elm_Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
+        "Elm.Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
         "Efl.Gfx.Base.visible":[true]
       }
     },
@@ -562,7 +562,7 @@
         "Evas.Object.size_hint_align":[-1, 0],
         "Elm.Entry.scrollable":[true],
         "Elm.Entry.single_line":[true],
-        "Elm_Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
+        "Elm.Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
         "Efl.Gfx.Base.visible":[true]
       }
     },
@@ -820,7 +820,7 @@
         "Evas.Object.size_hint_align":[-1, 0],
         "Elm.Entry.scrollable":[true],
         "Elm.Entry.single_line":[true],
-        "Elm_Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
+        "Elm.Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
         "Efl.Gfx.Base.visible":[true]
       },
       "Callbacks":
@@ -1130,7 +1130,7 @@
       {
         "Evas.Object.size_hint_weight":[1, 1],
         "Evas.Object.size_hint_align":[-1, -1],
-        "Elm_Interface_Scrollable.bounce_allow":[false, true],
+        "Elm.Interface_Scrollable.bounce_allow":[false, true],
         "Efl.Gfx.Base.visible":[true]
       },
       "Contains":
@@ -3226,7 +3226,7 @@
         "Evas.Object.size_hint_align":[-1, -1],
         "Elm.Entry.scrollable":[true],
         "Elm.Entry.single_line":[true],
-        "Elm_Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
+        "Elm.Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
         "Elm.Widget.part_text":["guide", "Type widget name here to search"],
         "Efl.Gfx.Base.visible":[true]
       }
@@ -3302,7 +3302,7 @@
         "Evas.Object.size_hint_align":[-1, 0],
         "Elm.Entry.scrollable":[true],
         "Elm.Entry.single_line":[true],
-        "Elm_Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
+        "Elm.Interface_Scrollable.policy":["ELM_SCROLLER_POLICY_OFF", 
"ELM_SCROLLER_POLICY_OFF"],
         "Elm.Widget.part_text":["guide", "Type property name here to search"],
         "Efl.Gfx.Base.visible":[true]
       }
diff --git a/src/tests/data/demo.h.ref b/src/tests/data/demo.h.ref
index 99f9ef2..dd44100 100644
--- a/src/tests/data/demo.h.ref
+++ b/src/tests/data/demo.h.ref
@@ -22,11 +22,11 @@ typedef struct
 {
    Eo *fs_win;
    Eo *fs_table;
+   Eo *fs_project_name_box;
+   Eo *fs_project_name_entry;
    Eo *fs_radio_box;
    Eo *fs_radio_c;
    Eo *fs_radio_cpp;
-   Eo *fs_project_name_box;
-   Eo *fs_project_name_entry;
    Eo *fileselector;
 } Egui_Layout_Fs_Win_Widgets;
 
@@ -44,11 +44,11 @@ typedef struct
    Eo *rm_buttons_box;
    Eo *rm_alias_entry;
    Eo *rm_value_entry;
-   Eo *rm_button_add;
    Eo *rm_image_fileselector;
    Eo *rm_edje_box;
    Eo *rm_edje_fs_edj;
    Eo *rm_edje_fs_edc;
+   Eo *rm_button_add;
 } Egui_Layout_Rm_Win_Widgets;
 
 
@@ -91,7 +91,6 @@ typedef struct
    Eo *hor_box;
    Eo *left_panes;
    Eo *left_panel_box;
-   Eo *theme_selector_hoversel;
    Eo *fctr_table;
    Eo *fctr_win_it;
    Eo *fctr_bg_it;
@@ -102,11 +101,11 @@ typedef struct
    Eo *fctr_icon_it;
    Eo *fctr_image_it;
    Eo *fctr_actionslider_it;
-   Eo *fctr_clock_it;
-   Eo *fctr_dayselector_it;
-   Eo *fctr_calendar_it;
    Eo *fctr_bubble_it;
+   Eo *fctr_calendar_it;
    Eo *fctr_colorselector_it;
+   Eo *fctr_dayselector_it;
+   Eo *fctr_clock_it;
    Eo *fctr_entry_it;
    Eo *fctr_flip_it;
    Eo *fctr_separator_it;
@@ -119,55 +118,56 @@ typedef struct
    Eo *fctr_hoversel_it;
    Eo *fctr_table_containers;
    Eo *fctr_box_it;
+   Eo *fctr_genlist_it;
+   Eo *fctr_gengrid_it;
+   Eo *fctr_naviframe_it;
    Eo *fctr_table_it;
    Eo *fctr_layout_it;
-   Eo *fctr_naviframe_it;
    Eo *fctr_panes_it;
    Eo *fctr_conformant_it;
-   Eo *fctr_genlist_it;
-   Eo *fctr_gengrid_it;
    Eo *fctr_grid_it;
    Eo *fctr_table_item_widgets;
    Eo *fctr_menu_it;
-   Eo *fctr_toolbar_it;
    Eo *fctr_diskselector_it;
    Eo *fctr_ctxpopup_it;
+   Eo *fctr_toolbar_it;
    Eo *fctr_table_evas;
    Eo *fctr_evas_image_it;
+   Eo *theme_selector_hoversel;
    Eo *right_panes;
    Eo *right_pane_layout;
    Eo *right_panel_box;
    Eo *objtree_table;
+   Eo *objtree_list;
    Eo *objtree_filter_box;
    Eo *objtree_filter_entry;
-   Eo *objtree_list;
    Eo *propsview_table;
+   Eo *propsview_filter_box;
+   Eo *propsview_filter_entry;
+   Eo *properties_list;
+   Eo *description_list;
    Eo *propsview_toolbar;
    Elm_Object_Item *propsview_toolbar_desc_it;
    Elm_Object_Item *propsview_toolbar_prop_it;
    Elm_Object_Item *propsview_toolbar_cb_it;
    Elm_Object_Item *propsview_toolbar_cont_it;
-   Eo *propsview_filter_box;
-   Eo *propsview_filter_entry;
-   Eo *description_list;
-   Eo *properties_list;
    Eo *callbacksview_box;
    Eo *callbacksview_list;
    Eo *callbacksview_buttons_box;
    Eo *callbacksview_up_btn;
    Eo *callbacksview_down_btn;
    Eo *callbacksview_del_btn;
+   Eo *contentview_box;
+   Eo *contentview_list;
+   Eo *contentview_buttons_box;
+   Eo *contentview_del_btn;
+   Eo *contentview_down_btn;
+   Eo *contentview_up_btn;
    Eo *itemview_box;
    Eo *itemview_list;
    Eo *itemview_buttons_box;
    Eo *itemview_add_item_nested_but;
    Eo *itemview_add_separator_but;
-   Eo *contentview_box;
-   Eo *contentview_list;
-   Eo *contentview_buttons_box;
-   Eo *contentview_up_btn;
-   Eo *contentview_down_btn;
-   Eo *contentview_del_btn;
 } Egui_Layout_Main_Win_Widgets;
 
 
diff --git a/src/tests/data/test_resources_cbs.c.ref 
b/src/tests/data/test_resources_cbs.c.ref
index 99fad05..28d7a61 100644
--- a/src/tests/data/test_resources_cbs.c.ref
+++ b/src/tests/data/test_resources_cbs.c.ref
@@ -13,8 +13,6 @@
 #include "elm_interface_fileselector.h"
 #include "test_resources_cbs.h"
 
-static Demo_Widgets g_pub_widgets;
-
 extern Eina_Bool
 _my_callback_function(void *data, Eo *obj, const Eo_Event_Description *desc, 
void *event_info);
 
@@ -25,6 +23,13 @@ elm_button1_clicked(void *data EINA_UNUSED, Eo *obj 
EINA_UNUSED, const Eo_Event_
    return EINA_TRUE;
 }
 
+static Eina_Bool
+_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   free(data);
+   return EINA_TRUE;
+}
+
 Demo_Elm_Win1_Widgets *
 demo_elm_win1_create(Eo *__main_parent)
 {
@@ -40,7 +45,7 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(elm_win1, elm_obj_win_title_set("elm_win1"));
    eo_do(elm_win1, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(elm_win1, efl_gfx_size_set(165, 130));
-   elm_win1_main_menu = eo_add(ELM_MENU_CLASS, elm_win1);
+   eo_do(elm_win1, elm_win1_main_menu = elm_obj_win_main_menu_get());
    elm_button1 = eo_add(ELM_BUTTON_CLASS, elm_win1);
    eo_do(elm_button1, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(elm_button1, efl_gfx_visible_set(EINA_TRUE));
@@ -49,7 +54,7 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(elm_button1, efl_gfx_position_set(52, 43));
    eo_do(elm_button1, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
elm_button1_clicked, NULL));
    eo_do(elm_win1, efl_gfx_visible_set(EINA_TRUE));
-
+   eo_do(elm_win1, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
diff --git a/src/tests/data/test_resources_edjes.c.ref 
b/src/tests/data/test_resources_edjes.c.ref
index b88dfac..713b0d4 100644
--- a/src/tests/data/test_resources_edjes.c.ref
+++ b/src/tests/data/test_resources_edjes.c.ref
@@ -13,14 +13,19 @@
 #include "elm_interface_fileselector.h"
 #include "test_resources_edjes.h"
 
-static Demo_Widgets g_pub_widgets;
-
 #ifdef DEMO_EDJE_PATH
   const char *edje = DEMO_EDJE_PATH"/test.edj";
 #else
    #error "Please define DEMO_EDJE_PATH"
 #endif
 
+static Eina_Bool
+_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   free(data);
+   return EINA_TRUE;
+}
+
 Demo_Elm_Layout1_Widgets *
 demo_elm_layout1_create(Eo *__main_parent)
 {
@@ -33,7 +38,7 @@ demo_elm_layout1_create(Eo *__main_parent)
    eo_do(elm_layout1, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(elm_layout1, efl_gfx_visible_set(EINA_TRUE));
    eo_do(elm_layout1, efl_file_set(edje, "layout"));
-
+   eo_do(elm_layout1, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
diff --git a/src/tests/data/test_resources_images.c.ref 
b/src/tests/data/test_resources_images.c.ref
index 2cf5f28..aa3d75c 100644
--- a/src/tests/data/test_resources_images.c.ref
+++ b/src/tests/data/test_resources_images.c.ref
@@ -13,8 +13,6 @@
 #include "elm_interface_fileselector.h"
 #include "test_resources_images.h"
 
-static Demo_Widgets g_pub_widgets;
-
 #ifdef DEMO_IMAGES_PATH
   const char *image1 = DEMO_IMAGES_PATH"/image1.png";
   const char *image2 = DEMO_IMAGES_PATH"/image2.png";
@@ -22,6 +20,13 @@ static Demo_Widgets g_pub_widgets;
    #error "Please define DEMO_IMAGES_PATH"
 #endif
 
+static Eina_Bool
+_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   free(data);
+   return EINA_TRUE;
+}
+
 Demo_Elm_Image1_Widgets *
 demo_elm_image1_create(Eo *__main_parent)
 {
@@ -35,7 +40,7 @@ demo_elm_image1_create(Eo *__main_parent)
    eo_do(elm_image1, efl_gfx_visible_set(EINA_TRUE));
    eo_do(elm_image1, efl_gfx_size_set(124, 153));
    eo_do(elm_image1, efl_file_set(image1, NULL));
-
+   eo_do(elm_image1, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
diff --git a/src/tests/data/test_settings.c.ref 
b/src/tests/data/test_settings.c.ref
index e332019..201a8e9 100644
--- a/src/tests/data/test_settings.c.ref
+++ b/src/tests/data/test_settings.c.ref
@@ -13,5 +13,3 @@
 #include "elm_interface_fileselector.h"
 #include "test_settings.h"
 
-static Demo_Widgets g_pub_widgets;
-
diff --git a/src/tests/data/test_widgets.c.ref 
b/src/tests/data/test_widgets.c.ref
index dcae52a..6544de3 100644
--- a/src/tests/data/test_widgets.c.ref
+++ b/src/tests/data/test_widgets.c.ref
@@ -15,6 +15,13 @@
 
 static Demo_Widgets g_pub_widgets;
 
+static Eina_Bool
+_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   free(data);
+   return EINA_TRUE;
+}
+
 Demo_Elm_Win1_Widgets *
 demo_elm_win1_create(Eo *__main_parent)
 {
@@ -36,7 +43,7 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(elm_layout1, efl_gfx_position_set(205, 379));
    eo_do(elm_win1, elm_obj_win_resize_object_add(elm_layout1));
    eo_do(elm_win1, efl_gfx_visible_set(EINA_TRUE));
-
+   eo_do(elm_win1, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
diff --git a/src/tests/data/test_widgets_create_cb.c.ref 
b/src/tests/data/test_widgets_create_cb.c.ref
index d86ddca..1581088 100644
--- a/src/tests/data/test_widgets_create_cb.c.ref
+++ b/src/tests/data/test_widgets_create_cb.c.ref
@@ -15,10 +15,20 @@
 
 static Demo_Widgets g_pub_widgets;
 
+extern void demo_elm_win2_create_done(Demo_Elm_Win2_Widgets *wdgs);
+
 static Eina_Bool
 elm_button1_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const 
Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   g_pub_widgets.elm_win2 = demo_elm_win2_create(NULL);
+   Demo_Elm_Win2_Widgets *wdgs = demo_elm_win2_create(NULL);
+   demo_elm_win2_create_done(wdgs);
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   free(data);
    return EINA_TRUE;
 }
 
@@ -38,7 +48,7 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(elm_win1, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(elm_win1, efl_gfx_size_set(383, 442));
    eo_do(elm_win1, elm_obj_win_autodel_set(EINA_TRUE));
-   elm_win1_main_menu = eo_add(ELM_MENU_CLASS, elm_win1);
+   eo_do(elm_win1, elm_win1_main_menu = elm_obj_win_main_menu_get());
    elm_button1 = eo_add(ELM_BUTTON_CLASS, elm_win1);
    eo_do(elm_button1, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(elm_button1, efl_gfx_visible_set(EINA_TRUE));
@@ -47,7 +57,7 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(elm_button1, efl_gfx_position_set(150, 201));
    eo_do(elm_button1, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
elm_button1_clicked, NULL));
    eo_do(elm_win1, efl_gfx_visible_set(EINA_TRUE));
-
+   eo_do(elm_win1, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
@@ -66,9 +76,9 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(elm_win2, elm_obj_win_title_set("elm_win2"));
    eo_do(elm_win2, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(elm_win2, efl_gfx_size_set(150, 100));
-   elm_win2_main_menu = eo_add(ELM_MENU_CLASS, elm_win2);
+   eo_do(elm_win2, elm_win2_main_menu = elm_obj_win_main_menu_get());
    eo_do(elm_win2, efl_gfx_visible_set(EINA_TRUE));
-
+   eo_do(elm_win2, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }
diff --git a/src/tests/data/test_widgets_modify_cb.c.ref 
b/src/tests/data/test_widgets_modify_cb.c.ref
index b25a8a2..e65770a 100644
--- a/src/tests/data/test_widgets_modify_cb.c.ref
+++ b/src/tests/data/test_widgets_modify_cb.c.ref
@@ -24,6 +24,13 @@ elm_button1_clicked(void *data EINA_UNUSED, Eo *obj 
EINA_UNUSED, const Eo_Event_
    return EINA_TRUE;
 }
 
+static Eina_Bool
+_pubs_free_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description 
*desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   free(data);
+   return EINA_TRUE;
+}
+
 Demo_Elm_Win1_Widgets *
 demo_elm_win1_create(Eo *__main_parent)
 {
@@ -39,7 +46,7 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(elm_win1, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(elm_win1, efl_gfx_size_set(383, 442));
    eo_do(elm_win1, elm_obj_win_autodel_set(EINA_TRUE));
-   elm_win1_main_menu = eo_add(ELM_MENU_CLASS, elm_win1);
+   eo_do(elm_win1, elm_win1_main_menu = elm_obj_win_main_menu_get());
    elm_button1 = eo_add(ELM_BUTTON_CLASS, elm_win1);
    eo_do(elm_button1, evas_obj_size_hint_weight_set(1.000000, 1.000000));
    eo_do(elm_button1, efl_gfx_visible_set(EINA_TRUE));
@@ -48,7 +55,7 @@ elm_obj_win_type_set(ELM_WIN_BASIC));
    eo_do(elm_button1, efl_gfx_position_set(150, 201));
    eo_do(elm_button1, 
eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, 
elm_button1_clicked, NULL));
    eo_do(elm_win1, efl_gfx_visible_set(EINA_TRUE));
-
+   eo_do(elm_win1, eo_event_callback_add(EO_BASE_EVENT_DEL, _pubs_free_cb, 
pub_widgets));
 
    return pub_widgets;
 }

-- 


Reply via email to