rimmed pushed a commit to branch master.

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

commit ba9af28f459183a1257c6e48340daa06fae0b3f1
Merge: 7814f03 786ee1a
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Fri Jul 17 17:02:14 2015 +0300

    Merge branch 'master' of internal eflete repo

 data/macros.edc                                    |  105 +-
 data/themes/default/images/control-bg-disabled.png |  Bin 0 -> 2925 bytes
 data/themes/default/images/control-bg.png          |  Bin 0 -> 2849 bytes
 data/themes/default/images/control-focus.png       |  Bin 0 -> 1124 bytes
 data/themes/default/images/control-shadow.png      |  Bin 0 -> 2921 bytes
 data/themes/default/images/cursor.png              |  Bin 0 -> 2857 bytes
 data/themes/default/images/scroll-bar.png          |  Bin 186 -> 141 bytes
 data/themes/default/widgets/button.edc             |  268 +---
 data/themes/default/widgets/entry.edc              | 1441 +++++++++++--------
 data/themes/default/widgets/genlist.edc            |  428 +++---
 data/themes/default/widgets/layout.edc             | 1449 +++++++++++++-------
 data/themes/default/widgets/layouts/property.edc   |   41 +-
 data/themes/default/widgets/scroller.edc           |  496 +++++--
 data/themes/default/widgets/styles.edc             |   26 +-
 data/themes/default/widgets/toolbar.edc            |    4 +-
 src/bin/common/widget_macro.h                      |    2 -
 src/bin/config/config.c                            |   24 +-
 src/bin/config/config.h                            |    1 -
 src/bin/eflete.c                                   |   27 +-
 src/bin/eflete.h                                   |    3 +-
 src/bin/history/history.c                          |  101 +-
 src/bin/history/history_attribute.c                |  285 ++--
 src/bin/history/history_part.c                     |   50 +-
 src/bin/history/history_state.c                    |   51 +-
 src/bin/history/history_ui.c                       |   22 +-
 src/bin/project_manager/project_manager.c          |  129 +-
 src/bin/project_manager/project_manager.h          |    3 +
 src/bin/project_manager/widget_manager.c           |  185 ++-
 src/bin/project_manager/widget_manager.h           |   23 +
 src/bin/ui/blocks/property_macros.h                |  248 ++--
 src/bin/ui/blocks/ui_block.c                       |   52 +-
 src/bin/ui/blocks/ui_property.c                    |  245 +++-
 src/bin/ui/blocks/ui_signal_list.c                 |    9 +-
 src/bin/ui/blocks/ui_states_list.c                 |   29 +-
 src/bin/ui/blocks/ui_widget_list.c                 |  340 ++++-
 src/bin/ui/connector.c                             |  399 ++++--
 src/bin/ui/container/container.c                   |   87 +-
 src/bin/ui/cursor.c                                |   37 +-
 src/bin/ui/dialogs/about_window.c                  |    8 +
 src/bin/ui/dialogs/colorsel.c                      |   23 +-
 src/bin/ui/dialogs/item_dialog.c                   |   22 +-
 src/bin/ui/dialogs/part_dialog.c                   |   18 +-
 src/bin/ui/dialogs/state_dialog.c                  |   37 +-
 src/bin/ui/dialogs/style_dialog.c                  |   21 +-
 src/bin/ui/editors/animator.c                      |   60 +-
 src/bin/ui/editors/animator_program_editor.c       |  162 ++-
 src/bin/ui/editors/animator_program_sequence.c     |   74 +-
 src/bin/ui/editors/colorclass_manager.c            |   74 +-
 src/bin/ui/editors/image_editor.c                  |  144 +-
 src/bin/ui/editors/sound_editor.c                  |  160 ++-
 src/bin/ui/editors/style_editor.c                  |  124 +-
 .../ui/live_view/elementary/live_actionslider.c    |    3 +
 src/bin/ui/live_view/elementary/live_bg.c          |    3 +
 src/bin/ui/live_view/elementary/live_bubble.c      |    5 +
 src/bin/ui/live_view/elementary/live_button.c      |    3 +
 src/bin/ui/live_view/elementary/live_calendar.c    |    3 +
 src/bin/ui/live_view/elementary/live_check.c       |    3 +
 src/bin/ui/live_view/elementary/live_clock.c       |    3 +
 .../ui/live_view/elementary/live_colorselector.c   |    3 +
 src/bin/ui/live_view/elementary/live_ctxpopup.c    |   10 +
 .../ui/live_view/elementary/live_custom_layout.c   |   17 +
 src/bin/ui/live_view/elementary/live_datetime.c    |    3 +
 src/bin/ui/live_view/elementary/live_entry.c       |    5 +
 src/bin/ui/live_view/elementary/live_frame.c       |   15 +
 src/bin/ui/live_view/elementary/live_gengrid.c     |   22 +-
 src/bin/ui/live_view/elementary/live_genlist.c     |   26 +-
 src/bin/ui/live_view/elementary/live_label.c       |    3 +
 src/bin/ui/live_view/elementary/live_layout.c      |    3 +
 src/bin/ui/live_view/elementary/live_list.c        |   15 +
 src/bin/ui/live_view/elementary/live_map.c         |    3 +
 .../live_view/elementary/live_multibuttonentry.c   |   15 +
 src/bin/ui/live_view/elementary/live_naviframe.c   |   25 +-
 src/bin/ui/live_view/elementary/live_notify.c      |   25 +-
 src/bin/ui/live_view/elementary/live_panel.c       |    5 +
 src/bin/ui/live_view/elementary/live_panes.c       |    5 +
 src/bin/ui/live_view/elementary/live_popup.c       |    6 +
 src/bin/ui/live_view/elementary/live_progressbar.c |    3 +
 src/bin/ui/live_view/elementary/live_radio.c       |   15 +
 src/bin/ui/live_view/elementary/live_scroller.c    |    6 +
 .../ui/live_view/elementary/live_segment_control.c |   12 +
 src/bin/ui/live_view/elementary/live_separator.c   |    3 +
 src/bin/ui/live_view/elementary/live_slider.c      |    3 +
 src/bin/ui/live_view/elementary/live_spinner.c     |    3 +
 src/bin/ui/live_view/elementary/live_toolbar.c     |    7 +
 .../ui/live_view/elementary/live_widget_common.c   |   15 +-
 src/bin/ui/live_view/live_prog_edit.c              |   13 +
 src/bin/ui/live_view/live_view.c                   |   42 +-
 src/bin/ui/live_view/live_view_prop.c              |   43 +-
 src/bin/ui/live_view/live_widget.c                 |   19 +-
 src/bin/ui/main_window.c                           |   31 +-
 src/bin/ui/menu.c                                  |   32 +-
 src/bin/ui/modal_window/modal_window.c             |   45 +-
 src/bin/ui/notification/notify.c                   |   17 +-
 src/bin/ui/panes.c                                 |   30 +-
 src/bin/ui/shortcuts/shortcuts.c                   |  115 +-
 src/bin/ui/shortcuts/shortcuts.h                   |   24 -
 src/bin/ui/splash.c                                |    4 +
 src/bin/ui/wizard/wizard_common.c                  |   48 +-
 src/bin/ui/wizard/wizard_common.h                  |    5 +-
 src/bin/ui/wizard/wizard_import_edc.c              |   57 +-
 src/bin/ui/wizard/wizard_import_edj.c              |    6 +-
 src/bin/ui/workspace/groupedit.c                   |  186 ++-
 src/bin/ui/workspace/groupedit_box_layouts.c       |   67 +
 src/bin/ui/workspace/groupedit_calc.c              |  226 ++-
 src/bin/ui/workspace/groupedit_private.h           |   16 +-
 src/bin/ui/workspace/highlight.c                   |   78 +-
 src/bin/ui/workspace/ui_workspace.c                |  301 ++--
 src/lib/Ewe.h                                      |    1 -
 src/lib/Makefile.am                                |   10 +-
 src/lib/ewe_combobox.c                             |    3 +-
 src/lib/ewe_win.c                                  |   50 -
 src/lib/ewe_win.eo                                 |    8 -
 src/lib/ewe_win.h                                  |   40 -
 src/lib/ewe_win_legacy.h                           |   67 -
 tests/Makefile.am                                  |    4 +-
 tests/edj_build/Makefile.am                        |    1 +
 tests/test_about_window/about_window_add.c         |   27 -
 tests/test_about_window/test_about_window.c        |    1 -
 tests/test_about_window/test_about_window.h        |    1 -
 .../colorclass_manager_add.c                       |   29 -
 .../test_colorclass_manager.c                      |    1 -
 .../test_colorclass_manager.h                      |    1 -
 tests/test_shortcuts/shortcuts_init.c              |   64 -
 tests/test_shortcuts/shortcuts_main_add.c          |  148 --
 tests/test_shortcuts/shortcuts_main_del.c          |  148 --
 tests/test_shortcuts/shortcuts_profile_load.c      |   80 --
 tests/test_shortcuts/shortcuts_shutdown.c          |   96 --
 tests/test_shortcuts/test_shortcuts.c              |   15 -
 tests/test_shortcuts/test_shortcuts.h              |   15 -
 tests/test_ui_states_list/test_ui_states_list.c    |   12 -
 tests/test_ui_states_list/test_ui_states_list.h    |   12 -
 tests/test_ui_states_list/ui_states_list_add.c     |   30 -
 .../test_ui_states_list/ui_states_list_data_set.c  |  242 ----
 .../ui_states_list_data_unset.c                    |   32 +-
 .../test_ui_states_list/ui_states_list_part_get.c  |   34 -
 .../ui_states_list_selected_state_del.c            |   31 -
 .../ui_states_list_selected_state_get.c            |   30 -
 .../test_ui_states_list/ui_states_list_state_add.c |   99 +-
 138 files changed, 6170 insertions(+), 4400 deletions(-)

-- 


Reply via email to