summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2014-12-23 09:46:57 +0200
committerYakov Goldberg <yakov.g@samsung.com>2014-12-23 10:13:29 +0200
commitfd2df9da283b23ece3adefd033fe9c9072a885be (patch)
tree37118e42298ab59f0f34dd9bfd77cc3426f34f09 /src/bin
parent4c96ac8e23ab41db58916382a4a11744343b250c (diff)
Dep_Id renamed to Eid
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/egui_gui/cbview.c92
-rw-r--r--src/bin/egui_gui/cbview.h2
-rw-r--r--src/bin/egui_gui/contentview.c2
-rw-r--r--src/bin/egui_gui/dnd.c2
-rw-r--r--src/bin/egui_gui/editor.c284
-rw-r--r--src/bin/egui_gui/egui_logic.c10
-rw-r--r--src/bin/egui_gui/itemview.c36
-rw-r--r--src/bin/egui_gui/itemview.h4
-rw-r--r--src/bin/egui_gui/objtree.c2
-rw-r--r--src/bin/egui_gui/props_helper.c36
-rw-r--r--src/bin/egui_gui/rmview.c14
-rw-r--r--src/bin/egui_gui/settings_view.c14
12 files changed, 249 insertions, 249 deletions
diff --git a/src/bin/egui_gui/cbview.c b/src/bin/egui_gui/cbview.c
index 6542546..75d177c 100644
--- a/src/bin/egui_gui/cbview.c
+++ b/src/bin/egui_gui/cbview.c
@@ -24,7 +24,7 @@ static Eo *propview_table = NULL;
24static Eina_Hash *expanded_classes = NULL; 24static Eina_Hash *expanded_classes = NULL;
25 25
26void 26void
27cbview_item_selected_set(Dep_Id *cb_dep_id) 27cbview_item_selected_set(Eid *cb_eid)
28{ 28{
29 Elm_Object_Item *it = elm_genlist_first_item_get(cb_list); 29 Elm_Object_Item *it = elm_genlist_first_item_get(cb_list);
30 for (; it; it = elm_genlist_item_next_get(it)) 30 for (; it; it = elm_genlist_item_next_get(it))
@@ -33,7 +33,7 @@ cbview_item_selected_set(Dep_Id *cb_dep_id)
33 continue; 33 continue;
34 34
35 It_Data *it_data = elm_object_item_data_get(it); 35 It_Data *it_data = elm_object_item_data_get(it);
36 if (cb_dep_id_get(it_data->cb) == cb_dep_id) 36 if (cb_eid_get(it_data->cb) == cb_eid)
37 { 37 {
38 elm_genlist_item_selected_set(it, EINA_TRUE); 38 elm_genlist_item_selected_set(it, EINA_TRUE);
39 elm_genlist_item_bring_in(it, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE); 39 elm_genlist_item_bring_in(it, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE);
@@ -50,7 +50,7 @@ _action_type_changed(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description
50 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg; 50 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg;
51 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg); 51 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
52 52
53 Dep_Id *action_id = cb_action_id_get(cb); 53 Eid *action_id = cb_action_id_get(cb);
54 Gui_Action *new_action; 54 Gui_Action *new_action;
55 Gui_Action *old_action = action_get(action_id); 55 Gui_Action *old_action = action_get(action_id);
56 const char *type_as_string = elm_object_item_part_text_get(event_info, NULL); 56 const char *type_as_string = elm_object_item_part_text_get(event_info, NULL);
@@ -58,12 +58,12 @@ _action_type_changed(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description
58 if (!action_id) 58 if (!action_id)
59 { 59 {
60 new_action = action_new(ctx); 60 new_action = action_new(ctx);
61 action_id = action_dep_id_get(new_action); 61 action_id = action_eid_get(new_action);
62 cb = cb_new_full(ctx, cb_type_get(cb), action_id); 62 cb = cb_new_full(ctx, cb_type_get(cb), action_id);
63 const Callback_Container *cc_old = wdg_cb_container_get(wdg); 63 const Callback_Container *cc_old = wdg_cb_container_get(wdg);
64 Callback_Container *cc_new = cc_old?cb_container_copy(cc_old):cb_container_new(); 64 Callback_Container *cc_new = cc_old?cb_container_copy(cc_old):cb_container_new();
65 cb_container_cb_add(cc_new, cb); 65 cb_container_cb_add(cc_new, cb);
66 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_CALLBACK_ADD_DEL, (void *)cc_old, cc_new); 66 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_CALLBACK_ADD_DEL, (void *)cc_old, cc_new);
67 gui_context_memento_add(ctx, memento); 67 gui_context_memento_add(ctx, memento);
68 68
69 wdg_cb_container_unset(wdg); 69 wdg_cb_container_unset(wdg);
@@ -99,7 +99,7 @@ _action_type_changed(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description
99 } 99 }
100 100
101 cbview_build(it_data->wdg); 101 cbview_build(it_data->wdg);
102 cbview_item_selected_set(cb_dep_id_get(cb)); 102 cbview_item_selected_set(cb_eid_get(cb));
103 103
104 return EO_CALLBACK_CONTINUE; 104 return EO_CALLBACK_CONTINUE;
105} 105}
@@ -112,7 +112,7 @@ _action_wdg_selected(void *data, Eo *obj EINA_UNUSED, void *event_info)
112 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg; 112 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg;
113 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg); 113 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
114 114
115 Dep_Id *action_id = cb_action_id_get(cb); 115 Eid *action_id = cb_action_id_get(cb);
116 Gui_Action *action = action_get(action_id); 116 Gui_Action *action = action_get(action_id);
117 if (action) 117 if (action)
118 { 118 {
@@ -122,7 +122,7 @@ _action_wdg_selected(void *data, Eo *obj EINA_UNUSED, void *event_info)
122 gui_context_memento_add(ctx, memento); 122 gui_context_memento_add(ctx, memento);
123 123
124 const char *wdg_name = elm_object_item_part_text_get(event_info, NULL); 124 const char *wdg_name = elm_object_item_part_text_get(event_info, NULL);
125 Dep_Id *wdg_id = gui_context_dep_id_get_by_name(ctx, wdg_name); 125 Eid *wdg_id = gui_context_eid_get_by_name(ctx, wdg_name);
126 126
127 Action_Type act_type = action_type_get(new_action); 127 Action_Type act_type = action_type_get(new_action);
128 128
@@ -131,7 +131,7 @@ _action_wdg_selected(void *data, Eo *obj EINA_UNUSED, void *event_info)
131 } 131 }
132 132
133 cbview_build(it_data->wdg); 133 cbview_build(it_data->wdg);
134 cbview_item_selected_set(cb_dep_id_get(cb)); 134 cbview_item_selected_set(cb_eid_get(cb));
135} 135}
136 136
137static Eina_Bool 137static Eina_Bool
@@ -142,7 +142,7 @@ _action_parent_selected(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descript
142 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg; 142 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg;
143 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg); 143 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
144 144
145 Dep_Id *action_id = cb_action_id_get(cb); 145 Eid *action_id = cb_action_id_get(cb);
146 Gui_Action *action = action_get(action_id); 146 Gui_Action *action = action_get(action_id);
147 if (action) 147 if (action)
148 { 148 {
@@ -152,12 +152,12 @@ _action_parent_selected(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descript
152 gui_context_memento_add(ctx, memento); 152 gui_context_memento_add(ctx, memento);
153 153
154 const char *parent_name = elm_object_item_part_text_get(event_info, NULL); 154 const char *parent_name = elm_object_item_part_text_get(event_info, NULL);
155 Dep_Id *parent_id = gui_context_dep_id_get_by_name(ctx, parent_name); 155 Eid *parent_id = gui_context_eid_get_by_name(ctx, parent_name);
156 action_creation_set(new_action, action_widget_id_get(new_action), parent_id); 156 action_creation_set(new_action, action_widget_id_get(new_action), parent_id);
157 } 157 }
158 158
159 cbview_build(it_data->wdg); 159 cbview_build(it_data->wdg);
160 cbview_item_selected_set(cb_dep_id_get(cb)); 160 cbview_item_selected_set(cb_eid_get(cb));
161 return EO_CALLBACK_CONTINUE; 161 return EO_CALLBACK_CONTINUE;
162} 162}
163 163
@@ -169,7 +169,7 @@ _action_user_cb_selected(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descrip
169 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg; 169 Gui_Widget *wdg = (Gui_Widget *) it_data->wdg;
170 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg); 170 Gui_Context *ctx = (Gui_Context *) wdg_context_get(wdg);
171 171
172 Dep_Id *action_id = cb_action_id_get(cb); 172 Eid *action_id = cb_action_id_get(cb);
173 Gui_Action *action = action_get(action_id); 173 Gui_Action *action = action_get(action_id);
174 if (action) 174 if (action)
175 { 175 {
@@ -179,12 +179,12 @@ _action_user_cb_selected(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descrip
179 gui_context_memento_add(ctx, memento); 179 gui_context_memento_add(ctx, memento);
180 180
181 const char *cb_name = elm_object_item_part_text_get(event_info, NULL); 181 const char *cb_name = elm_object_item_part_text_get(event_info, NULL);
182 Dep_Id *cb_id = gui_context_dep_id_get_by_name(ctx, cb_name); 182 Eid *cb_id = gui_context_eid_get_by_name(ctx, cb_name);
183 action_user_set(new_action, cb_id, NULL); 183 action_user_set(new_action, cb_id, NULL);
184 } 184 }
185 185
186 cbview_build(it_data->wdg); 186 cbview_build(it_data->wdg);
187 cbview_item_selected_set(cb_dep_id_get(cb)); 187 cbview_item_selected_set(cb_eid_get(cb));
188 return EO_CALLBACK_CONTINUE; 188 return EO_CALLBACK_CONTINUE;
189} 189}
190 190
@@ -195,7 +195,7 @@ _action_prop_selected(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descriptio
195 Gui_Widget_Callback *cb = it_data->cb; 195 Gui_Widget_Callback *cb = it_data->cb;
196 Gui_Context *ctx = (Gui_Context *) wdg_context_get(it_data->wdg); 196 Gui_Context *ctx = (Gui_Context *) wdg_context_get(it_data->wdg);
197 197
198 Dep_Id *action_id = cb_action_id_get(cb); 198 Eid *action_id = cb_action_id_get(cb);
199 Gui_Action *action = action_get(action_id); 199 Gui_Action *action = action_get(action_id);
200 if (action) 200 if (action)
201 { 201 {
@@ -219,7 +219,7 @@ _action_prop_selected(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descriptio
219 prop_name = _split_ret[elements_count - 1]; 219 prop_name = _split_ret[elements_count - 1];
220 } 220 }
221 221
222 Dep_Id *wdg_id = action_widget_id_get(action); 222 Eid *wdg_id = action_widget_id_get(action);
223 223
224 Gui_Widget *wdg = wdg_id ? wdg_get(wdg_id) : NULL; 224 Gui_Widget *wdg = wdg_id ? wdg_get(wdg_id) : NULL;
225 Op_Desc *op = db_mro_op_desc_get(wdg_class_name_get(wdg), prop_namespace, prop_name); 225 Op_Desc *op = db_mro_op_desc_get(wdg_class_name_get(wdg), prop_namespace, prop_name);
@@ -236,7 +236,7 @@ _action_prop_selected(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descriptio
236 free(_split_ret); 236 free(_split_ret);
237 237
238 cbview_build(it_data->wdg); 238 cbview_build(it_data->wdg);
239 cbview_item_selected_set(cb_dep_id_get(cb)); 239 cbview_item_selected_set(cb_eid_get(cb));
240 } 240 }
241 return EO_CALLBACK_CONTINUE; 241 return EO_CALLBACK_CONTINUE;
242} 242}
@@ -248,7 +248,7 @@ _action_item_selected(void *data, Eo *obj, const Eo_Event_Description *desc EINA
248 Gui_Widget_Callback *cb = it_data->cb; 248 Gui_Widget_Callback *cb = it_data->cb;
249 Gui_Context *ctx = (Gui_Context *) wdg_context_get(it_data->wdg); 249 Gui_Context *ctx = (Gui_Context *) wdg_context_get(it_data->wdg);
250 250
251 Dep_Id *action_id = cb_action_id_get(cb); 251 Eid *action_id = cb_action_id_get(cb);
252 Gui_Action *action = action_get(action_id); 252 Gui_Action *action = action_get(action_id);
253 253
254 Gui_Widget_Property *prop = action_property_get(action); 254 Gui_Widget_Property *prop = action_property_get(action);
@@ -265,10 +265,10 @@ _action_item_selected(void *data, Eo *obj, const Eo_Event_Description *desc EINA
265 const char *new_item_name = elm_object_item_part_text_get(event_info, NULL); 265 const char *new_item_name = elm_object_item_part_text_get(event_info, NULL);
266 /* Set selected string on hover */ 266 /* Set selected string on hover */
267 elm_object_text_set(obj, new_item_name); 267 elm_object_text_set(obj, new_item_name);
268 Dep_Id *new_name_id = gui_context_dep_id_get_by_name(ctx, new_item_name); 268 Eid *new_name_id = gui_context_eid_get_by_name(ctx, new_item_name);
269 gui_value_name_id_set(val, GUI_TYPE_OBJECT_ITEM, new_name_id); 269 gui_value_name_id_set(val, GUI_TYPE_OBJECT_ITEM, new_name_id);
270 270
271 Dep_Id *wdg_id = action_widget_id_get(action); 271 Eid *wdg_id = action_widget_id_get(action);
272 Gui_Action *new_action = action_copy(action_id); 272 Gui_Action *new_action = action_copy(action_id);
273 Gui_Memento *memento = gui_memento_new(action_id, MEMENTO_ACTION, action, new_action); 273 Gui_Memento *memento = gui_memento_new(action_id, MEMENTO_ACTION, action, new_action);
274 gui_context_memento_add(ctx, memento); 274 gui_context_memento_add(ctx, memento);
@@ -286,7 +286,7 @@ _action_prop_update(void *data, Eo *obj, void *event_info)
286 Gui_Widget_Callback *cb = it_data->cb; 286 Gui_Widget_Callback *cb = it_data->cb;
287 Gui_Context *ctx = (Gui_Context *) wdg_context_get(it_data->wdg); 287 Gui_Context *ctx = (Gui_Context *) wdg_context_get(it_data->wdg);
288 288
289 Dep_Id *action_id = cb_action_id_get(cb); 289 Eid *action_id = cb_action_id_get(cb);
290 Gui_Action *action = action_get(action_id); 290 Gui_Action *action = action_get(action_id);
291 const Eo_Class *kl = eo_class_get(obj); 291 const Eo_Class *kl = eo_class_get(obj);
292 const Op_Desc *op; 292 const Op_Desc *op;
@@ -357,9 +357,9 @@ _action_prop_update(void *data, Eo *obj, void *event_info)
357 } 357 }
358 else if (type == GUI_TYPE_OBJECT) 358 else if (type == GUI_TYPE_OBJECT)
359 { 359 {
360 Dep_Id *dep_id = DEP_ID_GET(val); 360 Eid *eid = EID_ID_GET(val);
361 Dep_Id *new_name_id = gui_context_dep_id_get_by_name(ctx, new_enum_value); 361 Eid *new_name_id = gui_context_eid_get_by_name(ctx, new_enum_value);
362 Gui_Widget *cur_param_wdg = dep_id?wdg_get(dep_id):NULL; 362 Gui_Widget *cur_param_wdg = eid?wdg_get(eid):NULL;
363 Gui_Widget *new_param_wdg = new_name_id?wdg_get(new_name_id):NULL; 363 Gui_Widget *new_param_wdg = new_name_id?wdg_get(new_name_id):NULL;
364 /* GUI_TYPE_OBJECT ops depend on other widgets, check that widget exists. 364 /* GUI_TYPE_OBJECT ops depend on other widgets, check that widget exists.
365 * or new one not equal old one.*/ 365 * or new one not equal old one.*/
@@ -380,12 +380,12 @@ _action_prop_update(void *data, Eo *obj, void *event_info)
380 } 380 }
381 else 381 else
382 { 382 {
383 Dep_Id *new_id = gui_context_dep_id_get_by_name(_active_context_get(), new_enum_value); 383 Eid *new_id = gui_context_eid_get_by_name(_active_context_get(), new_enum_value);
384 gui_value_name_id_set(val, type, new_id); 384 gui_value_name_id_set(val, type, new_id);
385 } 385 }
386 } 386 }
387 } 387 }
388 Dep_Id *wdg_id = action_widget_id_get(action); 388 Eid *wdg_id = action_widget_id_get(action);
389 Gui_Action *new_action = action_copy(action_id); 389 Gui_Action *new_action = action_copy(action_id);
390 Gui_Memento *memento = gui_memento_new(action_id, MEMENTO_ACTION, action, new_action); 390 Gui_Memento *memento = gui_memento_new(action_id, MEMENTO_ACTION, action, new_action);
391 gui_context_memento_add(ctx, memento); 391 gui_context_memento_add(ctx, memento);
@@ -415,13 +415,13 @@ _callbacks_classname_table_expand(const Gui_Widget *wdg, const char *classname,
415 Eina_List *items = NULL; 415 Eina_List *items = NULL;
416 Gui_Widget_Callback *cb; 416 Gui_Widget_Callback *cb;
417 417
418 Dep_Id *dep_id; 418 Eid *eid;
419 EINA_LIST_FOREACH(wgdcbs, l, dep_id) 419 EINA_LIST_FOREACH(wgdcbs, l, eid)
420 { 420 {
421 cb = cb_get_from_id(dep_id); 421 cb = cb_get_from_id(eid);
422 if (!strcmp(event_name, cb_type_get(cb))) 422 if (!strcmp(event_name, cb_type_get(cb)))
423 { 423 {
424 Dep_Id *act_id = cb_action_id_get(cb); 424 Eid *act_id = cb_action_id_get(cb);
425 const Gui_Action *action = action_get(act_id); 425 const Gui_Action *action = action_get(act_id);
426 if (action) items = eina_list_append(items, cb); 426 if (action) items = eina_list_append(items, cb);
427 } 427 }
@@ -497,8 +497,8 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EIN
497 // so in that case just return what it already has. 497 // so in that case just return what it already has.
498 if (it_data->cb_wdgs) return it_data->cb_wdgs->cb_item; 498 if (it_data->cb_wdgs) return it_data->cb_wdgs->cb_item;
499 499
500 Dep_Id *dep_id = cb_action_id_get(it_data->cb); 500 Eid *eid = cb_action_id_get(it_data->cb);
501 const Gui_Action *action = action_get(dep_id); 501 const Gui_Action *action = action_get(eid);
502 502
503 Egui_Layout_Cb_Item_Widgets *wdgs; 503 Egui_Layout_Cb_Item_Widgets *wdgs;
504 Eo *cb_item_box = _mempool_cache_data_get(CACHE_CALLBACKS); 504 Eo *cb_item_box = _mempool_cache_data_get(CACHE_CALLBACKS);
@@ -535,16 +535,16 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EIN
535 Action_Type atype = action_type_get(action); 535 Action_Type atype = action_type_get(action);
536 if (atype == CREATION_ACTION || atype == MODIF_ACTION) 536 if (atype == CREATION_ACTION || atype == MODIF_ACTION)
537 { 537 {
538 Dep_Id *wdg_id = action_widget_id_get(action); 538 Eid *wdg_id = action_widget_id_get(action);
539 const char *wdg_name = NULL; 539 const char *wdg_name = NULL;
540 if (wdg_id) wdg_name = dep_name_get(wdg_id); 540 if (wdg_id) wdg_name = eid_name_get(wdg_id);
541 if (!wdg_name) wdg_name = PROP_HOVERSEL_NONE_VALUE; 541 if (!wdg_name) wdg_name = PROP_HOVERSEL_NONE_VALUE;
542 eo_do(wdgs->cb_wdgs_hsel, elm_obj_hoversel_clear()); 542 eo_do(wdgs->cb_wdgs_hsel, elm_obj_hoversel_clear());
543 if (atype == CREATION_ACTION) 543 if (atype == CREATION_ACTION)
544 { 544 {
545 props_hoversel_objects_add(wdgs->cb_item, wdgs->cb_wdgs_hsel, elm_widget_top_get(cb_list), wdg_name, gui_context_main_widgets_get(wdg_context_get(it_data->wdg)), NULL); 545 props_hoversel_objects_add(wdgs->cb_item, wdgs->cb_wdgs_hsel, elm_widget_top_get(cb_list), wdg_name, gui_context_main_widgets_get(wdg_context_get(it_data->wdg)), NULL);
546 Dep_Id *parent_id = action_creation_parent_get(action); 546 Eid *parent_id = action_creation_parent_get(action);
547 const char *parent_name = (parent_id ? dep_name_get(parent_id) : NULL); 547 const char *parent_name = (parent_id ? eid_name_get(parent_id) : NULL);
548 Eo *parents_hs = props_hoversel_objects_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), parent_name, gui_context_wdg_list_get(wdg_context_get(it_data->wdg)), NULL); 548 Eo *parents_hs = props_hoversel_objects_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), parent_name, gui_context_wdg_list_get(wdg_context_get(it_data->wdg)), NULL);
549 eo_do(parents_hs, eo_event_callback_add(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_parent_selected, it_data)); 549 eo_do(parents_hs, eo_event_callback_add(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_parent_selected, it_data));
550 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, parents_hs); 550 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, parents_hs);
@@ -557,7 +557,7 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EIN
557 } 557 }
558 if (atype == MODIF_ACTION) 558 if (atype == MODIF_ACTION)
559 { 559 {
560 Dep_Id *wdg_id = action_widget_id_get(action); 560 Eid *wdg_id = action_widget_id_get(action);
561 Gui_Widget *wdg = wdg_get(wdg_id); 561 Gui_Widget *wdg = wdg_get(wdg_id);
562 Eo *props_hover = props_hoversel_object_ops_add(wdgs->cb_item, elm_widget_top_get(cb_list), " --- ", wdg); 562 Eo *props_hover = props_hoversel_object_ops_add(wdgs->cb_item, elm_widget_top_get(cb_list), " --- ", wdg);
563 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, props_hover); 563 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, props_hover);
@@ -576,8 +576,8 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EIN
576 if (val) 576 if (val)
577 { 577 {
578 const Eina_List *items_list = item_container_item_subitems_get(wdg_item_container_root_get(wdg)); 578 const Eina_List *items_list = item_container_item_subitems_get(wdg_item_container_root_get(wdg));
579 Dep_Id *cur_item = DEP_ID_GET(val); 579 Eid *cur_item = EID_ID_GET(val);
580 const char *cur_item_name = dep_name_get(cur_item)?:" --- "; 580 const char *cur_item_name = eid_name_get(cur_item)?:" --- ";
581 Eo *items_hover = props_hoversel_objects_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), cur_item_name, items_list, NULL); 581 Eo *items_hover = props_hoversel_objects_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), cur_item_name, items_list, NULL);
582 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, items_hover); 582 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, items_hover);
583 eo_do(items_hover, eo_event_callback_add(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_item_selected, it_data)); 583 eo_do(items_hover, eo_event_callback_add(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_item_selected, it_data));
@@ -610,8 +610,8 @@ _item_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EIN
610 } 610 }
611 if (atype == USER_ACTION) 611 if (atype == USER_ACTION)
612 { 612 {
613 Dep_Id *cb_id = action_user_cb_id_get(action); 613 Eid *cb_id = action_user_cb_id_get(action);
614 const char *cb_name = (cb_id ? dep_name_get(cb_id) : NULL); 614 const char *cb_name = (cb_id ? eid_name_get(cb_id) : NULL);
615 Eo *cbs_hs = props_hoversel_resources_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), cb_name, wdg_context_get(it_data->wdg), RESOURCE_EO_CALLBACK); 615 Eo *cbs_hs = props_hoversel_resources_add(wdgs->cb_item, NULL, elm_widget_top_get(cb_list), cb_name, wdg_context_get(it_data->wdg), RESOURCE_EO_CALLBACK);
616 eo_do(cbs_hs, eo_event_callback_add(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_user_cb_selected, it_data)); 616 eo_do(cbs_hs, eo_event_callback_add(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _action_user_cb_selected, it_data));
617 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, cbs_hs); 617 it_data->cb_dyn_objs = eina_list_append(it_data->cb_dyn_objs, cbs_hs);
@@ -699,14 +699,14 @@ _selected_callback_move(int dir)
699 cc_new = cb_container_copy(cc_old); 699 cc_new = cb_container_copy(cc_old);
700 if (cb_container_cb_move(cc_new, cb, dir)) 700 if (cb_container_cb_move(cc_new, cb, dir))
701 { 701 {
702 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_CALLBACK_ADD_DEL, (void *)cc_old, cc_new); 702 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_CALLBACK_ADD_DEL, (void *)cc_old, cc_new);
703 gui_context_memento_add((Gui_Context *) wdg_context_get(wdg), memento); 703 gui_context_memento_add((Gui_Context *) wdg_context_get(wdg), memento);
704 704
705 wdg_cb_container_unset((Gui_Widget *) wdg); 705 wdg_cb_container_unset((Gui_Widget *) wdg);
706 wdg_cb_container_set((Gui_Widget *) wdg, cc_new); 706 wdg_cb_container_set((Gui_Widget *) wdg, cc_new);
707 707
708 cbview_build(wdg); 708 cbview_build(wdg);
709 cbview_item_selected_set(cb_dep_id_get(cb)); 709 cbview_item_selected_set(cb_eid_get(cb));
710 } 710 }
711 /* If nothing wasn't move, delete Callback_Container */ 711 /* If nothing wasn't move, delete Callback_Container */
712 else 712 else
@@ -748,14 +748,14 @@ _callbacksview_del_btn_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, cons
748 cc_old = wdg_cb_container_get(wdg); 748 cc_old = wdg_cb_container_get(wdg);
749 cc_new = cb_container_copy(cc_old); 749 cc_new = cb_container_copy(cc_old);
750 cb_container_cb_remove(cc_new, cb); 750 cb_container_cb_remove(cc_new, cb);
751 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_CALLBACK_ADD_DEL, (void *)cc_old, cc_new); 751 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_CALLBACK_ADD_DEL, (void *)cc_old, cc_new);
752 gui_context_memento_add((Gui_Context *) wdg_context_get(wdg), memento); 752 gui_context_memento_add((Gui_Context *) wdg_context_get(wdg), memento);
753 753
754 wdg_cb_container_unset((Gui_Widget *) wdg); 754 wdg_cb_container_unset((Gui_Widget *) wdg);
755 wdg_cb_container_set((Gui_Widget *) wdg, cc_new); 755 wdg_cb_container_set((Gui_Widget *) wdg, cc_new);
756 756
757 cbview_build(wdg); 757 cbview_build(wdg);
758 cbview_item_selected_set(cb_dep_id_get(cb)); 758 cbview_item_selected_set(cb_eid_get(cb));
759 } 759 }
760 return EO_CALLBACK_CONTINUE; 760 return EO_CALLBACK_CONTINUE;
761} 761}
diff --git a/src/bin/egui_gui/cbview.h b/src/bin/egui_gui/cbview.h
index 3fd7119..1fd2ac9 100644
--- a/src/bin/egui_gui/cbview.h
+++ b/src/bin/egui_gui/cbview.h
@@ -12,6 +12,6 @@ void
12cbview_shutdown(void); 12cbview_shutdown(void);
13 13
14void 14void
15cbview_item_selected_set(Dep_Id *cb_dep_id); 15cbview_item_selected_set(Eid *cb_eid);
16 16
17#endif 17#endif
diff --git a/src/bin/egui_gui/contentview.c b/src/bin/egui_gui/contentview.c
index 25655b9..1e5acdb 100644
--- a/src/bin/egui_gui/contentview.c
+++ b/src/bin/egui_gui/contentview.c
@@ -100,7 +100,7 @@ contentview_build(const Gui_Widget *wdg)
100 100
101 EINA_LIST_FOREACH(items_lst, l, ci) 101 EINA_LIST_FOREACH(items_lst, l, ci)
102 { 102 {
103 Dep_Id *item_id = obj_container_item_dep_id_get(ci); 103 Eid *item_id = obj_container_item_eid_get(ci);
104 if (IS_ID_VALID(item_id) && !wdg_get(item_id)) continue; 104 if (IS_ID_VALID(item_id) && !wdg_get(item_id)) continue;
105 105
106 Gui_Widget_Property *prop = obj_container_item_prop_get(ci); 106 Gui_Widget_Property *prop = obj_container_item_prop_get(ci);
diff --git a/src/bin/egui_gui/dnd.c b/src/bin/egui_gui/dnd.c
index 0579639..d4386d3 100644
--- a/src/bin/egui_gui/dnd.c
+++ b/src/bin/egui_gui/dnd.c
@@ -152,7 +152,7 @@ static void
152_drop_target_iterate(Gui_Widget **drop_candidate, const Gui_Session *session, Evas_Coord x, Evas_Coord y) 152_drop_target_iterate(Gui_Widget **drop_candidate, const Gui_Session *session, Evas_Coord x, Evas_Coord y)
153{ 153{
154 Eina_Bool stop = EINA_TRUE; 154 Eina_Bool stop = EINA_TRUE;
155 Dep_Id *wdg_id; 155 Eid *wdg_id;
156 Eo *o; 156 Eo *o;
157 Evas_Coord ox, oy, ow, oh; 157 Evas_Coord ox, oy, ow, oh;
158 double aprx = 0.05; 158 double aprx = 0.05;
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index dd10705..eab1d67 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -126,7 +126,7 @@ Eina_Bool
126widget_name_change(Gui_Widget *wdg, const char *str) 126widget_name_change(Gui_Widget *wdg, const char *str)
127{ 127{
128 const Gui_Context *ctx = wdg_context_get(wdg); 128 const Gui_Context *ctx = wdg_context_get(wdg);
129 if (!dep_rename(wdg_dep_id_get(wdg), str)) 129 if (!eid_rename(wdg_eid_get(wdg), str))
130 { 130 {
131 ERR("Name \"%s\" already exists!", str); 131 ERR("Name \"%s\" already exists!", str);
132 return EINA_FALSE; 132 return EINA_FALSE;
@@ -145,7 +145,7 @@ _canvas_free_coords_get(const Gui_Context *ctx, Evas_Coord x_fix, Evas_Coord y_f
145 Evas_Coord x0 = 340 + x_fix, y0 = 120 + y_fix, w0 = 1060, h0 = 900, retx, rety, ymax = 120; 145 Evas_Coord x0 = 340 + x_fix, y0 = 120 + y_fix, w0 = 1060, h0 = 900, retx, rety, ymax = 120;
146 Eina_List *main_widgets = gui_context_main_widgets_get(ctx); 146 Eina_List *main_widgets = gui_context_main_widgets_get(ctx);
147 Eina_List *itr; 147 Eina_List *itr;
148 Dep_Id *wdg_id; 148 Eid *wdg_id;
149 retx = x0; 149 retx = x0;
150 rety = y0; 150 rety = y0;
151 151
@@ -445,7 +445,7 @@ static void
445_iter_widget_delete(Gui_Widget *wdg) 445_iter_widget_delete(Gui_Widget *wdg)
446{ 446{
447 const Eina_List *children = NULL, *l, *l2; 447 const Eina_List *children = NULL, *l, *l2;
448 Dep_Id *wid; 448 Eid *wid;
449 Gui_Session *session = (Gui_Session *) gui_context_editor_session_get(_active_context_get()); 449 Gui_Session *session = (Gui_Session *) gui_context_editor_session_get(_active_context_get());
450 450
451 children = wdg_children_list_get(wdg); 451 children = wdg_children_list_get(wdg);
@@ -503,7 +503,7 @@ static void
503_drag_widget_iterate(Gui_Widget **drag_candidate, const Gui_Session *session, Evas_Coord x, Evas_Coord y) 503_drag_widget_iterate(Gui_Widget **drag_candidate, const Gui_Session *session, Evas_Coord x, Evas_Coord y)
504{ 504{
505 Eina_Bool stop = EINA_TRUE; 505 Eina_Bool stop = EINA_TRUE;
506 Dep_Id *wdg_id; 506 Eid *wdg_id;
507 Eo *o; 507 Eo *o;
508 Evas_Coord ox, oy, ow, oh; 508 Evas_Coord ox, oy, ow, oh;
509 double aprx = 0.05; 509 double aprx = 0.05;
@@ -571,7 +571,7 @@ _mouse_down_main(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_
571 objtree_item_selected_set(wdg); 571 objtree_item_selected_set(wdg);
572} 572}
573 573
574/* Callback, called when depress mouse button */ 574/* Callback, called when eidress mouse button */
575static void 575static void
576_mouse_up_main(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 576_mouse_up_main(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
577{ 577{
@@ -836,7 +836,7 @@ _marker_mouse_up(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUS
836 goto end; 836 goto end;
837 } 837 }
838 Gui_Memento *memento = NULL; 838 Gui_Memento *memento = NULL;
839 memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_PROPERTY, _mmd->prop_size, prop); 839 memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_PROPERTY, _mmd->prop_size, prop);
840 gui_context_memento_add(_active_context_get(), memento); 840 gui_context_memento_add(_active_context_get(), memento);
841 } 841 }
842 842
@@ -861,7 +861,7 @@ _marker_mouse_up(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUS
861 goto end; 861 goto end;
862 } 862 }
863 Gui_Memento *memento = NULL; 863 Gui_Memento *memento = NULL;
864 memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_PROPERTY, _mmd->prop_pos, prop); 864 memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_PROPERTY, _mmd->prop_pos, prop);
865 gui_memento_append((Gui_Memento *) gui_context_current_memento_get(_active_context_get()), memento); 865 gui_memento_append((Gui_Memento *) gui_context_current_memento_get(_active_context_get()), memento);
866 } 866 }
867 } 867 }
@@ -967,7 +967,7 @@ _frame_mouse_up(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *des
967static void 967static void
968_iter_widget_create(Gui_Widget *wdg, const Eo *parent_win) 968_iter_widget_create(Gui_Widget *wdg, const Eo *parent_win)
969{ 969{
970 Dep_Id *wid; 970 Eid *wid;
971 971
972 /* Windows are iterated separately. If parent is NULL, means that current object is not win. 972 /* Windows are iterated separately. If parent is NULL, means that current object is not win.
973 * If iterated object is win, I create it as inlined_image and add frame to simulate win.*/ 973 * If iterated object is win, I create it as inlined_image and add frame to simulate win.*/
@@ -1132,7 +1132,7 @@ _edc_file_updated(void *data, Ecore_File_Monitor *em EINA_UNUSED, Ecore_File_Eve
1132 system(eina_strbuf_string_get(strbuf)); 1132 system(eina_strbuf_string_get(strbuf));
1133 eina_strbuf_free(strbuf); 1133 eina_strbuf_free(strbuf);
1134 /* we update the observers only if the invocation is from the system and not from _widget_prop_add */ 1134 /* we update the observers only if the invocation is from the system and not from _widget_prop_add */
1135 if (file_path) gui_context_dep_observers_invoke(resource_dep_id_get(res)); 1135 if (file_path) observers_invoke(resource_eid_get(res));
1136 break; 1136 break;
1137 } 1137 }
1138 default: 1138 default:
@@ -1146,7 +1146,7 @@ _widget_prop_add(Gui_Session *session, const Gui_Widget *wdg, const Gui_Widget_P
1146 if (IS_LAYOUT(wdg) && !strcmp(prop_name_get(prop), FILE_SET)) 1146 if (IS_LAYOUT(wdg) && !strcmp(prop_name_get(prop), FILE_SET))
1147 { 1147 {
1148 Gui_Value *v = prop_value_nth_get(prop, 0); 1148 Gui_Value *v = prop_value_nth_get(prop, 0);
1149 Dep_Id *res_id = DEP_ID_GET(v); 1149 Eid *res_id = EID_ID_GET(v);
1150 Gui_Resource *res = (Gui_Resource *)resource_get_from_id(res_id); 1150 Gui_Resource *res = (Gui_Resource *)resource_get_from_id(res_id);
1151 if (resource_type_get(res) == RESOURCE_EDJE) 1151 if (resource_type_get(res) == RESOURCE_EDJE)
1152 { 1152 {
@@ -1206,7 +1206,7 @@ _widget_prop_add(Gui_Session *session, const Gui_Widget *wdg, const Gui_Widget_P
1206 if (IS_LAYOUT(wdg) && !strcmp(prop_name_get(prop), FILE_SET)) 1206 if (IS_LAYOUT(wdg) && !strcmp(prop_name_get(prop), FILE_SET))
1207 { 1207 {
1208 Gui_Value *v = prop_value_nth_get(prop, 0); 1208 Gui_Value *v = prop_value_nth_get(prop, 0);
1209 Dep_Id *res_id = DEP_ID_GET(v); 1209 Eid *res_id = EID_ID_GET(v);
1210 const Gui_Resource *res = resource_get_from_id(res_id); 1210 const Gui_Resource *res = resource_get_from_id(res_id);
1211 if (resource_type_get(res) == RESOURCE_EDJE) 1211 if (resource_type_get(res) == RESOURCE_EDJE)
1212 { 1212 {
@@ -1275,25 +1275,25 @@ _widget_item_add(Gui_Session *session, const Gui_Widget *wdg, const Item_Contain
1275 if (IS_NAVIFRAME(wdg) && !strcmp(prop_name_get(prop), ITEM_PUSH)) 1275 if (IS_NAVIFRAME(wdg) && !strcmp(prop_name_get(prop), ITEM_PUSH))
1276 { 1276 {
1277 Gui_Value *val = prop_value_nth_get(prop, 1); 1277 Gui_Value *val = prop_value_nth_get(prop, 1);
1278 Dep_Id *wid = DEP_ID_GET(val); 1278 Eid *wid = EID_ID_GET(val);
1279 if (!wid) gui_value_name_id_set(val, GUI_TYPE_OBJECT, DUMMY_ID); 1279 if (!wid) gui_value_name_id_set(val, GUI_TYPE_OBJECT, DUMMY_ID);
1280 1280
1281 val = prop_value_nth_get(prop, 2); 1281 val = prop_value_nth_get(prop, 2);
1282 wid = DEP_ID_GET(val); 1282 wid = EID_ID_GET(val);
1283 if (!wid) gui_value_name_id_set(val, GUI_TYPE_OBJECT, DUMMY_ID); 1283 if (!wid) gui_value_name_id_set(val, GUI_TYPE_OBJECT, DUMMY_ID);
1284 1284
1285 val = prop_value_nth_get(prop, 3); 1285 val = prop_value_nth_get(prop, 3);
1286 wid = DEP_ID_GET(val); 1286 wid = EID_ID_GET(val);
1287 if (!wid) gui_value_name_id_set(val, GUI_TYPE_OBJECT, DUMMY_ID); 1287 if (!wid) gui_value_name_id_set(val, GUI_TYPE_OBJECT, DUMMY_ID);
1288 } 1288 }
1289 it = _ffi_eo_item_add(session, wdg, wit, data, _dummy_obj_get); 1289 it = _ffi_eo_item_add(session, wdg, wit, data, _dummy_obj_get);
1290 session_item_set(session, wit, it); 1290 session_item_set(session, wit, it);
1291 1291
1292 /* FIXME: Delete together with call in manager_widget_configure */ 1292 /* FIXME: Delete together with call in manager_widget_configure */
1293 Dep_Id *dep_id_itr; 1293 Eid *eid_itr;
1294 EINA_LIST_FOREACH(item_container_item_subitems_get(wit), itr, dep_id_itr) 1294 EINA_LIST_FOREACH(item_container_item_subitems_get(wit), itr, eid_itr)
1295 { 1295 {
1296 Item_Container_Item *witr = item_container_item_get_from_id(dep_id_itr); 1296 Item_Container_Item *witr = item_container_item_get_from_id(eid_itr);
1297 manager_widget_items_add(session, wdg, witr, MODE_EDITOR, data); 1297 manager_widget_items_add(session, wdg, witr, MODE_EDITOR, data);
1298 } 1298 }
1299 return EINA_TRUE; 1299 return EINA_TRUE;
@@ -1347,7 +1347,7 @@ static Eo*
1347_iter_dragged_widget_create(Gui_Session *session, const Gui_Widget *wdg, Eo *parent_win) 1347_iter_dragged_widget_create(Gui_Session *session, const Gui_Widget *wdg, Eo *parent_win)
1348{ 1348{
1349 const Eina_List *children = NULL, *l; 1349 const Eina_List *children = NULL, *l;
1350 Dep_Id *wid; 1350 Eid *wid;
1351 1351
1352 /* Windows are iterated separately. If parent is NULL, means that current object is not win. 1352 /* Windows are iterated separately. If parent is NULL, means that current object is not win.
1353 * If iterated object is win, I create it as inlined_image and add frame to simulate win.*/ 1353 * If iterated object is win, I create it as inlined_image and add frame to simulate win.*/
@@ -1550,13 +1550,13 @@ _drop_target_leave(void *data, Evas_Object *obj EINA_UNUSED)
1550 { 1550 {
1551 Gui_Widget_Property *prop = obj_container_item_prop_get(it); 1551 Gui_Widget_Property *prop = obj_container_item_prop_get(it);
1552 int ix, iy, iw, ih; 1552 int ix, iy, iw, ih;
1553 Dep_Id *dep_id; 1553 Eid *eid;
1554 ix = INT_GET(prop_value_nth_get(prop, 1)); 1554 ix = INT_GET(prop_value_nth_get(prop, 1));
1555 iy = INT_GET(prop_value_nth_get(prop, 2)); 1555 iy = INT_GET(prop_value_nth_get(prop, 2));
1556 iw = INT_GET(prop_value_nth_get(prop, 3)); 1556 iw = INT_GET(prop_value_nth_get(prop, 3));
1557 ih = INT_GET(prop_value_nth_get(prop, 4)); 1557 ih = INT_GET(prop_value_nth_get(prop, 4));
1558 dep_id = DEP_ID_GET(prop_value_nth_get(prop, 0)); 1558 eid = EID_ID_GET(prop_value_nth_get(prop, 0));
1559 Eo *c = session_eo_get(session, wdg_get(dep_id)); 1559 Eo *c = session_eo_get(session, wdg_get(eid));
1560 eo_do(wdg_eo, elm_obj_table_pack(c, ix, iy, iw, ih)); 1560 eo_do(wdg_eo, elm_obj_table_pack(c, ix, iy, iw, ih));
1561 } 1561 }
1562 di->packed = EINA_FALSE; 1562 di->packed = EINA_FALSE;
@@ -1623,7 +1623,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1623 if (!strcmp(wdg_class_name_get(wdg), DB_DEF_BOX_CLASS)) 1623 if (!strcmp(wdg_class_name_get(wdg), DB_DEF_BOX_CLASS))
1624 { 1624 {
1625 /* Get current(previous) index of draggable wdg. */ 1625 /* Get current(previous) index of draggable wdg. */
1626 int cur_visual_idx = wdg_obj_container_item_idx_get(wdg, wdg_dep_id_get(new_wdg), EINA_TRUE); 1626 int cur_visual_idx = wdg_obj_container_item_idx_get(wdg, wdg_eid_get(new_wdg), EINA_TRUE);
1627 int reorder_delta = di->box_pack_idx - cur_visual_idx; 1627 int reorder_delta = di->box_pack_idx - cur_visual_idx;
1628 1628
1629 Object_Container *_old_container, *_new_container; 1629 Object_Container *_old_container, *_new_container;
@@ -1637,7 +1637,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1637 /* If anything was reordered, need to reload content. */ 1637 /* If anything was reordered, need to reload content. */
1638 if (wdg_obj_container_content_reorder(wdg, cur_visual_idx, reorder_delta)) 1638 if (wdg_obj_container_content_reorder(wdg, cur_visual_idx, reorder_delta))
1639 { 1639 {
1640 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container); 1640 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container);
1641 gui_context_memento_add(_active_context_get(), memento); 1641 gui_context_memento_add(_active_context_get(), memento);
1642 } 1642 }
1643 obj_container_unref(_old_container); 1643 obj_container_unref(_old_container);
@@ -1645,7 +1645,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1645 else if (!strcmp(wdg_class_name_get(wdg), DB_DEF_TABLE_CLASS)) 1645 else if (!strcmp(wdg_class_name_get(wdg), DB_DEF_TABLE_CLASS))
1646 { 1646 {
1647 Object_Container_Item *ci = wdg_obj_container_item_get(wdg, -1, wdg_name_get(new_wdg)); 1647 Object_Container_Item *ci = wdg_obj_container_item_get(wdg, -1, wdg_name_get(new_wdg));
1648 Dep_Id *ci_dep_id = obj_container_item_dep_id_get(ci); 1648 Eid *ci_eid = obj_container_item_eid_get(ci);
1649 const Gui_Widget_Property *ci_prop = obj_container_item_prop_get(ci); 1649 const Gui_Widget_Property *ci_prop = obj_container_item_prop_get(ci);
1650 if ((INT_GET(prop_value_nth_get(ci_prop, 1)) != di->table_pack_x) || 1650 if ((INT_GET(prop_value_nth_get(ci_prop, 1)) != di->table_pack_x) ||
1651 (INT_GET(prop_value_nth_get(ci_prop, 2)) != di->table_pack_y)) 1651 (INT_GET(prop_value_nth_get(ci_prop, 2)) != di->table_pack_y))
@@ -1654,7 +1654,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1654 _old_container = (Object_Container *) wdg_obj_container_get((Gui_Widget *) wdg); 1654 _old_container = (Object_Container *) wdg_obj_container_get((Gui_Widget *) wdg);
1655 _new_container = obj_container_copy(_old_container); 1655 _new_container = obj_container_copy(_old_container);
1656 1656
1657 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container); 1657 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container);
1658 gui_context_memento_add((Gui_Context *) ctx, memento); 1658 gui_context_memento_add((Gui_Context *) ctx, memento);
1659 1659
1660 Eina_List *old_lst = wdg_obj_container_contents_list_get(wdg); 1660 Eina_List *old_lst = wdg_obj_container_contents_list_get(wdg);
@@ -1673,12 +1673,12 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1673 { 1673 {
1674 int ix, iy, iw, ih; 1674 int ix, iy, iw, ih;
1675 Gui_Widget_Property *prop = obj_container_item_prop_get(it); 1675 Gui_Widget_Property *prop = obj_container_item_prop_get(it);
1676 Dep_Id *dep_id = obj_container_item_dep_id_get(it); 1676 Eid *eid = obj_container_item_eid_get(it);
1677 Gui_Widget_Property *new_prop = prop_copy(prop); 1677 Gui_Widget_Property *new_prop = prop_copy(prop);
1678 Eo *c = session_eo_get(session, wdg_get(dep_id)); 1678 Eo *c = session_eo_get(session, wdg_get(eid));
1679 eo_do(wdg_eo, elm_obj_table_pack_get(c, &ix, &iy, &iw, &ih)); 1679 eo_do(wdg_eo, elm_obj_table_pack_get(c, &ix, &iy, &iw, &ih));
1680 1680
1681 if (dep_id == ci_dep_id) 1681 if (eid == ci_eid)
1682 { 1682 {
1683 ix = di->table_pack_x; 1683 ix = di->table_pack_x;
1684 iy = di->table_pack_y; 1684 iy = di->table_pack_y;
@@ -1686,7 +1686,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1686 gui_value_int_set(prop_value_nth_get(new_prop, 1), ix); 1686 gui_value_int_set(prop_value_nth_get(new_prop, 1), ix);
1687 gui_value_int_set(prop_value_nth_get(new_prop, 2), iy); 1687 gui_value_int_set(prop_value_nth_get(new_prop, 2), iy);
1688 1688
1689 ci = obj_container_item_new(new_prop, dep_id); 1689 ci = obj_container_item_new(new_prop, eid);
1690 wdg_obj_container_item_add((Gui_Widget *) wdg, ci, -1); 1690 wdg_obj_container_item_add((Gui_Widget *) wdg, ci, -1);
1691 } 1691 }
1692 } 1692 }
@@ -1718,7 +1718,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1718 propview_item_update(prop); 1718 propview_item_update(prop);
1719 1719
1720 Gui_Memento *memento = NULL; 1720 Gui_Memento *memento = NULL;
1721 memento = gui_memento_new(wdg_dep_id_get(new_wdg), MEMENTO_PROPERTY, old_prop, prop); 1721 memento = gui_memento_new(wdg_eid_get(new_wdg), MEMENTO_PROPERTY, old_prop, prop);
1722 1722
1723 /* If drag_data != EDITOR_DRAG_DATA then new widget wass dragged from the factory, 1723 /* If drag_data != EDITOR_DRAG_DATA then new widget wass dragged from the factory,
1724 * so memento must be added to the previous one. */ 1724 * so memento must be added to the previous one. */
@@ -1753,7 +1753,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1753 Object_Container *_old_prev_container, *_new_prev_container; 1753 Object_Container *_old_prev_container, *_new_prev_container;
1754 _old_prev_container = (Object_Container *) wdg_obj_container_get((Gui_Widget *) prev_wdg_container); 1754 _old_prev_container = (Object_Container *) wdg_obj_container_get((Gui_Widget *) prev_wdg_container);
1755 _new_prev_container = obj_container_copy(_old_prev_container); 1755 _new_prev_container = obj_container_copy(_old_prev_container);
1756 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(prev_wdg_container), 1756 Gui_Memento *memento = gui_memento_new(wdg_eid_get(prev_wdg_container),
1757 MEMENTO_OBJ_CONTAINER_ITEM, 1757 MEMENTO_OBJ_CONTAINER_ITEM,
1758 _old_prev_container, _new_prev_container); 1758 _old_prev_container, _new_prev_container);
1759 gui_context_memento_add((Gui_Context *) ctx, memento); 1759 gui_context_memento_add((Gui_Context *) ctx, memento);
@@ -1767,7 +1767,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1767 /* If dragging from a widget(window), unset parent*/ 1767 /* If dragging from a widget(window), unset parent*/
1768 else if (wdg_parent && (wdg_parent != wdg)) 1768 else if (wdg_parent && (wdg_parent != wdg))
1769 { 1769 {
1770 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(new_wdg), 1770 Gui_Memento *memento = gui_memento_new(wdg_eid_get(new_wdg),
1771 MEMENTO_WIDGET_PARENT, 1771 MEMENTO_WIDGET_PARENT,
1772 wdg_parent_id_get(new_wdg), NULL); 1772 wdg_parent_id_get(new_wdg), NULL);
1773 gui_context_memento_add((Gui_Context *) ctx, memento); 1773 gui_context_memento_add((Gui_Context *) ctx, memento);
@@ -1775,7 +1775,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1775 } 1775 }
1776 else if (!wdg_parent) 1776 else if (!wdg_parent)
1777 { 1777 {
1778 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(new_wdg), 1778 Gui_Memento *memento = gui_memento_new(wdg_eid_get(new_wdg),
1779 MEMENTO_WIDGET_PARENT, 1779 MEMENTO_WIDGET_PARENT,
1780 NULL, NULL); 1780 NULL, NULL);
1781 gui_context_memento_add((Gui_Context *) ctx, memento); 1781 gui_context_memento_add((Gui_Context *) ctx, memento);
@@ -1783,7 +1783,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1783 1783
1784 if (!wdg) 1784 if (!wdg)
1785 { 1785 {
1786 Gui_Memento *memento_next = gui_memento_new(wdg_dep_id_get(new_wdg), 1786 Gui_Memento *memento_next = gui_memento_new(wdg_eid_get(new_wdg),
1787 MEMENTO_WIDGET_PARENT, 1787 MEMENTO_WIDGET_PARENT,
1788 wdg_parent_id_get(new_wdg), NULL); 1788 wdg_parent_id_get(new_wdg), NULL);
1789 gui_memento_append((Gui_Memento *) gui_context_current_memento_get(ctx), memento_next); 1789 gui_memento_append((Gui_Memento *) gui_context_current_memento_get(ctx), memento_next);
@@ -1796,9 +1796,9 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1796 } 1796 }
1797 else if (wdg && IS_WIN(wdg)) 1797 else if (wdg && IS_WIN(wdg))
1798 { 1798 {
1799 Gui_Memento *memento_next = gui_memento_new(wdg_dep_id_get(new_wdg), 1799 Gui_Memento *memento_next = gui_memento_new(wdg_eid_get(new_wdg),
1800 MEMENTO_WIDGET_PARENT, 1800 MEMENTO_WIDGET_PARENT,
1801 wdg_parent_id_get(new_wdg), wdg_dep_id_get(wdg)); 1801 wdg_parent_id_get(new_wdg), wdg_eid_get(wdg));
1802 gui_memento_append((Gui_Memento *) gui_context_current_memento_get(ctx), memento_next); 1802 gui_memento_append((Gui_Memento *) gui_context_current_memento_get(ctx), memento_next);
1803 wdg_parent_set((Gui_Widget *) new_wdg, wdg_name_get(wdg)); 1803 wdg_parent_set((Gui_Widget *) new_wdg, wdg_name_get(wdg));
1804 } 1804 }
@@ -1813,7 +1813,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1813 _old_container = (Object_Container *) wdg_obj_container_get(wdg); 1813 _old_container = (Object_Container *) wdg_obj_container_get(wdg);
1814 _new_container = obj_container_copy(_old_container); 1814 _new_container = obj_container_copy(_old_container);
1815 1815
1816 Gui_Memento *memento_next = gui_memento_new(wdg_dep_id_get(wdg), 1816 Gui_Memento *memento_next = gui_memento_new(wdg_eid_get(wdg),
1817 MEMENTO_OBJ_CONTAINER_ITEM, 1817 MEMENTO_OBJ_CONTAINER_ITEM,
1818 _old_container, _new_container); 1818 _old_container, _new_container);
1819 /* Current memento is a memento created, during _factory _widget_create earlier in this func. */ 1819 /* Current memento is a memento created, during _factory _widget_create earlier in this func. */
@@ -1824,9 +1824,9 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1824 const Op_Desc *op_desc = db_container_desc_op_desc_get(db_container_desc_get(wdg_class_name_get(wdg)), CONTAINER_PACK); 1824 const Op_Desc *op_desc = db_container_desc_op_desc_get(db_container_desc_get(wdg_class_name_get(wdg)), CONTAINER_PACK);
1825 Gui_Widget_Property *prop = prop_create_for_op(op_desc); 1825 Gui_Widget_Property *prop = prop_create_for_op(op_desc);
1826 Gui_Value *val = prop_value_nth_get(prop, 0); 1826 Gui_Value *val = prop_value_nth_get(prop, 0);
1827 gui_value_name_id_set(val, GUI_TYPE_OBJECT, wdg_dep_id_get(new_wdg)); 1827 gui_value_name_id_set(val, GUI_TYPE_OBJECT, wdg_eid_get(new_wdg));
1828 1828
1829 Object_Container_Item *ci = obj_container_item_new(prop, wdg_dep_id_get(new_wdg)); 1829 Object_Container_Item *ci = obj_container_item_new(prop, wdg_eid_get(new_wdg));
1830 wdg_obj_container_item_add(wdg, ci, di->box_pack_idx); 1830 wdg_obj_container_item_add(wdg, ci, di->box_pack_idx);
1831 } 1831 }
1832 else if (wdg && !strcmp(wdg_class_name_get(wdg), DB_DEF_TABLE_CLASS)) 1832 else if (wdg && !strcmp(wdg_class_name_get(wdg), DB_DEF_TABLE_CLASS))
@@ -1838,7 +1838,7 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1838 _old_container = (Object_Container *) wdg_obj_container_get(wdg); 1838 _old_container = (Object_Container *) wdg_obj_container_get(wdg);
1839 _new_container = obj_container_copy(_old_container); 1839 _new_container = obj_container_copy(_old_container);
1840 1840
1841 Gui_Memento *memento_next = gui_memento_new(wdg_dep_id_get(wdg), 1841 Gui_Memento *memento_next = gui_memento_new(wdg_eid_get(wdg),
1842 MEMENTO_OBJ_CONTAINER_ITEM, 1842 MEMENTO_OBJ_CONTAINER_ITEM,
1843 _old_container, _new_container); 1843 _old_container, _new_container);
1844 /* Current memento is a memento created, during _factory _widget_create earlier in this func. */ 1844 /* Current memento is a memento created, during _factory _widget_create earlier in this func. */
@@ -1859,14 +1859,14 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1859 Gui_Widget_Property *prop = obj_container_item_prop_get(it); 1859 Gui_Widget_Property *prop = obj_container_item_prop_get(it);
1860 Gui_Widget_Property *new_prop = prop_copy(prop); 1860 Gui_Widget_Property *new_prop = prop_copy(prop);
1861 int ix, iy, iw, ih; 1861 int ix, iy, iw, ih;
1862 Dep_Id *dep_id = obj_container_item_dep_id_get(it); 1862 Eid *eid = obj_container_item_eid_get(it);
1863 Eo *c = session_eo_get(session, wdg_get(dep_id)); 1863 Eo *c = session_eo_get(session, wdg_get(eid));
1864 eo_do(wdg_eo, elm_obj_table_pack_get(c, &ix, &iy, &iw, &ih)); 1864 eo_do(wdg_eo, elm_obj_table_pack_get(c, &ix, &iy, &iw, &ih));
1865 1865
1866 gui_value_int_set(prop_value_nth_get(new_prop, 1), ix); 1866 gui_value_int_set(prop_value_nth_get(new_prop, 1), ix);
1867 gui_value_int_set(prop_value_nth_get(new_prop, 2), iy); 1867 gui_value_int_set(prop_value_nth_get(new_prop, 2), iy);
1868 1868
1869 Object_Container_Item *ci = obj_container_item_new(new_prop, dep_id); 1869 Object_Container_Item *ci = obj_container_item_new(new_prop, eid);
1870 wdg_obj_container_item_add((Gui_Widget *) wdg, ci, -1); 1870 wdg_obj_container_item_add((Gui_Widget *) wdg, ci, -1);
1871 } 1871 }
1872 1872
@@ -1874,13 +1874,13 @@ _drop_target_drop(void *data, Evas_Object *obj, Elm_Selection_Data *ev)
1874 const Op_Desc *op_desc = db_container_desc_op_desc_get(db_container_desc_get(wdg_class_name_get(wdg)), CONTAINER_PACK); 1874 const Op_Desc *op_desc = db_container_desc_op_desc_get(db_container_desc_get(wdg_class_name_get(wdg)), CONTAINER_PACK);
1875 Gui_Widget_Property *prop = prop_create_for_op(op_desc); 1875 Gui_Widget_Property *prop = prop_create_for_op(op_desc);
1876 1876
1877 gui_value_name_id_set(prop_value_nth_get(prop, 0), GUI_TYPE_OBJECT, wdg_dep_id_get(new_wdg)); 1877 gui_value_name_id_set(prop_value_nth_get(prop, 0), GUI_TYPE_OBJECT, wdg_eid_get(new_wdg));
1878 gui_value_int_set(prop_value_nth_get(prop, 1), di->table_pack_x); 1878 gui_value_int_set(prop_value_nth_get(prop, 1), di->table_pack_x);
1879 gui_value_int_set(prop_value_nth_get(prop, 2), di->table_pack_y); 1879 gui_value_int_set(prop_value_nth_get(prop, 2), di->table_pack_y);
1880 gui_value_int_set(prop_value_nth_get(prop, 3), 1); 1880 gui_value_int_set(prop_value_nth_get(prop, 3), 1);
1881 gui_value_int_set(prop_value_nth_get(prop, 4), 1); 1881 gui_value_int_set(prop_value_nth_get(prop, 4), 1);
1882 1882
1883 Object_Container_Item *ci = obj_container_item_new(prop, wdg_dep_id_get(new_wdg)); 1883 Object_Container_Item *ci = obj_container_item_new(prop, wdg_eid_get(new_wdg));
1884 wdg_obj_container_item_add(wdg, ci, -1); 1884 wdg_obj_container_item_add(wdg, ci, -1);
1885 } 1885 }
1886 } 1886 }
@@ -2108,17 +2108,17 @@ _drop_target_pos(void *data, Eo *obj, Evas_Coord x, Evas_Coord y, Elm_Xdnd_Actio
2108 { 2108 {
2109 Gui_Widget_Property *prop = obj_container_item_prop_get(it); 2109 Gui_Widget_Property *prop = obj_container_item_prop_get(it);
2110 int ix, iy, iw, ih; 2110 int ix, iy, iw, ih;
2111 Dep_Id *dep_id; 2111 Eid *eid;
2112 ix = INT_GET(prop_value_nth_get(prop, 1)); 2112 ix = INT_GET(prop_value_nth_get(prop, 1));
2113 iy = INT_GET(prop_value_nth_get(prop, 2)); 2113 iy = INT_GET(prop_value_nth_get(prop, 2));
2114 iw = INT_GET(prop_value_nth_get(prop, 3)); 2114 iw = INT_GET(prop_value_nth_get(prop, 3));
2115 ih = INT_GET(prop_value_nth_get(prop, 4)); 2115 ih = INT_GET(prop_value_nth_get(prop, 4));
2116 dep_id = DEP_ID_GET(prop_value_nth_get(prop, 0)); 2116 eid = EID_ID_GET(prop_value_nth_get(prop, 0));
2117 /* Don't pack widget which is currently dragged. */ 2117 /* Don't pack widget which is currently dragged. */
2118 if (dnd_drag_wdg_get() == wdg_get(dep_id)) 2118 if (dnd_drag_wdg_get() == wdg_get(eid))
2119 continue; 2119 continue;
2120 const Gui_Session *session = gui_context_editor_session_get(wdg_context_get(wdg)); 2120 const Gui_Session *session = gui_context_editor_session_get(wdg_context_get(wdg));
2121 Eo *c = session_eo_get(session, wdg_get(dep_id)); 2121 Eo *c = session_eo_get(session, wdg_get(eid));
2122 eo_do(wdg_eo, elm_obj_table_pack_set(c, ix, iy, iw, ih)); 2122 eo_do(wdg_eo, elm_obj_table_pack_set(c, ix, iy, iw, ih));
2123 } 2123 }
2124 } 2124 }
@@ -2128,11 +2128,11 @@ _drop_target_pos(void *data, Eo *obj, Evas_Coord x, Evas_Coord y, Elm_Xdnd_Actio
2128 { 2128 {
2129 Gui_Widget_Property *prop = obj_container_item_prop_get(it); 2129 Gui_Widget_Property *prop = obj_container_item_prop_get(it);
2130 int ix, iy, iw, ih; 2130 int ix, iy, iw, ih;
2131 Dep_Id *dep_id = DEP_ID_GET(prop_value_nth_get(prop, 0)); 2131 Eid *eid = EID_ID_GET(prop_value_nth_get(prop, 0));
2132 if (dnd_drag_wdg_get() == wdg_get(dep_id)) 2132 if (dnd_drag_wdg_get() == wdg_get(eid))
2133 continue; 2133 continue;
2134 const Gui_Session *session = gui_context_editor_session_get(wdg_context_get(wdg)); 2134 const Gui_Session *session = gui_context_editor_session_get(wdg_context_get(wdg));
2135 Eo *c = session_eo_get(session, wdg_get(dep_id)); 2135 Eo *c = session_eo_get(session, wdg_get(eid));
2136 2136
2137 eo_do(wdg_eo, elm_obj_table_pack_get(c, &ix, &iy, &iw, &ih)); 2137 eo_do(wdg_eo, elm_obj_table_pack_get(c, &ix, &iy, &iw, &ih));
2138 max_pack_x = (max_pack_x < ix) ? ix : max_pack_x; 2138 max_pack_x = (max_pack_x < ix) ? ix : max_pack_x;
@@ -2426,7 +2426,7 @@ _editor_layout_clear(const Gui_Context *ctx)
2426 EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_FALSE); 2426 EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_FALSE);
2427 2427
2428 Eina_List *list, *itr, *itr2; 2428 Eina_List *list, *itr, *itr2;
2429 Dep_Id *wdg_id; 2429 Eid *wdg_id;
2430 2430
2431 /* in editor, we iterate only over windows which don't have parent. */ 2431 /* in editor, we iterate only over windows which don't have parent. */
2432 list = gui_context_main_widgets_get(ctx); 2432 list = gui_context_main_widgets_get(ctx);
@@ -2450,7 +2450,7 @@ _editor_widget_clear(Gui_Widget *wdg)
2450static void 2450static void
2451_wdg_parent_win_reload(const Gui_Widget *wdg) 2451_wdg_parent_win_reload(const Gui_Widget *wdg)
2452{ 2452{
2453 Dep_Id *wdg_id = wdg_dep_id_get(wdg); 2453 Eid *wdg_id = wdg_eid_get(wdg);
2454 if (!wdg_get(wdg_id)) return; 2454 if (!wdg_get(wdg_id)) return;
2455 Gui_Widget *pwin = (Gui_Widget *) wdg_main_wdg_get(wdg); 2455 Gui_Widget *pwin = (Gui_Widget *) wdg_main_wdg_get(wdg);
2456 if (!pwin) return; 2456 if (!pwin) return;
@@ -2463,7 +2463,7 @@ _wdg_parent_win_reload(const Gui_Widget *wdg)
2463} 2463}
2464 2464
2465static void 2465static void
2466_update_widget_on_undoredo(Dep_Id *wdg_id, Eina_Bool state) 2466_update_widget_on_undoredo(Eid *wdg_id, Eina_Bool state)
2467{ 2467{
2468 const Gui_Widget *parent; /* We need the parent to reload the win */ 2468 const Gui_Widget *parent; /* We need the parent to reload the win */
2469 Gui_Widget *wdg = wdg_get(wdg_id); 2469 Gui_Widget *wdg = wdg_get(wdg_id);
@@ -2472,7 +2472,7 @@ _update_widget_on_undoredo(Dep_Id *wdg_id, Eina_Bool state)
2472 parent = (Gui_Widget *) wdg_parent_get(wdg); 2472 parent = (Gui_Widget *) wdg_parent_get(wdg);
2473 _editor_widget_clear(wdg); 2473 _editor_widget_clear(wdg);
2474 } 2474 }
2475 dep_active_set(wdg_id, state); 2475 eid_active_set(wdg_id, state);
2476 2476
2477 wdg = wdg_get(wdg_id); 2477 wdg = wdg_get(wdg_id);
2478 if (wdg) parent = wdg_main_wdg_get(wdg); 2478 if (wdg) parent = wdg_main_wdg_get(wdg);
@@ -2508,7 +2508,7 @@ _editor_undo(const Gui_Context *ctx)
2508 case MEMENTO_PROPERTY: 2508 case MEMENTO_PROPERTY:
2509 { 2509 {
2510 Gui_Widget_Property *old_prop, *new_prop; 2510 Gui_Widget_Property *old_prop, *new_prop;
2511 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2511 Eid *wdg_id = gui_memento_wdg_get(memento);
2512 const Op_Desc *op_desc = NULL; 2512 const Op_Desc *op_desc = NULL;
2513 2513
2514 Gui_Widget *wdg = wdg_get(wdg_id); 2514 Gui_Widget *wdg = wdg_get(wdg_id);
@@ -2553,7 +2553,7 @@ _editor_undo(const Gui_Context *ctx)
2553 case MEMENTO_OBJ_CONTAINER_ITEM: 2553 case MEMENTO_OBJ_CONTAINER_ITEM:
2554 { 2554 {
2555 Object_Container *old_container; 2555 Object_Container *old_container;
2556 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2556 Eid *wdg_id = gui_memento_wdg_get(memento);
2557 2557
2558 Gui_Widget *wdg = wdg_get(wdg_id); 2558 Gui_Widget *wdg = wdg_get(wdg_id);
2559 if (!wdg) 2559 if (!wdg)
@@ -2571,7 +2571,7 @@ _editor_undo(const Gui_Context *ctx)
2571 case MEMENTO_ITEM_CONTAINER_ITEM: 2571 case MEMENTO_ITEM_CONTAINER_ITEM:
2572 { 2572 {
2573 Item_Container_Item *old_it; 2573 Item_Container_Item *old_it;
2574 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2574 Eid *wdg_id = gui_memento_wdg_get(memento);
2575 2575
2576 Gui_Widget *wdg = wdg_get(wdg_id); 2576 Gui_Widget *wdg = wdg_get(wdg_id);
2577 if (!wdg) 2577 if (!wdg)
@@ -2582,13 +2582,13 @@ _editor_undo(const Gui_Context *ctx)
2582 2582
2583 old_it = gui_memento_old_pointer_get(memento); 2583 old_it = gui_memento_old_pointer_get(memento);
2584 2584
2585 item_container_item_set_on_id(item_container_item_dep_id_get(old_it), old_it); 2585 item_container_item_set_on_id(item_container_item_eid_get(old_it), old_it);
2586 break; 2586 break;
2587 } 2587 }
2588 case MEMENTO_CALLBACK: 2588 case MEMENTO_CALLBACK:
2589 { 2589 {
2590 Gui_Widget_Callback *old_cb; 2590 Gui_Widget_Callback *old_cb;
2591 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2591 Eid *wdg_id = gui_memento_wdg_get(memento);
2592 2592
2593 Gui_Widget *wdg = wdg_get(wdg_id); 2593 Gui_Widget *wdg = wdg_get(wdg_id);
2594 if (!wdg) 2594 if (!wdg)
@@ -2598,19 +2598,19 @@ _editor_undo(const Gui_Context *ctx)
2598 } 2598 }
2599 2599
2600 old_cb = gui_memento_old_pointer_get(memento); 2600 old_cb = gui_memento_old_pointer_get(memento);
2601 Dep_Id *cb_dep_id = cb_dep_id_get(old_cb); 2601 Eid *cb_eid = cb_eid_get(old_cb);
2602 2602
2603 cb_set_on_id(cb_dep_id, old_cb); 2603 cb_set_on_id(cb_eid, old_cb);
2604 2604
2605 proplayout_view_switch(CALLBACK_TYPE); 2605 proplayout_view_switch(CALLBACK_TYPE);
2606 _editor_wdg_selected_set(wdg); 2606 _editor_wdg_selected_set(wdg);
2607 cbview_item_selected_set(cb_dep_id); 2607 cbview_item_selected_set(cb_eid);
2608 break; 2608 break;
2609 } 2609 }
2610 case MEMENTO_CALLBACK_ADD_DEL: 2610 case MEMENTO_CALLBACK_ADD_DEL:
2611 { 2611 {
2612 Callback_Container *old_cc; 2612 Callback_Container *old_cc;
2613 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2613 Eid *wdg_id = gui_memento_wdg_get(memento);
2614 2614
2615 Gui_Widget *wdg = wdg_get(wdg_id); 2615 Gui_Widget *wdg = wdg_get(wdg_id);
2616 if (!wdg) 2616 if (!wdg)
@@ -2625,14 +2625,14 @@ _editor_undo(const Gui_Context *ctx)
2625 } 2625 }
2626 case MEMENTO_WIDGET: 2626 case MEMENTO_WIDGET:
2627 { 2627 {
2628 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2628 Eid *wdg_id = gui_memento_wdg_get(memento);
2629 Eina_Bool old_state = (intptr_t) gui_memento_old_pointer_get(memento); 2629 Eina_Bool old_state = (intptr_t) gui_memento_old_pointer_get(memento);
2630 _update_widget_on_undoredo(wdg_id, old_state); 2630 _update_widget_on_undoredo(wdg_id, old_state);
2631 break; 2631 break;
2632 } 2632 }
2633 case MEMENTO_WIDGET_PARENT: 2633 case MEMENTO_WIDGET_PARENT:
2634 { 2634 {
2635 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2635 Eid *wdg_id = gui_memento_wdg_get(memento);
2636 Gui_Widget *wdg = wdg_get(wdg_id); 2636 Gui_Widget *wdg = wdg_get(wdg_id);
2637 /* According to current scenario, widget can be dragged from another and dropped to canvas. 2637 /* According to current scenario, widget can be dragged from another and dropped to canvas.
2638 * Thus here can be only main_wdg which is going to be undoed. 2638 * Thus here can be only main_wdg which is going to be undoed.
@@ -2653,13 +2653,13 @@ _editor_undo(const Gui_Context *ctx)
2653 free(wi); 2653 free(wi);
2654 } 2654 }
2655 } 2655 }
2656 Dep_Id *old_parent_id = (Dep_Id *) gui_memento_old_pointer_get(memento); 2656 Eid *old_parent_id = (Eid *) gui_memento_old_pointer_get(memento);
2657 wdg_parent_set(wdg, dep_name_get(old_parent_id)); 2657 wdg_parent_set(wdg, eid_name_get(old_parent_id));
2658 break; 2658 break;
2659 } 2659 }
2660 case MEMENTO_ACTION: 2660 case MEMENTO_ACTION:
2661 { 2661 {
2662 Dep_Id *action_id = gui_memento_wdg_get(memento); 2662 Eid *action_id = gui_memento_wdg_get(memento);
2663 if (action_id) 2663 if (action_id)
2664 { 2664 {
2665 Gui_Action *old_action = (Gui_Action *)gui_memento_old_pointer_get(memento); 2665 Gui_Action *old_action = (Gui_Action *)gui_memento_old_pointer_get(memento);
@@ -2706,7 +2706,7 @@ _editor_redo(const Gui_Context *ctx)
2706 { 2706 {
2707 case MEMENTO_PROPERTY: 2707 case MEMENTO_PROPERTY:
2708 { 2708 {
2709 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2709 Eid *wdg_id = gui_memento_wdg_get(memento);
2710 const Op_Desc *op_desc = NULL; 2710 const Op_Desc *op_desc = NULL;
2711 2711
2712 Gui_Widget *wdg = wdg_get(wdg_id); 2712 Gui_Widget *wdg = wdg_get(wdg_id);
@@ -2751,7 +2751,7 @@ _editor_redo(const Gui_Context *ctx)
2751 case MEMENTO_CALLBACK: 2751 case MEMENTO_CALLBACK:
2752 { 2752 {
2753 Gui_Widget_Callback *new_cb; 2753 Gui_Widget_Callback *new_cb;
2754 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2754 Eid *wdg_id = gui_memento_wdg_get(memento);
2755 2755
2756 Gui_Widget *wdg = wdg_get(wdg_id); 2756 Gui_Widget *wdg = wdg_get(wdg_id);
2757 if (!wdg) 2757 if (!wdg)
@@ -2761,19 +2761,19 @@ _editor_redo(const Gui_Context *ctx)
2761 } 2761 }
2762 2762
2763 new_cb = gui_memento_new_pointer_get(memento); 2763 new_cb = gui_memento_new_pointer_get(memento);
2764 Dep_Id *cb_dep_id = cb_dep_id_get(new_cb); 2764 Eid *cb_eid = cb_eid_get(new_cb);
2765 2765
2766 cb_set_on_id(cb_dep_id, new_cb); 2766 cb_set_on_id(cb_eid, new_cb);
2767 2767
2768 proplayout_view_switch(CALLBACK_TYPE); 2768 proplayout_view_switch(CALLBACK_TYPE);
2769 _editor_wdg_selected_set(wdg); 2769 _editor_wdg_selected_set(wdg);
2770 cbview_item_selected_set(cb_dep_id); 2770 cbview_item_selected_set(cb_eid);
2771 break; 2771 break;
2772 } 2772 }
2773 case MEMENTO_CALLBACK_ADD_DEL: 2773 case MEMENTO_CALLBACK_ADD_DEL:
2774 { 2774 {
2775 Callback_Container *new_cc; 2775 Callback_Container *new_cc;
2776 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2776 Eid *wdg_id = gui_memento_wdg_get(memento);
2777 2777
2778 Gui_Widget *wdg = wdg_get(wdg_id); 2778 Gui_Widget *wdg = wdg_get(wdg_id);
2779 if (!wdg) 2779 if (!wdg)
@@ -2792,7 +2792,7 @@ _editor_redo(const Gui_Context *ctx)
2792 case MEMENTO_OBJ_CONTAINER_ITEM: 2792 case MEMENTO_OBJ_CONTAINER_ITEM:
2793 { 2793 {
2794 Object_Container *new_container; 2794 Object_Container *new_container;
2795 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2795 Eid *wdg_id = gui_memento_wdg_get(memento);
2796 2796
2797 Gui_Widget *wdg = wdg_get(wdg_id); 2797 Gui_Widget *wdg = wdg_get(wdg_id);
2798 if (!wdg) 2798 if (!wdg)
@@ -2810,7 +2810,7 @@ _editor_redo(const Gui_Context *ctx)
2810 case MEMENTO_ITEM_CONTAINER_ITEM: 2810 case MEMENTO_ITEM_CONTAINER_ITEM:
2811 { 2811 {
2812 Item_Container_Item *new_it; 2812 Item_Container_Item *new_it;
2813 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2813 Eid *wdg_id = gui_memento_wdg_get(memento);
2814 2814
2815 Gui_Widget *wdg = wdg_get(wdg_id); 2815 Gui_Widget *wdg = wdg_get(wdg_id);
2816 if (!wdg) 2816 if (!wdg)
@@ -2821,19 +2821,19 @@ _editor_redo(const Gui_Context *ctx)
2821 2821
2822 new_it = gui_memento_new_pointer_get(memento); 2822 new_it = gui_memento_new_pointer_get(memento);
2823 2823
2824 item_container_item_set_on_id(item_container_item_dep_id_get(new_it), new_it); 2824 item_container_item_set_on_id(item_container_item_eid_get(new_it), new_it);
2825 break; 2825 break;
2826 } 2826 }
2827 case MEMENTO_WIDGET: 2827 case MEMENTO_WIDGET:
2828 { 2828 {
2829 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2829 Eid *wdg_id = gui_memento_wdg_get(memento);
2830 Eina_Bool new_state = (intptr_t) gui_memento_new_pointer_get(memento); 2830 Eina_Bool new_state = (intptr_t) gui_memento_new_pointer_get(memento);
2831 _update_widget_on_undoredo(wdg_id, new_state); 2831 _update_widget_on_undoredo(wdg_id, new_state);
2832 break; 2832 break;
2833 } 2833 }
2834 case MEMENTO_WIDGET_PARENT: 2834 case MEMENTO_WIDGET_PARENT:
2835 { 2835 {
2836 Dep_Id *wdg_id = gui_memento_wdg_get(memento); 2836 Eid *wdg_id = gui_memento_wdg_get(memento);
2837 Gui_Widget *wdg = wdg_get(wdg_id); 2837 Gui_Widget *wdg = wdg_get(wdg_id);
2838 /* According to current scenario, widget can be dragged from canvas and dropped into object. 2838 /* According to current scenario, widget can be dragged from canvas and dropped into object.
2839 * Thus here can be only main_wdg which is going to be redoed. 2839 * Thus here can be only main_wdg which is going to be redoed.
@@ -2854,13 +2854,13 @@ _editor_redo(const Gui_Context *ctx)
2854 free(wi); 2854 free(wi);
2855 } 2855 }
2856 } 2856 }
2857 Dep_Id *new_parent_id = (Dep_Id *) gui_memento_new_pointer_get(memento); 2857 Eid *new_parent_id = (Eid *) gui_memento_new_pointer_get(memento);
2858 wdg_parent_set(wdg, dep_name_get(new_parent_id)); 2858 wdg_parent_set(wdg, eid_name_get(new_parent_id));
2859 break; 2859 break;
2860 } 2860 }
2861 case MEMENTO_ACTION: 2861 case MEMENTO_ACTION:
2862 { 2862 {
2863 Dep_Id *action_id = gui_memento_wdg_get(memento); 2863 Eid *action_id = gui_memento_wdg_get(memento);
2864 if (action_id) 2864 if (action_id)
2865 { 2865 {
2866 Gui_Action *new_action = (Gui_Action *)gui_memento_new_pointer_get(memento); 2866 Gui_Action *new_action = (Gui_Action *)gui_memento_new_pointer_get(memento);
@@ -2952,7 +2952,7 @@ _editor_ctx_call(const Gui_Context *ctx)
2952 EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_FALSE); 2952 EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_FALSE);
2953 2953
2954 Eina_List *list, *l; 2954 Eina_List *list, *l;
2955 Dep_Id *wdg_id; 2955 Eid *wdg_id;
2956 2956
2957 /* in editor, we iterate only over windows which don't have parent. */ 2957 /* in editor, we iterate only over windows which don't have parent. */
2958 list = gui_context_main_widgets_get(ctx); 2958 list = gui_context_main_widgets_get(ctx);
@@ -2990,9 +2990,9 @@ _editor_selected_wdg_del_cb()
2990 _editor_wdg_selected_set(NULL); 2990 _editor_wdg_selected_set(NULL);
2991 _editor_widget_clear(wdg); 2991 _editor_widget_clear(wdg);
2992 2992
2993 dep_active_set(wdg_dep_id_get(wdg), EINA_FALSE); 2993 eid_active_set(wdg_eid_get(wdg), EINA_FALSE);
2994 Gui_Memento *memento; 2994 Gui_Memento *memento;
2995 memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_WIDGET, (void *) (intptr_t) EINA_TRUE, (void *) (intptr_t) EINA_FALSE); 2995 memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_WIDGET, (void *) (intptr_t) EINA_TRUE, (void *) (intptr_t) EINA_FALSE);
2996 gui_context_memento_add((Gui_Context *) ctx, memento); 2996 gui_context_memento_add((Gui_Context *) ctx, memento);
2997 2997
2998 /* if parent_wdg is not NULL, it's not window, so it has parent. 2998 /* if parent_wdg is not NULL, it's not window, so it has parent.
@@ -3030,8 +3030,8 @@ _editor_factory_wdg_create(const char *class_name, const Gui_Widget *focused_wdg
3030 3030
3031 char *new_name = gui_context_free_name_get(ctx, class_name); 3031 char *new_name = gui_context_free_name_get(ctx, class_name);
3032 3032
3033 Dep_Id *dep_id = dep_new(ctx, new_name, DEP_TYPE_WIDGET); 3033 Eid *eid = eid_new(ctx, new_name, EID_TYPE_WIDGET);
3034 wdg = wdg_new(ctx, class_name, dep_id); 3034 wdg = wdg_new(ctx, class_name, eid);
3035 free(new_name); 3035 free(new_name);
3036 3036
3037 /* If a widget is selected during creation */ 3037 /* If a widget is selected during creation */
@@ -3049,7 +3049,7 @@ _editor_factory_wdg_create(const char *class_name, const Gui_Widget *focused_wdg
3049 wdg_parent_set(wdg, parent_name); 3049 wdg_parent_set(wdg, parent_name);
3050 3050
3051 Gui_Memento *memento; 3051 Gui_Memento *memento;
3052 memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_WIDGET, (void *) (intptr_t) EINA_FALSE, (void *) (intptr_t) EINA_TRUE); 3052 memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_WIDGET, (void *) (intptr_t) EINA_FALSE, (void *) (intptr_t) EINA_TRUE);
3053 gui_context_memento_add(ctx, memento); 3053 gui_context_memento_add(ctx, memento);
3054 3054
3055 /*Add default visibility property*/ 3055 /*Add default visibility property*/
@@ -3071,7 +3071,7 @@ _editor_factory_wdg_create(const char *class_name, const Gui_Widget *focused_wdg
3071 op = db_mro_op_desc_get(class_name, DB_DEF_WIN_CLASS, TITLE_SET); 3071 op = db_mro_op_desc_get(class_name, DB_DEF_WIN_CLASS, TITLE_SET);
3072 prop = prop_create_for_op(op); 3072 prop = prop_create_for_op(op);
3073 val = prop_value_nth_get(prop, 0); 3073 val = prop_value_nth_get(prop, 0);
3074 gui_value_string_set(val, strdup(dep_name_get(wdg_dep_id_get(wdg)))); 3074 gui_value_string_set(val, strdup(eid_name_get(wdg_eid_get(wdg))));
3075 wdg_prop_add(wdg, prop); 3075 wdg_prop_add(wdg, prop);
3076 } 3076 }
3077 3077
@@ -3112,9 +3112,9 @@ _editor_factory_wdg_create(const char *class_name, const Gui_Widget *focused_wdg
3112 { 3112 {
3113 char menu_name[20] = {'\0'}; 3113 char menu_name[20] = {'\0'};
3114 sprintf(menu_name, "%s_%s", wdg_name_get(wdg), "main_menu"); 3114 sprintf(menu_name, "%s_%s", wdg_name_get(wdg), "main_menu");
3115 dep_id = dep_new(ctx, menu_name, DEP_TYPE_WIDGET); 3115 eid = eid_new(ctx, menu_name, EID_TYPE_WIDGET);
3116 3116
3117 Gui_Widget *mmenu = wdg_new((Gui_Context *) ctx, DB_DEF_MENU_CLASS, dep_id); 3117 Gui_Widget *mmenu = wdg_new((Gui_Context *) ctx, DB_DEF_MENU_CLASS, eid);
3118 wdg_parent_set(mmenu, wdg_name_get(wdg)); 3118 wdg_parent_set(mmenu, wdg_name_get(wdg));
3119 3119
3120 manager_widget_create(session, mmenu, MODE_EDITOR, NULL); 3120 manager_widget_create(session, mmenu, MODE_EDITOR, NULL);
@@ -3149,7 +3149,7 @@ editor_shutdown()
3149} 3149}
3150 3150
3151static void 3151static void
3152_wdg_update(void *data, Dep_Id *subject_id EINA_UNUSED) 3152_wdg_update(void *data, Eid *subject_id EINA_UNUSED)
3153{ 3153{
3154 _wdg_parent_win_reload(data); 3154 _wdg_parent_win_reload(data);
3155} 3155}
@@ -3259,16 +3259,16 @@ _prop_update_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Descr
3259 /* FIXME: there is problem with content_set; because prev content must be unset; or need to redraw from the beginning*/ 3259 /* FIXME: there is problem with content_set; because prev content must be unset; or need to redraw from the beginning*/
3260 else if (type == GUI_TYPE_OBJECT) 3260 else if (type == GUI_TYPE_OBJECT)
3261 { 3261 {
3262 Dep_Id *old_dep_id = DEP_ID_GET(val); 3262 Eid *old_eid = EID_ID_GET(val);
3263 Dep_Id *new_dep_id = gui_context_dep_id_get_by_name(ctx, new_enum_value); 3263 Eid *new_eid = gui_context_eid_get_by_name(ctx, new_enum_value);
3264 if (!new_dep_id) 3264 if (!new_eid)
3265 { 3265 {
3266 ERR("Resource not exist for: \"%s\"", new_enum_value); 3266 ERR("Resource not exist for: \"%s\"", new_enum_value);
3267 } 3267 }
3268 /* FIXME: need to check if widget wasn't deleted yet*/ 3268 /* FIXME: need to check if widget wasn't deleted yet*/
3269 const char *cur_param = old_dep_id ? dep_name_get(old_dep_id) : NULL; 3269 const char *cur_param = old_eid ? eid_name_get(old_eid) : NULL;
3270 Gui_Widget *cur_param_wdg = wdg_get(old_dep_id); 3270 Gui_Widget *cur_param_wdg = wdg_get(old_eid);
3271 Gui_Widget *new_param_wdg = wdg_get(new_dep_id); 3271 Gui_Widget *new_param_wdg = wdg_get(new_eid);
3272 /* GUI_TYPE_OBJECT ops depend on other widgets, check that widget exists. 3272 /* GUI_TYPE_OBJECT ops depend on other widgets, check that widget exists.
3273 * or new one not equal old one.*/ 3273 * or new one not equal old one.*/
3274 if ((!new_param_wdg) || (cur_param_wdg == new_param_wdg)) 3274 if ((!new_param_wdg) || (cur_param_wdg == new_param_wdg))
@@ -3278,22 +3278,22 @@ _prop_update_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Descr
3278 } 3278 }
3279 /* If I simply change value in prop: t.e. "but1"->"but2" change parent of "but1".*/ 3279 /* If I simply change value in prop: t.e. "but1"->"but2" change parent of "but1".*/
3280 /* and change dependencies. */ 3280 /* and change dependencies. */
3281 gui_value_name_id_set(val, type, new_dep_id); 3281 gui_value_name_id_set(val, type, new_eid);
3282 3282
3283 if (cur_param) reload_win = EINA_TRUE; 3283 if (cur_param) reload_win = EINA_TRUE;
3284 } 3284 }
3285 else if (type == GUI_TYPE_FILE) 3285 else if (type == GUI_TYPE_FILE)
3286 { 3286 {
3287 Dep_Id *old_dep_id = DEP_ID_GET(val); 3287 Eid *old_eid = EID_ID_GET(val);
3288 if (old_dep_id) gui_context_dep_observer_del(old_dep_id, _wdg_update, (void *)wdg); 3288 if (old_eid) observer_del(old_eid, _wdg_update, (void *)wdg);
3289 if (!strcmp(new_enum_value, PROP_HOVERSEL_NONE_VALUE)) 3289 if (!strcmp(new_enum_value, PROP_HOVERSEL_NONE_VALUE))
3290 { 3290 {
3291 gui_value_name_id_set(val, type, 0); 3291 gui_value_name_id_set(val, type, 0);
3292 } 3292 }
3293 else 3293 else
3294 { 3294 {
3295 Dep_Id *new_id = gui_context_dep_id_get_by_name(ctx, new_enum_value); 3295 Eid *new_id = gui_context_eid_get_by_name(ctx, new_enum_value);
3296 gui_context_dep_observer_add(new_id, _wdg_update, (void *)wdg); 3296 observer_add(new_id, _wdg_update, (void *)wdg);
3297 gui_value_name_id_set(val, type, new_id); 3297 gui_value_name_id_set(val, type, new_id);
3298 } 3298 }
3299 reload_win = EINA_TRUE; 3299 reload_win = EINA_TRUE;
@@ -3312,7 +3312,7 @@ _prop_update_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Descr
3312 * I need to write gui_memento_new twice, because wdg_prop_remove will do unref and prop will be deleted. */ 3312 * I need to write gui_memento_new twice, because wdg_prop_remove will do unref and prop will be deleted. */
3313 if (prop_wdg_get(old_property)) 3313 if (prop_wdg_get(old_property))
3314 { 3314 {
3315 memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_PROPERTY, old_property, prop); 3315 memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_PROPERTY, old_property, prop);
3316 wdg_prop_remove((Gui_Widget *) wdg, old_property); 3316 wdg_prop_remove((Gui_Widget *) wdg, old_property);
3317 } 3317 }
3318 /* If not, this prop is default property which was fetched from _ffi_eo_do, don't need to save it, 3318 /* If not, this prop is default property which was fetched from _ffi_eo_do, don't need to save it,
@@ -3324,7 +3324,7 @@ _prop_update_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Descr
3324 prop_ref(old_property); 3324 prop_ref(old_property);
3325 prop_unref(old_property); 3325 prop_unref(old_property);
3326 old_property = NULL; 3326 old_property = NULL;
3327 memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_PROPERTY, old_property, prop); 3327 memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_PROPERTY, old_property, prop);
3328 } 3328 }
3329 gui_context_memento_add(ctx, memento); 3329 gui_context_memento_add(ctx, memento);
3330 3330
@@ -3396,7 +3396,7 @@ _drop_property_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
3396 const Gui_Widget *wdg = prop_wdg_get(prop); 3396 const Gui_Widget *wdg = prop_wdg_get(prop);
3397 if (wdg) 3397 if (wdg)
3398 { 3398 {
3399 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_PROPERTY, prop, NULL); 3399 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_PROPERTY, prop, NULL);
3400 gui_context_memento_add(ctx, memento); 3400 gui_context_memento_add(ctx, memento);
3401 3401
3402 wdg_prop_remove((Gui_Widget *) wdg, (Gui_Widget_Property *) prop); 3402 wdg_prop_remove((Gui_Widget *) wdg, (Gui_Widget_Property *) prop);
@@ -3449,10 +3449,10 @@ _item_public_update_cb(void *data, Eo *obj, const Eo_Event_Description *desc EIN
3449 new_item = item_container_item_copy(item); 3449 new_item = item_container_item_copy(item);
3450 item_container_item_public_set(new_item, state); 3450 item_container_item_public_set(new_item, state);
3451 3451
3452 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_ITEM_CONTAINER_ITEM, item, new_item); 3452 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_ITEM_CONTAINER_ITEM, item, new_item);
3453 gui_context_memento_add((Gui_Context *) ctx, memento); 3453 gui_context_memento_add((Gui_Context *) ctx, memento);
3454 3454
3455 item_container_item_set_on_id(item_container_item_dep_id_get(item), new_item); 3455 item_container_item_set_on_id(item_container_item_eid_get(item), new_item);
3456 return EO_CALLBACK_CONTINUE; 3456 return EO_CALLBACK_CONTINUE;
3457} 3457}
3458 3458
@@ -3490,12 +3490,12 @@ _field_update_from_itemview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Desc
3490 item_container_item_prop_set(new_wit, new_prop); 3490 item_container_item_prop_set(new_wit, new_prop);
3491 3491
3492 /* Create memento. */ 3492 /* Create memento. */
3493 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_ITEM_CONTAINER_ITEM, (void *) wit, new_wit); 3493 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_ITEM_CONTAINER_ITEM, (void *) wit, new_wit);
3494 gui_context_memento_add((Gui_Context *) ctx, memento); 3494 gui_context_memento_add((Gui_Context *) ctx, memento);
3495 3495
3496 /* Change item in Dep_Data*/ 3496 /* Change item in Dep_Data*/
3497 3497
3498 item_container_item_set_on_id(item_container_item_dep_id_get(wit), new_wit); 3498 item_container_item_set_on_id(item_container_item_eid_get(wit), new_wit);
3499 3499
3500 /* Get value which need to be changed.*/ 3500 /* Get value which need to be changed.*/
3501 val = prop_value_nth_get(new_prop, idx); 3501 val = prop_value_nth_get(new_prop, idx);
@@ -3535,7 +3535,7 @@ _field_update_from_itemview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Desc
3535 } 3535 }
3536 else 3536 else
3537 { 3537 {
3538 Dep_Id *name_id = gui_context_dep_id_get_by_name(_active_ctx, new_value); 3538 Eid *name_id = gui_context_eid_get_by_name(_active_ctx, new_value);
3539 gui_value_name_id_set(val, type, name_id); 3539 gui_value_name_id_set(val, type, name_id);
3540 if (type == GUI_TYPE_OBJECT) 3540 if (type == GUI_TYPE_OBJECT)
3541 { 3541 {
@@ -3548,7 +3548,7 @@ _field_update_from_itemview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Desc
3548 { 3548 {
3549 if (type == GUI_TYPE_OBJECT) 3549 if (type == GUI_TYPE_OBJECT)
3550 { 3550 {
3551 Dep_Id *old_name_id = gui_context_dep_id_get_by_name(_active_ctx, old_value); 3551 Eid *old_name_id = gui_context_eid_get_by_name(_active_ctx, old_value);
3552 Gui_Widget *w = wdg_get(old_name_id); 3552 Gui_Widget *w = wdg_get(old_name_id);
3553 wdg_parent_set(w, wdg_name_get(wdg_main_wdg_get(wdg))); 3553 wdg_parent_set(w, wdg_name_get(wdg_main_wdg_get(wdg)));
3554 } 3554 }
@@ -3562,7 +3562,7 @@ static void
3562_itemview_item_selected(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) 3562_itemview_item_selected(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
3563{ 3563{
3564 const Gui_Context *ctx = _active_context_get(); 3564 const Gui_Context *ctx = _active_context_get();
3565 Item_Container_Item *wit = item_container_item_get_from_id((Dep_Id *)elm_object_item_data_get(event_info)); 3565 Item_Container_Item *wit = item_container_item_get_from_id((Eid *)elm_object_item_data_get(event_info));
3566 Gui_Session *session = (Gui_Session *) gui_context_editor_session_get(ctx); 3566 Gui_Session *session = (Gui_Session *) gui_context_editor_session_get(ctx);
3567 Elm_Object_Item *it = session_item_get(session, wit); 3567 Elm_Object_Item *it = session_item_get(session, wit);
3568 if (eo_isa(it, ELM_MENU_ITEM_CLASS)) 3568 if (eo_isa(it, ELM_MENU_ITEM_CLASS))
@@ -3587,7 +3587,7 @@ _itemview_item_do_(unsigned int type)
3587 const Gui_Context *ctx = wdg_context_get(wdg); 3587 const Gui_Context *ctx = wdg_context_get(wdg);
3588 Gui_Value *val = NULL; 3588 Gui_Value *val = NULL;
3589 3589
3590 Dep_Id *selected_item_id = itemview_item_selected_get(); 3590 Eid *selected_item_id = itemview_item_selected_get();
3591 wit = item_container_item_get_from_id(selected_item_id); 3591 wit = item_container_item_get_from_id(selected_item_id);
3592 3592
3593 Item_Container_Item *it = NULL; 3593 Item_Container_Item *it = NULL;
@@ -3615,10 +3615,10 @@ _itemview_item_do_(unsigned int type)
3615 /* create Id for new parent item. */ 3615 /* create Id for new parent item. */
3616 new_parent_item = item_container_item_copy(parent_it); 3616 new_parent_item = item_container_item_copy(parent_it);
3617 3617
3618 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_ITEM_CONTAINER_ITEM, parent_it, new_parent_item); 3618 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_ITEM_CONTAINER_ITEM, parent_it, new_parent_item);
3619 gui_context_memento_add((Gui_Context *) ctx, memento); 3619 gui_context_memento_add((Gui_Context *) ctx, memento);
3620 3620
3621 item_container_item_set_on_id(item_container_item_dep_id_get(parent_it), new_parent_item); 3621 item_container_item_set_on_id(item_container_item_eid_get(parent_it), new_parent_item);
3622 3622
3623 Op_Desc *op = (Op_Desc *) db_container_desc_op_desc_get(db_container_desc_get(wdg_class_name_get(wdg)), CONTAINER_PACK); 3623 Op_Desc *op = (Op_Desc *) db_container_desc_op_desc_get(db_container_desc_get(wdg_class_name_get(wdg)), CONTAINER_PACK);
3624 Gui_Widget_Property *prop = prop_create_for_op(op); 3624 Gui_Widget_Property *prop = prop_create_for_op(op);
@@ -3626,7 +3626,7 @@ _itemview_item_do_(unsigned int type)
3626 char str[NAME_MAX] = {'\0'}; 3626 char str[NAME_MAX] = {'\0'};
3627 sprintf(str, "%s_%s%d", wdg_name_get(wdg), "it", i); 3627 sprintf(str, "%s_%s%d", wdg_name_get(wdg), "it", i);
3628 /* Check that newly generated name is not used. */ 3628 /* Check that newly generated name is not used. */
3629 while (gui_context_dep_id_get_by_name(ctx, str)) 3629 while (gui_context_eid_get_by_name(ctx, str))
3630 { 3630 {
3631 i++; 3631 i++;
3632 sprintf(str, "%s_%s%d", wdg_name_get(wdg), "it", i); 3632 sprintf(str, "%s_%s%d", wdg_name_get(wdg), "it", i);
@@ -3647,8 +3647,8 @@ _itemview_item_do_(unsigned int type)
3647 if (!strcmp(wdg_class_name_get(wdg), DB_DEF_MENU_CLASS)) 3647 if (!strcmp(wdg_class_name_get(wdg), DB_DEF_MENU_CLASS))
3648 { 3648 {
3649 val = prop_value_nth_get(prop, 0); 3649 val = prop_value_nth_get(prop, 0);
3650 Dep_Id *new_parent_dep_id = new_parent_item ? item_container_item_dep_id_get(new_parent_item) : 0; 3650 Eid *new_parent_eid = new_parent_item ? item_container_item_eid_get(new_parent_item) : 0;
3651 gui_value_name_id_set(val, GUI_TYPE_OBJECT_ITEM, new_parent_dep_id); 3651 gui_value_name_id_set(val, GUI_TYPE_OBJECT_ITEM, new_parent_eid);
3652 3652
3653 val = prop_value_nth_get(prop, 2); 3653 val = prop_value_nth_get(prop, 2);
3654 gui_value_string_set(val, strdup(str)); 3654 gui_value_string_set(val, strdup(str));
@@ -3673,10 +3673,10 @@ _itemview_item_do_(unsigned int type)
3673 3673
3674 new_parent_item = item_container_item_copy(parent_it); 3674 new_parent_item = item_container_item_copy(parent_it);
3675 3675
3676 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_ITEM_CONTAINER_ITEM, parent_it, new_parent_item); 3676 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_ITEM_CONTAINER_ITEM, parent_it, new_parent_item);
3677 gui_context_memento_add((Gui_Context *) ctx, memento); 3677 gui_context_memento_add((Gui_Context *) ctx, memento);
3678 3678
3679 item_container_item_set_on_id(item_container_item_dep_id_get(parent_it), new_parent_item); 3679 item_container_item_set_on_id(item_container_item_eid_get(parent_it), new_parent_item);
3680 } 3680 }
3681 3681
3682 /* Adding item to widget and parent item 3682 /* Adding item to widget and parent item
@@ -3691,9 +3691,9 @@ _itemview_item_do_(unsigned int type)
3691 wdg_item_insert_after(wdg, new_parent_item, wit, it); 3691 wdg_item_insert_after(wdg, new_parent_item, wit, it);
3692 /* Insert 'it' after selected 'wit' in the Items List. 3692 /* Insert 'it' after selected 'wit' in the Items List.
3693 * if wit == NULL, item will be added in the end. */ 3693 * if wit == NULL, item will be added in the end. */
3694 itemview_insert_after(item_container_item_dep_id_get(parent_it), 3694 itemview_insert_after(item_container_item_eid_get(parent_it),
3695 item_container_item_dep_id_get(wit), 3695 item_container_item_eid_get(wit),
3696 item_container_item_dep_id_get(it)); 3696 item_container_item_eid_get(it));
3697 } 3697 }
3698 3698
3699 _wdg_parent_win_reload(wdg); 3699 _wdg_parent_win_reload(wdg);
@@ -3717,7 +3717,7 @@ _content_del_from_propview(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descr
3717 3717
3718 /* Need to remove parent container from widget. */ 3718 /* Need to remove parent container from widget. */
3719 Object_Container_Item *ci = wdg_obj_container_item_get(wdg, idx, NULL); 3719 Object_Container_Item *ci = wdg_obj_container_item_get(wdg, idx, NULL);
3720 Dep_Id *name_id = obj_container_item_dep_id_get(ci); 3720 Eid *name_id = obj_container_item_eid_get(ci);
3721 3721
3722 Gui_Widget *param_wdg = wdg_get(name_id); 3722 Gui_Widget *param_wdg = wdg_get(name_id);
3723 /* Need to change parent for content being unset from container. 3723 /* Need to change parent for content being unset from container.
@@ -3733,7 +3733,7 @@ _content_del_from_propview(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descr
3733 _old_container = (Object_Container *) wdg_obj_container_get((Gui_Widget *) wdg); 3733 _old_container = (Object_Container *) wdg_obj_container_get((Gui_Widget *) wdg);
3734 _new_container = obj_container_copy(_old_container); 3734 _new_container = obj_container_copy(_old_container);
3735 3735
3736 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container); 3736 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container);
3737 gui_context_memento_add(ctx, memento); 3737 gui_context_memento_add(ctx, memento);
3738 3738
3739 wdg_obj_container_unset((Gui_Widget *) wdg); 3739 wdg_obj_container_unset((Gui_Widget *) wdg);
@@ -3772,7 +3772,7 @@ _content_reorder_from_propview(void *data, Eo *obj EINA_UNUSED, const Eo_Event_D
3772 /* If anything was reordered, need to reload content. */ 3772 /* If anything was reordered, need to reload content. */
3773 if (wdg_obj_container_content_reorder(wdg, idx, button_dir)) 3773 if (wdg_obj_container_content_reorder(wdg, idx, button_dir))
3774 { 3774 {
3775 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container); 3775 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container);
3776 gui_context_memento_add(_active_context_get(), memento); 3776 gui_context_memento_add(_active_context_get(), memento);
3777 3777
3778 /* Reload all the win when content reordered */ 3778 /* Reload all the win when content reordered */
@@ -3846,7 +3846,7 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_De
3846 _old_container = (Object_Container *) wdg_obj_container_get((Gui_Widget *) wdg); 3846 _old_container = (Object_Container *) wdg_obj_container_get((Gui_Widget *) wdg);
3847 _new_container = obj_container_copy(_old_container); 3847 _new_container = obj_container_copy(_old_container);
3848 3848
3849 Gui_Memento *memento = gui_memento_new(wdg_dep_id_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container); 3849 Gui_Memento *memento = gui_memento_new(wdg_eid_get(wdg), MEMENTO_OBJ_CONTAINER_ITEM, _old_container, _new_container);
3850 gui_context_memento_add(ctx, memento); 3850 gui_context_memento_add(ctx, memento);
3851 3851
3852 wdg_obj_container_unset((Gui_Widget *) wdg); 3852 wdg_obj_container_unset((Gui_Widget *) wdg);
@@ -3900,10 +3900,10 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_De
3900 } 3900 }
3901 gui_value_int_set(val, number); 3901 gui_value_int_set(val, number);
3902 3902
3903 Dep_Id *dep_id = obj_container_item_dep_id_get(ci); 3903 Eid *eid = obj_container_item_eid_get(ci);
3904 wdg_obj_container_item_remove(wdg, ci); 3904 wdg_obj_container_item_remove(wdg, ci);
3905 3905
3906 ci = obj_container_item_new(new_prop, dep_id); 3906 ci = obj_container_item_new(new_prop, eid);
3907 wdg_obj_container_item_add((Gui_Widget *) wdg, ci, pfd->it_data->idx); 3907 wdg_obj_container_item_add((Gui_Widget *) wdg, ci, pfd->it_data->idx);
3908 manager_widget_content_reset(session, wdg, new_prop, MODE_EDITOR, NULL); 3908 manager_widget_content_reset(session, wdg, new_prop, MODE_EDITOR, NULL);
3909 } 3909 }
@@ -3923,10 +3923,10 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_De
3923 gui_value_string_free(val); 3923 gui_value_string_free(val);
3924 gui_value_string_set(val, strdup(entry_data)); 3924 gui_value_string_set(val, strdup(entry_data));
3925 } 3925 }
3926 Dep_Id *dep_id = obj_container_item_dep_id_get(ci); 3926 Eid *eid = obj_container_item_eid_get(ci);
3927 wdg_obj_container_item_remove(wdg, ci); 3927 wdg_obj_container_item_remove(wdg, ci);
3928 3928
3929 ci = obj_container_item_new(new_prop, dep_id); 3929 ci = obj_container_item_new(new_prop, eid);
3930 wdg_obj_container_item_add((Gui_Widget *) wdg, ci, pfd->it_data->idx); 3930 wdg_obj_container_item_add((Gui_Widget *) wdg, ci, pfd->it_data->idx);
3931 3931
3932 /* FIXME: Hack. I need to reload window, because there are clashes in when part name is NULL. 3932 /* FIXME: Hack. I need to reload window, because there are clashes in when part name is NULL.
@@ -3943,7 +3943,7 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_De
3943 if (kl == ELM_HOVERSEL_CLASS) 3943 if (kl == ELM_HOVERSEL_CLASS)
3944 { 3944 {
3945 const char *new_value = elm_object_item_part_text_get(event_info, NULL); 3945 const char *new_value = elm_object_item_part_text_get(event_info, NULL);
3946 Dep_Id *new_name_id = gui_context_dep_id_get_by_name(ctx, new_value); 3946 Eid *new_name_id = gui_context_eid_get_by_name(ctx, new_value);
3947 eo_do(obj, elm_obj_widget_part_text_set(NULL, new_value)); 3947 eo_do(obj, elm_obj_widget_part_text_set(NULL, new_value));
3948 3948
3949 if (type == GUI_TYPE_ENUM) 3949 if (type == GUI_TYPE_ENUM)
@@ -3969,7 +3969,7 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_De
3969 _old_prev_container = (Object_Container *) wdg_obj_container_get((Gui_Widget *) prev_wdg_container); 3969 _old_prev_container = (Object_Container *) wdg_obj_container_get((Gui_Widget *) prev_wdg_container);
3970 _new_prev_container = obj_container_copy(_old_prev_container); 3970 _new_prev_container = obj_container_copy(_old_prev_container);
3971 3971
3972 Gui_Memento *memento_next = gui_memento_new(wdg_dep_id_get(prev_wdg_container), 3972 Gui_Memento *memento_next = gui_memento_new(wdg_eid_get(prev_wdg_container),
3973 MEMENTO_OBJ_CONTAINER_ITEM, 3973 MEMENTO_OBJ_CONTAINER_ITEM,
3974 _old_prev_container, _new_prev_container); 3974 _old_prev_container, _new_prev_container);
3975 gui_memento_append(memento, memento_next); 3975 gui_memento_append(memento, memento_next);
@@ -3987,14 +3987,14 @@ _content_change_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_De
3987 wdg_obj_container_item_remove(prev_wdg_container, _ci); 3987 wdg_obj_container_item_remove(prev_wdg_container, _ci);
3988 } 3988 }
3989 3989
3990 Dep_Id *dep_id = wdg_dep_id_get(new_param_wdg); 3990 Eid *eid = wdg_eid_get(new_param_wdg);
3991 gui_value_name_id_set(val, type, dep_id); 3991 gui_value_name_id_set(val, type, eid);
3992 3992
3993 if (ci) 3993 if (ci)
3994 { 3994 {
3995 wdg_obj_container_item_remove(wdg, ci); 3995 wdg_obj_container_item_remove(wdg, ci);
3996 } 3996 }
3997 ci = obj_container_item_new(new_prop, dep_id); 3997 ci = obj_container_item_new(new_prop, eid);
3998 wdg_obj_container_item_add((Gui_Widget *) wdg, ci, pfd->it_data->idx); 3998 wdg_obj_container_item_add((Gui_Widget *) wdg, ci, pfd->it_data->idx);
3999 3999
4000 /* Need to reload all window, because previously packed widgets will stay at their places. */ 4000 /* Need to reload all window, because previously packed widgets will stay at their places. */
@@ -4058,7 +4058,7 @@ _project_close(const Gui_Context *ctx)
4058 4058
4059 /* Iterate over windows and delete Main_Wdg_Info */ 4059 /* Iterate over windows and delete Main_Wdg_Info */
4060 Eina_List *list, *itr, *itr2; 4060 Eina_List *list, *itr, *itr2;
4061 Dep_Id *wdg_id; 4061 Eid *wdg_id;
4062 list = gui_context_main_widgets_get(_active_ctx); 4062 list = gui_context_main_widgets_get(_active_ctx);
4063 EINA_LIST_FOREACH_SAFE(list, itr, itr2, wdg_id) 4063 EINA_LIST_FOREACH_SAFE(list, itr, itr2, wdg_id)
4064 { 4064 {
@@ -4081,7 +4081,7 @@ static Eina_Bool
4081_observers_init(const Gui_Context *ctx) 4081_observers_init(const Gui_Context *ctx)
4082{ 4082{
4083 Eina_List *wdgs_itr; 4083 Eina_List *wdgs_itr;
4084 Dep_Id *wdg_id; 4084 Eid *wdg_id;
4085 EINA_LIST_FOREACH(gui_context_wdg_list_get(ctx), wdgs_itr, wdg_id) 4085 EINA_LIST_FOREACH(gui_context_wdg_list_get(ctx), wdgs_itr, wdg_id)
4086 { 4086 {
4087 Eina_List *props_itr; 4087 Eina_List *props_itr;
@@ -4100,7 +4100,7 @@ _observers_init(const Gui_Context *ctx)
4100 case GUI_TYPE_OBJECT: 4100 case GUI_TYPE_OBJECT:
4101 case GUI_TYPE_CB: 4101 case GUI_TYPE_CB:
4102 case GUI_TYPE_FILE: 4102 case GUI_TYPE_FILE:
4103 gui_context_dep_observer_add(DEP_ID_GET(value), _wdg_update, (void *)wdg); 4103 observer_add(EID_ID_GET(value), _wdg_update, (void *)wdg);
4104 break; 4104 break;
4105 default: 4105 default:
4106 break; 4106 break;
diff --git a/src/bin/egui_gui/egui_logic.c b/src/bin/egui_gui/egui_logic.c
index f480611..f0e1e71 100644
--- a/src/bin/egui_gui/egui_logic.c
+++ b/src/bin/egui_gui/egui_logic.c
@@ -585,7 +585,7 @@ _graphviz_widget_build(Agraph_t *ag, const Gui_Widget *wdg)
585 agsafeset(wdg_node, "style", "filled", ""); 585 agsafeset(wdg_node, "style", "filled", "");
586 agsafeset(wdg_node, "gradientangle", "270", ""); 586 agsafeset(wdg_node, "gradientangle", "270", "");
587 const Eina_List *children = NULL, *itr; 587 const Eina_List *children = NULL, *itr;
588 Dep_Id *w_id; 588 Eid *w_id;
589 589
590 children = wdg_children_list_get(wdg); 590 children = wdg_children_list_get(wdg);
591 EINA_LIST_FOREACH(children, itr, w_id) 591 EINA_LIST_FOREACH(children, itr, w_id)
@@ -595,11 +595,11 @@ _graphviz_widget_build(Agraph_t *ag, const Gui_Widget *wdg)
595 agedge(ag, wdg_node, w_node, 0, 1); 595 agedge(ag, wdg_node, w_node, 0, 1);
596 } 596 }
597 597
598 Dep_Id *cb_id; 598 Eid *cb_id;
599 EINA_LIST_FOREACH(wdg_cb_list_get(wdg), itr, cb_id) 599 EINA_LIST_FOREACH(wdg_cb_list_get(wdg), itr, cb_id)
600 { 600 {
601 Gui_Widget_Callback *cb = cb_get_from_id(cb_id); 601 Gui_Widget_Callback *cb = cb_get_from_id(cb_id);
602 Dep_Id *action_id = cb_action_id_get(cb); 602 Eid *action_id = cb_action_id_get(cb);
603 const Gui_Action *action = action_get(action_id); 603 const Gui_Action *action = action_get(action_id);
604 switch (action_type_get(action)) 604 switch (action_type_get(action))
605 { 605 {
@@ -649,7 +649,7 @@ _graphviz_button_clicked_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const E
649 const Gui_Context *ctx = _active_context_get(); 649 const Gui_Context *ctx = _active_context_get();
650 const Eina_List* start_pts = gui_context_start_points_get(ctx), *itr; 650 const Eina_List* start_pts = gui_context_start_points_get(ctx), *itr;
651 Agnode_t *start_node = NULL; 651 Agnode_t *start_node = NULL;
652 Dep_Id *wdg_id; 652 Eid *wdg_id;
653 if (start_pts) 653 if (start_pts)
654 { 654 {
655 start_node = agnode(ag, "Start", 1); 655 start_node = agnode(ag, "Start", 1);
@@ -662,7 +662,7 @@ _graphviz_button_clicked_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const E
662 const Gui_Widget *wdg = wdg_get(wdg_id); 662 const Gui_Widget *wdg = wdg_get(wdg_id);
663 if (wdg) 663 if (wdg)
664 { 664 {
665 Agnode_t *wdg_node = agnode(ag, (char *)dep_name_get(wdg_id), 1); 665 Agnode_t *wdg_node = agnode(ag, (char *)eid_name_get(wdg_id), 1);
666 agedge(ag, start_node, wdg_node, 0, 1); 666 agedge(ag, start_node, wdg_node, 0, 1);
667 } 667 }
668 } 668 }
diff --git a/src/bin/egui_gui/itemview.c b/src/bin/egui_gui/itemview.c
index cc79561..c13b758 100644
--- a/src/bin/egui_gui/itemview.c
+++ b/src/bin/egui_gui/itemview.c
@@ -36,7 +36,7 @@ _item_list_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *par
36{ 36{
37 Eo *box = eo_add(ELM_BOX_CLASS, lst); 37 Eo *box = eo_add(ELM_BOX_CLASS, lst);
38 const Gui_Widget *wdg = _editor_wdg_selected_get(); 38 const Gui_Widget *wdg = _editor_wdg_selected_get();
39 Item_Container_Item *item = item_container_item_get_from_id((Dep_Id *)data); 39 Item_Container_Item *item = item_container_item_get_from_id((Eid *)data);
40 40
41 eo_do(box, evas_obj_visibility_set(EINA_TRUE), 41 eo_do(box, evas_obj_visibility_set(EINA_TRUE),
42 elm_obj_box_horizontal_set(EINA_TRUE), 42 elm_obj_box_horizontal_set(EINA_TRUE),
@@ -67,9 +67,9 @@ _item_list_content_get(void *data, Evas_Object *obj EINA_UNUSED, const char *par
67 const char *cb_name = PROP_HOVERSEL_NONE_VALUE; 67 const char *cb_name = PROP_HOVERSEL_NONE_VALUE;
68 if (gui_value_type_get(val) == GUI_TYPE_CB) 68 if (gui_value_type_get(val) == GUI_TYPE_CB)
69 { 69 {
70 Dep_Id *dep_id = DEP_ID_GET(val); 70 Eid *eid = EID_ID_GET(val);
71 if (dep_id) 71 if (eid)
72 cb_name = dep_name_get(dep_id); 72 cb_name = eid_name_get(eid);
73 } 73 }
74 const char *cb_type_name = db_op_desc_nth_par_type_name_get(it_data->op_desc, i); 74 const char *cb_type_name = db_op_desc_nth_par_type_name_get(it_data->op_desc, i);
75 /* Adding user defined Evas_Smart_Cb s from resources. */ 75 /* Adding user defined Evas_Smart_Cb s from resources. */
@@ -136,16 +136,16 @@ _expanded_cb(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_inf
136 /* This is item being expanded. */ 136 /* This is item being expanded. */
137 Elm_Object_Item *glit = event_info; 137 Elm_Object_Item *glit = event_info;
138 138
139 Item_Container_Item *parent_item = item_container_item_get_from_id((Dep_Id *)elm_object_item_data_get(glit)); 139 Item_Container_Item *parent_item = item_container_item_get_from_id((Eid *)elm_object_item_data_get(glit));
140 140
141 /* Adding child's items into objtree view. */ 141 /* Adding child's items into objtree view. */
142 Dep_Id *dep_id; 142 Eid *eid;
143 EINA_LIST_FOREACH(item_container_item_subitems_get(parent_item), itr, dep_id) 143 EINA_LIST_FOREACH(item_container_item_subitems_get(parent_item), itr, eid)
144 { 144 {
145 Item_Container_Item *wit = item_container_item_get_from_id(dep_id); 145 Item_Container_Item *wit = item_container_item_get_from_id(eid);
146 146
147 Elm_Object_Item *nitem; 147 Elm_Object_Item *nitem;
148 Dep_Id *wit_id = item_container_item_dep_id_get(wit); 148 Eid *wit_id = item_container_item_eid_get(wit);
149 nitem = elm_genlist_item_append(lst, _item_itc, (void *) (uintptr_t) wit_id, glit, 149 nitem = elm_genlist_item_append(lst, _item_itc, (void *) (uintptr_t) wit_id, glit,
150 ELM_GENLIST_ITEM_TREE, _view_cbs->item_selection_cb_func, NULL); 150 ELM_GENLIST_ITEM_TREE, _view_cbs->item_selection_cb_func, NULL);
151// elm_genlist_item_expanded_set(nitem, EINA_FALSE); 151// elm_genlist_item_expanded_set(nitem, EINA_FALSE);
@@ -214,12 +214,12 @@ itemview_build(const Gui_Widget *wdg)
214 214
215 /* During first build, only headed widgets are added. */ 215 /* During first build, only headed widgets are added. */
216 const Item_Container_Item *root_it = wdg_item_container_root_get(wdg); 216 const Item_Container_Item *root_it = wdg_item_container_root_get(wdg);
217 Dep_Id *dep_id_itr; 217 Eid *eid_itr;
218 EINA_LIST_FOREACH(item_container_item_subitems_get(root_it), itr, dep_id_itr) 218 EINA_LIST_FOREACH(item_container_item_subitems_get(root_it), itr, eid_itr)
219 { 219 {
220 Item_Container_Item *wit = item_container_item_get_from_id(dep_id_itr); 220 Item_Container_Item *wit = item_container_item_get_from_id(eid_itr);
221 Elm_Object_Item *glit; 221 Elm_Object_Item *glit;
222 Dep_Id *wit_id = item_container_item_dep_id_get(wit); 222 Eid *wit_id = item_container_item_eid_get(wit);
223 glit = elm_genlist_item_append(lst, _item_itc, wit_id, NULL, 223 glit = elm_genlist_item_append(lst, _item_itc, wit_id, NULL,
224 ELM_GENLIST_ITEM_TREE, 224 ELM_GENLIST_ITEM_TREE,
225 _view_cbs->item_selection_cb_func, NULL); 225 _view_cbs->item_selection_cb_func, NULL);
@@ -239,7 +239,7 @@ itemview_clear()
239} 239}
240 240
241void 241void
242itemview_insert_after(Dep_Id *parent_it_id, Dep_Id *after_id, Dep_Id *wit_id) 242itemview_insert_after(Eid *parent_it_id, Eid *after_id, Eid *wit_id)
243{ 243{
244 Elm_Object_Item *pglit = NULL, *glafter = NULL, *nit; 244 Elm_Object_Item *pglit = NULL, *glafter = NULL, *nit;
245 245
@@ -284,11 +284,11 @@ itemview_insert_after(Dep_Id *parent_it_id, Dep_Id *after_id, Dep_Id *wit_id)
284} 284}
285 285
286/* Return Item_Container_Item for selected Genlist Item. */ 286/* Return Item_Container_Item for selected Genlist Item. */
287Dep_Id * 287Eid *
288itemview_item_selected_get() 288itemview_item_selected_get()
289{ 289{
290 Elm_Object_Item *it = NULL; 290 Elm_Object_Item *it = NULL;
291 Dep_Id *wit_id = 0; 291 Eid *wit_id = 0;
292 it = elm_genlist_selected_item_get(lst); 292 it = elm_genlist_selected_item_get(lst);
293 if (it) 293 if (it)
294 { 294 {
@@ -313,7 +313,7 @@ itemview_item_selected_set(const Item_Container_Item *wit)
313 Item_Container_Item *witr; 313 Item_Container_Item *witr;
314 EINA_LIST_FREE(chain, witr) 314 EINA_LIST_FREE(chain, witr)
315 { 315 {
316 Dep_Id *wit_id = item_container_item_dep_id_get(witr); 316 Eid *wit_id = item_container_item_eid_get(witr);
317 item = eina_hash_find(_witems_to_items_table, &wit_id); 317 item = eina_hash_find(_witems_to_items_table, &wit_id);
318 elm_genlist_item_expanded_set(item, EINA_TRUE); 318 elm_genlist_item_expanded_set(item, EINA_TRUE);
319 } 319 }
@@ -325,7 +325,7 @@ itemview_item_selected_set(const Item_Container_Item *wit)
325void 325void
326itemview_item_del(const Item_Container_Item *wit) 326itemview_item_del(const Item_Container_Item *wit)
327{ 327{
328 Dep_Id *wit_id = item_container_item_dep_id_get(wit); 328 Eid *wit_id = item_container_item_eid_get(wit);
329 Elm_Object_Item *glit = eina_hash_find(_witems_to_items_table, &wit_id); 329 Elm_Object_Item *glit = eina_hash_find(_witems_to_items_table, &wit_id);
330 if (glit) 330 if (glit)
331 { 331 {
diff --git a/src/bin/egui_gui/itemview.h b/src/bin/egui_gui/itemview.h
index 36d6eff..403646c 100644
--- a/src/bin/egui_gui/itemview.h
+++ b/src/bin/egui_gui/itemview.h
@@ -29,7 +29,7 @@ itemview_shutdown();
29void 29void
30itemview_build(const Gui_Widget *wdg); 30itemview_build(const Gui_Widget *wdg);
31 31
32Dep_Id * 32Eid *
33itemview_item_selected_get(); 33itemview_item_selected_get();
34 34
35void 35void
@@ -40,7 +40,7 @@ void
40itemview_clear(); 40itemview_clear();
41 41
42void 42void
43itemview_insert_after(Dep_Id *parent_it_id, Dep_Id *after_id, Dep_Id *wit_id); 43itemview_insert_after(Eid *parent_it_id, Eid *after_id, Eid *wit_id);
44 44
45void 45void
46itemview_item_del(const Item_Container_Item *wit); 46itemview_item_del(const Item_Container_Item *wit);
diff --git a/src/bin/egui_gui/objtree.c b/src/bin/egui_gui/objtree.c
index 613c346..492bc55 100644
--- a/src/bin/egui_gui/objtree.c
+++ b/src/bin/egui_gui/objtree.c
@@ -67,7 +67,7 @@ _item_expand(Gui_Widget *wdg, Elm_Object_Item *parent)
67{ 67{
68 Elm_Genlist_Item_Type type; 68 Elm_Genlist_Item_Type type;
69 69
70 Dep_Id *wid; 70 Eid *wid;
71 Elm_Object_Item *nitem; 71 Elm_Object_Item *nitem;
72 const Eina_List *w_list, *l; 72 const Eina_List *w_list, *l;
73 73
diff --git a/src/bin/egui_gui/props_helper.c b/src/bin/egui_gui/props_helper.c
index c1433bc..82ea874 100644
--- a/src/bin/egui_gui/props_helper.c
+++ b/src/bin/egui_gui/props_helper.c
@@ -100,10 +100,10 @@ _prop_field_update(const Gui_Widget_Property *prop, Eo *item_box, It_Data *it_da
100 props_hoversel_resources_add(NULL, o, NULL, NULL, wdg_context_get(it_data->wdg), RESOURCE_IMAGE); 100 props_hoversel_resources_add(NULL, o, NULL, NULL, wdg_context_get(it_data->wdg), RESOURCE_IMAGE);
101 props_hoversel_resources_add(NULL, o, NULL, NULL, wdg_context_get(it_data->wdg), RESOURCE_EDJE); 101 props_hoversel_resources_add(NULL, o, NULL, NULL, wdg_context_get(it_data->wdg), RESOURCE_EDJE);
102 102
103 Dep_Id *dep_id = DEP_ID_GET(prop_value_nth_get(prop, i)); 103 Eid *eid = EID_ID_GET(prop_value_nth_get(prop, i));
104 const char *default_str = PROP_HOVERSEL_NONE_VALUE; 104 const char *default_str = PROP_HOVERSEL_NONE_VALUE;
105 if (IS_ID_VALID(dep_id)) 105 if (IS_ID_VALID(eid))
106 default_str = dep_name_get(dep_id); 106 default_str = eid_name_get(eid);
107 eo_do(o, elm_obj_widget_part_text_set(NULL, default_str)); 107 eo_do(o, elm_obj_widget_part_text_set(NULL, default_str));
108 break; 108 break;
109 } 109 }
@@ -111,10 +111,10 @@ _prop_field_update(const Gui_Widget_Property *prop, Eo *item_box, It_Data *it_da
111 { 111 {
112 eo_do(o, elm_obj_hoversel_clear()); 112 eo_do(o, elm_obj_hoversel_clear());
113 props_hoversel_objects_add(NULL, o, NULL, NULL, gui_context_wdg_list_get(wdg_context_get(it_data->wdg)), it_data->wdg); 113 props_hoversel_objects_add(NULL, o, NULL, NULL, gui_context_wdg_list_get(wdg_context_get(it_data->wdg)), it_data->wdg);
114 Dep_Id *dep_id = DEP_ID_GET(prop_value_nth_get(prop, i)); 114 Eid *eid = EID_ID_GET(prop_value_nth_get(prop, i));
115 const char *default_str = PROP_HOVERSEL_NONE_VALUE; 115 const char *default_str = PROP_HOVERSEL_NONE_VALUE;
116 if (IS_ID_VALID(dep_id)) 116 if (IS_ID_VALID(eid))
117 default_str = dep_name_get(dep_id); 117 default_str = eid_name_get(eid);
118 eo_do(o, elm_obj_widget_part_text_set(NULL, default_str)); 118 eo_do(o, elm_obj_widget_part_text_set(NULL, default_str));
119 break; 119 break;
120 } 120 }
@@ -310,12 +310,12 @@ props_hoversel_objects_add(Eo *box, Eo *hoversel, Eo *hover_parent, const char *
310 elm_object_text_set(hoversel, default_val); 310 elm_object_text_set(hoversel, default_val);
311 311
312 const Eina_List *itr; 312 const Eina_List *itr;
313 Dep_Id *wid; 313 Eid *wid;
314 EINA_LIST_FOREACH(list, itr, wid) 314 EINA_LIST_FOREACH(list, itr, wid)
315 { 315 {
316 switch (dep_type_get(wid)) 316 switch (eid_type_get(wid))
317 { 317 {
318 case DEP_TYPE_WIDGET: 318 case EID_TYPE_WIDGET:
319 { 319 {
320 Gui_Widget *w = wdg_get(wid); 320 Gui_Widget *w = wdg_get(wid);
321 if (!w) continue; 321 if (!w) continue;
@@ -338,7 +338,7 @@ props_hoversel_objects_add(Eo *box, Eo *hoversel, Eo *hover_parent, const char *
338 Object_Container_Item *ci; 338 Object_Container_Item *ci;
339 EINA_LIST_FOREACH(wdg_obj_container_contents_list_get(wdg), itr2, ci) 339 EINA_LIST_FOREACH(wdg_obj_container_contents_list_get(wdg), itr2, ci)
340 { 340 {
341 if (obj_container_item_dep_id_get(ci) == wid) found = EINA_TRUE; 341 if (obj_container_item_eid_get(ci) == wid) found = EINA_TRUE;
342 } 342 }
343 if (found) continue; 343 if (found) continue;
344 } 344 }
@@ -347,11 +347,11 @@ props_hoversel_objects_add(Eo *box, Eo *hoversel, Eo *hover_parent, const char *
347 } 347 }
348 break; 348 break;
349 } 349 }
350 case DEP_TYPE_ITEM: 350 case EID_TYPE_ITEM:
351 { 351 {
352 Item_Container_Item *item = item_container_item_get_from_id(wid); 352 Item_Container_Item *item = item_container_item_get_from_id(wid);
353 if (!item) continue; 353 if (!item) continue;
354 eo_do(hoversel, elm_obj_hoversel_item_add(dep_name_get(wid), NULL, ELM_ICON_NONE, NULL, NULL)); 354 eo_do(hoversel, elm_obj_hoversel_item_add(eid_name_get(wid), NULL, ELM_ICON_NONE, NULL, NULL));
355 break; 355 break;
356 } 356 }
357 default: 357 default:
@@ -417,7 +417,7 @@ props_hoversel_resources_add(Eo *box, Eo *hoversel, Eo *hover_parent, const char
417 elm_object_text_set(hoversel, default_val); 417 elm_object_text_set(hoversel, default_val);
418 418
419 const Eina_List *res_lst, *itr; 419 const Eina_List *res_lst, *itr;
420 Dep_Id *res_id; 420 Eid *res_id;
421 res_lst = gui_context_resource_list_get(ctx, type); 421 res_lst = gui_context_resource_list_get(ctx, type);
422 EINA_LIST_FOREACH(res_lst, itr, res_id) 422 EINA_LIST_FOREACH(res_lst, itr, res_id)
423 { 423 {
@@ -471,9 +471,9 @@ props_value_add(Eo *box, const Gui_Widget *wdg, const Gui_Value *value, const Op
471 const char *default_str = PROP_HOVERSEL_NONE_VALUE; 471 const char *default_str = PROP_HOVERSEL_NONE_VALUE;
472 if (value) 472 if (value)
473 { 473 {
474 Dep_Id *dep_id = DEP_ID_GET(value); 474 Eid *eid = EID_ID_GET(value);
475 if (IS_ID_VALID(dep_id)) 475 if (IS_ID_VALID(eid))
476 default_str = dep_name_get(dep_id); 476 default_str = eid_name_get(eid);
477 } 477 }
478 const Gui_Context *ctx = wdg_context_get(wdg); 478 const Gui_Context *ctx = wdg_context_get(wdg);
479 new_obj = props_hoversel_objects_add(box, NULL, elm_widget_top_get(box), default_str, gui_context_wdg_list_get(ctx), wdg); 479 new_obj = props_hoversel_objects_add(box, NULL, elm_widget_top_get(box), default_str, gui_context_wdg_list_get(ctx), wdg);
@@ -517,8 +517,8 @@ props_value_add(Eo *box, const Gui_Widget *wdg, const Gui_Value *value, const Op
517 const char *default_str = PROP_HOVERSEL_NONE_VALUE; 517 const char *default_str = PROP_HOVERSEL_NONE_VALUE;
518 if (value) 518 if (value)
519 { 519 {
520 Dep_Id *dep_id = DEP_ID_GET(value); 520 Eid *eid = EID_ID_GET(value);
521 if (dep_id) default_str = dep_name_get(dep_id); 521 if (eid) default_str = eid_name_get(eid);
522 if (!default_str) 522 if (!default_str)
523 { 523 {
524 ERR("Looks like resource image was deleted. Handle this."); 524 ERR("Looks like resource image was deleted. Handle this.");
diff --git a/src/bin/egui_gui/rmview.c b/src/bin/egui_gui/rmview.c
index bdbaa0e..239c896 100644
--- a/src/bin/egui_gui/rmview.c
+++ b/src/bin/egui_gui/rmview.c
@@ -281,9 +281,9 @@ _bt_save_clicked(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *de
281 res_name = resource_name_get(res); 281 res_name = resource_name_get(res);
282 if (strcmp(str, res_name)) 282 if (strcmp(str, res_name))
283 { 283 {
284 Dep_Id *dep_id = resource_dep_id_get(res); 284 Eid *eid = resource_eid_get(res);
285 285
286 if (!dep_rename(dep_id, str)) 286 if (!eid_rename(eid, str))
287 { 287 {
288 ERR("Resource \"%s\" already exists!", str); 288 ERR("Resource \"%s\" already exists!", str);
289 status = EINA_FALSE; 289 status = EINA_FALSE;
@@ -321,7 +321,7 @@ _bt_save_clicked(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *de
321 resource_edc_path_set(res, str); 321 resource_edc_path_set(res, str);
322 const Gui_Widget *wdg = gui_context_data_get(ctx, SELECTED_WDG); 322 const Gui_Widget *wdg = gui_context_data_get(ctx, SELECTED_WDG);
323 proplayout_build(wdg); 323 proplayout_build(wdg);
324 gui_context_dep_observers_invoke(resource_dep_id_get(res)); 324 observers_invoke(resource_eid_get(res));
325 } 325 }
326 /* For CALLBACKS and STRINGS. */ 326 /* For CALLBACKS and STRINGS. */
327 else 327 else
@@ -348,9 +348,9 @@ _bt_del_clicked(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *des
348 eo_do(obj, f_data = eo_key_data_get(_STR_RMVIEW)); 348 eo_do(obj, f_data = eo_key_data_get(_STR_RMVIEW));
349 349
350 Gui_Resource *res = f_data->it_data->res; 350 Gui_Resource *res = f_data->it_data->res;
351 Dep_Id *dep_id = resource_dep_id_get(res); 351 Eid *eid = resource_eid_get(res);
352 352
353 dep_del(dep_id); 353 eid_del(eid);
354 resource_del(res); 354 resource_del(res);
355 _rmview_build(_rmview_toolbar_selected_type); 355 _rmview_build(_rmview_toolbar_selected_type);
356 356
@@ -413,7 +413,7 @@ _rmview_build(Rmview_Resource_Type type)
413 eo_do(g_rm_win->rm_table, elm_obj_table_pack(label, 1, 0, 1, 1)); 413 eo_do(g_rm_win->rm_table, elm_obj_table_pack(label, 1, 0, 1, 1));
414 414
415 Eina_List *itr; 415 Eina_List *itr;
416 Dep_Id *res_id; 416 Eid *res_id;
417 417
418 int table_line = 1; 418 int table_line = 1;
419 int table_col = 0; 419 int table_col = 0;
@@ -636,7 +636,7 @@ _rm_add_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Eve
636 if (!strlen(alias_str)) 636 if (!strlen(alias_str))
637 return EO_CALLBACK_CONTINUE; 637 return EO_CALLBACK_CONTINUE;
638 638
639 if (gui_context_dep_id_get_by_name(ctx, alias_str)) 639 if (gui_context_eid_get_by_name(ctx, alias_str))
640 { 640 {
641 ERR("Resource \"%s\" already exists", alias_str); 641 ERR("Resource \"%s\" already exists", alias_str);
642 return EO_CALLBACK_CONTINUE; 642 return EO_CALLBACK_CONTINUE;
diff --git a/src/bin/egui_gui/settings_view.c b/src/bin/egui_gui/settings_view.c
index 36c7d8b..ff1079f 100644
--- a/src/bin/egui_gui/settings_view.c
+++ b/src/bin/egui_gui/settings_view.c
@@ -45,7 +45,7 @@ _settingsview_toolbar_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *ev
45 45
46 elm_genlist_clear(g_settings_win->start_points_genlist); 46 elm_genlist_clear(g_settings_win->start_points_genlist);
47 const Eina_List *itr; 47 const Eina_List *itr;
48 Dep_Id *wdg_id; 48 Eid *wdg_id;
49 EINA_LIST_FOREACH(gui_context_main_widgets_get(ctx), itr, wdg_id) 49 EINA_LIST_FOREACH(gui_context_main_widgets_get(ctx), itr, wdg_id)
50 { 50 {
51 if (wdg_get(wdg_id)) 51 if (wdg_get(wdg_id))
@@ -91,7 +91,7 @@ _settings_apply_button_clicked(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, cons
91 eo_do(g_settings_win->images_prefix_entry, elm_obj_widget_part_text_set(NULL, old_val)); 91 eo_do(g_settings_win->images_prefix_entry, elm_obj_widget_part_text_set(NULL, old_val));
92 } 92 }
93 93
94 Dep_Id *start_pt_id = NULL; 94 Eid *start_pt_id = NULL;
95 gui_context_start_points_clear(ctx); 95 gui_context_start_points_clear(ctx);
96 EINA_LIST_FREE(_start_pts, start_pt_id) 96 EINA_LIST_FREE(_start_pts, start_pt_id)
97 gui_context_start_point_append(ctx, start_pt_id); 97 gui_context_start_point_append(ctx, start_pt_id);
@@ -122,7 +122,7 @@ settings_win_post_configure()
122static Eina_Bool 122static Eina_Bool
123_start_pt_chk_chg(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 123_start_pt_chk_chg(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
124{ 124{
125 Dep_Id *wdg_id = data; 125 Eid *wdg_id = data;
126 Eina_Bool state = eo_do(obj, elm_obj_check_state_get()); 126 Eina_Bool state = eo_do(obj, elm_obj_check_state_get());
127 if (state) 127 if (state)
128 _start_pts = eina_list_append(_start_pts, wdg_id); 128 _start_pts = eina_list_append(_start_pts, wdg_id);
@@ -135,16 +135,16 @@ _start_pt_chk_chg(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNU
135static char * 135static char *
136_start_pt_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) 136_start_pt_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED)
137{ 137{
138 Dep_Id *wdg_id = data; 138 Eid *wdg_id = data;
139 const char *wdg_name = dep_name_get(wdg_id); 139 const char *wdg_name = eid_name_get(wdg_id);
140 return wdg_name ? strdup(wdg_name) : NULL; 140 return wdg_name ? strdup(wdg_name) : NULL;
141} 141}
142 142
143static Evas_Object * 143static Evas_Object *
144_start_pt_content_get(void *data, Evas_Object *obj, const char *part) 144_start_pt_content_get(void *data, Evas_Object *obj, const char *part)
145{ 145{
146 Dep_Id *wdg_id = data; 146 Eid *wdg_id = data;
147 const Gui_Context *ctx = gui_context_get_by_dep_id(wdg_id); 147 const Gui_Context *ctx = gui_context_get_by_eid(wdg_id);
148 Eina_Bool state = !!eina_list_data_find(gui_context_start_points_get(ctx), wdg_id); 148 Eina_Bool state = !!eina_list_data_find(gui_context_start_points_get(ctx), wdg_id);
149 if (strcmp(part, "elm.swallow.icon")) return NULL; 149 if (strcmp(part, "elm.swallow.icon")) return NULL;
150 Eo *ck = eo_add(ELM_CHECK_CLASS, obj, 150 Eo *ck = eo_add(ELM_CHECK_CLASS, obj,