rimmed pushed a commit to branch master.

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

commit c79a6bef4c6d330f6e926e0072ac09ad7be3daa1
Merge: c1f1fee e250d55
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Fri Dec 25 15:59:13 2015 +0200

    Merge branch 'master' from internal eflete repo

 data/themes/default/widgets/layouts/property.edc   |   18 +
 po/POTFILES.in                                     |    9 -
 src/bin/Makefile.am                                |   16 +-
 src/bin/common/signals.h                           |  101 +-
 src/bin/editor/editor.h                            |   12 +
 src/bin/editor/editor_part.c                       |  172 +-
 src/bin/editor/editor_states.c                     |   76 +
 src/bin/project_manager/group_manager.c            |   79 +
 src/bin/project_manager/group_manager.h            |   12 +
 src/bin/project_manager/project_manager.c          |   12 +-
 src/bin/project_manager/project_manager.h          |   22 +-
 src/bin/project_manager/widget_manager.c           | 1060 ------------
 src/bin/project_manager/widget_manager.h           |  574 -------
 src/bin/ui/blocks/ui_block.c                       |  158 --
 src/bin/ui/blocks/ui_block.h                       |  235 ---
 src/bin/ui/blocks/ui_signal_list.c                 |  125 --
 src/bin/ui/blocks/ui_signal_list.h                 |   73 -
 src/bin/ui/blocks/ui_states_list.c                 |  375 -----
 src/bin/ui/blocks/ui_states_list.h                 |   90 -
 src/bin/ui/blocks/ui_widget_list.c                 | 1720 --------------------
 src/bin/ui/blocks/ui_widget_list.h                 |  258 ---
 src/bin/ui/connector.c                             | 1412 ----------------
 src/bin/ui/container/container.c                   |   86 +-
 src/bin/ui/container/container.h                   |   30 -
 src/bin/ui/demo_group.c                            |  236 +++
 .../{editors/colorclass_manager.h => demo_group.h} |   34 +-
 src/bin/ui/dialogs/item_dialog.c                   |  219 ---
 src/bin/ui/dialogs/item_dialog.h                   |   48 -
 src/bin/ui/dialogs/part_dialog.c                   |  254 ---
 src/bin/ui/dialogs/part_dialog.h                   |   50 -
 src/bin/ui/dialogs/style_dialog.c                  |  380 -----
 src/bin/ui/dialogs/style_dialog.h                  |   46 -
 src/bin/ui/editors/colorclass_manager.c            |  100 +-
 src/bin/ui/editors/colorclass_manager.h            |   17 +-
 src/bin/ui/editors/image_editor.c                  |   45 +-
 src/bin/ui/editors/image_editor.h                  |   17 -
 src/bin/ui/editors/sound_editor.c                  |    2 +-
 src/bin/ui/editors/style_editor.c                  |    4 +-
 src/bin/ui/group_navigator.c                       |  399 +++--
 src/bin/ui/group_navigator.h                       |   28 +
 src/bin/ui/live_view/demo.c                        |   12 +-
 .../ui/live_view/elementary/live_actionslider.c    |    6 +-
 src/bin/ui/live_view/elementary/live_bg.c          |    6 +-
 src/bin/ui/live_view/elementary/live_bubble.c      |    6 +-
 src/bin/ui/live_view/elementary/live_button.c      |    6 +-
 src/bin/ui/live_view/elementary/live_calendar.c    |    6 +-
 src/bin/ui/live_view/elementary/live_check.c       |    6 +-
 src/bin/ui/live_view/elementary/live_clock.c       |    6 +-
 .../ui/live_view/elementary/live_colorselector.c   |    6 +-
 src/bin/ui/live_view/elementary/live_ctxpopup.c    |    6 +-
 .../ui/live_view/elementary/live_custom_layout.c   |  141 +-
 src/bin/ui/live_view/elementary/live_datetime.c    |    6 +-
 .../live_view/elementary/live_elementary_widgets.h |    4 +-
 src/bin/ui/live_view/elementary/live_entry.c       |    6 +-
 src/bin/ui/live_view/elementary/live_gengrid.c     |    2 +-
 src/bin/ui/live_view/elementary/live_genlist.c     |    2 +-
 src/bin/ui/live_view/elementary/live_label.c       |    6 +-
 src/bin/ui/live_view/elementary/live_layout.c      |    6 +-
 src/bin/ui/live_view/elementary/live_naviframe.c   |    6 +-
 src/bin/ui/live_view/elementary/live_panel.c       |    6 +-
 src/bin/ui/live_view/elementary/live_panes.c       |    6 +-
 src/bin/ui/live_view/elementary/live_progressbar.c |    6 +-
 src/bin/ui/live_view/elementary/live_separator.c   |    6 +-
 src/bin/ui/live_view/elementary/live_slider.c      |    6 +-
 src/bin/ui/live_view/elementary/live_toolbar.c     |    6 +-
 .../ui/live_view/elementary/live_widget_common.c   |   44 +-
 src/bin/ui/live_view/live_view.c                   |    6 +-
 src/bin/ui/live_view/live_view.h                   |   13 +-
 src/bin/ui/live_view/live_view_prop.c              |    8 +-
 src/bin/ui/live_view/live_view_prop.h              |    8 +-
 src/bin/ui/main_window.c                           |    2 -
 src/bin/ui/main_window.h                           |   88 +-
 src/bin/ui/menu.c                                  |    7 +-
 src/bin/ui/popup.c                                 |    2 +-
 src/bin/ui/project_close.c                         |    4 -
 src/bin/ui/project_export.c                        |    4 +-
 src/bin/ui/property.c                              |  107 +-
 src/bin/ui/property.h                              |    1 -
 src/bin/ui/property_color.c                        |  216 +++
 src/bin/ui/property_demo_swallow.c                 |  281 ++++
 src/bin/ui/property_demo_text.c                    |  140 ++
 src/bin/ui/property_group.c                        |   82 +-
 src/bin/ui/property_group.h                        |   53 -
 src/bin/ui/property_private.h                      |   16 +-
 src/bin/ui/shortcuts/shortcuts.c                   |   58 +-
 src/bin/ui/splash.c                                |    2 +-
 src/bin/ui/tab_home_import_edc.c                   |    4 +-
 src/bin/ui/tab_home_import_edj.c                   |    2 +-
 src/bin/ui/tab_home_info.c                         |    2 +-
 src/bin/ui/tab_home_new.c                          |    2 +-
 src/bin/ui/tab_home_open.c                         |    2 +-
 src/bin/ui/tabs.c                                  |  316 +++-
 src/bin/ui/workspace/groupedit.c                   |   92 +-
 src/bin/ui/workspace/groupedit.h                   |   62 +-
 src/bin/ui/workspace/groupedit_calc.c              |  147 +-
 src/bin/ui/workspace/groupedit_private.h           |   27 +-
 src/bin/ui/workspace/highlight.c                   |    2 +-
 src/bin/ui/workspace/workspace.c                   |  285 ++--
 src/bin/ui/workspace/workspace.h                   |  161 +-
 tests/Makefile.am                                  |   77 +-
 tests/test_animator/animator_window_add_test.c     |    5 +-
 .../colorclass_manager_add.c                       |    7 +-
 tests/test_container/container_confine_set.c       |   79 -
 tests/test_container/container_confine_unset.c     |  118 --
 tests/test_container/test_container.c              |    3 -
 tests/test_container/test_container.h              |    3 -
 tests/test_image_editor/image_editor_file_choose.c |  185 ---
 tests/test_image_editor/test_image_editor.c        |    3 -
 tests/test_image_editor/test_image_editor.h        |    4 -
 tests/test_live_view/live_view_theme_update.c      |   28 +-
 tests/test_live_widget/live_widget_create.c        |    7 +-
 tests/test_project_manager/pm_project_save.c       |   10 +-
 .../pm_style_resource_export.c                     |   12 +-
 tests/test_sound_editor/sound_editor_file_choose.c |    4 +-
 tests/test_ui_main_window/add_callbacks_wd.c       |   79 -
 tests/test_ui_main_window/code_edit_mode_switch.c  |   81 -
 tests/test_ui_main_window/test_ui_main_window.c    |    2 -
 tests/test_ui_main_window/test_ui_main_window.h    |    2 -
 tests/test_ui_signal_list/test_ui_signal_list.c    |   45 -
 tests/test_ui_signal_list/test_ui_signal_list.h    |   31 -
 tests/test_ui_signal_list/ui_signal_list_add.c     |   73 -
 .../test_ui_signal_list/ui_signal_list_data_set.c  |  257 ---
 .../ui_signal_list_data_unset.c                    |  131 --
 tests/test_ui_states_list/test_ui_states_list.c    |   44 -
 tests/test_ui_states_list/test_ui_states_list.h    |   34 -
 tests/test_ui_states_list/ui_states_list_add.c     |   73 -
 .../test_ui_states_list/ui_states_list_data_set.c  |   94 --
 .../ui_states_list_data_unset.c                    |  135 --
 .../test_ui_states_list/ui_states_list_part_get.c  |  142 --
 tests/test_ui_widget_list/test_ui_widget_list.c    |   53 -
 tests/test_ui_widget_list/test_ui_widget_list.h    |   36 -
 tests/test_ui_widget_list/ui_widget_list_add.c     |   71 -
 .../test_ui_widget_list/ui_widget_list_data_set.c  |  250 ---
 .../ui_widget_list_tab_activate.c                  |  115 --
 .../test_ui_widget_list/ui_widget_list_title_set.c |   80 -
 tests/test_ui_workspace/test_ui_workspace.c        |   11 -
 tests/test_ui_workspace/test_ui_workspace.h        |   11 -
 .../test_ui_workspace/workspace_edit_object_get.c  |  135 --
 .../workspace_edit_object_part_above.c             |   93 --
 .../workspace_edit_object_part_add.c               |  158 --
 .../workspace_edit_object_part_below.c             |   95 --
 .../workspace_edit_object_part_del.c               |   98 --
 .../workspace_edit_object_part_item_selected_set.c |  227 ---
 .../workspace_edit_object_part_restack.c           |  150 --
 .../workspace_edit_object_part_state_set.c         |   63 +-
 .../workspace_edit_object_recalc.c                 |    4 +-
 .../workspace_edit_object_visible_set.c            |   94 --
 .../workspace_highlight_align_visible_get.c        |    6 +
 .../workspace_highlight_align_visible_set.c        |    6 +
 .../workspace_object_area_visible_get.c            |    6 +
 .../workspace_object_area_visible_set.c            |    6 +
 .../workspace_separate_mode_get.c                  |    6 +
 .../workspace_separate_mode_set.c                  |    7 +-
 .../test_ui_workspace/workspace_zoom_factor_get.c  |    7 +-
 .../test_ui_workspace/workspace_zoom_factor_set.c  |    8 +-
 tests/test_widget_manager/test_widget_manager.c    |   72 -
 tests/test_widget_manager/test_widget_manager.h    |   60 -
 tests/test_widget_manager/wm_class_add.c           |   80 -
 tests/test_widget_manager/wm_class_free.c          |   74 -
 tests/test_widget_manager/wm_layouts_list_new.c    |   78 -
 .../wm_layouts_list_objects_load.c                 |   81 -
 tests/test_widget_manager/wm_part_add.c            |   86 -
 tests/test_widget_manager/wm_part_by_name_find.c   |  211 ---
 .../wm_part_current_state_set.c                    |  179 --
 tests/test_widget_manager/wm_part_del.c            |   85 -
 tests/test_widget_manager/wm_part_type_get.c       |   96 --
 .../wm_program_signals_list_free.c                 |   88 -
 .../wm_program_signals_list_get.c                  |  152 --
 tests/test_widget_manager/wm_style_add.c           |  110 --
 tests/test_widget_manager/wm_style_copy.c          |  115 --
 tests/test_widget_manager/wm_style_data_reload.c   |   97 --
 tests/test_widget_manager/wm_style_free.c          |  118 --
 tests/test_widget_manager/wm_style_object_find.c   |  130 --
 tests/test_widget_manager/wm_styles_build_alias.c  |  150 --
 tests/test_widget_manager/wm_widget_add.c          |   80 -
 tests/test_widget_manager/wm_widget_free.c         |   73 -
 tests/test_widget_manager/wm_widget_list_free.c    |   70 -
 tests/test_widget_manager/wm_widget_list_new.c     |   77 -
 .../wm_widget_list_objects_load.c                  |   82 -
 179 files changed, 2672 insertions(+), 14467 deletions(-)

-- 


Reply via email to