summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2014-10-26 16:33:28 +0200
committerYakov Goldberg <yakov.g@samsung.com>2014-10-27 10:27:32 +0200
commitfbb3ea5c4086e057f785185b07000a0822e444f4 (patch)
treee7e85600d49d244aa7331df63572d53ecee20160
parent6779a9e66b6bea463a2c125ea4381bf36b01d64c (diff)
Reverting editor.c of split commit
-rw-r--r--src/bin/egui_gui/editor.c46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index 789ebf1..e3ea3f3 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -5,7 +5,7 @@
5#include "gui_widget.h" 5#include "gui_widget.h"
6#include "props_helper.h" 6#include "props_helper.h"
7#include "objtree.h" 7#include "objtree.h"
8#include "prop_layout.h" 8#include "propview.h"
9#include "itemview.h" 9#include "itemview.h"
10#include "gui_parser.h" 10#include "gui_parser.h"
11#include "egui_logic_private.h" 11#include "egui_logic_private.h"
@@ -1158,7 +1158,7 @@ _update_widget_on_undoredo(const Gui_Context *ctx, Dep_Id *wdg_id, Eina_Bool sta
1158 if (parent) _wdg_parent_win_reload(parent); 1158 if (parent) _wdg_parent_win_reload(parent);
1159 objtree_item_selected_set(wdg?wdg:parent); 1159 objtree_item_selected_set(wdg?wdg:parent);
1160 _editor_wdg_selected_set(wdg?wdg:parent); 1160 _editor_wdg_selected_set(wdg?wdg:parent);
1161 proplayout_build(wdg?wdg:parent); 1161 propview_build(wdg?wdg:parent);
1162} 1162}
1163 1163
1164/* Undo last action */ 1164/* Undo last action */
@@ -1194,7 +1194,7 @@ _editor_undo(const Gui_Context *ctx)
1194 wdg_prop_remove(wdg, new_prop); 1194 wdg_prop_remove(wdg, new_prop);
1195 } 1195 }
1196 1196
1197 proplayout_view_switch(PROPERTY_TYPE); 1197 propsview_view_switch(PROPERTY_TYPE);
1198 if (old_prop) 1198 if (old_prop)
1199 { 1199 {
1200 op_desc = prop_op_desc_get(old_prop); 1200 op_desc = prop_op_desc_get(old_prop);
@@ -1234,7 +1234,7 @@ _editor_undo(const Gui_Context *ctx)
1234 wdg_obj_container_unset(wdg); 1234 wdg_obj_container_unset(wdg);
1235 wdg_obj_container_set(wdg, old_container); 1235 wdg_obj_container_set(wdg, old_container);
1236 1236
1237 proplayout_view_switch(CONTENT_TYPE); 1237 propsview_view_switch(CONTENT_TYPE);
1238 _wdg_parent_win_reload(wdg); 1238 _wdg_parent_win_reload(wdg);
1239 _editor_wdg_selected_set(wdg); 1239 _editor_wdg_selected_set(wdg);
1240 objtree_item_selected_set(wdg); 1240 objtree_item_selected_set(wdg);
@@ -1257,7 +1257,7 @@ _editor_undo(const Gui_Context *ctx)
1257 Dep_Data *dep_data = gui_context_dep_data_get(item_container_item_dep_id_get(old_it)); 1257 Dep_Data *dep_data = gui_context_dep_data_get(item_container_item_dep_id_get(old_it));
1258 dep_data_item_set(dep_data, old_it); 1258 dep_data_item_set(dep_data, old_it);
1259 1259
1260 proplayout_view_switch(CONTENT_TYPE); 1260 propsview_view_switch(CONTENT_TYPE);
1261 _wdg_parent_win_reload(wdg); 1261 _wdg_parent_win_reload(wdg);
1262 _editor_wdg_selected_set(wdg); 1262 _editor_wdg_selected_set(wdg);
1263 objtree_item_selected_set(wdg); 1263 objtree_item_selected_set(wdg);
@@ -1281,7 +1281,7 @@ _editor_undo(const Gui_Context *ctx)
1281 Dep_Data *dep_data = gui_context_dep_data_get(cb_dep_id); 1281 Dep_Data *dep_data = gui_context_dep_data_get(cb_dep_id);
1282 dep_data_cb_set(dep_data, old_cb); 1282 dep_data_cb_set(dep_data, old_cb);
1283 1283
1284 proplayout_view_switch(CALLBACK_TYPE); 1284 propsview_view_switch(CALLBACK_TYPE);
1285 _editor_wdg_selected_set(wdg); 1285 _editor_wdg_selected_set(wdg);
1286 cbview_item_selected_set(cb_dep_id); 1286 cbview_item_selected_set(cb_dep_id);
1287 break; 1287 break;
@@ -1301,7 +1301,7 @@ _editor_undo(const Gui_Context *ctx)
1301 wdg_cb_container_unset(wdg); 1301 wdg_cb_container_unset(wdg);
1302 wdg_cb_container_set(wdg, old_cc); 1302 wdg_cb_container_set(wdg, old_cc);
1303 1303
1304 proplayout_view_switch(CALLBACK_TYPE); 1304 propsview_view_switch(CALLBACK_TYPE);
1305 _editor_wdg_selected_set(wdg); 1305 _editor_wdg_selected_set(wdg);
1306 break; 1306 break;
1307 } 1307 }
@@ -1362,7 +1362,7 @@ _editor_redo(const Gui_Context *ctx)
1362 op_desc = prop_op_desc_get(old_prop); 1362 op_desc = prop_op_desc_get(old_prop);
1363 } 1363 }
1364 1364
1365 proplayout_view_switch(PROPERTY_TYPE); 1365 propsview_view_switch(PROPERTY_TYPE);
1366 if (new_prop) 1366 if (new_prop)
1367 { 1367 {
1368 op_desc = prop_op_desc_get(new_prop); 1368 op_desc = prop_op_desc_get(new_prop);
@@ -1402,7 +1402,7 @@ _editor_redo(const Gui_Context *ctx)
1402 Dep_Data *dep_data = gui_context_dep_data_get(cb_dep_id); 1402 Dep_Data *dep_data = gui_context_dep_data_get(cb_dep_id);
1403 dep_data_cb_set(dep_data, new_cb); 1403 dep_data_cb_set(dep_data, new_cb);
1404 1404
1405 proplayout_view_switch(CALLBACK_TYPE); 1405 propsview_view_switch(CALLBACK_TYPE);
1406 _editor_wdg_selected_set(wdg); 1406 _editor_wdg_selected_set(wdg);
1407 cbview_item_selected_set(cb_dep_id); 1407 cbview_item_selected_set(cb_dep_id);
1408 break; 1408 break;
@@ -1422,7 +1422,7 @@ _editor_redo(const Gui_Context *ctx)
1422 wdg_cb_container_unset(wdg); 1422 wdg_cb_container_unset(wdg);
1423 wdg_cb_container_set(wdg, new_cc); 1423 wdg_cb_container_set(wdg, new_cc);
1424 1424
1425 proplayout_view_switch(CALLBACK_TYPE); 1425 propsview_view_switch(CALLBACK_TYPE);
1426 _editor_wdg_selected_set(wdg); 1426 _editor_wdg_selected_set(wdg);
1427 break; 1427 break;
1428 } 1428 }
@@ -1448,7 +1448,7 @@ _editor_redo(const Gui_Context *ctx)
1448 //manager_widget_content_unset_all(session, wdg, wdg_obj_container_class_name_get(wdg), MODE_EDITOR, NULL); 1448 //manager_widget_content_unset_all(session, wdg, wdg_obj_container_class_name_get(wdg), MODE_EDITOR, NULL);
1449 //manager_widget_content_add(session, wdg, MODE_EDITOR, NULL); 1449 //manager_widget_content_add(session, wdg, MODE_EDITOR, NULL);
1450 /* Update propview. */ 1450 /* Update propview. */
1451 proplayout_view_switch(CONTENT_TYPE); 1451 propsview_view_switch(CONTENT_TYPE);
1452 _wdg_parent_win_reload(wdg); 1452 _wdg_parent_win_reload(wdg);
1453 _editor_wdg_selected_set(wdg); 1453 _editor_wdg_selected_set(wdg);
1454 objtree_item_selected_set(wdg); 1454 objtree_item_selected_set(wdg);
@@ -1471,7 +1471,7 @@ _editor_redo(const Gui_Context *ctx)
1471 Dep_Data *dep_data = gui_context_dep_data_get(item_container_item_dep_id_get(new_it)); 1471 Dep_Data *dep_data = gui_context_dep_data_get(item_container_item_dep_id_get(new_it));
1472 dep_data_item_set(dep_data, new_it); 1472 dep_data_item_set(dep_data, new_it);
1473 1473
1474 proplayout_view_switch(CONTENT_TYPE); 1474 propsview_view_switch(CONTENT_TYPE);
1475 _wdg_parent_win_reload(wdg); 1475 _wdg_parent_win_reload(wdg);
1476 _editor_wdg_selected_set(wdg); 1476 _editor_wdg_selected_set(wdg);
1477 objtree_item_selected_set(wdg); 1477 objtree_item_selected_set(wdg);
@@ -1526,7 +1526,7 @@ _editor_ctx_call(const Gui_Context *ctx)
1526 * It will draw border around win, but widget was not selected yet. 1526 * It will draw border around win, but widget was not selected yet.
1527 * So need to hide border. */ 1527 * So need to hide border. */
1528 _editor_wdg_selected_set(NULL); 1528 _editor_wdg_selected_set(NULL);
1529 proplayout_build(NULL); 1529 propview_build(NULL);
1530 objtree_item_selected_set(NULL); 1530 objtree_item_selected_set(NULL);
1531 1531
1532 return EINA_TRUE; 1532 return EINA_TRUE;
@@ -1560,7 +1560,7 @@ _editor_selected_wdg_del_cb()
1560 { 1560 {
1561 _wdg_parent_win_reload(wdg); 1561 _wdg_parent_win_reload(wdg);
1562 } 1562 }
1563 proplayout_build(NULL); 1563 propview_build(NULL);
1564 1564
1565 /* Set selected widget: t.e. if I delete button, box will be selected after. 1565 /* Set selected widget: t.e. if I delete button, box will be selected after.
1566 * If I delete window, main item will be selected. */ 1566 * If I delete window, main item will be selected. */
@@ -1710,7 +1710,7 @@ editor_shutdown()
1710{ 1710{
1711 target_db_shutdown(); 1711 target_db_shutdown();
1712 seqview_shutdown(); 1712 seqview_shutdown();
1713 proplayout_shutdown(); 1713 propview_shutdown();
1714 itemview_shutdown(); 1714 itemview_shutdown();
1715 objtree_list_unset(); 1715 objtree_list_unset();
1716 1716
@@ -1917,7 +1917,7 @@ _prop_update_from_propview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Descr
1917 if (reload_win) 1917 if (reload_win)
1918 { 1918 {
1919 _wdg_parent_win_reload(wdg); 1919 _wdg_parent_win_reload(wdg);
1920 proplayout_build(NULL); 1920 propview_build(NULL);
1921 _editor_wdg_selected_set(wdg); 1921 _editor_wdg_selected_set(wdg);
1922 objtree_item_selected_set(wdg); 1922 objtree_item_selected_set(wdg);
1923 } 1923 }
@@ -1949,7 +1949,7 @@ _prop_del_from_propview(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Descript
1949 1949
1950 _wdg_parent_win_reload(wdg); 1950 _wdg_parent_win_reload(wdg);
1951 1951
1952 proplayout_build(NULL); 1952 propview_build(NULL);
1953 1953
1954 _editor_wdg_selected_set(wdg); 1954 _editor_wdg_selected_set(wdg);
1955 objtree_item_selected_set(wdg); 1955 objtree_item_selected_set(wdg);
@@ -1983,7 +1983,7 @@ _drop_property_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
1983 1983
1984 wdg_prop_remove((Gui_Widget *) wdg, (Gui_Widget_Property *) prop); 1984 wdg_prop_remove((Gui_Widget *) wdg, (Gui_Widget_Property *) prop);
1985 _wdg_parent_win_reload(wdg); 1985 _wdg_parent_win_reload(wdg);
1986 proplayout_build(NULL); 1986 propview_build(NULL);
1987 _editor_wdg_selected_set(wdg); 1987 _editor_wdg_selected_set(wdg);
1988 objtree_item_selected_set(wdg); 1988 objtree_item_selected_set(wdg);
1989 } 1989 }
@@ -2099,7 +2099,7 @@ _field_update_from_itemview(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Desc
2099 2099
2100 /* Reloading all window. */ 2100 /* Reloading all window. */
2101 _wdg_parent_win_reload(wdg); 2101 _wdg_parent_win_reload(wdg);
2102 proplayout_build(NULL); 2102 propview_build(NULL);
2103 _editor_wdg_selected_set(wdg); 2103 _editor_wdg_selected_set(wdg);
2104 objtree_item_selected_set(wdg); 2104 objtree_item_selected_set(wdg);
2105 itemview_item_selected_set(new_wit); 2105 itemview_item_selected_set(new_wit);
@@ -2264,7 +2264,7 @@ _itemview_item_do_(unsigned int type)
2264 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE); 2264 elm_object_item_disabled_set(g->main_win->toolbar_undo_it, EINA_FALSE);
2265 2265
2266 _wdg_parent_win_reload(wdg); 2266 _wdg_parent_win_reload(wdg);
2267 proplayout_build(NULL); 2267 propview_build(NULL);
2268 _editor_wdg_selected_set(wdg); 2268 _editor_wdg_selected_set(wdg);
2269 objtree_item_selected_set(wdg); 2269 objtree_item_selected_set(wdg);
2270 itemview_item_selected_set(it); 2270 itemview_item_selected_set(it);
@@ -2578,7 +2578,7 @@ _widget_selected_from_objtree(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUS
2578{ 2578{
2579 Gui_Widget *wdg = elm_object_item_data_get(event_info); 2579 Gui_Widget *wdg = elm_object_item_data_get(event_info);
2580 _editor_wdg_selected_set(wdg); 2580 _editor_wdg_selected_set(wdg);
2581 proplayout_build(wdg); 2581 propview_build(wdg);
2582 2582
2583 /* Make menu shown, when it is selected from objtree. */ 2583 /* Make menu shown, when it is selected from objtree. */
2584 if (wdg_is_container(wdg, DB_DEF_MENU_CLASS)) 2584 if (wdg_is_container(wdg, DB_DEF_MENU_CLASS))
@@ -2594,7 +2594,7 @@ _project_close(const Gui_Context *ctx)
2594{ 2594{
2595 /* Clear lists. */ 2595 /* Clear lists. */
2596 objtree_context_set(NULL); 2596 objtree_context_set(NULL);
2597 proplayout_build(NULL); 2597 propview_build(NULL);
2598 seqview_fill(NULL); 2598 seqview_fill(NULL);
2599 if (ctx) 2599 if (ctx)
2600 { 2600 {
@@ -2761,7 +2761,7 @@ editor_init(GuiLogicCbs *_guilogic_cbs)
2761 _guilogic_cbs->_project_new = _project_new; 2761 _guilogic_cbs->_project_new = _project_new;
2762 2762
2763 objtree_list_set(g->main_win->objtree_list); 2763 objtree_list_set(g->main_win->objtree_list);
2764 proplayout_init(); 2764 propview_init();
2765 seqview_init(g->main_win->seq_list); 2765 seqview_init(g->main_win->seq_list);
2766 itemview_init(g->main_win->itemview_list); 2766 itemview_init(g->main_win->itemview_list);
2767 target_db_init(); 2767 target_db_init();