Merge branch 'develop'v0.2.0

51 files changed, 7290 insertions, 4046 deletions

diff --git a/TODO b/TODO
index 28c592b..9a45539 100644
--- a/TODO
+++ b/TODO
@@ -1,24 +1,46 @@
 Features:
 --------
-- Espion: support parameters whose types can be double and defines
-- Factory: add all the widgets / DnD
-- Database: fill / add display names
-- Multiple simulations modes:
-   - UI:
-      - hoversel (mode) and button to launch
-      - list of launched simulations
-   - Eo* must move from Gui_Widget to some simulation context
-   - Stop simulation
+-1 User callbacks:
+   - add entries / user data has to be represented with a hoversel for the type + value
+   - return value of the callback has to be an integer; condition can test the value and act differently
+      -1 0 and 1 accepted 
+      -2 more values/nesting conditions
+-1 Containers generically support: box, menus...
+-1 Deletion by the user - have to register callback to set:
+   - public widgets pointers as NULL in generator.
+   - Eo pointers to NULL in simulator.
+-1 Factory: add all the widgets / DnD
+-2 Espion: support parameters whose types can be double and defines
+-1 Resources manager:
+   - use it for images/edj...
+   - DB has to indicate property expects ResourceId and not filepath
+-1 Generator: come back on all the generation process
+- Integration with:
+   -1 Enventor:
+      - invocation from GUI
+      - we may need a resource panel where we can set the paths to the images...
+      - Enventor needs to be launched with edc
+   -2 Eolian library:
+      - Egui invokes Eolian to determine if a property is a method or a property
+      - If property, request the Eo1/Eo2 get op id to retrieve info from the object
+   -2 Espion:
+      - via network (option in espion and in egui application importer menu)
+      - establish a protocol between them
 
 Fixes:
 -----
 - Egui:
    - Fix value types for parameters in property view.
+   - Resize sub-windows according to application resolution
+   - Don't propagate events when selecting widget
+ - refactor _callbacks_expand (propview.c)
 
 Improvements:
 ------------
 - Prettify the UI
 - stringshare
+- need to think how handle _prop_new_value, which is outside of  gui_widget
+- is it possible to remove prop_validate(), and validate value in gui_value_set()?
 - wdg, cb, action, seq: ptr->id...
 - Have to improve the egui UI
    - goal: give an identity to egui -> recognizable just by the UI
@@ -26,8 +48,12 @@ Improvements:
    - entries to improve: min size...
 - When DnD widget around canvas, bind it around objects.
 - add scroll_bars to layout windows, if actual size is larger than frame
-- connect window's visibility to its frame
 - DnD widget from one box to another; content_set, etc.
+- _action_dep_resolve uses active_context_get() because there is no another way to find widget.
+
+- Draw border around box and other containers, to see its size.
+- think about dependency in action's property
+- A lot of logs to add, it will help us to debug
 
 Open issues:
 -----------
@@ -37,13 +63,28 @@ Known EFL bugs:
 --------------
 - FILE SELECTOR
 - button: if size_set will be before part_text_set, text will be ellipsed!!! need some fixes in recalculation
+- Sequence add: force panel show because RETURN key is propagated to panel
+- Hoversel with a lot of elements prevent access to those not displayed on the screen
 
 Future:
 ------
+- Link to Eolian to retrieve description of functions (popup)
 - Generator: source files in different formats
 - 3D representation of the exploded window:
    - shows every widget-layer of the win (win, containers, basic) created by the user
 - Evas objects
+- undo/redo: to implement this, we need to keep opposite operation for each method: like pack_end -> unpack
+  Moreover, if method receives several objects as parameters, we need to know, which parameter is subject and which is object.
+  T.e. pack_before(box, but2, but1) -> unpack(box, box2), here we need to remember, that oppossite for pack_before method (unpack)
+  must work with 1st parameter of pack_before, t.e. box2.
+- Recording scenario usable for automated tests and Tizen PLM issues:
+   - via espion or simulator? in simulator, button to record & run
+   - can we use Exactness?
+   - do we need to associate the scenario to an app?
+- Screenshot feature:
+   - for tests, demos
+   - one jpeg per window
+   - Exactness?
 
 Miscellaneous:
 -------------
@@ -70,3 +111,11 @@ Miscellaneous:
                   - no? invoke child code generation and then do as yes
                - Insert the buffer into the global context buffer
          - If action == modif or user, just generate code into buffer.
+
+Add Instructions file:
+---------------------
+- Install GraphViz:
+sudo add-apt-repository ppa:gviz-adm/graphviz-dev
+sudo apt-get update
+sudo apt-get install libgraphviz4
+sudo apt-get install libgraphviz-dev
diff --git a/cmake/Modules/FindCGraph.cmake b/cmake/Modules/FindCGraph.cmake
new file mode 100644
index 0000000..200efe1
--- /dev/null
+++ b/cmake/Modules/FindCGraph.cmake
@@ -0,0 +1,41 @@
+# - Try to find GraphViz
+# Once done this will define
+#  CGRAPH_FOUND - System has GraphViz
+#  CGRAPH_INCLUDE_DIRS - The GraphViz include directories
+#  CGRAPH_LIBRARIES - The libraries needed to use GraphViz
+#  CGRAPH_LDFLAGS_OTHER - Other LDFLAGS needed te use GraphViz
+#  CGRAPH_DEFINITIONS - Compiler switches required for using GraphViz
+
+find_package(PkgConfig)
+if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1")
+   # "QUIET" was introduced in 2.8.2
+   set(_QUIET QUIET)
+endif ()
+pkg_check_modules(PC_LIBCGRAPH ${_QUIET} libcgraph)
+
+set (CGRAPH_MIN_VERSION "2.35.0.0")
+if ("${PC_LIBCGRAPH_VERSION}" VERSION_LESS ${CGRAPH_MIN_VERSION})
+   MESSAGE(STATUS "libcgraph version required: ${CGRAPH_MIN_VERSION}. Current version: ${PC_LIBCGRAPH_VERSION}.")
+else()
+   SET(LIBCGRAPH_REQUIRED_VERSION 1)
+endif()
+
+if (LIBCGRAPH_REQUIRED_VERSION)
+   find_path(CGRAPH_INCLUDE_DIR cgraph.h
+      HINTS ${PC_LIBCGRAPH_INCLUDEDIR} ${PC_LIBCCGRAPH_INCLUDE_DIRS}
+      PATH_SUFFIXES cgraph )
+
+   find_library(CGRAPH_LIBRARY NAMES cgraph libcgraph
+      HINTS ${PC_LIBCGRAPH_LIBDIR} ${PC_LIBCGRAPH_LIBRARY_DIRS} )
+
+   set(CGRAPH_INCLUDE_DIRS ${CGRAPH_INCLUDE_DIR})
+   set(CGRAPH_LIBRARIES ${CGRAPH_LIBRARY} )
+
+   #include(FindPackageHandleStandardArgs)
+   # handle the QUIETLY and REQUIRED arguments and set EINA_FOUND to TRUE
+   # if all listed variables are TRUE
+   find_package_handle_standard_args(cgraph DEFAULT_MSG
+      CGRAPH_LIBRARY)
+endif (LIBCGRAPH_REQUIRED_VERSION)
+
+mark_as_advanced(CGRAPH_INCLUDE_DIR CGRAPH_LIBRARY)
diff --git a/cmake/Modules/FindGvc.cmake b/cmake/Modules/FindGvc.cmake
new file mode 100644
index 0000000..5bcb911
--- /dev/null
+++ b/cmake/Modules/FindGvc.cmake
@@ -0,0 +1,41 @@
+# - Try to find GraphViz
+# Once done this will define
+#  GVC_FOUND - System has GraphViz
+#  GVC_INCLUDE_DIRS - The GraphViz include directories
+#  GVC_LIBRARIES - The libraries needed to use GraphViz
+#  GVC_LDFLAGS_OTHER - Other LDFLAGS needed te use GraphViz
+#  GVC_DEFINITIONS - Compiler switches required for using GraphViz
+
+find_package(PkgConfig)
+if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1")
+   # "QUIET" was introduced in 2.8.2
+   set(_QUIET QUIET)
+endif ()
+
+pkg_check_modules(PC_LIBGVC ${_QUIET} libgvc)
+set (LIBGVC_MIN_VERSION "2.35.0.0")
+if ("${PC_LIBGVC_VERSION}" VERSION_LESS ${LIBGVC_MIN_VERSION})
+   MESSAGE(STATUS "libgvc version required: ${LIBGVC_MIN_VERSION}. Current version: ${PC_LIBGVC_VERSION}.")
+else()
+   SET(LIBGVC_REQUIRED_VERSION 1)
+endif()
+
+if (LIBGVC_REQUIRED_VERSION)
+   find_path(GVC_INCLUDE_DIR gvc.h
+      HINTS ${PC_LIBGVC_INCLUDEDIR} ${PC_LIBCGVC_INCLUDE_DIRS}
+      PATH_SUFFIXES gvc )
+
+   find_library(GVC_LIBRARY NAMES gvc libgvc
+      HINTS ${PC_LIBGVC_LIBDIR} ${PC_LIBGVC_LIBRARY_DIRS} )
+
+   set(GVC_INCLUDE_DIRS ${GVC_INCLUDE_DIR})
+   set(GVC_LIBRARIES ${GVC_LIBRARY} )
+
+   #include(FindPackageHandleStandardArgs)
+   # handle the QUIETLY and REQUIRED arguments and set EINA_FOUND to TRUE
+   # if all listed variables are TRUE
+   find_package_handle_standard_args(gvc DEFAULT_MSG
+      GVC_LIBRARY)
+endif (LIBGVC_REQUIRED_VERSION)
+
+mark_as_advanced(GVC_INCLUDE_DIR GVC_LIBRARY)
diff --git a/py/func_names.json b/py/func_names.json
index e6f65fe..5badd0d 100644
--- a/py/func_names.json
+++ b/py/func_names.json
@@ -3,26 +3,38 @@
       [
         {  
            "tokens" : ["evas_obj_color", "set"],
-           "name" :  "color_set"
+           "name" :  "color_set",
+           "display_name" : "Color"
         },
         {  
            "tokens" : ["evas_obj_size_set"],
-           "name" : "size_set" },
+           "name" : "size_set",
+           "display_name" : "Size"
+        },
         {  
            "tokens" : ["evas_obj_position", "set"], 
-           "name" : "position_set"
+           "name" : "position_set",
+           "display_name" : "Position"
         },
         {
            "tokens" : ["evas_obj_size_hint_weight","set"],
-           "name" : "size_hint_weight_set"
+           "name" : "size_hint_weight_set",
+           "display_name" : "Size Hint Weight"
         },
         {
            "tokens" : ["evas_obj_size_hint_aspect","set"],
-           "name" : "size_hint_aspect_set"
+           "name" : "size_hint_aspect_set",
+           "display_name" : "Size Hint Aspect"
         },
         {
            "tokens" : ["evas_obj_size_hint_align","set"],
-           "name" : "size_hint_align_set"
+           "name" : "size_hint_align_set",
+           "display_name" : "Size Hint Align"
+        },
+        {
+           "tokens" : ["evas_obj_size_hint_min","set"],
+           "name" : "size_hint_min_set",
+           "display_name" : "Size Hint Min"
         },
         {
            "tokens" : ["evas_obj_visibility_set"],
@@ -31,261 +43,347 @@
         },
         {
            "tokens" : ["elm_obj_bg_color_set"],
-           "name" : "bg_color_set"
+           "name" : "bg_color_set",
+           "display_name" : "Bg Color"
         },
         {
            "tokens" : ["elm_obj_bg_file_set"],
-           "name" : "bg_file_set"
+           "name" : "bg_file_set",
+           "display_name" : "Bg File"
         },
         {
            "tokens" : ["elm_obj_win_title_set"],
-           "name" : "title_set"
+           "name" : "title_set",
+           "display_name" : "Title"
         },
         {
            "tokens" : ["elm_obj_win","autodel_set"],
-           "name" : "autodel_set"
+           "name" : "autodel_set",
+           "display_name" : "Autodel"
         },
         {
            "tokens" : ["elm_obj_win_constructor"],
-           "name" : ""
+           "name" : "",
+           "display_name" : "Constructor"
         },
         {
            "tokens" : ["elm_obj_win_resize_object_add"],
            "name" : "resize_object_add",
-           "flags" : ["MULTI_PROPERTY", "CHANGE_ON_ACTIVATE", "UPDATE_PARENT"]
+           "flags" : ["MULTI_PROPERTY", "CHANGE_ON_ACTIVATE", "UPDATE_PARENT"],
+           "display_name" : "Resize Object"
+        },
+        {
+           "tokens" : ["elm_obj_win_modal_set"],
+           "name" : "modal",
+           "display_name" : "Modal"
         },
         {
            "tokens" : ["elm_wdg_style_set"],
-           "name" : "style_set"
+           "name" : "style_set",
+           "display_name" : "Style"
         },
         {
            "tokens" : ["elm_wdg_part_text_set"],
-           "name" : "part_text_set"
+           "name" : "part_text_set",
+           "display_name" : "Part Text"
         },
         {
            "tokens" : ["elm_wdg_disabled_set"],
-           "name" : "disabled"
+           "name" : "disabled",
+           "display_name" : "Disabled"
         },
         {
            "tokens" : ["elm_wdg_access_info_set"],
-           "name" : "access_info_set"
+           "name" : "access_info_set",
+           "display_name" : "Access Info"
         },
         {
            "tokens" : ["elm_obj_container_content_set"],
            "name" : "content_set",
-           "flags" : ["CHANGE_ON_ACTIVATE", "UPDATE_PARENT"]
+           "flags" : ["CHANGE_ON_ACTIVATE", "UPDATE_PARENT"],
+           "display_name" : "Content"
         },
         {
            "tokens" : ["elm_obj_box_pack_end"],
            "name" : "pack_end",
-           "flags" : ["MULTI_PROPERTY", "CHANGE_ON_ACTIVATE", "UPDATE_PARENT"]
+           "flags" : ["MULTI_PROPERTY", "CHANGE_ON_ACTIVATE", "UPDATE_PARENT"],
+           "display_name" : "Pack End"
+        },
+        {
+           "tokens" : ["elm_obj_box_pack_after"],
+           "name" : "pack_after",
+           "flags" : ["MULTI_PROPERTY", "CHANGE_ON_ACTIVATE", "UPDATE_PARENT"],
+           "display_name" : "Pack After"
         },
         {
            "tokens" : ["elm_scrollable_interface_bounce_allow_set"],
-           "name" : "bounce_allow"
+           "name" : "bounce_allow",
+           "display_name" : "Bounce Allow"
         },
         {
            "tokens" : ["elm_scrollable_interface_policy_set"],
-           "name" : "policy"
+           "name" : "policy",
+           "display_name" : "Policy"
         },
         {
            "tokens" : ["elm_obj_image_file_set"],
-           "name" : "image_file_set"
+           "name" : "image_file_set",
+           "display_name" : "Image File"
         },
         {
            "tokens" : ["elm_obj_image_resizable_set"],
-           "name" : "image_resizable_set"
+           "name" : "image_resizable_set",
+           "display_name" : "Resizable"
         },
         {
            "tokens" : ["elm_obj_button_autorepeat_set"],
-           "name" : "autorepeat_set"
+           "name" : "autorepeat_set",
+           "display_name" : "Autorepeat"
         },
         {
            "tokens" : ["elm_obj_button_autorepeat_initial_timeout_set"],
-           "name" : "autorepeat_initial_timeout_set"
+           "name" : "autorepeat_initial_timeout_set",
+           "display_name" : "Autorepeat Initial Timeout"
         },
         {
            "tokens" : ["elm_obj_button_autorepeat_gap_timeout_set"],
-           "name" : "autorepeat_gap_timeout_set"
+           "name" : "autorepeat_gap_timeout_set",
+           "display_name" : "Autorepeat Gap Timeout"
         },
         {
            "tokens" : ["elm_obj_check_state_set"],
-           "name" : "check_state"
+           "name" : "check_state",
+           "display_name" : "State"
         },
         {
            "tokens" : ["elm_obj_entry_single_line_set"],
-           "name" : "single_line"
+           "name" : "single_line",
+           "display_name" : "Single Line"
+        },
+        {
+           "tokens" : ["elm_obj_entry_text_style_user_push"],
+           "name" : "text_style_user_push",
+           "display_name" : "User style"
         },
         {
            "tokens" : ["elm_obj_entry_scrollable_set"],
-           "name" : "scrollable"
+           "name" : "scrollable",
+           "display_name" : "Scrollable"
         },
         {
            "tokens" : ["elm_obj_frame_autocollapse_set"],
-           "name" : "autocollapse"
+           "name" : "autocollapse",
+           "display_name" : "Autocollapse"
         },
         {
            "tokens" : ["elm_obj_box_horizontal_set"],
-           "name" : "horizontal"
-        },
-        {
-           "tokens" : ["elm_obj_box_clear"],
-           "name" : "clear"
+           "name" : "horizontal",
+           "display_name" : "Horizontal"
         },
         {
            "tokens" : ["elm_obj_box_align_set"],
-           "name" : "box_align" 
+           "name" : "box_align",
+           "display_name" : "Alignment"
         },
         {
            "tokens" : ["elm_obj_grid_size_set"],
-           "name" : "grid_size"
+           "name" : "grid_size",
+           "display_name" : "Grid Size"
         },
         {
            "tokens" : ["elm_obj_grid_pack"],
-           "name" : "grid_pack"
+           "name" : "grid_pack",
+           "display_name" : "Pack"
         },
         {
            "tokens" : ["elm_obj_panel_hidden_set"],
-           "name" : "panel_hidden"
+           "name" : "panel_hidden",
+           "display_name" : "Hidden"
         },
         {
            "tokens" : ["elm_obj_panel_orient_set"],
-           "name" : "panel_orient"
+           "name" : "panel_orient",
+           "display_name" : "Orientation"
         },
         {
            "tokens" : ["elm_obj_panes_horizontal_set"],
-           "name" : "panes_horizontal"
+           "name" : "horizontal",
+           "display_name" : "Horizontal"
+        },
+        {
+           "tokens" : ["elm_obj_panes_fixed_set"],
+           "name" : "fixed",
+           "display_name" : "Fixed"
+        },
+        {
+           "tokens" : ["elm_obj_panes_content_left_size_set"],
+           "name" : "content_left_size",
+           "display_name" : "Content Left Size"
         },
         {
            "tokens" : ["elm_obj_fileselector_path_set"],
-           "name" : "fileselector_path"
+           "name" : "fileselector_path",
+           "display_name" : "Path"
         },
         {
            "tokens" : ["elm_obj_table_pack_set"],
-           "name" : "table_pack_set"
+           "name" : "table_pack_set",
+           "display_name" : "Pack Set"
         },
         {
-           "tokens" : ["elm_obj_table_pack_get"], 
-           "name" : "table_pack_get"
+           "tokens" : ["elm_obj_table_pack_get"],
+           "name" : "table_pack_get",
+           "display_name" : "Pack get"
         },
         {
            "tokens" : ["elm_obj_table_pack"],
-           "name" : "table_pack"
+           "name" : "table_pack",
+           "display_name" : "Pack"
+        },
+        {
+           "tokens" : ["elm_obj_table_padding_set"],
+           "name" : "table_padding",
+           "display_name" : "Padding"
         },
         {
            "tokens" : ["elm_obj_separator_horizontal_set"],
-           "name" : "horizontal"
+           "name" : "horizontal",
+           "display_name" : "Horizontal"
         },
         {
            "tokens" : ["elm_obj_flip_go"],
-           "name" : "flip_go"
+           "name" : "flip_go",
+           "display_name" : "Flip Go"
         },
         {
            "tokens" : ["elm_obj_layout_file_set"],
-           "name" : "layout_file_set"
+           "name" : "layout_file_set",
+           "display_name" : "Layout File"
         },
         {
            "tokens" : ["elm_obj_win_focus_highlight_enabled_set"],
-           "name" : "win_focus_highlight_enabled_set"
+           "name" : "win_focus_highlight_enabled_set",
+           "display_name" : "Focus Highlight Enabled"
+        },
+        {
+           "tokens" : ["elm_obj_toolbar_shrink_mode_set"],
+           "name" : "shrink_mode",
+           "display_name" : "Shrink Mode"
+        },
+        {
+           "tokens" : ["elm_obj_toolbar_select_mode_set"],
+           "name" : "select_mode",
+           "display_name" : "Select Mode"
+        },
+        {
+           "tokens" : ["elm_obj_toolbar_icon_size_set"],
+           "name" : "icon_size",
+           "display_name" : "Icon Size"
         }
       ],
 
 "CLASSES" : [
-"elm_notify",
-"Scrollable_Interface",
-"elm_image",
-"elm_hover",
-"elm_layout",
-"elm_actionslider",
-"Selectable_Interface",
-"elm_spinner",
-"elm_calendar",
-"elm_toolbar",
-"elm_progressbar",
-"elm_panel",
-"elm_access",
-"elm_mapbuf",
-"elm_entry",
-"Evas_Object_Smart_Clipped",
-"elm_flipselector",
-"elm_video",
-"elm_index",
-"Evas_Object_Box",
-"elm_ctxpopup",
+"Elm_Notify",
+"Evas_Scrollable_Interface",
+"Elm_Image",
+"Elm_Hover",
+"Elm_Gengrid_Pan",
+"Elm_Layout",
+"Elm_Actionslider",
+"Evas_Selectable_Interface",
+"Elm_Spinner",
+"Evas_Object",
+"Elm_Calendar",
+"Elm_Access",
+"Elm_Toolbar",
+"Elm_Progressbar",
+"Elm_Panel",
+"Elm_Mapbuf",
+"Elm_Entry",
+"Evas_Smart_Clipped",
+"Elm_Flipselector",
+"Elm_Video",
+"Evas_Box",
+"Elm_Check",
 "Evas",
-"elm_radio",
-"elm_diskselector",
-"elm_colorselector",
-"elm_prefs",
-"elm_web",
-"elm_interface_scrollable",
-"Evas_Object_Line",
-"Draggable_Interface",
-"elm_dayselector",
-"Evas_Object_Image",
-"elm_fileselector_button",
-"elm_thumb",
-"elm_systray",
+"Elm_Radio",
+"Elm_Diskselector",
+"Elm_Colorselector",
+"Elm_Container",
+"Elm_Prefs",
+"Elm_App_Server_View",
+"Elm_App_Server",
+"Elm_Web",
+"Elm_Interface_Scrollable",
+"Evas_Line",
+"Evas_Draggable_Interface",
+"Elm_Dayselector",
+"Evas_Image",
+"Elm_Fileselector_Button",
+"Elm_Thumb",
+"Elm_Systray",
 "Evas_Common_Interface",
-"elm_conformant",
-"Evas_Object_Textblock",
-"elm_map",
-"Clickable_Interface",
-"elm_route",
-"elm_pan",
-"Zoomable_Interface",
-"elm_check",
-"Evas_Object",
-"elm_widget",
-"elm_segment_control",
-"elm_frame",
-"elm_glview",
-"elm_naviframe",
-"elm_flip",
-"elm_gengrid_pan",
-"elm_datetime",
-"elm_button",
-"elm_photocam_pan",
-"elm_player",
-"Evas_Object_Text",
-"elm_icon",
-"elm_genlist",
-"elm_slider",
-"elm_table",
-"elm_panes",
-"elm_fileselector",
-"Evas_Object_Grid",
-"elm_slideshow",
-"elm_multibuttonentry",
-"evas_object_textgrid",
-"Evas_Object_Table",
-"elm_fileselector_entry",
-"Evas_Object_Rectangle",
-"elm_grid",
+"Elm_Index",
+"Elm_Conformant",
+"Evas_Textblock",
+"Elm_Map",
+"Elm_Route",
+"Elm_Pan",
+"Evas_Zoomable_Interface",
+"Elm_Ctxpopup",
+"Eo_Abstract_Class",
+"Elm_Widget",
+"Elm_Segment_Control",
+"Elm_Frame",
+"Elm_Glview",
+"Elm_Naviframe",
+"Elm_Flip",
+"Elm_Datetime",
+"Elm_App_Client",
+"Elm_Button",
+"Elm_Photocam_Pan",
+"Elm_Player",
+"Evas_Text",
+"Elm_Icon",
+"Elm_Genlist",
+"Elm_Slider",
+"Elm_Table",
+"Eo_Base",
+"Elm_Panes",
+"Elm_Fileselector",
+"Evas_Grid",
+"Elm_Slideshow",
+"Elm_Multibuttonentry",
+"Evas_Textgrid",
+"Evas_Table",
+"Elm_Fileselector_Entry",
+"Evas_Rectangle",
+"Elm_Grid",
 "Evas_Out",
-"elm_clock",
-"elm_gesture_layer",
-"elm_menu",
-"elm_hoversel",
-"elm_bubble",
-"elm_list",
-"elm_container",
-"elm_photo",
-"elm_map_pan",
-"elm_scroller",
-"Evas_Object_Polygon",
-"elm_win",
-"elm_gengrid",
-"elm_box",
-"elm_plug",
-"elm_popup",
-"elm_bg",
-"elm_inwin",
-"elm_separator",
-"Signal_Interface",
-"Evas_Object_Smart",
-"elm_genlist_pan",
-"elm_label",
-"elm_photocam"]
+"Elm_Clock",
+"Elm_App_Client_View",
+"Elm_Gesture_Layer",
+"Elm_Menu",
+"Elm_Hoversel",
+"Elm_Bubble",
+"Elm_List",
+"Evas_Clickable_Interface",
+"Elm_Genlist_Pan",
+"Elm_Map_Pan",
+"Elm_Scroller",
+"Evas_Polygon",
+"Elm_Win",
+"Elm_Gengrid",
+"Elm_Box",
+"Elm_Plug",
+"Elm_Popup",
+"Elm_Bg",
+"Elm_Inwin",
+"Elm_Separator",
+"Evas_Signal_Interface",
+"Evas_Smart",
+"Elm_Photo",
+"Elm_Label",
+"Elm_Photocam"]
 }
 
diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt
index 20fdc79..443f2bb 100644
--- a/src/bin/CMakeLists.txt
+++ b/src/bin/CMakeLists.txt
@@ -1,13 +1,15 @@
 set(CMAKE_BUILD_TYPE Debug)
 
 include_directories (${CMAKE_SOURCE_DIR}/src/lib)
+include_directories (${CMAKE_SOURCE_DIR}/src/bin/egui_gui)
 
 link_directories (${CMAKE_SOURCE_DIR}/src/lib)
 link_directories (${PC_LIBELEMENTARY_LIBRARY_DIRS})
 
-add_executable(egui main.c egui_layout.c egui_logic.c props_helper.c objtree.c propview.c seqview.c editor.c)
+set(TARGET egui_cmd)
 
 add_definitions(${EGUI_COMMON_DEFINITIONS})
+add_executable(${TARGET} main.c)
 
 include_directories(
    ${EINA_INCLUDE_DIRS}
@@ -16,7 +18,7 @@ include_directories(
    ${ELEMENTARY_INCLUDE_DIRS}
    )
 
-target_link_libraries (egui
+target_link_libraries (${TARGET}
    guiparser
    ${EINA_LIBRARIES}
    ${ECORE_LIBRARIES}
@@ -25,3 +27,10 @@ target_link_libraries (egui
    ecore_file
    )
 
+# Save current dir because we want to know path to soutce file to build egui
+SET(EGUI_BINARY_SRC ${CMAKE_CURRENT_LIST_DIR})
+# Save build path of egui_cmd, because we want to copy egui to the same folder
+SET(EGUI_BINARY_BLD ${CMAKE_CURRENT_BINARY_DIR})
+
+add_subdirectory(egui_gui)
+#add_subdirectory(egui_auto)
diff --git a/src/bin/editor.c b/src/bin/editor.c
deleted file mode 100644
index b1eaa99..0000000
--- a/src/bin/editor.c
+++ /dev/null
@@ -1,958 +0,0 @@
-
-#include "egui_log.h"
-#include "ffi_glue.h"
-#include "ffi_abstraction.h"
-#include "gui_widget.h"
-#include "props_helper.h"
-#include "objtree.h"
-#include "propview.h"
-#include "seqview.h"
-#include "editor.h"
-#include "egui_logic.h"
-
-#include <Elementary.h>
-
-#define SELECTED_WDG "slctd_wdg"
-
-static void _prop_update_from_propview(void *data, Eo *obj, void *ev);
-static void _prop_del_from_propview(void *data, Eo *obj, void *ev);
-static void _widget_selected_from_objtree(void *data, Evas_Object *obj, void *event_info);
-
-int
-which_border(Evas_Coord x, Evas_Coord y, Evas_Coord ow, Evas_Coord oh)
-{
-   /* Width of border to catch callback. */
-   Evas_Coord bw = 10;
-   int lr = 0, tb = 0;
-   if (x < bw) lr = BORDER_LEFT;
-   else if (x > ow - bw) lr = BORDER_RIGHT;
-   if (y < bw) tb = BORDER_TOP;
-   else if (y > oh - bw) tb = BORDER_BOTTOM;
-   return lr | tb;
-}
-
-static void
-_on_mouse_move_widget_drag(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
-void *event_info)
-{
-   Gui_Context *ctx = data;
-   static int cx, cy;
-   Evas_Coord x, y, ox, oy, ow, oh, dx, dy;
-   int wb = 0;
-   Evas_Event_Mouse_Move *ev = event_info;
-
-   /*FIXME: remove static stuff after tripple callback wil be fixed*/
-   if ((cx == ev->cur.canvas.x) && (cy == ev->cur.canvas.y))
-     return;
-
-   eo_do(obj, evas_obj_position_get(&ox, &oy));
-   eo_do(obj, evas_obj_size_get(&ow, &oh));
-
-//   ERR("obj name: %s; x: %d; y: %d ", wdg_name_get(wdg_by_eo_find(ctx, obj)), ox, oy);
-   dx = ev->cur.canvas.x - ev->prev.canvas.x;
-   dy = ev->cur.canvas.y - ev->prev.canvas.y;
-
-   /*absolute coords within object, calculate with prev position!*/
-   x = ev->prev.canvas.x - ox;
-   y = ev->prev.canvas.y - oy;
-
-   wb = which_border(x, y, ow, oh);
-
-   /* if dragging not border, update coords*/
-   if (wb == BORDER_OUT)
-     {
-        ox = ox + dx;
-        oy = oy + dy;
-     }
-   else
-     {
-        if (wb & BORDER_LEFT)
-          {
-             ow = ow - dx;
-             ox = ox + dx;
-          }
-        else if (wb & BORDER_RIGHT)
-          {
-             ow = ow + dx;
-          }
-
-        if (wb & BORDER_TOP)
-          {
-             oh = oh - dy;
-             oy = oy + dy;
-          }
-        else if (wb & BORDER_BOTTOM)
-          {
-             oh = oh + dy;
-          }
-     }
-
-   eo_do(obj, evas_obj_position_set(ox, oy));
-   eo_do(obj, evas_obj_size_set(ow, oh));
-     {
-        Gui_Widget *wdg = wdg_by_eo_find(ctx, obj);
-        Gui_Widget_Property *prop;
-        Gui_Value *val;
-
-        if (wdg)
-          {
-             prop = wdg_prop_get(wdg, "size_set");
-             if (prop)
-               {
-                  val = prop_value_nth_get(prop, 0);
-                  gui_value_set(val, GUI_TYPE_SINT, &ow);
-                  val = prop_value_nth_get(prop, 1);
-                  gui_value_set(val, GUI_TYPE_SINT, &oh);
-                  propview_item_update(prop);
-               }
-
-             prop = wdg_prop_get(wdg, "position_set");
-             if (prop)
-               {
-                  val = prop_value_nth_get(prop, 0);
-                  gui_value_set(val, GUI_TYPE_SINT, &ox);
-                  val = prop_value_nth_get(prop, 1);
-                  gui_value_set(val, GUI_TYPE_SINT, &oy);
-                  propview_item_update(prop);
-               }
-          }
-     }
-
-   cx = ev->cur.canvas.x;
-   cy = ev->cur.canvas.y;
-}
-
-static void
-_frame_mouse_move(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *fr, void *event_info)
-{
-   Evas_Coord x, y, ox, oy, ow, oh, dx, dy;
-   Evas_Event_Mouse_Move *ev = event_info;
-
-   eo_do(fr, evas_obj_position_get(&ox, &oy));
-   eo_do(fr, evas_obj_size_get(&ow, &oh));
-
-   dx = ev->cur.canvas.x - ev->prev.canvas.x;
-   dy = ev->cur.canvas.y - ev->prev.canvas.y;
-
-   int wb = 0;
-   /*absolute coords within object, calculate with prev position!*/
-   x = ev->prev.canvas.x - ox;
-   y = ev->prev.canvas.y - oy;
-
-   wb = which_border(x, y, ow, oh);
-
-   if (wb == BORDER_OUT)
-     {
-        ox = ox + dx;
-        oy = oy + dy;
-     }
-   else
-     {
-        if (wb & BORDER_LEFT)
-          {
-             ow = ow - dx;
-             ox = ox + dx;
-          }
-        else if (wb & BORDER_RIGHT)
-          {
-             ow = ow + dx;
-          }
-
-        if (wb & BORDER_TOP)
-          {
-             oh = oh - dy;
-             oy = oy + dy;
-          }
-        else if (wb & BORDER_BOTTOM)
-          {
-             oh = oh + dy;
-          }
-     }
-
-   Gui_Widget *wdg;
-   Gui_Widget_Property *prop;
-   Gui_Value *val;
-
-   eo_do(fr, eo_base_data_get("winwdg", (void**)(&wdg)));
-
-   manager_init();
-   prop = wdg_prop_get(wdg, SIZE_SET);
-   if (prop)
-     {
-        val = prop_value_nth_get(prop, 0);
-        gui_value_set(val, GUI_TYPE_SINT, &ow);
-        val = prop_value_nth_get(prop, 1);
-        gui_value_set(val, GUI_TYPE_SINT, &oh);
-        propview_item_update(prop);
-        /* win has size prop, so move it through manager*/
-        manager_wdg_prop_eo_do_call(wdg, prop, MODE_EDITOR, NULL);
-     }
-
-   /* FIXME: Move frame here, because we don't know if win must have position property*/
-   eo_do(fr, evas_obj_position_set(ox, oy));
-   prop = wdg_prop_get(wdg, POSITION_SET);
-   if (prop)
-     {
-        val = prop_value_nth_get(prop, 0);
-        gui_value_set(val, GUI_TYPE_SINT, &ox);
-        val = prop_value_nth_get(prop, 1);
-        gui_value_set(val, GUI_TYPE_SINT, &oy);
-        propview_item_update(prop);
-     }
-#if 0
-   /* FIXME: if win and its image is in frame, shoul it be resized?*/
-   Eo *inwin, *inwin_img;
-   inwin = wdg_eo_get(wdg);
-   inwin_img = elm_win_inlined_image_object_get(inwin);
-   evas_object_move(inwin, ox, oy);
-   evas_object_resize(inwin, ow, oh);
-   evas_object_move(inwin_img, ox, oy);
-   evas_object_resize(inwin_img, ow, oh);
-#endif
-   manager_shutdown();
-}
-
-#if 0
-static void
-_mouse_move_over(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
-{
-   /* Can be used later, to show change size arrows on focused object*/
-   Evas_Event_Mouse_Move *ev = event_info;
-   Evas_Coord x, y;
-   Evas_Coord ox, oy, ow, oh;
-   Eina_Bool focused;
-
-   eo_do(obj, evas_obj_focus_get(&focused));
-   eo_do(obj, evas_obj_position_get(&ox, &oy));
-   eo_do(obj, evas_obj_size_get(&ow, &oh));
-
-   x = ev->cur.canvas.x;
-   y = ev->cur.canvas.y;
-
-   ERR("Mouse is moving over obj: %p; evas: %p; %i %i", obj, evas_object_evas_get(obj), x, y);
-
-   switch (which_border(x - ox, y - oy, ow, oh))
-     {
-      case BORDER_LEFT:
-           {
-              ERR("LEFT");
-              break;
-           }
-      case BORDER_RIGHT:
-           {
-              ERR("RIGHT");
-              break;
-           }
-      case BORDER_TOP:
-           {
-              ERR("TOP");
-              break;
-           }
-      case BORDER_BOTTOM:
-           {
-              ERR("BOTTOM");
-              break;
-           }
-      default:
-         break;
-     }
-}
-#endif
-
-#if 0
-static void
-_mouse_in(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-   ERR("Mouse IN obj name: obj: %p; evas: %p", obj, evas_object_evas_get(obj));
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_over, NULL);
-}
-
-static void
-_mouse_out(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-   ERR("Mouse OUT obj name: obj: %p; evas: %p", obj, evas_object_evas_get(obj));
-   evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_over);
-}
-#endif
-void
-editor_wdg_selected_set(const Gui_Widget *wdg)
-{
-   if (wdg) gui_context_data_set(wdg_context_get(wdg), SELECTED_WDG, (Gui_Widget *) wdg);
-   else gui_context_data_set(active_context_get(), SELECTED_WDG, NULL);
-
-   if (!wdg) return;
-   Eo *obj = wdg_eo_get(wdg);
-   /* Stack up */
-   eo_do(obj, evas_obj_raise());
-   /* Set focus */
-   eo_do(obj, evas_obj_focus_set(EINA_TRUE));
-}
-
-const Gui_Widget*
-editor_wdg_selected_get()
-{
-   return gui_context_data_get(active_context_get(), SELECTED_WDG);
-}
-
-/* Second parameter is used to indicate if the wdg has to be deleted */
-static void
-_iter_del_widget(Gui_Widget *wdg, Eina_Bool del_wdg)
-{
-   Eina_List *children = NULL, *l, *l2;
-   Gui_Widget *w;
-
-   /* Windows are iterated separately, so if m_win == NULL, t.e. its parent is NULL
-    * so current object is not win.
-    * If iterated object is win, I create it as inlined_image and add frame to simulate win.*/
-
-   children = wdg_children_list_get(wdg);
-   EINA_LIST_FOREACH_SAFE(children, l, l2, w)
-     {
-        _iter_del_widget(w, del_wdg);
-     }
-   manager_wdg_eo_del_call(wdg, MODE_EDITOR, NULL);
-   if (del_wdg) wdg_del(wdg);
-}
-
-void
-_editor_selected_wdg_del_cb()
-{
-   const Gui_Widget *wdg = editor_wdg_selected_get();
-   if (!wdg) return;
-   editor_wdg_selected_set(NULL);
-   _iter_del_widget((Gui_Widget *) wdg, EINA_TRUE);
-}
-
-static void
-_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
-{
-//   Gui_Context *ctx = data;
-   ERR("key down");
-}
-
-/* Callback, which adds MOUSE_MOVE callback,
- * to implement drag-and-drop in editor mode*/
-static void
-_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-   Gui_Context *ctx = data;
-   Gui_Widget *wdg = wdg_by_eo_find(ctx, obj);
-   EINA_SAFETY_ON_NULL_RETURN(wdg);
-
-   evas_object_focus_set(wdg_eo_get(wdg), EINA_TRUE);
-   editor_wdg_selected_set(wdg);
-   objtree_item_selected_set(wdg);
-
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_widget_drag, ctx);
-   //ERR("obj name: %s, obj: %p; evas: %p", wdg_name_get(wdg), obj, evas_object_evas_get(obj));
-}
-
-/* Callback, which deletes MOUSE_MOVE callback,
- * to implement drag-and-drop*/
-//static void
-//_mouse_up(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-static Eina_Bool
-_mouse_up(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
-{
-   /* Delete all callbacks,
-    * because sometimes _mouse_down is called several times. */
-   while(evas_object_event_callback_del
-          (obj, EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_widget_drag));
-   return EO_CALLBACK_CONTINUE;
-}
-
-static void
-_frame_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
-{
-   Gui_Widget *wdg;
-   eo_do(obj, evas_obj_raise());
-   eo_do(obj, evas_obj_focus_set(EINA_TRUE));
-
-   eo_do(obj, eo_base_data_get("winwdg", (void**)(&wdg)));
-   eo_do(obj, evas_obj_focus_set(EINA_TRUE));
-
-   editor_wdg_selected_set(wdg);
-   objtree_item_selected_set(wdg);
-
-   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE, _frame_mouse_move, NULL);
-}
-
-static Eina_Bool
-_frame_mouse_up(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
-{
-   evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_MOVE, _frame_mouse_move);
-   return EO_CALLBACK_CONTINUE;
-}
-
-/* Second parameter is used only as parent for INLINED windows*/
-static void
-_iter_widget(Gui_Widget *wdg, const Eo *parent_win)
-{
-   Eina_List *children = NULL, *l;
-   Gui_Widget *w;
-
-   if (wdg_state_get(wdg) < STATE_VALIDATED)
-     {
-        ERR("Widget: \"%s\" was not validated, so can't be simulated.", wdg_name_get(wdg));
-        return;
-     }
-   /* Windows are iterated separately. If parent is NULL, means that current object is not win.
-    * If iterated object is win, I create it as inlined_image and add frame to simulate win.*/
-   Eina_Bool created;
-   created = manager_wdg_eo_add_call(wdg, MODE_EDITOR, (void *)parent_win);
-
-   if (created)
-     {
-        manager_wdg_eo_do_call(wdg, MODE_EDITOR, NULL);
-        manager_wdg_eo_do_delayed_call(wdg, MODE_EDITOR, NULL);
-
-        children = wdg_children_list_get(wdg);
-        EINA_LIST_FOREACH(children, l, w)
-          {
-             /* Window can not have child windows, so pass NULL. */
-             _iter_widget(w, NULL);
-          }
-     }
-}
-
-static Eina_Bool
-_win_resize(void *data EINA_UNUSED, Eo *o, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
-{
-   Evas_Coord ow = 0, oh = 0;
-   Eo *fr = NULL;
-   eo_do(o, evas_obj_size_get(&ow, &oh));
-   Eo *inwin_img = elm_win_inlined_image_object_get(o);
-   /* FIXME: comment it? */
-   evas_object_resize(inwin_img, ow, oh);
-   eo_do(o, eo_base_data_get("frame", (void **) &fr));
-   evas_object_resize(fr, ow, oh);
-   return EO_CALLBACK_CONTINUE;
-}
-
-static Eina_Bool
-_editor_eo_do(const Gui_Widget *wdg, void *_prop, void *data EINA_UNUSED)
-{
-   Eina_Bool ret;
-   ret = _ffi_eo_do(wdg, _prop);
-
-   if (IS_WIN(wdg) && !strcmp(prop_name_get(_prop), TITLE_SET))
-     {
-        char *title = WDG_NTH_VALUE_STRING_GET(wdg, TITLE_SET, 0);
-        Eo *fr = NULL, *o = wdg_eo_get(wdg);
-        eo_do(o, eo_base_data_get("frame", (void **) &fr));
-        elm_object_text_set(fr, title);
-     }
-   return ret;
-}
-
-static Eina_Bool
-_widget_del(Gui_Widget *wdg, void *data EINA_UNUSED)
-{
-   Eo *o = wdg_eo_get(wdg);
-   if (IS_WIN(wdg))
-     {
-        Eo *fr = NULL;
-        eo_do(o, eo_base_data_get("frame", (void **) &fr));
-        if (fr)
-          {
-             elm_object_content_unset(fr);
-             eo_do(o, eo_base_data_del("frame"));
-             eo_do(fr, eo_base_data_del("winwdg"));
-
-             eo_ref(fr);
-             eo_del(fr);
-          }
-     }
-   objtree_item_remove(wdg);
-   wdg_eo_set(wdg, NULL);
-   eo_ref(o);
-   eo_del(o);
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-_widget_add(const Gui_Widget *wdg, void *data)
-{
-   Eo *o;
-   if (!IS_WIN(wdg))
-     {
-        o = _ffi_eo_add(wdg);
-        if (!o) return EINA_FALSE;
-        evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _key_down, wdg_context_get(wdg));
-        evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, wdg_context_get(wdg));
-        //evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _mouse_up, NULL);
-        eo_do(o, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_UP, _mouse_up, NULL));
-        /* To avoid dragging box, when want to drag button. */
-        evas_object_propagate_events_set(o, EINA_FALSE);
-        /* Add callbacks to show widget resize arrows */
-#if 0
-        evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN, _mouse_in, NULL);
-        evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT, _mouse_out, NULL);
-#endif
-        /* Add specific callbacks, related to UI. */
-     }
-   else
-     {
-        Eo *fr;
-        Eo *parent_win = data;
-        /*
-        if (!parent_win)
-          {
-             parent_win = wdg_eo_get(wdg_parent_get(wdg));
-          }
-          */
-
-        o = eo_add_custom(ELM_OBJ_WIN_CLASS, parent_win, elm_obj_win_constructor(NULL, ELM_WIN_INLINED_IMAGE));
-        if (!o) return EINA_FALSE;
-
-        Eo *io = elm_win_inlined_image_object_get(o);
-        evas_object_propagate_events_set(io, EINA_FALSE);
-
-        fr = eo_add(ELM_OBJ_FRAME_CLASS, parent_win);
-        /* Unref everything and later ref it before delete */
-        eo_unref(fr);
-        eo_do(o, eo_base_data_set("frame", fr, NULL));
-
-        //evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-        //evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
-        elm_object_text_set(fr, elm_win_title_get(o));
-        eo_do(fr,
-              evas_obj_visibility_set(EINA_TRUE),
-              elm_obj_frame_autocollapse_set(EINA_TRUE));
-
-        evas_object_event_callback_add(fr, EVAS_CALLBACK_MOUSE_DOWN, _frame_mouse_down, NULL);
-        eo_do(fr, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_UP, _frame_mouse_up, NULL));
-        eo_do(fr, eo_base_data_set("winwdg", wdg, NULL));
-        elm_object_content_set(fr, io);
-
-        eo_do(o, eo_event_callback_add(EVAS_OBJECT_EVENT_RESIZE, _win_resize, NULL));
-        /* Get size from properties of window. */
-        static Evas_Coord ox = 150, oy = 50;
-        evas_object_move(fr, ox, oy);
-        evas_object_move(io, ox, oy);
-        //        ox = oy = ox + 30;
-     }
-
-   eo_unref(o);
-   wdg_eo_set((Gui_Widget *) wdg, o);
-   return EINA_TRUE;
-}
-
-void
-editor_init()
-{
-   Action_Functions *funcs = manager_action_functions_get(MODE_EDITOR);
-   funcs->wdg_add = _widget_add;
-   funcs->wdg_del = _widget_del;
-   funcs->prop_add = _editor_eo_do;
-
-   PropViewCbs *prop_cbs = propview_cbs_get();
-   prop_cbs->property_update_cb_func = _prop_update_from_propview;
-   prop_cbs->property_delete_cb_func = _prop_del_from_propview;
-
-   ObjTreeViewCbs *objtree_cbs = objtree_cbs_get();
-   objtree_cbs->item_selection_cb_func = _widget_selected_from_objtree;
-}
-
-Eina_Bool
-editor_ctx_call(const Gui_Context *ctx)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_FALSE);
-
-   manager_init();
-   Eina_List *list, *l;
-   Gui_Widget *wdg;
-
-   /* in editor, we iterate only over windows which don't have parent. */
-   list = gui_context_win_list_get(ctx);
-   EINA_LIST_FOREACH(list, l, wdg)
-     {
-        /* if window has parent widget, it will be iterated as child*/
-        if (wdg_parent_get(wdg))
-          {
-             ERR("Window: \"%s\" has parent. It should not happen. We have bug!", wdg_name_get(wdg));
-             continue;
-          }
-
-        /* All windows should be shown in main gui window. */
-        _iter_widget(wdg, canvas_get());
-     }
-   /* Set context for objtree. */
-   objtree_context_set(ctx);
-   seqview_fill(ctx);
-   manager_shutdown();
-   return EINA_TRUE;
-}
-
-/* Remove only Eo objects, not internal widget tree.*/
-Eina_Bool
-editor_layout_clear(const Gui_Context *ctx)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_FALSE);
-
-   manager_init();
-
-   Eina_List *list, *l;
-   Gui_Widget *wdg;
-
-   /* in editor, we iterate only over windows which don't have parent. */
-   list = gui_context_win_list_get(ctx);
-   EINA_LIST_FOREACH(list, l, wdg)
-     {
-        /* if window have parent widget, it will be iterated as child*/
-        if (wdg_parent_get(wdg)) continue;
-
-        /* if there is no parent window for widget,
-         * it means it will be shown in main gui window. */
-        _iter_del_widget(wdg, EINA_FALSE);
-     }
-   /* Set context for objtree. */
-   manager_shutdown();
-   return EINA_TRUE;
-}
-
-void
-editor_factory_wdg_create(const char *class_name)
-{
-   const Gui_Widget *parent_win = NULL;
-   const char *parent_name = NULL;
-   Gui_Widget *wdg;
-   const Gui_Widget *focused_wdg = editor_wdg_selected_get();
-   const Gui_Context *ctx = active_context_get();
-
-   if (!ctx)
-     {
-        ERR("No active context");
-        return;
-     }
-
-   /*If adding non window widget*/
-   if (strcmp(class_name, DB_DEF_WIN_CLASS))
-     {
-        if (!focused_wdg) return;
-        parent_win = wdg_parent_win_wdg_get(focused_wdg);
-        parent_name = wdg_name_get(parent_win);
-     }
-
-   char *new_name = gui_context_free_name_get(ctx, class_name);
-
-   wdg = wdg_new(new_name);
-   free(new_name);
-   wdg_class_name_set(wdg, class_name);
-   wdg_append(ctx, wdg);
-   wdg_parent_set(wdg, parent_name);
-
-   /*Add default visibility property*/
-   Gui_Widget_Property *prop;
-   Gui_Value *val;
-   Eina_Bool b = EINA_TRUE;
-   prop = prop_new(VISIBILITY_SET);
-   val = gui_value_new();
-   gui_value_set(val, GUI_TYPE_BOOL, &b);
-   prop_value_append(prop, val);
-   wdg_prop_add(wdg, prop);
-
-   if (IS_WIN(wdg))
-     {
-        /* By default, the window is created in the first action */
-        Gui_Sequence *seq = sequence_get(ctx, "BigBang");
-        /* Generate BigBand action if does not exist */
-        if (!seq) seq = sequence_new(ctx, "BigBang");
-        Gui_Action *action = action_new(seq);
-        action_creation_set(action, wdg_name_get(wdg));
-        seqview_fill(ctx);
-
-        prop = prop_new(CONSTRUCTOR);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_STRING, ELM_OBJ_WIN_CONSTRUCTOR);
-        prop_value_append(prop, val);
-        wdg_prop_add(wdg, prop);
-
-        prop = prop_new(ELM_OBJ_WIN_CONSTRUCTOR);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_NULL, NULL);
-        prop_value_append(prop, val);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_ENUM, "ELM_WIN_BASIC");
-        prop_value_append(prop, val);
-        wdg_prop_add(wdg, prop);
-
-        int i = 200;
-        prop = prop_new(SIZE_SET);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_SINT, &i);
-        prop_value_append(prop, val);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_SINT, &i);
-        prop_value_append(prop, val);
-        wdg_prop_add(wdg, prop);
-
-        prop = prop_new(TITLE_SET);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_STRING, wdg_name_get(wdg));
-        prop_value_append(prop, val);
-        wdg_prop_add(wdg, prop);
-     }
-   else
-     {
-        prop = prop_new(PART_TEXT_SET);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_NULL, NULL);
-        prop_value_append(prop, val);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_STRING, wdg_name_get(wdg));
-        prop_value_append(prop, val);
-        wdg_prop_add(wdg, prop);
-
-        int i = 255;
-        prop = prop_new(COLOR_SET);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_SINT, &i);
-        prop_value_append(prop, val);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_SINT, &i);
-        prop_value_append(prop, val);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_SINT, &i);
-        prop_value_append(prop, val);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_SINT, &i);
-        prop_value_append(prop, val);
-        wdg_prop_add(wdg, prop);
-
-        i = 0;
-        prop = prop_new(POSITION_SET);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_SINT, &i);
-        prop_value_append(prop, val);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_SINT, &i);
-        prop_value_append(prop, val);
-        wdg_prop_add(wdg, prop);
-
-        double d = 1;
-        prop = prop_new(SIZE_HINT_WEIGHT_SET);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_DOUBLE, &d);
-        prop_value_append(prop, val);
-        val = gui_value_new();
-        gui_value_set(val, GUI_TYPE_DOUBLE, &d);
-        prop_value_append(prop, val);
-        wdg_prop_add(wdg, prop);
-     }
-
-   wdg_validate(wdg);
-
-   manager_init();
-
-   Eo *pw = NULL;
-   if (IS_WIN(wdg)) pw = (Eo *)canvas_get();
-   manager_wdg_eo_add_call(wdg, MODE_EDITOR, pw);
-
-   objtree_item_contracted_set(NULL);
-
-   editor_wdg_selected_set(wdg);
-   objtree_item_selected_set(wdg);
-   manager_wdg_eo_do_call(wdg, MODE_EDITOR, NULL);
-   manager_shutdown();
-}
-
-void
-editor_layout_refresh()
-{
-   const Gui_Context *ctx = active_context_get();
-   editor_layout_clear(ctx);
-   editor_ctx_call(ctx);
-}
-
-/* onChange callback for all properties edit fields.
- * If currently there is no such property in the widget, it will be added.
- * The given object is the one created in the properties view for each parameter.
- */
-static void
-_prop_update_from_propview(void *data EINA_UNUSED, Eo *obj, void *event_info)
-{
-   Par_Field_Data *pfd = NULL;
-   const Eo_Class *kl = eo_class_get(obj);
-   Op_Desc *op;
-   Gui_Widget *wdg;
-   Gui_Widget_Property *prop;
-   int idx;
-   Gui_Value *val;
-   Eina_Bool prop_add = EINA_FALSE;
-
-   /* Get data for changed field. */
-   eo_do(obj, eo_base_data_get("editor", (void **) &pfd));
-   op = pfd->it_data->op_desc;
-   wdg = pfd->it_data->wdg;
-   prop = pfd->it_data->prop;
-   idx = pfd->par_idx;
-
-   /* If property doesn't exist, create it with some default values. */
-   if (!prop)
-     {
-        prop = prop_create_for_op(op);
-        /* Raise flag, that property is newly created and must be added to widget. */
-        prop_add = EINA_TRUE;
-     }
-   /* Get value which need to be changed.*/
-   val = prop_value_nth_get(prop, idx);
-
-   /* Get new value from edit field.
-    * And update Gui_Value with new value. */
-   Gui_Type type = db_op_desc_nth_par_type_get(op, idx);
-   if (kl == ELM_OBJ_ENTRY_CLASS)
-     {
-        const char *entry_data = elm_entry_entry_get(obj);
-        if (type == GUI_TYPE_STRING)
-          {
-             /* FIXME: part_text_set can receive NULL as parameter.
-              * But because of this, I can't write "null"*/
-             if (!strcmp(entry_data, "null"))
-               {
-                  gui_value_set(val, GUI_TYPE_NULL, NULL);
-               }
-             else
-               {
-                  gui_value_type_set(val, type);
-                  gui_value_string_set(val, entry_data);
-               }
-          }
-        /* FIXME: there is problem with content_set; because prev content must be unset; or need to redraw from the beginning*/
-        else if (type == GUI_TYPE_OBJECT)
-          {
-             const char *cur_param = gui_value_string_get(val);
-             Gui_Widget *cur_param_wdg = wdg_get(active_context_get(), cur_param);
-             Gui_Widget *new_param_wdg = wdg_get(active_context_get(), entry_data);
-             /* GUI_TYPE_OBJECT ops depend on other widgets, check that widget exists.
-              * or new one not equal old one.*/
-             if ((!new_param_wdg) || (cur_param_wdg == new_param_wdg))
-               {
-                  goto end;
-               }
-
-             /* Update parent, if op supports it. */
-             if (db_op_desc_flag_get(op) & UPDATE_PARENT)
-               {
-                  /* If I simply change value in prop: t.e. "but1"->"but2" change parent of "but1".*/
-                  const Gui_Widget* parent_win = wdg_parent_win_wdg_get(new_param_wdg);
-                  objtree_item_contracted_set(parent_win);
-                  if (cur_param_wdg)
-                    {
-                       wdg_parent_set(cur_param_wdg, wdg_name_get(parent_win));
-                    }
-                  wdg_parent_set(new_param_wdg, wdg_name_get(wdg));
-                  objtree_item_selected_set(wdg);
-               }
-
-             gui_value_type_set(val, type);
-             gui_value_string_set(val, entry_data);
-          }
-        else if (type == GUI_TYPE_SINT)
-          {
-             int number = atoi(entry_data);
-             gui_value_set(val, type, &number);
-          }
-        else if (type == GUI_TYPE_DOUBLE)
-          {
-             double number = atof(entry_data);
-             gui_value_set(val, type, &number);
-          }
-     }
-   if (kl == ELM_OBJ_CHECK_CLASS)
-     {
-        Eina_Bool state;
-        eo_do(obj, elm_obj_check_state_get(&state));
-        gui_value_set(val, type, &state);
-     }
-   if (kl == ELM_OBJ_HOVERSEL_CLASS)
-     {
-        const char *new_enum_value = elm_object_item_part_text_get(event_info, NULL);
-        /* Set selected string on hover */
-        elm_object_text_set(obj, new_enum_value);
-        /* Get new value depending on type of edit field.
-         * And update value. */
-        if (type == GUI_TYPE_ENUM || type == GUI_TYPE_OBJECT)
-          {
-             gui_value_set(val, type, (void *) new_enum_value);
-          }
-        if (type == GUI_TYPE_OBJECT)
-          {
-             /* Update parent, if op supports it. */
-             if (db_op_desc_flag_get(op) & UPDATE_PARENT)
-               {
-                  /* If I simply change value in prop: t.e. "but1"->"but2" change parent of "but1".*/
-                  Gui_Widget *new_param_wdg = wdg_get(active_context_get(), new_enum_value);
-                  const Gui_Widget* parent_win = wdg_parent_win_wdg_get(new_param_wdg);
-                  objtree_item_contracted_set(parent_win);
-                  wdg_parent_set(new_param_wdg, wdg_name_get(wdg));
-                  objtree_item_selected_set(wdg);
-               }
-          }
-     }
-
-   if (prop_add)
-     {
-        wdg_prop_add(wdg, prop);
-        pfd->it_data->prop = prop;
-     }
-   /* Validate widget and call for eo_func of current prop,
-    * in order to update layout. */
-   if (wdg_validate(wdg))
-     {
-        manager_init();
-        manager_wdg_prop_eo_do_call(wdg, prop, MODE_EDITOR, NULL);
-        manager_shutdown();
-        /* Rebuild view when property like "pack_end". */
-        if (db_op_desc_flag_get(op) & MULTI_PROPERTY)
-           propview_build(wdg);
-        return;
-     }
-end:
-   /* If property was newly created, delete it. */
-   if (prop_add) prop_del(prop);
-}
-
-static void
-_prop_del_from_propview(void *data, Eo *obj EINA_UNUSED, void *ev EINA_UNUSED)
-{
-   const Gui_Widget *wdg = editor_wdg_selected_get();
-   Gui_Widget_Property *prop = data;
-   const Op_Desc *op = prop_op_desc_get(prop);
-   Gui_Value *val;
-   Eina_List *l;
-
-   /* Change parent, when removing property like "pack_end". */
-   if (db_op_desc_flag_get(op) & UPDATE_PARENT)
-     {
-        EINA_LIST_FOREACH(prop_value_get(prop), l, val)
-          {
-             if (gui_value_type_get(val) == GUI_TYPE_OBJECT)
-               {
-                  Gui_Widget *param_wdg = wdg_get(active_context_get(), gui_value_string_get(val));
-                  if (param_wdg)
-                    {
-                       const Gui_Widget *parent_win = wdg_parent_win_wdg_get(param_wdg);
-                       /* Do it to update list. */
-                       objtree_item_contracted_set(parent_win);
-                       wdg_parent_set(param_wdg, wdg_name_get(parent_win));
-                       objtree_item_selected_set(wdg);
-                    }
-               }
-          }
-     }
-
-   wdg_prop_del((Gui_Widget *) wdg, prop);
-   editor_layout_refresh();
-   editor_wdg_selected_set(wdg);
-   objtree_item_selected_set(wdg);
-}
-
-static void
-_widget_selected_from_objtree(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
-{
-   Gui_Widget *wdg  = elm_object_item_data_get(event_info);
-   editor_wdg_selected_set(wdg);
-   if (wdg) propview_build(wdg);
-}
-
diff --git a/src/bin/editor.h b/src/bin/editor.h
deleted file mode 100644
index 3265d54..0000000
--- a/src/bin/editor.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-#ifndef _EDITOR_H
-#define _EDITOR_H
-
-#include "gui_widget.h"
-#include <Elementary.h>
-
-enum {
-     BORDER_OUT =    0,
-     BORDER_LEFT =   1 << 0,
-     BORDER_RIGHT =  1 << 1,
-     BORDER_TOP =    1 << 2,
-     BORDER_BOTTOM = 1 << 3
-};
-
-Eina_Bool
-editor_ctx_call(const Gui_Context *ctx);
-
-Eina_Bool
-editor_layout_clear(const Gui_Context *ctx);
-
-void
-editor_layout_refresh();
-
-void
-editor_factory_wdg_create(const char *class_name);
-
-void
-_editor_selected_wdg_del_cb();
-
-int
-which_border(Evas_Coord x, Evas_Coord y, Evas_Coord ow, Evas_Coord oh);
-
-void
-editor_wdg_selected_set(const Gui_Widget *wdg);
-
-const Gui_Widget*
-editor_wdg_selected_get();
-
-void
-editor_init();
-
-#endif
diff --git a/src/bin/egui_gui/CMakeLists.txt b/src/bin/egui_gui/CMakeLists.txt
new file mode 100644
index 0000000..22d688e
--- /dev/null
+++ b/src/bin/egui_gui/CMakeLists.txt
@@ -0,0 +1,134 @@
+set(CMAKE_BUILD_TYPE Debug)
+
+find_package(Gvc QUIET)
+find_package(CGraph QUIET)
+
+if (GVC_FOUND AND CGRAPH_FOUND)
+   add_definitions(-DHAVE_GRAPHVIZ)
+endif (GVC_FOUND AND CGRAPH_FOUND)
+
+include_directories (${CMAKE_SOURCE_DIR}/src/lib)
+
+link_directories (${CMAKE_SOURCE_DIR}/src/lib)
+link_directories (${PC_LIBELEMENTARY_LIBRARY_DIRS})
+
+#add -DGUI_MODE to build gui executable
+add_definitions(-DGUI_MODE)
+
+include_directories(
+   ${EINA_INCLUDE_DIRS}
+   ${ECORE_INCLUDE_DIRS}
+   ${EVAS_INCLUDE_DIRS}
+   ${ELEMENTARY_INCLUDE_DIRS}
+   ${GVC_INCLUDE_DIRS}
+   ${CGRAPH_INCLUDE_DIRS}
+   )
+
+############################
+# building our stable egui
+# by copying files
+############################
+
+add_custom_target(delete_files
+   COMMENT "Deleting previously autogenerated \"egui_layout.c/h files\""
+   COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/egui_layout.*
+   COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/tmp/egui_layout.*
+   )
+
+set(TARGET egui)
+
+add_executable(${TARGET}
+   ${EGUI_BINARY_SRC}/main.c
+   egui_layout.c
+   egui_logic.c
+   props_helper.c
+   objtree.c
+   propview.c
+   seqview.c
+   editor.c
+   )
+
+# we need to copy egui_layout json files into c/h files.
+# OUTPUT says that executable depends on these files
+add_custom_command (
+   OUTPUT egui_layout.c egui_layout.h
+   COMMENT "Copying egui_layout.c/h"
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/egui_layout_c.json egui_layout.c
+   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/egui_layout_h.json egui_layout.h
+   )
+
+#need to add /egui/build/src/bin/egui/egui_gui as INCLUDE dir because prev command generates file in build dir
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_dependencies(${TARGET} delete_files)
+target_link_libraries (${TARGET}
+   guiparser
+   ${EINA_LIBRARIES}
+   ${ECORE_LIBRARIES}
+   ${EVAS_LIBRARIES}
+   ${ELEMENTARY_LIBRARIES}
+   ${GVC_LIBRARIES}
+   ${CGRAPH_LIBRARIES}
+   ecore_file
+   )
+
+#copy egui from /build/egui_gui/ to /build
+add_custom_command (TARGET ${TARGET}
+   POST_BUILD
+   COMMENT "Post: Copying egui into usual build dir"
+   COMMAND ${CMAKE_COMMAND} -E copy ${TARGET} ${EGUI_BINARY_BLD}/${TARGET}
+   #delete generated files
+   COMMAND ${CMAKE_COMMAND} -E remove egui_layout.*
+   )
+
+############################
+# building our experimantal egui
+# by generating files
+############################
+set(TARGET2 egui_auto)
+
+add_executable(${TARGET2}
+   ${EGUI_BINARY_SRC}/main.c
+   tmp/egui_layout.c
+   egui_logic.c
+   props_helper.c
+   objtree.c
+   propview.c
+   seqview.c
+   editor.c)
+# add this dependency to force build one after another,
+# in order to delete and generate files in proper order
+add_dependencies(${TARGET2} ${TARGET})
+add_dependencies(${TARGET2} delete_files)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/tmp)
+
+#generate c/h files from json.
+# here i need to put these files into another path, because I can't again use OUTPUT egui_layout.c egui_layout.h.
+# Because cmake will think, that our egui_auto depends on files
+# egui_layout.c/h which were copied for target egui and will build with them
+add_custom_command (
+   OUTPUT tmp/egui_layout.c tmp/egui_layout.h
+   COMMENT "Generating gui layout from JSON"
+   COMMAND ${CMAKE_COMMAND} -E make_directory tmp
+   COMMAND ${EGUI_BINARY_BLD}/egui_cmd -f ${CMAKE_CURRENT_SOURCE_DIR}/egui_layout_c.json -g -o egui_layout -p ./tmp
+   )
+
+target_link_libraries (${TARGET2}
+   guiparser
+   ${EINA_LIBRARIES}
+   ${ECORE_LIBRARIES}
+   ${EVAS_LIBRARIES}
+   ${ELEMENTARY_LIBRARIES}
+   ${GVC_LIBRARIES}
+   ${CGRAPH_LIBRARIES}
+   ecore_file
+   )
+
+#copy egui_auto from /build/egui_gui/tmp to /build
+add_custom_command (TARGET ${TARGET2}
+   POST_BUILD
+   COMMENT "Post: Copying egui_auto into usual build dir"
+   COMMAND ${CMAKE_COMMAND} -E copy ${TARGET2} ${EGUI_BINARY_BLD}/${TARGET2}
+   COMMAND ${CMAKE_COMMAND} -E remove_directory tmp
+   )
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
new file mode 100644
index 0000000..da8d87d
--- /dev/null
+++ b/src/bin/egui_gui/editor.c
@@ -0,0 +1,1629 @@
+
+#include "egui_log.h"
+#include "ffi_glue.h"
+#include "ffi_abstraction.h"
+#include "gui_widget.h"
+#include "props_helper.h"
+#include "objtree.h"
+#include "propview.h"
+#include "seqview.h"
+#include "gui_parser.h"
+#include "egui_logic_private.h"
+
+#include <Elementary.h>
+#include "elm_widget.h"
+
+#define SELECTED_WDG "slctd_wdg"
+#define WIN_INFO "win_info_key"
+#define DEP_PROP_LIST "dependent_property_list_key"
+
+
+Gui_Session *_editor_session = NULL;
+static Gui_Context *_active_ctx = NULL;
+static It_Data_Type _propsview_toolbar_selected_item_type = DESCRIPTION_TYPE;
+
+void
+_active_context_set(Gui_Context *ctx)
+{
+   _active_ctx = ctx;
+}
+
+Gui_Context *
+_active_context_get()
+{
+   return _active_ctx;
+}
+/* function to resolve dependency between action and widget when deleting widget.*/
+extern Eina_Bool
+_action_dep_resolve(Gui_Action *action, Eina_Bool adding, Dep_Mode mode);
+
+typedef enum {
+     BORDER_OUT =    0,
+     BORDER_LEFT =   1 << 0,
+     BORDER_RIGHT =  1 << 1,
+     BORDER_TOP =    1 << 2,
+     BORDER_BOTTOM = 1 << 3,
+     /* Need separate names for borders and markers. They are used as keys in hash. */
+     BORDER_MARKER_LEFT = BORDER_LEFT,
+     BORDER_MARKER_RIGHT = BORDER_RIGHT,
+     BORDER_MARKER_TOP = BORDER_TOP,
+     BORDER_MARKER_BOTTOM = BORDER_BOTTOM,
+
+     BORDER_MARKER_TOP_LEFT = BORDER_MARKER_TOP | BORDER_MARKER_LEFT,
+     BORDER_MARKER_TOP_RIGHT = BORDER_MARKER_TOP | BORDER_MARKER_RIGHT,
+
+     BORDER_MARKER_BOTTOM_LEFT = BORDER_MARKER_BOTTOM | BORDER_MARKER_LEFT,
+     BORDER_MARKER_BOTTOM_RIGHT = BORDER_MARKER_BOTTOM | BORDER_MARKER_RIGHT
+
+} Border_Type;
+
+typedef struct _Win_Info
+{
+   Eo *frame;
+} Win_Info;
+
+static Win_Info*
+win_info_new()
+{
+   return calloc(1, sizeof(Win_Info));
+}
+
+static void
+win_info_frame_set(Win_Info *wi, Eo *fr)
+{
+   wi->frame = fr;
+}
+
+static Eo*
+win_info_frame_get(const Win_Info *wi)
+{
+   return wi->frame;
+}
+
+/*This is a helper to add/delete dependent properties to/from widget.
+ * Func is called when property is activated or deleted.*/
+static Eina_Bool
+_prop_dep_resolve(Gui_Widget_Property *prop, Eina_Bool adding)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(prop, EINA_FALSE);
+
+   Eina_List *values_lst, *itr;
+   Gui_Value *gui_value;
+
+   values_lst = prop_value_get(prop);
+
+   EINA_LIST_FOREACH(values_lst, itr, gui_value)
+     {
+        if (gui_value_type_get(gui_value) == GUI_TYPE_OBJECT)
+          {
+             char *wdg_name = gui_value_string_get(gui_value);
+             Gui_Widget *w = wdg_get(wdg_context_get(prop_wdg_get(prop)), wdg_name);
+             if (!w)
+               {
+                  ERR("Somehow widget '%s' doesn't exist", wdg_name);
+                  return EINA_TRUE;
+               }
+             Eina_List *dep_props_list = wdg_data_get(w, DEP_PROP_LIST);
+             if (adding)
+               {
+                  dep_props_list = eina_list_append(dep_props_list, prop);
+               }
+             else
+               {
+                  if (eina_list_data_find(dep_props_list, prop))
+                    {
+                       dep_props_list = eina_list_remove(dep_props_list, prop);
+                    }
+               }
+             wdg_data_set(w, DEP_PROP_LIST, dep_props_list);
+          }
+     }
+   return EINA_TRUE;
+}
+
+/* Iterate over each dependent property and delete it from its widget.
+ * T.e. when deleting button, "pack_end" will be dependent property.
+ * So delete this property from box.*/
+static void
+_wdg_dep_del(Gui_Widget *wdg)
+{
+   Gui_Widget_Property *prop;
+   Eina_List *lst = wdg_data_get(wdg, DEP_PROP_LIST);
+   Eina_List *itr, *itr_next;
+   wdg_data_set(wdg, DEP_PROP_LIST, NULL);
+
+   /* Iterate over each dependency, and delete this prop from each widget */
+   /* Make FOREACH_SAFE, because _prop_dep_resolve removes items from this list*/
+   EINA_LIST_FOREACH_SAFE(lst, itr, itr_next, prop)
+     {
+        Gui_Widget *w;
+        _prop_dep_resolve(prop, EINA_FALSE);
+        w = (Gui_Widget *) prop_wdg_get(prop);
+        wdg_prop_del(w, prop);
+     }
+   eina_list_free(lst);
+
+   /* Iterate over each property;
+    * and delete dependencies from each widget, which depend on this prop. */
+   lst = wdg_prop_list_get(wdg);
+   EINA_LIST_FOREACH(lst, itr, prop)
+     {
+        _prop_dep_resolve(prop, EINA_FALSE);
+     }
+
+   /* Iterate over actions, widget depends on. */
+   Gui_Action *action;
+   lst = wdg_data_get(wdg, DEP_ACTION_LIST);
+   EINA_LIST_FOREACH_SAFE(lst, itr, itr_next, action)
+     {
+        /* Delete action like in func _action_del. */
+        Gui_Sequence *seq = action_sequence_get(action);
+        Eina_List *actions_list = sequence_actions_list_get(seq);
+        Elm_Object_Item *it = action_data_get(action);
+        _action_dep_resolve(action, EINA_FALSE, DEP_ALL);
+        if (eina_list_count(actions_list) > 1)
+          {
+             if (it) elm_object_item_del(it);
+             action_del(action);
+          }
+        else
+          {
+             action_reset(action);
+             if (it) elm_genlist_item_update(it);
+          }
+     }
+   /* list for this widget will be operated inside _action_dep_resolve.
+    * so need to get it one more time.
+    * Moreover this func deletes iterated action from this list, so it will be free by the end,
+    * so don't need to call eina_list_free() */
+   lst = wdg_data_get(wdg, DEP_ACTION_LIST);
+   eina_list_free(lst);
+}
+
+static void
+_canvas_free_coords_get(Gui_Context *ctx, Evas_Coord *x, Evas_Coord *y)
+{
+   Evas_Coord x0 = 340, y0 = 120, w0 = 1060, h0 = 900, retx, rety, ymax = 120;
+   Eina_List *win_list = gui_context_win_list_get(ctx);
+   Eina_List *itr;
+   Gui_Widget *wdg;
+   retx = x0;
+   rety = y0;
+   EINA_LIST_FOREACH(win_list, itr, wdg)
+     {
+        Evas_Coord fx, fy, fw, fh;
+        Win_Info *wi = wdg_data_get(wdg, WIN_INFO);
+        if (wi)
+          {
+             eo_do(win_info_frame_get(wi), evas_obj_size_get(&fw, &fh));
+             eo_do(win_info_frame_get(wi), evas_obj_position_get(&fx, &fy));
+             if ((fx + fw) < (x0 + w0 - 100))
+               {
+                  retx = fx + fw;
+                  if ((fy + fh) > ymax)
+                    ymax = fy + fh;
+               }
+             else
+               {
+                  retx = x0;
+                  rety = ymax;
+                  if (rety > (y0 + h0)) rety = y0;
+               }
+          }
+     }
+   if (x) *x = retx;
+   if (y) *y = rety;
+}
+
+int
+which_border(Evas_Coord x, Evas_Coord y, Evas_Coord ow, Evas_Coord oh)
+{
+   /* Width of border to catch callback. */
+   Evas_Coord bw = 10;
+   int lr = 0, tb = 0;
+   if (x < bw) lr = BORDER_LEFT;
+   else if (x > ow - bw) lr = BORDER_RIGHT;
+   if (y < bw) tb = BORDER_TOP;
+   else if (y > oh - bw) tb = BORDER_BOTTOM;
+   return lr | tb;
+}
+
+static Eina_Bool
+_marker_mouse_down(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info);
+static Eina_Bool
+_marker_mouse_up(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info);
+static Eina_Bool
+_marker_mouse_in(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info);
+static Eina_Bool
+_marker_mouse_out(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info);
+#define STR(par) #par
+
+#define LINE(base_obj, id, x, y, l, w, visibility) \
+   ({\
+       Eo *line = NULL;\
+       eo_do(base_obj, eo_base_data_get(STR(id), (void **) &line));\
+       if (!line)\
+          {\
+             line = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas_object_evas_get(base_obj));\
+             eo_unref(line);\
+             eo_do(base_obj, eo_base_data_set(STR(id), line, NULL));\
+             eo_do(line, evas_obj_color_set(0, 255, 0, 255));\
+          }\
+       eo_do(line, evas_obj_visibility_set(visibility));\
+       eo_do(line, evas_obj_position_set(x, y));\
+       eo_do(line, evas_obj_size_set(l, w));\
+       eo_do(line, evas_obj_raise());\
+   })
+
+#define MARKER(base_obj, id, x, y, visibility) \
+   ({ \
+    Eo *_m = NULL;\
+    eo_do(base_obj, eo_base_data_get(STR(id), (void **) &_m));\
+    if (!_m)\
+        {\
+           _m = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas_object_evas_get(base_obj));\
+           eo_unref(_m);\
+           eo_do(base_obj, eo_base_data_set(STR(id), _m, NULL));\
+           eo_do(_m, evas_obj_color_set(0, 255, 0, 255));\
+           eo_do(_m, evas_obj_size_set(7, 7));\
+           eo_do(_m, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_DOWN, _marker_mouse_down, (void *) id)); \
+           eo_do(_m, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_UP, _marker_mouse_up, (void *) id)); \
+           eo_do(_m, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_IN, _marker_mouse_in, (void *) id)); \
+           eo_do(_m, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_OUT, _marker_mouse_out, (void *) id)); \
+        }\
+      eo_do(_m, evas_obj_position_set(x, y)); \
+      eo_do(_m, evas_obj_raise());\
+      eo_do(_m, evas_obj_visibility_set(visibility));\
+    })
+
+/* Draws border around obj, Evas is taken from base_obj;
+ * markers and lines are saved in base_obj*/
+static void
+_border_draw(const Eo *base_obj, Eo *obj, Eina_Bool visibility)
+{
+   Evas_Coord ox = 0, oy = 0, ow = 0, oh = 0, minw = 0, minh = 0;
+   Evas_Coord lw = 0 , lh = 0, hs = 5;
+
+   /* This is made, to have opportunity to pass NULL and hide border.*/
+   if (obj)
+     {
+        eo_do(obj, evas_obj_position_get(&ox, &oy));
+        eo_do(obj, evas_obj_size_hint_min_get(&minw, &minh));
+        eo_do(obj, evas_obj_size_get(&ow, &oh));
+        if (ow < minw) ow = minw;
+        if (oh < minh) oh = minh;
+
+        lw = ow + 2;
+        lh = oh + 2;
+     }
+
+   LINE(base_obj, BORDER_TOP, ox - 1, oy - 1, lw, 1, visibility);
+   LINE(base_obj, BORDER_BOTTOM, ox - 1, oy + oh + 1, lw, 1, visibility);
+   LINE(base_obj, BORDER_RIGHT, ox + ow + 1, oy - 1, 1, lh, visibility);
+   LINE(base_obj, BORDER_LEFT, ox - 1, oy - 1, 1, lh, visibility);
+
+   MARKER(base_obj, BORDER_MARKER_TOP_LEFT, ox - 1 - hs / 2, oy - 1 - hs / 2, visibility);
+   MARKER(base_obj, BORDER_MARKER_TOP, ox + ow / 2 - hs / 2, oy - 1 - hs / 2, visibility);
+   MARKER(base_obj, BORDER_MARKER_TOP_RIGHT, ox + ow + 1 - hs / 2, oy - 1 - hs / 2, visibility);
+   MARKER(base_obj, BORDER_MARKER_RIGHT, ox + ow + 1 - hs / 2, oy + oh / 2 - hs / 2, visibility);
+   MARKER(base_obj, BORDER_MARKER_BOTTOM_RIGHT, ox + ow + 1 - hs / 2, oy + oh + 1 - hs / 2, visibility);
+   MARKER(base_obj, BORDER_MARKER_BOTTOM, ox + ow / 2 - hs / 2, oy + oh + 1 - hs / 2, visibility);
+   MARKER(base_obj, BORDER_MARKER_BOTTOM_LEFT, ox - 1 - hs / 2, oy + oh + 1 - hs / 2, visibility);
+   MARKER(base_obj, BORDER_MARKER_LEFT, ox - 1 - hs / 2, oy + oh / 2 - hs / 2, visibility);
+}
+
+static void
+_wdg_border_draw(const Gui_Widget *wdg, Eina_Bool visibility)
+{
+   Eo *obj = session_eo_get(_editor_session, wdg);
+   if (!obj) return;
+   const Gui_Widget *win_wdg = wdg_parent_win_wdg_get(wdg);
+   if (!win_wdg) return;
+   Eo *win_wdg_eo;
+   win_wdg_eo = session_eo_get(_editor_session, win_wdg);
+   _border_draw(win_wdg_eo, obj, visibility);
+}
+#undef LINE
+#undef MARKER
+#undef STR
+
+static void
+_on_mouse_move_widget_drag(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+void *event_info)
+{
+   Gui_Context *ctx = data;
+   static int cx, cy;
+   Evas_Coord ox, oy;
+   Evas_Event_Mouse_Move *ev = event_info;
+
+   /*FIXME: remove static stuff after tripple callback wil be fixed*/
+   if ((cx == ev->cur.canvas.x) && (cy == ev->cur.canvas.y))
+     return;
+
+   eo_do(obj, evas_obj_position_get(&ox, &oy));
+   ox = ox + (ev->cur.canvas.x - ev->prev.canvas.x);
+   oy = oy + (ev->cur.canvas.y - ev->prev.canvas.y);
+
+   eo_do(obj, evas_obj_position_set(ox, oy));
+     {
+        Gui_Widget *wdg = wdg_find_by_eo(_editor_session, ctx, obj);
+        Gui_Widget_Property *prop;
+        Gui_Value *val;
+
+        if (wdg)
+          {
+             _wdg_border_draw(wdg, EINA_TRUE);
+
+             prop = wdg_prop_get(wdg, POSITION_SET);
+             if (prop)
+               {
+                  val = prop_value_nth_get(prop, 0);
+                  gui_value_set(val, GUI_TYPE_SINT, &ox);
+                  val = prop_value_nth_get(prop, 1);
+                  gui_value_set(val, GUI_TYPE_SINT, &oy);
+                  propview_item_update(prop);
+               }
+          }
+     }
+   cx = ev->cur.canvas.x;
+   cy = ev->cur.canvas.y;
+}
+
+static void
+_frame_mouse_move(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *fr, void *event_info)
+{
+   Evas_Coord ox, oy;
+   Evas_Event_Mouse_Move *ev = event_info;
+   Gui_Widget *wdg;
+   Gui_Widget_Property *prop;
+
+   eo_do(fr, evas_obj_position_get(&ox, &oy));
+
+   ox = ox + (ev->cur.canvas.x - ev->prev.canvas.x);
+   oy = oy + (ev->cur.canvas.y - ev->prev.canvas.y);
+
+   eo_do(fr, eo_base_data_get("winwdg", (void**)(&wdg)));
+
+   /* FIXME: Move frame here, because we don't know if win must have position property*/
+   eo_do(fr, evas_obj_position_set(ox, oy));
+   prop = wdg_prop_get(wdg, POSITION_SET);
+   if (prop)
+     {
+        Gui_Value *val;
+        val = prop_value_nth_get(prop, 0);
+        gui_value_set(val, GUI_TYPE_SINT, &ox);
+        val = prop_value_nth_get(prop, 1);
+        gui_value_set(val, GUI_TYPE_SINT, &oy);
+        propview_item_update(prop);
+     }
+
+   /* Redraw win border, when moving frame. */
+   _border_draw(canvas_get(), fr, EINA_TRUE);
+}
+
+static const Gui_Widget*
+_editor_wdg_selected_get()
+{
+   Gui_Context *ctx = _active_context_get();
+   if (!ctx) return NULL;
+   return gui_context_data_get(ctx, SELECTED_WDG);
+}
+
+static void
+_editor_wdg_selected_set(const Gui_Widget *wdg)
+{
+   const Gui_Widget *old_wdg = _editor_wdg_selected_get();
+   if ((old_wdg) && (old_wdg == wdg)) return;
+
+   /* Hide previous border*/
+   if (old_wdg)
+     {
+        if (IS_WIN(old_wdg))
+          {
+             Win_Info *wi = wdg_data_get(old_wdg, WIN_INFO);
+             Eo *fr = win_info_frame_get(wi);
+             _border_draw(canvas_get(), fr, EINA_FALSE);
+          }
+        else
+          {
+             _wdg_border_draw(old_wdg, EINA_FALSE);
+          }
+     }
+   else
+     {
+        /* During context call _win_resize() will be called.
+         * It will draw border around win, but widget was not selected yet.
+         * So need to hide border. */
+        _border_draw(canvas_get(), NULL, EINA_FALSE);
+     }
+
+   /* Show new border*/
+   if (wdg)
+     {
+        Gui_Context *ctx = wdg_context_get(wdg);
+        gui_context_data_set(ctx, SELECTED_WDG, (Gui_Widget *) wdg);
+
+        Eo *obj = session_eo_get(_editor_session, wdg);
+        /* Stack up */
+        //   eo_do(obj, evas_obj_raise());
+        /* Set focus */
+        eo_do(obj, evas_obj_focus_set(EINA_TRUE));
+        if (IS_WIN(wdg))
+          {
+             Win_Info *wi = wdg_data_get(wdg, WIN_INFO);
+             Eo *fr = win_info_frame_get(wi);
+             _border_draw(canvas_get(), fr, EINA_TRUE);
+          }
+        else
+          {
+             _wdg_border_draw(wdg, EINA_TRUE);
+          }
+     }
+   else
+     {
+        gui_context_data_set(_active_context_get(), SELECTED_WDG, NULL);
+     }
+}
+
+/* Second parameter is used to indicate if the wdg has to be deleted */
+static void
+_iter_widget_delete(Gui_Widget *wdg, Eina_Bool del_wdg)
+{
+   Eina_List *children = NULL, *l, *l2;
+   Gui_Widget *w;
+
+   children = wdg_children_list_get(wdg);
+   EINA_LIST_FOREACH_SAFE(children, l, l2, w)
+     {
+        _iter_widget_delete(w, del_wdg);
+     }
+
+   /* If widget is Win, look for its frame and unset content, but don't delete frame. */
+   if (IS_WIN(wdg))
+     {
+        Win_Info *wi = wdg_data_get(wdg, WIN_INFO);
+        Eo *fr = win_info_frame_get(wi);
+        if (fr)
+          {
+             elm_object_content_unset(fr);
+             if (del_wdg)
+               {
+                  wdg_data_set(wdg, WIN_INFO, NULL);
+                  free(wi);
+                  eo_do(fr, eo_base_data_del("winwdg"));
+                  eo_ref(fr);
+                  eo_del(fr);
+               }
+          }
+     }
+   manager_widget_delete(_editor_session, wdg, MODE_EDITOR, NULL);
+
+   if (del_wdg)
+     {
+        _wdg_dep_del(wdg);
+        wdg_del(wdg);
+     }
+   /* This function is called when widget is deleted or context refreshed.
+    * This case is for context refresh: clear list of dependencies.*/
+   else
+     {
+        Eina_List *lst = wdg_data_get(wdg, DEP_PROP_LIST);
+        eina_list_free(lst);
+        wdg_data_set(wdg, DEP_PROP_LIST, NULL);
+     }
+}
+
+static void
+_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+//   Gui_Context *ctx = data;
+   ERR("key down");
+}
+
+/* Callback, which adds MOUSE_MOVE callback,
+ * to implement drag-and-drop in editor mode*/
+static void
+_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
+{
+   Gui_Context *ctx = data;
+   Gui_Widget *wdg = wdg_find_by_eo(_editor_session, ctx, obj);
+   EINA_SAFETY_ON_NULL_RETURN(wdg);
+
+   Eo *wdg_eo = session_eo_get(_editor_session, wdg);
+   evas_object_focus_set(wdg_eo, EINA_TRUE);
+   _editor_wdg_selected_set(wdg);
+   objtree_item_selected_set(wdg);
+
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_widget_drag, ctx);
+}
+
+/* Callback, which deletes MOUSE_MOVE callback,
+ * to implement drag-and-drop*/
+static Eina_Bool
+_mouse_up(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   /* Delete all callbacks,
+    * because sometimes _mouse_down is called several times. */
+   while(evas_object_event_callback_del
+          (obj, EVAS_CALLBACK_MOUSE_MOVE, _on_mouse_move_widget_drag));
+   return EO_CALLBACK_CONTINUE;
+}
+
+static Eina_Bool
+_marker_mouse_move(void *data, Eo *marker EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info)
+{
+   Eo *weo;
+   Evas_Coord ox, oy, ow, oh, minw, minh, dx, dy;
+   Evas_Event_Mouse_Move *ev = event_info;
+   Border_Type border = (int) data;
+
+   Eo *cur_logo = NULL;
+   const Gui_Widget *wdg = _editor_wdg_selected_get();
+
+   dx = ev->cur.canvas.x - ev->prev.canvas.x;
+   dy = ev->cur.canvas.y - ev->prev.canvas.y;
+
+   /* in base object cursor description is save.
+    * base object is win's Eo for widget,
+    * and canvas(main window) for frame. */
+   const Eo *base_obj;
+   if (IS_WIN(wdg))
+     {
+        base_obj = canvas_get();
+        Win_Info *wi = wdg_data_get(wdg, WIN_INFO);
+        weo = win_info_frame_get(wi);
+
+        /* When resizing frame, we need to get min width and height form window.
+         * And don't forget deltas*/
+        Eo *ww = session_eo_get(_editor_session, wdg);
+        eo_do(ww, evas_obj_size_hint_min_get(&minw, &minh));
+        int dw, dh;
+        eo_do(weo, eo_base_data_get("dw", (void **) &dw));
+        eo_do(weo, eo_base_data_get("dh", (void **) &dh));
+        minw += dw;
+        minh += dh;
+     }
+   else
+     {
+        const Gui_Widget *win_wdg = wdg_parent_win_wdg_get(wdg);
+        base_obj = session_eo_get(_editor_session, win_wdg);
+        /* Eo object of widget. */
+        weo = session_eo_get(_editor_session, wdg);
+        eo_do(weo, evas_obj_size_hint_min_get(&minw, &minh));
+     }
+
+   eo_do(base_obj, eo_base_data_get("cursor", (void **) &cur_logo));
+   if (cur_logo)
+     eo_do(cur_logo, evas_obj_position_set(ev->cur.canvas.x + 7, ev->cur.canvas.y + 5));
+
+   eo_do(weo, evas_obj_position_get(&ox, &oy));
+   eo_do(weo, evas_obj_size_get(&ow, &oh));
+
+   if (border & BORDER_MARKER_LEFT)
+     {
+        if ((ev->prev.canvas.x < ox) && ((ow - dx) > 0) && ((ow - dx) >= minw))
+          {
+             ow = ow - dx;
+             ox = ox + dx;
+          }
+     }
+   else if (border & BORDER_MARKER_RIGHT)
+     {
+        if ((ev->prev.canvas.x > (ox + ow)) && ((ow + dx) >= minw))
+          {
+             ow = ow + dx;
+          }
+     }
+
+   if (border & BORDER_MARKER_TOP)
+     {
+        if ((ev->prev.canvas.y < oy) && ((oh - dy) > 0) && ((oh - dy) >= minh))
+          {
+             oh = oh - dy;
+             oy = oy + dy;
+          }
+     }
+   else if (border & BORDER_MARKER_BOTTOM)
+     {
+        if ((ev->prev.canvas.y >= (oy + oh)) && ((oh + dy) >= minh))
+          {
+             oh = oh + dy;
+          }
+     }
+
+   eo_do(weo, evas_obj_position_set(ox, oy));
+   eo_do(weo, evas_obj_size_set(ow, oh));
+
+   if (IS_WIN(wdg))
+     {
+        Gui_Widget_Property *prop;
+        Gui_Value *val;
+
+        prop = wdg_prop_get(wdg, SIZE_SET);
+        if (prop)
+          {
+             Evas_Coord dw, dh;
+             eo_do(weo, eo_base_data_get("dw", (void **) &dw));
+             eo_do(weo, eo_base_data_get("dh", (void **) &dh));
+             /* ow and oh are frame's sizes, we need to subtract delta,
+              * to get window's size.*/
+             ow = ow - dw;
+             oh = oh - dh;
+
+             val = prop_value_nth_get(prop, 0);
+             gui_value_set(val, GUI_TYPE_SINT, &ow);
+             val = prop_value_nth_get(prop, 1);
+             gui_value_set(val, GUI_TYPE_SINT, &oh);
+             propview_item_update(prop);
+             /* win has size prop, so move it through manager*/
+             manager_widget_property_add(_editor_session, wdg, prop, MODE_EDITOR, NULL);
+          }
+     }
+   else
+     {
+        /* This probably should be in _wdg_resize(),
+         * but it interferes when updating size and position from Propview. */
+        Gui_Widget_Property *prop;
+        Gui_Value *val;
+        prop = wdg_prop_get(wdg, SIZE_SET);
+        if (prop)
+          {
+             val = prop_value_nth_get(prop, 0);
+             gui_value_set(val, GUI_TYPE_SINT, &ow);
+             val = prop_value_nth_get(prop, 1);
+             gui_value_set(val, GUI_TYPE_SINT, &oh);
+             propview_item_update(prop);
+          }
+
+        prop = wdg_prop_get(wdg, POSITION_SET);
+        if (prop)
+          {
+             val = prop_value_nth_get(prop, 0);
+             gui_value_set(val, GUI_TYPE_SINT, &ox);
+             val = prop_value_nth_get(prop, 1);
+             gui_value_set(val, GUI_TYPE_SINT, &oy);
+             propview_item_update(prop);
+          }
+     }
+
+   return EO_CALLBACK_CONTINUE;
+}
+
+static Eina_Bool
+_marker_mouse_down(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   eo_do(obj, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_MOVE, _marker_mouse_move, data));
+   return EO_CALLBACK_CONTINUE;
+}
+
+static Eina_Bool
+_marker_mouse_up(void *data, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   eo_do(obj, eo_event_callback_del(EVAS_OBJECT_EVENT_MOUSE_MOVE, _marker_mouse_move, data));
+   return EO_CALLBACK_CONTINUE;
+}
+
+static Eina_Bool
+_marker_mouse_in(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Evas_Coord sz = 17, trans_size = 25;
+   Evas_Event_Mouse_Down *ev = event_info;
+
+   const Gui_Widget *wdg = _editor_wdg_selected_get();
+
+   const Eo *base_obj;
+   if (IS_WIN(wdg))
+     {
+        base_obj = canvas_get();
+     }
+   else
+     {
+        const Gui_Widget *win_wdg = wdg_parent_win_wdg_get(wdg);
+        base_obj = session_eo_get(_editor_session, win_wdg);
+     }
+
+   /* This is "arrow" icon which flows around cursor. */
+   Eo *cur_logo;
+   eo_do(base_obj, eo_base_data_get("cursor", (void **) &cur_logo));
+
+   if (!cur_logo)
+   {
+        cur_logo = eo_add(ELM_OBJ_IMAGE_CLASS, obj);
+        eo_unref(cur_logo);
+        eo_do(cur_logo, evas_obj_size_set(sz, sz));
+        eo_do(cur_logo, elm_obj_image_resizable_set(EINA_TRUE, EINA_TRUE));
+
+        char path[100];
+        getcwd(path, sizeof(path));
+        sprintf(path, "%s/src/data/images/resize_red.png", path);
+        eo_do(cur_logo, elm_obj_image_file_set(path, NULL, NULL));
+        //eo_do(h, elm_obj_image_file_set("/home/yakov/e17/elementary/data/themes/img/icon_border_resize.png", NULL, NULL));
+        eo_do(base_obj, eo_base_data_set("cursor", cur_logo, NULL));
+
+        Elm_Transit *trans;
+        trans = elm_transit_add();
+        elm_transit_object_add(trans, cur_logo);
+
+        elm_transit_effect_resizing_add(trans, sz, sz, trans_size, trans_size);
+        elm_transit_duration_set(trans, 0.3);
+        elm_transit_auto_reverse_set(trans, EINA_TRUE);
+        elm_transit_repeat_times_set(trans, -1);
+        elm_transit_go(trans);
+     }
+   eo_do(cur_logo, evas_obj_visibility_set(EINA_TRUE));
+   eo_do(cur_logo, evas_obj_raise());
+   eo_do(cur_logo, evas_obj_position_set(ev->canvas.x + 7, ev->canvas.y + 8));
+
+   return EO_CALLBACK_CONTINUE;
+}
+
+static Eina_Bool
+_marker_mouse_out(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Eo *cur_logo = NULL;
+   const Gui_Widget *wdg = _editor_wdg_selected_get();
+
+   const Eo *base_obj;
+   if (IS_WIN(wdg))
+     {
+        base_obj = canvas_get();
+     }
+   else
+     {
+        const Gui_Widget *win_wdg = wdg_parent_win_wdg_get(wdg);
+        base_obj = session_eo_get(_editor_session, win_wdg);
+     }
+
+   eo_do(base_obj, eo_base_data_get("cursor", (void **) &cur_logo));
+
+   if (!cur_logo)
+     return EO_CALLBACK_CONTINUE;
+
+   eo_do(cur_logo, evas_obj_visibility_set(EINA_FALSE));
+   return EO_CALLBACK_CONTINUE;
+}
+
+static void
+_frame_mouse_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
+{
+   Gui_Widget *wdg;
+   eo_do(obj, evas_obj_raise());
+   eo_do(obj, evas_obj_focus_set(EINA_TRUE));
+
+   eo_do(obj, eo_base_data_get("winwdg", (void**)(&wdg)));
+   eo_do(obj, evas_obj_focus_set(EINA_TRUE));
+
+   _editor_wdg_selected_set(wdg);
+   objtree_item_selected_set(wdg);
+
+   evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE, _frame_mouse_move, NULL);
+}
+
+static Eina_Bool
+_frame_mouse_up(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_MOVE, _frame_mouse_move);
+   return EO_CALLBACK_CONTINUE;
+}
+
+/* Second parameter is used only as parent for INLINED windows*/
+static void
+_iter_widget_create(Gui_Widget *wdg, const Eo *parent_win)
+{
+   Eina_List *children = NULL, *l;
+   Gui_Widget *w;
+
+   if (wdg_state_get(wdg) < STATE_VALIDATED)
+     {
+        ERR("Widget: \"%s\" was not validated, so can't be simulated.", wdg_name_get(wdg));
+        return;
+     }
+   /* Windows are iterated separately. If parent is NULL, means that current object is not win.
+    * If iterated object is win, I create it as inlined_image and add frame to simulate win.*/
+   Eina_Bool created;
+   created = manager_widget_create(_editor_session, wdg, MODE_EDITOR, (void *)parent_win);
+
+   if (created)
+     {
+        manager_widget_configure(_editor_session, wdg, MODE_EDITOR, NULL);
+
+        children = wdg_children_list_get(wdg);
+        EINA_LIST_FOREACH(children, l, w)
+          {
+             /* Window can not have child windows, so pass NULL. */
+             _iter_widget_create(w, NULL);
+          }
+     }
+}
+
+static Eina_Bool
+_wdg_resize(void *data EINA_UNUSED, Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Evas_Coord ow = 0, oh = 0, minw = 0, minh = 0;
+
+   const Gui_Context *ctx = _active_context_get();
+   Gui_Widget *wdg = wdg_find_by_eo(_editor_session, ctx, obj);\
+   Gui_Widget *selected_wdg = gui_context_data_get(ctx, SELECTED_WDG);
+   if (wdg != selected_wdg)
+     return EO_CALLBACK_CONTINUE;
+
+   eo_do(obj, evas_obj_size_hint_min_get(&minw, &minh));
+   eo_do(obj, evas_obj_size_get(&ow, &oh));
+   if (ow < minw) ow = minw;
+   if (oh < minh) oh = minh;
+   eo_do(obj, evas_obj_size_set(ow, oh));
+
+   /* This is commented here because, it makes unavailable
+    * change position and size from Proverty View.
+    * This is going to be in _marker_mouse_move() for a while*/
+#if 0
+   if (wdg)
+     {
+        Gui_Widget_Property *prop;
+        Gui_Value *val;
+        prop = wdg_prop_get(wdg, SIZE_SET);
+        if (prop)
+          {
+             val = prop_value_nth_get(prop, 0);
+             gui_value_set(val, GUI_TYPE_SINT, &ow);
+             val = prop_value_nth_get(prop, 1);
+             gui_value_set(val, GUI_TYPE_SINT, &oh);
+             propview_item_update(prop);
+          }
+
+        int ox, oy;
+        eo_do(obj, evas_obj_position_get(&ox, &oy));
+        prop = wdg_prop_get(wdg, POSITION_SET);
+        if (prop)
+          {
+             val = prop_value_nth_get(prop, 0);
+             gui_value_set(val, GUI_TYPE_SINT, &ox);
+             val = prop_value_nth_get(prop, 1);
+             gui_value_set(val, GUI_TYPE_SINT, &oy);
+             propview_item_update(prop);
+          }
+     }
+#endif
+
+   _wdg_border_draw(wdg, EINA_TRUE);
+   return EO_CALLBACK_CONTINUE;
+}
+
+static Eina_Bool
+_win_resize(void *data EINA_UNUSED, Eo *o, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Evas_Coord ow = 0, oh = 0, minw = 0, minh = 0;
+   Eo *fr = NULL;
+
+   eo_do(o, evas_obj_size_hint_min_get(&minw, &minh));
+   eo_do(o, evas_obj_size_get(&ow, &oh));
+   if (ow < minw) ow = minw;
+   if (oh < minh) oh = minh;
+
+   Eo *inwin_img = elm_win_inlined_image_object_get(o);
+   /* FIXME: comment it? */
+   eo_do(inwin_img, evas_obj_size_set(ow, oh));
+   eo_do(o, eo_base_data_get("frame", (void **) &fr));
+
+   int dw, dh;
+   eo_do(fr, eo_base_data_get("dw", (void **) &dw));
+   eo_do(fr, eo_base_data_get("dh", (void **) &dh));
+   eo_do(fr, evas_obj_size_set(ow + dw, oh + dh));
+
+   _border_draw(canvas_get(), fr, EINA_TRUE);
+   return EO_CALLBACK_CONTINUE;
+}
+
+static Eina_Bool
+_widget_prop_add(Gui_Session *session, const Gui_Widget *wdg, void *_prop, void *data EINA_UNUSED)
+{
+   Eina_Bool ret = _ffi_eo_do(session, wdg, _prop);
+   if (ret)
+     {
+        _prop_dep_resolve(_prop, EINA_TRUE);
+     }
+
+   if (IS_WIN(wdg))
+     {
+        Eo *fr = NULL, *o = session_eo_get(session, wdg);
+        eo_do(o, eo_base_data_get("frame", (void **) &fr));
+
+        if (!strcmp(prop_name_get(_prop), TITLE_SET))
+          {
+             char *title = WDG_NTH_VALUE_STRING_GET(wdg, TITLE_SET, 0);
+             eo_do(fr, elm_wdg_part_text_set(NULL, title));
+          }
+        else if (!strcmp(prop_name_get(_prop), VISIBILITY_SET))
+          {
+             Eina_Bool visibility;
+             eo_do(o, evas_obj_visibility_get(&visibility));
+             eo_do(fr, evas_obj_visibility_set(visibility));
+             /* Always show windows in editor. This made for the case, when eo_do call
+              * is going on file load*/
+             eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+             eo_do(fr, evas_obj_visibility_set(EINA_TRUE));
+          }
+     }
+   return ret;
+}
+
+static Eina_Bool
+_widget_del(Gui_Session *session, const Gui_Widget *wdg, void *data EINA_UNUSED)
+{
+   Eo *o = session_eo_get(session, wdg);
+   objtree_item_remove(wdg);
+   session_wdg_existence_set(session, wdg, EINA_FALSE);
+   eo_ref(o);
+   eo_del(o);
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_widget_add(Gui_Session *session, const Gui_Widget *wdg, void *data)
+{
+   Eo *o;
+   if (!IS_WIN(wdg))
+     {
+        o = _ffi_eo_add(session, wdg);
+        if (!o) return EINA_FALSE;
+        evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _key_down, wdg_context_get(wdg));
+        evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, wdg_context_get(wdg));
+        //evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _mouse_up, NULL);
+        eo_do(o, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_UP, _mouse_up, NULL));
+        /* To avoid dragging box, when want to drag button. */
+        evas_object_propagate_events_set(o, EINA_FALSE);
+        /* Add callbacks to show widget resize arrows */
+#if 0
+        evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN, _mouse_in, NULL);
+        evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT, _mouse_out, NULL);
+#endif
+        eo_do(o, eo_event_callback_add(EVAS_OBJECT_EVENT_RESIZE, _wdg_resize, NULL));
+        /* Add specific callbacks, related to UI. */
+     }
+   else
+     {
+        Eo *fr;
+        Eo *parent_win = data;
+        /*
+        if (!parent_win)
+          {
+             parent_win = wdg_eo_get(wdg_parent_get(wdg));
+          }
+          */
+
+        o = eo_add_custom(ELM_OBJ_WIN_CLASS, parent_win, elm_obj_win_constructor(NULL, ELM_WIN_INLINED_IMAGE));
+        if (!o) return EINA_FALSE;
+
+        Eo *io = elm_win_inlined_image_object_get(o);
+        evas_object_propagate_events_set(io, EINA_FALSE);
+
+        Win_Info *wi = wdg_data_get(wdg, WIN_INFO);
+
+        if (!wi)
+          {
+             Evas_Coord x, y;
+             fr = eo_add(ELM_OBJ_FRAME_CLASS, parent_win);
+             _canvas_free_coords_get(wdg_context_get(wdg), &x, &y);
+             eo_do(fr, evas_obj_position_set(x, y));
+             /* Unref everything and later ref it before delete */
+             eo_unref(fr);
+             wi = win_info_new();
+             win_info_frame_set(wi, fr);
+             wdg_data_set(wdg, WIN_INFO, wi);
+
+             //evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+             //evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL);
+             elm_object_text_set(fr, elm_win_title_get(o));
+             eo_do(fr,
+                   evas_obj_visibility_set(EINA_TRUE),
+                   elm_obj_frame_autocollapse_set(EINA_TRUE));
+
+             evas_object_event_callback_add(fr, EVAS_CALLBACK_MOUSE_DOWN, _frame_mouse_down, NULL);
+             eo_do(fr, eo_event_callback_add(EVAS_OBJECT_EVENT_MOUSE_UP, _frame_mouse_up, NULL));
+             eo_do(fr, eo_base_data_set("winwdg", wdg, NULL));
+          }
+        fr = win_info_frame_get(wi);
+        eo_do(o, eo_base_data_set("frame", fr, NULL));
+        elm_object_content_set(fr, io);
+
+        eo_do(o, eo_event_callback_add(EVAS_OBJECT_EVENT_RESIZE, _win_resize, NULL));
+        /* Get size from properties of window. */
+        Evas_Coord ox = 150, oy = 50;
+        eo_do(fr, evas_obj_position_get(&ox, &oy));
+        eo_do(io, evas_obj_position_set(ox, oy));
+
+          {
+             /* When set image as content to frame, image is smaller then frame.
+              * So we want to calculate delta, to resize in proper way.
+              * For this simulate resizing of image and frame.
+              * Suppose 50, 50 is desired size for window,
+              * and frame can be a litter bit smaller.*/
+             Evas_Coord dw, dh;
+             Evas_Coord im_w, im_h;
+             Evas_Coord ow = 50, oh = 50;
+             /* Set desired size.*/
+             eo_do(io, evas_obj_size_set(ow, oh));
+             eo_do(fr, evas_obj_size_set(ow, oh));
+             /* Get size of image (which is smaller, because frame is 50, 50)*/
+             eo_do(io, evas_obj_size_get(&im_w, &im_h));
+             /* Calculate deltas*/
+             dw = ow - im_w;
+             dh = oh - im_h;
+             /* Save deltas in frame data*/
+             eo_do(fr, eo_base_data_set("dw", (void *) dw, NULL));
+             eo_do(fr, eo_base_data_set("dh", (void *) dh, NULL));
+             /* Resize properly. */
+             eo_do(fr, evas_obj_size_set(ow + dw, oh + dh));
+             eo_do(io, evas_obj_size_set(ow, oh));
+          }
+     }
+
+   eo_unref(o);
+   session_eo_set(session, wdg, o);
+   Eina_List *lst = NULL;
+   wdg_data_set(wdg, DEP_PROP_LIST, lst);
+   return EINA_TRUE;
+}
+
+/* Remove only Eo objects or also widgets*/
+static Eina_Bool
+_editor_layout_clear(const Gui_Context *ctx, Eina_Bool delete_widgets)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_FALSE);
+
+   Eina_List *list, *itr, *itr2;
+   Gui_Widget *wdg;
+
+   /* in editor, we iterate only over windows which don't have parent. */
+   list = gui_context_win_list_get(ctx);
+   EINA_LIST_FOREACH_SAFE(list, itr, itr2, wdg)
+     {
+        _iter_widget_delete(wdg, delete_widgets);
+     }
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_editor_ctx_call(const Gui_Context *ctx)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(ctx, EINA_FALSE);
+
+   Eina_List *list, *l;
+   Gui_Widget *wdg;
+
+   /* in editor, we iterate only over windows which don't have parent. */
+   list = gui_context_win_list_get(ctx);
+   EINA_LIST_FOREACH(list, l, wdg)
+     {
+        /* if window has parent widget, it will be iterated as child*/
+        if (wdg_parent_get(wdg))
+          {
+             ERR("Window: \"%s\" has parent. It should not happen. We have bug!", wdg_name_get(wdg));
+             continue;
+          }
+
+        /* All windows should be shown in main gui window. */
+        _iter_widget_create(wdg, canvas_get());
+     }
+   /* Set context for objtree. */
+   objtree_item_contracted_set(NULL);
+   /* During context call _win_resize() will be called.
+    * It will draw border around win, but widget was not selected yet.
+    * So need to hide border. */
+   _editor_wdg_selected_set(NULL);
+   return EINA_TRUE;
+}
+
+/* Remove only Eo objects or also widgets*/
+static Eina_Bool
+_editor_widget_clear(Gui_Widget *wdg)
+{
+   EINA_SAFETY_ON_NULL_RETURN_VAL(wdg, EINA_FALSE);
+
+   _iter_widget_delete(wdg, EINA_FALSE);
+   return EINA_TRUE;
+}
+
+static void
+_editor_selected_wdg_del_cb()
+{
+   Gui_Widget *wdg = (Gui_Widget *) _editor_wdg_selected_get();
+   if (!wdg) return;
+   const Gui_Widget *parent_wdg = wdg_parent_get((Gui_Widget *) wdg);
+   _editor_wdg_selected_set(NULL);
+   _iter_widget_delete(wdg, EINA_TRUE);
+
+   /* if parent_wdg is not NULL, it's not window, so it has parent.
+    * if parent wdg is NULL, wdg is window, so just delete it. */
+   if (parent_wdg)
+     {
+        Gui_Widget *pwin = (Gui_Widget *) wdg_parent_win_wdg_get(parent_wdg);
+        _editor_widget_clear((Gui_Widget *) pwin);
+        _iter_widget_create(pwin, canvas_get());
+     }
+   propview_build(NULL, _propsview_toolbar_selected_item_type);
+   /*close objtree list*/
+   objtree_item_contracted_set(NULL);
+   /* Set selected widget: t.e. if I delete button, box will be selected after.
+    * If I delete window, main item will be selected. */
+   objtree_item_selected_set(parent_wdg);
+   _editor_wdg_selected_set(parent_wdg);
+}
+
+static void
+_editor_factory_wdg_create(const char *class_name)
+{
+   const Gui_Widget *parent_win = NULL;
+   const char *parent_name = NULL;
+   Gui_Widget *wdg;
+   const Gui_Widget *focused_wdg = _editor_wdg_selected_get();
+   const Gui_Context *ctx = _active_context_get();
+
+   if (!ctx)
+     {
+        ERR("No active context");
+        return;
+     }
+
+   /*If adding non window widget*/
+   if (strcmp(class_name, DB_DEF_WIN_CLASS))
+     {
+        if (!focused_wdg) return;
+        parent_win = wdg_parent_win_wdg_get(focused_wdg);
+        parent_name = wdg_name_get(parent_win);
+     }
+
+   char *new_name = gui_context_free_name_get(ctx, class_name);
+
+   wdg = wdg_new(new_name);
+   free(new_name);
+   wdg_class_name_set(wdg, class_name);
+   wdg_append(ctx, wdg);
+   wdg_parent_set(wdg, parent_name);
+
+   /*Add default visibility property*/
+   Gui_Widget_Property *prop;
+   Gui_Value *val;
+   Eina_Bool b = EINA_TRUE;
+   Op_Desc *op;
+   op = db_mro_op_desc_get(class_name, VISIBILITY_SET);
+   prop = prop_create_for_op(op);
+   val = prop_value_nth_get(prop, 0);
+   gui_value_set(val, GUI_TYPE_BOOL, &b);
+   wdg_prop_add(wdg, prop);
+
+   if (IS_WIN(wdg))
+     {
+        /* By default, the window is created in the first action */
+        Gui_Sequence *seq = sequence_get(ctx, "BigBang");
+        /* Generate BigBand action if does not exist */
+        if (!seq) seq = sequence_new(ctx, "BigBang");
+        Gui_Action *action = action_new(seq);
+        action_creation_set(action, wdg_name_get(wdg));
+        _action_dep_resolve(action, EINA_TRUE, DEP_ACTION);
+        seqview_fill(ctx);
+
+        op = db_mro_op_desc_get(class_name, CONSTRUCTOR);
+        prop = prop_create_for_op(op);
+        val = prop_value_nth_get(prop, 0);
+        gui_value_set(val, GUI_TYPE_STRING, ELM_OBJ_WIN_CONSTRUCTOR);
+        wdg_prop_add(wdg, prop);
+
+        op = db_mro_op_desc_get(class_name, ELM_OBJ_WIN_CONSTRUCTOR);
+        prop = prop_create_for_op(op);
+        val = prop_value_nth_get(prop, 0);
+        gui_value_set(val, GUI_TYPE_NULL, NULL);
+        val = prop_value_nth_get(prop, 1);
+        gui_value_set(val, GUI_TYPE_ENUM, "ELM_WIN_BASIC");
+        wdg_prop_add(wdg, prop);
+
+        int i = 200;
+        op = db_mro_op_desc_get(class_name, SIZE_SET);
+        prop = prop_create_for_op(op);
+        val = prop_value_nth_get(prop, 0);
+        gui_value_set(val, GUI_TYPE_SINT, &i);
+        val = prop_value_nth_get(prop, 1);
+        gui_value_set(val, GUI_TYPE_SINT, &i);
+        wdg_prop_add(wdg, prop);
+
+        op = db_mro_op_desc_get(class_name, TITLE_SET);
+        prop = prop_create_for_op(op);
+        val = prop_value_nth_get(prop, 0);
+        gui_value_set(val, GUI_TYPE_STRING, wdg_name_get(wdg));
+        wdg_prop_add(wdg, prop);
+     }
+   else
+     {
+        op = db_mro_op_desc_get(class_name, PART_TEXT_SET);
+        prop = prop_create_for_op(op);
+        val = prop_value_nth_get(prop, 0);
+        gui_value_set(val, GUI_TYPE_NULL, NULL);
+        val = prop_value_nth_get(prop, 1);
+        gui_value_set(val, GUI_TYPE_STRING, wdg_name_get(wdg));
+        wdg_prop_add(wdg, prop);
+
+#if 0
+        int i = 255;
+        op = db_mro_op_desc_get(class_name, COLOR_SET);
+        prop = prop_create_for_op(op);
+        val = prop_value_nth_get(prop, 0);
+        gui_value_set(val, GUI_TYPE_SINT, &i);
+        val = prop_value_nth_get(prop, 1);
+        gui_value_set(val, GUI_TYPE_SINT, &i);
+        val = prop_value_nth_get(prop, 2);
+        gui_value_set(val, GUI_TYPE_SINT, &i);
+        val = prop_value_nth_get(prop, 3);
+        gui_value_set(val, GUI_TYPE_SINT, &i);
+        wdg_prop_add(wdg, prop);
+
+        i = 0;
+        op = db_mro_op_desc_get(class_name, POSITION_SET);
+        prop = prop_create_for_op(op);
+        val = prop_value_nth_get(prop, 0);
+        gui_value_set(val, GUI_TYPE_SINT, &i);
+        val = prop_value_nth_get(prop, 1);
+        gui_value_set(val, GUI_TYPE_SINT, &i);
+        wdg_prop_add(wdg, prop);
+#endif
+        double d = 1;
+        op = db_mro_op_desc_get(class_name, SIZE_HINT_WEIGHT_SET);
+        prop = prop_create_for_op(op);
+        val = prop_value_nth_get(prop, 0);
+        gui_value_set(val, GUI_TYPE_DOUBLE, &d);
+        val = prop_value_nth_get(prop, 1);
+        gui_value_set(val, GUI_TYPE_DOUBLE, &d);
+        wdg_prop_add(wdg, prop);
+     }
+
+   wdg_validate(wdg);
+
+   Eo *pw = NULL;
+   if (IS_WIN(wdg)) pw = (Eo *)canvas_get();
+   manager_widget_create(_editor_session, wdg, MODE_EDITOR, pw);
+
+   objtree_item_contracted_set(NULL);
+
+   _editor_wdg_selected_set(wdg);
+   objtree_item_selected_set(wdg);
+   manager_widget_configure(_editor_session, wdg, MODE_EDITOR, NULL);
+}
+
+static void
+_editor_shutdown()
+{
+   target_db_shutdown();
+   seqview_shutdown();
+   propview_scrollbox_unset();
+   objtree_list_unset();
+   session_del(_editor_session);
+}
+
+/* onChange callback for all properties edit fields.
+ * If currently there is no such property in the widget, it will be added.
+ * The given object is the one created in the properties view for each parameter.
+ */
+static void
+_prop_update_from_propview(void *data EINA_UNUSED, Eo *obj, void *event_info)
+{
+   Par_Field_Data *pfd = NULL;
+   const Eo_Class *kl = eo_class_get(obj);
+   Op_Desc *op;
+   Gui_Widget *wdg;
+   Gui_Widget_Property *prop;
+   int idx;
+   Gui_Value *val;
+   Eina_Bool prop_add = EINA_FALSE;
+   Eina_Bool reload_win = EINA_FALSE;
+
+   /* Get data for changed field. */
+   eo_do(obj, eo_base_data_get("editor", (void **) &pfd));
+   op = pfd->it_data->op_desc;
+   wdg = pfd->it_data->wdg;
+   prop = pfd->it_data->prop;
+   idx = pfd->par_idx;
+
+   /* If property doesn't exist, create it with some default values. */
+   if (!prop)
+     {
+        prop = prop_create_for_op(op);
+        /* Raise flag, that property is newly created and must be added to widget. */
+        prop_add = EINA_TRUE;
+     }
+   /* Get value which need to be changed.*/
+   val = prop_value_nth_get(prop, idx);
+
+   /* Get new value from edit field.
+    * And update Gui_Value with new value. */
+   Gui_Type type = db_op_desc_nth_par_type_get(op, idx);
+   if (kl == ELM_OBJ_ENTRY_CLASS)
+     {
+        const char *entry_data = elm_entry_entry_get(obj);
+        if (type == GUI_TYPE_STRING)
+          {
+             /* FIXME: part_text_set can receive NULL as parameter.
+              * But because of this, I can't write "null"*/
+             if (!strcmp(entry_data, "null"))
+               {
+                  gui_value_set(val, GUI_TYPE_NULL, NULL);
+               }
+             else
+               {
+                  gui_value_type_set(val, type);
+                  gui_value_string_set(val, entry_data);
+               }
+          }
+        else if (type == GUI_TYPE_SINT)
+          {
+             int number = atoi(entry_data);
+             gui_value_set(val, type, &number);
+          }
+        else if (type == GUI_TYPE_DOUBLE)
+          {
+             double number = atof(entry_data);
+             gui_value_set(val, type, &number);
+          }
+     }
+   if (kl == ELM_OBJ_CHECK_CLASS)
+     {
+        Eina_Bool state;
+        eo_do(obj, elm_obj_check_state_get(&state));
+        gui_value_set(val, type, &state);
+     }
+   if (kl == ELM_OBJ_HOVERSEL_CLASS)
+     {
+        const char *new_enum_value = elm_object_item_part_text_get(event_info, NULL);
+        /* Set selected string on hover */
+        elm_object_text_set(obj, new_enum_value);
+        /* Get new value depending on type of edit field.
+         * And update value. */
+        if (type == GUI_TYPE_ENUM)
+          {
+             gui_value_set(val, type, (void *) new_enum_value);
+          }
+        /* FIXME: there is problem with content_set; because prev content must be unset; or need to redraw from the beginning*/
+        if (type == GUI_TYPE_OBJECT)
+          {
+             const char *cur_param = gui_value_string_get(val);
+             Gui_Widget *cur_param_wdg = wdg_get(_active_context_get(), cur_param);
+             Gui_Widget *new_param_wdg = wdg_get(_active_context_get(), new_enum_value);
+             /* GUI_TYPE_OBJECT ops depend on other widgets, check that widget exists.
+              * or new one not equal old one.*/
+             if ((!new_param_wdg) || (cur_param_wdg == new_param_wdg))
+               {
+                  goto end;
+               }
+             /* If I simply change value in prop: t.e. "but1"->"but2" change parent of "but1".*/
+             /* and change dependencies. */
+             _prop_dep_resolve(prop, EINA_FALSE);
+             gui_value_set(val, type, (void *) new_enum_value);
+
+             /* Update parent, if op supports it. */
+             if (db_op_desc_flag_get(op) & UPDATE_PARENT)
+               {
+                  const Gui_Widget* parent_win = wdg_parent_win_wdg_get(new_param_wdg);
+                  objtree_item_contracted_set(parent_win);
+                  if (cur_param_wdg)
+                    {
+                       wdg_parent_set(cur_param_wdg, wdg_name_get(parent_win));
+                    }
+                  wdg_parent_set(new_param_wdg, wdg_name_get(wdg));
+                  objtree_item_selected_set(wdg);
+               }
+             if (cur_param) reload_win = EINA_TRUE;
+          }
+     }
+
+   if (prop_add)
+     {
+        wdg_prop_add(wdg, prop);
+        pfd->it_data->prop = prop;
+     }
+   /* Validate property and call for eo_func of current prop,
+    * in order to update layout. */
+   if (prop_validate(prop))
+     {
+        if (reload_win)
+          {
+             Gui_Widget *pwin = (Gui_Widget *) wdg_parent_win_wdg_get(wdg);
+             _editor_widget_clear((Gui_Widget *) pwin);
+             propview_build(NULL, _propsview_toolbar_selected_item_type);
+             _iter_widget_create(pwin, canvas_get());
+             _editor_wdg_selected_set(wdg);
+             objtree_item_contracted_set(NULL);
+             objtree_item_selected_set(wdg);
+          }
+        else
+          {
+             /* Don't do anything with win if prop is VISIBILITY*/
+             if (IS_WIN(wdg) && (!strcmp(prop_name_get(prop), VISIBILITY_SET)))
+               {
+               }
+             else
+               {
+                  manager_widget_property_add(_editor_session, wdg, prop, MODE_EDITOR, NULL);
+                  if (!strcmp(prop_name_get(prop), POSITION_SET))
+                    {
+                       _wdg_border_draw(wdg, EINA_TRUE);
+                    }
+               }
+             /* Rebuild view when property like "pack_end". */
+             if (db_op_desc_flag_get(op) & MULTI_PROPERTY)
+               propview_build(wdg, _propsview_toolbar_selected_item_type);
+          }
+        return;
+     }
+   /* FIXME: add return here? */
+end:
+   /* If property was newly created, delete it. */
+   if (prop_add) prop_del(prop);
+}
+
+static void
+_prop_del_from_propview(void *data, Eo *obj EINA_UNUSED, void *ev EINA_UNUSED)
+{
+   const Gui_Widget *wdg = _editor_wdg_selected_get();
+   Gui_Widget_Property *prop = data;
+   const Op_Desc *op = prop_op_desc_get(prop);
+   Gui_Value *val;
+   Eina_List *l;
+
+   /* Change parent, when removing property like "pack_end". */
+   if (db_op_desc_flag_get(op) & UPDATE_PARENT)
+     {
+        EINA_LIST_FOREACH(prop_value_get(prop), l, val)
+          {
+             if (gui_value_type_get(val) == GUI_TYPE_OBJECT)
+               {
+                  Gui_Widget *param_wdg = wdg_get(_active_context_get(), gui_value_string_get(val));
+                  if (param_wdg)
+                    {
+                       const Gui_Widget *parent_win = wdg_parent_win_wdg_get(param_wdg);
+                       /* Do it to update list. */
+                       objtree_item_contracted_set(parent_win);
+                       wdg_parent_set(param_wdg, wdg_name_get(parent_win));
+                       objtree_item_selected_set(wdg);
+                    }
+               }
+          }
+     }
+
+   Gui_Widget *pwin = (Gui_Widget *) wdg_parent_win_wdg_get(wdg);
+   _editor_widget_clear((Gui_Widget *) pwin);
+
+   /*Before deleting property iterate over its parameters and remove pointer to this prop from widgets,
+    * which depend on it. */
+   _prop_dep_resolve(prop, EINA_FALSE);
+   wdg_prop_del((Gui_Widget *) wdg, prop);
+   propview_build(NULL, _propsview_toolbar_selected_item_type);
+
+   _iter_widget_create(pwin, canvas_get());
+   _editor_wdg_selected_set(wdg);
+   objtree_item_contracted_set(NULL);
+   objtree_item_selected_set(wdg);
+}
+
+static void
+_widget_selected_from_objtree(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
+{
+   Gui_Widget *wdg  = elm_object_item_data_get(event_info);
+   _editor_wdg_selected_set(wdg);
+   propview_build(wdg, _propsview_toolbar_selected_item_type);
+}
+
+static void
+_propsview_toolbar_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   const Gui_Widget *wdg  = _editor_wdg_selected_get();
+
+   if (!strcmp(data, "Description"))
+     {
+        _propsview_toolbar_selected_item_type = DESCRIPTION_TYPE;
+     }
+   else if (!strcmp(data, "Properties"))
+     {
+        _propsview_toolbar_selected_item_type = PROPERTY_TYPE;
+     }
+   else if (!strcmp(data, "Callbacks"))
+     {
+        _propsview_toolbar_selected_item_type = CALLBACK_TYPE;
+     }
+
+   propview_build(wdg, _propsview_toolbar_selected_item_type);
+}
+
+static void
+_project_close(const Gui_Context *ctx)
+{
+   if (ctx)
+     {
+        /* Set selected widget to NULL, in order to hide border. */
+        _editor_wdg_selected_set(NULL);
+        _editor_layout_clear(_active_ctx, EINA_TRUE);
+        gui_context_del((Gui_Context *) ctx);
+     }
+   _active_context_set(NULL);
+   /* Clear lists. */
+   objtree_context_set(NULL);
+   propview_build(NULL, _propsview_toolbar_selected_item_type);
+   seqview_fill(NULL);
+}
+
+static Eina_Bool
+_project_new(char *filename)
+{
+   Gui_Context *ctx;
+   ctx = gui_context_new();
+   if (!ctx)
+     {
+        ERR("Can not create context: %p", ctx);
+        return EINA_FALSE;
+     }
+
+   if (filename)
+     {
+        if (!gui_parser_json_file_read(ctx, filename))
+          {
+             gui_context_del(ctx);
+             return EINA_FALSE;
+          }
+     }
+
+   /* FIXME: handle return values */
+   gui_context_validate(ctx);
+   _active_context_set(ctx);
+   objtree_context_set(ctx);
+   seqview_fill(ctx);
+
+   /*resolve action dependencies
+    * FIXME: put it in other place?
+    * Action dependencies affect only on editor, so I need to resolve it somewhere during context resolving. */
+   Eina_List *itr;
+   Gui_Sequence *seq = NULL;
+   EINA_LIST_FOREACH(gui_context_seq_list_get(ctx), itr, seq)
+     {
+        Eina_List *itr2;
+        Gui_Action *action;
+        EINA_LIST_FOREACH(sequence_actions_list_get(seq), itr2, action)
+          {
+             _action_dep_resolve(action, EINA_TRUE, DEP_ALL);
+          }
+     }
+
+   _editor_ctx_call(ctx);
+   return EINA_TRUE;
+}
+
+void
+editor_init(GuiLogicCbs *_guilogic_cbs, Eo *objlist, Eo *scrollbox, Eo *seqlist)
+{
+   Action_Functions *funcs = manager_action_functions_get(MODE_EDITOR);
+   funcs->wdg_add = _widget_add;
+   funcs->wdg_del = _widget_del;
+   funcs->prop_add = _widget_prop_add;
+
+   PropViewCbs *prop_cbs = propview_cbs_get();
+   prop_cbs->property_update_cb_func = _prop_update_from_propview;
+   prop_cbs->property_delete_cb_func = _prop_del_from_propview;
+
+   ObjTreeViewCbs *objtree_cbs = objtree_cbs_get();
+   objtree_cbs->item_selection_cb_func = _widget_selected_from_objtree;
+
+   _guilogic_cbs->_layout_clear = _editor_layout_clear;
+   _guilogic_cbs->_editor_ctx_call = _editor_ctx_call;
+   _guilogic_cbs->_editor_selected_wdg_del_cb = _editor_selected_wdg_del_cb;
+   _guilogic_cbs->_editor_factory_wdg_create = _editor_factory_wdg_create;
+   _guilogic_cbs->_editor_shutdown = _editor_shutdown;
+   _guilogic_cbs->_project_close = _project_close;
+   _guilogic_cbs->_project_new = _project_new;
+   _guilogic_cbs->_propsview_toolbar_clicked = _propsview_toolbar_clicked;
+
+   _guilogic_cbs->_seqview_fill = seqview_fill;
+
+   _editor_session = session_new();
+
+   objtree_list_set(objlist);
+   propview_scrollbox_set(scrollbox);
+   seqview_init(seqlist);
+   target_db_init();
+}
+
diff --git a/src/bin/egui_gui/egui_layout_c.json b/src/bin/egui_gui/egui_layout_c.json
new file mode 100644
index 0000000..d463165
--- /dev/null
+++ b/src/bin/egui_gui/egui_layout_c.json
@@ -0,0 +1,2395 @@
+#include <Elementary.h>
+#include "elm_widget.h"
+#include "elm_widget_container.h"
+#include "elm_interface_scrollable.h"
+#include "egui_layout.h"
+
+static GUI pub_widgets;
+static Eo *main_win;
+static Eo *sequences_buttons_box;
+static Eo *button_sequence_add;
+static Eo *seq_add_entry;
+
+/* @egui
+{
+  "entry_activate":
+  {
+    "Desc":
+    {
+      "type":"sequence"
+    },
+    "Actions":
+    {
+      "User":["_seq_add_entry_activate_cb", ""],
+      "Modification":["button_sequence_add", "disabled", [false]]
+    }
+  }
+ }
+@!egui */
+static Eina_Bool
+_sequence_entry_activate_execute(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   extern Eina_Bool _seq_add_entry_activate_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info);
+   if (!_seq_add_entry_activate_cb(NULL, obj, desc, event_info)) return EO_CALLBACK_STOP;
+   eo_do(button_sequence_add, elm_wdg_disabled_set(EINA_FALSE));
+   return EO_CALLBACK_CONTINUE;
+}
+
+void
+_create_gvc_win()
+{
+   Eo *gvc_win;
+   Eo *gvc_img;
+
+/* @egui
+{
+  "gvc_win":
+  {
+    "Desc":
+    {
+      "parent":null,
+      "class":"Elm_Win",
+      "type":"widget"
+    },
+    "Properties":
+    {
+      "constructor":["elm_obj_win_constructor"],
+      "elm_obj_win_constructor":["Graph", "ELM_WIN_BASIC"],
+      "title_set":["Graph View"],
+      "autodel_set":[true],
+      "size_set":[400, 400],
+      "resize_object_add":["gvc_img"],
+      "visibility_set":[true]
+    }
+  }
+ }
+@!egui */
+   gvc_win = eo_add_custom(ELM_OBJ_WIN_CLASS, NULL, elm_obj_win_constructor("Graph", ELM_WIN_BASIC));
+   eo_unref(gvc_win);
+   eo_do(gvc_win, elm_obj_win_title_set("Graph View"));
+   eo_do(gvc_win, elm_obj_win_autodel_set(EINA_TRUE));
+   eo_do(gvc_win, evas_obj_size_set(400, 400));
+/* @egui
+{
+  "gvc_img":
+  {
+    "Desc":
+    {
+      "parent":"gvc_win",
+      "class":"Elm_Image",
+      "type":"widget"
+    },
+    "Properties":
+    {
+      "size_hint_weight_set":[1, 1],
+      "image_file_set":["/tmp/truc.png", null, null],
+      "visibility_set":[true]
+    }
+  }
+ }
+@!egui */
+   gvc_img = eo_add(ELM_OBJ_IMAGE_CLASS, gvc_win);
+   eo_unref(gvc_img);
+   eo_do(gvc_img, evas_obj_size_hint_weight_set(1.000000, 1.000000));
+   eo_do(gvc_img, elm_obj_image_file_set("/tmp/truc.png", NULL, NULL));
+   eo_do(gvc_img, evas_obj_visibility_set(EINA_TRUE));
+   eo_do(gvc_win, elm_obj_win_resize_object_add(gvc_img));
+   eo_do(gvc_win, evas_obj_visibility_set(EINA_TRUE));
+}
+
+
+/* @egui
+{
+  "graphviz_button_clicked":
+  {
+    "Desc":
+    {
+      "type":"sequence"
+    },
+    "Actions":
+    {
+      "Creation":"gvc_win"
+    }
+  }
+ }
+@!egui */
+static Eina_Bool
+_sequence_graphviz_button_clicked_execute(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   _create_gvc_win();
+
+   return EO_CALLBACK_CONTINUE;
+}
+
+
+/* @egui
+{
+  "del_button_clicked":
+  {
+    "Desc":
+    {
+      "type":"sequence"
+    },
+    "Actions":
+    {
+      "User":["_action_or_seq_del", ""]
+    }
+  }
+ }
+@!egui */
+static Eina_Bool
+_sequence_del_button_clicked_execute(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   extern Eina_Bool _action_or_seq_del(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info);
+   if (!_action_or_seq_del(NULL, obj, desc, event_info)) return EO_CALLBACK_STOP;
+   return EO_CALLBACK_CONTINUE;
+}
+
+static void
+_create_fs_win()
+{
+   Eo *fs_win;
+   Eo *bg2;
+   Eo *vbox;
+   Eo *fileselector;
+
+/* @egui
+{
+  "fs_win":
+  {
+    "Desc":
+    {
+      "parent":null,
+      "class":"Elm_Win",
+      "public":true,
+      "type":"widget"
+    },
+    "Properties":
+    {
+      "constructor":["elm_obj_win_constructor"],
+      "elm_obj_win_constructor":[null, "ELM_WIN_BASIC"],
+      "title_set":["Select file"],
+      "autodel_set":[true],
+      "size_set":[300, 450],
+      "resize_object_add":["bg2"],
+      "resize_object_add":["vbox"],
+      "modal":[true],
+      "visibility_set":[true]
+    }
+  }
+ }
+@!egui */
+   fs_win = eo_add_custom(ELM_OBJ_WIN_CLASS, main_win, elm_obj_win_constructor(NULL, ELM_WIN_BASIC));
+   eo_unref(fs_win);
+   pub_widgets.fs_win = fs_win;
+   eo_do(fs_win, elm_obj_win_modal_set(EINA_TRUE));
+   eo_do(fs_win, elm_obj_win_title_set("Select file"));
+   eo_do(fs_win, elm_obj_win_autodel_set(EINA_TRUE));
+   eo_do(fs_win, evas_obj_size_set(300, 450));
+/* @egui
+{
+  "bg2":
+  {
+    "Desc":
+    {
+      "parent":"fs_win",
+      "class":"Elm_Bg",
+      "type":"widget"
+    },
+    "Properties":
+    {
+      "bg_color_set":[80, 80, 80, 255],
+      "size_hint_weight_set":[1, 1],
+      "visibility_set":[true]
+    }
+  }
+ }
+@!egui */
+   bg2 = eo_add(ELM_OBJ_BG_CLASS, fs_win);
+   eo_unref(bg2);
+   eo_do(bg2, elm_obj_bg_color_set(80, 80, 80, 255));
+   eo_do(bg2, evas_obj_size_hint_weight_set(1.000000, 1.000000));
+   eo_do(bg2, evas_obj_visibility_set(EINA_TRUE));
+   eo_do(fs_win, elm_obj_win_resize_object_add(bg2));
+/* @egui
+{
+  "vbox":
+  {
+    "Desc":
+    {
+      "parent":"fs_win",
+      "class":"Elm_Box",
+      "type":"widget"
+    },
+    "Properties":
+    {
+      "size_hint_weight_set":[1, 1],
+      "pack_end":["fileselector"],
+      "visibility_set":[true]
+    }
+  }
+ }
+@!egui */
+   vbox = eo_add(ELM_OBJ_BOX_CLASS, fs_win);
+   eo_unref(vbox);
+   eo_do(vbox, evas_obj_size_hint_weight_set(1.000000, 1.000000));
+   eo_do(vbox, evas_obj_visibility_set(EINA_TRUE));
+   eo_do(fs_win, elm_obj_win_resize_object_add(vbox));
+/* @egui
+{
+  "fileselector":
+  {
+    "Desc":
+    {
+      "parent":"vbox",
+      "class":"Elm_Fileselector",
+      "public":true,
+      "type":"widget"
+    },
+    "Properties":
+    {
+      "size_hint_weight_set":[1, 1],
+      "size_hint_align_set":[-1, -1],
+      "visibility_set":[true]
+    }
+  }
+ }
+@!egui */
+   fileselector = eo_add(ELM_OBJ_FILESELECTOR_CLASS, vbox);
+   eo_unref(fileselector);
+   pub_widgets.fileselector = fileselector;
+   eo_do(fileselector, evas_obj_size_hint_weight_set(1.000000, 1.000000));
+   eo_do(fileselector, evas_obj_size_hint_align_set(-1.000000, -1.000000));
+   eo_do(fileselector, evas_obj_visibility_set(EINA_TRUE));
+   eo_do(vbox, elm_obj_box_pack_end(fileselector));
+   eo_do(fs_win, evas_obj_visibility_set(EINA_TRUE));
+}
+
+
+/* @egui
+{
+  "fs_win_show":
+  {
+    "Desc":
+    {
+      "type":"sequence"
+    },
+    "Actions":
+    {
+      "Creation":"fs_win"
+    }
+  }
+ }
+@!egui */
+Eina_Bool
+_sequence_fs_win_show_execute(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   _create_fs_win();
+
+   return EO_CALLBACK_CONTINUE;
+}
+
+
+/* @egui
+{
+  "seq_add_entry_pack":
+  {
+    "Desc":
+    {
+      "type":"sequence"
+    },
+    "Actions":
+    {
+      "Modification":["sequences_buttons_box", "pack_after", ["seq_add_entry", "button_sequence_add"]],
+      "Modification":["seq_add_entry", "visibility_set", [true]],
+      "Modification":["button_sequence_add", "disabled", [true]]
+    }
+  }
+}
+@!egui */
+static Eina_Bool
+_sequence_seq_add_entry_pack_execute(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   eo_do(sequences_buttons_box, elm_obj_box_pack_after(seq_add_entry, button_sequence_add));
+   eo_do(seq_add_entry, evas_obj_visibility_set(EINA_TRUE));
+   eo_do(button_sequence_add, elm_wdg_disabled_set(EINA_TRUE));
+   return EO_CALLBACK_CONTINUE;
+}
+