summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJackDanielZ <daniel.zaoui@yahoo.com>2014-09-24 00:13:15 +0300
committerYakov Goldberg <yakov.g@samsung.com>2014-10-02 15:26:39 +0300
commitc929b67423d27cdd4eed0a32db0286163a06b234 (patch)
tree090320c80845a897a90adbaacf1d906c7960b92c
parent2680924fa59e6d797194239d1e1ff8a9b9082b3b (diff)
Main Widgets: modify access to public widgets
-rw-r--r--src/bin/egui_gui/editor.c66
-rw-r--r--src/bin/egui_gui/egui_logic.c302
-rw-r--r--src/bin/egui_gui/propview.c96
-rw-r--r--src/bin/egui_gui/rmview.c130
-rw-r--r--src/bin/egui_gui/settings_view.c38
5 files changed, 316 insertions, 316 deletions
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 275d38b..8d42fd3 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -19,7 +19,7 @@
19#define WIN_INFO "win_info_key" 19#define WIN_INFO "win_info_key"
20 20
21static Gui_Context *_active_ctx = NULL; 21static Gui_Context *_active_ctx = NULL;
22static const GUI *g; 22static const Egui_Layout_Widgets *g;
23 23
24void 24void
25_active_context_set(Gui_Context *ctx) 25_active_context_set(Gui_Context *ctx)
@@ -164,7 +164,7 @@ _marker_mouse_out(void *data, Eo *obj, const Eo_Event_Description *desc, void *e
164 eo_do(base_obj, eo_key_data_set(STR(id), line, NULL));\ 164 eo_do(base_obj, eo_key_data_set(STR(id), line, NULL));\
165 eo_do(line, evas_obj_color_set(0, 255, 0, 255));\ 165 eo_do(line, evas_obj_color_set(0, 255, 0, 255));\
166 if (base_obj == canvas_get())\ 166 if (base_obj == canvas_get())\
167 eo_do(evas_object_smart_parent_get(g->main_box), evas_obj_smart_member_add(line)); \ 167 eo_do(evas_object_smart_parent_get(g->main_win->main_box), evas_obj_smart_member_add(line)); \
168 }\ 168 }\
169 eo_do(line, evas_obj_visibility_set(visibility));\ 169 eo_do(line, evas_obj_visibility_set(visibility));\
170 eo_do(line, evas_obj_position_set(x, y));\ 170 eo_do(line, evas_obj_position_set(x, y));\
@@ -187,7 +187,7 @@ _marker_mouse_out(void *data, Eo *obj, const Eo_Event_Description *desc, void *e
187 eo_do(_m, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_IN, _marker_mouse_in, (void *) (intptr_t) id)); \ 187 eo_do(_m, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_IN, _marker_mouse_in, (void *) (intptr_t) id)); \
188 eo_do(_m, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_OUT, _marker_mouse_out, (void *) (intptr_t) id)); \ 188 eo_do(_m, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_OUT, _marker_mouse_out, (void *) (intptr_t) id)); \
189 if (base_obj == canvas_get())\ 189 if (base_obj == canvas_get())\
190 eo_do(evas_object_smart_parent_get(g->main_box), evas_obj_smart_member_add(_m)); \ 190 eo_do(evas_object_smart_parent_get(g->main_win->main_box), evas_obj_smart_member_add(_m)); \
191 }\ 191 }\
192 eo_do(_m, evas_obj_position_set(x, y)); \ 192 eo_do(_m, evas_obj_position_set(x, y)); \
193 eo_do(_m, evas_obj_raise());\ 193 eo_do(_m, evas_obj_raise());\
@@ -1024,7 +1024,7 @@ _widget_add(Gui_Session *session, const Gui_Widget *wdg, void *data)
1024 /* This frame does not have any smart as parent. So in order to show menu above the frame, 1024 /* This frame does not have any smart as parent. So in order to show menu above the frame,
1025 * we add this frame as a member of smart object. */ 1025 * we add this frame as a member of smart object. */
1026 1026
1027 Eo *smart_parent = evas_object_smart_parent_get(g->main_box); 1027 Eo *smart_parent = evas_object_smart_parent_get(g->main_win->main_box);
1028 eo_do(smart_parent, evas_obj_smart_member_add(fr)); 1028 eo_do(smart_parent, evas_obj_smart_member_add(fr));
1029 eo_do(smart_parent, evas_obj_position_get(&x_par, &y_par)); 1029 eo_do(smart_parent, evas_obj_position_get(&x_par, &y_par));
1030 1030
@@ -1309,8 +1309,8 @@ _editor_undo(const Gui_Context *ctx)
1309 1309
1310 gui_context_memento_prev((Gui_Context *) ctx); 1310 gui_context_memento_prev((Gui_Context *) ctx);
1311 1311
1312 elm_object_item_disabled_set(g->toolbar_redo_it, gui_context_can_redo(ctx) ? EINA_FALSE : EINA_TRUE); 1312 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, gui_context_can_redo(ctx) ? EINA_FALSE : EINA_TRUE);
1313 elm_object_item_disabled_set(g->toolbar_undo_it, gui_context_can_undo(ctx) ? EINA_FALSE : EINA_TRUE); 1313 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, gui_context_can_undo(ctx) ? EINA_FALSE : EINA_TRUE);
1314 1314
1315 return EINA_TRUE; 1315 return EINA_TRUE;
1316} 1316}
@@ -1479,8 +1479,8 @@ _editor_redo(const Gui_Context *ctx)
1479 ERR("case - default"); 1479 ERR("case - default");
1480 } 1480 }
1481 1481
1482 elm_object_item_disabled_set(g->toolbar_redo_it, gui_context_can_redo(ctx) ? EINA_FALSE : EINA_TRUE); 1482 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, gui_context_can_redo(ctx) ? EINA_FALSE : EINA_TRUE);
1483 elm_object_item_disabled_set(g->toolbar_undo_it, gui_context_can_undo(ctx) ? EINA_FALSE : EINA_TRUE); 1483 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, gui_context_can_undo(ctx) ? EINA_FALSE : EINA_TRUE);
1484 1484
1485 return EINA_TRUE; 1485 return EINA_TRUE;
1486} 1486}
@@ -1534,8 +1534,8 @@ _editor_selected_wdg_del_cb()
1534 memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_WIDGET, (void *) (intptr_t) EINA_TRUE, (void *) (intptr_t) EINA_FALSE); 1534 memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_WIDGET, (void *) (intptr_t) EINA_TRUE, (void *) (intptr_t) EINA_FALSE);
1535 gui_context_memento_add((Gui_Context *) ctx, memento); 1535 gui_context_memento_add((Gui_Context *) ctx, memento);
1536 1536
1537 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 1537 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
1538 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 1538 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
1539 1539
1540 /* if parent_wdg is not NULL, it's not window, so it has parent. 1540 /* if parent_wdg is not NULL, it's not window, so it has parent.
1541 * if parent wdg is NULL, wdg is window, so just delete it. */ 1541 * if parent wdg is NULL, wdg is window, so just delete it. */
@@ -1590,8 +1590,8 @@ _editor_factory_wdg_create(const char *class_name)
1590 memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_WIDGET, (void *) (intptr_t) EINA_FALSE, (void *) (intptr_t) EINA_TRUE); 1590 memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_WIDGET, (void *) (intptr_t) EINA_FALSE, (void *) (intptr_t) EINA_TRUE);
1591 gui_context_memento_add((Gui_Context *) ctx, memento); 1591 gui_context_memento_add((Gui_Context *) ctx, memento);
1592 1592
1593 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 1593 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
1594 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 1594 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
1595 1595
1596 /*Add default visibility property*/ 1596 /*Add default visibility property*/
1597 Gui_Widget_Property *prop; 1597 Gui_Widget_Property *prop;
@@ -1903,8 +1903,8 @@ _prop_update_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Descr
1903 /* Save new prop in item. */ 1903 /* Save new prop in item. */
1904 pfd->it_data->prop = prop; 1904 pfd->it_data->prop = prop;
1905 1905
1906 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 1906 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
1907 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 1907 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
1908 1908
1909 /* Validate property and call for eo_func of current prop, 1909 /* Validate property and call for eo_func of current prop,
1910 * in order to update layout. */ 1910 * in order to update layout. */
@@ -1998,8 +1998,8 @@ _drop_property_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
1998 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_PROPERTY, prop, NULL); 1998 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_PROPERTY, prop, NULL);
1999 gui_context_memento_add(ctx, memento); 1999 gui_context_memento_add(ctx, memento);
2000 2000
2001 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 2001 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
2002 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 2002 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
2003 2003
2004 wdg_prop_remove((Gui_Widget *) wdg, (Gui_Widget_Property *) prop); 2004 wdg_prop_remove((Gui_Widget *) wdg, (Gui_Widget_Property *) prop);
2005 _wdg_parent_win_reload(wdg); 2005 _wdg_parent_win_reload(wdg);
@@ -2019,7 +2019,7 @@ _prop_ctx_menu_cb_func(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Descripti
2019 Elm_Object_Item *it = NULL; 2019 Elm_Object_Item *it = NULL;
2020 eo_do(obj, it_data = eo_key_data_get(_STR_EDITOR)); 2020 eo_do(obj, it_data = eo_key_data_get(_STR_EDITOR));
2021 2021
2022 Eo *ctxpopup = elm_ctxpopup_add(g->propsview_table); 2022 Eo *ctxpopup = elm_ctxpopup_add(g->main_win->propsview_table);
2023 evas_object_smart_callback_add(ctxpopup, "dismissed", _ctxpopup_dismissed, NULL); 2023 evas_object_smart_callback_add(ctxpopup, "dismissed", _ctxpopup_dismissed, NULL);
2024 it = elm_ctxpopup_item_append(ctxpopup, "Drop Property", NULL, _drop_property_cb, it_data); 2024 it = elm_ctxpopup_item_append(ctxpopup, "Drop Property", NULL, _drop_property_cb, it_data);
2025 /* If property not connected to widget, this is default property so can not be dropped. */ 2025 /* If property not connected to widget, this is default property so can not be dropped. */
@@ -2028,7 +2028,7 @@ _prop_ctx_menu_cb_func(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Descripti
2028 elm_object_item_disabled_set(it, EINA_TRUE); 2028 elm_object_item_disabled_set(it, EINA_TRUE);
2029 } 2029 }
2030 Evas_Coord x, y; 2030 Evas_Coord x, y;
2031 eo_do(evas_object_evas_get(g->main_win), evas_canvas_pointer_canvas_xy_get(&x, &y)); 2031 eo_do(evas_object_evas_get(g->main_win->main_win), evas_canvas_pointer_canvas_xy_get(&x, &y));
2032 eo_do(ctxpopup, evas_obj_size_hint_max_set(240, 240)); 2032 eo_do(ctxpopup, evas_obj_size_hint_max_set(240, 240));
2033 eo_do(ctxpopup, evas_obj_position_set(x, y)); 2033 eo_do(ctxpopup, evas_obj_position_set(x, y));
2034 eo_do(ctxpopup, evas_obj_visibility_set(EINA_TRUE)); 2034 eo_do(ctxpopup, evas_obj_visibility_set(EINA_TRUE));
@@ -2058,8 +2058,8 @@ _item_public_update_cb(void *data, Eo *obj, const Eo_Event_Description *desc EIN
2058 2058
2059 dep_data_item_set(dep_data, new_item); 2059 dep_data_item_set(dep_data, new_item);
2060 2060
2061 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 2061 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
2062 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 2062 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
2063 return EO_CALLBACK_CONTINUE; 2063 return EO_CALLBACK_CONTINUE;
2064} 2064}
2065 2065
@@ -2100,8 +2100,8 @@ _field_update_from_itemview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Desc
2100 /* Change item in Dep_Data*/ 2100 /* Change item in Dep_Data*/
2101 dep_data_item_set(dep_data, new_wit); 2101 dep_data_item_set(dep_data, new_wit);
2102 2102
2103 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 2103 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
2104 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 2104 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
2105 2105
2106 /* Get value which need to be changed.*/ 2106 /* Get value which need to be changed.*/
2107 val = prop_value_nth_get(new_prop, idx); 2107 val = prop_value_nth_get(new_prop, idx);
@@ -2279,8 +2279,8 @@ _itemview_item_do_(unsigned int type)
2279 item_container_item_dep_id_get(it)); 2279 item_container_item_dep_id_get(it));
2280 } 2280 }
2281 2281
2282 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 2282 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
2283 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 2283 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
2284 2284
2285 _wdg_parent_win_reload(wdg); 2285 _wdg_parent_win_reload(wdg);
2286 propview_build(NULL); 2286 propview_build(NULL);
@@ -2325,8 +2325,8 @@ _content_del_from_propview(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descr
2325 wdg_obj_container_unset((Gui_Widget *) wdg); 2325 wdg_obj_container_unset((Gui_Widget *) wdg);
2326 wdg_obj_container_set((Gui_Widget *) wdg, _new_container); 2326 wdg_obj_container_set((Gui_Widget *) wdg, _new_container);
2327 2327
2328 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 2328 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
2329 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 2329 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
2330 2330
2331 /* Delete content from container data. */ 2331 /* Delete content from container data. */
2332 wdg_obj_container_item_remove(wdg, ci); 2332 wdg_obj_container_item_remove(wdg, ci);
@@ -2364,8 +2364,8 @@ _content_reorder_from_propview(void *data, Eo *obj EINA_UNUSED, const Eo_Event_D
2364 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container); 2364 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container);
2365 gui_context_memento_add(_active_context_get(), memento); 2365 gui_context_memento_add(_active_context_get(), memento);
2366 2366
2367 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 2367 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
2368 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 2368 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
2369 2369
2370 /* Reload all the win when content reordered */ 2370 /* Reload all the win when content reordered */
2371 _wdg_parent_win_reload(wdg); 2371 _wdg_parent_win_reload(wdg);
@@ -2586,8 +2586,8 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_De
2586 } 2586 }
2587 } 2587 }
2588 2588
2589 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 2589 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
2590 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 2590 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
2591 2591
2592 return EO_CALLBACK_CONTINUE; 2592 return EO_CALLBACK_CONTINUE;
2593} 2593}
@@ -2778,10 +2778,10 @@ editor_init(GuiLogicCbs *_guilogic_cbs)
2778 _guilogic_cbs->_project_close = _project_close; 2778 _guilogic_cbs->_project_close = _project_close;
2779 _guilogic_cbs->_project_new = _project_new; 2779 _guilogic_cbs->_project_new = _project_new;
2780 2780
2781 objtree_list_set(g->objtree_list); 2781 objtree_list_set(g->main_win->objtree_list);
2782 propview_init(); 2782 propview_init();
2783 seqview_init(g->seq_list); 2783 seqview_init(g->main_win->seq_list);
2784 itemview_init(g->itemview_list); 2784 itemview_init(g->main_win->itemview_list);
2785 target_db_init(); 2785 target_db_init();
2786 ecore_idle_enterer_add(_wdg_border_draw_on_idle, NULL); 2786 ecore_idle_enterer_add(_wdg_border_draw_on_idle, NULL);
2787} 2787}
diff --git a/src/bin/egui_gui/egui_logic.c b/src/bin/egui_gui/egui_logic.c
index fa4f4f0..c65f24a 100644
--- a/src/bin/egui_gui/egui_logic.c
+++ b/src/bin/egui_gui/egui_logic.c
@@ -21,7 +21,7 @@
21/*FIXME: remove this include */ 21/*FIXME: remove this include */
22#include "objtree.h" 22#include "objtree.h"
23 23
24static const GUI *g; 24static const Egui_Layout_Widgets *g;
25 25
26static GuiLogicCbs *_guilogic_cbs = NULL; 26static GuiLogicCbs *_guilogic_cbs = NULL;
27 27
@@ -63,7 +63,7 @@ enum
63const Eo * 63const Eo *
64canvas_get() 64canvas_get()
65{ 65{
66 return g->main_win; 66 return g->main_win->main_win;
67} 67}
68 68
69static void 69static void
@@ -116,7 +116,7 @@ _canvas_name_update(const Gui_Context *ctx)
116 if (!project_name) project_name = "untitled"; 116 if (!project_name) project_name = "untitled";
117 sprintf(name, "Erigo - %s", project_name); 117 sprintf(name, "Erigo - %s", project_name);
118 } 118 }
119 eo_do(g->main_win, elm_obj_win_title_set(name)); 119 eo_do(g->main_win->main_win, elm_obj_win_title_set(name));
120} 120}
121 121
122static void 122static void
@@ -181,7 +181,7 @@ _on_fs_done(void *data, Evas_Object *obj EINA_UNUSED, void *event)
181 _menu_item_disabled_set(project_menu, ITEM_SAVE, EINA_FALSE); 181 _menu_item_disabled_set(project_menu, ITEM_SAVE, EINA_FALSE);
182 _menu_item_disabled_set(project_menu, ITEM_SAVEAS, EINA_FALSE); 182 _menu_item_disabled_set(project_menu, ITEM_SAVEAS, EINA_FALSE);
183 _menu_item_disabled_set(project_menu, ITEM_EXPORT, EINA_FALSE); 183 _menu_item_disabled_set(project_menu, ITEM_EXPORT, EINA_FALSE);
184 const char *project_name = eo_do(g->fs_project_name_entry, elm_obj_widget_part_text_get(NULL)); 184 const char *project_name = eo_do(g->fs_win->fs_project_name_entry, elm_obj_widget_part_text_get(NULL));
185 if (!strlen(project_name)) project_name = "New Project"; 185 if (!strlen(project_name)) project_name = "New Project";
186 186
187 char *default_filename = strdup(project_name), *p; 187 char *default_filename = strdup(project_name), *p;
@@ -225,7 +225,7 @@ _on_fs_done(void *data, Evas_Object *obj EINA_UNUSED, void *event)
225 gui_context_export_filename_set((Gui_Context *) ctx, filename); 225 gui_context_export_filename_set((Gui_Context *) ctx, filename);
226 gui_context_export_path_set((Gui_Context *) ctx, (const char *) parent_dir); 226 gui_context_export_path_set((Gui_Context *) ctx, (const char *) parent_dir);
227 int state = -1; 227 int state = -1;
228 eo_do(g->fs_radio_c, state = elm_obj_radio_value_get()); 228 eo_do(g->fs_win->fs_radio_c, state = elm_obj_radio_value_get());
229 switch (state) 229 switch (state)
230 { 230 {
231 case 0: 231 case 0:
@@ -259,7 +259,7 @@ _on_fs_done(void *data, Evas_Object *obj EINA_UNUSED, void *event)
259 free(parent_dir); 259 free(parent_dir);
260 260
261end: 261end:
262 eo_del(g->fs_win); 262 eo_del(g->fs_win->fs_win);
263} 263}
264 264
265static void 265static void
@@ -270,28 +270,28 @@ _fs_mode_open(int fs_mode)
270 270
271 egui_layout_fs_win_show(NULL, NULL, NULL, NULL); 271 egui_layout_fs_win_show(NULL, NULL, NULL, NULL);
272 272
273 eo_do(g->fileselector, elm_interface_fileselector_folder_only_set(EINA_FALSE)); 273 eo_do(g->fs_win->fileselector, elm_interface_fileselector_folder_only_set(EINA_FALSE));
274 eo_do(g->fileselector, elm_interface_fileselector_is_save_set(EINA_FALSE)); 274 eo_do(g->fs_win->fileselector, elm_interface_fileselector_is_save_set(EINA_FALSE));
275 switch (fs_mode) 275 switch (fs_mode)
276 { 276 {
277 case ITEM_EXPORT: 277 case ITEM_EXPORT:
278 { 278 {
279 eo_do(g->fs_radio_box, evas_obj_visibility_set(EINA_TRUE)); 279 eo_do(g->fs_win->fs_radio_box, evas_obj_visibility_set(EINA_TRUE));
280 eo_do(g->fileselector, elm_interface_fileselector_is_save_set(EINA_TRUE)); 280 eo_do(g->fs_win->fileselector, elm_interface_fileselector_is_save_set(EINA_TRUE));
281 fs_path = gui_context_export_path_get(ctx); 281 fs_path = gui_context_export_path_get(ctx);
282 fs_file = gui_context_export_filename_get(ctx); 282 fs_file = gui_context_export_filename_get(ctx);
283 break; 283 break;
284 } 284 }
285 case ITEM_NEW: 285 case ITEM_NEW:
286 { 286 {
287 eo_do(g->fs_project_name_box, evas_obj_visibility_set(EINA_TRUE)); 287 eo_do(g->fs_win->fs_project_name_box, evas_obj_visibility_set(EINA_TRUE));
288 eo_do(g->fileselector, elm_interface_fileselector_is_save_set(EINA_TRUE)); 288 eo_do(g->fs_win->fileselector, elm_interface_fileselector_is_save_set(EINA_TRUE));
289 eo_do(g->fileselector, elm_interface_fileselector_folder_only_set(EINA_TRUE)); 289 eo_do(g->fs_win->fileselector, elm_interface_fileselector_folder_only_set(EINA_TRUE));
290 break; 290 break;
291 } 291 }
292 case ITEM_SAVEAS: 292 case ITEM_SAVEAS:
293 { 293 {
294 eo_do(g->fileselector, elm_interface_fileselector_is_save_set(EINA_TRUE)); 294 eo_do(g->fs_win->fileselector, elm_interface_fileselector_is_save_set(EINA_TRUE));
295 fs_file = gui_context_project_filename_get(ctx); 295 fs_file = gui_context_project_filename_get(ctx);
296 fs_path = gui_context_project_path_get(ctx); 296 fs_path = gui_context_project_path_get(ctx);
297 break; 297 break;
@@ -317,7 +317,7 @@ _fs_mode_open(int fs_mode)
317 317
318 if (ecore_file_exists(full_path)) 318 if (ecore_file_exists(full_path))
319 { 319 {
320 eo_do(g->fileselector, elm_interface_fileselector_selected_set(full_path)); 320 eo_do(g->fs_win->fileselector, elm_interface_fileselector_selected_set(full_path));
321 } 321 }
322 else 322 else
323 { 323 {
@@ -330,7 +330,7 @@ _fs_mode_open(int fs_mode)
330 if (ecore_file_exists(full_path2)) 330 if (ecore_file_exists(full_path2))
331 { 331 {
332 ecore_file_cp(full_path2, full_path); 332 ecore_file_cp(full_path2, full_path);
333 Eina_Bool res = eo_do(g->fileselector, elm_interface_fileselector_selected_set(full_path)); 333 Eina_Bool res = eo_do(g->fs_win->fileselector, elm_interface_fileselector_selected_set(full_path));
334 if (res) 334 if (res)
335 ecore_file_remove(full_path); 335 ecore_file_remove(full_path);
336 } 336 }
@@ -339,9 +339,9 @@ _fs_mode_open(int fs_mode)
339 } 339 }
340 else 340 else
341 { 341 {
342 eo_do(g->fileselector, elm_interface_fileselector_path_set(fs_path)); 342 eo_do(g->fs_win->fileselector, elm_interface_fileselector_path_set(fs_path));
343 } 343 }
344 evas_object_smart_callback_add(g->fileselector, "done", _on_fs_done, (void *)(intptr_t) fs_mode); 344 evas_object_smart_callback_add(g->fs_win->fileselector, "done", _on_fs_done, (void *)(intptr_t) fs_mode);
345} 345}
346 346
347#if 0 347#if 0
@@ -544,7 +544,7 @@ _sub_wins_hide_show_cb(void *data, Evas_Object *_obj EINA_UNUSED, void *event_in
544 switch (action) 544 switch (action)
545 { 545 {
546 case FACTORY_VIEW: 546 case FACTORY_VIEW:
547 obj = g->fctr_table; 547 obj = g->main_win->fctr_table;
548 break; 548 break;
549 case FACTORY_VIEW_SWITCH: 549 case FACTORY_VIEW_SWITCH:
550 { 550 {
@@ -553,13 +553,13 @@ _sub_wins_hide_show_cb(void *data, Evas_Object *_obj EINA_UNUSED, void *event_in
553 break; 553 break;
554 } 554 }
555 case SEQUENCE_VIEW: 555 case SEQUENCE_VIEW:
556 obj = g->sequences_box; 556 obj = g->main_win->sequences_box;
557 break; 557 break;
558 case OBJTREE_VIEW: 558 case OBJTREE_VIEW:
559 obj = g->objtree_table; 559 obj = g->main_win->objtree_table;
560 break; 560 break;
561 case PROPERTIES_VIEW: 561 case PROPERTIES_VIEW:
562 obj = g->propsview_table; 562 obj = g->main_win->propsview_table;
563 break; 563 break;
564 default: 564 default:
565 return; 565 return;
@@ -579,10 +579,10 @@ _sub_wins_hide_show_cb(void *data, Evas_Object *_obj EINA_UNUSED, void *event_in
579 //eo_do(g->left_panel_box, elm_obj_box_pack_end(obj)); 579 //eo_do(g->left_panel_box, elm_obj_box_pack_end(obj));
580 break; 580 break;
581 case OBJTREE_VIEW: 581 case OBJTREE_VIEW:
582 eo_do(g->right_panel_box, elm_obj_box_pack_start(obj)); 582 eo_do(g->main_win->right_panel_box, elm_obj_box_pack_start(obj));
583 break; 583 break;
584 case PROPERTIES_VIEW: 584 case PROPERTIES_VIEW:
585 eo_do(g->right_panel_box, elm_obj_box_pack_end(obj)); 585 eo_do(g->main_win->right_panel_box, elm_obj_box_pack_end(obj));
586 break; 586 break;
587 default: 587 default:
588 break; 588 break;
@@ -598,7 +598,7 @@ _sub_wins_hide_show_cb(void *data, Evas_Object *_obj EINA_UNUSED, void *event_in
598 break; 598 break;
599 case OBJTREE_VIEW: 599 case OBJTREE_VIEW:
600 case PROPERTIES_VIEW: 600 case PROPERTIES_VIEW:
601 eo_do(g->right_panel_box, elm_obj_box_unpack(obj)); 601 eo_do(g->main_win->right_panel_box, elm_obj_box_unpack(obj));
602 break; 602 break;
603 default: 603 default:
604 break; 604 break;
@@ -717,7 +717,7 @@ _graphview_generate(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_
717Eina_Bool 717Eina_Bool
718_gvc_win_show_post_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 718_gvc_win_show_post_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
719{ 719{
720 eo_do(g->gvc_img, efl_file_set("/tmp/truc.png", NULL)); 720 eo_do(g->gvc_win->gvc_img, efl_file_set("/tmp/truc.png", NULL));
721 return EO_CALLBACK_CONTINUE; 721 return EO_CALLBACK_CONTINUE;
722} 722}
723#else 723#else
@@ -774,7 +774,7 @@ _toolbar_simulate_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
774 session = simulator_ctx_call(_active_context_get(), target_name_get(td)); 774 session = simulator_ctx_call(_active_context_get(), target_name_get(td));
775 if (session) 775 if (session)
776 { 776 {
777 Eo *menu = elm_toolbar_item_menu_get(g->toolbar_simulate_it); 777 Eo *menu = elm_toolbar_item_menu_get(g->main_win->toolbar_simulate_it);
778 Elm_Object_Item *it = elm_menu_item_add(menu, NULL, NULL, target_name_get(td), NULL, NULL); 778 Elm_Object_Item *it = elm_menu_item_add(menu, NULL, NULL, target_name_get(td), NULL, NULL);
779 elm_menu_item_add(menu, it, NULL, "Kill", _toolbar_session_kill_cb, session); 779 elm_menu_item_add(menu, it, NULL, "Kill", _toolbar_session_kill_cb, session);
780 session_population_zero_cb_set(session, _population_zero_cb, it); 780 session_population_zero_cb_set(session, _population_zero_cb, it);
@@ -803,84 +803,84 @@ _factory_item_finalize(Eo *item_box, char *image_name, char *egui_class_name)
803static void 803static void
804_factory_vertical_pack(Eina_Bool vertical_pack) 804_factory_vertical_pack(Eina_Bool vertical_pack)
805{ 805{
806 elm_table_clear(g->fctr_table, EINA_FALSE); 806 elm_table_clear(g->main_win->fctr_table, EINA_FALSE);
807 if (vertical_pack) 807 if (vertical_pack)
808 { 808 {
809 //elm_table_homogeneous_set(g->fctr_table, EINA_TRUE); 809 //elm_table_homogeneous_set(g->main_win->fctr_table, EINA_TRUE);
810 evas_object_size_hint_align_set(g->fctr_table, 0.1, -1); 810 evas_object_size_hint_align_set(g->main_win->fctr_table, 0.1, -1);
811 elm_table_padding_set(g->fctr_table, 6, 7); 811 elm_table_padding_set(g->main_win->fctr_table, 6, 7);
812 812
813 elm_table_pack(g->fctr_table, g->fctr_win_it, 0, 0, 1, 1); 813 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_win_it, 0, 0, 1, 1);
814 elm_table_pack(g->fctr_table, g->fctr_bg_it, 0, 1, 1, 1); 814 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_bg_it, 0, 1, 1, 1);
815 elm_table_pack(g->fctr_table, g->fctr_box_it, 0, 2, 1, 1); 815 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_box_it, 0, 2, 1, 1);
816 816
817 elm_table_pack(g->fctr_table, g->fctr_button_it, 0, 3, 1, 1); 817 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_button_it, 0, 3, 1, 1);
818 elm_table_pack(g->fctr_table, g->fctr_label_it, 0, 4, 1, 1); 818 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_label_it, 0, 4, 1, 1);
819 elm_table_pack(g->fctr_table, g->fctr_check_it, 0, 5, 1, 1); 819 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_check_it, 0, 5, 1, 1);
820 820
821 elm_table_pack(g->fctr_table, g->fctr_radio_it, 0, 6, 1, 1); 821 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_radio_it, 0, 6, 1, 1);
822 822
823 elm_table_pack(g->fctr_table, g->fctr_icon_it, 0, 7, 1, 1); 823 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_icon_it, 0, 7, 1, 1);
824 elm_table_pack(g->fctr_table, g->fctr_image_it, 0, 8, 1, 1); 824 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_image_it, 0, 8, 1, 1);
825 elm_table_pack(g->fctr_table, g->fctr_actionslider_it, 0, 9, 1, 1); 825 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_actionslider_it, 0, 9, 1, 1);
826 826
827 elm_table_pack(g->fctr_table, g->fctr_clock_it, 0, 10, 1, 1); 827 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_clock_it, 0, 10, 1, 1);
828 elm_table_pack(g->fctr_table, g->fctr_dayselector_it, 0, 11, 1, 1); 828 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_dayselector_it, 0, 11, 1, 1);
829 elm_table_pack(g->fctr_table, g->fctr_calendar_it, 0, 12, 1, 1); 829 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_calendar_it, 0, 12, 1, 1);
830 830
831 elm_table_pack(g->fctr_table, g->fctr_bubble_it, 0, 13, 1, 1); 831 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_bubble_it, 0, 13, 1, 1);
832 elm_table_pack(g->fctr_table, g->fctr_colorselector_it, 0, 14, 1, 1); 832 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_colorselector_it, 0, 14, 1, 1);
833 elm_table_pack(g->fctr_table, g->fctr_entry_it, 0, 15, 1, 1); 833 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_entry_it, 0, 15, 1, 1);
834 834
835 elm_table_pack(g->fctr_table, g->fctr_flip_it, 0, 16, 1, 1); 835 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_flip_it, 0, 16, 1, 1);
836 elm_table_pack(g->fctr_table, g->fctr_genlist_it, 0, 17, 1, 1); 836 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_genlist_it, 0, 17, 1, 1);
837 elm_table_pack(g->fctr_table, g->fctr_gengrid_it, 0, 18, 1, 1); 837 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_gengrid_it, 0, 18, 1, 1);
838 838
839 elm_table_pack(g->fctr_table, g->fctr_table_it, 0, 19, 1, 1); 839 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_table_it, 0, 19, 1, 1);
840 elm_table_pack(g->fctr_table, g->fctr_menu_it, 0, 20, 1, 1); 840 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_menu_it, 0, 20, 1, 1);
841 elm_table_pack(g->fctr_table, g->fctr_diskselector_it, 0, 21, 1, 1); 841 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_diskselector_it, 0, 21, 1, 1);
842 842
843 elm_table_pack(g->fctr_table, g->fctr_ctxpopup_it, 0, 22, 1, 1); 843 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_ctxpopup_it, 0, 22, 1, 1);
844 elm_table_pack(g->fctr_table, g->fctr_toolbar_it, 0, 23, 1, 1); 844 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_toolbar_it, 0, 23, 1, 1);
845 elm_table_pack(g->fctr_table, g->fctr_layout_it, 0, 24, 1, 1); 845 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_layout_it, 0, 24, 1, 1);
846 } 846 }
847 else 847 else
848 { 848 {
849 elm_table_padding_set(g->fctr_table, 2, 2); 849 elm_table_padding_set(g->main_win->fctr_table, 2, 2);
850 850
851 elm_table_pack(g->fctr_table, g->fctr_win_it, 0, 0, 1, 1); 851 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_win_it, 0, 0, 1, 1);
852 elm_table_pack(g->fctr_table, g->fctr_bg_it, 1, 0, 1, 1); 852 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_bg_it, 1, 0, 1, 1);
853 elm_table_pack(g->fctr_table, g->fctr_box_it, 2, 0, 1, 1); 853 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_box_it, 2, 0, 1, 1);
854 854
855 elm_table_pack(g->fctr_table, g->fctr_button_it, 0, 1, 1, 1); 855 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_button_it, 0, 1, 1, 1);
856 elm_table_pack(g->fctr_table, g->fctr_label_it, 1, 1, 1, 1); 856 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_label_it, 1, 1, 1, 1);
857 elm_table_pack(g->fctr_table, g->fctr_check_it, 2, 1, 1, 1); 857 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_check_it, 2, 1, 1, 1);
858 858
859 elm_table_pack(g->fctr_table, g->fctr_radio_it, 0, 2, 1, 1); 859 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_radio_it, 0, 2, 1, 1);
860 elm_table_pack(g->fctr_table, g->fctr_icon_it, 1, 2, 1, 1); 860 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_icon_it, 1, 2, 1, 1);
861 elm_table_pack(g->fctr_table, g->fctr_image_it, 2, 2, 1, 1); 861 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_image_it, 2, 2, 1, 1);
862 862
863 elm_table_pack(g->fctr_table, g->fctr_actionslider_it, 0, 3, 1, 1); 863 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_actionslider_it, 0, 3, 1, 1);
864 elm_table_pack(g->fctr_table, g->fctr_clock_it, 1, 3, 1, 1); 864 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_clock_it, 1, 3, 1, 1);
865 elm_table_pack(g->fctr_table, g->fctr_dayselector_it, 2, 3, 1, 1); 865 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_dayselector_it, 2, 3, 1, 1);
866 866
867 elm_table_pack(g->fctr_table, g->fctr_calendar_it, 0, 4, 1, 1); 867 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_calendar_it, 0, 4, 1, 1);
868 elm_table_pack(g->fctr_table, g->fctr_bubble_it, 1, 4, 1, 1); 868 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_bubble_it, 1, 4, 1, 1);
869 elm_table_pack(g->fctr_table, g->fctr_colorselector_it, 2, 4, 1, 1); 869 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_colorselector_it, 2, 4, 1, 1);
870 870
871 elm_table_pack(g->fctr_table, g->fctr_entry_it, 0, 5, 1, 1); 871 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_entry_it, 0, 5, 1, 1);
872 elm_table_pack(g->fctr_table, g->fctr_flip_it, 1, 5, 1, 1); 872 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_flip_it, 1, 5, 1, 1);
873 elm_table_pack(g->fctr_table, g->fctr_genlist_it, 2, 5, 1, 1); 873 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_genlist_it, 2, 5, 1, 1);
874 874
875 elm_table_pack(g->fctr_table, g->fctr_gengrid_it, 0, 6, 1, 1); 875 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_gengrid_it, 0, 6, 1, 1);
876 elm_table_pack(g->fctr_table, g->fctr_table_it, 1, 6, 1, 1); 876 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_table_it, 1, 6, 1, 1);
877 elm_table_pack(g->fctr_table, g->fctr_menu_it, 2, 6, 1, 1); 877 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_menu_it, 2, 6, 1, 1);
878 878
879 elm_table_pack(g->fctr_table, g->fctr_diskselector_it, 0, 7, 1, 1); 879 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_diskselector_it, 0, 7, 1, 1);
880 elm_table_pack(g->fctr_table, g->fctr_ctxpopup_it, 1, 7, 1, 1); 880 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_ctxpopup_it, 1, 7, 1, 1);
881 elm_table_pack(g->fctr_table, g->fctr_toolbar_it, 2, 7, 1, 1); 881 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_toolbar_it, 2, 7, 1, 1);
882 882
883 elm_table_pack(g->fctr_table, g->fctr_layout_it, 0, 8, 1, 1); 883 elm_table_pack(g->main_win->fctr_table, g->main_win->fctr_layout_it, 0, 8, 1, 1);
884 } 884 }
885} 885}
886 886
@@ -903,20 +903,20 @@ _canvas_bg_show_on_idle(void *data EINA_UNUSED)
903{ 903{
904 Evas_Coord cv_x, cv_y, cv_w, cv_h, tmp; 904 Evas_Coord cv_x, cv_y, cv_w, cv_h, tmp;
905 905
906 eo_do(g->left_panes, evas_obj_size_get(&cv_x, NULL)); 906 eo_do(g->main_win->left_panes, evas_obj_size_get(&cv_x, NULL));
907 cv_x = (double)cv_x * elm_panes_content_left_size_get(g->left_panes); 907 cv_x = (double)cv_x * elm_panes_content_left_size_get(g->main_win->left_panes);
908 cv_x += 7; 908 cv_x += 7;
909 909
910 eo_do(g->right_panes, evas_obj_position_get(&cv_w, NULL)); 910 eo_do(g->main_win->right_panes, evas_obj_position_get(&cv_w, NULL));
911 eo_do(g->right_panes, evas_obj_size_get(&tmp, NULL)); 911 eo_do(g->main_win->right_panes, evas_obj_size_get(&tmp, NULL));
912 tmp = (double)tmp * elm_panes_content_left_size_get(g->right_panes); 912 tmp = (double)tmp * elm_panes_content_left_size_get(g->main_win->right_panes);
913 cv_w += tmp; 913 cv_w += tmp;
914 cv_w -= (cv_x + 7); 914 cv_w -= (cv_x + 7);
915 eo_do(g->toolbar, evas_obj_size_get(NULL, &cv_y)); 915 eo_do(g->main_win->toolbar, evas_obj_size_get(NULL, &cv_y));
916 eo_do(g->main_win, evas_obj_size_get(NULL, &cv_h)); 916 eo_do(g->main_win->main_win, evas_obj_size_get(NULL, &cv_h));
917 cv_h -= cv_y; 917 cv_h -= cv_y;
918 918
919 eo_do(g->canvas_bg, 919 eo_do(g->main_win->canvas_bg,
920 evas_obj_position_set(cv_x, cv_y), 920 evas_obj_position_set(cv_x, cv_y),
921 evas_obj_size_set(cv_w, cv_h)); 921 evas_obj_size_set(cv_w, cv_h));
922 return ECORE_CALLBACK_RENEW; 922 return ECORE_CALLBACK_RENEW;
@@ -928,36 +928,36 @@ egui_start()
928 g = get_gui(); 928 g = get_gui();
929 929
930 // Post-configuration 930 // Post-configuration
931 eo_do(g->main_win, elm_obj_win_maximized_set(EINA_TRUE)); 931 eo_do(g->main_win->main_win, elm_obj_win_maximized_set(EINA_TRUE));
932 eo_do(evas_object_smart_parent_get(g->main_box), evas_obj_smart_member_add(g->canvas_bg)); 932 eo_do(evas_object_smart_parent_get(g->main_win->main_box), evas_obj_smart_member_add(g->main_win->canvas_bg));
933 eo_do(g->canvas_bg, evas_obj_stack_below(g->main_box)); 933 eo_do(g->main_win->canvas_bg, evas_obj_stack_below(g->main_win->main_box));
934 934
935 //Eo *mmenu; 935 //Eo *mmenu;
936 //eo_do(g->main_win, elm_obj_win_main_menu_get(&mmenu)); 936 //eo_do(g->main_win->main_win, elm_obj_win_main_menu_get(&mmenu));
937 //eo_do(mmenu, elm_obj_menu_item_add(NULL, NULL, "OPEN", NULL, NULL, NULL)); 937 //eo_do(mmenu, elm_obj_menu_item_add(NULL, NULL, "OPEN", NULL, NULL, NULL));
938 938
939 Evas_Object *seq_rect = evas_object_rectangle_add(evas_object_evas_get(g->seq_table)); 939 Evas_Object *seq_rect = evas_object_rectangle_add(evas_object_evas_get(g->main_win->seq_table));
940 evas_object_size_hint_min_set(seq_rect, 200, 1); 940 evas_object_size_hint_min_set(seq_rect, 200, 1);
941 evas_object_size_hint_weight_set(seq_rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 941 evas_object_size_hint_weight_set(seq_rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
942 evas_object_size_hint_align_set(seq_rect, EVAS_HINT_FILL, EVAS_HINT_FILL); 942 evas_object_size_hint_align_set(seq_rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
943 elm_table_pack(g->seq_table, seq_rect, 0, 0, 1, 1); 943 elm_table_pack(g->main_win->seq_table, seq_rect, 0, 0, 1, 1);
944 944
945 Evas_Object *objtree_rect = evas_object_rectangle_add(evas_object_evas_get(g->objtree_table)); 945 Evas_Object *objtree_rect = evas_object_rectangle_add(evas_object_evas_get(g->main_win->objtree_table));
946 evas_object_size_hint_min_set(objtree_rect, 300, 100); 946 evas_object_size_hint_min_set(objtree_rect, 300, 100);
947 evas_object_size_hint_weight_set(objtree_rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 947 evas_object_size_hint_weight_set(objtree_rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
948 evas_object_size_hint_align_set(objtree_rect, EVAS_HINT_FILL, EVAS_HINT_FILL); 948 evas_object_size_hint_align_set(objtree_rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
949 elm_table_pack(g->objtree_table, objtree_rect, 0, 1, 1, 1); 949 elm_table_pack(g->main_win->objtree_table, objtree_rect, 0, 1, 1, 1);
950 950
951 Evas_Object *propsview_rect = evas_object_rectangle_add(evas_object_evas_get(g->propsview_table)); 951 Evas_Object *propsview_rect = evas_object_rectangle_add(evas_object_evas_get(g->main_win->propsview_table));
952 evas_object_size_hint_min_set(propsview_rect, 300, 100); 952 evas_object_size_hint_min_set(propsview_rect, 300, 100);
953 evas_object_size_hint_weight_set(propsview_rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 953 evas_object_size_hint_weight_set(propsview_rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
954 evas_object_size_hint_align_set(propsview_rect, EVAS_HINT_FILL, EVAS_HINT_FILL); 954 evas_object_size_hint_align_set(propsview_rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
955 elm_table_pack(g->propsview_table, propsview_rect, 0, 2, 1, 1); 955 elm_table_pack(g->main_win->propsview_table, propsview_rect, 0, 2, 1, 1);
956 956
957 editor_init(guilogic_cbs_get()); 957 editor_init(guilogic_cbs_get());
958 958
959 evas_object_smart_callback_add(g->objtree_filter_entry, "changed,user", _entry_changed_cb, NULL); 959 evas_object_smart_callback_add(g->main_win->objtree_filter_entry, "changed,user", _entry_changed_cb, NULL);
960 //elm_object_event_callback_add(g->main_win, _event, NULL); 960 //elm_object_event_callback_add(g->main_win->main_win, _event, NULL);
961 961
962 /*Adding resizing to canvas frame*/ 962 /*Adding resizing to canvas frame*/
963 /* 963 /*
@@ -968,11 +968,11 @@ egui_start()
968 _idle_enterer = ecore_idle_enterer_add(_canvas_bg_show_on_idle, NULL); 968 _idle_enterer = ecore_idle_enterer_add(_canvas_bg_show_on_idle, NULL);
969 /* Toolbar */ 969 /* Toolbar */
970 Eo *menu; 970 Eo *menu;
971 elm_toolbar_item_selected_set(g->toolbar_project_it, EINA_FALSE); 971 elm_toolbar_item_selected_set(g->main_win->toolbar_project_it, EINA_FALSE);
972 elm_toolbar_item_menu_set(g->toolbar_project_it, EINA_TRUE); 972 elm_toolbar_item_menu_set(g->main_win->toolbar_project_it, EINA_TRUE);
973 elm_toolbar_item_priority_set(g->toolbar_project_it, -9999); 973 elm_toolbar_item_priority_set(g->main_win->toolbar_project_it, -9999);
974 elm_toolbar_menu_parent_set(g->toolbar, g->main_win); 974 elm_toolbar_menu_parent_set(g->main_win->toolbar, g->main_win->main_win);
975 menu = elm_toolbar_item_menu_get(g->toolbar_project_it); 975 menu = elm_toolbar_item_menu_get(g->main_win->toolbar_project_it);
976 project_menu = menu; 976 project_menu = menu;
977 977
978 Elm_Object_Item *it; 978 Elm_Object_Item *it;
@@ -993,24 +993,24 @@ egui_start()
993 elm_object_item_data_set(it, (void *) ITEM_CLOSE); 993 elm_object_item_data_set(it, (void *) ITEM_CLOSE);
994 elm_object_item_disabled_set(it, EINA_TRUE); 994 elm_object_item_disabled_set(it, EINA_TRUE);
995 995
996 elm_toolbar_item_separator_set(g->toolbar_separator1_it, EINA_TRUE); 996 elm_toolbar_item_separator_set(g->main_win->toolbar_separator1_it, EINA_TRUE);
997 997
998 elm_object_item_data_set(g->toolbar_rm_it, (void *) (intptr_t) RSRC_MNGR); 998 elm_object_item_data_set(g->main_win->toolbar_rm_it, (void *) (intptr_t) RSRC_MNGR);
999 elm_object_item_data_set(g->toolbar_settings_it, (void *) (intptr_t) SETTINGS_WIN); 999 elm_object_item_data_set(g->main_win->toolbar_settings_it, (void *) (intptr_t) SETTINGS_WIN);
1000 1000
1001 elm_toolbar_item_separator_set(g->toolbar_separator2_it, EINA_TRUE); 1001 elm_toolbar_item_separator_set(g->main_win->toolbar_separator2_it, EINA_TRUE);
1002 1002
1003 elm_object_item_data_set(g->toolbar_undo_it, (void *) (intptr_t) CTX_UNDO); 1003 elm_object_item_data_set(g->main_win->toolbar_undo_it, (void *) (intptr_t) CTX_UNDO);
1004 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_TRUE); 1004 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_TRUE);
1005 elm_object_item_data_set(g->toolbar_redo_it, (void *) (intptr_t) CTX_REDO); 1005 elm_object_item_data_set(g->main_win->toolbar_redo_it, (void *) (intptr_t) CTX_REDO);
1006 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 1006 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
1007 elm_object_item_data_set(g->toolbar_reload_it, (void *) (intptr_t) CTX_REFRESH); 1007 elm_object_item_data_set(g->main_win->toolbar_reload_it, (void *) (intptr_t) CTX_REFRESH);
1008 elm_object_item_data_set(g->toolbar_delete_it, (void *) (intptr_t) WDG_DELETE); 1008 elm_object_item_data_set(g->main_win->toolbar_delete_it, (void *) (intptr_t) WDG_DELETE);
1009 1009
1010 elm_toolbar_item_menu_set(g->toolbar_view_it, EINA_TRUE); 1010 elm_toolbar_item_menu_set(g->main_win->toolbar_view_it, EINA_TRUE);
1011 elm_toolbar_item_priority_set(g->toolbar_view_it, -9999); 1011 elm_toolbar_item_priority_set(g->main_win->toolbar_view_it, -9999);
1012 1012
1013 menu = elm_toolbar_item_menu_get(g->toolbar_view_it); 1013 menu = elm_toolbar_item_menu_get(g->main_win->toolbar_view_it);
1014 it = elm_menu_item_add(menu, NULL, "window-new", "Factory show/hide", _sub_wins_hide_show_cb,(void *) (intptr_t) FACTORY_VIEW); 1014 it = elm_menu_item_add(menu, NULL, "window-new", "Factory show/hide", _sub_wins_hide_show_cb,(void *) (intptr_t) FACTORY_VIEW);
1015 elm_object_item_disabled_set(it, EINA_TRUE); 1015 elm_object_item_disabled_set(it, EINA_TRUE);
1016 it = elm_menu_item_add(menu, NULL, "window-new", "Factory vert/hor", _sub_wins_hide_show_cb,(void *) (intptr_t) FACTORY_VIEW_SWITCH); 1016 it = elm_menu_item_add(menu, NULL, "window-new", "Factory vert/hor", _sub_wins_hide_show_cb,(void *) (intptr_t) FACTORY_VIEW_SWITCH);
@@ -1021,10 +1021,10 @@ egui_start()
1021 it = elm_menu_item_add(menu, NULL, "window-new", "Properties", _sub_wins_hide_show_cb,(void *) (intptr_t) PROPERTIES_VIEW); 1021 it = elm_menu_item_add(menu, NULL, "window-new", "Properties", _sub_wins_hide_show_cb,(void *) (intptr_t) PROPERTIES_VIEW);
1022 elm_object_item_disabled_set(it, EINA_TRUE); 1022 elm_object_item_disabled_set(it, EINA_TRUE);
1023 1023
1024 elm_toolbar_item_selected_set(g->toolbar_simulate_it, EINA_FALSE); 1024 elm_toolbar_item_selected_set(g->main_win->toolbar_simulate_it, EINA_FALSE);
1025 elm_toolbar_item_priority_set(g->toolbar_simulate_it, -9999); 1025 elm_toolbar_item_priority_set(g->main_win->toolbar_simulate_it, -9999);
1026 elm_toolbar_item_menu_set(g->toolbar_simulate_it, EINA_TRUE); 1026 elm_toolbar_item_menu_set(g->main_win->toolbar_simulate_it, EINA_TRUE);
1027 menu = elm_toolbar_item_menu_get(g->toolbar_simulate_it); 1027 menu = elm_toolbar_item_menu_get(g->main_win->toolbar_simulate_it);
1028 it = elm_menu_item_add(menu, NULL, NULL, "Create a new session...", NULL, NULL); 1028 it = elm_menu_item_add(menu, NULL, NULL, "Create a new session...", NULL, NULL);
1029 { 1029 {
1030 Eina_List *itr; 1030 Eina_List *itr;
@@ -1037,37 +1037,37 @@ egui_start()
1037 1037
1038 /* Disable GraphViz item if library not installed. */ 1038 /* Disable GraphViz item if library not installed. */
1039#ifndef HAVE_GRAPHVIZ 1039#ifndef HAVE_GRAPHVIZ
1040 elm_object_item_disabled_set(g->toolbar_graph_it, EINA_TRUE); 1040 elm_object_item_disabled_set(g->main_win->toolbar_graph_it, EINA_TRUE);
1041#endif 1041#endif
1042 1042
1043 _factory_item_finalize(g->fctr_actionslider_it, "factory_actionslider.png", DB_DEF_ACTIONSLIDER_CLASS); 1043 _factory_item_finalize(g->main_win->fctr_actionslider_it, "factory_actionslider.png", DB_DEF_ACTIONSLIDER_CLASS);
1044 _factory_item_finalize(g->fctr_bg_it, "factory_bg.png", DB_DEF_BG_CLASS); 1044 _factory_item_finalize(g->main_win->fctr_bg_it, "factory_bg.png", DB_DEF_BG_CLASS);
1045 _factory_item_finalize(g->fctr_box_it, "factory_box.png", DB_DEF_BOX_CLASS); 1045 _factory_item_finalize(g->main_win->fctr_box_it, "factory_box.png", DB_DEF_BOX_CLASS);
1046 _factory_item_finalize(g->fctr_bubble_it, "factory_bubble.png", DB_DEF_BUBBLE_CLASS); 1046 _factory_item_finalize(g->main_win->fctr_bubble_it, "factory_bubble.png", DB_DEF_BUBBLE_CLASS);
1047 _factory_item_finalize(g->fctr_button_it, "factory_button.png", DB_DEF_BUTTON_CLASS); 1047 _factory_item_finalize(g->main_win->fctr_button_it, "factory_button.png", DB_DEF_BUTTON_CLASS);
1048 _factory_item_finalize(g->fctr_calendar_it, "factory_calendar.png", DB_DEF_CALENDAR_CLASS); 1048 _factory_item_finalize(g->main_win->fctr_calendar_it, "factory_calendar.png", DB_DEF_CALENDAR_CLASS);
1049 _factory_item_finalize(g->fctr_check_it, "factory_check.png", DB_DEF_CHECK_CLASS); 1049 _factory_item_finalize(g->main_win->fctr_check_it, "factory_check.png", DB_DEF_CHECK_CLASS);
1050 _factory_item_finalize(g->fctr_radio_it, "factory_radio.png", DB_DEF_RADIO_CLASS); 1050 _factory_item_finalize(g->main_win->fctr_radio_it, "factory_radio.png", DB_DEF_RADIO_CLASS);
1051 _factory_item_finalize(g->fctr_clock_it, "factory_clock.png", DB_DEF_CLOCK_CLASS); 1051 _factory_item_finalize(g->main_win->fctr_clock_it, "factory_clock.png", DB_DEF_CLOCK_CLASS);
1052 _factory_item_finalize(g->fctr_colorselector_it, "factory_colorselector.png", DB_DEF_COLORSELECTOR_CLASS); 1052 _factory_item_finalize(g->main_win->fctr_colorselector_it, "factory_colorselector.png", DB_DEF_COLORSELECTOR_CLASS);
1053 _factory_item_finalize(g->fctr_dayselector_it, "factory_dayselector.png", DB_DEF_DAYSELECTOR_CLASS); 1053 _factory_item_finalize(g->main_win->fctr_dayselector_it, "factory_dayselector.png", DB_DEF_DAYSELECTOR_CLASS);
1054 _factory_item_finalize(g->fctr_image_it, "factory_image.png", DB_DEF_IMAGE_CLASS); 1054 _factory_item_finalize(g->main_win->fctr_image_it, "factory_image.png", DB_DEF_IMAGE_CLASS);
1055 _factory_item_finalize(g->fctr_icon_it, "factory_icon.png", DB_DEF_ICON_CLASS); 1055 _factory_item_finalize(g->main_win->fctr_icon_it, "factory_icon.png", DB_DEF_ICON_CLASS);
1056 _factory_item_finalize(g->fctr_label_it, "factory_label.png", DB_DEF_LABEL_CLASS); 1056 _factory_item_finalize(g->main_win->fctr_label_it, "factory_label.png", DB_DEF_LABEL_CLASS);
1057 _factory_item_finalize(g->fctr_win_it, "factory_win.png", DB_DEF_WIN_CLASS); 1057 _factory_item_finalize(g->main_win->fctr_win_it, "factory_win.png", DB_DEF_WIN_CLASS);
1058 _factory_item_finalize(g->fctr_entry_it, "factory_entry.png", DB_DEF_ENTRY_CLASS); 1058 _factory_item_finalize(g->main_win->fctr_entry_it, "factory_entry.png", DB_DEF_ENTRY_CLASS);
1059 _factory_item_finalize(g->fctr_flip_it, "factory_flip.png", DB_DEF_FLIP_CLASS); 1059 _factory_item_finalize(g->main_win->fctr_flip_it, "factory_flip.png", DB_DEF_FLIP_CLASS);
1060 _factory_item_finalize(g->fctr_genlist_it, "factory_genlist.png", DB_DEF_GENLIST_CLASS); 1060 _factory_item_finalize(g->main_win->fctr_genlist_it, "factory_genlist.png", DB_DEF_GENLIST_CLASS);
1061 _factory_item_finalize(g->fctr_gengrid_it, "factory_gengrid.png", DB_DEF_GENGRID_CLASS); 1061 _factory_item_finalize(g->main_win->fctr_gengrid_it, "factory_gengrid.png", DB_DEF_GENGRID_CLASS);
1062 _factory_item_finalize(g->fctr_table_it, "factory_table.png", DB_DEF_TABLE_CLASS); 1062 _factory_item_finalize(g->main_win->fctr_table_it, "factory_table.png", DB_DEF_TABLE_CLASS);
1063 _factory_item_finalize(g->fctr_menu_it, "factory_menu.png", DB_DEF_MENU_CLASS); 1063 _factory_item_finalize(g->main_win->fctr_menu_it, "factory_menu.png", DB_DEF_MENU_CLASS);
1064 _factory_item_finalize(g->fctr_diskselector_it, "factory_diskselector.png", DB_DEF_DISKSELECTOR_CLASS); 1064 _factory_item_finalize(g->main_win->fctr_diskselector_it, "factory_diskselector.png", DB_DEF_DISKSELECTOR_CLASS);
1065 _factory_item_finalize(g->fctr_ctxpopup_it, "factory_ctxpopup.png", DB_DEF_CTXPOPUP_CLASS); 1065 _factory_item_finalize(g->main_win->fctr_ctxpopup_it, "factory_ctxpopup.png", DB_DEF_CTXPOPUP_CLASS);
1066 _factory_item_finalize(g->fctr_toolbar_it, "factory_toolbar.png", DB_DEF_TOOLBAR_CLASS); 1066 _factory_item_finalize(g->main_win->fctr_toolbar_it, "factory_toolbar.png", DB_DEF_TOOLBAR_CLASS);
1067 _factory_item_finalize(g->fctr_layout_it, "factory_layout.png", DB_DEF_LAYOUT_CLASS); 1067 _factory_item_finalize(g->main_win->fctr_layout_it, "factory_layout.png", DB_DEF_LAYOUT_CLASS);
1068 1068
1069 /*FIXME: Need to unpack inline image, so pass it into delete callback*/ 1069 /*FIXME: Need to unpack inline image, so pass it into delete callback*/
1070 evas_object_smart_callback_add(g->main_win, "delete,request", _main_win_del_cb, NULL); 1070 evas_object_smart_callback_add(g->main_win->main_win, "delete,request", _main_win_del_cb, NULL);
1071} 1071}
1072 1072
1073void 1073void
diff --git a/src/bin/egui_gui/propview.c b/src/bin/egui_gui/propview.c
index 85e3386..f9620b9 100644
--- a/src/bin/egui_gui/propview.c
+++ b/src/bin/egui_gui/propview.c
@@ -336,9 +336,9 @@ _cb_sequence_modify(void *data, Eo *obj, const Eo_Event_Description *desc EINA_U
336 dep_data_cb_set(dep_data, new_cb); 336 dep_data_cb_set(dep_data, new_cb);
337 } 337 }
338 gui_context_memento_add(ctx, memento); 338 gui_context_memento_add(ctx, memento);
339 GUI *g = get_gui(); 339 Egui_Layout_Widgets *g = get_gui();
340 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 340 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
341 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 341 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
342 342
343 propview_build(it_data->wdg); 343 propview_build(it_data->wdg);
344 _select_callback_item(cb_dep_id_get(new_cb)); 344 _select_callback_item(cb_dep_id_get(new_cb));
@@ -616,8 +616,8 @@ PropViewCbs *propview_cbs_get()
616static const char* 616static const char*
617_filter_string_get() 617_filter_string_get()
618{ 618{
619 GUI *g = get_gui(); 619 Egui_Layout_Widgets *g = get_gui();
620 const char *str = elm_entry_entry_get(g->propsview_filter_entry); 620 const char *str = elm_entry_entry_get(g->main_win->propsview_filter_entry);
621 //Trim from left 621 //Trim from left
622 while (*str == ' ') str++; 622 while (*str == ' ') str++;
623 623
@@ -884,9 +884,9 @@ _content_build(const Gui_Widget *wdg)
884 (!strcmp(wdg_name, DB_DEF_BOX_CLASS) || 884 (!strcmp(wdg_name, DB_DEF_BOX_CLASS) ||
885 !strcmp(wdg_name, DB_DEF_WIN_CLASS))); 885 !strcmp(wdg_name, DB_DEF_WIN_CLASS)));
886 886
887 GUI *g = get_gui(); 887 Egui_Layout_Widgets *g = egui_layout_gui_get();
888 elm_object_disabled_set(g->contentview_down_btn, !isbox); 888 elm_object_disabled_set(g->main_win->contentview_down_btn, !isbox);
889 elm_object_disabled_set(g->contentview_up_btn, !isbox); 889 elm_object_disabled_set(g->main_win->contentview_up_btn, !isbox);
890 890
891 Eina_List *items_lst = wdg_obj_container_contents_list_get(wdg); 891 Eina_List *items_lst = wdg_obj_container_contents_list_get(wdg);
892 892
@@ -1226,7 +1226,7 @@ _callbacks_build(const Gui_Widget *wdg)
1226static void 1226static void
1227_propview_build_post_cb(const Gui_Widget *wdg, It_Data_Type new_type) 1227_propview_build_post_cb(const Gui_Widget *wdg, It_Data_Type new_type)
1228{ 1228{
1229 GUI *g = get_gui(); 1229 Egui_Layout_Widgets *g = get_gui();
1230 /* Unsetting view according to old selected toolbar's item. */ 1230 /* Unsetting view according to old selected toolbar's item. */
1231 switch (_propsview_toolbar_selected_item_type) 1231 switch (_propsview_toolbar_selected_item_type)
1232 { 1232 {
@@ -1248,8 +1248,8 @@ _propview_build_post_cb(const Gui_Widget *wdg, It_Data_Type new_type)
1248 } 1248 }
1249 case ITEM_TYPE: 1249 case ITEM_TYPE:
1250 { 1250 {
1251 eo_do(g->contentview_box, evas_obj_visibility_set(EINA_TRUE)); 1251 eo_do(g->main_win->contentview_box, evas_obj_visibility_set(EINA_TRUE));
1252 eo_do(g->itemview_box, evas_obj_visibility_set(EINA_FALSE)); 1252 eo_do(g->main_win->itemview_box, evas_obj_visibility_set(EINA_FALSE));
1253 break; 1253 break;
1254 } 1254 }
1255 } 1255 }
@@ -1257,50 +1257,50 @@ _propview_build_post_cb(const Gui_Widget *wdg, It_Data_Type new_type)
1257 _propsview_toolbar_selected_item_type = new_type; 1257 _propsview_toolbar_selected_item_type = new_type;
1258 1258
1259 /* Setting view according to new selected toolbar's item. */ 1259 /* Setting view according to new selected toolbar's item. */
1260 eo_do(g->contentview_box, evas_obj_visibility_set(EINA_FALSE)); 1260 eo_do(g->main_win->contentview_box, evas_obj_visibility_set(EINA_FALSE));
1261 eo_do(g->properties_list, evas_obj_visibility_set(EINA_FALSE)); 1261 eo_do(g->main_win->properties_list, evas_obj_visibility_set(EINA_FALSE));
1262 eo_do(g->itemview_box, evas_obj_visibility_set(EINA_FALSE)); 1262 eo_do(g->main_win->itemview_box, evas_obj_visibility_set(EINA_FALSE));
1263 eo_do(g->callbacksview_box, evas_obj_visibility_set(EINA_FALSE)); 1263 eo_do(g->main_win->callbacksview_box, evas_obj_visibility_set(EINA_FALSE));
1264 eo_do(g->description_list, evas_obj_visibility_set(EINA_FALSE)); 1264 eo_do(g->main_win->description_list, evas_obj_visibility_set(EINA_FALSE));
1265 1265
1266 switch (new_type) 1266 switch (new_type)
1267 { 1267 {
1268 case DESCRIPTION_TYPE: 1268 case DESCRIPTION_TYPE:
1269 { 1269 {
1270 eo_do(g->description_list, evas_obj_visibility_set(EINA_TRUE)); 1270 eo_do(g->main_win->description_list, evas_obj_visibility_set(EINA_TRUE));
1271 break; 1271 break;
1272 } 1272 }
1273 case PROPERTY_TYPE: 1273 case PROPERTY_TYPE:
1274 { 1274 {
1275 eo_do(g->properties_list, evas_obj_visibility_set(EINA_TRUE)); 1275 eo_do(g->main_win->properties_list, evas_obj_visibility_set(EINA_TRUE));
1276 break; 1276 break;
1277 } 1277 }
1278 case CALLBACK_TYPE: 1278 case CALLBACK_TYPE:
1279 { 1279 {
1280 eo_do(g->callbacksview_box, evas_obj_visibility_set(EINA_TRUE)); 1280 eo_do(g->main_win->callbacksview_box, evas_obj_visibility_set(EINA_TRUE));
1281 break; 1281 break;
1282 } 1282 }
1283 case CONTENT_TYPE: 1283 case CONTENT_TYPE:
1284 { 1284 {
1285 eo_do(g->contentview_box, evas_obj_visibility_set(EINA_TRUE)); 1285 eo_do(g->main_win->contentview_box, evas_obj_visibility_set(EINA_TRUE));
1286 break; 1286 break;
1287 } 1287 }
1288 case ITEM_TYPE: 1288 case ITEM_TYPE:
1289 { 1289 {
1290 eo_do(g->contentview_box, evas_obj_visibility_set(EINA_FALSE)); 1290 eo_do(g->main_win->contentview_box, evas_obj_visibility_set(EINA_FALSE));
1291 eo_do(g->itemview_box, evas_obj_visibility_set(EINA_TRUE)); 1291 eo_do(g->main_win->itemview_box, evas_obj_visibility_set(EINA_TRUE));
1292 1292
1293 if (wdg_is_container(wdg, DB_DEF_MENU_CLASS)) 1293 if (wdg_is_container(wdg, DB_DEF_MENU_CLASS))
1294 { 1294 {
1295 eo_do(g->itemview_add_item_nested_but, elm_obj_widget_disabled_set(EINA_FALSE)); 1295 eo_do(g->main_win->itemview_add_item_nested_but, elm_obj_widget_disabled_set(EINA_FALSE));
1296 eo_do(g->itemview_add_separator_but, elm_obj_widget_disabled_set(EINA_FALSE)); 1296 eo_do(g->main_win->itemview_add_separator_but, elm_obj_widget_disabled_set(EINA_FALSE));
1297 } 1297 }
1298 else if (wdg_is_container(wdg, DB_DEF_DISKSELECTOR_CLASS) || 1298 else if (wdg_is_container(wdg, DB_DEF_DISKSELECTOR_CLASS) ||
1299 wdg_is_container(wdg, DB_DEF_CTXPOPUP_CLASS) || 1299 wdg_is_container(wdg, DB_DEF_CTXPOPUP_CLASS) ||
1300 wdg_is_container(wdg, DB_DEF_TOOLBAR_CLASS)) 1300 wdg_is_container(wdg, DB_DEF_TOOLBAR_CLASS))
1301 { 1301 {
1302 eo_do(g->itemview_add_item_nested_but, elm_obj_widget_disabled_set(EINA_TRUE)); 1302 eo_do(g->main_win->itemview_add_item_nested_but, elm_obj_widget_disabled_set(EINA_TRUE));
1303 eo_do(g->itemview_add_separator_but, elm_obj_widget_disabled_set(EINA_TRUE)); 1303 eo_do(g->main_win->itemview_add_separator_but, elm_obj_widget_disabled_set(EINA_TRUE));
1304 } 1304 }
1305 break; 1305 break;
1306 } 1306 }
@@ -1456,22 +1456,22 @@ void
1456propsview_view_switch(It_Data_Type type) 1456propsview_view_switch(It_Data_Type type)
1457{ 1457{
1458 Elm_Object_Item *it; 1458 Elm_Object_Item *it;
1459 GUI *g = get_gui(); 1459 Egui_Layout_Widgets *g = get_gui();
1460 switch (type) 1460 switch (type)
1461 { 1461 {
1462 case PROPERTY_TYPE: 1462 case PROPERTY_TYPE:
1463 { 1463 {
1464 it = g->propsview_toolbar_prop_it; 1464 it = g->main_win->propsview_toolbar_prop_it;
1465 break; 1465 break;
1466 } 1466 }
1467 case CALLBACK_TYPE: 1467 case CALLBACK_TYPE:
1468 { 1468 {
1469 it = g->propsview_toolbar_cb_it; 1469 it = g->main_win->propsview_toolbar_cb_it;
1470 break; 1470 break;
1471 } 1471 }
1472 case DESCRIPTION_TYPE: 1472 case DESCRIPTION_TYPE:
1473 { 1473 {
1474 it = g->propsview_toolbar_desc_it; 1474 it = g->main_win->propsview_toolbar_desc_it;
1475 break; 1475 break;
1476 } 1476 }
1477 /* Currently ITEM_TYPE cannot appear here. 1477 /* Currently ITEM_TYPE cannot appear here.
@@ -1479,7 +1479,7 @@ propsview_view_switch(It_Data_Type type)
1479 case ITEM_TYPE: 1479 case ITEM_TYPE:
1480 case CONTENT_TYPE: 1480 case CONTENT_TYPE:
1481 { 1481 {
1482 it = g->propsview_toolbar_cont_it; 1482 it = g->main_win->propsview_toolbar_cont_it;
1483 break; 1483 break;
1484 } 1484 }
1485 } 1485 }
@@ -1520,9 +1520,9 @@ _selected_callback_move(int dir)
1520 wdg_cb_container_unset((Gui_Widget *) wdg); 1520 wdg_cb_container_unset((Gui_Widget *) wdg);
1521 wdg_cb_container_set((Gui_Widget *) wdg, cc_new); 1521 wdg_cb_container_set((Gui_Widget *) wdg, cc_new);
1522 1522
1523 GUI *g = get_gui(); 1523 Egui_Layout_Widgets *g = get_gui();
1524 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 1524 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
1525 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 1525 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
1526 1526
1527 propview_build(wdg); 1527 propview_build(wdg);
1528 _select_callback_item(cb_dep_id_get(cb)); 1528 _select_callback_item(cb_dep_id_get(cb));
@@ -1574,9 +1574,9 @@ _callbacksview_del_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, cons
1574 wdg_cb_container_unset((Gui_Widget *) wdg); 1574 wdg_cb_container_unset((Gui_Widget *) wdg);
1575 wdg_cb_container_set((Gui_Widget *) wdg, cc_new); 1575 wdg_cb_container_set((Gui_Widget *) wdg, cc_new);
1576 1576
1577 GUI *g = get_gui(); 1577 Egui_Layout_Widgets *g = get_gui();
1578 elm_object_item_disabled_set(g->toolbar_redo_it, EINA_TRUE); 1578 elm_object_item_disabled_set(g->main_win->toolbar_redo_it, EINA_TRUE);
1579 elm_object_item_disabled_set(g->toolbar_undo_it, EINA_FALSE); 1579 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
1580 } 1580 }
1581 } 1581 }
1582 return EO_CALLBACK_CONTINUE; 1582 return EO_CALLBACK_CONTINUE;
@@ -1632,38 +1632,38 @@ propview_init()
1632 _itc_ctn->func.del = _contents_item_del; 1632 _itc_ctn->func.del = _contents_item_del;
1633 } 1633 }
1634 1634
1635 GUI *g = get_gui(); 1635 Egui_Layout_Widgets *g = egui_layout_gui_get();
1636 1636
1637 propview_table = g->propsview_table; 1637 propview_table = g->main_win->propsview_table;
1638 1638
1639 prop_list = g->properties_list; 1639 prop_list = g->main_win->properties_list;
1640 1640
1641 /* Put it here, because it Enums defined in propsview.h */ 1641 /* Put it here, because it Enums defined in propsview.h */
1642 elm_object_item_data_set(g->propsview_toolbar_desc_it, (void *) (intptr_t) DESCRIPTION_TYPE); 1642 elm_object_item_data_set(g->main_win->propsview_toolbar_desc_it, (void *) (intptr_t) DESCRIPTION_TYPE);
1643 elm_object_item_data_set(g->propsview_toolbar_prop_it, (void *) (intptr_t) PROPERTY_TYPE); 1643 elm_object_item_data_set(g->main_win->propsview_toolbar_prop_it, (void *) (intptr_t) PROPERTY_TYPE);
1644 elm_object_item_data_set(g->propsview_toolbar_cb_it, (void *) (intptr_t) CALLBACK_TYPE); 1644 elm_object_item_data_set(g->main_win->propsview_toolbar_cb_it, (void *) (intptr_t) CALLBACK_TYPE);
1645 elm_object_item_data_set(g->propsview_toolbar_cont_it, (void *) (intptr_t) CONTENT_TYPE); 1645 elm_object_item_data_set(g->main_win->propsview_toolbar_cont_it, (void *) (intptr_t) CONTENT_TYPE);
1646 1646
1647 evas_object_smart_callback_add(prop_list, "expand,request", _expand_request_cb, NULL); 1647 evas_object_smart_callback_add(prop_list, "expand,request", _expand_request_cb, NULL);
1648 evas_object_smart_callback_add(prop_list, "contract,request", _contract_request_cb, NULL); 1648 evas_object_smart_callback_add(prop_list, "contract,request", _contract_request_cb, NULL);
1649 evas_object_smart_callback_add(prop_list, "expanded", _props_expanded_cb, NULL); 1649 evas_object_smart_callback_add(prop_list, "expanded", _props_expanded_cb, NULL);
1650 evas_object_smart_callback_add(prop_list, "contracted", _props_contracted_cb, NULL); 1650 evas_object_smart_callback_add(prop_list, "contracted", _props_contracted_cb, NULL);
1651 1651
1652 eo_do(g->propsview_filter_entry, 1652 eo_do(g->main_win->propsview_filter_entry,
1653 eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER, 1653 eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER,
1654 _propview_filter_entry_changed_cb, 1654 _propview_filter_entry_changed_cb,
1655 NULL)); 1655 NULL));
1656 1656
1657 cb_list = g->callbacksview_list; 1657 cb_list = g->main_win->callbacksview_list;
1658 1658
1659 evas_object_smart_callback_add(cb_list, "expand,request", _expand_request_cb, NULL); 1659 evas_object_smart_callback_add(cb_list, "expand,request", _expand_request_cb, NULL);
1660 evas_object_smart_callback_add(cb_list, "contract,request", _contract_request_cb, NULL); 1660 evas_object_smart_callback_add(cb_list, "contract,request", _contract_request_cb, NULL);
1661 evas_object_smart_callback_add(cb_list, "expanded", _callbacks_expanded_cb, NULL); 1661 evas_object_smart_callback_add(cb_list, "expanded", _callbacks_expanded_cb, NULL);
1662 evas_object_smart_callback_add(cb_list, "contracted", _callbacks_contracted_cb, NULL); 1662 evas_object_smart_callback_add(cb_list, "contracted", _callbacks_contracted_cb, NULL);
1663 1663
1664 desc_list = g->description_list; 1664 desc_list = g->main_win->description_list;
1665 1665
1666 ctn_list = g->contentview_list; 1666 ctn_list = g->main_win->contentview_list;
1667 1667
1668 _mempool_cache_init(); 1668 _mempool_cache_init();
1669 expanded_classes = eina_hash_string_superfast_new(NULL); 1669 expanded_classes = eina_hash_string_superfast_new(NULL);
diff --git a/src/bin/egui_gui/rmview.c b/src/bin/egui_gui/rmview.c
index 1164d82..68fa102 100644
--- a/src/bin/egui_gui/rmview.c
+++ b/src/bin/egui_gui/rmview.c
@@ -22,7 +22,7 @@
22#define EVAS_CALLBACK_STR "EVAS_CALLBACK" 22#define EVAS_CALLBACK_STR "EVAS_CALLBACK"
23#define EVAS_SMART_CALLBACK_STR "EVAS_SMART_CALLBACK" 23#define EVAS_SMART_CALLBACK_STR "EVAS_SMART_CALLBACK"
24 24
25static GUI *g; 25static Egui_Layout_Widgets *g;
26/* currently selected toolbar item */ 26/* currently selected toolbar item */
27static Rmview_Resource_Type _rmview_toolbar_selected_type = RMVIEW_NOT_SELECTED; 27static Rmview_Resource_Type _rmview_toolbar_selected_type = RMVIEW_NOT_SELECTED;
28 28
@@ -443,7 +443,7 @@ _rmview_build(Rmview_Resource_Type type)
443 Eo *label, *en, *bt, *icon; 443 Eo *label, *en, *bt, *icon;
444 const char *header1 = NULL, *header2 = NULL; 444 const char *header1 = NULL, *header2 = NULL;
445 Gui_Resource_Type type_start, type_end, type_itr; 445 Gui_Resource_Type type_start, type_end, type_itr;
446 eo_do(g->rm_table, elm_obj_table_clear(EINA_TRUE)); 446 eo_do(g->rm_win->rm_table, elm_obj_table_clear(EINA_TRUE));
447 447
448 switch (type) 448 switch (type)
449 { 449 {
@@ -493,11 +493,11 @@ _rmview_build(Rmview_Resource_Type type)
493 break; 493 break;
494 } 494 }
495 } 495 }
496 label = _rmview_label_add(g->rm_table, header1); 496 label = _rmview_label_add(g->rm_win->rm_table, header1);
497 eo_do(g->rm_table, elm_obj_table_pack(label, 0, 0, 1, 1)); 497 eo_do(g->rm_win->rm_table, elm_obj_table_pack(label, 0, 0, 1, 1));
498 498
499 label = _rmview_label_add(g->rm_table, header2); 499 label = _rmview_label_add(g->rm_win->rm_table, header2);
500 eo_do(g->rm_table, elm_obj_table_pack(label, 1, 0, 1, 1)); 500 eo_do(g->rm_win->rm_table, elm_obj_table_pack(label, 1, 0, 1, 1));
501 501
502 Eina_List *itr; 502 Eina_List *itr;
503 Dep_Id *res_id; 503 Dep_Id *res_id;
@@ -522,9 +522,9 @@ _rmview_build(Rmview_Resource_Type type)
522 Rmview_Item_Data *it_data = calloc(1, sizeof(Rmview_Item_Data)); 522 Rmview_Item_Data *it_data = calloc(1, sizeof(Rmview_Item_Data));
523 it_data->res = (Gui_Resource *)res; 523 it_data->res = (Gui_Resource *)res;
524 524
525 en = _rmview_entry_add(g->rm_table,res_name); 525 en = _rmview_entry_add(g->rm_win->rm_table,res_name);
526 it_data->en1 = en; 526 it_data->en1 = en;
527 eo_do(g->rm_table, elm_obj_table_pack(en, table_col++, table_line, 1, 1)); 527 eo_do(g->rm_win->rm_table, elm_obj_table_pack(en, table_col++, table_line, 1, 1));
528 data = RMVIEW_FIELD_DATA_BUILD(0, it_data); 528 data = RMVIEW_FIELD_DATA_BUILD(0, it_data);
529 529
530 eo_do(en, eo_key_data_set(_STR_RMVIEW, data, _field_data_free)); 530 eo_do(en, eo_key_data_set(_STR_RMVIEW, data, _field_data_free));
@@ -535,9 +535,9 @@ _rmview_build(Rmview_Resource_Type type)
535 /* Add fields specific to CALLBACKs */ 535 /* Add fields specific to CALLBACKs */
536 case RESOURCE_EO_CALLBACK: 536 case RESOURCE_EO_CALLBACK:
537 { 537 {
538 en = _rmview_entry_add(g->rm_table, value); 538 en = _rmview_entry_add(g->rm_win->rm_table, value);
539 it_data->en2 = en; 539 it_data->en2 = en;
540 eo_do(g->rm_table, elm_obj_table_pack(en, table_col++, table_line, 1, 1)); 540 eo_do(g->rm_win->rm_table, elm_obj_table_pack(en, table_col++, table_line, 1, 1));
541 data = RMVIEW_FIELD_DATA_BUILD(1, it_data); 541 data = RMVIEW_FIELD_DATA_BUILD(1, it_data);
542 eo_do(en, eo_key_data_set(_STR_RMVIEW, data, _field_data_free)); 542 eo_do(en, eo_key_data_set(_STR_RMVIEW, data, _field_data_free));
543 eo_do(en, eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER, _res_changed, NULL)); 543 eo_do(en, eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER, _res_changed, NULL));
@@ -546,11 +546,11 @@ _rmview_build(Rmview_Resource_Type type)
546 /* Add field (fileselector entry) specific to IMAGE */ 546 /* Add field (fileselector entry) specific to IMAGE */
547 case RESOURCE_IMAGE: 547 case RESOURCE_IMAGE:
548 { 548 {
549 en = _rmview_fs_entry_add(g->rm_table, "..."); 549 en = _rmview_fs_entry_add(g->rm_win->rm_table, "...");
550 eo_do(en, elm_interface_fileselector_path_set(value)); 550 eo_do(en, elm_interface_fileselector_path_set(value));
551 551
552 it_data->en2 = en; 552 it_data->en2 = en;
553 eo_do(g->rm_table, elm_obj_table_pack(en, table_col++, table_line, 1, 1)); 553 eo_do(g->rm_win->rm_table, elm_obj_table_pack(en, table_col++, table_line, 1, 1));
554 data = RMVIEW_FIELD_DATA_BUILD(1, it_data); 554 data = RMVIEW_FIELD_DATA_BUILD(1, it_data);
555 eo_do(en, eo_key_data_set(_STR_RMVIEW, data, _field_data_free)); 555 eo_do(en, eo_key_data_set(_STR_RMVIEW, data, _field_data_free));
556 eo_do(en, eo_event_callback_add(ELM_FILESELECTOR_ENTRY_EVENT_CHANGED, _res_changed, NULL)); 556 eo_do(en, eo_event_callback_add(ELM_FILESELECTOR_ENTRY_EVENT_CHANGED, _res_changed, NULL));
@@ -563,18 +563,18 @@ _rmview_build(Rmview_Resource_Type type)
563 Gui_Sequence *seq = sequence_get(seq_id); 563 Gui_Sequence *seq = sequence_get(seq_id);
564 Eina_Bool state = sequence_public_get(seq); 564 Eina_Bool state = sequence_public_get(seq);
565 565
566 Eo *ck = _rmview_check_add(g->rm_table, state); 566 Eo *ck = _rmview_check_add(g->rm_win->rm_table, state);
567 it_data->en2 = ck; 567 it_data->en2 = ck;
568 data = RMVIEW_FIELD_DATA_BUILD(1, it_data); 568 data = RMVIEW_FIELD_DATA_BUILD(1, it_data);
569 eo_do(ck, eo_key_data_set(_STR_RMVIEW, data, _field_data_free)); 569 eo_do(ck, eo_key_data_set(_STR_RMVIEW, data, _field_data_free));
570 eo_do(g->rm_table, elm_obj_table_pack(ck, table_col++, table_line, 1, 1)); 570 eo_do(g->rm_win->rm_table, elm_obj_table_pack(ck, table_col++, table_line, 1, 1));
571 eo_do(ck, eo_event_callback_add(ELM_CHECK_EVENT_CHANGED, _res_changed, NULL)); 571 eo_do(ck, eo_event_callback_add(ELM_CHECK_EVENT_CHANGED, _res_changed, NULL));
572 break; 572 break;
573 } 573 }
574 /* Add field (double entry) specific to EDJE */ 574 /* Add field (double entry) specific to EDJE */
575 case RESOURCE_EDJE: 575 case RESOURCE_EDJE:
576 { 576 {
577 Eo *box = _rmview_box_add(g->rm_table, EINA_FALSE); 577 Eo *box = _rmview_box_add(g->rm_win->rm_table, EINA_FALSE);
578 578
579 en = _rmview_fs_entry_add(box, "..."); 579 en = _rmview_fs_entry_add(box, "...");
580 value = resource_edj_path_get(res); 580 value = resource_edj_path_get(res);
@@ -594,15 +594,15 @@ _rmview_build(Rmview_Resource_Type type)
594 eo_do(box, elm_obj_box_pack_end(en)); 594 eo_do(box, elm_obj_box_pack_end(en));
595 it_data->en3 = en; 595 it_data->en3 = en;
596 596
597 eo_do(g->rm_table, elm_obj_table_pack(box, table_col++, table_line, 1, 1)); 597 eo_do(g->rm_win->rm_table, elm_obj_table_pack(box, table_col++, table_line, 1, 1));
598 break; 598 break;
599 } 599 }
600 /* Add field (entry) specific to STRING */ 600 /* Add field (entry) specific to STRING */
601 case RESOURCE_STRING: 601 case RESOURCE_STRING:
602 { 602 {
603 en = _rmview_entry_add(g->rm_table, value); 603 en = _rmview_entry_add(g->rm_win->rm_table, value);
604 it_data->en2 = en; 604 it_data->en2 = en;
605 eo_do(g->rm_table, elm_obj_table_pack(en, table_col++, table_line, 1, 1)); 605 eo_do(g->rm_win->rm_table, elm_obj_table_pack(en, table_col++, table_line, 1, 1));
606 data = RMVIEW_FIELD_DATA_BUILD(1, it_data); 606 data = RMVIEW_FIELD_DATA_BUILD(1, it_data);
607 eo_do(en, eo_key_data_set(_STR_RMVIEW, data, _field_data_free)); 607 eo_do(en, eo_key_data_set(_STR_RMVIEW, data, _field_data_free));
608 eo_do(en, eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER, _res_changed, NULL)); 608 eo_do(en, eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER, _res_changed, NULL));
@@ -617,19 +617,19 @@ _rmview_build(Rmview_Resource_Type type)
617#ifdef HAVE_ENVENTOR 617#ifdef HAVE_ENVENTOR
618 if (res_type == RESOURCE_EDJE) 618 if (res_type == RESOURCE_EDJE)
619 { 619 {
620 icon = elm_image_add(g->rm_table); 620 icon = elm_image_add(g->rm_win->rm_table);
621 eo_do(icon, 621 eo_do(icon,
622 efl_file_set(PACKAGE_DATA_DIR"/images/enventor_icon.png", NULL), 622 efl_file_set(PACKAGE_DATA_DIR"/images/enventor_icon.png", NULL),
623 evas_obj_size_hint_min_set(25, 25), 623 evas_obj_size_hint_min_set(25, 25),
624 elm_obj_image_resizable_set(EINA_TRUE, EINA_TRUE), 624 elm_obj_image_resizable_set(EINA_TRUE, EINA_TRUE),
625 evas_obj_visibility_set(EINA_TRUE) 625 evas_obj_visibility_set(EINA_TRUE)
626 ); 626 );
627 bt = _rmview_button_add(g->rm_table, ""); 627 bt = _rmview_button_add(g->rm_win->rm_table, "");
628 eo_do(bt, 628 eo_do(bt,
629 elm_obj_container_content_set("icon", icon), 629 elm_obj_container_content_set("icon", icon),
630 elm_obj_widget_disabled_set(EINA_FALSE) 630 elm_obj_widget_disabled_set(EINA_FALSE)
631 ); 631 );
632 eo_do(g->rm_table, elm_obj_table_pack(bt, table_col++, table_line, 1, 1)); 632 eo_do(g->rm_win->rm_table, elm_obj_table_pack(bt, table_col++, table_line, 1, 1));
633 633
634 data = RMVIEW_FIELD_DATA_BUILD(2, it_data); 634 data = RMVIEW_FIELD_DATA_BUILD(2, it_data);
635 eo_do(bt, eo_key_data_set(_STR_RMVIEW, data, _field_data_free)); 635 eo_do(bt, eo_key_data_set(_STR_RMVIEW, data, _field_data_free));
@@ -637,19 +637,19 @@ _rmview_build(Rmview_Resource_Type type)
637 } 637 }
638#endif 638#endif
639 639
640 bt = _rmview_button_add(g->rm_table, "save"); 640 bt = _rmview_button_add(g->rm_win->rm_table, "save");
641 it_data->bt_save = bt; 641 it_data->bt_save = bt;
642 eo_do(bt, elm_obj_widget_disabled_set(EINA_TRUE)); 642 eo_do(bt, elm_obj_widget_disabled_set(EINA_TRUE));
643 eo_do(bt, eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_save_clicked, NULL)); 643 eo_do(bt, eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_save_clicked, NULL));
644 644
645 eo_do(g->rm_table, elm_obj_table_pack(bt, table_col++, table_line, 1, 1)); 645 eo_do(g->rm_win->rm_table, elm_obj_table_pack(bt, table_col++, table_line, 1, 1));
646 data = RMVIEW_FIELD_DATA_BUILD(2, it_data); 646 data = RMVIEW_FIELD_DATA_BUILD(2, it_data);
647 eo_do(bt, eo_key_data_set(_STR_RMVIEW, data, _field_data_free)); 647 eo_do(bt, eo_key_data_set(_STR_RMVIEW, data, _field_data_free));
648 648
649 bt = _rmview_button_add(g->rm_table, "del"); 649 bt = _rmview_button_add(g->rm_win->rm_table, "del");
650 eo_do(bt, eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_del_clicked, NULL)); 650 eo_do(bt, eo_event_callback_add(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_del_clicked, NULL));
651 651
652 eo_do(g->rm_table, elm_obj_table_pack(bt, table_col++, table_line, 1, 1)); 652 eo_do(g->rm_win->rm_table, elm_obj_table_pack(bt, table_col++, table_line, 1, 1));
653 data = RMVIEW_FIELD_DATA_BUILD(3, it_data); 653 data = RMVIEW_FIELD_DATA_BUILD(3, it_data);
654 eo_do(bt, eo_key_data_set(_STR_RMVIEW, data, _field_data_free)); 654 eo_do(bt, eo_key_data_set(_STR_RMVIEW, data, _field_data_free));
655 655
@@ -658,49 +658,49 @@ _rmview_build(Rmview_Resource_Type type)
658 } 658 }
659 /* Adding last line of buttons to add new resources. */ 659 /* Adding last line of buttons to add new resources. */
660 { 660 {
661 eo_do(g->rm_buttons_box, elm_obj_box_unpack_all()); 661 eo_do(g->rm_win->rm_buttons_box, elm_obj_box_unpack_all());
662 eo_do(g->rm_buttons_box, elm_obj_box_pack_end(g->rm_alias_entry)); 662 eo_do(g->rm_win->rm_buttons_box, elm_obj_box_pack_end(g->rm_win->rm_alias_entry));
663 663
664 eo_do(g->rm_value_entry, evas_obj_visibility_set(EINA_FALSE)); 664 eo_do(g->rm_win->rm_value_entry, evas_obj_visibility_set(EINA_FALSE));
665 eo_do(g->rm_seq_pub_check, evas_obj_visibility_set(EINA_FALSE)); 665 eo_do(g->rm_win->rm_seq_pub_check, evas_obj_visibility_set(EINA_FALSE));
666 eo_do(g->rm_image_fileselector, evas_obj_visibility_set(EINA_FALSE)); 666 eo_do(g->rm_win->rm_image_fileselector, evas_obj_visibility_set(EINA_FALSE));
667 eo_do(g->rm_edje_box, evas_obj_visibility_set(EINA_FALSE)); 667 eo_do(g->rm_win->rm_edje_box, evas_obj_visibility_set(EINA_FALSE));
668 eo_do(g->rm_edje_fs_edj, evas_obj_visibility_set(EINA_FALSE)); 668 eo_do(g->rm_win->rm_edje_fs_edj, evas_obj_visibility_set(EINA_FALSE));
669 eo_do(g->rm_edje_fs_edc, evas_obj_visibility_set(EINA_FALSE)); 669 eo_do(g->rm_win->rm_edje_fs_edc, evas_obj_visibility_set(EINA_FALSE));
670 670
671 switch (_rmview_toolbar_selected_type ) 671 switch (_rmview_toolbar_selected_type )
672 { 672 {
673 case RMVIEW_IMAGE: 673 case RMVIEW_IMAGE:
674 { 674 {
675 eo_do(g->rm_image_fileselector, evas_obj_visibility_set(EINA_TRUE)); 675 eo_do(g->rm_win->rm_image_fileselector, evas_obj_visibility_set(EINA_TRUE));
676 eo_do(g->rm_buttons_box, elm_obj_box_pack_end(g->rm_image_fileselector)); 676 eo_do(g->rm_win->rm_buttons_box, elm_obj_box_pack_end(g->rm_win->rm_image_fileselector));
677 break; 677 break;
678 } 678 }
679 case RMVIEW_CALLBACK: 679 case RMVIEW_CALLBACK:
680 { 680 {
681 eo_do(g->rm_value_entry, evas_obj_visibility_set(EINA_TRUE)); 681 eo_do(g->rm_win->rm_value_entry, evas_obj_visibility_set(EINA_TRUE));
682 eo_do(g->rm_buttons_box, elm_obj_box_pack_end(g->rm_value_entry)); 682 eo_do(g->rm_win->rm_buttons_box, elm_obj_box_pack_end(g->rm_win->rm_value_entry));
683 break; 683 break;
684 } 684 }
685 case RMVIEW_SEQUENCE: 685 case RMVIEW_SEQUENCE:
686 { 686 {
687 eo_do(g->rm_seq_pub_check, evas_obj_visibility_set(EINA_TRUE)); 687 eo_do(g->rm_win->rm_seq_pub_check, evas_obj_visibility_set(EINA_TRUE));
688 eo_do(g->rm_value_entry, evas_obj_visibility_set(EINA_FALSE)); 688 eo_do(g->rm_win->rm_value_entry, evas_obj_visibility_set(EINA_FALSE));
689 eo_do(g->rm_buttons_box, elm_obj_box_pack_end(g->rm_seq_pub_check)); 689 eo_do(g->rm_win->rm_buttons_box, elm_obj_box_pack_end(g->rm_win->rm_seq_pub_check));
690 break; 690 break;
691 } 691 }
692 case RMVIEW_EDJE: 692 case RMVIEW_EDJE:
693 { 693 {
694 eo_do(g->rm_edje_box, evas_obj_visibility_set(EINA_TRUE)); 694 eo_do(g->rm_win->rm_edje_box, evas_obj_visibility_set(EINA_TRUE));
695 eo_do(g->rm_edje_fs_edj, evas_obj_visibility_set(EINA_TRUE)); 695 eo_do(g->rm_win->rm_edje_fs_edj, evas_obj_visibility_set(EINA_TRUE));
696 eo_do(g->rm_edje_fs_edc, evas_obj_visibility_set(EINA_TRUE)); 696 eo_do(g->rm_win->rm_edje_fs_edc, evas_obj_visibility_set(EINA_TRUE));
697 eo_do(g->rm_buttons_box, elm_obj_box_pack_end(g->rm_edje_box)); 697 eo_do(g->rm_win->rm_buttons_box, elm_obj_box_pack_end(g->rm_win->rm_edje_box));
698 break; 698 break;
699 } 699 }
700 case RMVIEW_STRING: 700 case RMVIEW_STRING:
701 { 701 {
702 eo_do(g->rm_value_entry, evas_obj_visibility_set(EINA_TRUE)); 702 eo_do(g->rm_win->rm_value_entry, evas_obj_visibility_set(EINA_TRUE));
703 eo_do(g->rm_buttons_box, elm_obj_box_pack_end(g->rm_value_entry)); 703 eo_do(g->rm_win->rm_buttons_box, elm_obj_box_pack_end(g->rm_win->rm_value_entry));
704 break; 704 break;
705 } 705 }
706 default: 706 default:
@@ -709,7 +709,7 @@ _rmview_build(Rmview_Resource_Type type)
709 } 709 }
710 } 710 }
711 711
712 eo_do(g->rm_buttons_box, elm_obj_box_pack_end(g->rm_button_add)); 712 eo_do(g->rm_win->rm_buttons_box, elm_obj_box_pack_end(g->rm_win->rm_button_add));
713 } 713 }
714} 714}
715 715
@@ -738,11 +738,11 @@ _rmview_toolbar_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_in
738Eina_Bool 738Eina_Bool
739_rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 739_rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
740{ 740{
741 GUI *_g = get_gui(); 741 Egui_Layout_Widgets *_g = get_gui();
742 Gui_Resource_Type res_type; 742 Gui_Resource_Type res_type;
743 const char *alias_str = NULL, *value_str = NULL; 743 const char *alias_str = NULL, *value_str = NULL;
744 const Gui_Context *ctx = _active_context_get(); 744 const Gui_Context *ctx = _active_context_get();
745 eo_do(_g->rm_alias_entry, alias_str = elm_obj_widget_part_text_get(NULL)); 745 eo_do(_g->rm_win->rm_alias_entry, alias_str = elm_obj_widget_part_text_get(NULL));
746 746
747 if (!strlen(alias_str)) 747 if (!strlen(alias_str))
748 return EO_CALLBACK_CONTINUE; 748 return EO_CALLBACK_CONTINUE;
@@ -791,21 +791,21 @@ _rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Eve
791 /* For CALLBACKS and STRINGS: check that value str is not empty. */ 791 /* For CALLBACKS and STRINGS: check that value str is not empty. */
792 if ((res_type != RESOURCE_SEQUENCE) && (res_type != RESOURCE_IMAGE) && (res_type != RESOURCE_EDJE)) 792 if ((res_type != RESOURCE_SEQUENCE) && (res_type != RESOURCE_IMAGE) && (res_type != RESOURCE_EDJE))
793 { 793 {
794 eo_do(_g->rm_value_entry, value_str = elm_obj_widget_part_text_get(NULL)); 794 eo_do(_g->rm_win->rm_value_entry, value_str = elm_obj_widget_part_text_get(NULL));
795 if (!strlen(value_str)) 795 if (!strlen(value_str))
796 return EO_CALLBACK_CONTINUE; 796 return EO_CALLBACK_CONTINUE;
797 } 797 }
798 /* For IMAGES: check that path is not empty. */ 798 /* For IMAGES: check that path is not empty. */
799 else if (res_type == RESOURCE_IMAGE) 799 else if (res_type == RESOURCE_IMAGE)
800 { 800 {
801 eo_do(_g->rm_image_fileselector, value_str = elm_interface_fileselector_path_get()); 801 eo_do(_g->rm_win->rm_image_fileselector, value_str = elm_interface_fileselector_path_get());
802 if (!strlen(value_str)) 802 if (!strlen(value_str))
803 return EO_CALLBACK_CONTINUE; 803 return EO_CALLBACK_CONTINUE;
804 } 804 }
805 /* For EDJES: check that edj path is not empty. */ 805 /* For EDJES: check that edj path is not empty. */
806 else if (res_type == RESOURCE_EDJE) 806 else if (res_type == RESOURCE_EDJE)
807 { 807 {
808 eo_do(_g->rm_edje_fs_edj, value_str = elm_interface_fileselector_path_get()); 808 eo_do(_g->rm_win->rm_edje_fs_edj, value_str = elm_interface_fileselector_path_get());
809 if (!strlen(value_str)) 809 if (!strlen(value_str))
810 return EO_CALLBACK_CONTINUE; 810 return EO_CALLBACK_CONTINUE;
811 } 811 }
@@ -822,7 +822,7 @@ _rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Eve
822 Dep_Id *dep_id = gui_context_dep_id_by_name_get(ctx, alias_str); 822 Dep_Id *dep_id = gui_context_dep_id_by_name_get(ctx, alias_str);
823 Gui_Sequence *seq = sequence_new(ctx, dep_id); 823 Gui_Sequence *seq = sequence_new(ctx, dep_id);
824 Eina_Bool state; 824 Eina_Bool state;
825 eo_do(_g->rm_seq_pub_check, state = elm_obj_check_state_get()); 825 eo_do(_g->rm_win->rm_seq_pub_check, state = elm_obj_check_state_get());
826 sequence_public_set(seq, state); 826 sequence_public_set(seq, state);
827 seqview_fill(ctx); 827 seqview_fill(ctx);
828 } 828 }
@@ -831,10 +831,10 @@ _rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Eve
831 resource_value_set(gui_res, value_str); 831 resource_value_set(gui_res, value_str);
832 if (res_type == RESOURCE_EDJE) 832 if (res_type == RESOURCE_EDJE)
833 { 833 {
834 resource_edc_path_set(gui_res, eo_do(_g->rm_edje_fs_edc, elm_interface_fileselector_path_get())); 834 resource_edc_path_set(gui_res, eo_do(_g->rm_win->rm_edje_fs_edc, elm_interface_fileselector_path_get()));
835 resource_edj_path_set(gui_res, value_str); 835 resource_edj_path_set(gui_res, value_str);
836 eo_do(_g->rm_edje_fs_edc, elm_obj_widget_part_text_set(NULL, NULL)); 836 eo_do(_g->rm_win->rm_edje_fs_edc, elm_obj_widget_part_text_set(NULL, NULL));
837 eo_do(_g->rm_edje_fs_edj, elm_obj_widget_part_text_set(NULL, NULL)); 837 eo_do(_g->rm_win->rm_edje_fs_edj, elm_obj_widget_part_text_set(NULL, NULL));
838 } 838 }
839 const Gui_Widget *wdg = gui_context_data_get(ctx, SELECTED_WDG); 839 const Gui_Widget *wdg = gui_context_data_get(ctx, SELECTED_WDG);
840 propview_build(wdg); 840 propview_build(wdg);
@@ -845,10 +845,10 @@ _rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Eve
845 } 845 }
846 846
847 _rmview_build(_rmview_toolbar_selected_type); 847 _rmview_build(_rmview_toolbar_selected_type);
848 eo_do(_g->rm_seq_pub_check, elm_obj_check_state_set(EINA_FALSE)); 848 eo_do(_g->rm_win->rm_seq_pub_check, elm_obj_check_state_set(EINA_FALSE));
849 eo_do(_g->rm_image_fileselector, elm_interface_fileselector_path_set(getenv("HOME"))); 849 eo_do(_g->rm_win->rm_image_fileselector, elm_interface_fileselector_path_set(getenv("HOME")));
850 eo_do(_g->rm_alias_entry, elm_obj_widget_part_text_set(NULL, NULL)); 850 eo_do(_g->rm_win->rm_alias_entry, elm_obj_widget_part_text_set(NULL, NULL));
851 eo_do(_g->rm_value_entry, elm_obj_widget_part_text_set(NULL, NULL)); 851 eo_do(_g->rm_win->rm_value_entry, elm_obj_widget_part_text_set(NULL, NULL));
852 return EO_CALLBACK_CONTINUE; 852 return EO_CALLBACK_CONTINUE;
853} 853}
854 854
@@ -857,15 +857,15 @@ Eina_Bool
857_rm_win_show_post_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 857_rm_win_show_post_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
858{ 858{
859 g = get_gui(); 859 g = get_gui();
860 eo_do(g->rm_toolbar, elm_obj_toolbar_item_append("emblem-photos", "Images", 860 eo_do(g->rm_win->rm_toolbar, elm_obj_toolbar_item_append("emblem-photos", "Images",
861 _rmview_toolbar_clicked, (void *) (intptr_t) RMVIEW_IMAGE)); 861 _rmview_toolbar_clicked, (void *) (intptr_t) RMVIEW_IMAGE));
862 eo_do(g->rm_toolbar, elm_obj_toolbar_item_append("emblem-photos", "Edjes", 862 eo_do(g->rm_win->rm_toolbar, elm_obj_toolbar_item_append("emblem-photos", "Edjes",
863 _rmview_toolbar_clicked, (void *) (intptr_t) RMVIEW_EDJE)); 863 _rmview_toolbar_clicked, (void *) (intptr_t) RMVIEW_EDJE));
864 eo_do(g->rm_toolbar, elm_obj_toolbar_item_append("call-start", "Callbacks", 864 eo_do(g->rm_win->rm_toolbar, elm_obj_toolbar_item_append("call-start", "Callbacks",
865 _rmview_toolbar_clicked, (void *) (intptr_t) RMVIEW_CALLBACK)); 865 _rmview_toolbar_clicked, (void *) (intptr_t) RMVIEW_CALLBACK));
866 eo_do(g->rm_toolbar, elm_obj_toolbar_item_append("format-justify-fill", "Sequences", 866 eo_do(g->rm_win->rm_toolbar, elm_obj_toolbar_item_append("format-justify-fill", "Sequences",
867 _rmview_toolbar_clicked, (void *) (intptr_t) RMVIEW_SEQUENCE)); 867 _rmview_toolbar_clicked, (void *) (intptr_t) RMVIEW_SEQUENCE));
868 eo_do(g->rm_toolbar, elm_obj_toolbar_item_append("format-text-bold", "Strings", 868 eo_do(g->rm_win->rm_toolbar, elm_obj_toolbar_item_append("format-text-bold", "Strings",
869 _rmview_toolbar_clicked, (void *) (intptr_t) RMVIEW_STRING)); 869 _rmview_toolbar_clicked, (void *) (intptr_t) RMVIEW_STRING));
870 870
871 return EO_CALLBACK_CONTINUE; 871 return EO_CALLBACK_CONTINUE;
diff --git a/src/bin/egui_gui/settings_view.c b/src/bin/egui_gui/settings_view.c
index 750c274..383ae4c 100644
--- a/src/bin/egui_gui/settings_view.c
+++ b/src/bin/egui_gui/settings_view.c
@@ -16,8 +16,8 @@ static SettingsView_Type _toolbar_selected_type = SETTINGSVIEW_NOT_SELECTED;
16static Eina_Bool 16static Eina_Bool
17_settings_apply_button_enable(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 17_settings_apply_button_enable(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
18{ 18{
19 GUI *_g = get_gui(); 19 Egui_Layout_Widgets *_g = get_gui();
20 eo_do(_g->settings_button_apply, elm_obj_widget_disabled_set(EINA_FALSE)); 20 eo_do(_g->settings_win->settings_button_apply, elm_obj_widget_disabled_set(EINA_FALSE));
21 return EO_CALLBACK_CONTINUE; 21 return EO_CALLBACK_CONTINUE;
22} 22}
23 23
@@ -26,31 +26,31 @@ static void
26_settingsview_toolbar_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 26_settingsview_toolbar_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
27{ 27{
28 SettingsView_Type type = (int) (intptr_t) data; 28 SettingsView_Type type = (int) (intptr_t) data;
29 GUI *g = get_gui(); 29 Egui_Layout_Widgets *g = get_gui();
30 if (_toolbar_selected_type == type) 30 if (_toolbar_selected_type == type)
31 return; 31 return;
32 _toolbar_selected_type = type; 32 _toolbar_selected_type = type;
33 33
34 const Gui_Context *ctx = _active_context_get(); 34 const Gui_Context *ctx = _active_context_get();
35 eo_do(g->project_name_entry, elm_obj_widget_part_text_set(NULL, gui_context_project_name_get(ctx))); 35 eo_do(g->settings_win->project_name_entry, elm_obj_widget_part_text_set(NULL, gui_context_project_name_get(ctx)));
36 eo_do(g->settings_table, elm_obj_table_pack(g->project_name_label, 0, 0, 1, 1)); 36 eo_do(g->settings_win->settings_table, elm_obj_table_pack(g->settings_win->project_name_label, 0, 0, 1, 1));
37 eo_do(g->settings_table, elm_obj_table_pack(g->project_name_entry, 1, 0, 1, 1)); 37 eo_do(g->settings_win->settings_table, elm_obj_table_pack(g->settings_win->project_name_entry, 1, 0, 1, 1));
38 eo_do(g->project_name_entry, eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER, _settings_apply_button_enable, NULL)); 38 eo_do(g->settings_win->project_name_entry, eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER, _settings_apply_button_enable, NULL));
39 39
40 eo_do(g->images_prefix_entry, elm_obj_widget_part_text_set(NULL, gui_context_images_prefix_get(ctx))); 40 eo_do(g->settings_win->images_prefix_entry, elm_obj_widget_part_text_set(NULL, gui_context_images_prefix_get(ctx)));
41 eo_do(g->settings_table, elm_obj_table_pack(g->images_prefix_label, 0, 1, 1, 1)); 41 eo_do(g->settings_win->settings_table, elm_obj_table_pack(g->settings_win->images_prefix_label, 0, 1, 1, 1));
42 eo_do(g->settings_table, elm_obj_table_pack(g->images_prefix_entry, 1, 1, 1, 1)); 42 eo_do(g->settings_win->settings_table, elm_obj_table_pack(g->settings_win->images_prefix_entry, 1, 1, 1, 1));
43 eo_do(g->images_prefix_entry, eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER, _settings_apply_button_enable, NULL)); 43 eo_do(g->settings_win->images_prefix_entry, eo_event_callback_add(ELM_ENTRY_EVENT_CHANGED_USER, _settings_apply_button_enable, NULL));
44} 44}
45 45
46/* "Apply" button "clicked" callback." */ 46/* "Apply" button "clicked" callback." */
47Eina_Bool 47Eina_Bool
48_settings_apply_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 48_settings_apply_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
49{ 49{
50 GUI *_g = get_gui(); 50 Egui_Layout_Widgets *_g = get_gui();
51 const Gui_Context *ctx = _active_context_get(); 51 const Gui_Context *ctx = _active_context_get();
52 const char *new_val = NULL, *old_val; 52 const char *new_val = NULL, *old_val;
53 eo_do(_g->project_name_entry, new_val = elm_obj_widget_part_text_get(NULL)); 53 eo_do(_g->settings_win->project_name_entry, new_val = elm_obj_widget_part_text_get(NULL));
54 old_val = gui_context_project_name_get(ctx); 54 old_val = gui_context_project_name_get(ctx);
55 if (!old_val) old_val = ""; 55 if (!old_val) old_val = "";
56 56
@@ -60,10 +60,10 @@ _settings_apply_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, cons
60 } 60 }
61 else if (!strlen(new_val)) 61 else if (!strlen(new_val))
62 { 62 {
63 eo_do(_g->project_name_entry, elm_obj_widget_part_text_set(NULL, old_val)); 63 eo_do(_g->settings_win->project_name_entry, elm_obj_widget_part_text_set(NULL, old_val));
64 } 64 }
65 65
66 eo_do(_g->images_prefix_entry, new_val = elm_obj_widget_part_text_get(NULL)); 66 eo_do(_g->settings_win->images_prefix_entry, new_val = elm_obj_widget_part_text_get(NULL));
67 old_val = gui_context_images_prefix_get(ctx); 67 old_val = gui_context_images_prefix_get(ctx);
68 68
69 //if (new_val && old_val && strlen(new_val) && (strcmp(new_val, old_val))) 69 //if (new_val && old_val && strlen(new_val) && (strcmp(new_val, old_val)))
@@ -74,10 +74,10 @@ _settings_apply_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, cons
74 } 74 }
75 else if (!new_val || !strlen(new_val)) 75 else if (!new_val || !strlen(new_val))
76 { 76 {
77 eo_do(_g->images_prefix_entry, elm_obj_widget_part_text_set(NULL, old_val)); 77 eo_do(_g->settings_win->images_prefix_entry, elm_obj_widget_part_text_set(NULL, old_val));
78 } 78 }
79 79
80 eo_do(_g->settings_button_apply, elm_obj_widget_disabled_set(EINA_TRUE)); 80 eo_do(_g->settings_win->settings_button_apply, elm_obj_widget_disabled_set(EINA_TRUE));
81 return EO_CALLBACK_CONTINUE; 81 return EO_CALLBACK_CONTINUE;
82} 82}
83 83
@@ -93,8 +93,8 @@ _settings_win_request_delete(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const
93Eina_Bool 93Eina_Bool
94_settings_win_show_post_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 94_settings_win_show_post_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
95{ 95{
96 GUI *g = get_gui(); 96 Egui_Layout_Widgets *g = get_gui();
97 eo_do(g->settings_toolbar, elm_obj_toolbar_item_append("preferences-system", "Project", 97 eo_do(g->settings_win->settings_toolbar, elm_obj_toolbar_item_append("preferences-system", "Project",
98 _settingsview_toolbar_clicked, (void *) (intptr_t) SETTINGSVIEW_MAIN)); 98 _settingsview_toolbar_clicked, (void *) (intptr_t) SETTINGSVIEW_MAIN));
99 return EO_CALLBACK_CONTINUE; 99 return EO_CALLBACK_CONTINUE;
100} 100}