rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=b7796c57fb2588ffc97c5d582b384dc565bcf86a

commit b7796c57fb2588ffc97c5d582b384dc565bcf86a
Merge: ba9af28 fadf269
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Fri Jul 24 16:37:44 2015 +0300

    Merge branch 'master' of internal eflete repo

 data/themes/default/images/color-sight.png         | Bin 525 -> 528 bytes
 data/themes/default/widgets/colorselector.edc      |   7 +-
 data/themes/default/widgets/ctxpopup.edc           |   1 +
 src/bin/common/string_common.h                     |   7 +
 src/bin/common/widget_macro.h                      |   8 -
 src/bin/eflete.c                                   |   2 +
 src/bin/history/history.c                          |  11 +-
 src/bin/history/history_attribute.c                |  11 +-
 src/bin/history/history_part.c                     |  25 +-
 src/bin/history/history_state.c                    |  18 +-
 src/bin/project_manager/project_manager.c          |   5 +-
 src/bin/project_manager/widget_manager.c           |   5 +-
 src/bin/ui/blocks/property_macros.h                |  92 ++-
 src/bin/ui/blocks/ui_property.c                    |  91 +--
 src/bin/ui/blocks/ui_widget_list.c                 |  22 +-
 src/bin/ui/connector.c                             | 109 ++--
 src/bin/ui/dialogs/item_dialog.c                   |  66 ++-
 src/bin/ui/dialogs/part_dialog.c                   |  22 +-
 src/bin/ui/dialogs/state_dialog.c                  |  82 +--
 src/bin/ui/dialogs/style_dialog.c                  | 103 ++--
 src/bin/ui/editors/animator.c                      |  56 +-
 src/bin/ui/editors/animator_program_editor.c       |  80 +--
 src/bin/ui/editors/colorclass_manager.c            |  65 ++-
 src/bin/ui/editors/image_editor.c                  |   2 +-
 src/bin/ui/editors/sound_editor.c                  | 101 ++--
 src/bin/ui/editors/style_editor.c                  | 106 ++--
 src/bin/ui/live_view/live_view.c                   |  49 +-
 src/bin/ui/live_view/live_view.h                   |  17 +
 src/bin/ui/live_view/live_view_prop.c              | 138 ++++-
 src/bin/ui/live_view/live_view_prop.h              |  18 +
 src/bin/ui/live_view/live_widgets.h                |   1 -
 src/bin/ui/preference/preference.c                 |   2 +-
 src/bin/ui/shortcuts/shortcuts.c                   |   2 +-
 src/bin/ui/wizard/wizard_common.c                  |   2 +-
 src/bin/ui/workspace/groupedit.c                   |  22 +-
 src/bin/ui/workspace/groupedit.h                   |  30 -
 src/bin/ui/workspace/groupedit_calc.c              |   1 -
 src/bin/ui/workspace/highlight.c                   |   1 +
 src/bin/ui/workspace/ui_workspace.c                |  18 +-
 src/lib/Ewe.h                                      |   1 -
 src/lib/Makefile.am                                |   8 -
 src/lib/ewe_entry.c                                | 343 ------------
 src/lib/ewe_entry.eo                               | 121 ----
 src/lib/ewe_entry.h                                |  29 -
 src/lib/ewe_entry_common.h                         |  87 ---
 src/lib/ewe_entry_eo.h                             |  40 --
 src/lib/ewe_entry_legacy.h                         | 128 -----
 src/lib/ewe_widget_entry.h                         |  27 -
 tests/Makefile.am                                  |  66 +--
 tests/edj_build/Makefile.am                        |   2 +
 tests/test_animator/animator_window_add_test.c     | 121 +---
 tests/test_animator/test_animator.c                |   4 +-
 tests/test_animator/test_animator.h                |   3 +-
 tests/test_colorselector/colorselector_add.c       |  27 -
 tests/test_colorselector/colorselector_color_get.c |  83 ---
 tests/test_colorselector/test_colorselector.c      |   3 -
 tests/test_colorselector/test_colorselector.h      |   3 -
 tests/test_config/config_init.c                    |  28 -
 tests/test_config/config_panes_sizes_data_update.c |  37 --
 tests/test_config/profile_get.c                    |  33 --
 tests/test_config/profile_load.c                   |  37 --
 tests/test_config/profile_save.c                   |  31 --
 tests/test_config/test_config.c                    |  21 +-
 tests/test_config/test_config.h                    |  22 +-
 tests/test_container/container_add.c               |  33 --
 tests/test_container/container_border_hide.c       |  66 ---
 tests/test_container/container_border_show.c       |  66 ---
 tests/test_container/container_confine_set.c       |  88 ---
 tests/test_container/container_confine_unset.c     |  30 -
 .../test_container/container_container_size_get.c  |  30 -
 .../test_container/container_container_size_set.c  |  32 --
 tests/test_container/container_content_set.c       |  76 ---
 tests/test_container/container_content_unset.c     |  30 -
 tests/test_container/container_handler_size_get.c  |  35 --
 tests/test_container/container_handler_size_set.c  |  30 -
 tests/test_container/container_max_size_set.c      |  31 --
 tests/test_container/container_min_size_set.c      |  32 --
 tests/test_container/container_padding_size_get.c  |  78 ---
 tests/test_container/container_padding_size_set.c  |  66 ---
 tests/test_container/container_style_get.c         |  30 -
 tests/test_container/container_style_set.c         |  68 ---
 tests/test_container/test_container.c              |  76 +--
 tests/test_container/test_container.h              |  76 +--
 tests/test_cursor/cursor_main_set.c                |  61 --
 tests/test_cursor/cursor_type_get.c                |  29 -
 tests/test_cursor/cursor_type_set.c                |  63 ---
 tests/test_cursor/test_cursor.c                    |   5 -
 tests/test_cursor/test_cursor.h                    |   5 -
 tests/test_eflete/app_free.c                       |  26 -
 tests/test_eflete/app_shutdown.c                   |  29 -
 tests/test_eflete/colorselector_get.c              |  62 ---
 tests/test_eflete/main_window_get.c                |  62 ---
 tests/test_eflete/test_eflete.c                    |   8 -
 tests/test_eflete/test_eflete.h                    |   8 -
 tests/test_eflete/win_layout_get.c                 |  61 --
 tests/test_ewe_combobox/ewe_combobox_add.c         |   2 +-
 tests/test_ewe_entry/ewe_entry_add.c               |  96 ----
 tests/test_ewe_entry/ewe_entry_regex_autocheck.c   | 157 ------
 tests/test_ewe_entry/ewe_entry_regex_check.c       | 204 -------
 tests/test_ewe_entry/ewe_entry_regex_error_get.c   | 615 ---------------------
 tests/test_ewe_entry/ewe_entry_regex_glow.c        | 157 ------
 tests/test_ewe_entry/ewe_entry_regex_set.c         | 256 ---------
 tests/test_ewe_entry/ewe_entry_regex_unset.c       | 131 -----
 tests/test_ewe_entry/test_ewe_entry.c              |  77 ---
 tests/test_ewe_entry/test_ewe_entry.h              |  71 ---
 tests/test_ewe_tabs/ewe_tabs_active_item_get.c     |   2 +-
 tests/test_groupedit/groupedit_add.c               |  33 --
 tests/test_groupedit/groupedit_bg_set.c            |  32 --
 tests/test_groupedit/groupedit_bg_unset.c          |  30 -
 .../groupedit_edit_object_part_add.c               |  38 --
 .../groupedit_edit_object_part_del.c               |  38 --
 .../groupedit_edit_object_part_state_add.c         |  38 --
 .../groupedit_edit_object_part_state_del.c         |  38 --
 .../groupedit_edit_object_part_state_set.c         |  38 --
 tests/test_groupedit/groupedit_edit_object_set.c   | 121 ----
 tests/test_groupedit/groupedit_edit_object_unset.c |  68 ---
 .../groupedit_part_object_area_get.c               |  38 --
 .../groupedit_part_object_area_visible_get.c       |  38 --
 .../groupedit_part_object_area_visible_set.c       |  38 --
 tests/test_groupedit/groupedit_part_visible_set.c  |  38 --
 tests/test_groupedit/groupedit_style_get.c         | 109 ----
 tests/test_groupedit/groupedit_style_set.c         | 145 -----
 tests/test_groupedit/test_groupedit.c              |  77 ---
 tests/test_groupedit/test_groupedit.h              |  84 ---
 tests/test_highlight/highlight_add.c               |  32 --
 .../test_highlight/highlight_handler_align_hide.c  |  64 ---
 .../test_highlight/highlight_handler_align_show.c  |  64 ---
 .../highlight_handler_align_visible_get.c          |  64 ---
 .../highlight_handler_disabled_set.c               |  64 ---
 tests/test_highlight/highlight_handler_mode_set.c  |  66 ---
 tests/test_highlight/highlight_object_follow.c     | 139 -----
 tests/test_highlight/highlight_object_unfollow.c   |  63 ---
 tests/test_highlight/test_highlight.c              |  17 -
 tests/test_highlight/test_highlight.h              |  17 -
 tests/test_history/history_clear.c                 |  31 --
 tests/test_history/history_diff_add.c              | 588 ++------------------
 tests/test_history/history_genlist_get.c           |  71 ---
 tests/test_history/history_module_add.c            |  79 ---
 tests/test_history/history_module_del.c            | 179 ------
 tests/test_history/history_module_depth_get.c      |  83 ---
 tests/test_history/history_module_depth_set.c      |  90 +--
 tests/test_history/history_redo.c                  | 174 +-----
 tests/test_history/history_term.c                  |  31 --
 tests/test_history/history_undo.c                  | 171 +-----
 tests/test_history/test_history.c                  |  31 +-
 tests/test_history/test_history.h                  |  31 +-
 tests/test_image_editor/image_editor_file_choose.c |  52 --
 tests/test_image_editor/image_editor_window_add.c  |  80 ---
 tests/test_image_editor/test_image_editor.c        |   3 -
 tests/test_image_editor/test_image_editor.h        |   3 -
 tests/test_live_view/live_view_add.c               |  32 --
 tests/test_live_view/live_view_free.c              |  29 -
 tests/test_live_view/live_view_theme_update.c      | 153 -----
 tests/test_live_view/live_view_widget_style_set.c  | 155 ------
 .../test_live_view/live_view_widget_style_unset.c  |  28 -
 tests/test_live_view/test_live_view.c              |  20 +-
 tests/test_live_view/test_live_view.h              |  21 +-
 tests/test_live_view_prop/live_view_property_add.c |  33 --
 .../test_live_view_prop/live_view_property_free.c  |  32 --
 .../live_view_property_style_set.c                 | 148 -----
 .../live_view_property_style_unset.c               |  86 +--
 tests/test_live_view_prop/test_live_view_prop.c    |   7 -
 tests/test_live_view_prop/test_live_view_prop.h    |   9 -
 tests/test_live_widget/live_widget_create.c        |  43 --
 tests/test_live_widget/live_widget_del.c           |  66 ---
 tests/test_live_widget/test_live_widget.c          |   3 -
 tests/test_live_widget/test_live_widget.h          |   3 -
 tests/test_modal_window/mw_add.c                   |  36 +-
 tests/test_modal_window/mw_icon_set.c              |  80 +--
 tests/test_modal_window/mw_info_text_set.c         |  73 +--
 tests/test_modal_window/mw_title_set.c             |  73 +--
 tests/test_modal_window/test_modal_window.c        |  15 +-
 tests/test_modal_window/test_modal_window.h        |  15 +-
 tests/test_notify/noti_error_show_test.c           |  40 --
 tests/test_notify/noti_info_show_test.c            |  78 ---
 tests/test_notify/noti_warning_show_test.c         |  40 --
 tests/test_notify/test_notify.c                    |   4 -
 tests/test_notify/test_notify.h                    |   4 -
 tests/test_part_dialog/part_dialog_add.c           | 335 -----------
 tests/test_part_dialog/test_part_dialog.c          |  45 --
 tests/test_part_dialog/test_part_dialog.h          |  34 --
 .../pm_style_resource_export.c                     | 183 ------
 tests/test_project_manager/test_project_manager.c  |   3 -
 tests/test_project_manager/test_project_manager.h  |   4 -
 tests/test_sound_editor/sound_editor_file_choose.c | 130 -----
 tests/test_sound_editor/sound_editor_window_add.c  | 125 -----
 tests/test_sound_editor/test_sound_editor.c        |   6 -
 tests/test_sound_editor/test_sound_editor.h        |   6 -
 tests/test_style_dialog/style_dialog_add.c         | 244 --------
 tests/test_style_dialog/test_style_dialog.c        |  44 --
 tests/test_style_dialog/test_style_dialog.h        |  33 --
 tests/test_style_editor/style_editor_window_add.c  | 107 ----
 tests/test_style_editor/test_style_editor.c        |   3 -
 tests/test_style_editor/test_style_editor.h        |   3 -
 tests/test_ui_block/test_ui_block.c                |  23 +-
 tests/test_ui_block/test_ui_block.h                |  24 +-
 tests/test_ui_block/test_ui_block_macro.h          |  61 +-
 tests/test_ui_block/ui_block_add.c                 |  26 -
 tests/test_ui_block/ui_block_content_visible.c     |  28 -
 tests/test_ui_block/ui_block_title_visible.c       |  28 -
 tests/test_ui_item_dialog/item_dialog_add.c        | 220 --------
 tests/test_ui_item_dialog/test_ui_item_dialog.c    |  43 --
 tests/test_ui_item_dialog/test_ui_item_dialog.h    |  33 --
 tests/test_ui_main_window/add_callbacks_wd.c       |  74 ---
 tests/test_ui_main_window/code_edit_mode_switch.c  |  35 --
 tests/test_ui_main_window/register_callbacks.c     |  71 ---
 tests/test_ui_main_window/test_ui_main_window.c    |  44 +-
 tests/test_ui_main_window/test_ui_main_window.h    |  48 +-
 tests/test_ui_main_window/ui_main_window_add.c     |  35 --
 tests/test_ui_main_window/ui_menu_add.c            |  73 ---
 tests/test_ui_main_window/ui_menu_disable_set.c    |  85 ---
 .../ui_menu_items_list_disable_set.c               |  87 ---
 tests/test_ui_main_window/ui_panes_add.c           |  79 +--
 tests/test_ui_main_window/ui_panes_hide.c          |  74 ---
 .../ui_panes_left_panes_min_size_toggle.c          |  43 --
 tests/test_ui_main_window/ui_panes_show.c          |  73 ---
 tests/test_ui_signal_list/test_ui_signal_list.c    |   7 -
 tests/test_ui_signal_list/test_ui_signal_list.h    |   7 -
 tests/test_ui_signal_list/ui_signal_list_add.c     |  30 -
 .../test_ui_signal_list/ui_signal_list_data_set.c  | 218 --------
 .../ui_signal_list_data_unset.c                    |  32 --
 .../test_ui_state_dialog/state_dialog_state_add.c  | 146 -----
 .../test_ui_state_dialog/state_dialog_state_del.c  | 146 -----
 tests/test_ui_state_dialog/test_ui_state_dialog.c  |  47 --
 tests/test_ui_state_dialog/test_ui_state_dialog.h  |  36 --
 tests/test_ui_widget_list/test_ui_widget_list.c    |  55 +-
 tests/test_ui_widget_list/test_ui_widget_list.h    |  56 --
 tests/test_ui_widget_list/ui_widget_list_add.c     |  29 -
 .../ui_widget_list_class_data_reload.c             | 296 ----------
 .../test_ui_widget_list/ui_widget_list_data_set.c  |  76 ---
 .../ui_widget_list_layouts_reload.c                | 221 --------
 .../test_ui_widget_list/ui_widget_list_part_add.c  | 339 ------------
 .../ui_widget_list_part_selected_set.c             | 265 ---------
 .../ui_widget_list_selected_part_above.c           | 349 ------------
 .../ui_widget_list_selected_part_below.c           | 351 ------------
 .../ui_widget_list_selected_part_del.c             | 279 ----------
 .../ui_widget_list_selected_part_get.c             | 209 -------
 .../ui_widget_list_selected_parts_get.c            | 215 -------
 .../ui_widget_list_tab_activate.c                  |  30 -
 .../test_ui_widget_list/ui_widget_list_title_set.c |  72 ---
 tests/test_ui_workspace/test_ui_workspace.c        | 156 ++----
 tests/test_ui_workspace/test_ui_workspace.h        | 169 ++----
 tests/test_ui_workspace/workspace_add.c            |  30 -
 .../test_ui_workspace/workspace_edit_object_get.c  |  34 --
 .../workspace_edit_object_part_above.c             | 145 -----
 .../workspace_edit_object_part_add.c               | 205 -------
 .../workspace_edit_object_part_below.c             | 145 -----
 .../workspace_edit_object_part_del.c               | 143 -----
 .../workspace_edit_object_part_item_add.c          | 236 --------
 .../workspace_edit_object_part_item_del.c          | 170 ------
 .../workspace_edit_object_part_item_selected_set.c |  98 ----
 .../workspace_edit_object_part_rename.c            | 182 ------
 .../workspace_edit_object_part_restack.c           | 255 ---------
 .../workspace_edit_object_part_state_add.c         | 180 +-----
 .../workspace_edit_object_part_state_del.c         | 304 +---------
 .../workspace_edit_object_part_state_set.c         | 107 ----
 .../workspace_edit_object_recalc.c                 |  73 ---
 .../test_ui_workspace/workspace_edit_object_set.c  | 197 -------
 .../workspace_edit_object_unset.c                  |  31 --
 .../workspace_edit_object_visible_set.c            |  88 ---
 .../workspace_highlight_align_visible_get.c        |  79 ---
 .../workspace_highlight_align_visible_set.c        |  32 --
 tests/test_ui_workspace/workspace_highlight_set.c  | 215 -------
 .../test_ui_workspace/workspace_highlight_unset.c  |  33 --
 .../workspace_object_area_visible_get.c            |  79 ---
 .../workspace_object_area_visible_set.c            |  32 --
 .../workspace_separate_mode_get.c                  |  79 ---
 .../workspace_separate_mode_set.c                  |  74 ---
 .../test_ui_workspace/workspace_zoom_factor_get.c  |  70 +--
 .../test_ui_workspace/workspace_zoom_factor_set.c  |  58 ++
 tests/test_widget_manager/test_widget_manager.c    |  91 +--
 tests/test_widget_manager/test_widget_manager.h    |  94 +---
 tests/test_widget_manager/wm_class_add.c           |  86 ---
 tests/test_widget_manager/wm_class_free.c          |  27 -
 tests/test_widget_manager/wm_layouts_list_new.c    |  27 -
 .../wm_layouts_list_objects_load.c                 | 116 ----
 tests/test_widget_manager/wm_part_add.c            | 146 -----
 tests/test_widget_manager/wm_part_by_name_find.c   |  90 ---
 .../wm_part_current_state_set.c                    | 132 -----
 tests/test_widget_manager/wm_part_del.c            | 162 ------
 tests/test_widget_manager/wm_part_type_get.c       |  58 --
 .../wm_program_signals_list_free.c                 |  27 -
 .../wm_program_signals_list_get.c                  |  62 ---
 tests/test_widget_manager/wm_style_add.c           | 141 -----
 tests/test_widget_manager/wm_style_copy.c          | 139 +----
 tests/test_widget_manager/wm_style_data_reload.c   | 129 -----
 tests/test_widget_manager/wm_style_free.c          |  27 -
 tests/test_widget_manager/wm_style_object_find.c   |  99 ----
 tests/test_widget_manager/wm_styles_build_alias.c  |  30 -
 tests/test_widget_manager/wm_widget_add.c          |  88 ---
 tests/test_widget_manager/wm_widget_free.c         |  27 -
 tests/test_widget_manager/wm_widget_list_free.c    |  27 -
 tests/test_widget_manager/wm_widget_list_new.c     |  27 -
 .../wm_widget_list_objects_load.c                  | 115 ----
 294 files changed, 1301 insertions(+), 21005 deletions(-)

-- 


Reply via email to