rimmed pushed a commit to branch master.

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

commit 55436d29818e5769fee53a3cac4cb44219abf60e
Merge: a00e801 3c59c66
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date:   Wed Jan 13 16:50:00 2016 +0200

    Merge branch 'master' from internal eflete repo

 data/images/___eflete_dummy_image___.png           | Bin 0 -> 165 bytes
 data/themes/default/widgets/check.edc              |  62 ++-
 data/themes/default/widgets/entry.edc              |  13 +-
 data/themes/default/widgets/genlist.edc            |  28 ++
 data/themes/default/widgets/panes.edc              |   8 +-
 data/themes/default/widgets/styles.edc             |   8 +
 src/bin/Makefile.am                                |   1 +
 src/bin/common/signals.h                           |  32 ++
 src/bin/common/string_common.c                     |  12 +
 src/bin/common/string_common.h                     |   4 +
 src/bin/editor/banned_edje_edit_api.h              |   6 +-
 src/bin/editor/default.c                           |  59 ++-
 src/bin/editor/default.h                           |  51 ++
 src/bin/editor/diff.c                              |  48 ++
 src/bin/editor/diff.h                              |  20 +
 src/bin/editor/editor.h                            | 133 +++++
 src/bin/editor/editor_macro.h                      |  66 +++
 src/bin/editor/editor_part.c                       |   4 +-
 src/bin/editor/editor_program.c                    | 550 +++++++++++++++++++++
 src/bin/editor/editor_states.c                     |  21 +-
 src/bin/eflete.h                                   |   1 +
 src/bin/project_manager/project_manager.c          | 349 +++++++++++--
 src/bin/project_manager/project_manager.h          |  45 +-
 src/bin/ui/container/container.c                   |   2 +
 src/bin/ui/demo_group.c                            |  85 +++-
 src/bin/ui/demo_group.h                            |  14 +
 src/bin/ui/editors/image_editor.c                  |   4 +
 src/bin/ui/editors/style_editor.c                  |   2 +-
 src/bin/ui/group_navigator.c                       | 357 ++++++++-----
 .../live_view/elementary/live_elementary_widgets.h |  11 +
 src/bin/ui/live_view/elementary/live_frame.c       |  85 +++-
 src/bin/ui/live_view/elementary/live_gengrid.c     |  96 +++-
 src/bin/ui/live_view/elementary/live_genlist.c     | 104 ++--
 src/bin/ui/live_view/elementary/live_list.c        |  78 ++-
 .../live_view/elementary/live_multibuttonentry.c   |  88 +++-
 src/bin/ui/live_view/elementary/live_radio.c       |  77 ++-
 src/bin/ui/live_view/elementary/live_scroller.c    |  73 ++-
 .../ui/live_view/elementary/live_segment_control.c |  81 ++-
 src/bin/ui/live_view/elementary/live_spinner.c     |   6 +-
 .../ui/live_view/elementary/live_widget_common.c   | 116 ++---
 src/bin/ui/main_window.h                           |   8 +
 src/bin/ui/menu.c                                  |  11 +-
 src/bin/ui/popup.c                                 |   4 +
 src/bin/ui/project_export.c                        | 107 ++++
 src/bin/ui/project_navigator.c                     |   2 +-
 src/bin/ui/property_group.c                        | 206 +++++++-
 src/bin/ui/property_macros.h                       |  34 ++
 src/bin/ui/tab_home_import_edc.c                   |   4 +-
 src/bin/ui/tab_home_import_edj.c                   |   3 +-
 src/bin/ui/tabs.c                                  |  18 -
 src/bin/ui/workspace/groupedit.c                   |   3 -
 src/bin/ui/workspace/groupedit_calc.c              |   7 +-
 src/bin/ui/workspace/workspace.c                   |  84 ++--
 53 files changed, 2751 insertions(+), 540 deletions(-)

-- 


Reply via email to