rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=14fb5eb2ee585e449bf4eab617f03b20b8f445b4
commit 14fb5eb2ee585e449bf4eab617f03b20b8f445b4
Merge: eb3c755 3530f9a
Author: Vyacheslav Reutskiy <v.reuts...@samsung.com>
Date: Thu Jul 2 16:07:41 2015 +0300
Merge branch 'devs/rimmed/develop'
NEWS | 37 +-
README | 4 +-
configure.ac | 3 +-
data/Makefile.am | 10 -
data/layouts/edje/colorclass_editor.edc | 80 -
data/layouts/eflete.edc | 1 -
data/macros.edc | 13 +
data/resources/images/bg_demo.png | Bin 136 -> 0 bytes
data/resources/images/border_part.png | Bin 198 -> 0 bytes
data/resources/images/eye_close.png | Bin 4330 -> 0 bytes
data/resources/images/eye_open.png | Bin 4406 -> 0 bytes
data/resources/images/gallery-bg.png | Bin 193 -> 0 bytes
data/resources/images/icon-add.png | Bin 157 -> 0 bytes
data/resources/images/icon-back.png | Bin 191 -> 0 bytes
data/resources/images/icon-notification.png | Bin 586 -> 0 bytes
data/resources/images/icon-remove.png | Bin 143 -> 0 bytes
data/resources/images/icon-search.png | Bin 695 -> 0 bytes
data/resources/images/icon-slidedown.png | Bin 150 -> 0 bytes
data/resources/images/icon-slideup.png | Bin 154 -> 0 bytes
data/resources/images/icon_next.png | Bin 3232 -> 0 bytes
data/resources/images/icon_pause.png | Bin 2168 -> 0 bytes
data/resources/images/icon_play.png | Bin 2134 -> 0 bytes
data/resources/images/icon_prev.png | Bin 3212 -> 0 bytes
data/resources/images/mw_button_close.png | Bin 452 -> 0 bytes
data/resources/images/mw_button_info.png | Bin 844 -> 0 bytes
data/resources/images/no_image_warning.png | Bin 2206 -> 0 bytes
data/resources/images/section-item-bg.png | Bin 118 -> 0 bytes
data/resources/images/sound.png | Bin 11307 -> 0 bytes
data/resources/resources.edc | 88 -
data/themes/default/default.edc | 2 +
.../default}/images/animator_arrow_left.png | Bin
.../default}/images/animator_arrow_right.png | Bin
.../default/images/attention.png} | Bin 2893 -> 3670 bytes
data/themes/default/images/bevel_in.png | Bin 0 -> 107 bytes
.../default/images/bg_box.png} | Bin
data/themes/default/images/bg_demo.png | Bin 0 -> 115 bytes
.../default/images/bg_group.png} | Bin
.../default/images/bg_part_item.png} | Bin
.../default/images/bg_proxy.png} | Bin
.../default/images/bg_spacer.png} | Bin
.../default/images/bg_swallow.png} | Bin
.../default/images/bg_table.png} | Bin
.../default/images/border_2.png} | Bin
data/themes/default/images/color-background-3.png | Bin 0 -> 287 bytes
data/themes/default/images/color-sight.png | Bin 0 -> 525 bytes
data/themes/default/images/color_focus.png | Bin 0 -> 783 bytes
.../default/images/icon-alias_link.png} | Bin
.../default}/images/icon-box.png | Bin
.../default}/images/icon-external.png | Bin
.../default}/images/icon-group.png | Bin
.../default}/images/icon-image.png | Bin
.../default}/images/icon-proxy.png | Bin
.../default}/images/icon-rectangle.png | Bin
.../default}/images/icon-separate.png | Bin
.../default}/images/icon-spacer.png | Bin
.../default}/images/icon-swallow.png | Bin
.../default}/images/icon-table.png | Bin
.../default}/images/icon-text.png | Bin
.../default}/images/icon-textblock.png | Bin
.../default}/images/icon_align.png | Bin
data/themes/default/images/icon_arrow_down.png | Bin 352 -> 403 bytes
data/themes/default/images/icon_arrow_left.png | Bin 422 -> 416 bytes
data/themes/default/images/icon_arrow_right.png | Bin 398 -> 401 bytes
data/themes/default/images/icon_arrow_up.png | Bin 307 -> 396 bytes
.../default}/images/icon_end-point.png | Bin
data/themes/default/images/icon_minus.png | Bin 180 -> 194 bytes
.../default}/images/icon_offset.png | Bin
data/themes/default/images/icon_plus.png | Bin 243 -> 271 bytes
.../default}/images/icon_start-point.png | Bin
data/themes/default/images/inset_shadow.png | Bin 0 -> 247 bytes
.../default/images/preview-bg-black.png} | Bin
.../default/images/preview-bg-tile.png} | Bin
.../default/images/preview-bg-white.png} | Bin
data/themes/default/images/ring_shadow.png | Bin 0 -> 635 bytes
.../themes/default/images/ring_white_blue_glow.png | Bin 0 -> 1396 bytes
data/themes/default/images/ring_white_middle.png | Bin 0 -> 365 bytes
data/themes/default/widgets/button.edc | 364 +---
data/themes/default/widgets/check.edc | 209 +-
data/themes/default/widgets/colorselector.edc | 945 ++++++++
data/themes/default/widgets/frame.edc | 1 +
data/themes/default/widgets/gengrid.edc | 459 +---
data/themes/default/widgets/genlist.edc | 849 +++-----
data/themes/default/widgets/icon.edc | 1 +
data/themes/default/widgets/image.edc | 74 +-
data/themes/default/widgets/layout.edc | 182 +-
.../default/widgets/layouts/colorclass_manager.edc | 423 ++++
data/themes/default/widgets/layouts/live_view.edc | 8 +-
data/themes/default/widgets/menu.edc | 4 +-
data/themes/default/widgets/naviframe.edc | 432 ++--
data/themes/default/widgets/toolbar.edc | 450 ++--
data/themes/default/widgets/win.edc | 61 +
.../ewe/widgets/images/cursor-position-hor.png} | Bin 2893 -> 3097 bytes
.../ewe/widgets/images/cursor-position-ver.png} | Bin 2872 -> 3079 bytes
.../ewe/widgets/images/ruler_hor_pointer.png | Bin 571 -> 0 bytes
.../ewe/widgets/images/ruler_ver_pointer.png | Bin 542 -> 0 bytes
data/themes/ewe/widgets/ruler.edc | 13 +-
po/POTFILES.in | 2 +-
po/uk.po | 2296 +++++++++++---------
src/bin/Makefile.am | 2 +-
src/bin/common/common_macro.h | 14 +
src/bin/common/widget_macro.h | 14 +-
src/bin/history/history.c | 2 +-
src/bin/project_manager/project_manager.c | 37 +-
src/bin/project_manager/project_manager.h | 1 +
src/bin/ui/blocks/property_macros.h | 2 +-
src/bin/ui/blocks/ui_property.c | 47 +-
src/bin/ui/blocks/ui_signal_list.c | 22 +-
src/bin/ui/blocks/ui_widget_list.c | 181 +-
src/bin/ui/connector.c | 35 +-
src/bin/ui/editors/animator.c | 8 +-
src/bin/ui/editors/colorclass_editor.c | 654 ------
src/bin/ui/editors/colorclass_manager.c | 737 +++++++
.../{colorclass_editor.h => colorclass_manager.h} | 14 +-
src/bin/ui/editors/image_editor.c | 142 +-
src/bin/ui/editors/sound_editor.c | 36 +-
src/bin/ui/editors/style_editor.c | 18 +-
.../ui/live_view/elementary/live_custom_layout.c | 11 +
src/bin/ui/live_view/live_prog_edit.c | 23 +-
src/bin/ui/live_view/live_view.c | 5 +-
src/bin/ui/live_view/live_view_prop.c | 35 +-
src/bin/ui/main_window.h | 2 +-
src/bin/ui/menu.c | 2 +-
src/bin/ui/modal_window/modal_window.c | 2 +-
src/bin/ui/shortcuts/shortcuts.c | 6 +-
src/bin/ui/wizard/wizard_import_edc.c | 1 +
src/bin/ui/workspace/groupedit.c | 4 +-
src/bin/ui/workspace/groupedit_calc.c | 67 +-
src/bin/ui/workspace/groupedit_private.h | 10 -
src/bin/ui/workspace/ui_workspace.c | 4 +-
tests/Makefile.am | 13 +-
tests/edj_build/Makefile.am | 2 +-
.../colorclass_manager_add.c} | 38 +-
.../test_colorclass_manager.c} | 10 +-
.../test_colorclass_manager.h} | 8 +-
tests/test_cursor/cursor_main_get.c | 29 -
tests/test_cursor/test_cursor.h | 1 -
tests/test_history/history_diff_add.c | 57 -
tests/test_history/history_redo.c | 3 +-
tests/test_history/test_history.c | 1 -
tests/test_history/test_history.h | 1 -
tests/test_sound_editor/sound_editor_window_add.c | 14 -
tests/test_ui_main_window/test_ui_main_window.c | 4 -
tests/test_ui_main_window/test_ui_main_window.h | 4 -
tests/test_ui_main_window/ui_style_clicked.c | 246 ---
.../test_ui_state_dialog/state_dialog_state_add.c | 63 -
.../test_ui_state_dialog/state_dialog_state_del.c | 68 -
tests/test_ui_state_dialog/test_ui_state_dialog.c | 2 -
tests/test_ui_state_dialog/test_ui_state_dialog.h | 2 -
.../test_ui_states_list/ui_states_list_data_set.c | 2 +-
tests/test_widget_manager/wm_styles_build_alias.c | 78 -
150 files changed, 4763 insertions(+), 5032 deletions(-)
--
