Compare commits

...

1349 Commits

Author SHA1 Message Date
maxerba ea3c9f371f Updating french translation 2021-12-05 14:10:41 +01:00
maxerba db18424b10 Update pot and it.po files 2021-12-05 12:05:13 +01:00
maxerba 25f15ff99a Fix localization targets currently unable to find libintl as done in the enlightenment package 2021-12-05 12:02:51 +01:00
Vincent Torri f1f92e6abb Build: add meson build system
Test Plan: Compilation, comparison with autotools, and run of enventor (on Windows)

Reviewers: Hermet, raster

Differential Revision: https://phab.enlightenment.org/D12304
2021-11-04 16:47:57 +09:00
Hermet Park 2f2bf09b1a one more missing replacement... 2021-11-04 16:34:00 +09:00
Hermet Park b15117a527 replaced with the compatible focus apis.
ex-apis are not defined anymore.
2021-11-04 16:27:57 +09:00
Vincent Torri 2f8b1063b4 NLS: on Windows, we need to include libintl.h so that NLS functions and macros are declared
Test Plan: compilation

Reviewers: Hermet, raster

Differential Revision: https://phab.enlightenment.org/D12301
2021-11-04 16:07:40 +09:00
Vincent Torri 1d4957aa8b Remove unused __UNUSED__ (!) as EINA_UNUSED is used instead
Reviewers: Hermet, raster

Differential Revision: https://phab.enlightenment.org/D12300
2021-11-04 16:03:36 +09:00
Vincent Torri 31aab8115b build: fix compilation on Windows, and fix EAPI on UNIX 2021-10-25 17:45:27 +09:00
maxerba 7e632b42d2 updating french and italian translations 2021-05-22 11:51:08 +02:00
Vincent Torri 82754a3419 fix function declaration
Test Plan: compilation

Reviewers: raster, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D12233
2021-02-01 11:19:12 +00:00
Vincent Torri 5712432988 fix some errors when using future meson build system
Test Plan: compilation

Reviewers: raster, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D12232
2021-02-01 11:19:00 +00:00
Vincent Torri cca2d207e6 fix warnings and a missing include
Summary: C functions without parameter should have void. missing inclusion of locale.h for localeconv()

Test Plan: compilation

Reviewers: raster, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D12231
2021-02-01 11:18:51 +00:00
Vincent Torri bfdf844546 Enventor.h.in is useless, there is no substitution. Just use Eventor.h
Test Plan: compilation

Reviewers: raster, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D12230
2021-02-01 11:18:39 +00:00
maxerba f5857dd9d2 Adding french translation 2020-03-29 10:28:13 +02:00
Vincent Torri 724cd0d040 use eina_strndup() instead of the GNU extension strndup(). Fix also a warning with CreateFile() 2019-09-04 16:17:48 +09:00
Hermet Park 2832e31975 templates: + versioning for textblock compatibility 2019-08-26 14:57:34 +09:00
Hermet Park 6e01540e31 edc_editor: fix the broken sub file editor if open a new file.
This is a regression bug that introduced the recent removed eolian usage.
2019-08-19 18:11:26 +09:00
Hermet Park 0d1a9621f6 edc_editor: ++safety
don't access null pointer.
2019-08-19 18:11:19 +09:00
Hermet Park 514708d908 get rid of unstable eolian usage - 3,
Now it works, yet has some issues.
2019-08-18 03:08:50 +09:00
Hermet Park 5c52175885 get rid of unstable eolian usage - 2,
Now it's buildable but still not working properly.
2019-08-18 03:07:31 +09:00
Hermet Park 395f127fcd get rid of unstable eolian usage.
a step to make it stable back.
2019-08-18 03:07:26 +09:00
Hermet Park f02fb1e572 remove unnecessary files 2019-08-18 03:07:21 +09:00
Hermet Park c4e1cab2c0 enventor: return error properly when failed open a file. 2019-02-28 14:07:58 +09:00
Hermet Park 08a9678c1b edc_editor: fix compile warnings.
rearrange data size to avoid possible data overflow.
2019-02-28 13:45:09 +09:00
Hermet Park 230d2f8ada templates: remove white-trailings. 2019-02-28 13:38:48 +09:00
Hermet Park 42dec185fa edc_editor: polishing code.
put EINA_UNUSED flags for unused parameters.
2019-02-28 13:28:49 +09:00
Hermet Park 60e51fccbe edc_editor: don't access the danling edit object. 2019-02-28 13:26:59 +09:00
Hermet Park 5e87363560 fix build breaks.
Now it's compilable again.
2019-02-28 13:17:26 +09:00
Hermet Park b60ac86c71 fix another build issue. 2018-05-25 16:03:25 +09:00
Hermet Park 7fc50a5eab fix build errors.
Still it has some abi issues. Need to fix them all.
2018-05-25 14:24:30 +09:00
Hermet Park e5f8e3a6a6 enventor_smart: correct indentation. 2018-03-22 17:31:07 +09:00
Hermet Park 983d018642 fix compile errors.
It haven't been managed long time. Make it buildable, first of all, Revenant Enventor.

Still it has some abi issues. Need to fix them all.
2018-03-22 17:15:04 +09:00
Jaehyun Cho e98cd391e6 enventor_object: Fix compile error 2018-01-29 11:34:41 +09:00
YeongJong Lee 973440ef04 edc_editor: Fix the linenumber scrolling
Summary:
Editor line number is scrollable horizontally
This patch fix the line number scrolling

ref T4276

Test Plan:
1. Open enventor
2. Scroll the scrollerbar horizontally in edc_editor
3. check that the line number entry is fixed

Reviewers: Jaehyun_Cho

Maniphest Tasks: T4276

Differential Revision: https://phab.enlightenment.org/D4901
2017-11-30 22:40:14 +09:00
Hermet Park 76f437e8ba updated AUTHORS 2017-11-24 20:52:11 +08:00
Jaehyun Cho bb012c843e Revert "edc_editor: Prevent auto-scrolling by scroller"
This reverts commit b13596ac2c.

The auto-scroll issue has been fixed by efl update without this patch.
2017-11-24 10:23:12 +09:00
Hermet Park 3c1bb2c3af update authors email. 2017-10-14 22:54:27 +08:00
Mykyta Biliavskyi 900330174a Build: apply changes for eo syntax and gfx api.
Due to changes in EO syntax and efl_gfx_* api signature change build was
failed.
2017-09-27 13:25:26 +03:00
YeongJong Lee b13596ac2c edc_editor: Prevent auto-scrolling by scroller
Summary:
scroller had auto-scroll properties.
In detail, when the content of scroller have focus, the scroller scroll top-left
position of the content.

But enventor does not want to auto-scroll.
This prevent it.

Ref : 44e40c7c5e4549e78008eb7b74b6ab1b7e1fcf9d

Test Plan:
1. Open enventor basic template
2. Scroll down
3. click edc_editor

Reviewers: Jaehyun_Cho, cedric

Reviewed By: cedric

Subscribers: jpeg, cedric

Differential Revision: https://phab.enlightenment.org/D4930
2017-07-10 20:33:34 +09:00
YeongJong Lee 8b55d776da redoundo: fix abnormal behavior of smart redoundo
Summary:
1. When delete text
2. When add some separated text on the same line ex) aaaa -> abbaacca
,the smart redoundo is broken

This fixes that bugs

Test Plan:
1. turn on smart redo / undo option
1. add / delete text
2. check that smart redoundo works correctly

Reviewers: Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4880
2017-05-23 10:14:19 +09:00
Jaehyun Cho eb50a89b06 enventor_smart: Fix to not use group_add/group_del functions
group_add and group_del have become evas internal functions according to
the efl commit 55b529cebc113dd66906ce39034299df97a2a2ed.
Therefore, codes inside group_add and group_del move to constructor and
destructor.
2017-05-22 14:38:57 +09:00
Jaehyun Cho 287496b077 text_setting: Fix to set font style by default
Previously, font style was not selected automatically when font name is
selected.
Now, the first font style is selected automatically when font name is
selected.
2017-04-17 17:40:25 +09:00
Jaehyun Cho f911b6067b build: Support edc in path containing space character
Previously, if edc file is located in a path containing space character,
then, edje_cc did not work.

Now, to resolve the above issue, edc file path is treated with double
quotation marks.
2017-03-07 16:37:56 +09:00
Jaehyun Cho e3df617192 search: Fix to move search position in forward search
Previously, if the searched word was located position 0, then the first
search worked but the next search did not work. Because the search
position was still 0.

Now, the search position moves to the end of the searched word if the
search type is forward.
2017-03-02 10:14:24 +09:00
Jaehyun Cho 3ee3c69707 text_setting: Fix to apply font style to text in text setting
Previously, if a font style was selected and then re-open text setting,
the selected font style was not applied to example text in text setting.

Now, the selected font style is applied to example text when text
setting is re-opened.
2017-02-24 17:09:45 +09:00
YeongJong Lee a8a14566c7 refactor key event method
Summary: The key event work well now.

Test Plan:
1. Run enventor
2. Test the shortcut key that use modifiers(<Ctrl>, <Alt>)
3. Check the shortcut work correctly

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Maniphest Tasks: T5146

Differential Revision: https://phab.enlightenment.org/D4620
2017-02-22 15:57:17 +09:00
YeongJong Lee 324454b3cb goto: fix scroll issue
Summary:
Add scroller_region_show method.

fix https://phab.enlightenment.org/T4416

Test Plan:
1. Run enventor
2. Open goto window using shortcut key(<Ctrl> + <l>)
3. type line number
4. check the scroller scroll correctly

Reviewers: Jaehyun_Cho, Hermet

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4619
2017-02-02 10:44:01 +09:00
Amitesh Singh 19380a570d fix compilation with efl master.
This fixes following compilation errors
enventor_object.eo:216:7: class 'Efl.Gfx.visible' not found within the
inheritance tree of 'Enventor.Object'

Signed-off-by: Amitesh Singh <amitesh.sh@samsung.com>
2017-01-11 11:07:55 +05:30
Jaehyun Cho cbd28d7fab preference_setting: Modify description for auto indentation.
The short cut key for auto indentation was deleted.
So the description for auto indentation has been modified.
2016-12-01 20:53:58 +09:00
Jaehyun Cho 15fd8149b4 enventor_smart: Fix crash when focused item does not exist. 2016-12-01 20:25:55 +09:00
YeongJong Lee d9cbfba323 edc_navigator: Add dragable bar for edc_navigator
Summary:
edc_navigator can be resized. in order to prevent collision
between edc_navigator and file_browser, limit the size to half each other.

Test Plan:
1. Run enventor
2-1. Drag the bar between text editor and edc_navigator
2-2. Toggle edc_navigator using key F10
3. Check edc_navigator size is saved after restart envertor

Reviewers: Jaehyun_Cho, Hermet

Differential Revision: https://phab.enlightenment.org/D4439
2016-11-30 13:25:56 +09:00
YeongJong Lee c13134d609 file_browser: Add dragable bar for file_browser
Summary: file_browser can be resized.

Test Plan:
1. Run enventor
2-1. Drag the bar between file_browser and live view
2-2. Toggle file_browser using key F9
3. Check file_browser size is saved after restart envertor

Reviewers: Jaehyun_Cho, Hermet

Differential Revision: https://phab.enlightenment.org/D4431
2016-11-29 12:51:29 +09:00
Jaehyun Cho d796f89805 edc_editor: Fix not to append candidate slider values after error code.
When error code is saved, cursor moves to the error code.

This cursor position change causes that candidate slider values are
appended after error code because cursor position moved to error code.
This patch restores cursor position to candidate keyword.

As a result, candidate slider values are always appended after candidate
keyword.
2016-11-25 16:02:17 +09:00
Jaehyun Cho 2a8448e726 Revert "autocomp: Add time with "LINEAR" to "transition"."
This reverts commit 7be5b79c17.
2016-11-24 19:04:55 +09:00
Jaehyun Cho 7be5b79c17 autocomp: Add time with "LINEAR" to "transition". 2016-11-23 21:16:59 +09:00
Jaehyun Cho 18bb73f161 edc_parser: Append different string to each candidate list. 2016-11-23 20:50:15 +09:00
Jaehyun Cho c4d60f326a syntax_indent: Insert spaces by tab key.
Previously, tab key causes that both spaces for indent and spaces for
tab are inserted.
Now, tab key causes that either spaces for indent or spaces for tab are
inserted.

If paragraph is shorter than spaces for indent then only spaces for
indent are inserted. Otherwise, only spaces for tab are inserted.
2016-11-23 16:55:56 +09:00
Jaehyun Cho 468e29f331 reference: Add keyword domain. 2016-11-22 17:11:31 +09:00
Jaehyun Cho 457b603cfe reference: Add external keyword. 2016-11-22 17:01:27 +09:00
Jaehyun Cho c1be183c93 template: Move programs block of Watchface2 correctly. 2016-11-22 14:09:21 +09:00
Jaehyun Cho 0a74589393 reference: Add a space between words. 2016-11-22 13:44:35 +09:00
Hermet Park 490377f67c update AUTHORS. 2016-11-21 13:15:05 +09:00
YeongJong Lee 0c47afc9a8 tools: Make tool tabs scrollable
Summary: when some menu is hidden, it's scrollable.

Test Plan:
1. run enventor
2. reduce enventor window size
3. scroll tool tabs

Reviewers: Jaehyun_Cho, Hermet

Differential Revision: https://phab.enlightenment.org/D4418
2016-11-21 11:41:20 +09:00
Hermet Park fc6f5d8d24 templates: apply lazy edc
scale: 1 -> scale;
2016-11-11 14:23:24 +09:00
Hermet Park 25bf63e377 fix eo break.
updated changed eo usage.
2016-11-11 14:20:56 +09:00
Jaehyun Cho 851bdbfdb2 Update help description for "Ctrl+Double Click". 2016-11-02 11:44:24 +09:00
Jaehyun Cho a9d4c4a472 Revert "Remove unnecessary shortcut key."
This reverts commit 8de5b07488.
2016-11-02 11:41:12 +09:00
Jaehyun Cho 56b7cfa627 Fix typos in help (shortcut and history).
Fix typos as follows.
Defaut -> Default
complation -> compilation
dummpy -> dummy
2016-10-31 13:19:00 +09:00
Jaehyun Cho 62dc189286 Fix typo in Enventor introduction.
Correct typo to "easier" in Enventor introduction.
2016-10-26 13:01:58 +09:00
Jaehyun Cho 20237248d6 preference_setting: Fix typo. 2016-10-24 14:41:29 +09:00
Jaehyun Cho 8de5b07488 Remove unnecessary shortcut key. 2016-10-24 14:31:02 +09:00
Jaehyun Cho af4a2e276b Fix eo compilation.
This commit fixes 5dad0ee304
2016-10-19 18:38:54 +09:00
Jaehyun Cho 5dad0ee304 Fix eo compilation.
This commit applies the following efl commits.

evas: Mark group_add/del as internal
evas/elm: Remove function group_move
evas/elm: Remove function group_move
evas/elm: Remove group_show and group_hide
evas: Move clip_unset to legacy, remove group_clip
2016-10-19 18:21:25 +09:00
Jaehyun Cho e69df46f52 setting: Remove redundant tooltip description for "Status". 2016-10-17 21:11:16 +09:00
Jaehyun Cho f3895af390 tools: Fix typo. 2016-10-17 21:08:10 +09:00
Hermet Park 22f42237b2 update eolian build commands.
eo is under the beta.
it's still fragile.
2016-10-12 10:40:17 +09:00
Hermet Park 721f69bbd4 fix an incorrect API usage.
Previous api call for directory check is not proper.
Fixed to the proper API.

This was noticed by ecore_file_path_dir_exists() bug fix.
2016-09-30 17:32:29 +09:00
Hermet Park 5b67f50283 syntax color: These keywords shouldn't be added here. 2016-09-30 16:52:50 +09:00
Hermet Park eb983b21d5 syntax color: updated list. 2016-09-30 16:49:56 +09:00
Jaehyun Cho 9376291824 edc_parser: Fix the argument names of the keyword aspect.
The argument names of the keyword aspect are not width and height but
they are min and max.
2016-09-29 09:57:56 +09:00
Jaehyun Cho 52932c6e15 console: Fix to reset console error message. 2016-09-29 07:07:15 +09:00
Hermet Park 5edd1eec8f fix the incorrect API usage.
Previous api call for directory check is not proper.
Fixed to the proper API.

This was noticed by ecore_file_path_dir_exists() bug fix.
2016-09-26 20:11:27 +09:00
YeongJong Lee 6455ac8c27 panes: fix ambiguous variable
Summary:
Position editors,console in horizontal panes and position live view,
text editor in vertical panes.

Test Plan:
1. launch enventor
2. check <Alt> + <Left> command is working well
3. check <Alt> + <Right> command is working well
4. check <Alt> + <Up> command is working well
5. check <Alt> + <Down> command is working well

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Differential Revision: https://phab.enlightenment.org/D4315
2016-09-26 14:54:07 +09:00
maxerba 24965f5efb Adding italian translation 2016-09-25 15:51:56 +02:00
maxerba 99a5df4248 Adding slovenian translation 2016-09-21 22:25:59 +02:00
Hermet Park 2ee529fde2 fix broken batman svg resource.
correct missing '/' at the end of svg tag.
2016-09-19 23:41:41 +09:00
Taehyub Kim db198e8901 search: fix the wrong replace behavior
Summary: fix the wrong behavior of replace logic

Test Plan:
1. launch enventor with basic template
2. open search window
3. input part keyword to the find entry
4. input some text to the replace with entry
5. press next button and find part keyword
6. press replace button again and again until all of keyword are changed
7. check it is working correctly

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Differential Revision: https://phab.enlightenment.org/D4299
2016-09-19 17:26:44 +09:00
Hermet Park db307a642c preference_setting: fix invalid shortcut key message.
alt + o is no more valid.
2016-09-19 14:33:00 +09:00
Hermet Park 396051ef28 tools: fix a wrong tooltip message. 2016-09-19 14:27:24 +09:00
Taehyub Kim 6ba889ae26 menu: remove unncessary space
Summary: remove unncessary space

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4265
2016-09-01 20:08:05 +09:00
Taehyub Kim 04957cba70 file_mgr: remove unnecessary space
Summary: remove unncessary space

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4264
2016-09-01 20:07:37 +09:00
Taehyub Kim 46e3db3392 edc_navigator: remove unnecessary space
Summary: remove unncessary space

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4263
2016-09-01 20:07:04 +09:00
Taehyub Kim 65e13b5c72 base_gui: apply enventor coding convention
Summary: apply enventor coding convention

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4262
2016-09-01 20:06:42 +09:00
Taehyub Kim 341b9827e3 text_setting: remove unncessary space
Summary: remove unnecessary space

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4267
2016-09-01 20:03:33 +09:00
Taehyub Kim 5f2682a792 utils: apply enventor coding convention
Summary: apply enventor coding convention

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4268
2016-09-01 20:02:52 +09:00
Taehyub Kim 0238ed5162 dummy_obj: apply enventor coding convention
Summary: apply enventor coding convention

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4269
2016-09-01 20:02:08 +09:00
Taehyub Kim 6b7ec9dcd5 template: remove unnecessary space
Summary: remove unncessary space

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4270
2016-09-01 20:01:14 +09:00
Taehyub Kim a7329630c3 lib util: apply enventor coding convention
Summary: apply enventor coding convention

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4271
2016-09-01 20:00:13 +09:00
Hermet Park b36401793a updated authors 2016-08-28 02:15:11 +09:00
Hermet Park 47f30db217 back to devel mode. 2016-08-28 01:32:17 +09:00
Hermet Park a7607172bc Revert "Revert "updated eo syntax usage.""
This reverts commit 92e1f996a7.
2016-08-28 01:31:35 +09:00
Hermet Park f1cca70e8d Revert "Revert "wooo.. one more eo change.""
This reverts commit 235bf45929.
2016-08-28 01:31:26 +09:00
Hermet Park 235bf45929 Revert "wooo.. one more eo change."
This reverts commit 9d188e601e.

revert temporarily.
2016-08-28 01:18:28 +09:00
Hermet Park 92e1f996a7 Revert "updated eo syntax usage."
This reverts commit a1cabe509f.

revert temporarily.
2016-08-28 01:18:06 +09:00
Hermet Park 0cc2d947b8 updated po 2016-08-28 01:03:10 +09:00
Hermet Park 572b48a9f9 edc_parser: fix memory leak.
here redundant code caused memory leak.
remove it.
2016-08-28 00:51:17 +09:00
Hermet Park 626c184817 auto_comp: free the all used memory.
clean logic of lexem_nodes was a little aweful
even it missed chunks of memory.

free all of them perfectly.
2016-08-28 00:06:12 +09:00
Hermet Park c6cff4bef8 fix memory corruption at free time.
That list pointer could be corrupted because
inside of the enventor_item_del(), the list head pointer could be modified.
2016-08-27 23:42:15 +09:00
Hermet Park 9504c8a634 edc_editor: fix memory leaks.
evas_textblock_cursor_content_get() requires free the returned data.
2016-08-27 23:25:24 +09:00
Hermet Park bab9f21128 edj_mgr: ++safe code.
nullout to not access invalid memory.
2016-08-27 23:15:30 +09:00
Hermet Park c213443fb1 file_tab: fix memory leak. 2016-08-27 16:38:40 +09:00
Hermet Park 7a947c2dd9 sytax_color: fix invalid memory access.
array index was over the range by 1.

fixed.
2016-08-27 16:36:51 +09:00
Hermet Park cab3e34fa4 editor/parser: fix memory leaks detected by valgrind. 2016-08-27 16:26:41 +09:00
Hermet Park 755da93bff auto_comp: fix memory leak. 2016-08-27 15:58:12 +09:00
Hermet Park c9ac1d8f50 fix make distcheck errors. 2016-08-27 15:45:58 +09:00
Hermet Park bf82057a78 update readme.
remove elementary package dependency
2016-08-27 15:40:27 +09:00
Hermet Park 64bd230f2c updated Enventor introduction. 2016-08-27 15:37:34 +09:00
Hermet Park 6442ca1b4e bump up version. 2016-08-26 20:41:21 +09:00
Hermet Park 9cbb90bd26 updated NEWS. 2016-08-26 20:29:48 +09:00
Hermet Park cf740c2ae1 win32: fix the build break. 2016-08-26 17:17:25 +09:00
Hermet Park caa2a39d65 win32: use a mutex to gurantee single instance app.
We found a corner case that the pc power is shut-down.
in that case lock file won't be removed and Enventor won't be
launched forever.

So use a mutex to recover this scenario additionally.
I tested all the scenarios that I can imagine,
and now it perfectly works fine!
2016-08-26 00:20:38 +09:00
Hermet Park a0b9d4e911 edc_editor: rewrite 5ea2c05dec
We found a side effect from that patch. So rewrite it with an other approach.
It's a hackish but no idea except it :(
2016-08-25 17:22:47 +09:00
Jaehyun Cho b3a5acf761 Revert "build: Support relative resource paths in sub edc file."
This reverts commit c17f2f3e37.
2016-08-24 21:24:40 +09:00
Jaehyun Cho 1cf5123192 Revert "build: Fix changing working directory correctly in all OS."
This reverts commit 60c5967920.
2016-08-24 21:24:25 +09:00
Jaehyun Cho 18b86be0f4 Revert "build: Fix warnings of the usage of chdir() and _chdir()."
This reverts commit 3bcf72a918.
2016-08-24 21:24:18 +09:00
Jaehyun Cho 571342bf2e Revert "code refactoring."
This reverts commit 6d5ce9daca.
2016-08-24 21:24:06 +09:00
Hermet Park 6d5ce9daca code refactoring.
centralize divergent logics.
2016-08-24 17:21:21 +09:00
Hermet Park a709380b32 edc_navigator: support vector type icon. 2016-08-24 17:16:24 +09:00
Jaehyun Cho 3bcf72a918 build: Fix warnings of the usage of chdir() and _chdir(). 2016-08-24 17:09:22 +09:00
Jaehyun Cho 60c5967920 build: Fix changing working directory correctly in all OS. 2016-08-24 17:01:33 +09:00
Hermet Park 5ea2c05dec edc_editor: fix syntax color issue.
Some cases, the edc editor can't apply syntax color
when it opens a new edc file.

we can cover this scanerio by trying  syntax color logic again
until it's succeed.

@T4275
2016-08-24 16:40:18 +09:00
Hermet Park b87adfb06c live_edit: eeek typo. 2016-08-24 16:20:20 +09:00
Hermet Park cd18635424 live_edit: fix wrong rounding() usage.
Probably, It needs to overwrite the rounded value to the origins,
but it missed.
2016-08-24 16:18:04 +09:00
Hermet Park 522e843414 file_mgr: fix the crash issue.
In some senario, file mgr lost focused item
and it's invalid memorry caused a crash issue.

now it's fixed.
2016-08-24 15:59:01 +09:00
Hermet Park c45c13d8bc cleanup unused warning. 2016-08-24 12:53:11 +09:00
Jaehyun Cho f5eb5361d2 main: Do not set default new file with template option (-t).
Template option (-t) creates a new file with the selected template.
Therefore, template option (-t) does not need to set default new file.
2016-08-24 09:51:39 +09:00
Jaehyun Cho 202fecd511 file_mgr: Do not replace current main file if it is the new main file.
Replace the current main file to a sub file if it is not the new main
file.
2016-08-24 09:43:20 +09:00
Jaehyun Cho b6d9930e0a file_mgr: Remove redundant code. 2016-08-23 23:39:58 +09:00
Jaehyun Cho 5ae577f5ea file_mgr: Fix condition.
Fix condition based on the commit,
265626a86b
2016-08-23 23:34:39 +09:00
Jaehyun Cho c17f2f3e37 build: Support relative resource paths in sub edc file.
Relative resource paths in sub edc files are based on the current working
directory.
To support relative resource paths in sub edc files, set main edc file's
directory as the working directory when edje_cc is executed.

Test Plan:
1. Create "main.edc" in "./edc/" directory.
2. Create "sub.edc" in "./edc/sub/" directory.
3. Create "icon.png" in "./edc/image/" directory.
4. "main.edc" includes "sub.edc". (i.e. #include "./sub/sub.edc")
5. "sub.edc" uses "icon.png".
   (i.e. images.image: "./image/icon.png" COMP;)
6. Open "main.edc" in the current working directory.
   (i.e. enventor -w ./edc ./edc/main.edc -i ./edc/image)
2016-08-23 21:42:13 +09:00
Hermet Park 13fa36376c file_tab: bring in item when it's selected. 2016-08-23 09:33:23 +09:00
Hermet Park 63f3fae337 edj_viewer: fix the invalid size of part highlight for the text part.
My previous patch made a side effect that part highting size
wont be correct for the text part.

For now, disable the logic.
2016-08-23 09:07:40 +09:00
Hermet Park 30c32488e0 live_edit: multiply base_scale to the live edit object.
Previously, live edit object doesn't have base scale value
so text and textblock size is incorrect.

Now, its fixed.
2016-08-23 08:53:37 +09:00
Hermet Park 1e5ae3db45 stablize unstable worker threads.
Still there are unsafe thread functions that access invalid memory.
fix all of them.
2016-08-23 08:05:14 +09:00
Hermet Park d3b0347ffd eeek. stupid. simple mistake. 2016-08-23 04:29:16 +09:00
Hermet Park a4952ba96e re-implement the method for guranteeing the singleton instance on win32.
I found some crash issues that enventor couldn't catch the event.
Have no idea what kinds of the crashes but probably it'd out of the signal
handling.

So re-implement the way of supporting the locking file mechanism
to use the win32 basic File functionality that gurantee removing file
when Enventor is closed in normal or abnormal, either cases.
2016-08-23 04:20:23 +09:00
Hermet Park 3c2a31a8ff git rid of unnessary logic.
Previously, generated views were to terminated if the edj path is changed,
but it's not quite useful at any scenarios.

User may want to change just the edj output path without any input resources
changes.
2016-08-23 01:52:42 +09:00
Hermet Park 6c5edd4e34 theme: fix the wrong layout.
Tools should be overlaid on the content.
Previously, console was over the tools layer but it's wrong.
2016-08-23 01:07:50 +09:00
Hermet Park 0ffbb836c7 file_tab: bring in selected item properly.
When an item is newly added or selected, it should be brought in the view.
2016-08-22 22:52:37 +09:00
Hermet Park ddb4a44147 autocomp: add snapshot part. 2016-08-22 22:37:18 +09:00
Hermet Park 0633ff5ec9 syntax keyword: add "snapshot" keyword. 2016-08-22 22:35:28 +09:00
Jaehyun Cho 0f4b53b57a live_edit: Apply base scale in live edit.
When a part is added in live edit, base scale is applied to the minimum
size of the part.
2016-08-22 18:44:46 +09:00
Jaehyun Cho c4a02f9d05 Revert "live_edit: Apply base scale in live edit."
This reverts commit 05d92ed1c3.
2016-08-22 17:56:36 +09:00
Jaehyun Cho 1bc328d6de reference: Add keyword "base_scale". 2016-08-22 17:52:20 +09:00
Jaehyun Cho 9138b6be75 autocomp: Add keyword "base_scale". 2016-08-22 17:52:19 +09:00
Jaehyun Cho 05d92ed1c3 live_edit: Apply base scale in live edit.
When a part is added in live edit, base scale is applied to the part.
2016-08-22 01:34:22 +09:00
Jaehyun Cho 231ffaa7e1 lib: Add enventor_object_base_scale_get(). 2016-08-19 18:28:48 +09:00
Jaehyun Cho 675990ad3f live_edit: Apply round-off to view size and min size calculation.
To compute accurate view size and min size, apply round-off to view size
and min size calculation.
2016-08-19 18:28:47 +09:00
Jaehyun Cho 5126538a87 live_edit: Fix to reduce round-off error.
Round off values in the end to reduce round-off error.
2016-08-19 18:28:45 +09:00
Hermet Park 265626a86b fix a invalid memoray access.
The focused_item could be invalid if the enventor item is removed before seting it null.
Also, the previous warning is no more invalid because
it was introduced by unsafe threads workers that was already fixed before.
2016-08-19 16:24:16 +09:00
Bowon Ryu c5a606e090 file_tab: update themes.
Summary:
update icon,
close button re-location.

Test Plan:
1. launch enventor with multi-file supports.
2. add items to file_tab
3. observe file_tab items.

Reviewers: Hermet, Jaehyun_Cho, herb

Differential Revision: https://phab.enlightenment.org/D4243
2016-08-19 13:05:34 +09:00
Taehyub Kim 6d109cf27a file_tab: add 'bring in' feature for the item out of file tab
Summary:
when the item of file tab which is in out of file tab view needs to be shown,
It should be moved into the file tab view

Test Plan:
1. launch enventor with multi-file supports
2. add item fully to the file tab
3. click next arrow in file tab and move the selection item
4. when selection item reached end of file tab
5. check the next item which is out of file tab view comes into the file tab view

Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu

Differential Revision: https://phab.enlightenment.org/D4242
2016-08-19 12:59:06 +09:00
Hermet Park ec0d43a307 console: return function as soon as possible. 2016-08-19 12:57:39 +09:00
Taehyub Kim f0ab0ec9a9 edc_parser: move the functions in utils which are find_part and find_group to the edc_parser
Summary:
move hte functions in utils which are find_part and find_group to the edc_parser
since it is right way

Test Plan:
1. launch enventor
2. move cursor on part name in text view
3. press F3 key
4. check it works well

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4240
2016-08-19 12:56:21 +09:00
Taehyub Kim 644d004f93 console: fix the selection function of console error message
Summary:
fix the selection function of console error message,
it was behavior broken since there is markup text in console message.
so I fixed it work well.

Test Plan:
1. launch enventor
2. make some error in text view
3. save
4. check the selection region in text view

Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu

Differential Revision: https://phab.enlightenment.org/D4239
2016-08-19 12:52:31 +09:00
Taehyub Kim 74938a0f66 syntax_color: add NULL checking in macro_apply
Summary:
add NULL checking in macro_apply
@fix

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Differential Revision: https://phab.enlightenment.org/D4237
2016-08-18 17:06:23 +09:00
Hermet Park b5b39617f2 edj_viewer: don't update views if they were deactivated.
This fixes the wireframe issue that deactivated views' wireframes are appeared
when the file is updated.

This is only happened if edc collections is consisted with multiple edc files.
If edj file is updated, all generated views will be updated.
and wireframes will be also updated and appeared.

but we don't need to update the deactivated views even if the edj is
updated. we could this with an activated boolean and this will be much
optimized way for many generated views.
2016-08-18 00:27:56 +09:00
Hermet Park fa929055a2 edj_mgr: reduce the edj view caching time to 5 min. 2016-08-17 23:44:58 +09:00
Hermet Park 3d610f1898 theme: just modify the file permission.
keep the file permission consistency.
2016-08-17 23:30:17 +09:00
Hermet Park 026728b042 enable file browser, file tab in default.
set initalize base window size.
2016-08-17 22:53:14 +09:00
Taehyub Kim 6dbe2bc4e6 statusbar: disable focus for resize slider bar
Summary: disable focus for resize slider bar

Test Plan:
1. launch enventor
2. show resize ctxpopup using status bar
3. check the focus is disable

Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu

Differential Revision: https://phab.enlightenment.org/D4232
2016-08-17 22:30:39 +09:00
Taehyub Kim 7e1a4c00a7 edc_editor: add NULL checking in edit_cursor_double_clicked_cb
Summary:
add NULL checking in edit_cursor_double_clicked_cb
@fix

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4234
2016-08-17 22:29:31 +09:00
Taehyub Kim 950734d000 auto_comp: apply strncpy in context_lexem_thread_cb
Summary:
apply strncpy in context_lexem_thread_cb
@fix

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4236
2016-08-17 22:28:16 +09:00
Taehyub Kim a47b12bd53 syntax_color: add NULL checking in macro_key_push function
Summary: add NULL checking in macro_key_push function

Reviewers: Jaehyun_Cho, bowonryu, NikaWhite, Hermet

Reviewed By: NikaWhite, Hermet

Differential Revision: https://phab.enlightenment.org/D4235
2016-08-17 22:22:53 +09:00
Taehyub Kim 1665ac9ba6 enventor_smart: add NULL checking
Summary:
add NULL checking in syntax_color_set and syntax_color_get API
@fix

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4233
2016-08-17 22:21:16 +09:00
Jaehyun Cho e646da1ee0 search: Move "Next" button to the right of "Previous" button. 2016-08-17 15:39:37 +09:00
Taehyub Kim bc5a7b3c36 edc_editor: support to jump to the part define
Summary: add the new feature to jump to the part define

Test Plan:
1. launch enventor
2. click mouse right button on "relative to" part name in text view
3. check selection is on the part define

Reviewers: Hermet, NikaWhite, bowonryu, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Tags: #enventor

Differential Revision: https://phab.enlightenment.org/D4167
2016-08-16 22:00:01 +09:00
Hermet Park 4b22c006b1 edj_viewer: ++safety.
add a null check.
2016-08-16 17:28:54 +09:00
Hermet Park 693baf4398 fix window os build.
SignalHandlerPointer is not defined.
We can't use it here.
2016-08-16 14:53:00 +09:00
Hermet Park a1cabe509f updated eo syntax usage.
it's still under the beta.
2016-08-16 11:48:17 +09:00
Hermet Park 8fec9ff3c9 edc_parser: fix spinlock infinte loop issue.
nullout pointer properly to not access an invalid memory thread.
2016-08-16 11:32:34 +09:00
Hermet Park 7b23d7964a removed redundant code. 2016-08-16 10:39:06 +09:00
Hermet Park b28c487980 ported crash handling for Windows OS. 2016-08-15 17:08:10 +09:00
Hermet Park eca29287ab file_mgr: support file back tracking feature.
Now, press F4 opens the previous file back.
2016-08-15 16:49:35 +09:00
Hermet Park 5836cc702a edc_edit: code refactoring.
just internal function name change.
2016-08-15 15:00:37 +09:00
Hermet Park 27db1e3245 edj_viewer: set highlight geometry precisely.
change the geometry of highlight to its common geometry,
not actual text area.

This change is for consistency for wireframes,
and I expect user want it.
2016-08-15 14:57:00 +09:00
Hermet Park 7656155bf3 live_edit: dismiss ctxpopup when view position is changed.
ctxpopup position won't be valid anymore if the live edit object's
 position is updated. so dismiss it.
2016-08-15 14:20:53 +09:00
Hermet Park 7f34f53864 wireframes: fix merge conflict. 2016-08-15 14:16:16 +09:00
Taehyub Kim cb47271ff6 wireframes_obj: restore resize and move callback for layout
Summary: restore resize and move callabck for layout

Test Plan:
1. launch enventor
2. open a basic edc
3. add spacer part
4. turn on wireframe
5. resize the view
6. see the result of wireframe

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Differential Revision: https://phab.enlightenment.org/D4216

Conflicts:
	src/lib/wireframes_obj.c
2016-08-15 14:09:45 +09:00
Hermet Park e40122daab file_browser: unset main tag at new file.
If user select a new file, then the main file will be this new one.
And then, the previous main file should lose the main tag.
2016-08-12 15:39:25 +09:00
Hermet Park b4655c371c text_setting: reset font style properly. 2016-08-12 15:09:07 +09:00
Hermet Park 8f7c61df8b live_edit: adjust text ui. 2016-08-12 12:28:41 +09:00
Bowon Ryu 498782167f live_edit: update font style and bg.
Test Plan:
1. enventor
2. add live_edit content.
3. observe content.

Reviewers: Hermet, Jaehyun_Cho, herb

Differential Revision: https://phab.enlightenment.org/D4221
2016-08-12 11:32:39 +09:00
Hermet Park a2db164533 file_tab: avoid unnecessary selection behavior.
When list item's close button is clicked, this selection is triggered
prior to the close button clicked callback.
It's useless to perform this selected callback anyway this file tab
item is gonna removed soon. But, due to the list's behavior,
it's unavoidable so we need this tricky animator.
2016-08-12 10:29:53 +09:00
Hermet Park 9d188e601e wooo.. one more eo change. 2016-08-12 10:07:10 +09:00
Hermet Park 65267ba2fd file tab: stablizing file switching behavior.
There are still corner case bugs.

one is issued by unsafe thread working
and the other one is group switching.

fixed all in all.
2016-08-12 04:00:17 +09:00
Jaehyun Cho ea4a177dcf reference: Change reference data name from md to rd.
Change reference data name to rd since rd stands for reference data.
2016-08-11 23:35:18 +09:00
Hermet Park cd70d4e0fa fix a regression bug.
we found a template won't work on enventor launch.
fix it by opening even the same input file.
2016-08-11 20:09:15 +09:00
Hermet Park 4a0df5d7b5 stupid commit d58729f3bc.
we should remove the code that declared sigactions.
2016-08-11 16:17:20 +09:00
Hermet Park d58729f3bc Get rid of the lock file mecahinsm from win32 build.
It needs a portable way to support win32.
2016-08-11 15:31:36 +09:00
Jean-Philippe Andre 3af6ede5e5 clang: Fix warnings and compilation errors
enventor wouldn't compile with clang. Also, it would print
a lot of warnings.
2016-08-10 15:17:41 +09:00
Jaehyun Cho b5e27c58d6 syntax_indent: Fix not to paste string redundantly.
Previously, indentation logic produced a duplicated string if the copied
string ends with spaces.

Test Plan:
1. Open basic template.
2. Cut string right before "}" in the text view.
   (e.g. Copy from 5th line to 7th line right before "}" in basic edc.)
3. Paste the cut string.
4. See that 6th line's string is pasted redundantly.
2016-08-09 21:19:01 +09:00
Hermet Park 6f47ad19e0 multi-file: clear edj views if main item is changed.
If the main item is changed, previous edj views won't be valid anymore.
We need to clear them.
2016-08-09 01:39:56 +09:00
Hermet Park 64b88b4147 file_mgr: avoid unnecessary item focus. 2016-08-09 01:10:27 +09:00
Hermet Park a281963ba1 sanitize compare file pathes.
let's have a full pathes for enventor items.
then we don't need to call ecore_file_realpath() at every accesses.
2016-08-09 01:02:46 +09:00
Hermet Park e086a6edbb ++null check 2016-08-09 00:25:43 +09:00
Hermet Park 780cf89dcc edc_editor: fix missing shortcut key updation. 2016-08-08 23:59:52 +09:00
Hermet Park b3afcc4810 file_browser: stabilizing switching main edc file function. 2016-08-08 23:58:08 +09:00
Hermet Park 997b878fa8 file_browser: support to switch main EDC file.
F2 => set main edc
F3 => quick jump
F4 => revert quick jump (not done yet)
F5 => reference tooltip.
2016-08-08 20:25:05 +09:00
Hermet Park 1fda44ae6d theme layout_setting: code refactoring.
use default state names explicitly.
2016-08-08 17:51:16 +09:00
Jaehyun Cho ee438d5fc8 file_browser: Fix memory leak. 2016-08-08 17:24:34 +09:00
Jaehyun Cho 8bcb3aa7b4 reference: Fix memory leak. 2016-08-08 16:13:22 +09:00
Hermet Park 534805a688 build_setting: add a main edc file path.
Support to change main edc file in build setting.
Also, Enventor will support a shortcut key to change main edc file.
2016-08-07 04:35:08 +09:00
Hermet Park c1f05cf8b8 Exit Enventor main logic normally in all cases.
exit call quits Enventor process unexpectedly,
and that made Enventor lose the lock file deletion.
2016-08-07 01:57:47 +09:00
Hermet Park c890ca73b6 file_browser, file_tab: change a default behavior.
Previously, they are disabled if the workspace is not specified.
We don't need this anymore.
Because we gonna support runtime changing for the workspace directory.
2016-08-07 01:41:47 +09:00
Hermet Park dbebb64e32 Change the enventor lock file path.
If usr's system is shutdown unexpectedly,
the lock file wont' be removed properly.

Store the lock file in the OS temporary folder
so it can be removed defintely when OS is turned off.
2016-08-07 01:30:06 +09:00
Hermet Park 4212c9fa98 Limit to an unique enventor instance.
Now, Enventor allows only one enventor instance.
This is sort of a limited way, but it would be better while enventor supports
multiple file editing.

Unless it perfectly covers scenarios that overwrite editor code from other
process, Enventor will limit its process count.
2016-08-06 05:03:40 +09:00
Hermet Park 726eabd442 edj_viewer: fix a bug that scale is applied one step after.
Logically, it used previous scale factor in updating live view.
update the scale factor first then update the live view!
2016-08-06 01:58:58 +09:00
Hermet Park 001aae25d8 newfile: sort template list in alphabetical order. 2016-08-06 01:48:06 +09:00
Hermet Park a23ef99cdb template: add Mask example. 2016-08-06 01:37:18 +09:00
Taehyub Kim 4f3e016ca9 wirefrmaes_obj: update wireframe when it is animated
Summary:
when animation is working, wire frame is not updated.
so I fixed it.

Test Plan:
1. launch enventor.
2. run animation template
3. see the result about update of wireframe

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Differential Revision: https://phab.enlightenment.org/D4214
2016-08-05 17:01:48 +09:00
Hermet Park b663b04096 edc_editor: add missing null out. 2016-08-05 16:34:20 +09:00
Hermet Park b987e70045 fix memory leaks. 2016-08-04 23:48:50 +09:00
Hermet Park 1901cd4699 auto_comp: this is the last thread safe code.
there is a quite complex case that non-thread safe code
that may occur crash or wrong behavior of enventor.

just improve the thread safe code to avoid the situation.
2016-08-04 23:25:52 +09:00
Hermet Park 13305c77af auto_comp: ++safe code
don't free auto comp instance if its internal thread is working.
2016-08-04 22:57:24 +09:00
Hermet Park 86b9124e53 syntax_color: ++ safe code.
don't free color instance if its internal thread is working.
2016-08-04 20:54:21 +09:00
Hermet Park 1a9d5dcba7 edc_editor: one more thread safe code.
This patch is another same fix to e24efc9c7e.
2016-08-04 20:45:42 +09:00
Hermet Park e6e81c29d5 correct memory free order. 2016-08-04 20:20:00 +09:00
Jaehyun Cho a4b07dad96 edc_editor: Fix to remove focus highlight on template selection button.
This patch is temporary patch to remove focus highlight on template
selection button of new file open. (enventor -t)
Without this patch, en_edit cannot get focus because its visibility is
set with false.
2016-08-04 20:14:40 +09:00
Hermet Park e24efc9c7e edc_parser: fix the memory corruption.
just realized that ecore_thread_cancel() wont call the thread cancel function instantly.
and this broke parser sequences that memory corruption.

Fix that situation to not write invalid memory.
2016-08-04 19:52:29 +09:00
Hermet Park b25d5dffa8 lib: thread optimization.
get out of threads if they are canceled.
threads don't need to perform their logic totally.
2016-08-04 19:25:18 +09:00
Hermet Park c5f59c63b8 edc_editor: fix a potential error.
Terminate redoundo instance after edc editor private resources are removed.
Redoundo has a entry delete callback, and it frees the redoundo private memory there.

But, if a redoundo instance is removed before entry delete callback is called,
invalid memory access will be happened.

Acutally this's broken memory.

So prevent this scenario by correcting function call order.

@fix
2016-08-04 19:10:21 +09:00
Bowon Ryu 4b693973b0 help: bug fix. entry scroller doesn't reset.
Test Plan:
1. enventor
2. press F1
3. select list item (shortcut keys)
4. scroll down
5. back
6. select list item (shortcut keys)
7. observe scroller's position

Reviewers: Hermet, Jaehyun_Cho, herb

Differential Revision: https://phab.enlightenment.org/D4213
2016-08-04 17:35:20 +09:00
Hermet Park fb4c8b70a8 edj_viewer: safety code.
+ null check
2016-08-03 19:55:58 +09:00
Hermet Park fd050aacf2 Support individual group view scale.
Now, groups keep their own view scale on their own contexts.
This will help user simultaneous group editing.
2016-08-03 19:35:04 +09:00
Hermet Park d57b173d39 file_tab: actually, list item allows to use tooltip. 2016-08-03 18:34:48 +09:00
Hermet Park 98e833ef37 file_tab: support full path tooltip info. 2016-08-03 18:30:49 +09:00
Hermet Park 43cfa31a14 edc_editor: show an image on cursor "images.image" 2016-08-03 16:39:26 +09:00
Jaehyun Cho 8878662778 main: Remove unused variables. 2016-08-03 15:56:03 +09:00
Hermet Park 010fc88fac setting: updated tooltip msg. 2016-08-03 15:53:32 +09:00
Hermet Park b4d8678595 Support individual group view size.
Now, groups keep their own view size on their own contexts.
This will help user simultaneous group editing.
2016-08-03 15:39:46 +09:00
Hermet Park f7c0be87b7 wireframe: fix an issue that wireframe disappeared.
While adding new live objects, some of wireframes is disappeared.
Actually, they were blocked by new live object content.

Fix by re-adding them as smart members.
2016-08-03 13:46:59 +09:00
Hermet Park 40bcd71121 syntax_color: updated 2016-08-03 01:15:45 +09:00
Hermet Park 96c767611b file_tab: fix a crash issue.
when user close a non selected file tab item,
Enventor occasionaly has a crash.
As investested, it seemed like an EFL issue.
But we can easily fix this by moving the function call.
2016-08-03 00:55:40 +09:00
Hermet Park af4ec62a1b edc_editor: ++secure code.
just in case, if the animator is called after ed instance is removed.
2016-08-03 00:38:03 +09:00
Hermet Park 9868254d9e theme: fix indentation. 2016-08-03 00:07:26 +09:00
Taehyub Kim a6b495dc9c envnetor_smart: fix the view resize callback
Summary: fix the view resize callback

Test Plan:
1. launch enventor
2. run group template
3. change the view size
4. change the group
5. change the view size
6. change the group to firxt
7. see the result

Reviewers: Hermet, NikaWhite, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4208
2016-08-02 22:49:28 +09:00
Taehyub Kim 160f672232 envnetor_smart: keep the each view size
Summary: when group is changed, view information should be updated

Test Plan:
1. launch enventor
2. run group template
3. change the view size
4. change the group
5. change the view size
6. change the group to firxt
7. see the result

Reviewers: Hermet, NikaWhite, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4207
2016-08-02 22:34:15 +09:00
Jaehyun Cho e3356ae00c templates: Change name field with common name in Listitem template. 2016-08-02 19:25:12 +09:00
Jaehyun Cho b32a30bd41 text_setting: Fix not to access unassigned array.
This fixes commit 6bf75f2044
2016-08-02 17:19:14 +09:00
Hermet Park 4468f9283c file_mgr: compare file pathes precisely.
Actually, it needs to compare realpath for files
to confirm to newly open or not.
2016-08-01 19:28:41 +09:00
Hermet Park 6bf75f2044 text_setting: apply lazy style to syntax color template code. 2016-08-01 16:54:52 +09:00
Jaehyun Cho b783c90092 Fix build break on Windows with EAPI. 2016-07-28 14:31:41 +09:00
Hermet Park bdb4842bab template: add GameStage. 2016-07-28 00:11:30 +09:00
Hermet Park 20dcc69221 template: add BgAnimation. 2016-07-27 23:38:24 +09:00
Hermet Park 553221450b theme: add missing clipper size. 2016-07-27 23:13:44 +09:00
Hermet Park 32123a78d4 theme: set clipper size properly.
Some dialogue layout had larger size clipper than actual box size.
Correct clipper size to fit to dialogue box.
2016-07-27 22:58:06 +09:00
Hermet Park d39d88eda3 theme: remove redundant part. 2016-07-27 22:54:51 +09:00
Hermet Park 563b1484d9 Revert "theme: set clipper size properly."
This reverts commit 895984f8f5.

Eeek, this broke dim effects!
2016-07-27 22:53:41 +09:00
Hermet Park 895984f8f5 theme: set clipper size properly.
Some dialogue layout had larger size clipper than actual box size.
Correct clipper size to fit to dialogue box.
2016-07-27 22:48:59 +09:00
Hermet Park ac1a32044d theme: fix indentation. 2016-07-27 22:40:22 +09:00
Hermet Park 5cf5f1f3e2 template: add interpolation example. 2016-07-27 22:33:39 +09:00
Hermet Park 179285e83b makefile: fixed script indent. 2016-07-27 21:39:36 +09:00
Hermet Park ab86d9c04f template: add a basic vector example 2016-07-27 21:36:08 +09:00
Hermet Park f847e936db template: add a vector morphing example. 2016-07-27 21:08:19 +09:00
Hermet Park 44ba41d27b theme: set explicit font name. 2016-07-27 17:21:44 +09:00
Hermet Park 3db26261f7 multi-file: support syntax_colors.
a# Please enter the commit message for your changes. Lines starting
2016-07-27 15:37:46 +09:00
Hermet Park 21dac2992c font: don't abuse elementary configuration setting.
Dont' save elementary config in enventor.
It harms the other application config values.
Most of all, it doesn't need it.
2016-07-27 14:10:13 +09:00
Hermet Park 147541a628 help: updated about contents. 2016-07-27 13:00:47 +09:00
Jaehyun Cho 7448325239 help: Remove redundant wrap setting and Change wrap type.
Remove redundant wrap set with argument EINA_TRUE.
Change wrap type from mixed to word.
2016-07-27 10:33:11 +09:00
Jaehyun Cho 2c1b4ed275 reference: Fix incorrect variable types. 2016-07-26 23:13:20 +09:00
Jaehyun Cho 7fe53d0b70 reference: Add keywords "description" and "type" in part block.
Add keywords "description" and "type" in part block to support old EDC
before LazyEDC.
2016-07-26 13:31:20 +09:00
Jaehyun Cho 0fb527452d reference: Add keywords in program block.
Description of link.base is also updated since link.base works like
program.signal and program.source.
2016-07-26 11:47:58 +09:00
Hermet Park b67897a8ca live_edit: add fixed width & height tooltip msg. 2016-07-26 11:46:42 +09:00
Hermet Park a8b2214851 help: clean up help bg resources.
removed unnecessary references.
2016-07-25 22:21:11 +09:00
Hermet Park bb6fae503d template: update CustomButton example 2016-07-25 22:09:37 +09:00
Hermet Park 93ae1d6f95 help: code refactoring.
remove unseless lines and add descriptive comments.
2016-07-25 21:13:45 +09:00
Bowon Ryu 0822f1f246 help: updated help.
Summary: GUI composed of the edc layout.

Test Plan:
1. enventor
2. press F1 Key

Reviewers: Hermet, Jaehyun_Cho, herb

Differential Revision: https://phab.enlightenment.org/D4187
2016-07-25 21:09:15 +09:00
Jaehyun Cho 7752d3cc93 reference: Add children keywords of "desc". 2016-07-25 19:45:28 +09:00
Jaehyun Cho 6396bcd2d0 reference: Update description for "align" in box and table item. 2016-07-25 19:45:26 +09:00
Hermet Park 32dbf96259 live_edit: fix broken relative popup.
If a relative part has a long name,
its text will be drawn over the popup box.

Set it's maximum size to prevent this.
2016-07-25 19:21:13 +09:00
Hermet Park f8df90b1bd template: renamed Button template to CustomButton. 2016-07-25 17:04:28 +09:00
Bowon Ryu 6f0a1b021d template: updated button example.
Summary: this sample can use for button customizing.

Test Plan:
1. enventor
2. esc -> New
3. Button

Reviewers: Hermet, Jaehyun_Cho, herb

Differential Revision: https://phab.enlightenment.org/D4185
2016-07-25 17:02:00 +09:00
Hermet Park 2cc7f569d8 template: update textblock example code. 2016-07-25 17:00:57 +09:00
Bowon Ryu 81d2e44495 template: updated Textblock
Summary: Textblock sample for line wrapping & ellipsis

Test Plan:
1. enventor
2. esc -> New
3. Textblock

Reviewers: Hermet, Jaehyun_Cho, herb

Differential Revision: https://phab.enlightenment.org/D4183
2016-07-25 16:41:06 +09:00
Hermet Park 8df8b2ba88 template: update MouseEvent code. 2016-07-25 16:40:03 +09:00
Bowon Ryu 425b7e42c3 templates: updated mouse event example
Test Plan:
1. enventor
2. esc -> New
3. MouseEvent

Reviewers: Jaehyun_Cho, herb, Hermet

Differential Revision: https://phab.enlightenment.org/D4162
2016-07-25 16:31:10 +09:00
Hermet Park 17ba4a2cd3 help: code refactoring.
Replaced bg to image.
Put the bg image resource into enventor theme.
2016-07-25 16:29:20 +09:00
Bowon Ryu 09ea8541bb help: updated help
Test Plan:
1. enventor
2. press F1 Key

Reviewers: Jaehyun_Cho, Hermet

Differential Revision: https://phab.enlightenment.org/D4178
2016-07-25 16:02:08 +09:00
Jaehyun Cho cf92ba7a67 edc_parse: Check more cases to update EDC info correctly.
"#if", "#endif", and "#define" cases are checked to update EDC
information correctly.

This fixes commit 2fc82c79d3
2016-07-22 19:24:33 +09:00
Jaehyun Cho 7def9a7865 edc_parser: Fix to parse "#define" expression correctly.
Update pointer after parsing "#define" expression.
Parse other expressions after parsing "#define" expression.
2016-07-22 19:09:00 +09:00
Jaehyun Cho b8beb179be edc_parser: Parse utf8 text instead of markup text. 2016-07-22 19:00:12 +09:00
Hermet Park 0462d04c0d multi-file: support quick jump (F5)
if you press F5 on "#include xxxx" line,
Enventor will open that include file.

Conflicts:
	src/lib/edc_parser.c
2016-07-22 16:19:46 +09:00
Jaehyun Cho 8b8aa1fdfe edc_parser: Fix to move pointer correctly. 2016-07-22 15:06:24 +09:00
Jaehyun Cho 7331eb0390 edc_parser: Fix to use "\n" instead of <br/> on parsing utf8. 2016-07-22 15:06:23 +09:00
Jaehyun Cho 9edd41ac45 edc_parser: Replace char* to const char*.
Replace char* to const char* because the string is not modified.
2016-07-22 15:02:28 +09:00
Jaehyun Cho 2fc82c79d3 Revert "Support to use macro as a group name."
This reverts commit 335575eb84

Although using macro as a group name is not a common usage, but it takes
a lot of efforts to maintain and implement new features based on this.
2016-07-22 14:32:26 +09:00
Hermet Park cbb7caa834 file_mgr: reset contexts when file focus is moved on.
We need to reset goto, search, live edit even edc navigator context
if the selected file is switched to other.
2016-07-22 13:34:56 +09:00
Thiep Ha 5d1cec3e7b correct returned value of focus_get function.
Function eventor_object_focus_get needs to return
Eina_Bool value.
2016-07-22 11:49:26 +09:00
Hermet Park d0f6bb2e36 syntax_color: improve macro keywords.
Set macro colors to the end of a strcuture,
if the define continues to the next lines with line wrapping.
2016-07-21 21:48:21 +09:00
Hermet Park f18efb732a edc_parser: fix typos. 2016-07-21 21:03:59 +09:00
Hermet Park 32bcf8b985 multi-file: allow to open an empty file. 2016-07-21 20:59:54 +09:00
Hermet Park eda850d9db multi-file: support edc navigator. 2016-07-21 20:53:13 +09:00
Hermet Park 505ea04e28 edc_editor: removed unused var. 2016-07-21 17:31:17 +09:00
Taehyub Kim 5ddaa8dbe5 live_edit: add more condition for min size of live edit item
Summary:
In case of the live edit item has min size without relative to part,
the size of the item should not be changed.
To cover this case, I added more condition

Test Plan:
1. launch envnetor
2. click a live edit item on tools
3. check the fixed option without "relative to" setting
4. insert the item with mouse double click
5. see the min size of the item while the view size is changing

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Differential Revision: https://phab.enlightenment.org/D4173
2016-07-21 17:25:11 +09:00
Hermet Park 7d88c580e1 goto: fix the go to window closing issue.
When go to window is unfocused, window is closed.
Though this behavior was intended, the functionality was not quite nice.
Even this caused a weired behavior(bug) on windows that,
go to window was closed when it's minimized.

So get rid of this policy!

@fix T3922
2016-07-21 17:13:21 +09:00
Jaehyun Cho 8aeac17e4d reference: Apply #inherit expression to part type keywords. 2016-07-21 10:37:37 +09:00
Jaehyun Cho 75f33b8f98 reference: Support keyword inheritance.
Support keyword inheritance by using #inherit expression.
(e.g. #inherit "collections.group.parts.part";)
2016-07-21 10:33:29 +09:00
Jaehyun Cho 04b5206d51 reference: Fix memory leak. 2016-07-21 10:30:02 +09:00
Jaehyun Cho 493e0dc0dd reference: Remove unused internal function. 2016-07-21 09:19:14 +09:00
Jaehyun Cho 8b0f1e175e reference: Add comments about how functions work. 2016-07-21 09:15:14 +09:00
Hermet Park 1cfb9985fb file_browser: skip folder items if their names are started with .
On the linux system, A folder, which name is started with . is intended hidden folders.
So skip appending them in default.
2016-07-20 19:43:47 +09:00
Hermet Park 449fa28899 workspace: set workspace path current path in default.
If user don't specify the workspace path,
Enventor set the workspace path to current directory path
while turning off file browser and file tab function in default.
2016-07-20 19:29:39 +09:00
Hermet Park 46fc271678 file_browser: compare file names exactly.
previously, it didn't care the relative paths.
compare file names but file paths exclusively.
2016-07-20 19:12:17 +09:00
Hermet Park f98b075d1e live_edit: add exceptional case.
If the live view size hasn't been set up yet,
live edit won't be functional.

Handles the case then displays the exceptional case message.
2016-07-20 18:59:15 +09:00
Hermet Park 58a1f10608 multi-file: ++implementation.
support live edit function.
2016-07-20 18:52:45 +09:00
Jaehyun Cho a768577e6c reference: Code refactoring to expand functionality. 2016-07-20 18:29:32 +09:00
Hermet Park 63f9dc9dee live_edit: rearrange objects stack.
Previously each live edit components are messed up in stacking.
Restacked by putting wireframe, dummy objects
below live edit object, control points, align lines and texts.

This required a totally hackishy method but there are no other solution so far.

@fix T4026
2016-07-20 15:00:37 +09:00
Hermet Park a5ecd83696 live_edit: fix typo? 2016-07-20 13:48:49 +09:00
Hermet Park d883a8c715 live_edit: don't displayed over the scroller.
Set a smart parent to actual view object so the control point
and texts to be clipped properly.
2016-07-20 13:46:51 +09:00
Jaehyun Cho 773b93e792 reference: Support keyword reference in multi-file structure.
Show keyword reference of the focused item entry.
Append "collections" to parent keyword list arbitrary if the focused
item is not the main item.
2016-07-19 21:28:18 +09:00
Jaehyun Cho 44e36e8b69 reference: Fix position of keyword reference layout. 2016-07-19 21:04:40 +09:00
Hermet Park 02a50da5d6 template: fix a invalid coordinates code generation.
fix a side effect of localizing floats.

_posix_fp() uses static stringbuffer.
If this function is called multiple times in printf(),
previous buffer data will be invalid.

we are calling this for x, y twice in one func.
2016-07-19 20:18:12 +09:00
Jaehyun Cho 763d7b2669 reference: Check dot('.') grammar to identify parent keyword.
Check dot('.') grammer (e.g. image.normal) to identify parent keyword.
2016-07-19 19:50:21 +09:00
Hermet Park 50b32ef8f4 live_edit: code refactoring.
remove hackish code.
you can write code prettier!
2016-07-19 19:47:43 +09:00
Hermet Park 2d9fd3588f multi-file: close live_view properly if the file is closed.
this commit is about stablizing mult-file functionalities.
2016-07-19 19:28:22 +09:00
Jaehyun Cho 5179e31f39 file_browser: Display sorted file list based on file type. 2016-07-19 17:00:48 +09:00
Hermet Park b43d92abbe template: clear MobileLayout code. 2016-07-19 14:01:52 +09:00
Bowon Ryu fda5113662 templates: updated mobile layout
Summary: This sample similar to general mobile layout.

Test Plan:
1. enventor
2. esc -> New
3. BasicMobileApp

Reviewers: Jaehyun_Cho, herb, Hermet

Differential Revision: https://phab.enlightenment.org/D4161
2016-07-19 13:48:24 +09:00
Jaehyun Cho cf280a4c83 reference: Add part type keywords.
box, group, image, part, proxy, rect, spacer, swallow, table, text,
textblock, vector, and their children keywords are added.

Notice that most of properties of part types are the same. Now the
descriptions of the properties are duplicated.

Notice that external part type is not added since there is no
description about external part type.
2016-07-19 13:32:30 +09:00
Jaehyun Cho f567d51776 reference: Fix to handle one character keyword.
Fix to handle one character keyword such as "x" and "y".
2016-07-19 13:23:26 +09:00
Jaehyun Cho 3a4bbab8d2 reference: Add keywords in group block.
alias, broadcast_signal, inherit, limits, max, min, script, and their
children keywords are added.

The descriptions refer the following website.
https://developer.tizen.org/dev-guide/2.3.1/org.tizen.guides/html/native/ui/edc_part_block_n.htm
2016-07-18 19:17:37 +09:00
Hermet Park 09f19b7654 multi-file: improve a use case.
hide a previous preview if a new represent file hans't any viewable group.
2016-07-17 00:40:08 +09:00
Jaehyun Cho adc7ba1c48 reference: Add resource type keywords.
color_classes, data, fonts, images, sounds, styles, and their children
keywords are added.

The descriptions refer the following website.
https://developer.tizen.org/dev-guide/2.3.1/org.tizen.guides/html/native/ui/edc_part_block_n.htm
2016-07-16 01:24:09 +09:00
Jaehyun Cho dedad7bbad reference: Modify keywords' descriptions. 2016-07-16 01:24:07 +09:00
Hermet Park d85f045099 preference_setting: update tooltip message. 2016-07-15 21:12:21 +09:00
Hermet Park a70270a9d9 arrange shortcut key
removed line number toggle.
f5 -> quick jump.
f6 -> reference tooltip.
2016-07-15 19:50:39 +09:00
Hermet Park 6ebb0d1ba5 Revert "templates: updated button"
This reverts commit 25e6943e33.

This patch didn't intended...
2016-07-15 19:18:51 +09:00
Hermet Park 12d9df1ce1 template: updated watchface resource. 2016-07-15 19:18:29 +09:00
Hermet Park deb1e1bfbf template: add guidance comments in list item. 2016-07-15 19:14:27 +09:00
Hermet Park d78d731d93 template: updated list item content. 2016-07-15 19:12:19 +09:00
Bowon Ryu 25e6943e33 templates: updated button
Test Plan:
1. enventor
2. esc -> New
3. Button

Reviewers: Hermet, Jaehyun_Cho, herb

Differential Revision: https://phab.enlightenment.org/D4162
2016-07-15 18:55:36 +09:00
Hermet Park cb46ee7d14 tools: use lower-case name for consistency. 2016-07-14 20:14:12 +09:00
Hermet Park 7ebc3e8c3c live_edit: updated tooltip msg. 2016-07-14 20:04:40 +09:00
Hermet Park 18083fbdbf updated SHORTCUT manual. 2016-07-14 19:52:05 +09:00
Hermet Park 29c89341fa updated authors. 2016-07-14 14:01:50 +09:00
Jean Guyomarc'h e910826ade template: don't localize floats in the edje editor
Summary:
Enventor live edit would generate invalid code with
the french locale.
Indeed, french uses a comma (",") as the decimal point,
instead of the dot. With localization enabled, printf()
would automatically localized the floating point,
introducing a comma in the edje code where a dot is
expected...

To avoid this, we now enclose the floats we don't want
to be localized (use the implicit POSIX local: with a dot)
in a function that looks the current locale and replace
the decimal point with a dot.

Test Plan:
(1) Without the patch, call LC_ALL=C enventor and see live
    edit if correct.
(2) Without the patch, call LC_ALL=fr_FR.UTF-8 envetor and
    see live edit generate invalid edje code.
(3) Apply the patch, and repeat steps (1) and (2) and observe
    that both cases now success.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D4146
2016-07-14 13:58:06 +09:00
Hermet Park bc3a11dbb8 update syntax color keywords. 2016-07-13 11:58:27 +09:00
Bowon Ryu 8e0a3d8a98 console: apply syntax color for console error message
Summary:
current error message is hard to read.
if the message has a syntax color, then it will be better.

Reviewers: Hermet, herb, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4124
2016-07-13 11:00:48 +09:00
Jaehyun Cho b570f792ff file_browser: Code refactoring to fix file search crash.
Previously, searching files in file browser causes crash.
Now, each file browser data contains genlist item and the genlist item
is also deleted when the file browser data is deallocated.
2016-07-11 21:29:58 +09:00
Jaehyun Cho 710621cc9b Support keyword reference function.
Display keyword reference if F5 is pressed while cursor is on the
keyword.
2016-07-09 00:21:50 +09:00
Hermet Park a3edf9f746 template: clean list item source code. 2016-07-08 10:44:05 +09:00
Bowon Ryu 49c049e63d templates: updated list item.
Summary: This sample can use for e-mail concept list item.

Test Plan:
1. enventor
2. esc -> New
3. list_item

Reviewers: Jaehyun_Cho, herb, Hermet

Differential Revision: https://phab.enlightenment.org/D4136
2016-07-08 10:40:03 +09:00
Hermet Park 4b8f989090 multi-file: re-implemented item grouping infra.
Changed item concept that only one item can represent the enventor object.
I'd thought multiple editors of Enventor could be active at the same time,
but it brought Enventor Lib has over-concept feature,
because Enventor App doesn't support it so far.
2016-07-07 20:34:42 +09:00
Hermet Park ace06a6d8b multi-file: itemize redo/undo functions. 2016-07-07 19:13:25 +09:00
Hermet Park 50cb8c7d42 multi-file: highlight a part on current focused item. 2016-07-07 19:06:58 +09:00
Hermet Park d6f61c9963 multi-file: consolidate bodies. 2016-07-07 18:42:13 +09:00
Hermet Park 65a0e198da fix a side effect that missed a main item focus.
this is introduced from c59be9cf1b.
2016-07-07 16:49:14 +09:00
Hermet Park 64bf39cc83 syntax_indent: fix a incorrect parsing.
Current cursor can be moving over by 1.
it occured broken indentation in a template insert corner case.
2016-07-07 16:33:59 +09:00
Hermet Park c59be9cf1b multi-file: ++implementation.
1. make it work with template insert feature.
2. dissmiss inactivated item's view sync callbacks.
2016-07-07 16:21:03 +09:00
Hermet Park 71f261bad4 don't switch font info, if the same font comes.
I didn't dig further, but that corrupted enventor menu/setting.
probably, eina_stringshare ocurred memory corrution...?

anyhow, its useless to apply same font again.

@fix T4013
2016-07-07 13:56:16 +09:00
Hermet Park 0384f50f01 multi-file: find the first group when edc item has a focus.
This properly switchs a current focused item view on realtime.
That means, when user switch files, it will display the first group
view in a new selected file.
2016-07-07 12:03:53 +09:00
Taehyub Kim 18030c6532 tempalate: change the description
Summary: change the description

Test Plan:
1. open new file
2. see the template name

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Differential Revision: https://phab.enlightenment.org/D4091

Conflicts:
	data/templates/Makefile.am
2016-07-07 11:09:46 +09:00
Hermet Park 06b5fc387e template: rename watchface_rect to watchface2 2016-07-07 10:59:38 +09:00
Hermet Park 6809f71c75 theme: rearrange dialogue box size. 2016-07-07 10:56:23 +09:00
Bowon Ryu 7668fe7b90 templates: updated rectangle watchface.
Test Plan:
1. enventor
2. esc -> New
3. watchface_rect

Reviewers: Hermet, Jaehyun_Cho, herb

Differential Revision: https://phab.enlightenment.org/D4131
2016-07-07 10:37:28 +09:00
Hermet Park e2506983ad file_tab: free item memory properly.
when file tab is terminated, free used memory.
2016-07-06 15:04:47 +09:00
Hermet Park 0176bda440 file_tab: fix invalid memory access.
list item selected callback passed file tab item, not file data!
2016-07-06 14:49:41 +09:00
Hermet Park 932174c629 text_setting: allow null argument.
text_setting_reset() allows null value by demand.
2016-07-06 14:30:12 +09:00
Taehyub Kim 381afdd7b1 live_edit: align line should be shown always on live edit item
Summary: align line should be shown always on live edit item

Test Plan:
1. launch enventor
2. click an live edit item on tools
3. move and align the item
4. see the align line on other parts

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4121
2016-07-06 14:18:39 +09:00
Hermet Park 98d798c55c wireframe: quitely, wireframe is just an image. 2016-07-06 13:39:04 +09:00
Hermet Park bd98c5c3c3 theme: improve icon images. 2016-07-05 19:12:54 +09:00
Hermet Park 5b00b70fc2 file_tab: ++implementation.
allow remove item from the tab.
2016-07-04 22:17:38 +09:00
Hermet Park 37770335ff file_browser: display main edc file marker.
it helps people notice the main edc file among the edcs.
2016-07-04 18:33:30 +09:00
Hermet Park 193ec29fa0 multi-file: support live editor.
Additional implementation.
Now it works for live editing.
2016-07-04 17:53:54 +09:00
Hermet Park 3840ab3f5e edc_parser: revert unintentional change. 2016-07-04 15:14:55 +09:00
Hermet Park 6780f25ad4 multi-file: redoundo implemtation.
Still a lots of changes required... >.<
2016-07-04 15:09:26 +09:00
Hermet Park e58c6c7600 live_edit: fix a broken functionality.
edc_parser was unintentionally changed while multi-files support.
2016-07-04 13:59:39 +09:00
Hermet Park 4353d98bac multi-file: make multi files work for auto completion. 2016-07-04 13:07:24 +09:00
Hermet Park fb7224f4a9 auto_comp: code refactoring.
added descriptive comments for the main logic of context analysis.
2016-07-04 12:58:07 +09:00
Hermet Park 25c1bccd66 file_tab: disable it, if a workspace were not given.
Like the file browser, file_tab will be forcely disabled if the workspace were
not given by user. In that case, file tab would have false always.
So, it needs restore mechanism for original file tab value.
2016-07-04 11:33:27 +09:00
Hermet Park 6303afd975 multi-file: ++implementation.
+ line deletion and file saving.
2016-07-03 08:50:47 +09:00
Hermet Park 36a2f9f917 Code refactoring.
Replace globals with utils.

Conceptually, this globals has more utility functionalities.
2016-07-02 17:39:47 +09:00
Hermet Park e4896f1090 multi-file: ++implementation.
Now it works on search/replace.

API changes.
Below object APIs replaced with item APIs.

enventor_object_text_get()
enventor_object_text_insert()
enventor_object_selection_get()
enventor_object_cursor_pos_get()
enventor_object_cursor_pos_set()
enventor_object_select_none()
enventor_object_select_region_set()
enventor_object_syntax_color_partial_apply()
enventor_object_syntax_color_full_apply()
2016-07-02 17:32:11 +09:00
Hermet Park d9f7d5d0d6 theme: apply lazy edc style. 2016-07-02 15:58:57 +09:00
Hermet Park 68548afdde multi-file: support the function, go to line.
removed enventor_object_max_line_get()
removed enventor_object_goto_line()
added enventor_item_max_line_get()
added enventor_item_goto_line()
2016-07-02 15:39:10 +09:00
Hermet Park b71d9d2f26 fixed missing short-cut key changes.
Introduced from 4d6e98d0f0.
2016-07-02 14:32:27 +09:00
Hermet Park fe4919db46 status: Fix a view size issue.
It wont set the view size if the statusbar were disabled.

This time, statusbar is almost mandatory function.
So, regardless of statusbar activation,
Enventor updates the view size and mouse cursor info.

@fix T3974
2016-07-02 14:21:34 +09:00
Hermet Park e3c03b38ba settings: allow null arguments on build/text setting. 2016-07-02 14:16:30 +09:00
Hermet Park 5e8d2e518d fixed all compile warning stuff. 2016-07-02 14:09:42 +09:00
Hermet Park bbc8ee13ea code refactoring.
renamed from outline to wireframe.

Conceptually, here feature is close to "wireframe".
2016-07-02 13:58:27 +09:00
Hermet Park 12f516939c tools: update wireframes message. 2016-07-02 13:35:34 +09:00
Hermet Park 4d6e98d0f0 reorganize shortcut keys.
-- auto indentation.
-- auto completion.
++ wireframes (ctrl + w).
2016-07-02 13:32:34 +09:00
Hermet Park 896da7f386 tools: update part outline tooltip msg. 2016-07-02 13:19:31 +09:00
Hermet Park 8fae57d181 template/map: fix a typo. 2016-07-02 03:22:15 +09:00
Hermet Park e93ab43319 ++ multi file editing feature implementation. 2016-07-01 23:59:17 +09:00
Hermet Park 731d0bed5b ++secure code. 2016-07-01 18:58:26 +09:00
Hermet Park 8c13d63a8e ++ multi file support. 2016-07-01 18:24:14 +09:00
Bowon Ryu f4cf6703bb redoundo: fix Undo's indiscriminate red alert.
Summary:
if grammatically incorrect EDC file is opened, then
Undo causes error caution (with red alert) even though
there is no Undo action.

Test Plan:
1. Make incorrect EDC file. (e.g. Write "aaaa" in EDC file incorrectly)
2. Save the wrong EDC file.
3. Newly open the wrong EDC file.
4. press Undo button and it causes error caution.

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4118
2016-06-30 21:50:42 +09:00
Hermet Park f0623301d9 file_browser/file_tab: ++ multi file support implementaion 2016-06-30 16:50:20 +09:00
Hermet Park bd0aa1a81e file_browser: code refactoring.
use enventor coding convention.
2016-06-30 16:12:55 +09:00
Hermet Park c8749390d8 file_tab: ++implementation. 2016-06-30 00:52:13 +09:00
Hermet Park 247c1e67ae file_tab: use customed list for file tab. 2016-06-29 23:29:37 +09:00
Hermet Park 5140ab5c64 code refactoring.
add a common memory fail message routine to reduce string usage.
2016-06-29 20:41:39 +09:00
Hermet Park e61cfb6124 file_tab: add a partial implmentation. 2016-06-29 20:28:11 +09:00
Taehyub Kim 4100cc9131 edj_viewer: add parts outline highlight feature
Summary:
When we add a live edit item, it is convenient to be support part outline.
so I added part outline feature. It can be toggling.

@T3626

Test Plan:
1. launch enventor
2. activate parts outline item on tools
3. see the parts outline in live edit view

Reviewers: Hermet, NikaWhite, bowonryu, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4071
2016-06-28 14:20:57 +09:00
Taehyub Kim dafc19ce3f live_edit: change the description of fixed mode
Summary: change the description of fixed mode

Test Plan:
1. click a live edit item on tools
2. see the description of fixed mode in live view

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4106
2016-06-28 14:01:00 +09:00
Taehyub Kim 4ba5c36f91 build_setting: change the description of build setting
Summary: change the description of build setting

Test Plan:
1. show the build setting
2. see the path title

Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu

Differential Revision: https://phab.enlightenment.org/D4105
2016-06-28 13:59:05 +09:00
Taehyub Kim 964a57936f tools: change the description for the tools of live edit mode
Summary: change the descrtipion for the tools for live edit mode

Test Plan:
1. move the mouse cursor on part highlighting, dummy parts and mirror mode tools
2. see the tooltip messages

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4103
2016-06-28 13:53:12 +09:00
Taehyub Kim 9ed825cdb7 edc_navigator: change the EDC Navigator description
Summary: change the description

Test Plan:
1. Open basic.edc template
2. remove the annotation of program part
3. Show EDC Navigator
4. move the mouse cursor on the button of Program which have rectangle icon.
5. move the mouse cursor on the button of program which have triangle icon.
6. see the each tooltip messages.

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4102
2016-06-28 13:52:21 +09:00
Taehyub Kim 3690f6d012 preference_setting: change the description
Summary: change the description

Test Plan:
1. open setting menue
2. move the mouse cursor on View Size, Auto Hiding Console, Smart Undo/Redo and Error Message Alert
3. see the tooltip messages

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4099
2016-06-28 13:51:42 +09:00
Taehyub Kim 2391268f5b tools: change the description of window layout
Summary: change the description of window layout

Test Plan:
1. move the mouse cursor on EDC Navigator and Status item of tools
2. see the tooltip messages

Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu

Differential Revision: https://phab.enlightenment.org/D4098
2016-06-28 13:49:56 +09:00
Taehyub Kim f1d5e5605d statusbar: change the description
Summary: change the description

Test Plan:
1. move the mouse cursor on each statusbar item
   (Resize, Swap and Group)
2. see the tooltip messages

Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu

Differential Revision: https://phab.enlightenment.org/D4097
2016-06-28 13:48:37 +09:00
Taehyub Kim 8a6b7163cb tools: change the editing tools description
Summary: change the Find/Replace description

Test Plan:
1. move the mouse cursor on Find/Replace tools
2. see the tooltip message

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4096
2016-06-28 13:47:35 +09:00
Taehyub Kim ea0ba27ada live_edit: change the description
Summary: change the description

Test Plan:
1. move the mouse cursor on each live edit item
2. see the tooltip messages

Reviewers: Hermet, NikaWhite, Jaehyun_Cho, bowonryu

Differential Revision: https://phab.enlightenment.org/D4095
2016-06-28 13:44:40 +09:00
Taehyub Kim 0e925d231b tools: change the description
Summary: change the description

Test Plan:
1. toggle dummy parts, mirror mode and parth highlighting
2. see the result

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4094
2016-06-28 13:43:02 +09:00
Hermet Park b11d41d6c2 Remove redundant tools updation call in config change,
instead Update statusbar only here.
2016-06-27 11:48:34 +09:00
Hermet Park 879e56b438 preference_setting: fix a wrong shortcut key info. 2016-06-27 11:38:29 +09:00
Hermet Park 2fef095d4e preference_setting: update tools tooltip msg. 2016-06-27 11:37:31 +09:00
Hermet Park edda0396fa GUI: change the status usability.
Added a toggle option in setting.
and replaced the status shortcut key to F8 from F11.
Now, tools shortcut key is moved to F7.

This change is such a pre-requisition for a file tab feature.
2016-06-27 11:27:39 +09:00
Hermet Park 89866ef74a theme: remove redundant part. 2016-06-25 14:01:11 +09:00
Hermet Park 80010eb72d layout: code refactoring.
use lazy edc style.
2016-06-25 13:45:10 +09:00
Hermet Park 9f8390bf0a fix a dummy swallow/spacer selection bug.
Previously, two parts allowed repeat events,
Below parts would have a mouse events and then selected lastly.

@fix T3737
2016-06-25 12:49:50 +09:00
Hermet Park 5672abf9ce add one more dedicated developer. 2016-06-25 12:39:48 +09:00
Taehyub Kim 3163a95f82 menu: change the description
Summary: change the description

Test Plan:
1. input some text into text view
2. click x button of enventor window
3. see the popup message

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4092
2016-06-25 12:32:47 +09:00
Taehyub Kim b8a1b8865f search: change the description
Summary: change the description

Test Plan:
1. open search window
2. see the text

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4090
2016-06-25 12:27:57 +09:00
Taehyub Kim a9c1c62cbe ctxpopup: apply coding convention
Summary:
apply codinf convention
@fix

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D4085
2016-06-25 12:27:08 +09:00
Taehyub Kim 6a55ec38b8 menu: apply coding convention
Summary:
apply coding convention
@fix

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D4084
2016-06-25 12:26:20 +09:00
Taehyub Kim b8b65b0d3e live_edit: apply coding convention
Summary:
the line is over than 80 character.
@fix

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D4083
2016-06-25 12:25:14 +09:00
Hermet Park d519670f65 update eo usage.
fix build break.
2016-06-25 00:07:01 +09:00
Hermet Park 74855861ca edc_navigator: part exception code still required. my mistake.
now, it this logic coveres the part searching properly.
2016-06-23 20:23:53 +09:00
Hermet Park d627d761ec Revert "edc_navigator: remove redundant compatibility code."
This reverts commit e2f00759de.
2016-06-23 20:15:54 +09:00
Hermet Park e2f00759de edc_navigator: remove redundant compatibility code.
because of this, it occured a corruption for the part searching.
basically, this is unnecessary because it's been covered by part_type.
2016-06-23 20:10:15 +09:00
Hermet Park b959417fdc build: support edje_cc beta feature. 2016-06-23 17:04:22 +09:00
Jaehyun Cho 9d5bf61003 Rename Evas.Object to Efl.Canvas.Object.
This commit applies the following efl commit.

evas: Rename Evas.Object to Efl.Canvas.Object
2016-06-21 17:14:37 +09:00
Bowon Ryu b69a210b00 text_setting: remove dec & inc button on font_size slider
Summary:
ux update for text setting.
remove dec & inc button because uncomfortable.
and adjust slider step.

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4065
2016-06-21 16:24:34 +09:00
Bowon Ryu 8235fa8404 text_setting: add button & spinner for font_size slider
Summary:
ux update for text setting.
add dec & inc buttons and spinner for font_size slider.

Test Plan: esc > settings > text editor

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4057
2016-06-21 14:03:04 +09:00
Hermet Park 53f4b3c28c support the new type vector. 2016-06-20 13:42:36 +09:00
Taehyub Kim 4f4da34c9b edc_editor: rearrange selected part to be placed in center
Summary:
When we search the word or click part in live edit view and edc navigator,
The corresponding name in text view is selected, but it is not center align.
So I make it center align when the word is selected.

@T3326

Test Plan:
1. launch enventor
2. open search window
3. input any word in script
4. click ok forward button
5. check selection part if it is placed in center
6. click a part in live edit view
7. check selection part if it is placed in center
8. click a part name in edc navigator
9. check selection part if it is placed in center

Reviewers: Hermet, Jaehyun_Cho, NikaWhite, bowonryu

Differential Revision: https://phab.enlightenment.org/D4059
2016-06-20 13:10:36 +09:00
Taehyub Kim 04edb800e2 live_edit: refactoring setting relative features
Summary:
There are some hole cases.
For example, if we want to input fixed part
then we had to check fixed option first.
but now, we can input fixed part in any order.
In addition, Unnecessary codes are removed
and added more comments.

Test Plan:
1. launch envnetor.
2. make a live edit item by clicking live edit item on tools.
3. set relatives for the live edit item.
4. double click and insert the item.
5. see the result.

Reviewers: Jaehyun_Cho, NikaWhite, bowonryu, Hermet

Differential Revision: https://phab.enlightenment.org/D4047
2016-06-20 12:12:10 +09:00
Jaehyun Cho 9e98077d30 Fix eo compilation.
This commit applies the following efl commits.

Evas: Move smart_callbacks_descriptions to legacy
Evas: Rename smart object into Efl.Canvas.Group
2016-06-19 12:44:09 +09:00
Jaehyun Cho 86c531cad8 main: Fix workspace path option not to print "TYPE: STR".
ECORE_GETOPT_STORE_METAVAR_STR() prints additional information such as
"TYPE: STR".
Not to print "TYPE: STR", ECORE_GETOPT_APPEND_METAVAR() is used for
workspace path option.
2016-06-14 15:25:17 +09:00
Jaehyun Cho f889d61140 main: Remove redundant code that free ecore getopt list.
Since lists of image paths, font paths, sound paths, and data paths are
free manually, ecore_getopt_list_free() does not need to be called.
2016-06-14 15:14:13 +09:00
Jaehyun Cho 0e54be9d8e main: Fix help contents for workspace path option.
Synchronize help contents for workspace path option with other path
options.
2016-06-13 21:46:59 +09:00
Jaehyun Cho 52695c9a56 main: Fix workspace path option to work.
Workspace path option did not work because option type was changed
incorrectly.
Now the option type has been changed from list strings to one string
correctly.
2016-06-13 13:26:38 +09:00
Hermet Park 1f0df70689 build_setting: update tooltip messages. 2016-06-10 14:28:38 +09:00
Hermet Park e1cde9ffca tools: update tooltip. 2016-06-10 13:59:38 +09:00
Taehyub Kim 29d91c48b3 build_setting: add build setting tooltip messeges
Summary: add build setting tooltip messeges

Test Plan:
1. launch enventor
2. go settign menu
3. click EDC build tab
4. move mouse cursor on each item
5. see the tooltip messeges

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D4034
2016-06-10 13:47:53 +09:00
Hermet Park 87a67d4237 tools: improve tooltip messages for live edit buttons. 2016-06-10 13:27:56 +09:00
Hermet Park bee36c5f6c preference_setting: improve tooltip messages. 2016-06-10 11:44:07 +09:00
Taehyub Kim dae6778bb8 preference_setting: improve tooltips messages
Summary: add more comments for preference

Test Plan:
1. launch enventor
2. move mouse cursor on preference of setting
3. see the tooltip messeges

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D4033
2016-06-10 11:11:59 +09:00
Hermet Park d3bf7d155c status: update tooltip message. 2016-06-10 11:10:42 +09:00
Taehyub Kim cc877931ca statusbar: improve tooltip messages
Summary: add more comments for statusbar tooltip

Test Plan:
1. launch enventor
2. move mouse cursor on statusar tooltips
3. see the message of tooltips

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D4032
2016-06-10 10:45:44 +09:00
Hermet Park 7a9c30c3f1 tools: improve tooltip message. 2016-06-10 10:42:56 +09:00
Taehyub Kim 58fe5e78af tools: improve browser tooltips
Summary: add more comment for broswer tooltips

Test Plan:
1. launch enventor
2. move mouse curor on broswer tooltips
3. see the message of tooltips

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D4031
2016-06-10 10:22:21 +09:00
Hermet Park d1e2b38444 tools: improve tooltip message. 2016-06-10 10:21:41 +09:00
Taehyub Kim 75c20f5ca1 tools: improve tooltips messages of script
Summary: add more comment of script tooltips

Test Plan:
1. launch enventor
2. move mouse cursor on script tooltip
3. see the message of tooltips

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Reviewed By: NikaWhite

Differential Revision: https://phab.enlightenment.org/D4030
2016-06-10 09:51:32 +09:00
Hermet Park 1ad226474c tools: improve tooltip msg. 2016-06-09 11:36:32 +09:00
Hermet Park 234b1926fc Revert "temporary change for release v0.9.0"
This reverts commit 847e84b12d.

enventor v0.9.0 was released.
2016-06-06 17:32:37 +09:00
Hermet Park 847e84b12d temporary change for release v0.9.0 2016-06-06 17:26:42 +09:00
Hermet Park 50f0ab8602 live_edit: work fixed size correctly.
rewrite previous logic to fix potential errors.
2016-06-06 16:21:52 +09:00
Hermet Park a9bfa26c17 live_edit: improve relative to popup gui. 2016-06-06 13:26:42 +09:00
Hermet Park 37fa2ee7e6 live_edit: dismiss relative to ctxpopup only when esc key is pressed. 2016-06-06 12:33:17 +09:00
Hermet Park 96ecc2cde9 live_edit: determine current relative to axis.
relative_x shouldn't be available on top,bottom dragging.
relative_y shouldn't be available on left,right dragging.
2016-06-06 03:47:36 +09:00
Hermet Park 50f663adc2 live_edit: re-implement the relative to function.
still there are plenty of wrong behaviors...
2016-06-06 03:23:56 +09:00
Hermet Park d353764908 live_edit: code refactoring.
just cleane up code.
no logic changes.
2016-06-06 00:58:42 +09:00
Hermet Park a10c2a63dc adjust tooltip delay time. 2016-06-06 00:40:33 +09:00
Hermet Park e0368a9a37 live_edit: code refactoring.
renamed internal variables for readibility.
no logic changes.
2016-06-06 00:36:56 +09:00
Hermet Park 0502123d50 live_edit: code refactoring.
remove duplicated code.
2016-06-06 00:29:07 +09:00
Hermet Park e6fac7b975 live_edit: code refactoring.
remove unnecessary code.
2016-06-06 00:27:38 +09:00
Hermet Park e4157834f4 help: updated history here also. 2016-06-05 14:21:38 +09:00
Hermet Park e941b46899 updated NEWS 2016-06-05 14:16:51 +09:00
Hermet Park 47136e121a update po files 2016-06-05 13:39:20 +09:00
Hermet Park 8ffc1e0a68 bump up version, 0.9.0 2016-06-05 13:34:24 +09:00
Hermet Park 696d9e3f7e updated tools icons.
lines, live textblock
2016-06-05 13:24:17 +09:00
Hermet Park 4da3778f80 removed redundant code 2016-06-05 13:09:52 +09:00
Jaehyun Cho 4e688f87b5 auto_comp: Fix that autocomp list moves to selected part name position.
Previously, autocomp list moved to selected part name position because
autocomp list did not disappear when mouse down event occurred.
Now, an event rectangle is added to catch mouse down event and autocomp
list disappears when mouse down event occurs.

@fix T3738
2016-06-02 22:21:25 +09:00
Bowon Ryu 6371a5d930 edc_navigator: fix evaluation order
Summary: fix static analyzer warning

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4008
2016-06-02 20:17:18 +09:00
Bowon Ryu 8ceeb8b113 live_edit: fix data type for calculate part relative
Summary: fix static analyzer warning.

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4006
2016-06-02 20:15:24 +09:00
Jaehyun Cho 90ad03aa2e enventor: Do not highlight part during live edit mode.
Previously, part highlighting worked if part highlighting button is
clicked or enventor window moves during live edit mode.
Now, part highlighting does not work during live edit mode.

@fix T3653
2016-06-02 19:33:47 +09:00
Jaehyun Cho cd13b0f169 Revert "enventor: Do not highlight part during live edit mode."
This reverts commit 567a38d5e5.

Disable state should not control part highlight state.
2016-06-02 19:21:42 +09:00
Hermet Park 37ba55657b edc_editor: turn off focus highlight effect for code editor.
Editor has its cursor blinking so it doesn't need an additional highlight effect.
2016-06-02 19:15:00 +09:00
Jaehyun Cho 567a38d5e5 enventor: Do not highlight part during live edit mode.
Previously, part highlighting worked if part highlighting button is
clicked or enventor window moves during live edit mode.
Now, part highlighting does not work during live edit mode.

@fix T3653
2016-06-02 19:05:31 +09:00
Bowon Ryu 79ee03693c goto: add NULL check
Summary: fix static analyzer warning

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4005
2016-06-02 16:01:13 +09:00
Bowon Ryu 2889bf140f live_edit: remove same code
Summary: fix static analyzer warning

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4004
2016-06-02 15:32:25 +09:00
Bowon Ryu 7990e68b8e syntax_indent: add NULL check
Summary: fix static analyzer warning

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4003
2016-06-02 15:28:56 +09:00
Bowon Ryu 722d245929 live_edit: add return value
Summary: fix static analyzer warning

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4000
2016-06-02 15:19:23 +09:00
Jaehyun Cho 5f6dd2eb39 edc_parser: Fix memory leak. 2016-06-02 13:23:06 +09:00
Hermet Park 80e637ec89 image_preview: fix the broken image relay function.
this was introduced by e5ffff6872

i didn't catch the case which the string contains a single text.
2016-06-02 12:52:45 +09:00
Bowon Ryu d4a4a4da6c syntax_color: fix wrong indentation
Summary: fix static analyzer warning

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4002
2016-06-02 11:59:54 +09:00
Bowon Ryu 2698280453 template: set uninitialized value
Summary: fix static analyzer warning

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D4001
2016-06-02 11:57:30 +09:00
Hermet Park e5ffff6872 ctxpopup: don't display image preview if image string is in comments.
if image string is in comments, image shouldn't be appeared.
but edc parser didn't compares texts elaborately and it came out error.

now fixed it.

@fix T3740
2016-06-02 00:41:08 +09:00
Hermet Park 925eb77c79 edc_editor: compare name elaboratley to search the part correctly.
when user press a part on the live view, the part name compareing is triggered.
in that sequence, cursor is jump onto the part wrt clicked part.

since, however, the string compare is not enough
the cursor could go on other part which has a similar name.

now compare them in detail to correct this

@fix T3736
2016-06-02 00:26:38 +09:00
Hermet Park 0882acfe93 edc_navigator: compare name elaborately to search the part correctly.
previous string compare is not enough find the string if there are similar ones.

now compare them in detail to correct this.

@fix T3736
2016-06-02 00:08:04 +09:00
Hermet Park 6635a98393 ctxpopup: block whole area if the editor ctxpopup is activated.
Since enventor allowed user to touch outer of editor while its ctxpopup is activated,
the context could be broken.

Block whole area and prevent the context break.

@fix T3752
2016-06-01 23:40:40 +09:00
Hermet Park 73ceae42b5 live_edit: don't highlight lines when ctrl key is pressed.
When user press the ctrl key, then part magnetic effect is always enabled.
it was introduced from missing return function value...

@fix T3741
2016-06-01 23:30:06 +09:00
Hermet Park 47fb10341c main: print warning message correctly.
that message is not about a programmers error but user's mis-usage.
That shouldn't be eina_log_error.
2016-06-01 23:22:03 +09:00
Hermet Park 4276c9479e config: set error-message-red-alert-effect configurable.
that effect is up to user's preference.
let user choose it enabled or not.
2016-06-01 23:19:21 +09:00
Jaehyun Cho c3709b5435 main: Do not overwrite existing EDC with template code.
If existing EDC is opened with -t option, then it is not allowed.

@fix T3745
2016-06-01 22:55:04 +09:00
Hermet Park ad16037c4d renamed about to help.
Come to think of it, About func is more than About.

Help is better name for it.
2016-06-01 22:52:13 +09:00
Hermet Park c410db3b92 main: print help usage with standand output. 2016-06-01 22:44:14 +09:00
Hermet Park 69c85269ce tools: free used eina_list. 2016-05-31 20:12:26 +09:00
Hermet Park fc8096c878 template: updated watchface. 2016-05-31 16:01:29 +09:00
Jaehyun Cho b769398911 template: Fix to insert template code to the correct place.
Previously, template code was inserted before the closing bracket.
Now, template code is inserted after the closing bracket.

Test Plan
1. Open basic.edc.
2. Put mouse cursor the end of the line 18.
3. Press Ctrl + t to insert template code of image part.
2016-05-31 14:25:33 +09:00
Jaehyun Cho 1dd3d5c465 template: Fix line count of textblock part inserted in live edit mode.
Previously, line count was not correct after textblock part is inserted
in live edit mode.
Now, line count is correctly calculated after textblock part is inserted
in live edit mode.

Test Plan
1. Insert textblock part in live edit mode.
2. Check max line number.
2016-05-31 14:12:21 +09:00
Hermet Park 98d9cf4cb0 live_edit: fix the logic to support fixed size.
previous logic was corrupted at some point.
2016-05-29 01:41:52 +09:00
Hermet Park d88a2121e1 live_edit: revise previous patch.
Actually, previous patch is not make sense..
fixed width and height should work exclusively.
2016-05-28 19:42:11 +09:00
Taehyub Kim e30aca010e live_edit: make live edit item fixed when width and height are fixed
Summary:
live_edit: when the live edit item's width and height are fixed,
                  the size of live edit item should be fixed.

Test Plan:
1. launch enventor
2. click a live edit item
3. check all of fixed options
4. do not set relative_to options
5. insert the live edit item to the live view
6. check the inserted item's size whether it is fixed or not

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3976
2016-05-28 19:38:59 +09:00
Hermet Park 3a6d844df2 live_edit: update message. 2016-05-28 19:37:31 +09:00
Taehyub Kim 0e7fd59874 live_edit: add toggle key for enabling and disabling auto align
Summary: add control toggle key for enabling and disabling auto align

Test Plan:
1. launch enventor
2. click a live edit item using toolbar item
3. move the item to the another part
4. press control key when the item is close to the another part
5. check auto align function whether it is disabled or not

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Differential Revision: https://phab.enlightenment.org/D3931
2016-05-28 19:33:56 +09:00
Hermet Park 21957cc7bb template: updates watchface. 2016-05-27 11:57:25 +09:00
Hermet Park f562d86376 templates: add watchface. 2016-05-27 11:50:51 +09:00
Hermet Park 9749d0dfc4 theme: increase minimum size of window.
there many features have come in enventor....
it needs larger space.
2016-05-26 04:32:43 +09:00
Hermet Park 4725daefd3 setting: polish gui. 2016-05-26 02:29:04 +09:00
Hermet Park 431c055a8f replace enventor embedded image. 2016-05-26 01:59:42 +09:00
Hermet Park 75ff3baa67 theme: remove redundant code. 2016-05-26 00:09:42 +09:00
Jaehyun Cho 2d2bb9e3a5 text_setting: Show current font name.
Previously, current font name was not visible because scroller of font
name did not move to the current font name list item.
Now, current font name is visible.
2016-05-25 23:53:56 +09:00
Jaehyun Cho 75206cd36d setting: Reorganize items.
Remove setting items which are already in toolbar area.
Reorganize items in text setting.
2016-05-25 23:53:55 +09:00
Hermet Park fe4cc81da1 updated about 2016-05-25 02:34:00 +09:00
Hermet Park 3f317692cb about: redesign about page. 2016-05-25 02:20:51 +09:00
Hermet Park ab93f6ecb8 update AUTHOR 2016-05-24 12:05:19 +09:00
Hermet Park 3a8320e42d edc_parser: code refactoring.
factorize depth.
2016-05-24 12:03:13 +09:00
Bowon Ryu cc538a8508 edc_parser&autocomp: Fix double click issue on WindowsOS
Summary:
Enventor window stops responding on double clicking "min" on Windows.
Because of approaching the index in which the cur_context doesn't exist, the crash happens.
*cur_context[] in parser_attribute_get() edc_parser.c

Test Plan:
1. launch enventor on Windows
2. add image using live edit
3. double click "min" on editor

@TSAM-3524

Reviewers: Jaehyun_Cho, Hermet

Differential Revision: https://phab.enlightenment.org/D3972
2016-05-24 11:58:35 +09:00
Hermet Park c77cfc6499 fix eo compilation.
Still eo syntax is unstable, enventor keeps updating its usage.
2016-05-24 11:57:31 +09:00
Hermet Park 9e8dce3db8 live_edit: revise previous patch 6fb471d8d4.
redesign ui and clear code.
2016-05-23 22:12:43 +09:00
Taehyub Kim 6fb471d8d4 live_edit: add fixed width and height interface in live edit view
Summary: update fixed width and height interface to choose easier

Test Plan:
1. launch enventor
2. make live edit item by clicking live edit toolbar
3. click fixed width or fixed height check item on setting interface in live edit view
4. set relative_to property by dragging the edge of the part
5. insert the live edit item
6. check the result in text view

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Differential Revision: https://phab.enlightenment.org/D3962
2016-05-23 21:25:30 +09:00
Hermet Park ee41674954 fix broken font sizing short cut key.
now enventor object is nothing more than just eo interface.
actual contents are totally moved on items.
we use item interfaces to figure their zones for mouse wheel events.
2016-05-23 14:25:36 +09:00
Hermet Park 1768d6b388 live_edit: improve status message. 2016-05-23 13:54:53 +09:00
Taehyub Kim f0f7e2dfff live_edit: fix the live edit item moving issue
Summary:
if we move a live edit item by direction key, sometimes pixel is increased by 2 pixels.
so I modified it is increaed by 1 pixed when the scale is larger than 1.0

Test Plan:
1. launch enventor
2. click a live edit item using toolbar
3. move the live edit item by direction key
4. check the change of pixel info

@T3473

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Differential Revision: https://phab.enlightenment.org/D3946
2016-05-23 13:49:41 +09:00
Hermet Park 519bcbedee tools: don't overlay editor buttons on tools buttons.
also, this cleaned edc code nicely.
2016-05-23 00:53:28 +09:00
Hermet Park b204102d80 update template insert button icon image. 2016-05-23 00:17:36 +09:00
Hermet Park 88286c627c live_edit: fix incorrect align line position.
because the computation doesn't considered scroller bar areas,
the position of the align liner wasn't correct.

this is now fixed.
2016-05-22 23:56:49 +09:00
Jaehyun Cho cf4c9ffb94 tools: Add template insert button.
Add template insert button in tools to let users know how to use
template insert function.
2016-05-22 23:34:42 +09:00
Jaehyun Cho 2c0378467c file_browser: Fix not to show file browser if workspace is not set. 2016-05-22 23:00:22 +09:00
Taehyub Kim 4dce517e17 live_edit: remove unnecessary code
Summary:
toolbox object is not used anyware, so I remove it

@fix

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3964
2016-05-22 20:26:39 +09:00
Hermet Park d74f4afed0 updated about 2016-05-22 11:08:20 +09:00
Hermet Park 329d4ba1ff update help for workspace. 2016-05-22 11:00:04 +09:00
Hermet Park 82af282a04 ctxpopup: apply tile bg for image preview. 2016-05-20 05:11:26 +09:00
Hermet Park f47d613c30 live_edit: add edge attaching effect.
if edge of live edit object is attached to other part's,
outline can be highlighted.
2016-05-20 04:49:24 +09:00
Hermet Park 9c8d91cc18 live_edit: initialize static variables. 2016-05-20 03:05:03 +09:00
Hermet Park 259fa2eebd live_edit: code refactoring.
fix coding convention.
2016-05-20 02:51:54 +09:00
Hermet Park c32e417d5d live_edit: remove margin in the spacer image.
spacer margin should be removed from the image
because live edit needs accruate pixel control.
on the other hands, spacer button icon needs margin.

this implementation is a little tricky but i have no idea better than this.
2016-05-20 00:32:25 +09:00
Hermet Park 9ae16dce31 live_edit: fix broken behavior.
when user clicks live edit button multiple files,
it's conext is corrupted.

clean the resource proeprly and make it work back.
2016-05-19 00:34:52 +09:00
Hermet Park e16ff998b1 implementing multi editor support.
this feature will be come gradually...
2016-05-19 00:28:58 +09:00
Jaehyun Cho b6ffc80449 edc_editor: Fix memory leak. 2016-05-18 23:02:55 +09:00
Jaehyun Cho 2fd17c1ed0 file_browser: Fix memory issues.
Fix memory leak and memory double free issues.
2016-05-18 22:08:40 +09:00
Hermet Park 25a34493be remove redundant comments. 2016-05-18 17:46:54 +09:00
Taehyub Kim 7b770ab594 statusbar: update live edit item when view is resized
Summary: update live edit item when view is resized

Test Plan:
1. add a live edit item on live view
2. resize the live view using resize item on statusbar
3. see live edit item is resing well

Reviewers: Hermet, NikaWhite, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3940
2016-05-18 00:24:53 +09:00
Hermet Park f36abe3d3c edc_edit: code refactoring.
font set for editor should be global.
so, take care of this in enventor object data.

This is a partial change for multiple edc editor.
2016-05-17 23:32:34 +09:00
Jaehyun Cho 11f5ebfd49 edc_parser: Fix warnings. 2016-05-17 18:13:03 +09:00
Jaehyun Cho d299c6cde4 enventor_smart: Fix warnings. 2016-05-17 18:13:02 +09:00
Taehyub Kim 9ec8d25c7b layout_common: fix the colorselector scalable
Summary: make the colorselector scalable when the base scale of enventor is changed

Test Plan:
1. Launch Enventor
2. Change the scale
3. Show colorselector by clicking the color keyword
4. Check the colorselector

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3949
2016-05-17 17:45:54 +09:00
Jaehyun Cho e3b07f998e syntax_color: Fix warnings. 2016-05-17 17:40:11 +09:00
Jaehyun Cho 7f86c01a0c syntax_indent: Fix warnings. 2016-05-17 00:52:25 +09:00
Jaehyun Cho ada36237e9 template: Fix warnings. 2016-05-17 00:41:36 +09:00
Jaehyun Cho e7b8554343 main: Fix warnings. 2016-05-16 23:59:23 +09:00
Jaehyun Cho 2854c5ce9e tools: Fix warnings. 2016-05-16 23:38:34 +09:00
Jaehyun Cho 29686022e0 setting: Fix warnings. 2016-05-16 23:32:55 +09:00
Jaehyun Cho 754e629b14 live_edit: Fix warnings. 2016-05-16 23:32:50 +09:00
Taehyub Kim 6ba3339d25 template: fix the fixed condition for relative_to
Summary:
fix the fixed condifion for relative_to.
the condition was wrong, so I fixed it.

Test Plan:
1. Launch Enventor
2. Click a Live Edit Item
3. Check fixed_w and fixed_h
4. Insert the Live Edit Item

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3943
2016-05-16 23:30:26 +09:00
Taehyub Kim afd04c7469 enventor_smart: fix mirror mode for relative_to
Summary:
When we apply mirror mode, we need to considering swap relative_to,
but exist code was not checking null pointer.
so I fixed the logic.

Test Plan:
1. Launch Enventor
2. Apply Mirror Mode
3. Insert a live edit item with relative_set setting

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3942
2016-05-16 23:28:30 +09:00
Jaehyun Cho 9ab099dd4c edc_navigator: Fix warnings. 2016-05-16 22:55:30 +09:00
Jaehyun Cho 03ffd3a8c4 file_browser: Fix warnings. 2016-05-16 22:45:16 +09:00
Jaehyun Cho 54698e69d9 enventor: Fix eo. 2016-05-16 00:29:02 +09:00
Hermet Park 87b107604b template: apply lazy style for spacer template. 2016-05-15 17:57:49 +09:00
Jaehyun Cho 5268e282d5 file_browser: Set NULL to freed data pointer to prevent double free.
To prevent double free when genlist items are expanded and contracted,
set NULL to freed data pointer.
2016-05-14 19:59:19 +09:00
Jaehyun Cho 2b40c0a170 file_browser: Fix to display refresh button only on workspace.
Previously, refresh button is displayed on all directories.
Now, refresh button is displayed only on workspace directory.
2016-05-14 19:41:35 +09:00
Hermet Park 682d95c1f0 edc_navigator: remove redundant code.
genlit fixed content the re-usage issue.
now this code it no more necessary here.
2016-05-14 19:32:35 +09:00
Hermet Park 96f1fc1c28 update a usage of namingspace for evas object smart. 2016-05-13 00:45:48 +09:00
Taehyub 5194059b40 live_edit: Add new feature about setting relative_to among the exist parts
Summary:
Add new interface feature about setting relative_to to make relationship esaily
between part and part. Now, we can make the relationship using just mouse interface.

Test Plan:
1. launch enventor
2. add live edit item using live edit toolbar
3. drag the item to the another part
4. move a control point that you want to make a relationship to the another part edge
5. and then relative_to ctxpopup is shown
6. select the relative_to item in the ctxpopup
7. insert the live edit item with double click
8. check the inserted code whether it is make relationship or not

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3936
2016-05-11 21:57:51 +09:00
Hermet Park b1b1583b54 tools: fixed 0 1; warning issue. 2016-05-10 23:29:59 +09:00
Jaehyun Cho 5dbfbd64f3 tools: Divide tools into live view tools and text editor tools.
Now tools are divided into live view tools and text editor tools based
on their functions.
Region for file browser tools and edc navigator tools is also reserved.
2016-05-10 23:19:36 +09:00
Jaehyun Cho 7a85d0bc3b live_edit: Remove unused code.
live_edit does not need trigger any more. Therefore, code related to
trigger is removed.
2016-05-10 23:19:04 +09:00
Hermet Park 5450bcdf1b file_browser: just comment fixed. 2016-05-08 04:52:33 +09:00
Hermet Park 5c21ca9ba9 file_browser: refactoring internals.
remove unnecessary edc usage.

and don't surprise even though refresh button generation is wierd.
That is about genlist bug and will be fixed there soon.
2016-05-08 04:49:55 +09:00
Hermet Park c20a47bced edc_edit: code refactoring.
toggle option for ctxpopup should be global.
so, take care of this in enventor object data.

This is a partial change for multiple edc editor.
2016-05-08 03:16:46 +09:00
Hermet Park a77f756735 edc_edit: fixed redo undo short cut keys.
there were still wrong implementation. fixed them.
2016-05-08 03:11:04 +09:00
Hermet Park 47bbaf731b edc_edit: fix broken ctrl+z, ctrl+r short-cut key events.
This was introduced from previous patches.
Now initialization point of edit_data is next to the efl lib initialization.
This broke this and now i fixed this with dispatching way.
2016-05-08 02:55:46 +09:00
Hermet Park 512e13a626 redoundo: fix invalid timer usage.
don't access freed timer.

@fix
2016-05-08 02:36:52 +09:00
Hermet Park 0b27ce5474 redoundo: code refactoring.
toggle option for redoundo should be global.
so, take care of this in enventor object data.
2016-05-08 02:34:31 +09:00
Hermet Park e36b84e53d internal changes for supporting multiple editor.
loose the dependency of edc_edit with enventor instance.
2016-05-07 23:14:45 +09:00
Hermet Park 047c9ff238 refactoring for multiple edc editor.
move editor attributes out of edc_edit.
since those attributes should be applied through editors.
2016-05-07 17:35:07 +09:00
Hermet Park ae7f3e30b3 redoundo: do coupling with edc_edit instance.
one redoundo should work with it's owner editor.

This is a refactoring for multiple edc editor.
2016-05-07 04:14:47 +09:00
Hermet Park dc916f0dfe syntax_indent: code refactoring.
1. reuse exisiting strbuf.
2. fix code convention.
3. coupling with editor entry.
2016-05-07 02:58:26 +09:00
Hermet Park fa3dc0cc3a just rename file.
indent -> syntax_indent
2016-05-07 02:32:05 +09:00
Hermet Park fa1d1fc6d7 syntax_color: reorganize internals for multiple edc editor.
place a global syntax color source to share throught editor instances.

This is a partial change for supporting multiple edc files.
2016-05-07 01:46:58 +09:00
Jaehyun Cho 1b5054c1eb file_browser: Disable functions if workspace is not set.
Workspace layout is disabled to disable functions in file browser if
workspace is not set.
2016-05-04 15:10:26 +09:00
Jaehyun Cho b34c637273 file_browser: Add file search function.
If a search word is input, then files which contain the search word in
their file names are displayed.
To show file icons clearly in search mode, file icon images of file
browser are modified.

@T3579
2016-05-04 15:10:25 +09:00
Taehyub Kim 279eea73eb live_edit: add new feature about auto align
Summary:
when we are layouting using live edit item,
It is hart to align the inserting item among the exist parts.
so add auto align feature to align easily.

Test Plan:
1. launch enventor
2. add a live item using the toolbar
3. move and resize the live item in live view
4. check the auto align function when the item near another part

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Differential Revision: https://phab.enlightenment.org/D3884
2016-05-03 16:53:07 +09:00
Jaehyun Cho cfc55700ce file_browser: Expand current directory only.
Previously, file browser expands all directory hierarchy.
Now, file browser expands current directory only.
Moreover, directory's sub file data is created when the directory is
expanded to support deep directory hierarchy.
2016-05-03 14:47:33 +09:00
Jaehyun Cho 5e4cbcfc9c file_browser: Fix crash that occurs when file does not exist.
ecore_file_exists() returns EINA_FALSE for some cases although the given
file exists. This commit is for the above malfunction cases.
2016-05-03 13:11:23 +09:00
Hermet Park d5a3c29f36 file_browser: adjust refresh button position. 2016-05-02 22:55:33 +09:00
Jaehyun Cho 037f9d4283 file_browser: Apply resource file icons.
Apply edc, image, sound, and font file icons.
2016-05-02 19:45:44 +09:00
Jaehyun Cho a030df08d1 file_browser: Fix "Workspace" text position. 2016-05-02 19:45:03 +09:00
Jaehyun Cho a176e619e6 file_browser: Support "Show All Files" function.
By default, file browser shows resource type files only such as edc,
image, sound, and font type files.
If the "Show All Files" check is on, then file browser shows all types
of files.

@T3390
2016-05-02 15:49:14 +09:00
Jaehyun Cho 48fb17f938 file_browser: Change refresh button.
Change the refresh button to an icon button and move it next to the
"Workspace".
2016-05-02 15:49:00 +09:00
Jaehyun Cho f84eeb951e file_browser: Remove "Collections EDC".
Normally collections edc is included in the workspace directory.
Therefore, "Collections EDC" item is removed from the file browser.
2016-05-02 15:48:58 +09:00
Hermet Park 084fbd4b62 add TODO for multiple file editor. 2016-05-01 22:26:12 +09:00
Hermet Park 22fc5a96e5 edc_parser: fix wrong value.
base_scale shouldn't be zero.
2016-05-01 22:07:42 +09:00
Hermet Park 6946d1f715 additional implementation for multiple edc editor.
some missing implementation from bea4735e02.
2016-05-01 22:05:20 +09:00
Hermet Park 3db7a0a7c8 remove EINA_REF
This looks quitely unnecesary. go away from here.
2016-05-01 21:21:40 +09:00
Hermet Park bea4735e02 Change Enventor API.
This is a partial change for supporting multiple edc files.

enventor_object_file_set() -> enventor_object_main_file_set()
2016-05-01 21:16:31 +09:00
Hermet Park e08cc69795 code refactoring
change declarations type of enventor object

from Evas_Object to Enventor_Object
2016-05-01 20:27:08 +09:00
Hermet Park 9c2748d95b code refactoring.
put declarations at proper positions.
2016-05-01 17:31:37 +09:00
Hermet Park bd78cafef4 theme: update invert size icon. 2016-05-01 16:22:05 +09:00
Hermet Park dfd4a1acde theme: update expand icon design. 2016-05-01 16:04:04 +09:00
Hermet Park c33f835836 live_edit: fix center guide text positioning problem.
This problem looks it just introduced from copy & paste...

@fix T3568
2016-04-28 22:45:20 +09:00
Jaehyun Cho 0f3740630e file_browser: Add refresh button.
When refresh button is clicked, then all directories in file browser are
updated.
2016-04-28 17:51:09 +09:00
Hermet Park 8c6da49ae1 colorpalette: remove fixed warnings. 2016-04-27 00:06:25 +09:00
Hermet Park 1c21a8538f status: adjust stats msg idle time.
as well as some messages.
2016-04-27 00:03:25 +09:00
Hermet Park d38facff7f edc_editor: fix a broken ctxpopup image relay behavior.
Next image word selection was broken.
so, the selection was a little twisted.
It seems something has been changed in entry.
Anyhow, it's fixed in enventor side. :(

@fix T3258
2016-04-26 23:41:40 +09:00
Hermet Park 8d109970c6 code refactoring.
sanitize duplicated error message code.
2016-04-26 23:13:42 +09:00
Hermet Park e7bc310f1b edc_editor: free used memory. 2016-04-26 22:58:46 +09:00
Hermet Park 99eee8091e ctxpopup: fix a broken ctxpopup image relay behavior.
grab keys to ensure key events.

fix @T3271
2016-04-26 22:18:05 +09:00
Hermet Park d271175953 fix unexpected close on edc navigator.
if edj view failed to load a edj, edje_edit apis will occur crashes.
we could avoid this crash in enventor side.

@fix T3510
2016-04-26 20:39:44 +09:00
Hermet Park e263ffa002 edc_navigator: removed auto contraction option.
I've tried this.
And concluded this is not necessary in point of user experience.
2016-04-25 11:50:26 +09:00
Hermet Park ce9c4ba4e5 edc_navigator: ++safety. 2016-04-23 14:06:28 +09:00
Hermet Park 2b7a8af2ce edc_navigator: fix item contents remaining bugs.
Genlist reuses the contents unintendly.
Definitely, This is a genlist bug
and it looks a side effect of resuable contents feature. :(
2016-04-23 13:53:37 +09:00
Hermet Park 6f9d51e28b edc_navigator: optimize state update logic.
don't need to flush every updation time.
we only update changed states.
2016-04-23 13:27:58 +09:00
Hermet Park a4d4fb748c edc_navigator: support stop all programs.
for this, added one more api, enventor_object_programs_stop()
2016-04-23 13:15:32 +09:00
Hermet Park 97fbb51062 edc_navigator: add play button icon. 2016-04-23 11:43:47 +09:00
Hermet Park 087538ce0c tiny optimization.
sharing enventor string names.
2016-04-23 11:30:36 +09:00
Hermet Park b2cf6c3f48 edc_navigator: support tooltip message. 2016-04-23 11:22:48 +09:00
Hermet Park 955b762ecc edc_navigator: provide a program launch button.
Now launching program by double clicking the program part in the code
is removed! This was not intuitive.
2016-04-22 19:31:07 +09:00
Hermet Park e70197ff49 edc_navigator: don't sorted insert for groups and programs.
I found a genlist has a logical error (probably).
This change avoid that error.
But even programs and groups doesn't need a sorting.
2016-04-22 18:34:02 +09:00
Jaehyun Cho fef19af88e file_browser: Refactorying code. 2016-04-22 18:27:04 +09:00
Hermet Park 0f6a9873ce edc_navigator: deselect an selected item when user focuses on editing. 2016-04-22 17:39:13 +09:00
Jaehyun Cho 12cdcc0ee3 indent: Fix to calculate indent depth after multi line comment.
Previously, if '{' and '}' appear right after multi line comment,
the indent depth for those brackets was not calculated.
Now indent depth for those brackets is calculated correctly.

Test Plan:
1. Launch enventor.
2. Insert a group template. (Ctrl + T after collections)
3. Save the modified EDC.
4. Load the modified EDC.
2016-04-22 16:27:34 +09:00
Hermet Park 386edb7ab5 edc_navigator: store/restore auto contraction mode. 2016-04-22 16:22:53 +09:00
Taehyub Kim 876903f918 template: fix the error of line position when inserting group template
Summary:
fix the error operation of group template insertion.
The line position would be broken after inserting group template.
so I fixed it.

Test Plan:
1. launch enventor
2. insert group template using Ctrl + T
3. check the line position of source code whether it is corrected or not

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3908
2016-04-22 15:44:18 +09:00
Hermet Park 4ee083fdac edc_navigator: feature extension.
Now this function has an option for auto contraction.

User could choose one of them for their taste.
2016-04-22 15:39:24 +09:00
Hermet Park 10fcefe123 fileselector: fixed a fixed 0 1 warning. 2016-04-20 23:33:01 +09:00
Hermet Park a8fd04d63f make it compileable.
up to update eo syntaxes.
2016-04-20 23:28:42 +09:00
Hermet Park c139a34f6a console: arrange default console height. 2016-04-18 16:48:17 +09:00
Jaehyun Cho e68d886937 templates: Remove newlines at the end of EDC template files.
EDC template files were created by vim and vim produces newlines at the
end of files. This causes an unexpected newline at the end of loaded EDC
template files.
This commit fixes T3429.
2016-04-18 14:25:13 +09:00
Taehyub Kim c1aae66795 live_edit: support direction key events for moving live edit item
Summary:
before, we cannot move the live edit item using direction key.
now we can modify it using direction key.

@T3356

Test Plan:
1. launch enventor
2. insert a live edit item
3. move the item using direction key

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Differential Revision: https://phab.enlightenment.org/D3862
2016-04-18 14:04:28 +09:00
Hermet Park 59914e5a9e setting: improve preference gui 2016-04-17 14:27:07 +09:00
Hermet Park 9da3ee6bf5 setting: adjust font style list width 2016-04-17 13:59:53 +09:00
Hermet Park b04b7dde28 setting: refactoring code.
split preference setting code from general setting.
2016-04-17 13:48:35 +09:00
Hermet Park 8f91d45ff1 setting: reorganize setting view. 2016-04-17 13:31:27 +09:00
Hermet Park e6bfbd85c9 setting: code refactoring
internal variable name change.

there are no tabbar in elementary.
2016-04-17 11:12:53 +09:00
Hermet Park 8a837c3b4a setting: code refactoring.
clean up code.

this is one step for setting extension.
2016-04-16 00:52:46 +09:00
Jaehyun Cho 2be4e6c3d3 file_browser: Show workspace directory.
File browser shows workspace directory and its sub files.
Workspace directory is set with argument "-w" and directory path.
(e.g. enventor -w ./workspace)

This commit implements T3389.
2016-04-15 21:06:45 +09:00
Hermet Park 3beb93cf26 live_view: replace bg image. 2016-04-15 20:23:35 +09:00
Hermet Park c8f5b31b6f edc_navigator: improve icon quality. 2016-04-15 19:32:23 +09:00
Jaehyun Cho ff8136dbf3 file_browser: Add file browser.
File browser shows "collections" main EDC.

This commit implements T3388.
2016-04-15 18:54:02 +09:00
Hermet Park cbf12e2a80 replace swallow icon 2016-04-15 16:58:10 +09:00
Hermet Park e94c7bdc12 update text & textblock template code 2016-04-15 16:37:25 +09:00
Hermet Park 8b28c062d9 devel version is always higher than released version of enventor.
by doing this, your enventor could work with enventor libaries of devel version.
2016-04-14 19:31:52 +09:00
Hermet Park 829e309692 redoundo - remove redundant code. 2016-04-13 21:53:55 +09:00
Mykyta Biliavskyi aa8dc3a8dd Undo/redo: correct work with unicode symbols.
@fix T3420
2016-04-06 15:09:09 +09:00
Jaehyun Cho ff7ca0ee79 indent: Refactoring indentation.
Fix indentation issues by refactoring indentation logic.
2016-04-04 21:03:31 +09:00
Mykyta Biliavskyi 6ab19b2b87 Redoundo: enable smart analyze for a pushed region text.
Manage text blocks, that used for autocomplete feature.
This  commit make possible to undo or redo whole block of text
including user input. For example: user types "col"
and choose "collections" from ctxpopup. In normal mode
of  undoredo module in case of undo action will be left
"col"  text. In smart mode whole block "collections" will be deleted.
2016-04-04 18:01:37 +09:00
Mykyta Biliavskyi 5c95fa6e17 Redoundo: enhance smart functions.
Add support autointendation in smart redoundo.
Undo/redo adding or deleting line  will done in one action.
2016-04-04 16:50:08 +09:00
Hermet Park 9caad87f12 add missing images part in a group template code.
@fix
2016-04-01 16:42:28 +09:00
Taehyub Kim 3b038768f5 template: improve adding template of image resource do not duplicate
Summary:
when we insert image template or live view item,
the template code of image resource will be duplicated.
so, I added the code checking template image resource not to be duplicate

Test Plan:
1. launch enventor
2. add image part twice using ctrl + t or live view item
3. see the images block has an ENVENTOR_EMBEDDED_LOGO.png

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3851
2016-04-01 16:33:34 +09:00
Hermet Park 09bf899aed refactoring console code.
just rewrite code for readibility.

no logic change.
2016-04-01 16:21:38 +09:00
Taehyub Kim a360601aa4 console: hide unnecessary console error line
Summary:
Actually it is unnecessary error log below the first line.
so I skipped the log

Test Plan:
1. launch enventor
2. make an error
3. see the console log in single line

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3845
2016-04-01 16:12:20 +09:00
Hermet Park a07d7c0120 reverse live edit coordinates when mirror mode is enabled.
literally, the origin of the coordinates should be reversed on the mirrored mode.
2016-03-29 20:07:46 +09:00
Taehyub Kim d4ea957246 edj_viewer: fix the residual spacer parts when mirror mode is applied
Summary:
When mirror mode is toggled, the position of spacer parts in preview is not changed.
So I added the code to update spacer parts.

@T3367

Test Plan:
1. laucnch enventor
2. added the spacer to preview
3. toggle mirror mode more than two times.
4. see the spacer parts whether it is updated or not

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3835
2016-03-29 19:41:58 +09:00
Taehyub Kim 6b19c191ac enventor_smart: make the position of live edit item show correctly when mirror mode is applied
Summary:
when mirror mode is applied, the live edit item is added to wrong position.
so I added mirror mode checking to show correctly.

@T3368

Test Plan:
1. launcher enventor
2. enable mirror mode
3. add a live edit item to preview
4. check that the position of the item is right

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3834
2016-03-29 19:38:54 +09:00
Hermet Park c0942cd60a editor: removed a fixed 1 0; warning. 2016-03-29 08:35:19 +09:00
Mykyta Biliavskyi 7a3aff94c3 Enventor smart: create new empty file in file_set.
Fix T3275
2016-03-25 17:22:06 +09:00
Hermet Park 9ed5a70ac8 edj_viewer: refactoring mirror mode code.
simpler and nicer code.
2016-03-25 16:33:38 +09:00
taehyub 3b06354c67 update the mirror mode icon
Summary: update mirror mode icon

Test Plan:
1. launch enventor
2. see the mirror mode icon

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3830
2016-03-25 15:18:48 +09:00
Hermet Park 5bf8018118 statusbar: adjust statusbar tooltip direction. 2016-03-25 13:45:39 +09:00
Hermet Park ccbf9d65c6 tools: arrange mirror mode tooltip direction. 2016-03-25 13:39:57 +09:00
taehyub df7a9f51f8 tools: support mirror mode
Summary: Added new toolbar item to support mirror mode

Test Plan:
1. luanch enventor
2. toggle mirror mode item of toolbar at the left-top or press ctrl + M
3. see the mirror mode working well

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Differential Revision: https://phab.enlightenment.org/D3813
2016-03-25 13:30:33 +09:00
taehyub 21ed85b72b syntax_color: improve string syntax color logic
Summary:
If we input the quotation mark("), the code under the mark are changed to gray.
so I changed the limitation from the start of quotation mark to the end of the line.

Test Plan:
1. launch enventor
2. input the quotation mark(") in the middle of the code
3. see the syntax color change range about string syntax color

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3825
2016-03-25 13:18:06 +09:00
taehyub d0db6015e3 template: change the template code of basic.edc
Summary:
It is better the image resource block is in the group.
so I moved the block into the group in basic.edc

Test Plan:
1. launch enventor
2. create new file as basic
3. see the image resource block in group

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Differential Revision: https://phab.enlightenment.org/D3816
2016-03-24 21:38:07 +09:00
Jaehyun Cho 849c01410c edj_viewer: Check if edj file set is finished.
Check if edj file set is finished and do not call edje_edit functions if
edj file set is not finished.

Test Plan:
1. Open edc
2. Modify edc incorrectly (e.g. Remove semicolon)
3. Save edc
4. Open the saved edc
5. Mouse double click "target" in program.
2016-03-23 23:04:56 +09:00
Yongheon, Shin e20bca7f4f Update dummy part when removing all source code
Summary:
In my opinion, the solution can move the position of update_edj_file_internal(vd) in update_edj_file.
However, I added dummy_obj_update only above failure case of edj load.

Test Plan:
1. Run Enventor and Load basic edc file
2. Select all source code with Ctrl+A and remove them with del or backspace.
3. Check the dummy part

Reviewers: Jaehyun_Cho, Hermet

Subscribers: Jaehyun_Cho, Hermet

Differential Revision: https://phab.enlightenment.org/D3808
2016-03-22 19:04:16 +09:00
taehyub 77b342d619 template_code: remove the image's comment to look better
Summary:
improve the image's template code.
when inserting image's template code,
images block has redundant annotation.

Test Plan:
1. insert image's part using ctrl + t
2. see the images part and check the difference with before

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3814
2016-03-22 11:01:07 +09:00
Yongheon, Shin 41a320bc89 (T3274) Fix Crash issue when removing all code in edc editor
Summary:
- When calculating the position of cursor, the code cannot get group information.
  So, if we cannot get group information including position, add blocking code.

Test Plan:
1. Open Enventor
2. Remove all code after selecting with Ctrl+a
3. Click any part in edj editor

Reviewers: Hermet, Jaehyun_Cho

Subscribers: Jaehyun_Cho, Hermet

Differential Revision: https://phab.enlightenment.org/D3804
2016-03-18 18:04:15 +09:00
Jaehyun Cho 99b9790146 live_edit: fix malfunction of key input on Windows system.
re-implement live edit key input by using key grab mechanism.
This commit is based on commit 502a826599.

@fix
2016-03-17 20:07:06 +09:00
Jaehyun Cho eb1f95d02c edc_editor: Fix to allocate memory including null character '\0'.
Without this patch, crash sometimes happens when preview part is clicked
on Windows.
2016-03-17 17:55:57 +09:00
Jaehyun Cho e940639079 indent: Check '\r' when indented code line is created on Windows.
On Windows, new line is represented as "\r\n".
Therefore, '\r' is checked when indented code line is created.
Otherwise, unnecessary newlines are inserted after indentation on
Windows.
2016-03-17 15:41:27 +09:00
Yongheon, Shin 842341bea2 [T3267] improve part name for more formal naming rule
Summary:
Current generated part name from the live edit is too unfamiliar with users.
We need to improve for more formal naming rule like,
ex) rect_xxxx
    image_xxxx
    swallow_xxxx

Test Plan:
1. Open Enventor
2. Add rect, image, swllow, text, textblock, spacer

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Subscribers: Jaehyun_Cho, Hermet

Differential Revision: https://phab.enlightenment.org/D3793
2016-03-17 14:38:28 +09:00
Hermet Park d23793101b statusbar: fix view sizing issue when an invert button is clicked repeatedly.
previously, the button was available even if the inverting animation was going
on. This caused the corruption view size because of context loss.

We could avoid this issue by freezing button when transition is going on.
2016-03-16 21:27:04 +09:00
Hermet Park 18ca260c1a edc_navigator: fix the editor cursor jump issue.
Skip a group selection callback because it leads the editor cursor jump on to
the group area. But this group updation could be triggered in a various
scenario. The cursor should be jumped only when user clicked a group item
in the genlist.
2016-03-16 20:02:32 +09:00
Mykyta Biliavskyi 397821a3a4 Layout: change behaviuor for hide edc_navigator swallow object.
When edc.navigator swallow is hidden it placed outside main markup.
2016-03-16 14:55:37 +09:00
Hermet Park 5c40f9b8f6 remove broken theme extension code.
redundant code were remained uselessly.
these were catched by edje error logs.
2016-03-16 13:02:43 +09:00
Jaehyun Cho 227b549805 Revert "Revert "Revert "edc_editor: Support auto save to update preview."""
This reverts commit a3185bc64b.

Apply auto save in the future after resolving side effects.

Conflicts:
	src/lib/edc_editor.c
2016-03-16 11:30:41 +09:00
Jaehyun Cho 8935ac45a5 Replace elm_app_name_get() with "enventor" for Windows.
On Windows, elm_app_name_get() returns "enventor.exe".
To set "enventor" style, elm_app_name_get() is replaced with "enventor".
2016-03-14 17:19:13 +09:00
Jaehyun Cho f26e60d624 indent: Fix to paste a word at correct position.
Do not apply indentation when pasted string does not contain keywords
which cause a new line. (e.g. string not containing ';')

Test Plan:
1. Open basic.edc
2. Copy "default"
3. Paste at the same position.
2016-03-14 15:13:36 +09:00
Jaehyun Cho fa76bf2aee setting: Fix edc navigator toggle to work.
When Apply button is clicked, state of edc navigator toggle is applied.
When Reset button is clicked, state of edc navigator toggle is restored.
2016-03-14 14:15:56 +09:00
Hermet Park d77d8f7a50 + syntax color keywords 2016-03-12 15:17:44 +09:00
Tom Hacohen 0e03164b68 Revert "fix the build break that introduced by eo syntax change."
This reverts commit 986663f5ed.
2016-03-11 12:42:09 +00:00
Hermet Park 986663f5ed fix the build break that introduced by eo syntax change. 2016-03-11 17:38:36 +09:00
Hermet Park d2d0b8c33b updated po 2016-03-11 17:38:27 +09:00
Hermet Park 498c1259eb Revert "Revert "Fix to apply Eo4.""
This reverts commit e67a1d1607.

0.8.0 was released. revert this again.
2016-03-08 16:53:27 +09:00
Hermet Park 3869e9acc8 Revert "Revert "editor: don't auto save always.""
This reverts commit aa6607c616.

0.8.0 was released. revert this again.
2016-03-08 16:53:13 +09:00
Hermet Park a3185bc64b Revert "Revert "edc_editor: Support auto save to update preview.""
This reverts commit b663d049db.

0.8.0 was released. revert this again.
2016-03-08 16:52:34 +09:00
Hermet Park 5cc7bc4770 fix makedist failure.
include missing resources.
2016-03-08 16:34:21 +09:00
Hermet Park b663d049db Revert "edc_editor: Support auto save to update preview."
This reverts commit 509b9bd628.
2016-03-08 10:17:25 +09:00
Hermet Park aa6607c616 Revert "editor: don't auto save always."
This reverts commit 3a2c08e6c5.

Revert this temporarily for release enventor 0.8.0
2016-03-08 10:16:55 +09:00
Hermet Park e67a1d1607 Revert "Fix to apply Eo4."
This reverts commit b656f774d9.

Revert this for enventor 0.8.0 release.
2016-03-08 10:16:04 +09:00
Hermet Park 8f53a8d9cf indent: free code line resource properly. 2016-03-07 23:42:10 +09:00
Hermet Park 55987e5774 edc_parser: fix one more memory leak. 2016-03-07 23:26:00 +09:00
Hermet Park f760fd4144 edc_parser: go away memory leaks! 2016-03-07 23:22:22 +09:00
Hermet Park 79f10753fe edc_editor: one more memory leak :( 2016-03-07 22:55:34 +09:00
Hermet Park ce3b32741d edc_editor: free string memory after use them. 2016-03-07 22:53:51 +09:00
Hermet Park 135af1a13f console: free memory after used it. 2016-03-07 22:41:31 +09:00
Hermet Park 8500ebbb80 indent: add a comment to be fixed. 2016-03-07 22:35:53 +09:00
Hermet Park 442c22e28a edc_parser: remove memory leak. 2016-03-07 22:30:16 +09:00
Hermet Park 9b48678c70 dummy_obj: don't allocate memory if the object is invalid. 2016-03-07 22:28:57 +09:00
Hermet Park f26a4db691 edc_editor: free string resources after it used. 2016-03-07 22:22:31 +09:00
Hermet Park c03187f3cd panes: free all transits when enventor is terminated. 2016-03-07 22:14:45 +09:00
Hermet Park 160489f60e updated AUTHORS 2016-03-07 21:52:52 +09:00
Hermet Park ea3d989d70 edc_parser: remove unnecessary code. 2016-03-07 21:50:30 +09:00
Hermet Park 665bcb9b55 edc_parser: fix typo. 2016-03-07 20:47:24 +09:00
Hermet Park 6280b1e680 Revert "edc_parser: check null for code safety"
This reverts commit ed5c01209d.
2016-03-07 20:45:11 +09:00
taehyub ed5c01209d edc_parser: check null for code safety
Summary:
check null for code safety

@fix

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3776
2016-03-07 20:44:23 +09:00
Jaehyun Cho 3530641830 main: Use destination length in snprintf.
Use destination length instead of source length in snprintf.
2016-03-07 20:42:35 +09:00
taehyub 651d8551a3 main: change sprintf to snprintf
Summary: change sprintf to snprintf for code safety

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3773
2016-03-07 20:30:49 +09:00
taehyub 58f08915e9 edc_editor: change sprintf to snprintf
Summary: change sprintf to snprintf for code safety

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3774
2016-03-07 20:30:49 +09:00
taehyub 1a0f3c7e1d config_data: change sprintf function to snprintf function
Summary:
change sprintf to snprintf for code safety

@fix

Reviewers: Hermet, NikaWhite, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3772
2016-03-07 20:22:09 +09:00
Hermet Park bdbf20acd8 update NEWS 2016-03-07 20:19:54 +09:00
Hermet Park 87820ee919 updated README 2016-03-07 20:19:54 +09:00
taehyub 6ad27f9fbe newfile: change sprintf function to snprintf function
Summary:
change sprintf to snprintf for code safety

@fix

Reviewers: Hermet, NikaWhite, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3771
2016-03-07 20:18:38 +09:00
Jaehyun Cho d4fec9c7d2 dummy_obj: Print error when setting swallow image is failed.
If setting swallow image from edje file is failed, then print error.
2016-03-07 20:14:02 +09:00
Jaehyun Cho cab91580fe config_data: Terminate if config init is failed.
If config init is failed, then initialization is stopped and terminated.

@fix
2016-03-07 19:56:35 +09:00
Jaehyun Cho d0ef7f8c68 setting: Check entry string before translating to integer.
@fix
2016-03-07 19:34:41 +09:00
Hermet Park 6890a0fc67 bump up version 2016-03-07 19:14:18 +09:00
Jaehyun Cho d64c7ca196 live_edit: Prevent memory overflow case.
Emum value Ctrl_Pt_Cnt is only used to set array size.
Therefore, Ctrl_Pt_Cnt should not be used as an index value.

@fix
2016-03-07 17:22:34 +09:00
taehyub 49fae1fe40 text_setting: fix the unsafe code of string function
Summary:
fix the unsafe code like strcat and strcpy.
it is changed to strncpy, strncat

@fix

Reviewers: Hermet, NikaWhite, Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3761
2016-03-07 12:13:07 +09:00
taehyub 3a4e1dec9e enventor_smart: change the postfix operator to prefix operator to check next pointer
Summary:
if(!(ptr++)) code check current pointer then it is updated next pointer.
so I changed the postfix operator to prefix operator to check next pointer in the condition.

@fix

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3762
2016-03-07 12:02:09 +09:00
Hermet Park 3f8dfe944c edj_viewer: fix a problem that live view failed to update images.
This problem scenario belongs to the image modification by an other process.
If an image size is very huge, live view possibly lost the image monitoring
because of asynchorous file handling.

Here solution is to update images repeatedly for those unexpected case.

@fix T3094
2016-03-05 13:02:18 +09:00
Hermet Park 964a31831d remove compile warnings.
1. unused variable.
2. compare signed and unsigned
3. undelcared function call.
2016-03-05 11:49:12 +09:00
Hermet Park 6428fd4ede remove compile warnings.
insert brackets to declare structure initial values clearly.
2016-03-05 11:40:18 +09:00
Hermet Park 78ec05cb0d get rid of compile warnings.
use parentheses around assignment used as truth value.
2016-03-05 11:34:46 +09:00
Hermet Park 3a43682695 remove unused compile warnings. 2016-03-05 11:31:37 +09:00
Hermet Park 6d2b4a01b4 remove unused compile warnings. 2016-03-05 11:27:24 +09:00
Hermet Park 3a2c08e6c5 editor: don't auto save always.
If save has been accomplished, we can skip a auto save.

This auto save brings enventor unexpected error highlighting twice.
2016-03-05 11:17:15 +09:00
Hermet Park 5900c6ac37 editor: restore error underline style. 2016-03-05 11:13:35 +09:00
Hermet Park 332bbeda4f editor: reset cursor position when edc is loaded.
edc editor needs to reset cursor position when a edc is newly loaded.

People granted this behavior.
2016-03-05 00:31:28 +09:00
Hermet Park 7795dbe101 editor: fix initial max line 0 issue.
Update max line correctly of the statusbar.
This fix brought Enventor_Max_Line passed away
because Enventor_Cursor_Line can be used instead.

@fix
2016-03-05 00:26:41 +09:00
Hermet Park da5134a165 status: update line ui. 2016-03-05 00:06:35 +09:00
Hermet Park 683e13de47 update status cursor image. 2016-03-05 00:02:54 +09:00
Hermet Park e78aec8ef6 statusbar: replace a group guide text with a group icon. 2016-03-04 23:58:38 +09:00
taehyub c8f5d743cb goto: add null checking about the return value of elm_entry_entry_get
Summary:
there is no null checking condition,
so I added the null checking condition about the return value of elm_entry_entry_get.
@fix

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3763
2016-03-04 23:39:35 +09:00
taehyub a512a80782 edc_editor: add null checking in error_line_num_highlight function
Summary:
in error_line_num_highlight, utf8 can be null.
so, I added null checking about it.

@fix

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3764
2016-03-04 23:39:14 +09:00
taehyub 20b99c0d48 base_gui: fix the wrong condition
Summary:
There is a wrong condition in base_gui.c like if ((w>0) && (w>0)).
The condition compares to same rule.

@fix

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3767
2016-03-04 23:38:41 +09:00
taehyub 04415c8d70 edc_navigator: add return value
Summary:
There is a missing return value in edc_navigator.c

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D3768
2016-03-04 23:36:27 +09:00
taehyub ad35ab32aa template: select the random name after inserting live view part
Summary:
select the random name after inserting live view part or template part.

Test Plan:
1. insert a part using Live View
2. see the selection region of random name of Live View
3. insert a templte using Ctrl + t
4. see the selection region of random name of template

@T3014

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3743
2016-03-04 16:32:58 +09:00
taehyub 26570d64c0 template: Fix undo error by correcting cursor position
Summary:
There is a memorizing cursor in wrong position, it cause undo error.
If insert the description template, undo operation is not working correctly.

@fix

Test Plan:
1. press ctrl + t in the part, then insert description part
2. press ctrl + z, undo the code
3. see the normal operation

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3760
2016-03-04 16:19:42 +09:00
taehyub 3cb3dfdda7 ctxpopup.c: change sprintf function to snprintf function
Summary:
change sprintf to snprintf for code safety

@fix

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3757
2016-03-04 16:12:37 +09:00
taehyub d86d1f38ee ctxpopup.c: change strcat function to strncat function
Summary:
change strcat to strncat for code safe

@fix

Reviewers: Hermet, Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3755
2016-03-04 16:06:20 +09:00
Jaehyun Cho 509b9bd628 edc_editor: Support auto save to update preview.
auto save function saves edc file and updates preview by using timer.
auto save timer is applied when entry is changed or redo/undo is done.
auto save timer is cancelled when candidate list or auto complete list
appears.
2016-03-04 10:32:30 +09:00
Jaehyun Cho b488c57a9c edc_editor: Fix to call "edc,modified" callback when edc is modified.
Previously, "edc,modified" callback is called only if
enventor_object_save() is called.
To call "edc,modified" callback when edc is modified, "edc,modified"
callback is called in edit_save().
2016-03-04 10:32:24 +09:00
Jaehyun Cho b656f774d9 Fix to apply Eo4.
In Eo4, eo_do, eo_do_ret, eo_do_super, eo_do_super_ret are not used.
2016-03-04 09:22:27 +09:00
Mykyta Biliavskyi fb59a491ba Indent: check last '\n' in file before convert edc source to the markup text.
This solve issue when the additional empty line was added
to the bottom of formatted text.

@fix T3128
2016-03-03 13:38:47 +09:00
Jaehyun Cho ec2c88af8e statusbar: Fix cursor arrow size.
The relative height of cursor_arrow part is zero. So this causes slow
size calculation.
To resolve this issue, "fixed: 1 1;" is added into cursor_arrow part.
This commit fixes commit fd240531ff

Test Plan:
1. add rect by LiveEdit
2. change part size
2016-03-02 21:05:06 +09:00
Hermet Park ead1fdd6b1 edc_navigator: improve finding logic.
cursor jumps properly according to a selected item.
2016-02-29 21:32:30 +09:00
Hermet Park ff8458925e edc_navigator: 4th patch for base behavior.
add a function jumping editor cursor onto selected item.
2016-02-29 20:19:10 +09:00
Hermet Park 839b481e3c edc_navigator: fix a case that programs were not listed.
previously, program list were removed frequently.
but it should be kept for resusing.
2016-02-29 19:02:17 +09:00
Jaehyun Cho c86aa0dac6 Revert "edc_editor: optimize bracket logic."
This reverts commit 7250db0b10.

This commit causes unexpected cursor movement.
2016-02-29 18:14:26 +09:00
Mykyta Biliavskyi 01431db641 Parser: recognize keyword with context.
Uses the autocomplete context parser for recognizing keywords
with the same names in different contexts. For example:
the attributes "min" and "max" for a description context
should be integer values in range from 0 to 1000; but for a
"text" context those attributes should be boolean.

Curently add recognition for a "min" and "max" attributes in the "text" content.

@fix T2712
2016-02-29 18:12:19 +09:00
Jaehyun Cho 5ec2cb8599 template: Fix to set edc changed in template_insert().
Set edc changed in template_insert() to save template insertion.

Test Plan:
1. write a part. (e.g. rect { "rect2";)
2. insert desc template (ctrl + t)
2. close edc

When edc is closed without saving after inserting template, warning
popup should appear.
2016-02-29 17:38:53 +09:00
Jaehyun Cho b2286162a9 edc_editor: Fix to set edc changed in edit_text_insert().
Set edc changed in edit_text_insert() to save text insertion.

Test Plan:
1. open find/replace (ctrl + f)
2. write strings in "Find:" and "Replace with:"
3. push "Replace all"
4. close edc

When edc is closed without saving after replacing a string, warning
popup should appear.
2016-02-29 17:38:51 +09:00
Jaehyun Cho 5b00c94969 Revert "Show the save warning dialog on close unsaved file."
This reverts commit a2e8ea3028.

When a part is inserted by LiveEdit or modified by candidate popup, edc
file is saved automatically.

Conflicts:
	src/bin/file_mgr.c
2016-02-29 17:38:50 +09:00
Hermet Park d226cf54c2 edc_navigator: remove program list when other item types are selected. 2016-02-29 17:36:45 +09:00
Hermet Park d09c073fb0 edc_navigator: support program list 2016-02-29 17:28:25 +09:00
Hermet Park 647dbde8ca edc_navigator: 3rd patchset.
optimizing + stablizing functions.
2016-02-29 00:05:44 +09:00
Hermet Park bb09392d12 edc_navigator: 3rd patch for base navigation behavior. 2016-02-27 17:31:12 +09:00
Hermet Park fd240531ff statusbar: improve ui.
replace a cursor icon instead of a guide text.
2016-02-27 13:48:07 +09:00
Hermet Park 234f6b2f1b updated icons 2016-02-27 12:58:45 +09:00
Hermet Park 50a7b468ef edc_navigator: 2nd patch for base navigation behavior.
not completed.
2016-02-26 22:23:25 +09:00
Jaehyun Cho 69029879d8 ctxpopup: Reset candidate values by backspace key.
toggle, slider and colorselector values of candidate ctxpopup are reset
by backspace key.
2016-02-26 20:07:04 +09:00
Jaehyun Cho f96c2a92a6 ctxpopup: Refactoring to get sliders easily. 2016-02-26 19:34:07 +09:00
Jaehyun Cho 61a0effa33 ctxpopup: Refactoring to get toggles easily. 2016-02-26 19:32:00 +09:00
Hermet Park db339cfaee change message colors to white.
previous color was eye catchable but not good to read.
2016-02-26 17:48:13 +09:00
Hermet Park 0a3b314384 updated about.
here is one more dedicated developer for enventor.
2016-02-26 16:59:21 +09:00
Hermet Park ac26094e08 ctxpopup: remove a warning.
casting 64bits data void * type correctly.
2016-02-26 16:55:26 +09:00
taehyub 27f62fc10b add color modification feature to change color easier
Summary:
To make it easier for user to modify color,
I added color modification feature such as colorselector,
color view, color inputs and priority color lists into the ctxpopup.

Test Plan:
1. click the 'color' keyword
2. see the color components of ctxpopup
3. change the color using the components

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Differential Revision: https://phab.enlightenment.org/D3726
2016-02-26 16:54:21 +09:00
Jaehyun Cho 3eb9a70024 edj_viewer: Show selected part state for newly created group.
Part state of new group is set before new group is loaded into layout.
So default part state of new group is displayed instead of selected part
state.
To fix this issue, part state of new group is set after new group is
loaded into layout.
2016-02-24 19:54:00 +09:00
Jaehyun Cho 5a9de80061 edj_viewer: Fix to highlight part for newly created group.
Part of new group is highlighted before new group is loaded into layout.
So after loading new group, part of new group is not highlighted.
To fix this issue, part of new group is highlighted after new group is
loaded into layout.
2016-02-24 19:38:40 +09:00
Jaehyun Cho 84a165c5d6 edj_viewer: Fix to call "part,clicked" callback for newly created group.
Part name list of new group is set before new group is loaded into
layout. So part name list of new group is not set and "part,clicked"
signal callback for each part is not called.
To fix this issue, part name list of new group is set after new group is
loaded into layout.
2016-02-24 19:11:25 +09:00
Jaehyun Cho 4d72aee9dd edj_viewer: Fix to show dummy swallow for newly created group.
Dummy swallow of new group is created before new group is loaded into
layout. So dummy swallow of new group is not displayed.
To fix this issue, dummy swallow is created after new group is loaded
into layout.
2016-02-24 19:11:23 +09:00
Jaehyun Cho af1591100c text_setting: Select current font name and style. 2016-02-23 22:38:13 +09:00
Hermet Park df7b31d544 fix a crash issue.
part won't be have any names.

@fix T3201
2016-02-23 21:33:11 +09:00
Hermet Park 7e7a1f02b7 rearrange a minimum size of window. 2016-02-23 20:07:05 +09:00
Jaehyun Cho 650c017df9 Revert "text_setting: Show monospaced fonts."
This feature is useful for small number of developers.
From the point of maintenance view, reverting this feature is better.

This reverts commit f391c03be0.
2016-02-23 18:59:07 +09:00
Jaehyun Cho e81fa2f350 Revert "text_setting: Change "Monospaced" to "Fixed-width"."
To revert commit f391c03be0, revert this
commit.

This reverts commit c3a8e7d03f.
2016-02-23 18:58:02 +09:00
Vyacheslav Reutskiy c47e5487ee theme: add name for unnamed parts 2016-02-23 10:30:32 +02:00
Jaehyun Cho 1af1cca8f6 config: Set default monospaced font on Ubuntu. 2016-02-23 16:51:57 +09:00
Jaehyun Cho c3a8e7d03f text_setting: Change "Monospaced" to "Fixed-width".
Change "Monospaced" to "Fixed-width" for better understanding.
2016-02-23 14:45:32 +09:00
Mykyta Biliavskyi 2005ee095c Indent: clean code. Delete unused variables. 2016-02-23 14:30:05 +09:00
Mykyta Biliavskyi 843f6cc195 Indent: add logic to paste formatted text above or below current line.
Checking the string from start till cursor position is empty.
And in case if this range is empty - formatted text will be
inserted above the current line.
2016-02-23 14:05:33 +09:00
Jaehyun Cho f391c03be0 text_setting: Show monospaced fonts.
Monospaced fonts are identified by fontconfig APIs.
(i.e. Monospaced fonts have a spacing value with 100.)
Therefore, showing monospaced fonts are available only if fontconfig is
installed.
2016-02-23 12:19:12 +09:00
Jaehyun Cho 9a4c1c667c config: Set default monospaced font on Windows and OSX. 2016-02-22 22:59:05 +09:00
Hermet Park b891b071be edc_navigator: not completed. but first patch set for base layout & infra 2016-02-22 20:44:41 +09:00
Jaehyun Cho 28a622d04e config: Set monospaced font as a default font. 2016-02-22 20:27:34 +09:00
Hermet Park 313274df6e fix broken view size reset.
implementing was missing. :(
2016-02-22 19:37:38 +09:00
Mykyta Biliavskyi 02b45c0719 Redoundo: Support the real-time preview when we undo/redo the code.
When user undo or redo change, the edc file will be recompiled and the
live view will be updated. There are two flow: in case if the change is buildable
(i.e. the edc file was builded sucessfuly, when this change happened)
edc file will be recompiled. In case when change marked as unbilduable -
nothing will happen.

@T3051
2016-02-22 18:49:46 +09:00
taehyub 92fe342039 apply ELM_CNP_MODE_PLAINTEXT mode to enventor entry
Summary:
When copy & paste in markup text mode, elm_entry does not support to close markup text.
In enventor the feature cause the color changes about the pasted text.
so I applied the plain text mode to prevent color changes when some text are pasted.

Test Plan
1. copy some text
2. paste anywhere
3. see the color of the text whether there are color changes or not

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3717
2016-02-19 18:36:26 +09:00
Mykyta Biliavskyi 57c78d0993 Edj viewer: clean the list of the part names when module terminate. 2016-02-19 17:34:17 +09:00
Hermet Park 0eacf2eb08 one more doc updation. 2016-02-19 17:32:14 +09:00
Hermet Park 956141c920 update readme/about guide. 2016-02-19 17:29:29 +09:00
Yongheon, Shin dac33a48f6 Set the cursor region of part, when selecting in live editor
Summary: Set the cusor region of part, when selecting in live editor

Test Plan:
1. Open the enventor and load a sample
           2. Select a part in live editor

Reviewers: Jaehyun_Cho, Hermet

Subscribers: Jaehyun_Cho, Hermet

Differential Revision: https://phab.enlightenment.org/D3690
2016-02-19 17:02:28 +09:00
taehyub 5fceb29b5b fix the error word select function
Summary:
removed the animator creation when mouse double click in console box.
If use animator, there can be unexpected behavior like selection region is deleted when long script is loaded.
@fix

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3714
2016-02-19 16:10:23 +09:00
Jaehyun Cho f2bae6cc6b indent: Refactoring indent_text_create().
Utilize indent_code_lines_create() function.
2016-02-19 14:58:42 +09:00
Jaehyun Cho 3871364b10 indent: Refactoring indent_text_auto_format().
Move the module parsing codes and creating code line list to
indent_code_lines_create() function.
2016-02-19 14:34:03 +09:00
Jaehyun Cho 02a4549906 indent: Apply indentation to newly loaded edc text
When an edc text is newly loaded, the edc text is indendted if its
indentation is not correct.
The indented text creation function, indent_text_create(), utilizes
the logic of indent_text_auto_format().
2016-02-19 14:19:41 +09:00
Jaehyun Cho 26b84340fe indent: Fix not to insert a new line between '{' and block state
<Test Case>
1. Copy "description { "default";" in basic.edc.
2. Paste

<Test Result>
Previously, a new line is inserted between "description {" and
""default";".
Now, the copied text is pasted.
2016-02-19 10:42:13 +09:00
Jaehyun Cho 63bff24817 indent: Fix indentation calculation in line comment 2016-02-19 10:36:52 +09:00
Jaehyun Cho d1674c0ef0 indent: Fix indentation calculation in macro 2016-02-19 10:36:25 +09:00
Mykyta Biliavskyi 726cd500a6 Edc parser: fix memory leak.
Function elm_entry_markup_to_utf8 returned malloc'ed buffer and
it should be freed.
2016-02-19 10:09:27 +09:00
Jaehyun Cho e0daa7936a indent: Fix to paste markup symbols
Previously, utf8 is set into textblock in copy&paste.
Now, markup is set into textblock in copy&paste.

<Test Case>
1. Copy "if (A && B) set_int(num, 1);"
2. Paste

<Test Result>
Previously, "if (A " is pasted.
Now, the copied text is pasted.
2016-02-19 09:30:47 +09:00
Hermet Park 30af154860 revise previous patch code.
d929258e57.

scalable.
icon.
etc...
2016-02-19 02:52:49 +09:00
taehyub d929258e57 add back button in menu and about screen
Summary:
Summary
There is no back button in menu and about screens.
So user cannot close the screens without 'escape key'.
To make more efficient I added back button on the screens.

Test Plan:
1. press 'esc' key
2. see the back button on the screen
3. prees 'F2' key
4. see the back button on the screen

Reviewers: Jaehyun_Cho, NikaWhite, Hermet

Differential Revision: https://phab.enlightenment.org/D3705
2016-02-19 02:26:15 +09:00
Hermet Park 33b1f74e48 removed logo from about page. 2016-02-19 02:21:47 +09:00
Hermet Park 811875fd04 fix build break. 2016-02-19 02:16:47 +09:00
Mykyta Biliavskyi 269bf8b393 Edc editor: improve search the cursor position for the selected part.
In parsing the part blocks added additional check for a block type name.
This make possible to differ names of the part block and names,
that uses inside attributes, style blocks, programs and etc.

fix T2977
2016-02-18 15:37:20 +09:00
Jaehyun Cho b2282f628b indent: Fix not to process complex logic for single markup symbols 2016-02-18 02:12:41 +09:00
Hermet Park 7108c1c05e fix broken live spacer image. 2016-02-17 22:46:43 +09:00
Hermet Park 67f80c2b03 remove minimum template code.
actually, empty template code is replaced with minimum template code.
orignally, empty template code is useless.
2016-02-17 22:15:01 +09:00
Hermet Park b15e55fa6e autocomp: generate lazy style code. 2016-02-17 22:13:24 +09:00
Hermet Park 958900962e editor: remove an unnecessary comment. 2016-02-17 21:57:49 +09:00
taehyub 44935bd484 remove unnecessary selection recover logic
Summary:
selection region recovery is applied twice in entry recover.
there are selection region recovery logic before elm_entry_selection_region_set,
but we also recover using elm_entry_selection_region_set.
it is unncessary code.

@fix

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3709
2016-02-17 21:54:36 +09:00
Jaehyun Cho f7f9770dd1 templates: Keep coding conventions in basic.edc 2016-02-17 21:39:25 +09:00
Jaehyun Cho 503afcc4c5 indent: Fix not to insert a new line within macro
Do not insert a new line after '{', '}', ';' if it is within macro.

<Test Case>
1. Copy the following in edc.
"#define FN_COL_DEFAULT 255 255 255 255; color3: 0 0 0 128"
2. Paste

<Test Result>
Previously, a new line is inserted after ';' within the macro.
Now, the same text with the copied text is pasted.
2016-02-17 21:34:48 +09:00
Jaehyun Cho dffb6ead04 indent: Keep coding convensions in indent_text_auto_format() 2016-02-17 21:34:44 +09:00
Jaehyun Cho e5aa15a1df indent: Fix to insert a new line after comment line
<Test Case>
1. Copy the following in basic.edc.
"/* TODO: Please replace embedded image files to your application image files. */
images {"
2. Paste

<Test Result>
Previously, the new line between line comment and code disappears.
Now, the new line between line comment and code is preserved.
2016-02-17 21:34:40 +09:00
Jaehyun Cho f98127a485 indent: Fix to preserve separate code lines
If copied code lines are in the separate lines, then paste those code
lines in the separate lines.

<Test Case>
1. Copy the following in edc.
"TILED_HORIZ(120)
visible: 0;"
2. Paste

<Test Result>
Previously, those code lines are pasted in the same line.
Now, those code lines are pasted in the separate lines like original
code lines.
2016-02-17 21:34:37 +09:00
Jaehyun Cho f2d889dbf7 indent: Fix not to insert a new line between '{' and block name
<Test Case>
1. Copy "group { "main";" in basic.edc.
2. Paste

<Test Result>
Previously, a new line is inserted between "group {" and ""main";".
Now, the copied text is pasted.
2016-02-17 21:34:33 +09:00
Jaehyun Cho 91ae4f1c47 indent: Fix to paste copied text not ending with '{', '}', ';'
<Test Case>
1. Copy "group { "main"; parts" in basic.edc.
2. Paste

<Test Result>
Previously, "parts" is not pasted. But now it is pasted.
2016-02-17 21:34:28 +09:00
Jaehyun Cho 0b8734f14d indent: Fix to compare string before '\0' 2016-02-17 21:34:24 +09:00
taehyub cf417f8fa4 fix the unexpected selection problem
Summary:
There is a delay for getting selection start position.
It cause the wrong selection recovery.
so I modified the selection recover logic
using the selection region of entry.

@fix

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3680
2016-02-17 20:37:22 +09:00
Hermet Park 28e9bebcc5 console: code refactoring
make it clean.
2016-02-17 19:16:39 +09:00
taehyub 83e66e43bd focus error notification when error is occured
Summary: select error word when error is occured

Test Plan:
1. make some error in edc script
2. press ctrl + s
3. see the selection region of error word

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3681
2016-02-17 19:07:34 +09:00
Hermet Park d388f581e5 setting: fix broken view scale entries.
this seems caused by elementary change,
92d905ffa0e9c5b2f5b01885856349a010b49ee4
2016-02-16 21:58:58 +09:00
Hermet Park d84e1b11b6 text_setting: remove redundant code.
That code is totally useless at the moment.
I belive color palette will be introduced in enventor soon.
2016-02-16 21:46:51 +09:00
Hermet Park 86d07222f6 Revert "indent: Apply indentation for newly loaded edc file"
This reverts commit 66328e75f3.

This patch broke enventor :-(
please test with games/etypers/data/themes/etyers.edc
2016-02-13 03:32:29 +09:00
Hermet Park 4f9b9807cb Revert "indent: Cover comment line and block name for insert indentation"
This reverts commit ccee4e868d.
2016-02-13 03:32:02 +09:00
Jaehyun Cho ccee4e868d indent: Cover comment line and block name for insert indentation
Lexeme for insert indentation ends with comment line as well.
So a new line is inserted after comment line.
Lexeme for insert indentation does not end with '{' if block name is
written after the bracket.
So a new line is not inserted between '{' and block name.
2016-02-12 21:39:57 +09:00
Jaehyun Cho 66328e75f3 indent: Apply indentation for newly loaded edc file
Auto indentation is applied when an edc file is newly loaded.
2016-02-12 21:39:51 +09:00
taehyub e5bbb91914 console.c: error log redirecting when double click in console box
Summary:
When there are some errors in the edc, console box shows the error logs.
I added error log redirecting feature to find error word in the edc script.
Now, We just double click the console box to find error logs.

Test Plan:
  1. make some errors
  2. press ctrl + s
  3. do mouse double click in console box
  4. see the selection region of error word in edc script

Reviewers: Jaehyun_Cho, Hermet

Differential Revision: https://phab.enlightenment.org/D3652
2016-02-12 19:13:43 +09:00
Hermet Park 4710a53a94 main: remove unnecessary call
ELM_MAIN() calls elm_shutdown().
2016-02-11 22:07:10 +09:00
Hermet Park 7250db0b10 edc_editor: optimize bracket logic.
we don't need to apply bracket everytime.
Previously brackets didn't applied and current brackets are no valid either
then skip to apply bracket highlighting function.
2016-02-11 14:57:50 +09:00
taehyub 7811da09b0 Add bracket highlight function in thread function
Summary:
Add bracket highlight function in thread function.
It cause the entry scroller moving when scroller bar is unpressed.

@T3145

Reviewers: Hermet, Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3671
2016-02-11 14:50:13 +09:00
Hermet Park ddcd9be22d updated AUTHORS 2016-02-09 22:29:11 +09:00
Hermet Park fe41adaa28 support a guide text for editor ctxpopup.
introduce a new smart callback "ctxpopup,activated"

@feature
2016-02-09 17:51:11 +09:00
Hermet Park ab0dab409c stats: add a function to resize a live view.
previously, editor ctxpopup had inc/dec buttons to control values elaboratly.
I removed them because user could control them using mouse wheel.

I believe it's cleaner and nicer ui for enventor.

@feature
2016-02-09 17:19:23 +09:00
Hermet Park c5c352c917 ui: improve editor ctxpopup function.
allow +/- buttons' autorepeat functions.
2016-02-09 15:41:30 +09:00
Hermet Park ab8dc5f3ed ui: improve editor ctxpopup.
remove a entry in the editor ctxpopup.
we don't need to display entry anymore
since the changes is simulteniously applied into the editor text.
2016-02-09 15:32:42 +09:00
Hermet Park 61bc3c1cbc ui: adjust the preview image size. 2016-02-09 02:13:54 +09:00
Hermet Park 9fda7d3407 improve ux: change editor ctxpopup direction order.
Come to think of it, up/down direction of ctxpopup is more comfortable
to watch the values updation while modifying the values in ctxpopup.
2016-02-09 02:07:44 +09:00
Hermet Park df3d1f9e4d status: improve button style. 2016-02-06 03:04:22 +09:00
Hermet Park 0a52422284 align the setting's view scale slider label.
This is a tricky method,
but can't control the slider label without it.
2016-02-05 20:16:11 +09:00
Hermet Park 3bb0eb04e7 remove the concept of resizable view size.
As far as I reviewed, this function is useless.
We remove it because now people can control the exact size of view.
2016-02-05 20:11:24 +09:00
Hermet Park 5ede4deb93 fix build break.
TRANSIT_TIME define was just missed.
2016-02-05 18:40:49 +09:00
Hermet Park c499de4e88 stats: inverting view size with transition. 2016-02-05 18:14:16 +09:00
Hermet Park bb81be9901 status: code refactoring.
we don't need a disabled function but just unfocusable buttons.
2016-02-05 17:58:01 +09:00
taehyub 4b82e2b945 fix the problem of selection cursor moving
Summary:
The selection cursor is moved at the frist
When clicking and moving the bracket using the mouse.
In entry_recover(), there is no selection cursor recover machanism.
So I added the selection recover logic in the function.
Now, it is fixed.

@fix
@T3099

Test Plan:
  1. click the bracket
  2. moving the cursor keeping the mouse clicking
  3. see the fixed result

Reviewers: Jaehyun_Cho, Hermet

Differential Revision: https://phab.enlightenment.org/D3641
2016-02-05 17:47:53 +09:00
Hermet Park 75345770ce add a function to invert view size. 2016-02-05 17:42:26 +09:00
Hermet Park 10c40a182c change the guide text of the fixed live view size. 2016-02-05 16:16:30 +09:00
Hermet Park 4f4fd2c792 Improve the guide text (more kindly) for the live edit. 2016-02-05 16:04:32 +09:00
Hermet Park e90df35c2c Improve a behavior of mouse wheel for live view.
Before this change, live view won't be scaled up/down with mouse wheel
unless the live view size was fixed.

Now, it automatically fixes the size of view then change the scale of view.
2016-02-05 15:57:00 +09:00
Hermet Park e5f6f463da Eeek. This wans't intended. 2016-02-05 00:19:56 +09:00
Hermet Park fca5e6561c polish tools icons. 2016-02-05 00:09:27 +09:00
Hermet Park 924cf47060 tools - rearrange tool buttons position. 2016-02-04 21:15:29 +09:00
Hermet Park c8aa003ec3 update live edit tools 2016-02-04 21:04:33 +09:00
Hermet Park 9692cb188e backup enventor logo original resource. 2016-02-04 19:24:25 +09:00
Hermet Park 524324110a change enventor embeded logo image. 2016-02-04 19:22:48 +09:00
Hermet Park f4cccb9a31 logo - resize logo. 2016-02-04 17:32:04 +09:00
Hermet Park 9974c8bcb6 status: disable status when menus were enabled. 2016-02-04 15:35:38 +09:00
Hermet Park ca03157927 update enventor menu design. 2016-02-04 15:18:18 +09:00
Hermet Park 0627ab6b51 Here, it comes with new design of enventor logo. 2016-02-04 14:38:05 +09:00
Hermet Park 8aac906c82 Revert "fix the problem of selection cusor moving"
This reverts commit e8ade4e64b.

This patch was not intended :(
2016-02-03 14:06:52 +09:00
Hermet Park c610bebb8d Set focus to the editor when zooming popup is dismissed.
This fixed the after focus image of the zooming popup.
2016-02-03 14:04:41 +09:00
taehyub e8ade4e64b fix the problem of selection cusor moving
Summary:
The selection cursor is moved at the frist
When clicking and moving the bracket using the mouse.
In entry_recover(), there is no selection cursor recover machanism.
So I added the selection recover logic in the function.
Now, it is fixed.

@fix
@T3099

Test Plan:
  1. click the bracket
  2. moving the cursor keeping the mouse clicking
  3. see the fixed result

Reviewers: Hermet, Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3641
2016-02-03 10:36:12 +09:00
Yongheon, Shin 22579bec50 Add keyword feature for base_scale
Summary: When selecting with double-click on base_scale variable, add keyword

Reviewers: Jaehyun_Cho

Subscribers: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3633
2016-02-02 18:09:44 +09:00
taehyub be94d88921 edc_editor: remove unnecessary code
Summary:
remove unnecessary code in entry_recover function

@fix

Reviewers: Hermet, Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3638
2016-02-02 17:46:36 +09:00
taehyub bf5e38298d edc_editor: fix bracket updateto be called one time
Summary: fix bracket update callback to be called one time

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3637
2016-02-02 17:44:12 +09:00
taehyub 24e012812f edc_parser: move update cb into bracket_thread_end
Summary:
move update cb into bracket_thread_end.
it can cause runtime error when the bracket thread is canceled.

@fix

Reviewers: Hermet, Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3636
2016-02-02 17:39:06 +09:00
Hermet Park 872a79e87d fix incorrect memory allocation.
eina_inarray copies it's element memory when it have them.
we don't need to allocate element memory dynamically to push into it.

@fix
2016-02-02 16:38:51 +09:00
Mykyta Biliavskyi 99155bcbf2 Enhance amount of supported keywords for the autocomplete feature.
Newly added keywords and blocks:
  - Block Proxy for description.
     attributes are supported:
       - source_clip
       - source_visible
  - Block Params for external parts
     attributes are supportd
       - int
       - double
       - bool
       - string
       - choice
  - Block Filter for descriptions.
     attributes are supported:
       - code
       - source
       - data
  - Block Link
  - Support External part type.
2016-02-02 11:22:41 +09:00
taehyub f2cc727146 make group, description and program tempalte code compilable
Summary: make group, description and program tempalte code compilable

Test Plan:
1. insert template code using ctrl + t
2. see the name of the template and checkt the compile error.

Reviewers: Jaehyun_Cho, Hermet

Subscribers: NikaWhite

Differential Revision: https://phab.enlightenment.org/D3613
2016-01-29 16:41:59 +09:00
Hermet Park e381643026 edc_parser: fix build break.
it's a just typo.
2016-01-29 16:10:51 +09:00
Hermet Park 49ee620131 Fix template code inserting.
This is a side effect of this commit e984d2bb4e

@T3107
2016-01-28 19:36:21 +09:00
Jaehyun Cho e984d2bb4e template: Fix incorrect template insertion inside LazEDC block
Since LazEDC block types were not recognized for template insertion,
inserted template type inside LazEDC block was not correct.
(e.g. inside desc { })
Now LazEDC block types are considered for template insertion by Ctrl+T.
2016-01-27 15:14:27 +09:00
Hermet Park 14daddac74 code refactoring.
revise bracket logics which was newly introduced.
2016-01-27 14:27:49 +09:00
Hermet Park ceb2b75a69 updated authors 2016-01-27 13:03:49 +09:00
taehyub ed7e655add edc_editor: add pair of bracket highlighting feature
Summary: when mouse cursor on bracket which are '{', '}', the bracket is highlighted with its pair.

Reviewers: Jaehyun_Cho, Hermet

Reviewed By: Hermet

Subscribers: herb, NikaWhite, Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3588
2016-01-27 13:01:53 +09:00
Hermet Park f9edc4363d removed unused textblock tags. 2016-01-26 00:51:54 +09:00
Hermet Park c79a0aa4e5 about - use entry_file_set() instead of direct file accessing.
This changes enventor makes much simpler to maintaining code.
Additionally, the about file should have been markup format.
Previously, it used to use markup partially so its format was ambigious.
2016-01-25 15:56:20 +09:00
Jaehyun Cho 0c15bde219 edc_parser: Fix to allocate correct size of memory for string.
Allocate one more char memory for the last null character of the string.
This commit fixes the commit 335575eb84.
2016-01-22 21:21:12 +09:00
Hermet Park 3fb96ced83 toggle on the fixed view size forcely,
when user starts to drag the slider to change the view scale.

Enventor assumes user wants a fixed view size
when they try to scale up/down the live view.
2016-01-22 21:00:48 +09:00
Hermet Park 6f4a9b2683 improve menu ui.
removed the prev button.
instead, user can toggle menu screen off, by clicking the dim area.
2016-01-22 20:47:04 +09:00
Hermet Park 4d3c94cf64 code refactoring.
goto_close(), search_close() returns a result in order that the caller decides a next behavior.
2016-01-22 20:22:46 +09:00
Hermet Park 5c23a5b661 code refactoring.
tools_close() returns a result in order that the caller decides a next behavior.
2016-01-22 19:59:37 +09:00
Hermet Park ede00648d9 code refactoring.
remove enventor reference passing. it's avaiable to be globally accessed.
2016-01-22 19:53:32 +09:00
Hermet Park b50dbe2571 code refactoring.
remove enventor reference passing. it's avaiable to be globally accessed.
2016-01-22 19:41:51 +09:00
Hermet Park df29f91476 don't block mouse events.
This part blocks the status's button click.
2016-01-22 19:33:34 +09:00
Hermet Park 8679899045 code refactoring.
remove enventor reference passing. it's avaiable to be globally accessed.
2016-01-22 19:30:29 +09:00
Hermet Park cc2e04fe99 main: update live view scale value after setting is done.
This is a missing code from newly introduced view scale slider
350ee8c413
2016-01-22 19:07:59 +09:00
Hermet Park 4b9dd42839 set slider step size for view scale in setting.
Now slider cursor moves by 0.01.
2016-01-22 19:06:26 +09:00
Hermet Park c2bf98db8e update gitignore. 2016-01-22 18:59:41 +09:00
Hermet Park d4115210da base_gui: remove redundant code. 2016-01-22 18:58:34 +09:00
Hermet Park 350ee8c413 add live view scale slider onto status bar.
@feature
2016-01-22 17:34:32 +09:00
Jaehyun Cho 521d12f4cb edc_parser: Fix array count of aspect_preference. 2016-01-21 19:00:31 +09:00
Jaehyun Cho 5c170bc5a4 edc_parser: Fix to remove unsupported in EDC.
NONE for program action is removed since it is not supported in EDC.
2016-01-21 18:47:57 +09:00
Jaehyun Cho ab32de6337 autocomp: Fix the count of box.items.item's node list.
This commit fix the commit cf1e142364
Fix the count of part.box.items.item's node list as "span" is removed.
2016-01-21 10:06:32 +09:00
Jaehyun Cho 142db7a0f9 autocomp: Fix not to deallocate memory of eet data descriptor.
It does not need to reset eet data descriptor when eet file is opened
again.
2016-01-20 15:02:34 +09:00
Jaehyun Cho 69d892e4e2 autocomp: Fix to replace unsupported cursor mode value.
Currenly, cursor_mode can have only 2 values, UNDER and BEFORE.
Since BEFORE is more commonly used, unsupported cursor mode value
DEFAULT is replaced with BEFORE.
2016-01-14 20:37:20 +09:00
Jaehyun Cho cf1e142364 autocomp: Fix to remove unsupported keywords in EDC.
group.data.file and part.box.items.item.span are not supported in EDC.
2016-01-14 20:32:45 +09:00
Hermet Park d06a07b574 fix the incorrect tooltip positor for tools.
i have no idea when this bug was introduced.
But previously, it worked perfectly.

Anyhow, putting new code for fixing.
2016-01-08 15:27:50 +09:00
Hermet Park ad1dfd99c4 refactoring code.
rename an internal function name.
previous one was so ambigious.
2016-01-08 12:03:39 +09:00
Hermet Park d02d6a2679 remove an unused prototype declaration. 2016-01-08 11:49:32 +09:00
Hermet Park ecff37f1b5 remove redundant code. 2016-01-08 11:48:12 +09:00
Hermet Park 5b0e15daa6 modify spacer output style. 2016-01-06 13:39:04 +09:00
Jaehyun Cho 5120c20d84 Parse macro only if EDC is modified and group name is searched.
Previously, macro was parsed when EDC was changed.
This caused performance issue.
Now, macro is parsed only if EDC is changed and group name is searched.
2016-01-06 13:28:54 +09:00
Jaehyun Cho 335575eb84 Support to use macro as a group name.
Previously, group name was recognized with double quotation marks("").
This makes defined macro cannot be used as a group name.
Now, defined macro is parsed and listed. Macro group name is recognized
from the defined macro list.
2016-01-04 20:23:36 +09:00
Hermet Park e3b5d85e08 ++ enventor config version 2016-01-03 15:51:38 +09:00
Hermet Park 709ec8d24d update authors 2016-01-03 15:47:38 +09:00
Hermet Park 54850ad581 updated NEWS for enventor v0.7.0 2016-01-03 15:45:10 +09:00
Hermet Park 08f68802e8 highlight categories to be more notable.
sorry stehpen, but i have no idea why you moved them.
2016-01-03 15:26:08 +09:00
Hermet Park 3f7e523d39 improve a autocomplete feature.
it should not blow the string queue up.

@fix T2982
2016-01-03 03:56:25 +09:00
Hermet Park 0e345e9841 Makefiles shouldn't be on the po candidate. 2016-01-02 23:07:36 +09:00
Hermet Park ef59e50da0 update po 2016-01-02 22:41:20 +09:00
Hermet Park f3d5cc942a fix invaild memory read.
previously, entry_move_cb could be called after autocomp is terminated
this logic slightly change them.
2016-01-02 22:26:57 +09:00
Hermet Park eb7209c1ad don't read a value from an invalid address. 2016-01-02 16:39:21 +09:00
Hermet Park d35a229eab update dummy parts interfaces.
change toggle dummy swallow to dummy parts
because now dummies include spacer and swallow.
2016-01-02 14:06:59 +09:00
Hermet Park 7017b802ee prevent memory leak 2016-01-01 23:55:53 +09:00
Hermet Park 9ddf6e49c3 fix the part flickering issue.
This problem comes out with a third scenario,
which is, if user uses a ctxpopup slider to change the attributions
of the more than first part state.

In this case, the edj will be reloaded if the attributions are changed.
But still the cursor would be inside of the state,
so the state preview will be switched to the default,
then it turns out a sort of a flickering issue.

@T2969
2016-01-01 23:39:11 +09:00
Hermet Park 175a4355bf i hope this is the final. :-@ 2016-01-01 15:21:59 +09:00
Hermet Park d38f12313e clean the enventor description once again. 2016-01-01 15:20:50 +09:00
Hermet Park 4b5cd462c6 make enventor description clean and tidy. 2016-01-01 15:15:58 +09:00
Hermet Park d17e5b14b1 bump version up for v0.7.0 release. 2016-01-01 15:09:58 +09:00
Hermet Park 82d6b6604a edj_viewer: fix failure at loading edj file when enventor is starting up.
If ECORE_EXE_EVENT_DEL were firslty called than normal edj file load function,
enventor won't set up the edj viewer since logic is corrupted.

Now, fixed the calls order by moving the ECORE_EXE_EVENT_DEL onto later to the normal edj file load func.

@fix T2993
2016-01-01 14:50:16 +09:00
Hermet Park 8159192a47 close ctxpopup when warning popup is shown up.
check whether ctxpopup and close it, if window is moving on to close.

@fix T2996
2016-01-01 12:11:26 +09:00
Hermet Park 100b674f05 live_edit: improve icon quality.
use higher resolution images.
2016-01-01 01:53:26 +09:00
Hermet Park b78bf1efe5 don't jump part cursor when enventor object is disabled. 2016-01-01 01:12:48 +09:00
ChunEon Park 06bc1f0226 liveedit: fix the incorrect size of object.
Conceptually, the output size of the edit object shouldn't be scaled.

@fix T2975
2016-01-01 00:37:07 +09:00
Mykyta Biliavskyi 1a9b4de007 Autocomplete: add support new keywords.
Inside "part" block added:
   - effect (for Text parts)
   - anti_alias
   - mask_flags
Inside "description" block added:
   - limit
   - clip_to
Inside "text" block added:
   - domain
2015-12-30 16:31:17 +09:00
Mykyta Biliavskyi fbc8111b56 Template: fix indention for generated "styles" block.
@fix T2973
2015-12-30 14:35:25 +09:00
Mykyta Biliavskyi 39ddc2da33 Templates: fix indention for generated "images" block
fix T2971
2015-12-30 11:36:09 +09:00
Mykyta Biliavskyi bce72d3f44 Error notification: dismiss ctxpopup when error happen.
Callback build_err_noti_cb uses for reset the error state.
Dismiss context popup with attribute values in
case when the error happened.
2015-12-29 18:15:12 +09:00
Mykyta Biliavskyi 460dfed226 Live edit: return focus to the entry, after insert template.
fix T2968
2015-12-29 14:08:11 +09:00
Mykyta Biliavskyi 11ae10d04f Console: reset console content on open or create new file
fix T2980
2015-12-29 12:04:23 +09:00
Mykyta Biliavskyi a40b144128 Build: reset error notification before each build.
fix T2972
2015-12-29 11:34:59 +09:00
Mykyta Biliavskyi e264bc5f95 Error highlight: fix highlight errors inside the first line.
Fix T2970
2015-12-29 10:33:36 +09:00
Mykyta Biliavskyi f9a5d71896 Ctxpopup: reload the image content for preview.
The mouse wheel Up/Down to show preview of the
previous/next image. Previously the new ctxpopup
widget was created for each image inside the set.
Now the preview content is reloaded without
creating new ctxpopup widget.

fix T2974
2015-12-28 17:10:13 +09:00
Hermet Park a41671c11a rename author 2015-12-24 09:18:54 +09:00
Mykyta Biliavskyi 3940a0e58e Edc editor: highlight error line number. 2015-12-24 09:08:44 +09:00
Hermet Park e2b895a28d set spacer image transparency to avoid additional color multiply. 2015-12-24 09:01:40 +09:00
Mykyta Biliavskyi d51d9ef663 Dummy object: change image for spacer. 2015-12-23 17:38:52 +09:00
Mykyta Biliavskyi ec8e664873 Edc parser: improve cur_state_thread_blocking function.
Added recognize "parts" block. This make easyest to
understand cases like this: keyword "image" is part type name or
it is image description.

@fix T2964
2015-12-23 17:01:57 +09:00
Mykyta Biliavskyi 47134c410d Parser: rework parser_collections_block_pos_get function.
Make parser recognize the resource blocks (images, styles, etc)
This function uses for getting the insert position of the resource
block.

@fix T2740
2015-12-23 11:23:37 +09:00
Mykyta Biliavskyi 7d523c5ede Dummy object: split remove fake objetcts of Spacer and Swallow.
Fix removing fake objects, that represent deleted parts.
Previous solution wasn't clearing spacer list, and this can
cause undefined behaviour.

Function dummy_objs_update should be optimized. Because in
current state inside this function there are too much loop
with the similar logic.

@fix
2015-12-22 11:01:11 +09:00
Mykyta Biliavskyi 9863ea304c Edje viewer: Jump to code of current clicked part.
When user click a part in the live view,
the entry cursor jumps to the corresponded part line.

Need additional attention for the invisible parts. Swallow
and spacer parts primitives created after edje-layout. And this
causes situation when this primitives is placed above other
parts.

T2179
2015-12-22 09:25:53 +09:00
Mykyta Biliavskyi 3b4a6767a5 Dummy: Support dummy spacer like dummy swallow.
Create dummy object for all spacer in the group.
This feature Enable/Disable by the button on
tools panel "Dummy Swallow" or by hotkey Ctrl+W.
2015-12-16 17:33:49 +09:00
Mykyta Biliavskyi 3fc121acd5 Localization: update localization and enventor.pot content. 2015-12-16 10:30:30 +09:00
Mykyta Biliavskyi d1c5cebb24 Localization: add texts from setting layouts to locale. 2015-12-16 10:22:39 +09:00
Mykyta Biliavskyi 5843cd1d22 Localization: add Russian translation. 2015-12-10 17:37:36 +09:00
Mykyta Biliavskyi 360170fd74 Localization: fix localization support.
Correct initalizing textdomain.
Use LOCALE_DIR environment variable.
Support localization in setting.c and text_setting.c files.
2015-12-10 17:30:00 +09:00
Mykyta Biliavskyi 6aea530622 Text settings: Add analysis typed text for redoundo feature.
Added cases:
    Analyse auto indention for new lines. It mean, that redo/undo
            line creation will finished by one step.
    Analyse input symbols speed. In case when user writes somethenigi
            and takes a short delay (by default 0.8sec)
            between written symbols - redo/undo action will use this delay
            as point to create new node in redo/undo queue.
    Analyse input symbols on a "words". Ongoing alphabetic symbols
            between nonalphabetic symbols known as
            "word". Redo/undo action will use for a step a whole "word".

In text setting added addition toggle named "Smart undo/redo".
By default this feature is disabled.

Todo: make this feature work with auto intendation.

Prortotype here: https://phab.enlightenment.org/D1288
2015-12-10 10:53:12 +09:00
Jaehyun Cho 2e541e722a enventor: Fix to move scroller bar to correct position for find function
enventor creates a scroller instead of using entry's scroller for text
editor. This causes that the scroller bar moves to incorrect position
when a word is selected by find function. To resolve this problem, set
entry's cursor position before setting entry's select region.
2015-12-07 17:30:05 +09:00
Mykyta Biliavskyi 4cbc3e5adc Multilanguage: add english po file.
Also added target for update po files.
2015-11-18 09:00:10 +00:00
Mykyta Biliavskyi 90f58d7c0a Multilanguage: generate template pot file. 2015-11-17 17:40:51 +00:00
Mykyta Biliavskyi c6ec131b8d Multilanguage: apply gettext macro to bin/.
Cover all strings with _() macro.
2015-11-17 17:39:22 +00:00
Mykyta Biliavskyi 2f6f020f65 Multilanguage: Add infrastructure for multilanguage support.
Added macros _(), that should be used for each string,
that will be translated to other languages.
2015-11-17 16:59:55 +00:00
Jee-Yong Um 9b2c054002 enventor: remove --eo option from eolian_helper
Summary: remove --eo option from Makefile_Eolian_Helper.am to fix build fail

Reviewers: Hermet, Jaehyun_Cho

Reviewed By: Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3331
2015-11-16 13:01:42 +09:00
Stephen Houston b56a87b550 Enventor: Fix some grammatical/spelling issues. 2015-10-30 07:40:21 -05:00
Jean-Philippe Andre c998307b9b add SOURCE aspect_preference 2015-10-29 14:44:56 +09:00
Jean-Philippe Andre c1c3580305 hilight: add more keywords (LOSSY_ETC1,2, SOURCE) 2015-10-29 14:40:32 +09:00
Jean-Philippe Andre f1888d7be2 hilight: add a couple keywords (no_render) 2015-10-02 14:26:11 +09:00
Jaehyun Cho 4e82a3e7ca config_data: Fix to set random output file name.
Currently, output file name is the same as input file name.
This causes an issue when input files which have same names are opened
at the same time.
To resolve the above issue, output file names are set randomly.
2015-09-24 10:03:12 +09:00
Jaehyun Cho 811b10293f config_data: Remove duplicated code. 2015-09-24 08:41:02 +09:00
ChunEon Park ebe037c8a3 about: add one empty line to align form. 2015-09-22 16:36:08 +09:00
Mykyta Biliavskyi 4ddc93b231 Candidates list: add attributes rel*.to_x/y.
@fix T2500
2015-09-22 15:46:02 +00:00
Mykyta Biliavskyi d22bfdba37 Ctxpopup: block the input values from ctxpopup if it already deleted.
When compilation error happens - the currently open ctxpopup
will be closed.
@fix T2542
2015-09-22 10:36:09 +00:00
ChunEon Park b39b452b69 color: +syntax color keywords 2015-09-21 16:44:14 +09:00
Mykyta Biliavskyi a2e8ea3028 Show the save warning dialog on close unsaved file. 2015-09-18 09:36:07 +00:00
Jaehyun Cho 0600579464 edc_parser: Fix compile error. 2015-09-17 16:04:30 +09:00
Mykyta Biliavskyi e011f68951 Parser: enhance quality of parsing the part state names.
Summary:
added ability parsing different cases of usage
"description" and "desc" keywords.
Now support descriptions without names - those states
will be defined as "default". For keyword "description"
attribute "state" non mandatory.
Examples of support syntax:
 desc {"state_name";}
 desc {image.normal: "img";}  <- "default" 0.0;
 description {state: "state_name"; ...}
 description {"state_name";...}
 description {image.normal: "img";} <- "default" 0.0;

@fix T2680

Reviewers: Hermet

Maniphest Tasks: T2680

Differential Revision: https://phab.enlightenment.org/D2969
2015-09-17 14:19:01 +00:00
Mykyta Biliavskyi 27c17e9a43 Goto: close window from the toolbar.
Summary: moved the focus management  for "goto" window
from base_gui.c inside goto.c.
Added timer, that make delay between unfocus of the "goto" window
and freeing the "goto" internal structures. It is necessary because
when the "goto" window is active and pressed button on toolbar
firstly emitted the signal "unfocused" for window and then
happens button click event.

@fix T1604
2015-09-17 13:56:37 +00:00
Mykyta Biliavskyi ba45d8689e Edc Editor: after dismissing candidate list, cursor is moved at the end of attribute.
After choose or hide the candidate, the entry cursor
is moved to the end of attribute string ';'. It is more natural
way, than was previously, when cursor was placed before ':'.
2015-09-16 09:50:08 +00:00
Mykyta Biliavskyi e2cc943e77 Fix compilation warnings for enventor application. 2015-09-15 17:42:03 +00:00
Mykyta Biliavskyi c8fdf43e9a Fix compilation warnings for enventor library. 2015-09-15 17:39:51 +00:00
Mykyta Biliavskyi abe5ef0aa6 Highlight: apply disable/enable the highlight status for all groups.
The highlight feature is provided for global usage (it means,
that disabling highlighting will turn off it for ALL parts
in ALL groups). This patch add management the highlight
feature status for cases when the highlight was enabled
when one group was active and disable in another group.
2015-09-15 15:41:08 +00:00
Mykyta Biliavskyi b542071bb3 Static analyze: fix "Function call argument is an uninitialized value"
Summary:
Fix clang static analyzer warning.
@fix

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D3046
2015-09-14 17:45:04 +00:00
Mykyta Biliavskyi 17c4e71fc1 Edc_editor: fix compile warning and clear code.
Reveret "Edc_editor: after insert candidate,
move cursor to end of attribute", because it cause
wrong behaviour.
Clear code, make selection in entry by elm_entry_selection_set.
2015-09-14 17:39:47 +00:00
Mykyta Biliavskyi 19fdca4376 Static analyze: "Value stored to 'var' during its initialization is never read"
Summary:
Fix clang static analyzer warning.
@fix

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D3045
2015-09-14 15:36:17 +00:00
Mykyta Biliavskyi 78392731d4 Edc_editor: after insert candidate, move cursor to end of attribute,
Summary:
This is correct behaviour for cursor placement
after inserting candidate into edc code. Previously
cursor was placed before ':'.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D3044
2015-09-14 15:34:41 +00:00
Mykyta Biliavskyi 1955c96144 Ctxpopup: dismiss ctxpopup after the candidate chosen.
Summary:
Add the elm_ctxpopup_dismiss call inside the
candidate select callback function.
Delete unused function ctxpopup_candidate_selected_cb.

Test Plan:
change  rel1.to param using candidate list.
After select candidate - ctxpopup should be dismissed.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D3043
2015-09-14 15:25:36 +00:00
Mykyta Biliavskyi 778d3c4879 Autocomp: bring the selected item in candidates list.
Summary:
For cases when the autocomplete list contain
a lot of items, that  the list enables scrollbar. This make impossible
to scroll last item by Down arrows. It is happens because the
focus is not allow for elm_list widget. This patch bring
selected item manually.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D3040
2015-09-14 14:59:40 +00:00
Mykyta Biliavskyi ae2d88fa76 Edc_editor: remove "cursor,changed,manual" callback.
Summary:
For the initiate synchronizing cursor position
and the live view object was moved edit_view_sync into
callback function for "cursor,changed" entry signal.
It is neccessary, because keys "Page up" and "Page down"
didn't initiate the signal "cursor,changed,manual".

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D3034
2015-09-14 14:34:42 +00:00
Mykyta Biliavskyi 9647ca44d2 edc_parser: recognize keyword "offset" as changeable value.
Summary:
Keyword "offset" added into list of arguments.
This attribute is represented by two spinners with range
-100..100. "offset" is used inside "relative" and "fill"
blocks

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D3027
2015-09-14 14:22:25 +00:00
Mykyta Biliavskyi 1fd611f4b6 Edc_editor: enhance enventor_object_text insert API.
Summary:
added edit_text_insert function, that
shared for public use as enventor_object_text_insert
This API provide functionality for text insert with
support correct text replacement and redo/undo
feature support.

@fix T2691

Test Plan:
Lunch Enventor. Open "Find/Replace" dialog.
Fill "Find" field with exist string and fill
"Replace with" field with any text. Press "Replace All".
Close dialog window and check how work Ctrl+Z and Ctrl+R
hotkey combinations.

Reviewers: Hermet

Maniphest Tasks: T2691

Differential Revision: https://phab.enlightenment.org/D3005
2015-09-04 15:42:43 +09:00
Mykyta Biliavskyi 0a64eab88b Candidate list: filter the generated program names.
Summary:
for cases when candidate list contain
names of programs, all generated names will be
ignored.
The generated name is started with: "program_0x" - template.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2970
2015-09-04 15:39:00 +09:00
ChunEon Park 31c0b592b3 fix eo build break.
removed docs actually it's empty.

the doc will be filled at Enventor 1.0
2015-09-04 15:37:11 +09:00
Mykyta Biliavskyi a1a9d7eae1 Autocomplete: change behavior of show candidate list.
Summary:
prevously in cases when necessary node of
the lexem tree wasn't find - was displayed the
candidate list with  the root node
candidates (collections, images, color_classes, etc).
Now the candidate list do not displayed at all.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2972
2015-08-31 19:14:37 +09:00
ChunEon Park d2180b235f fix broken key input in search/goto
This issue was introduced in 502a826599.

Acutally, here is an additional keygrab change.
2015-08-27 13:03:54 +09:00
Jaehyun Cho b6d17628c5 Remove eio_monitor for edc file.
Instead of using eio_monitor, build edc file in enventor_object_save().
2015-08-27 03:55:48 +09:00
ChunEon Park 502a826599 fix malfunction of key input on Windows system.
re-implement main key input by using key grab mechanism.

@fix
2015-08-27 03:49:33 +09:00
ChunEon Park 1b0fc9f4cf auto completion: fix malfunction of key input on Windows system.
re-implement auto completion key input by using key grab mechanism.

@fix
2015-08-27 00:58:01 +09:00
ChunEon Park c5ccf94fea config_data: create config home folder if it doesn't exist.
previously, user home config folder was not existed,
enventor config file won't be saved.

now, it's fixed.

@fix
2015-08-25 16:24:32 +09:00
ChunEon Park 37a029102b we don't use engine anymore. use acceleration. 2015-08-25 03:02:00 +09:00
ChunEon Park 5d8f485ecf Makefile: build compatibility on Windows
Signed-Off-By: michelle legrand <michelle.legrand@openwide.fr>
2015-08-25 00:51:35 +09:00
Mykyta Biliavskyi cd062d9564 Edc parser: recognize description block without state name.
Summary:
In cases when keyword "description" is used without
state name(it mean that state will have "default" 0.0 name) -
parser is fail to recognize correct name of that description and
all others that placed below.
This make impossible to switching between groups and part descriptions,
that placed below description without state name.
@fix

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2954
2015-08-20 11:19:15 +09:00
Mykyta Biliavskyi c33ba546f2 Autocomplete: support images subblock inside group block.
Summary:
for cases when "group" block contain "images" subblock
autocomplete feature works wrong if cursor placed below "images"
subblock.
Added support "images" inside "group".Also added "part" to
recognized keywords.
@fix

Reviewers: Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D2955
2015-08-20 11:11:52 +09:00
Mykyta Biliavskyi 88055de59c Autocomplete: except text between quotes.
Summary:
text that placed between quotes is
excepted from recognize keywords. Previously
when inside was string like this:
'images.normal: "123.png";' the autocomplete parser
is recognize the dot, that placed inside quotes.
It is broke the searching keyword in candidates tree.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2958
2015-08-20 11:09:37 +09:00
Mykyta Biliavskyi 08a2d9d038 Edc_editor: run programs in case if name placed on new line.
Summary:
launch programs in cases when program name is
placed not in the same paragraph with "program" keyword.
Now analyzes whole text, that placed after selected keyword,
not only text inside the same paragraph.
@fix

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2964
2015-08-20 11:07:36 +09:00
ChunEon Park 072bba3dc1 fix win32 porting.
specify missing dll import/export declarations for EAPIs.
2015-08-20 11:04:56 +09:00
Jaehyun Cho 8b3ef719f0 templates: Change sound file name. 2015-08-12 16:46:43 +09:00
Jaehyun Cho 0aef6bd397 templates: Change image file names. 2015-08-12 11:20:37 +09:00
Mykyta Biliavskyi 9c66f6fcf0 Build: marks line, that contain error in edc_editor.
Summary:
parse error messages from edje_cc, and marked
by underline the mistaken line.  In cases for messages
that does not contain line numbers, trying to parse
name of wrong parameter. Trying to searching the parsed name
in edc code, and highlight the first entity.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2791
2015-08-11 13:18:07 +09:00
ChunEon Park 281c9e667e add base_scale to templates. 2015-08-11 11:56:01 +09:00
Vincent Torri 8abd0ef514 Fix warning on Windows 64 bits 2015-07-31 16:07:57 +09:00
Vincent Torri cd7023ecc9 Use eina_environment_home_get() instead of getenv("HOME") for portability 2015-07-31 16:07:14 +09:00
Vincent Torri ee5672fa73 Remove useless instructions 2015-07-31 16:06:12 +09:00
ChunEon Park d5f66885ac indent: free memory correctly. 2015-07-10 23:46:24 +09:00
ChunEon Park 8ebd0d2dbf edc_editor: code refactoring.
remove direct variable access but use getter.
2015-07-10 20:46:17 +09:00
ChunEon Park fedcfd3149 text_setting: one more here code refactoring.
err is enough to use.
2015-07-10 20:13:12 +09:00
ChunEon Park c25eb038b3 text_setting: code refactoring.
err is enough to use.
2015-07-10 20:10:37 +09:00
ChunEon Park 2c4a407e65 renamed color.src -> edc.src
Reeame the color source file more specifically.
2015-07-10 20:06:49 +09:00
ChunEon Park 74ff6efbd7 syntax_color: reorder the syntax color.
apply comments color prior to tags.
2015-07-09 22:48:16 +09:00
ChunEon Park 6e911ef3fc editor: set default tabstops size 10. 2015-07-09 20:34:15 +09:00
ChunEon Park d3cfd41e14 syntax_color: support configurable syntax color count.
Previous the color table count is fixed to 6
we can make it changeable by color configurable file.

Please increase MAX_COL_NUM if it really needs.
2015-07-09 20:18:43 +09:00
ChunEon Park c188b78c06 syntax_color: improve logic.
previous code was strictly only working for edc.
relax the logic to cover more general cases.
2015-07-09 19:51:19 +09:00
ChunEon Park e05fe27848 color: add more keywords 2015-07-09 19:51:00 +09:00
ChunEon Park 7e6fbfde90 ctxpopup: cutout slider updation.
we don't need to update slider changes multiple times under the animator callback.
2015-07-09 15:31:37 +09:00
ChunEon Park b0e0820148 autocomp: remove generation of optional code. 2015-07-06 19:32:38 +09:00
ChunEon Park 9bf1c484f7 code refactoring.
replace *edc, *edj to *input, *output
For the general editor, modify them in advance.
2015-07-04 01:18:27 +09:00
ChunEon Park d2e3c6dc6b syntax_color: apply string syntax color prior to others.
even if the comments are inside of the qutoes,
the comments syntax color should not be applied.
2015-07-04 01:08:01 +09:00
ChunEon Park 6b6f4b19c1 main: code refactoring.
don't keep temporary variable.
2015-07-03 23:01:22 +09:00
ChunEon Park 8ef03ee90c newfile: code refactoring.
return function as soon as possible.
2015-07-03 22:41:11 +09:00
ChunEon Park e9f258a839 notify file changed popup correctly.
Current implementation has logical hole that skips the notification of file changes first time.
We fix this even if it depends on the time thresholds.
New implementation will skip the file changes also but
it will only skip, if the file change is happened again under 2 seconds.
2015-07-03 20:24:05 +09:00
ChunEon Park 1cc52fee57 fix to avoid popup of "file modified"
if the file is modified continously,
it couldn't catch that the file is modified by self or not.
we do avoid this by delaying the notifying event for 3 secs.
2015-07-03 19:58:20 +09:00
Mykyta Biliavskyi 6e62d994c4 Autocompletion: support multi names for the section.
Summary:
Support new *.edc syntax.
Each lexem node can have a many different names.
It useful for parts in new edc syntax (swallow {}, image {} ... )
Change "description" lexem to "desc"

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2785
2015-07-03 11:49:11 +09:00
ChunEon Park a93933d770 edc_editor: clean up code. 2015-07-03 11:48:08 +09:00
ChunEon Park 115bad9bb5 edc_parser: generate default time for transition 2015-07-02 21:47:29 +09:00
ChunEon Park 8678084b8f edc_parser: remove the generated code '0.0' at the end of state.
0.0 is generally unused but annoying to users.
2015-07-02 21:42:18 +09:00
ChunEon Park b654fee78a ctxpopup: remove a space in the generated code just around ';' 2015-07-02 21:39:15 +09:00
ChunEon Park 61c6e87993 color: add nomouse keyword 2015-07-02 19:49:23 +09:00
ChunEon Park 976685ae10 edj_viewer: track the images and update live view whenever they were modified. 2015-07-01 16:20:28 +09:00
ChunEon Park fe2ad1f07b change Enventor_Path_Type interface.
changed names for enum value consistency.
2015-07-01 12:04:48 +09:00
ChunEon Park 1285140af4 edj_viewer: code refactoring.
remove duplicated code.
2015-07-01 11:55:04 +09:00
ChunEon Park 22f990960f edc_parser: remove redundant code. 2015-07-01 10:03:06 +09:00
ChunEon Park 92c09a0a39 ctxpopup: support dramatic updation for live view.
a little slow, but it's better than before.

added smart callback, @live_view,updated
renamed smart callback, @ctxpopup,selected -> @ctxpopup,changed
2015-07-01 01:25:04 +09:00
ChunEon Park e990da6de2 update for more lazy edc style. 2015-06-30 20:23:29 +09:00
ChunEon Park 796e1bffe1 edj_viewer: call the "live_view,loaded" at proper time.
previously, the signal can be called even live view is not loaded yet.

@fix
2015-06-30 19:49:04 +09:00
ChunEon Park aa962ba179 update edj as soon as possible.
checks the new edj per every frame if it failed to load.
2015-06-30 18:24:24 +09:00
ChunEon Park f254d6fabe autocomp: update to lazy edc keywords. 2015-06-30 18:18:53 +09:00
ChunEon Park 12fc464bd9 template: update live edit generation code for new edc syntax. 2015-06-30 16:46:34 +09:00
ChunEon Park 533dc32dec template_code: updated to new style of edc. 2015-06-30 16:28:16 +09:00
ChunEon Park ed624ce108 color: + textblock 2015-06-30 16:21:26 +09:00
ChunEon Park 8c8cca1495 edc_parser: support proxy, textblock 2015-06-30 16:15:54 +09:00
ChunEon Park 68e566df51 color: + one more missing keyword. 2015-06-30 16:15:28 +09:00
ChunEon Park 8822f5be5a template: update to new sexy edc style. 2015-06-30 16:14:49 +09:00
ChunEon Park 837185d2e0 color: support new keyword, spacer 2015-06-30 15:51:44 +09:00
ChunEon Park 7521f45a1e edc_parser: support new syntax keywords.
desc, swallow, group, spacer, text, image, rect..
2015-06-30 15:50:25 +09:00
ChunEon Park 11513e0568 remove unused functions. 2015-06-30 15:26:07 +09:00
ChunEon Park 3a081788c8 edc_parser: code refactoring.
1. rename internal variable.
2. remove static string length variables.
2015-06-30 15:23:11 +09:00
ChunEon Park f705d89495 color: fix conflict set and set_xxx.
this is tricky but works.
2015-06-29 22:01:40 +09:00
ChunEon Park 820f107e48 color: added more keywords 2015-06-29 21:35:04 +09:00
Mykyta Biliavskyi 9cc1fb443e Correct handling ecore key modificators.
Summary: Macro EVENT_KEY_MODIFIER_CHECK_OR_RET provide possibility  to check, if only one modifier pressed.

Reviewers: Hermet

Projects: #enventor

Differential Revision: https://phab.enlightenment.org/D2759
2015-06-26 13:49:43 +09:00
Mykyta Biliavskyi 43554348a4 Change the file save policy.
Summary:
  In case when inputted file name does not contain
  "edc" or "edj" extention, ".edc" will be added automaticaly.

  T1784

Reviewers: Hermet

Projects: #enventor

Maniphest Tasks: T1784

Differential Revision: https://phab.enlightenment.org/D2760
2015-06-26 13:44:38 +09:00
Mykyta Biliavskyi a310bbd9a4 Ctxpopup hide on focus out.
Summary:
On keypress up or down button doesn't need
to allow focus to the ctxpopup.

@fix T2522

Reviewers: Hermet

Maniphest Tasks: T2522

Differential Revision: https://phab.enlightenment.org/D2765
2015-06-26 13:39:20 +09:00
ChunEon Park 460e6dc97b updatd command line help message. 2015-06-24 15:50:20 +09:00
ChunEon Park 3c31b1661e tools: update tooltip message 2015-06-24 15:38:20 +09:00
ChunEon Park a604cfcae4 updated NEWS. 2015-06-24 15:36:47 +09:00
Jean-Philippe Andre 83012a0a04 Editor zoom: Ctrl + wheel should work even with numlock
When checking the modifiers, only ALT, CTRL, WIN and SHIFT make
sense in this context.
2015-06-24 15:30:34 +09:00
ChunEon Park b94d20ec05 updated NEWS 2015-06-24 15:26:50 +09:00
ChunEon Park 786fef138c cancel live edit if the about is activated. 2015-06-24 15:26:00 +09:00
ChunEon Park 9342835f3d live_edit: update live edit on scrolling. 2015-06-24 15:24:32 +09:00
ChunEon Park 56816ab1f4 live edit: don't clip by symbol layout but live view.
texts/control points don't need to be clipped by symbol layout.
if the zoom level is enoughly small and there is enough space to
display the control points and text, then we can display them.
2015-06-24 15:11:44 +09:00
ChunEon Park 2a7ebec75b edj_viewer: fix wrong spacer highlight position.
spacer position just need to relative to the it's layout.
this is much simpler way to support zooming as well as it's nature behavior.
2015-06-24 15:06:48 +09:00
ChunEon Park 9615d308ec menu: fix wrong grammar 2015-06-24 14:47:27 +09:00
ChunEon Park 9c0cf02039 update warning button text.
save/yes/no -> save/discard/cancel
2015-06-24 14:43:39 +09:00
ChunEon Park 8d51516705 adjust live view zoom range
0.5 ~ 5.0 -> 0.1 ~ 10.0
2015-06-24 14:35:14 +09:00
ChunEon Park e45efbf381 auto_comp: fix crash at auto comp.
increase stack buffer size to afford more huge size of edc text.
and handle exceptional case for lack of stack size.
2015-06-24 14:06:32 +09:00
ChunEon Park ca8c53e073 revise description of live view. 2015-06-24 13:37:31 +09:00
ChunEon Park 7e31de5ce3 menu: removed tooltips from menu buttons. 2015-06-24 13:31:20 +09:00
Mykyta Biliavskyi 4a71ca8b75 Indent: fix position of pasted block.
Summary:
Position of pasted block depends from
existing symbols in current paragraph.

fix T2512
fix T2511

Reviewers: Hermet

Maniphest Tasks: T2511, T2512

Differential Revision: https://phab.enlightenment.org/D2747
2015-06-24 13:23:54 +09:00
Mykyta Biliavskyi c7cd1ee563 Fix -Wint-to-pointer-cast compiler warning in ctxpopup.c 2015-06-24 13:21:34 +09:00
ChunEon Park 273d0c2166 template: remove new line trailiings. 2015-06-24 13:17:22 +09:00
ChunEon Park d8ddce9204 clean up code.
remove duplicated function call.
2015-06-24 13:16:01 +09:00
Mykyta Biliavskyi c2d6bae122 Autoindent: fix increase line numbers.
Summary:
Function indent_insert_apply reutn count of inserted lines.
It is provide increse line numbers correctly.

@fix T2510

Reviewers: Hermet

Maniphest Tasks: T2510

Differential Revision: https://phab.enlightenment.org/D2745
2015-06-24 13:14:14 +09:00
Mykyta Biliavskyi 533994772f Fix compiler warnings.
Fix -Wuninitialized flag warnings.
2015-06-24 13:12:20 +09:00
ChunEon Park 94465b1e73 update NEWS 2015-06-23 22:16:19 +09:00
ChunEon Park 75233b3879 updated NEWS 2015-06-23 22:14:26 +09:00
ChunEon Park b4a80c112d get prepare for v0.6.0 2015-06-23 21:38:16 +09:00
ChunEon Park 366732c761 updated AUTHORS 2015-06-23 21:33:30 +09:00
ChunEon Park 099b87186f modify zoom behavior.
changed zoom up/down behavior only if view size is set.
it's been quitely useless zoom up/down function without any base size.
2015-06-23 21:30:26 +09:00
ChunEon Park 6d72ca9e4b live_edit: ... fix live edit scaling issue. 2015-06-23 21:29:41 +09:00
ChunEon Park 802d68ff83 config: store/recover the editor panes position. 2015-06-23 14:39:48 +09:00
ChunEon Park 9dd9e0d9eb live_edit: support zoom on live editing.
previously, it doesn't care the view zooming on live editing.
now it's working perfectly.
2015-06-23 13:14:11 +09:00
ChunEon Park 61d7acca06 live_edit: use ELM_SCALE_SIZE() for scalability. 2015-06-23 11:20:01 +09:00
ChunEon Park 00ce4ff714 tools: update line number icon image. 2015-06-23 11:05:33 +09:00
ChunEon Park 24ad783b25 live_view: fix incorrect zoom scale.
Previously, the live view maximum size was not updated properly
even if the zoom scale value had been changed.

@fix
2015-06-23 10:55:35 +09:00
ChunEon Park f7bb26e9b1 live_edit: fix focus highlight floating issue.
After selecting a live view edit item,
the item focus highlighting is remained there.
Now it's fixed by moving the focus to live view.
2015-06-23 10:28:25 +09:00
ChunEon Park 6e7e18b12b auto_comp: close popup if the line is deleted.
@fix.
2015-06-23 10:21:22 +09:00
ChunEon Park c301fab3cd auto_comp: optimize code.
use callback data rather than global variable.
2015-06-23 10:11:03 +09:00
ChunEon Park e86b8256b6 fix the candidate list size.
don't oversized candidate popup than edit area.
Instead, enable the scroll of the list in order thatuser can choose one item.

@fix
2015-06-23 09:58:18 +09:00
ChunEon Park 149faa3f35 updated README/ABOUT 2015-06-23 08:40:39 +09:00
ChunEon Park 55b3a1c4b1 --compiler warning.
shit, avoid unused compiler warning by trick.
2015-06-23 08:25:29 +09:00
Mykyta Biliavskyi dc85cafc7d Autocomplete: add attribute "dot" for lexems.
Summary:
Attribute "dot" make possible to mark lexems, that
can use the '.' symbol. Like image.normal: "bla";
This commit fix issue, when pressing '.' after any
keyword was shown candidate list.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2709
2015-06-23 08:16:01 +09:00
ChunEon Park 772ffe2229 live_edit: fix regression bug that introduced in 14a0e2cfd2
toggling context is corrupted but recovered again.
2015-06-22 22:50:22 +09:00
ChunEon Park 14a0e2cfd2 tools: improved ui.
add click / toggle on/off effect.
2015-06-22 22:45:40 +09:00
ChunEon Park 11e5dba045 code refactoring.
remove duplicated logics wrt function toggles.

this is the precede work for improving tools gui.
2015-06-22 18:25:48 +09:00
ChunEon Park ea715444ed remove compile warnings.
remove unused variables.
2015-06-22 15:44:22 +09:00
Mykyta Biliavskyi 9f47246074 Autocomplete: fix memory leak on autocomplete terminate.
Summary: Tree structure of lexems didn't freed, when feature terminating.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2727
2015-06-22 14:51:18 +09:00
Mykyta Biliavskyi 02af80d3ba Hotkeys: fix work ctrl_l key with num lock.
Summary: Need to check CTRL_L and ALT_L bits in ECORE_EVENT_MODIFIER

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2722
2015-06-22 14:49:17 +09:00
Mykyta Biliavskyi 7020fec1f3 Autocomplete: fix memory leak.
Summary:
When context_lexem_thread_cb is canceled - possible, that
td->utf8 memory, that allocated at context_lexem_get
didn't freed.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2726
2015-06-22 14:45:54 +09:00
Mykyta Biliavskyi 5b3aa7ca3b Autocomplete: show list of the candidates by Ctrl+space.
Summary:
By press ctrl_l+space will be shown popup with the candidates list,
that relevant to current cursor position.
Added API enventor_object_auto_complete_list_show as public.

Reviewers: Hermet, jpeg

Maniphest Tasks: T2496

Differential Revision: https://phab.enlightenment.org/D2720
2015-06-22 14:34:52 +09:00
ChunEon Park d1e7eed0fb recover the autocomplete backspace key issue.
before change this, backspace is not working for auto complete,
so user can't cancel the popup.

this change is reverted to the old one code (118e86e0dd)
2015-06-22 14:20:14 +09:00
Mykyta Biliavskyi 9e81a5f263 Autocomplete: fix behaviour of the Backspace.
Summary:
For case when the list of candidates is shown after typing
'.', "backspace" didn't work. It happens because the queue was
already cleared, when the user press "backspace". But at the
same time list of the candidates is presented and shown.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2714
2015-06-22 14:09:14 +09:00
ChunEon Park 339298a01b auto_comp: + exeptional case.
just in case non - tooltip items.
2015-06-22 14:05:27 +09:00
Mykyta Biliavskyi 708923f8ff Autopcomp: select first item in candidates list.
Reviewers: Hermet

Maniphest Tasks: T2495

Differential Revision: https://phab.enlightenment.org/D2719
2015-06-22 13:59:50 +09:00
Mykyta Biliavskyi 1877830e70 Autocomp: sort autocomp to alphabet order.
Reviewers: Hermet

Maniphest Tasks: T2495

Differential Revision: https://phab.enlightenment.org/D2718
2015-06-22 13:55:36 +09:00
ChunEon Park 46a8114c89 template: update basic. 2015-06-18 08:48:22 +09:00
Mykyta Biliavskyi 0dfeb6c177 Autocomplete: fix segfault, caused by '.'
Summary:
When '.' typed without keyword, function context_lexem_thread
is returning NULL pointer to the lexem node. This cause segfault,
when the lexem node is used for prepare the candidates list
in candidate_list_show function.

Reviewers: Hermet

Maniphest Tasks: T2504

Differential Revision: https://phab.enlightenment.org/D2712
2015-06-17 17:02:58 +09:00
Mykyta Biliavskyi b4af164c8a Autocomplete: show list of the candidates after '.'.
Summary:
   In case, when user typed keyword and add '.' symbol, will be
   shown list of possible keywords.
   For example:
   rel1. -> will be shown list: relative, offset, to, to_x, to_y.

   Depends D2648
   @fix  T2178

Reviewers: Hermet, Jaehyun

Subscribers: jpeg

Projects: #enventor

Maniphest Tasks: T2178

Differential Revision: https://phab.enlightenment.org/D2651
2015-06-16 16:53:23 +09:00
Mykyta Biliavskyi ee415fa135 Parser: recognize comments in code.
Summary:
For cur_state_get in parser module and context_lexem_get in
auto complete module add abiliti to recognize commented lines.

fix T2482

Reviewers: Hermet, Jaehyun, jpeg

Reviewed By: jpeg

Maniphest Tasks: T2482

Differential Revision: https://phab.enlightenment.org/D2677
2015-06-16 13:38:06 +09:00
ChunEon Park 97941ff378 Indent: auto indentation when code is pasted.
Summary:
if some edc code is pasted, the indentation could be corrupted.
let's make it fix automatically, even if indentation of
the pasted code is not correct, only when auto indent mode is enabled.

Reviewers: Jaehyun, Hermet

Projects: #enventor

Maniphest Tasks: T2174

Differential Revision: https://phab.enlightenment.org/D2601
2015-06-16 13:36:30 +09:00
Mykyta Biliavskyi 59d6ce59cd Autocomplete: make search context run in additional thread
Summary:
  Now parsing and actualizing context of current cursor position
  happens in additional thread.

  @fix T2467

Reviewers: Jaehyun, Hermet

Projects: #enventor

Maniphest Tasks: T2467

Differential Revision: https://phab.enlightenment.org/D2648
2015-06-16 13:29:00 +09:00
Mykyta Biliavskyi f931b5e06f autocomp.src: fix mistakes and add dependencies.
Summary:
Add suport blocks images and color_classes inside
collections block.
Fix position cursor for rel1 { to: ""; }.
Add RAW as default type for sound samples.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2706
2015-06-16 13:27:29 +09:00
Mykyta Biliavskyi f49cf431b7 Autocomplete: fix ability to disable functionality.
Summary:
Chack status of the flag *(autocomp_data)->enabled,
when entry "changed" callback is called.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2707
2015-06-16 13:22:36 +09:00
Mykyta Biliavskyi 31d07e5590 Edc parser: correct detection of current description.
Summary:
Added check, if the entry cursor is go out of the description
block, will be returned NULL description_name.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D2681
2015-06-15 14:09:42 +09:00
ChunEon Park 3ff81bce00 clean up help message. 2015-06-12 23:11:28 +09:00
ChunEon Park 82d31b3418 fix the font/live zoom control issue.
When you focus on other window while you pressing the ctrl/alt key at the enventor,
the ctrl/alt key pressed context can be corrupted.

because enventor keeps the extra flag for ctrl/alt key press states.
but in the problem case, the unpress key won't be trigged.

enventor doesn't need to keep the extra flag but track the modifiers in key event.

@fix
2015-06-12 17:03:45 +09:00
ChunEon Park 5b7bdd95ba change the short-cut key usage.
previous panes toggle is triggered by ctrl + arrow keys.
But editor itself uses ctrl key for cursor move/jump.
To conserve the cursor key, we change the panes short-cut.

Thanks jpeg to report this.
2015-06-11 17:19:52 +09:00
ChunEon Park 08c9ddeecd don't clip the tooltip in tools.
i guess, since the tooltip has been changed recently,
it's behavior changed a little.
because of this, tooltip in tools got clipped outside of the viewport.

Anyhow it's fixed.

@fix
2015-06-11 16:45:09 +09:00
ChunEon Park d8bac599a7 removed template code insert feature.
now enventor supports inserting part with live view editor,
i don't think this is required in enventor anymore.
2015-06-11 16:39:26 +09:00
Mykyta Biliavskyi 216763a925 Build: delete auto_com_code.h from library sources.
This causd fail to run "make dist" command.
2015-06-11 16:26:33 +09:00
ChunEon Park 02dca36f69 update help description. 2015-06-11 16:24:09 +09:00
Jean-Philippe Andre 69b475ce22 Add .arcconfig file for arcanist usage 2015-06-11 16:05:39 +09:00
Mykyta Biliavskyi e960a0df12 Edj viewer: support SPACER part highlighting.
In edje library SPACER doesnt have Evas_Object,
that represent part on canvas. Calculation position
and size of the SPACER highlight should be corrected.
For correcting geometry of highlight, uses current
state of scroller(that contain layout object)
and layout object.

@fix T2464
2015-06-09 16:13:27 +09:00
Mykyta Biliavskyi 4e4dd4400c Fix candidate popup positioning is wrong.
Ctxpopup will not show, if the size of
editable area is smaller, than ctxpopup wth content.

@fix T2180
2015-06-09 16:00:51 +09:00
ChunEon Park 2d9f86a30d autocomp: fix the resoucre directory path
auto_comp data is the library resource rather than application.
use the eina prefix rather then app data path.
2015-06-09 15:40:30 +09:00
Mykyta Biliavskyi 2ceb0a2b3c Autocomplete: enhance the autocomplete feature.
The hardcoded list of the strings from auto_comp_code.h is replaced by
description of the relationships between keywords.
This descriptions is stored in autocomp.src file.
Now the autocomplete feature is monitoring context of the
inputted text, and provide list of the keywords, that
relevant to current context.
For add new relationships between keywords need
only add it into autocomp.src in correct hierarchical order.
2015-06-09 15:28:49 +09:00
Jaehyun Cho 1390a1a6d5 syntax_color: add &gt;(>) and &lt;(<) keywords. 2015-06-06 03:47:06 +09:00
Mykyta Biliavskyi 148ad69c3b Use eina_prefix for generation path to resource of enventor library.
This way provide the ability to determine the runtime location
of the library.
Makes possible to use enventor library on the Windows platform.
2015-06-05 17:53:59 +09:00
Mykyta Biliavskyi 59a5faf6e0 Save dialog: support save edj files.
In case when user types filename.edj binary file will be
compiled into that place, which chosen in fileselector.
2015-06-04 11:53:42 +09:00
ChunEon Park 6854160251 setting: increase show transition duration. 2015-06-03 23:18:08 +09:00
Mykyta Biliavskyi af56cdb083 Support version fo the enventor config file.
Config data is checked on the versiob of config file.
if the version is lower than current, then don't read
the config data and instead open with default.
On enventor close, config file is rewrited with new data.
2015-06-03 22:52:19 +09:00
Mykyta Biliavskyi d6d69eb6c7 Fix generation path to theme, for enventor library.
In case when enventor library initialized by another application,
function elm_app_data_get_dir() return data dir of the parent
application.
Now on precompilation stage (automake) path to enventor theme
will be added to internal usage. It make no dependencies from
parent application.

@fix T1285
2015-06-03 22:50:31 +09:00
Mykyta Biliavskyi 00a7e03432 Update hale information.
Update --help informarion about attributes.
2015-06-03 20:09:08 +09:00
Mykyta Biliavskyi 512e12c970 Update README and ABOUT files.
Update information accordingly to usage Enventor in CLI.
2015-06-03 20:06:52 +09:00
Mykyta Biliavskyi 59ec635813 Command arguments: add recognize output file.
If command arguments contain path to file
with ".edj" extension, this file will be used
for store output binary file.

Example:
enventor --id /path/img --fd /path/fnt input.edc output.edj
2015-06-03 16:55:23 +09:00
Mykyta Biliavskyi a247010813 Command line arguments: fix ignoring resource pathes.
If application run with command like:
enventor --id /path/images --fd /path/fonts
Pathes will be used in application.

@fix
2015-06-03 16:49:12 +09:00
ChunEon Park 2dd1f7627c configure: remove undefined commands 2015-05-31 11:56:03 +09:00
ChunEon Park a59ebb43aa template: update rotation+zoom 2015-05-31 01:43:53 +09:00
ChunEon Park 0eda8b8510 color: add zoom keyword 2015-05-31 01:42:07 +09:00
ChunEon Park 34893056cf template: add group 2015-05-31 01:40:04 +09:00
ChunEon Park 3ebfc09e61 template: revise basic 2015-05-31 01:25:26 +09:00
ChunEon Park b0ce2bda44 template: add rotation+zoom 2015-05-31 01:17:51 +09:00
Mykyta Biliavskyi 9ac6faaa9e edj viewer: update live view for different groups.
This happens, because edj file is rewrited and
descriptor lost. Reload all groups each time when
edj file rewrited.

@fix T2162
2015-05-28 19:37:25 +09:00
Mykyta Biliavskyi d18b1afdc2 Update part state in dependence of the cursor position.
Added ability to switch part state on live view, when
cursor located inside the "description" subblock of part.
In case when cursor move out from "description" block,
default state of part will be displayed.
2015-05-27 14:47:40 +09:00
Mykyta Biliavskyi 4415cdf7a9 Command line: add new arguments into command line.
Added next arguments:
-v, --version           show program version.
-c, --copyright         show copyright.
-l, --license           show license.
2015-05-27 14:43:25 +09:00
ChunEon Park ec340a1760 config_data: code refactoring.
just clean up code.
2015-05-27 14:41:40 +09:00
Mykyta Biliavskyi dee12936e3 Config: fill the paths to the resource directories from command line.
Add support multi paths for resource directories as arguments
from command line.

Now support next parameterized arguments:
--id path/ - image directory path,
--sd path/ - sound directory path,
--fd path/ - font directory path,
--dd path/ - data directory path,
--to - open template dialog.

For example:
enventor  --id path_1/ --id path_2/ --sd path_3/ --fd path_n/
2015-05-27 14:36:30 +09:00
ChunEon Park 118e86e0dd auto_comp: fix missing precise_is_inside. 2015-05-25 02:27:55 +09:00
ChunEon Park aa789b0448 edc_editor: disable the part highlight on live edit mode. 2015-05-24 19:25:37 +09:00
ChunEon Park 2ccceded2f live_edit: improve grip control. 2015-05-24 19:14:59 +09:00
ChunEon Park ae963003bb Revert " Update part state in dependence of the cursor position."
This reverts commit 165c955bee.

it's not intended patch. reverted.
2015-05-24 18:29:38 +09:00
ChunEon Park a81a0d23ee eo: sync with eolian syntax changes. 2015-05-24 18:18:12 +09:00
ChunEon Park b59cc1022d auto_comp: fix build break.
there were typo that caused build break.
2015-05-24 18:16:30 +09:00
ChunEon Park 165c955bee Update part state in dependence of the cursor position.
Summary:
Added ability to switch part state on live view, when cursor located inside the "description" subblock of part.
In case when cursor move out from "description" block, default state of part will be displayed.

Reviewers: Hermet, Jaehyun_Cho

Projects: #enventor

Differential Revision: https://phab.enlightenment.org/D2499
2015-05-22 22:24:34 +09:00
ChunEon Park 49a2a87c6f auto_comp: +precise_is_inside 2015-05-21 11:07:43 +09:00
Jaehyun Cho d66139a1aa lib/enventor: Use the new Eolian property syntax. 2015-05-09 02:51:41 +09:00
Jaehyun Cho d27216193e lib/enventor: Use correct Eolian namespace syntax. 2015-05-09 02:48:39 +09:00
ChunEon Park 5966093325 lib/main: minus initialization count when it's shutdown.
@fix
2015-05-03 02:59:26 +09:00
ChunEon Park a83556895f base_gui: + assert for easy debugging 2015-04-14 13:16:59 +09:00
Jaehyun Cho 6b21eeab0f Set default font if font name is given with NULL. 2015-03-26 22:52:55 +09:00
Jaehyun Cho 4439ca4d75 text_setting: Add font name/style settings. 2015-03-26 22:00:47 +09:00
Jaehyun Cho 489d43a62a edc_editor: Add enventor_object_font_set()/get() APIs. 2015-03-26 22:00:43 +09:00
Jaehyun Cho 42f816e101 edc_editor: Fix typo. 2015-03-24 22:07:40 +09:00
Jaehyun Cho b157b5807d themes: Apply entry theme extension.
Entry theme extension is needed to change font type by text class.
2015-03-24 19:52:57 +09:00
Jaehyun Cho 1d026c1b4a syntax_template: Fix that font color popup not appear when font is small.
Fix that font color popup does not appear on font setting when font is small
by setting font_size 3 digits.
2015-03-16 23:27:38 +09:00
ChunEon Park 21f3f10b15 lib/auto_comp: support more keywords - anti_alias, ellipsis 2015-03-03 13:50:09 +09:00
ChunEon Park 94447b0ccc remove redundant code.
it was for compatible for enventor v0.5.0 release.
now we are on development stage.
2015-03-02 14:49:51 +09:00
ChunEon Park acb713f39d disable latest eo api dependency for enventor v0.5 2015-03-02 13:56:23 +09:00
ChunEon Park 71669212c5 fix formatting. 2015-03-02 13:41:07 +09:00
ChunEon Park 7d5eee37cb updated AUTHORS 2015-03-02 00:57:51 +09:00
ChunEon Park c077f6d95e updates NEWS for enventor v0.5.0 2015-03-01 19:26:50 +09:00
ChunEon Park 8e2725786e confirm make distcheck. 2015-03-01 19:01:01 +09:00
ChunEon Park 76b56d92a2 bin/live_edit: remove unimportant message. 2015-03-01 18:55:11 +09:00
ChunEon Park 86de812d51 lib/edc_editor: stable redo, undo
seems fd handler is broken.. (suspect ecore audio..)
so key down events happened multiple times,

here workaround code is for stable enventor.
and should be removed later.
2015-03-01 18:52:36 +09:00
ChunEon Park c129316a64 lib/edc_parser: fix invalid memory access.
after parser data is freed, cur name thread which is still alive can access to parser data.
to resolve this, thread data has a  parser data pointer.
2015-03-01 18:41:00 +09:00
ChunEon Park 83ffef1bf3 Revert "bin/main: fix redo/undo operation issue."
This reverts commit 8f739c0edf.

eeek. this breaks entry input events.
2015-03-01 16:02:29 +09:00
ChunEon Park 8f739c0edf bin/main: fix redo/undo operation issue.
suddenly i found ecore key down/up is called twice..
i don't know reason but seems fd handler triggered this events.
this could be my system problem if your system doesn't have this,
please remove this workaround code.
2015-03-01 15:57:53 +09:00
ChunEon Park 57a2f1e377 lib: fix to monitoring new empty file.
"empty" in the template as well as empty input file in the command line, were not tracked by enventor
so live view couldnt be updated.

now it's fixed.
2015-03-01 14:34:03 +09:00
ChunEon Park d146547b52 enventor_object_save() forcely rewrites if the file path is changed.
so app doesn't need to care it anymore.
2015-03-01 14:23:31 +09:00
ChunEon Park 3dfaf7cb61 bin/file_mgr: don't update msg if statusbar is disabled. 2015-03-01 14:11:00 +09:00
ChunEon Park 65a52d4968 bin/main: this is not intended. 2015-03-01 12:34:15 +09:00
ChunEon Park 5d779f3dc7 bin/main: code refactoring.
add a enventor common setup to remove duplication.
2015-03-01 12:30:10 +09:00
ChunEon Park 5fbe04485f Revert "edc_editor: Add enventor_object_font_set()/get() APIs."
This reverts commit 220e1fe10c.

font change is critically buggy.
need to test more and review in detail.
2015-03-01 03:13:17 +09:00
ChunEon Park b19304d4c7 Revert "text_setting: Add font name and font style settings."
This reverts commit 74e72e6234.

Conflicts:
	src/bin/text_setting.c

font change is critically buggy.
need to test more and review in detail.
2015-03-01 03:08:18 +09:00
ChunEon Park cb339befe2 bin/main: fix infinite loop case.
when user launch enventor with command line option "-to xxx.edc",
it falls in infinite loop.

now its fixed.
2015-03-01 02:37:24 +09:00
ChunEon Park a22815cbfd lib: fix to not display file modification warning box.
don't display file modification warning box in launching envetor with template select menu.
2015-03-01 02:30:13 +09:00
ChunEon Park f3f0c30c8a fix live view updation problem.
if file is saved as, the edj tracking would be corrupted.
later this scenario, live view won't be updated

@fix T2124
2015-03-01 02:00:19 +09:00
ChunEon Park 4bb07d2f13 theme: restore removed group switching effect that was unintended.
side effect that introduced from e858f46c0b
2015-02-28 22:48:37 +09:00
ChunEon Park a595407460 lib/edc_editor: remove redundant code 2015-02-28 22:18:50 +09:00
ChunEon Park d99de37795 lib/edj_viewer: remove redundant code. 2015-02-28 17:13:05 +09:00
ChunEon Park 5ccaf382d0 migrate enventor ac define in configure.ac
focus enventor configurations on configure.ac
2015-02-28 15:16:43 +09:00
ChunEon Park cdab9f0a5d clean up code for supporting dllexport in win32. 2015-02-28 15:13:23 +09:00
ChunEon Park 96d4919a6b enable ENVENTOR BETA API in configure. 2015-02-28 14:50:17 +09:00
ChunEon Park db36b48d19 about: insert a empty line here. 2015-02-28 14:43:05 +09:00
ChunEon Park 259102d5f7 update COPYING 2015-02-28 14:38:51 +09:00
ChunEon Park 4551994771 updated AUTHORS 2015-02-28 14:36:31 +09:00
ChunEon Park a84a34a779 updated README 2015-02-28 14:34:40 +09:00
Michelle Legrand 05a848fddd lib: add export/import for libraries on Windows
Summary: Exporting/Importing Enventor dll for Win32.

Differential Revision: https://phab.enlightenment.org/D2040
2015-02-28 14:33:18 +09:00
ChunEon Park cf3ad3a914 lib/edj_viewer: fix the cursor position scale to view scale 2015-02-28 14:21:59 +09:00
ChunEon Park 7720ce5cf5 bump up version 2015-02-28 13:43:36 +09:00
Jaehyun Cho f5d344c129 edc_editor: Fix not to set entry non-editable.
Since elm_entry_editable_set() reloads entry theme, the registered
textblock of redoundo is replaced. This causes segmentation fault when
ctxpopup is dismissed.
Although entry is editable, entry text cannot not be changed if entry
does not have focus.
2015-02-27 19:36:11 +09:00
Jaehyun Cho cf78081977 newfile: Fix that edj is not reloaded when newly opened edc is changed.
edj was not reloaded when newly opened edc is changed since the new edc
path was not stored in conifg edc path.
2015-02-27 17:32:24 +09:00
ChunEon Park 0e885dfd04 bin/text_setting: remove unused variable. 2015-02-27 17:28:01 +09:00
ChunEon Park 5e8f437df5 fix all annoying warnings. 2015-02-27 17:26:02 +09:00
Jaehyun Cho 0abb1870dc ctxpopup: Fix the focus order of up/down buttons. 2015-02-27 16:48:02 +09:00
Jaehyun Cho 74e72e6234 text_setting: Add font name and font style settings. 2015-02-27 16:38:55 +09:00
Jaehyun Cho 220e1fe10c edc_editor: Add enventor_object_font_set()/get() APIs. 2015-02-27 16:38:46 +09:00
ChunEon Park 2aa5cca140 bin/tools: updated icons with tizen's.
Theses icons are contributed by
Yunho jeong and Mincheol Seo.
2015-02-26 15:20:53 +09:00
ChunEon Park 839e488bf1 theme/images: use macro to reduce loc. 2015-02-26 14:49:16 +09:00
ChunEon Park f7b15998d8 bin/tools: add button - redo, undo. 2015-02-26 14:39:43 +09:00
ChunEon Park 94fb905d65 lib/edc_editor: add 2 more apis - redo, undo. 2015-02-26 14:31:06 +09:00
ChunEon Park b28526310f bin/tools: code refactoring.
rename to explicit name.
2015-02-26 14:23:46 +09:00
ChunEon Park 3a60e771a6 bin/tools: add save button. 2015-02-26 14:22:30 +09:00
ChunEon Park e76fa5a666 bin/tools: adjust tools icons.
adjust 2 more images..
2015-02-26 13:38:59 +09:00
ChunEon Park 6d4f65df99 bin/tools: adjust tools icons.
adjust images and icon position and size.
2015-02-26 13:33:15 +09:00
ChunEon Park c668f54514 bin/live_edit: update info text format 2015-02-26 10:55:59 +09:00
ChunEon Park a87332c72e update for eo_do_ret()
api call change complied with unstable eo.
2015-02-26 10:47:51 +09:00
ChunEon Park 331ad370d7 bin/live_edit: fix side effect.
align lines are always visible. it's fixed.

it's introduced from e858f46c0b
2015-02-25 22:08:52 +09:00
ChunEon Park dd91efdc3d bin/live_edit: improve ui.
reposition info text and update guide text.
2015-02-25 22:03:55 +09:00
ChunEon Park e858f46c0b bin/live_edit: increase accuration for detailed coordinates. 2015-02-25 21:50:14 +09:00
ChunEon Park 61fb69f9da bin/live_edit: adjust text template code. 2015-02-25 17:02:01 +09:00
ChunEon Park 4cf2a8677a bin/live_edit: set content scalable 2015-02-25 16:53:16 +09:00
ChunEon Park 33b19c34cb bin/live_edit: code refactoring.
use enumeration instead of macro
2015-02-25 16:25:06 +09:00
ChunEon Park f21ba9c7e6 bin/live_edit: improve info text ui 2015-02-25 16:06:21 +09:00
Jaehyun Cho 16ad0b8958 edc_editor: Fix not to allow focus to edit layout when ctxpopup shows. 2015-02-25 15:49:14 +09:00
ChunEon Park d2f04a1be9 lib/live_view: remove redundant part. 2015-02-25 14:33:42 +09:00
ChunEon Park 179646e910 bin/live_edit: remove unused vars. 2015-02-25 14:14:57 +09:00
Jaehyun Cho 27cae3451d edc_editor: Fix not to set line entry editable. 2015-02-25 11:16:10 +09:00
ChunEon Park ba3d067179 bin/main: cancel live edit if context is switched to. 2015-02-25 11:10:54 +09:00
ChunEon Park f059e39409 lib/edc_editor: turn off edit mode if the editor is disabled.
elementary object disable policy has been changed,
if editor disables it's layout, it's line and editor entry would be disabled also.
in this case, the text color will be changed according to disabled style.

to avoid, this, we just disable edit mode instead of disable object.
2015-02-25 10:44:21 +09:00
Jaehyun Cho 0832ee8b16 Revert "syntax_color: Set white to default text color."
This reverts commit 992b50cc9b.
2015-02-24 20:37:05 +09:00
Jaehyun Cho 010f54cbdb Revert "Revert "edj_viewer: Fix cursor position on status bar.""
This reverts commit dd7da0b038.
2015-02-24 20:35:54 +09:00
Jaehyun Cho 6a871e04fc Revert "edc_editor: Set default text color to line text."
This reverts commit 89bbb67032.
2015-02-24 20:33:20 +09:00
Jaehyun Cho dd7da0b038 Revert "edj_viewer: Fix cursor position on status bar."
This reverts commit f2d5a22240.
2015-02-24 20:33:00 +09:00
Jaehyun Cho f2d5a22240 edj_viewer: Fix cursor position on status bar.
Fix cursor position on status bar not to be bigger than view size.
2015-02-24 16:48:11 +09:00
Jaehyun Cho 89bbb67032 edc_editor: Set default text color to line text.
Set #656565FF to default line text color to not change line text color
when entry is disabled.
2015-02-24 16:03:16 +09:00
ChunEon Park 0c282e559c bin/live_edit: fix the align line wrong position.
logically, the align line has the position problem.
it's position should be limited to each control positions.
2015-02-23 20:34:08 +09:00
ChunEon Park 0d18a42c86 bin/goto: make button scalable. 2015-02-23 20:00:38 +09:00
ChunEon Park 1ba6dfbc5d bin/tools: fix to icon scalable. 2015-02-23 19:17:11 +09:00
ChunEon Park 66706fac1f bin/live_edit: improve ui.
show/hide align lines more smoothly.
2015-02-22 23:45:49 +09:00
ChunEon Park f44b41ab29 bin/live_edit: show/hide control points
show/hide control points case by case.
2015-02-22 23:35:11 +09:00
ChunEon Park ebfefc0531 bin/live_edit: improve ux.
add a assistance lines for aligning.
2015-02-22 23:14:58 +09:00
ChunEon Park 56848930dd bin/live_edit: improve ui.
frame animation timeline should be same with control points
2015-02-22 22:46:20 +09:00
ChunEon Park 38123a2267 bin/live_edit: fix side effect
control point size should be not zero.

side effect that introduced by a1d8bf57c7.
2015-02-22 22:45:00 +09:00
ChunEon Park a1d8bf57c7 bin/live_edit: remove unnecessary code. 2015-02-22 22:37:26 +09:00
ChunEon Park 9baad134e8 bin/live_edit: insert part on user double click. 2015-02-22 22:33:04 +09:00
ChunEon Park 2386e45e92 bin/live_edit: allow backspace key to cancel the live edit mode 2015-02-22 22:26:12 +09:00
ChunEon Park 99307f2e58 bin/live_edit: remove redundant code 2015-02-22 22:25:43 +09:00
ChunEon Park 66e04b8ec1 bin/live_edit: improve usage.
add better rich control pointers.

this patch totally re-implemenet live edit function
since the draggable part has a lots of limitation to control it by user.
2015-02-22 18:27:24 +09:00
ChunEon Park 49c8b9ea4a bin/live_edit: improve ui. 2015-02-21 15:48:02 +09:00
ChunEon Park b792fac1d3 bin/live_edit: code refactoring.
just change internal variable name.
no logic change.
2015-02-21 15:47:33 +09:00
ChunEon Park 4d85c59418 bin/live_edit: shorter guide message. 2015-02-20 21:58:18 +09:00
ChunEon Park 24bcf041ba bin/live_edit: fix wrong ctxpopup position.
in case of short-cut key usage,
ctxpopup was appeared wrongly.
now it's placed according to the live edit buton.
2015-02-20 21:54:25 +09:00
ChunEon Park 2f451ba1b4 bin/live_edit: fix logic wrong.
live edit should be canceled when ctxpopup is dismissed
2015-02-20 20:53:48 +09:00
ChunEon Park 2346693c0a bin/live_edit: improve ux
change ui draggable rel1, rel2 controls.
remove info text
make outline shiny
2015-02-20 20:44:44 +09:00
ChunEon Park 4c66c8a1c4 bin/live_edit: code refactoring.
clean up the code.
2015-02-19 15:37:14 +09:00
ChunEon Park d95a66712c bin/live_edit: cancel live edit mode if ctxpopup is dismissed by user. 2015-02-19 14:51:04 +09:00
ChunEon Park fe23ef7865 bin/tools: remove redundant call.
we don't need to set focus on enventor here anyway the menu will be activated.
2015-02-19 13:06:43 +09:00
ChunEon Park ab4ddaa2fd bin/tools: code clean up.
split behaviors as possible.
2015-02-19 13:06:04 +09:00
ChunEon Park 8e0efde5b1 bin/live_edit: toggle live edit
don't activate search/goto with the live edit.
2015-02-19 13:01:47 +09:00
ChunEon Park 0ef94819a3 bin/live_edit: cast data type. 2015-02-19 12:56:27 +09:00
ChunEon Park 37e425fa1b bin/live_Edit: cancel live edit when esc is pressed 2015-02-19 12:34:03 +09:00
ChunEon Park bf122beaec bin/main: code clean up.
split behaviors as possible.
2015-02-19 12:29:33 +09:00
ChunEon Park 1381b2ade3 bin/live_edit: updated icons 2015-02-16 21:47:49 +09:00
ChunEon Park 4e6be71030 bin/live_edit: code refactoring.
just clean up code
2015-02-16 19:23:10 +09:00
ChunEon Park d040694dc2 bin/live_edit: use a ctxpopup instead of menu. 2015-02-16 19:19:33 +09:00
Jaehyun Cho 992b50cc9b syntax_color: Set white to default text color.
Set white to default text color to not change text color when entry is disabled.
2015-02-16 18:58:22 +09:00
ChunEon Park 12b35145ae bin/live_edit: refactoring code.
Just keep the on/off info in live edit.
enventor doesn't need to keep it in config since it's mode is volatile.
2015-02-16 16:27:42 +09:00
ChunEon Park 5c440f6554 bin/ui: improve tools find icon. 2015-02-16 15:34:06 +09:00
ChunEon Park d5ad84665d bin/ui: improve tools icons 2015-02-16 15:30:10 +09:00
Hermet 04c35e5d8a bin/console: add auto hiding function.
this is for better intellegent console window.

console will be hidden if any error messages are gone.
2015-02-14 18:36:00 +09:00
Hermet d8f471fd02 bin/console: improve the console usage.
show the console with the default size if it's size is 0 when toggle is clicked.
this is improvement for those people who doesn't understand that nothing is happened when console toggle is clicked.
2015-02-14 17:12:32 +09:00
Hermet fb6c3be3c2 bin: avoid direct type the app name. 2015-02-14 13:09:48 +09:00
ChunEon Park 17d7879eea bin/about: wrap sentences by word. 2015-02-13 18:28:57 +09:00
ChunEon Park 62cbb30270 bin/setting: improve more ui layout
it's suck to use toggle, label and slider..
label aligning is different each others...
2015-02-13 18:19:00 +09:00
ChunEon Park 6d95775842 bin/setting: improve setting gui layouting 2015-02-13 17:31:10 +09:00
ChunEon Park 900d65141a bin/main: change to new api call according to api deprecation. 2015-02-13 14:50:46 +09:00
ChunEon Park 29229c7f73 bin/main: fix to see the package directories properly. 2015-02-13 14:43:45 +09:00
Jaehyun Cho efe9c54d37 file_mgr: Reset console messages when edc file is modified. 2015-02-13 13:42:33 +09:00
Jaehyun Cho bc64118d58 Revert "console: Reset console error message when edc file is saved."
This reverts commit 392a12f9dd.
2015-02-13 13:34:34 +09:00
ChunEon Park 5e15bfab77 enventor/lib: no these are incorrect... 2015-02-13 13:22:57 +09:00
ChunEon Park 8c467a1f0a update AUTHORS 2015-02-13 13:19:52 +09:00
michelle legrand 83bb597ecd enventor_main: use elm_app_data_get_dir()
Summary:
Replacing PACKAGE_DATA_DIR by elm_app_data_get_dir() function. This function will look
for the data directory from where we are executing the program and not from where
we installed it. This enable us to have separated binaries (for Windows) in another
directory different from the configure's prefix.
@fix

Projects: #enventor

Differential Revision: https://phab.enlightenment.org/D1964
2015-02-13 13:17:12 +09:00
Jaehyun Cho 46d1017df7 template: Fix cursor position when insert image description and textblock style.
Fix the cursor position when image description and textblock style are inserted
with image part and textblock part.
2015-02-12 23:01:37 +09:00
Jaehyun Cho fe48ac5af7 edc_parser: Fix to enable inserting templates by live edit.
The problem that template is not inserted by live edit was caused by the wrong
double quotation marks parser.
The double quotation marks are written as "&quote;" in entry markup format and
they are written as "\"" in utf8 format.
Previously, only "&quote;" was used to parse double quotation marks.
Now, "&quote;" is used in entry markup format and "\"" is used in utf8 format
to parse double quotation marks.
2015-02-12 22:42:33 +09:00
Jaehyun Cho b14f106bf7 setting: Set a custom chain to set the focus order.
When the setting layout is unset and set, the focus order is changed.
To make the focus order same, set a custom chain.
2015-02-12 17:50:07 +09:00
Jaehyun Cho 995a6ef684 setting: Change the width of view width and view height entries.
Change the width of view width and view height entries to fit to 4 digits.
2015-02-12 15:44:24 +09:00
Jaehyun Cho 20b11fbc29 setting: Use label for uneditable text instead of entry.
To move focus correctly, use label for uneditable text instead of entry.
2015-02-12 15:25:25 +09:00
Jaehyun Cho 6c4d881777 newfile: Set temporary path to default edc path by eina_file_mkstemp(). 2015-02-11 22:20:34 +09:00
Jaehyun Cho 2e80073cfd template: Enable to insert image description and textblock style.
Enable to insert image description and textblock style when image part and
textblock part are inserted.
Previously, those are inserted only if parts are inserted by the live edit.
2015-02-11 20:21:27 +09:00
Jaehyun Cho 392a12f9dd console: Reset console error message when edc file is saved. 2015-02-11 19:08:20 +09:00
Jaehyun Cho 83abef91d2 setting: Add the Text Editor mode in setting.
Add the Text Editor mode in setting by adding text_setting.c.
text_setting.c covers the syntax coloring and the syntax font scaling.
2015-02-03 15:44:12 +09:00
Jaehyun Cho 899551a20c config: Add config_syntax_color_set()/get() functions.
Add config_syntax_color_set()/get() functions to save and load
2015-02-03 15:21:01 +09:00
Jaehyun Cho d0070eb673 Revert "config: Add config_syntax_color_set()/get() functions."
This reverts commit 2289ad6c03.

This commit is not applied correctly.
2015-02-03 13:47:53 +09:00
Jaehyun Cho e1991b63ff Revert "setting: Add the Text Editor mode in setting."
This reverts commit 799fd32e13.

The previous commit("config: Add config_syntax_color_set()/get() functions.")
is not applied correctly.
2015-02-03 13:46:43 +09:00
Jaehyun Cho 799fd32e13 setting: Add the Text Editor mode in setting.
Add the Text Editor mode in setting by adding text_setting.c.
text_setting.c covers the syntax coloring and the syntax font scaling.
2015-02-03 13:42:12 +09:00
Jaehyun Cho 2289ad6c03 config: Add config_syntax_color_set()/get() functions.
Summary: Add config_syntax_color_set()/get() functions to save and load user syntax color list.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1915
2015-02-03 12:00:32 +09:00
Jaehyun Cho 4fd5b2f132 common: Move <Enventor.h> to common header file of application.
Move <Enventor.h> to common.h to let application files include
<Enventor.h> and <Elementary.h> easily by including only "common.h".
2015-02-02 20:10:51 +09:00
Jaehyun Cho 9d6726799f syntax_color: Add an enum value ENVENTOR_SYNTAX_COLOR_LAST
Add an enum value ENVENTOR_SYNTAX_COLOR_LAST to help to indicate the last enum value of the syntax color.
2015-02-02 19:53:46 +09:00
ChunEon Park 43b3b77e04 lib: add enventor_object_cursor_pos_set to public API
Reviewers: Hermet

Projects: #enventor

Differential Revision: https://phab.enlightenment.org/D1894
2015-01-26 13:27:46 +09:00
Jaehyun Cho d5898e5434 syntax_color: Fix to parse and append double quotation marks(") correctly.
Fix the way of parsing and appending "&quot;" correctly.
2015-01-20 13:48:25 +09:00
Jaehyun Cho af1dc2f23d edc_parser: Fix to show double quotation marks(")
Change the markup for double quotation marks from "\"" to "&quot;".
2015-01-16 17:56:26 +09:00
Jaehyun Cho aeb4bcda16 syntax_color: Add enventor_object_syntax_color_set()/get().
Summary: Add enventor_object_syntax_color_set()/get() to support changing text color.

@feature

Reviewers: Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D1833
2015-01-05 13:27:54 +09:00
Jaehyun Cho ec28195641 ctxpopup: Fix to initialize string buffer.
Summary: Fix to initialize string buffer before calling strcat().

Reviewers: Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D1831
2014-12-30 11:52:14 +09:00
ChunEon Park 8b27ad269c syntax_color: add anti_alias keyword 2014-12-24 16:31:27 +09:00
ChunEon Park 1cd13a93f9 lib/liveview: clip the content if it's over the maximum view size. 2014-12-23 18:37:48 +09:00
ChunEon Park caeec62fdb lib/edc_parser: add more candidate popup keywords 2014-12-23 18:24:14 +09:00
ChunEon Park d8ef874198 lib/auto_comp: add "smooth" keyword 2014-12-23 11:11:28 +09:00
Jaehyun Cho da3cff83d9 edc_parser: Support property keywords of "transition".
Summary:
Support property keywords of "transition" in program.
         @feature

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1792
2014-12-19 15:46:11 +09:00
Jaehyun Cho ea2918130f edc_parser: Support a new candidate keyword "signal".
Summary:
Support a new candidate keyword "signal" in program.
@feature

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1791
2014-12-19 15:43:50 +09:00
ChunEon Park ef6ac44737 lib/ctxpopup: simpler toogle message 2014-12-19 14:44:09 +09:00
Jaehyun Cho 528389b95c ctxpopup: Support toggle candidate.
Summary:
Support toggle candidate.
         @feature

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1789
2014-12-19 14:36:49 +09:00
ChunEon Park 5fd165eaf4 theme: improve candidate popup gui. 2014-12-16 10:10:52 +09:00
Jaehyun Cho 48e56a4c4c ctxpopup: Change slider candidate style to contain type and entry.
Summary:
Change slider candidate style to contain value type and entry.
@feature

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1743
2014-12-16 09:08:15 +09:00
ChunEon Park 0f78075ead bin/main: fixed missing linenumber toogles.
F5 did nothing since it missed toggling the linenumber.

@fix
2014-12-15 09:50:01 +09:00
ChunEon Park 1061dd1aa6 bin/menu: revise save/load title messages. 2014-12-15 09:46:16 +09:00
ChunEon Park 43b070e0bb bin/menu: add tooltip messages.
@feature
2014-12-15 09:43:47 +09:00
ChunEon Park e2a58c0200 bin/tools: add short cut key info to tools tooltips. 2014-12-15 09:36:06 +09:00
ChunEon Park 6c6afadf25 about: fix wrong shortcut keys info. 2014-12-15 09:27:23 +09:00
ChunEon Park 8a568b1b89 bin/tools: improve tooltip messages. 2014-12-15 09:17:02 +09:00
ChunEon Park 9212c2eae4 bin: add tooltip messages to tools buttons.
@feature
2014-12-15 09:09:27 +09:00
Jaehyun Cho 855373f002 main: Keep view size set last time.
Summary:
Keep view size set last time by using "live_view,loaded" enventor callback.
@feature

Reviewers: Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D1745
2014-12-12 19:49:50 +09:00
Jaehyun Cho f177939cd2 enventor_main: Add "live_view,loaded" enventor callback.
Summary:
Add "live_view,loaded" enventor callback to notice that view layout is newly loaded.
@feature

Reviewers: Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D1744
2014-12-12 19:48:30 +09:00
Jaehyun Cho 6b8cebe8b5 main: Not dismiss ctxpopup by key events which are not shortcut keys.
Summary:
Not dismiss ctxpopup by key events which are not shortcut keys.
         This enables to control slider and buttons with key events,
         @feature

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1735
2014-12-09 11:19:55 +09:00
Jaehyun Cho b33e0e824e ctxpopup: Disable autoscroll while ctxpopup is visible.
Summary:
Disable autoscroll while ctxpopup is visible.
         This fixes the incorrect region show problem when ctxpopup is opened
         and also enables slider and buttons in ctxpopup can get focus.
         @fix

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1731
2014-12-09 11:19:07 +09:00
Jaehyun Cho f05dca3a22 Change the way of activating candidate ctxpopup.
Summary:
Change the way of activating candidate ctxpopup.
         @feature

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1729
2014-12-09 11:09:36 +09:00
ChunEon Park 20e1f20e6f color: add a new keyword, "CUBIC_BEZIER"
@fix
2014-12-04 19:32:19 +09:00
ChunEon Park 2029a8ae45 lib/edc_parser: add a candidate item, "cubic_bezier"
@feature
2014-12-04 19:31:08 +09:00
Jaehyun Cho 62cf8910ff bin/auto_comp: Support auto_comp and color for keywords in item.
Summary:
Support auto_comp and color for keywords aspect_mode, position, prefer, span, spread, weight.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1718

@fix
2014-12-03 11:59:22 +09:00
Jaehyun Cho f19f89f777 edc_parser: Fix max value of mouse_events from 1000 to 1
Summary:
Fix max value of mouse_events from 1000 to 1
         @fix

Reviewers: Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D1727
2014-12-03 11:56:25 +09:00
ChunEon Park 112cca116b bin/setting: recomposite setting gui. 2014-11-27 14:55:09 +09:00
Jaehyun Cho d9b91b0e67 edc_parser: Fix keyword name from "align" to "align:"
Summary:
edc_parser: Fix keyword name from "align" to "align:"

@fix

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1702
2014-11-26 21:23:29 +09:00
Jaehyun Cho a4227ef9a4 setting: Add size configuration of Live View
Summary:
Add size configuration of Live View
@feature

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1667
2014-11-25 21:08:29 +09:00
ChunEon Park 8ebec28586 fix typo 2014-11-20 08:52:12 +09:00
Jaehyun Cho 442bcaab36 Makefile: Install eo header files
Summary:
Install eo header files (enventor_object.eo.h, enventor_object.eo.legacy.h)
         @fix

Reviewers: Hermet

Reviewed By: Hermet

Subscribers: kfesyna

Differential Revision: https://phab.enlightenment.org/D1676
2014-11-19 21:57:35 +09:00
Jaehyun Cho cce3c96084 Fix build warning
Summary:
Fix build warning
         @fix

Reviewers: Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D1661
2014-11-14 17:31:18 +09:00
Jaehyun Cho 06557d3214 config_data: Keep window size set last time
Summary: Keep window size set last time by storing window size in config data

Reviewers: Hermet, seoz

Differential Revision: https://phab.enlightenment.org/D1665
2014-11-14 17:28:03 +09:00
Jaehyun Cho 98a9eca6c5 live_edit: Fix T1785 to restore live edit
Summary:
Fix T1785 to restore live edit
         @fix

Reviewers: Hermet

Maniphest Tasks: T1785

Differential Revision: https://phab.enlightenment.org/D1650
2014-11-12 16:44:19 +09:00
Lee Gwang-O b1259eb6b6 enventor: add description in README
Reviewers: Hermet

Reviewed By: Hermet

Subscribers: seoz

Differential Revision: https://phab.enlightenment.org/D1639
2014-11-05 20:39:15 +09:00
ChunEon Park 15b5363bda fix wrong package dependency.
Thanks Scimmia!
2014-11-03 23:24:35 +09:00
318 changed files with 40904 additions and 7528 deletions

26
.gitignore vendored
View File

@ -4,14 +4,20 @@
*.edj
*.swp
*.eet
*.exe
*~
.*
*.eo.*
*.sed
*.sin
*.gmo
tags
Enventor.h
enventor
enventorql
Makefile.in.in
Makefile.in
Makefile
@ -32,12 +38,20 @@ install-sh
libtool
ltmain.sh
enventor.pc
m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4
m4/efl.m4
!m4/efl_attribute.m4
!m4/efl_binary.m4
!m4/elm_quicklaunch.m4
!m4/efl_beta.m4
!m4/efl_eo.m4
m4/*
po/Makevars.template
po/POTFILES
po/Rules-quot
po/en@boldquot.header
po/en@quot.header
po/stamp-po
intl/
config.rpath
missing
src/bin/.deps/
src/bin/.libs/

1282
ABOUT-NLS

File diff suppressed because it is too large Load Diff

22
AUTHORS
View File

@ -1,4 +1,4 @@
Hermet (Chuneon Park) <hermet@hermet.pe.kr>
Hermet Park <hermetpark@gmail.com>
Cedric Bail <cedric.bail@free.fr>
Raoul Hecky <raoul.hecky@gmail.com>
Daniel Juyung Seo <seojuyung2@gmail.com>
@ -12,3 +12,23 @@ Alex-P. Natsios <drakevr@linuxteam.teilar.gr>
Kabeer Khan <kabeer.khan@samsung.com>
Leonid Dyudnik <l.dydnik@samsung.com>
Igor Murzov <garik@efl.so>
Lee Gwang-O <maeryo@live.co.kr>
Michelle Legrand <michelle.legrand@openwide.fr>
Yunho Jung <yunho7.jung@samsung.com>
Mincheol Seo <mcmin.seo@samsung.com>
Michelle Legrand <legrand.michelle@outlook.com>
Jerome Pinot <ngc891@gmail.com>
Jean-Phillippe Andre <jp.andre@samsung.com>
Vincent Torri <vincent.torri@gmail.com>
Stephen Houston <smhouston88@gmail.com>
Jee-Yong Um <jc9.um@samsung.com>
Tae-Hyup Kim <taehyub.kim@samsung.com>
Yurii Tsivun <y.tsivun@samsung.com>
Yongheon Shin <yongheon.shin@samsung.com>
Vyacheslav Reutskiy <v.reutskiy@samsung.com>
Bowon Ryu <bowon.ryu@samsung.com>
Jean Guyomarc'h <jean@guyomarch.bzh>
Thiep Ha <thiep.ha@samsung.com>
YeongJong Lee <cleanlyj@naver.com>
Massimo Maiurana <maiurana@gmail.com>
Amitesh Singh <amitesh.sh@samsung.com>

View File

@ -1,6 +1,6 @@
Copyright notice for Enventor:
Copyright (C) 2013-2014 ChunEon Park and various contributors (see AUTHORS)
Copyright (C) 2013-2016 Hermet Park and various contributors (see AUTHORS)
All rights reserved.

View File

@ -13,16 +13,19 @@ missing
filesdir = $(datadir)/$(PACKAGE)/docs
files_DATA = README
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \
README \
AUTHORS \
COPYING \
autogen.sh
SUBDIRS = src data
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src data . po
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pc/enventor.pc
update-po:
$(MAKE) $(AM_MAKEFLAGS) -C po update-po

View File

@ -1,19 +0,0 @@
if HAVE_EOLIAN_CXX
EOLIAN_CXX = @eolian_cxx@
_EOLIAN_CXX_DEP = @eolian_cxx@
else
EOLIAN_CXX = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian_cxx/eolian_cxx${EXEEXT}
_EOLIAN_CXX_DEP = bin/eolian_cxx/eolian_cxx${EXEEXT}
endif
AM_V_EOLCXX = $(am__v_EOLCXX_@AM_V@)
am__v_EOLCXX_ = $(am__v_EOLCXX_@AM_DEFAULT_V@)
am__v_EOLCXX_0 = @echo " EOLCXX " $@;
SUFFIXES += .eo.hh
%.eo.hh: %.eo $(_EOLIAN_CXX_DEP)
$(AM_V_EOLCXX)$(EOLIAN_CXX) $(EOLIAN_FLAGS) -o $@ $<
CLEANFILES += $(BUILT_SOURCES)

View File

@ -1,24 +0,0 @@
if HAVE_EOLIAN_GEN
EOLIAN_GEN = @eolian_gen@
_EOLIAN_GEN_DEP = @eolian_gen@
else
EOLIAN_GEN = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eolian/eolian_gen${EXEEXT}
_EOLIAN_GEN_DEP = bin/eolian/eolian_gen${EXEEXT}
endif
AM_V_EOL = $(am__v_EOL_@AM_V@)
am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@)
am__v_EOL_0 = @echo " EOLIAN " $@;
SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h
%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
$(AM_V_EOL)$(EOLIAN_GEN) --eo --legacy $(EOLIAN_FLAGS) --gc -o $@ $<
%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
$(AM_V_EOL)$(EOLIAN_GEN) --eo $(EOLIAN_FLAGS) --gh -o $@ $<
%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
$(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<
CLEANFILES += $(BUILT_SOURCES)

319
NEWS
View File

@ -1,9 +1,320 @@
==============
Enventor 0.4.0
Enventor 1.0.0
==============
Changes since Enventor 0.9.0:
-----------------------------
Additions:
* Tooltips: Newly supported.
* Wireframe: Newly introduced.
* File Tab: Newly introduced.
* Reference Popup: Newly introduced.
* A lot of Enventor APIs are changed.
Improvements:
* EDC Editor: Rearrange searched part to be placed in center.
* EDC Editor: Support to jump to the part define.
* File Borwser: Set current directory as a workspace in default.
* File Browser: add a function to set a main edc file with a marker.
* File Browser: Display sorted file list based on file type.
* File Browser: Skip files if their names were started with dot.
* Template: Add various samples.
* New File: Sort template list in alphabetical order.
* Help: Update overall content.
* Setting: Apply layze style to syntax color template code.
* Setting: Add the main EDC file path.
* Live Edit: support base_scale values.
* Console: Apply syntax color for error messages:.
* EDC Parser: Identify whole macro functions to have syntax color.
* Support vector type part.
* Update overall GUIs & Shortcut keys.
* Support individual group view size and view scale.
* Limit to an single Enventor instance.
* Update Syntax color keywords.
* Allow multi-file editor.
Fixes:
* Template: Fix Map template code typo.
* Template: don't localize floats in the relative values.
* Statusbar: Fix an incorrect view size.
* Indentation: Fix a incorrect indentation in a corner case.
* Live Edit: Fix incorrect stacking.
* Live Edit: Fix an added object to have min size properly.
* Live Edit: Dismiss ctxpopup when view position is changed.
* Goto: Fix window closing issue.
* Setting: Fix to not abuse user Elementary configuration file.
* Setting: Reset font style properly.
* EDC Editor: Show images on cursor "images.image".
* EDC Editor: Fix to remove focus highlight on template seletion button.
* Fix many crash scenarios.
* Fix a dummy swallow/spacer selection bug.
* Fix Undo's indiscriminate red alert.
* Fix build break on Win32.
Changes since Enventor 0.8.0:
-----------------------------
Additions:
* Mirror Mode: Newly introduced.
* File Browser: Newly introduced.
* Live Edit: Support Auto-Align feature.
* Live Edit: Support relative_to among the exist parts.
* Live Edit: Support Fixed Width & Height Interface.
* Live Edit: Add Edge Attaching Effect.
* Template: Add a Watchface code.
Improvements:
* Live Edit: Improve part name for more formal naming rule.
* Live Edit: Support direction key for moving live edit object item per pixels.
* Live Edit: Do not highlight part during live edit mode.
* Template: Remove a duplicated image comment to look better.
* Syntax Color: Improve string syntax color logic.
* Console: Hide unnecessary error messages.
* RedoUndo: Enhance smart function to support auto indentation.
* RedoUndo: Enable smart analyze for a pushed region text.
* Setting: Redesign GUI.
* Setting: Set Error-Message-Red-Alert-Effect configurable.
* About: Redesign from About to Help.
* EDC Navigator: Provide a program launch/stop functions.
* EDC Navigator: Redesign its basic tree behavior.
* Enventor API: renamed from enventor_object_file_set() -> enventor_object_main_file_set()
* Tools: Support a template insert button.
* Don't overwrite existing EDC with new template code.
* EDC Editor: Turned off focus highlight effect.
Fixes:
* Setting: Fix to activate edc navigator toggle correctly.
* Setting: Show current font correctly.
* EDC Navigator: Fix the editor cursor jumping issue.
* EDC Navigator: Compare name elaborately to search the part correctly.
* Statusbar: Fix view sizing issue when an invert button is clicked repeatedly.
* Indentation: Check '\r' when indented code line is created on Windows.
* Indentation: Fix to calculate indent depth after multi line comment.
* Indentation: Fix to paste a word at correct position.
* EDC Editor: Fix a crash issue on Windows when preview part on live view is clicked.
* EDC Editor: Compare name elaborately to search the clicked part correctly.
* Live Edit: Fix malfunction of key input on Windows.
* Live Edit: Fix center guide text positioning problem.
* Live View: Update dummy part when removing all source code.
* RedoUndo: Correct work with unicode symbols.
* Template: Fix the error of line position when inserting group template.
* Template: Fix line count of textblock part inserted in live edit mode.
* Template: Fix to insert template code to the correct place.
* EDC Parser: Fix wrong minimum value of "base_scale"
* EDC Parser: Fix a crash issue when double click words on Windows.
* Ctxpopup: Fix a broken preview image relay behavior.
* Ctxpopup: Block whole area if the editor ctxpopup is activated.
* Ctxpopup: Don't display image previews if the selected image string is in comments.
* Auto Completion: Fix its list moved to selected part name position.
* Fix a crash issue when removing all code in edc editor.
* Fix a compilation issue when new empty file is opened.
* Fix a color selector to scalable.
Changes since Enventor 0.7.0:
-----------------------------
Additions:
* Editor: Open/Close Bracket Highlighting.
* Statusbar: Support view inverting function (for simulating device rotation)
* Introduce a edc navigator.
* Support a color selector for "color" keywords in edc to change color.
* Add Enventor APis.
- enventor_object_part_states_list_get()
- enventor_object_parts_list_get()
- enventor_object_part_type_get()
- enventor_object_programs_list_get()
- ctxpopup,activated signal.
Removes:
* Remove fixed size option in setting.
* Remove minimum new template code.
* Remove Enventr_Max_Line data type.
Improvements:
* Editor: Support group name macros and preview those group macros.
* Improve Dummy Spacer UI.
* Statusbar supports live view zooming.
* Statusbar supports view size setting.
* View Scale slider in setting works on step size for mouse wheel.
* Improve the usage of the live view zooming with mouse wheel.
* Template code: fixed weird code insertion inside LazyEDC block.
* Support more autocomplete keywords.
* New design of Enventor logo.
* Improve tools ui.
* Simpilier editor ctxpopup ui.
* Console Box: Clicking Error log redirects editor cursor to the error code.
* Auto Indentation: Apply auto indentation for a edc file which is newly loaded.
* Auto Indentation: Improve logics for better smart results.
* Auto-select error code when error is occured.
* Auto completion: improve logic to guide better smart candidates lists.
* Live Edit: Select a name text in edc for a newly inserted part.
* Part Selection: Select a name in edc for a current selected part.
* RedoUndo: Support real-time preview when we undo/redo the code.
* Set a default font as Monospace type.
* Support monospace font types in the setting fonts list.
* In default, Select a current font type in the text setting.
* Editor Ctxpopup: Support Back key to reset the modification.
Fixes:
* Fix incorrect tools' tooltip position.
* Remove some unsupported edc keyowrds.
* Fix some memory leak issues.
* Fix ridiculous editor cursor jumping issue.
* Fix to paste markup symbols correctly.
* Fix editor to work with Copy & Paste Plain Text mode.
* Fix crash issues.
* Fix a bug that dummy swallow is invisible.
* Fix a bug that part selection in live view doesn't work.
* Fix not to insert an empty line at the end of file.
* Fix to keep the edc changed status correctly. This brought enventor save edc files multiple times unnecessarily.
* Fix initial line max is 0 issue.
* Reset cursor position to 0 when edc file is loaded.
* Fix to update images properly even if very large size of image were updated by other process.
Changes since Enventor 0.6.0:
-----------------------------
Additions:
* Tracking image resources for realtime live view updation.
* Marking lines which contains errors in edc editor.
* Support localization (English, Russian)
* Smart redo/undo function which applies coding convention for undo texts.
* Support dummy spacer.
* Jumping on to the code related with the current clicked part in live view.
Removes:
* Get rid of ELM_ENGINE environment.
Improvements:
* Focus shouldn't move on to ctxpopup when its moving.
* File Saving contains .edc extension automatically.
* Migrate on to lazy edc fully (syntax color, template code, etc..)
* Support realtime live view updation for the slider in ctxpoup.
* Renamed syntax color data file from color.src to edc.src.
* More compatible with ms windows platform.
* Add "base_scale" into template code.
* Improve auto completion for more correct and useful candidate keywords.
* Support ELM_ACCEL environment.
* Move the editor cursor at the end of the attributes after dismissing candidate list.
* Rename a temporary output file name to be different with input file name so that multiple enventors could modify same input file at the same time.
* Support more auto complete keywords.
- effect, anti_alias, mask_flags, limit, clip_to, domain
* Improve live edit icons quality.
Fixes:
* Fix key modifiers to work short cut keys correctly.
* Correct incorrect syntax color.
* Enventor_Path_Type interface is updated.
* Fix missing edc updation if it is modified by other processes.
* Fix some memory leaks.
* Recognize part descriptions properly in the editor even though they don't have names.
* Create a config home folder properly if it's not existed.
* Fix eo build break on the latest efl(1.16)
* Fix a broken redo/undo function after replacing the text with search/replace feature.
* Fix to be avaiable to choose the last item on the candidate list.
* Fix to work part highlighting out for all groups in one edc.
* Fix to close goto window while it's toggled with a toolbar button.
* Fix a wierd behavior which changes edc source when ctxpopup is going to be closed.
* Fix to move scroller bar to correct position for find function.
* Fix the issue that ctxpopup preview images are remained when mouse wheel works quickly.
* Reset console box error messages when new or open file is performed.
* Let the editor have focus after live edit is done.
* Dismiss ctxpopup when edc build error.
* Dismiss ctxpopup when warning box is shown up at window exit.
* Fix incorrect size displaying of the live object.
Changes since Enventor 0.5.0:
-----------------------------
Additions:
* Support editor font setting(font name, style, size).
* Add Enventor APis.
- enventor_object_font_set()/get() APIs.
- enventor_object_auto_complete_list_show() API.
Removes:
* Get rid of template insert feature per parts.
* Get rid of tooltips from menu buttons.
Improvements:
* Support more keywords in auto completion.
* Support more syntax color keywords
* Update live view with the current part that cursor positioned in.
* Improve live edit dragging handling.
* Introduce new command line arguments.
* Add more new file templates.
* Support edj output file path set.
* Update previous enventor config file properly by version info.
* Support saving edj file from file dialog.
* Enhance auto completion feature.
* Support part highlighting for SPACER type.
* Change short-cut keys for split views.
* Apply auto indentation when code is pasted.
* Support toggle effect on Tools GUI.
* Store/Restore editor split view status.
* Change live view scaling to zoom in/out concept.
* Adjust live view zoom range. (0.1 ~ 10.0)
Fixes:
* Fix the compatibility to eo syntax change.
* Fix library initialization count corruption.
* Disable part highlight on Live Edit mode.
* Fix the live view to update by groups correctly.
* Fix wrong candidate popup position.
* Fix context corruption of font/view scale up/down.
* Fix auto completion popup sizing issue.
* Close auto completion popup if the line is deleted.
* Fix focus highlight remaining issue when live edit item is selected.
* Zoom up/down properly on live edit mode.
* Cancel live edit if the about(F1) is activated.
* Ctrl + wheel works even with numlock.
Changes since Enventor 0.4.0:
-----------------------------
Additions:
* Support syntax color customization in setting.
* Add console auto hide mode.
* Support Live Edit (Ctrl + E).
* Add Enventor APIs.
- enventor_object_redo(), undo() APIs.
- enventor_object_cursor_pos_set() API.
- enventor_object_syntax_color_set()/get() APIs.
* Add "live_view,loaded" enventor smart callback.
Improvements:
* Enable to insert image descirtiption and textblock style in template inserting.
* Reset console error message when error is gone.
* Add Text Editor mode in setting.
* Menu supports tooltip.
* Redesign Tools and support tooltip helper.
* Redesign candidate popup and it's behavior.
* Support more keywords in candidate popup.
* Support more keywords in auto completion.
* Keep window size set last time.
Fixes:
* Fix to monitor empty file in live view.
* Fix intinite loop with "-to xxx.edc" in command line.
* Fix live view updation problem.
* Exporting/Importing Enventor dll for win32.
* Fix that edj is not reloaded when newly opened edc is changed.
* Fix wrong cursor position on status bar.
* Fix to goto window scalable.
* Set temporary path to default edc path by eina_file_mkstemp().
* Fix to show double quotation marks(") on efl 1.13
* Don't dismiss candidate popup on key events.
* Disable autoscrolling while ctxpopup is visible.
* Fix max value of mouse_events from 1000 to 1
* Fix to toggle linenumber properly with Shortcut key(F5)
* Fix max value of the mouse_events from 1000 to 1
* Fix candidate keyword name "align"
* Install missing eo header files
* Fix build package dependency.
Changes since Enventor 0.3.0:
---------------------------
-----------------------------
Additions:
* Support Redo/Undo (Ctrl+R/Ctrl+Z)
@ -17,7 +328,7 @@ Improvements:
* Support "-to" command line option to open template menu at launching.
* Support multiple Enventor app processes.
* Improve GUIs.
* Generate template parts with radom names.
* Generate template parts with random names.
Fixes:
* Fixed auto completion popup to be shown even if entry cursor is moved up and down.
@ -31,7 +342,7 @@ Fixes:
* Fixed dummy object(swallow) was invisible case.
Changes since Enventor 0.2.0:
---------------------------
-----------------------------
Additions:
* Go to line (Ctrl+L)

188
README
View File

@ -1,106 +1,114 @@
[Enventor v0.4.0]
This is an EDC editor with some convenient functions. It's brand new and was
only started near the begining of June 2013, so expecting it to do everything a
mature script editor does is a bit premature, but considering it's young age,
it does a lot.
[Enventor v1.0.0]
Enventor, which is also known as EDC (Edje Data Collections) Editor, is a EDC script editor tool that supports text editing and previewing functions for the EDC source code.
When your application requires real-time changeable layouts like animated ones, then you can write the layout design using EDC script, compile it into EDJ format file, and import it into your application using a UI layout component. You can also write design layouts from simple to complex ones using the EDC script with Enventor. Enventor helps you write EDC script code easier and finish your work faster. If you are not familiar with EDC programming, see Edje Programming Guide - https://www.enlightenment.org/program_guide/edje_pg for more information.
[Requirements]
efl (>= 1.10.0)
elementary (>= 1.10.0)
Please note that some features may not quite function correctly or completely
less EFL 1.10. Newer would be better.
Please see http://www.enlightenment.org for information on these.
efl (>= 1.18.0)
Please note that some features may not quite function correctly or completely prior to EFL 1.18. Newer would be better.
Please see the following sites for more information.
https://www.enlightenment.org/about-enventor
https://phab.enlightenment.org/w/projects/enventor
http://www.openhub.net/p/enventor
[Compiling]
Once you have met requirements, compiling and installing is simple:
Once you have met the requirements, compiling and installing is simple:
$ ./autogen.sh
$ make
$ sudo make install
$ sudo ldconfig (it may need on Linux System)
[Short Cut Keys]
Esc = Open/Close Menu
F1 = About
F2 = New
F3 = Save
F4 = Load
F5 = Show/Hide Line Number
F9 = Show/Hide Tools
F10 = Show/Hide Console
F11 = Show/Hide Status
F12 = Setting
Ctrl+S = Quick Save + Compile EDC
Ctrl+I = On/Off Auto Indentation
Ctrl+O = On/Off Auto Completion
Ctrl+W = Show/Hide Dummy Swallow
Ctrl+H = On/Off Part Highlighting
Ctrl+Left = On/Off Full Edit View
Ctrl+Top = On/Off Full Console View
Ctrl+Bottom = On/Off Full Editors View
Ctrl+T = Insert Defaut Template Code
Ctrl+Mouse Wheel Up = View Scale Up / Font Size Up
Ctrl+Mouse Wheel Down = View Scale Down / Font Size Down
Ctrl+Shift+B = Insert Part Template Code: Textblock
Ctrl+Shift+I = Insert Part Template Code: Image
Ctrl+Shift+R = Insert Part Template Code: Rectangle
Ctrl+Shift+T = Insert Part Template Code: Text
Ctrl+Shift+S = Insert Part Template Code: Spacer
Ctrl+Shift+W = Insert Part Template Code: Swallow
Ctrl+A = Select Text All
Ctrl+Double Click = Select a word
Ctrl+Z = Undo Text
Ctrl+R = Redo Text
Ctrl+C = Copy Selected Text
Ctrl+V = Paste Copied Text
Ctrl+X = Cut Selected Text
Ctrl+D = Delete a Current line
Ctrl+F = Find/Replace
Ctrl+L = Go to line
Ctrl+Home = Go to the Top line
Ctrl+End = Go to the Bottom line
Esc - Open/Close Menu
F1 - Help
F2 - Set Main EDC (in File Browser)
F3 - Quick Jump (Open an including file / Jumping to a referencing part)
F4 - Revert Quick Jump
F5 - Keyword Reference
F7 - Toggle Tools
F8 - Toggle Status
F9 - Toggle File Browser
F10 - Toggle EDC Navigator
F11 - Toggle File Tab
F12 - Settings
Ctrl+S - Quick Save + Update Live View
Ctrl+U - Toggle Dummy Parts
Ctrl+H - Toggle Part Highlighting
Ctrl+M - Toggle Mirror Mode
Ctrl+W - Toggle Wireframes
Ctrl+T - Insert Default Template Code
Ctrl+Mouse Wheel Up - View Zoom In / Font Size Up
Ctrl+Mouse Wheel Down - View Zoom Out / Font Size Down
Alt+Left - Toggle Full Edit View
Alt+Right - Toggle Full Live View
Alt+Up - Toggle Full Console View
Alt+Down - Toggle Full Editors View
Ctrl+A - Select Text All
Ctrl+Double Click - Select a word without openning candidate popup
Ctrl+Z - Undo Text
Ctrl+R - Redo Text
Ctrl+C - Copy Selected Text
Ctrl+V - Paste Copied Text
Ctrl+X - Cut Selected Text
Ctrl+D - Delete a Current line
Ctrl+F - Find/Replace
Ctrl+L - Go to line
Ctrl+Home - Go to the Top line
Ctrl+End - Go to the Bottom line
Ctrl+Space - Search candidate keywords in the context
[Command Line Usage]
enventor --help
enventor [input file] [-to] [-id image path] [-sd sound path] [-fd font path] [-dd data path]
-input file = EDC file to open. If input file is skipped, Enventor will open a default template code with a temporary file.
-to = Open template menu when you launch Enventor
-id = image resources, that edc includes, path
-sd = sound resources, that edc includes, path
-fd = font resources, that edc includes, path
-dd = data resources, that edc includes, path
enventor [input file] [output file] [-t] [-i image path] [-s sound path] [-f font path] [-d data path] [-w workspace path]
input file = EDC file to open. If input file is skipped, Enventor will open a default template code with a temporary file.
output file = EDJ file to store compiled file. If output file is skipped, Enventor will store the binary file to the temporary directory.
-t = Open template menu when you launch Enventor
-i = path to image resources that the edc includes
-s = path to sound resources that the edc includes
-f = path to font resources that the edc includes
-d = path to data resources that the edc includes
-w = workspace directory path that contains group edc files
Examples of Enventor command line usage:
$ enventor
$ enventor -to
$ enventor newfile.edc -to
$ enventor sample.edc -id ./images -sd ./sounds
$ enventor input.edc -i ./images
$ enventor input.edc output.edj -i ./images
$ enventor -t
$ enventor newfile.edc -t
$ enventor input.edc output.edj -i ./images -s ./sounds -w ./workspace
[Developers]
A lots of developers have joined in Enventor project. Here listed are the dedicated Enventor developers but there are much more people who've gladly contributed for Enventor improvement. For list of whole contributors, See AUTHORS file.
Copyright (C) 2013 - 2014 by:
Hermet (Chuneon Park)
Many developers have contributed to Enventor project. The following names are dedicated Enventor developers' names but there are more people who've gladly contributed for Enventor. For a complete list of contributors, See AUTHORS file.
Copyright (C) 2013 - 2016 by:
Hermet Park
Jaehyun Cho
Mykyta Biliavskyi
Kateryna Fesyna
Tae-Hyup Kim
Bowon Ryu
Yunho Jeong
Mincheol Seo
Raoul Hecky
Yurii Tsivun
And various contributors (See AUTHORS)

View File

@ -6,7 +6,7 @@ rm -f aclocal.m4 ltmain.sh
touch README
touch ABOUT-NLS
# echo "Running autopoint..." ; autopoint -f || :
echo "Running autopoint..." ; autopoint -f || :
echo "Running aclocal..." ; aclocal $ACLOCAL_FLAGS -I m4 || exit 1
echo "Running autoheader..." ; autoheader || exit 1
echo "Running autoconf..." ; autoconf || exit 1

View File

@ -1,8 +1,8 @@
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [0])
m4_define([v_min], [4])
m4_define([v_mic], [0])
m4_define([v_maj], [1])
m4_define([v_min], [0])
m4_define([v_mic], [99])
#m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
##-- When released, remove the dnl on the below line
dnl m4_undefine([v_rev])
@ -17,10 +17,11 @@ m4_define([lt_age], v_min)
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
AC_INIT(enventor, [v_ver], hermet@hermet.pe.kr)
AC_INIT(enventor, [v_ver], hermetpark@gmail.com)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR(configure.ac)
AC_CONFIG_MACRO_DIR([m4])
AC_PROG_CC
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
@ -28,12 +29,28 @@ AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(1.6 dist-bzip2 dist-xz)
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS(config.h)
AC_GNU_SOURCE
lt_cv_deplibs_check_method=pass_all
LT_INIT([win32-dll])
AC_PROG_LIBTOOL
AM_PROG_CC_C_O
ELM_QUICKLAUNCH
AM_PROG_AS
##-- localization with using gettext
AM_GNU_GETTEXT_VERSION(0.18.1)
AM_GNU_GETTEXT([external])
#===============================================================================
if test "x${prefix}" = "xNONE"; then
LOCALE_DIR="${ac_default_prefix}/share/locale"
else
LOCALE_DIR="${prefix}/share/locale"
fi
AC_SUBST(LOCALE_DIR)
#===============================================================================
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_ifdef([v_rev], , [m4_define([v_rev], [0])])
@ -54,12 +71,15 @@ ENVENTOR_VERSION_MINOR=v_min
AC_SUBST(ENVENTOR_VERSION_MAJOR)
AC_SUBST(ENVENTOR_VERSION_MINOR)
EFL_ENABLE_EO_API_SUPPORT
EFL_ENABLE_BETA_API_SUPPORT
AC_DEFINE_UNQUOTED(ENVENTOR_WIN32_BUILD_SUPPORT, 1, "Support Win32 dllexport")
AC_DEFINE_UNQUOTED(ENVENTOR_BETA_API_SUPPORT, 1, "Enable access to unstable ENVENTOR API that are still in beta")
AC_DEFINE_UNQUOTED(EFL_UI_FOCUS_OBJECT_PROTECTED, 1, "Enable Focus Protected API")
efl_version="1.10.0"
efl_version="1.18.0"
requirement_enventor=" \
eo >= ${efl_version} \
efl >= ${efl_version} \
eina >= ${efl_version} \
eet >= ${efl_version} \
elementary >= ${efl_version} \
@ -72,48 +92,20 @@ efreet >= ${efl_version}"
AC_SUBST(requirement_enventor)
PKG_CHECK_MODULES([ENVENTOR],
[
${requirement_enventor}
]
)
PKG_CHECK_MODULES([ENVENTOR], [${requirement_enventor}])
### Checks for linker characteristics
lt_enable_auto_import=""
case "${host_os}" in
mingw*)
lt_enable_auto_import="-Wl,--enable-auto-import"
;;
esac
case "$host_vendor" in
ps3*)
# Escape had already been checked to exist
;;
esac
AC_SUBST([lt_enable_auto_import])
# Needs to be moved into a macro, and also, needs a way to automatically fetch from all the dependencies using the Requires.
DEPS_EOLIAN_FLAGS=`${PKG_CONFIG} --variable=eolian_flags eo evas edje ecore elementary efl`
AC_SUBST([DEPS_EOLIAN_FLAGS])
EFL_ATTRIBUTE_UNUSED
# Check edje_cc
EFL_WITH_BIN([eet], [eet-eet], [eet])
EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
EFL_WITH_BIN([eolian], [eolian-gen], [eolian_gen])
EFL_WITH_BIN([eolian-cxx], [eolian-cxx], [eolian_cxx])
# Force the helper to try external eolian generator
AM_CONDITIONAL([HAVE_EOLIAN_GEN], [true])
AM_CONDITIONAL([HAVE_EOLIAN_CXX], [true])
AC_CONFIG_FILES([
po/Makefile.in
Makefile
src/Makefile
src/include/Makefile
src/lib/Makefile
src/lib/Enventor.h
src/bin/Makefile
data/Makefile
data/desktop/Makefile
@ -122,10 +114,13 @@ data/images/Makefile
data/themes/Makefile
data/themes/default/Makefile
data/themes/default/images/Makefile
data/themes/default/sounds/Makefile
data/templates/Makefile
data/color/Makefile
data/autocomp/Makefile
data/sounds/Makefile
data/about/Makefile
data/help/Makefile
data/reference/Makefile
pc/enventor.pc
])

View File

@ -1,3 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = images themes templates desktop icon color sounds about
SUBDIRS = images themes templates desktop icon color sounds help autocomp reference

View File

@ -1,89 +0,0 @@
<font_size=11><b>[Enventor v0.4.0]</b></font_size>
This is an EDC editor with some convenient functions.
It's band new and was only started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature, but considering it's young age, it does a lot.
Please note that some features may not quite function correctly or completely
less EFL 1.10. Newer would be better.
Please see http://www.enlightenment.org for information on these.
<font_size=11><b>[Short Cut Keys]</b></font_size>
Esc = Open/Close Menu
F1 = About
F2 = New
F3 = Save
F4 = Load
F5 = Show/Hide Line Number
F9 = Show/Hide Tools
F10 = Show/Hide Console
F11 = Show/Hide Status
F12 = Setting
Ctrl+S = Quick Save + Compile EDC
Ctrl+I = On/Off Auto Indentation
Ctrl+O = On/Off Auto Completion
Ctrl+W = Show/Hide Dummy Swallow
Ctrl+H = On/Off Part Highlighting
Ctrl+Left = On/Off Full Edit View
Ctrl+Top = On/Off Full Console View
Ctrl+Bottom = On/Off Full Editors View
Ctrl+T = Insert Defaut Template Code
Ctrl+Mouse Wheel Up = View Scale Up / Font Size Up
Ctrl+Mouse Wheel Down = View Scale Down / Font Size Down
Ctrl+Shift+B = Insert Part Template Code: Textblock
Ctrl+Shift+I = Insert Part Template Code: Image
Ctrl+Shift+R = Insert Part Template Code: Rectangle
Ctrl+Shift+T = Insert Part Template Code: Text
Ctrl+Shift+S = Insert Part Template Code: Spacer
Ctrl+Shift+W = Insert Part Template Code: Swallow
Ctrl+A = Select Text All
Ctrl+Double Click = Select a word
Ctrl+Z = Undo Text
Ctrl+R = Redo Text
Ctrl+C = Copy Selected Text
Ctrl+V = Paste Copied Text
Ctrl+X = Cut Selected Text
Ctrl+D = Delete a Current line
Ctrl+F = Find/Replace
Ctrl+L = Go to line
Ctrl+Home = Go to the Top line
Ctrl+End = Go to the Bottom line
<font_size=11><b>[Command Line Usage]</b></font_size>
enventor --help
enventor [input file] [-to] [-id image path] [-sd sound path] [-fd font path] [-dd data path]
-input file = EDC file to open. If input file is skipped, Enventor will open a default template code with a temporary file.
-to = Open template menu when you launch Enventor
-id = image resources, that edc includes, path
-sd = sound resources, that edc includes, path
-fd = font resources, that edc includes, path
-dd = data resources, that edc includes, path
Examples of Enventor command line usage:
$ enventor
$ enventor -to
$ enventor newfile.edc -to
$ enventor sample.edc -id ./images -sd ./sounds
<font_size=11><b>[Developers]</b></font_size>
A lots of developers have joined in Enventor project. Here listed are the dedicated Enventor developers but there are much more people who've gladly contributed for Enventor improvement. For list of whole contributors, See AUTHORS file.
Copyright (C) 2013 - 2014 by:
Hermet (Chuneon Park)
Jaehyun Cho
Mykyta Biliavskyi
Kateryna Fesyna
Raoul Hecky
And various contributors (See AUTHORS)

View File

@ -1,6 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/$(PACKAGE)/about
files_DATA = \
ABOUT
EXTRA_DIST = $(files_DATA)

16
data/autocomp/Makefile.am Normal file
View File

@ -0,0 +1,16 @@
MAINTAINERCLEANFILES = Makefile.in
EET_EET = @eet_eet@
EXTRA_DIST = autocomp.src
filesdir = $(datadir)/$(PACKAGE)/autocomp
files_DATA = autocomp.eet
%.eet: %.src
$(EET_EET) -e \
$(top_builddir)/data/autocomp/$@ node \
$< 1
clean-local:
rm -rf *.eet *~

2093
data/autocomp/autocomp.src Normal file

File diff suppressed because it is too large Load Diff

14
data/autocomp/meson.build Normal file
View File

@ -0,0 +1,14 @@
custom_target('autocomp.eet',
input : 'autocomp.src',
output : 'autocomp.eet',
command : eet_exe + [
'-e',
join_paths(meson.current_build_dir(), 'autocomp.eet'),
'node',
join_paths(meson.current_source_dir(), 'autocomp.src'),
'1'
],
install : true,
install_dir : join_paths(dir_pkgdata, 'autocomp')
)

View File

@ -3,11 +3,13 @@ MAINTAINERCLEANFILES = Makefile.in
EET_EET = @eet_eet@
EXTRA_DIST = \
color.src
edc.src \
syntax_template.dat
filesdir = $(datadir)/$(PACKAGE)/color
files_DATA = \
color.eet
edc.eet \
syntax_template.dat
%.eet: %.src
$(EET_EET) -e \

View File

@ -2,6 +2,7 @@ group "syntax_color_group" struct {
value "string" string: "AAAAAA";
value "comment" string: "00B000";
value "macro" string: "D42A2A";
value "count" string: "6";
group "colors" array {
count 6;
group "color" struct {
@ -19,6 +20,8 @@ group "syntax_color_group" struct {
value "key" string: "!";
value "key" string: "=";
value "key" string: "&amp;";
value "key" string: "&gt;";
value "key" string: "&lt;";
value "key" string: "|";
value "key" string: "\\";
}
@ -28,10 +31,19 @@ group "syntax_color_group" struct {
group "keys" list {
value "key" string: "box";
value "key" string: "collections";
value "key" string: "color_class ";
value "key" string: "color_classes";
value "key" string: "data";
value "key" string: "description";
value "key" string: "desc";
value "key" string: "dragable";
value "key" string: "externals";
value "key" string: "external";
value "key" string: "fill";
value "key" string: "filters";
value "key" string: "filter";
value "key" string: "fonts";
value "key" string: "gradient";
value "key" string: "group";
value "key" string: "images";
value "key" string: "image ";
@ -40,23 +52,34 @@ group "syntax_color_group" struct {
value "key" string: "item";
value "key" string: "map";
value "key" string: "origin";
value "key" string: "params";
value "key" string: "param";
value "key" string: "parts";
value "key" string: "part";
value "key" string: "programs";
value "key" string: "program";
value "key" string: "proxy";
value "key" string: "perspective ";
value "key" string: "rect";
value "key" string: "rel1";
value "key" string: "rel2";
value "key" string: "rotation";
value "key" string: "sample";
value "key" string: "script";
value "key" string: "set";
value "key" string: "set.";
value "key" string: "set ";
value "key" string: "snapshot";
value "key" string: "sounds";
value "key" string: "spacer";
value "key" string: "styles";
value "key" string: "swallow";
value "key" string: "size ";
value "key" string: "table";
value "key" string: "text ";
value "key" string: "text.";
value "key" string: "textblock";
value "key" string: "vector";
value "key" string: "zoom";
}
}
group "color" struct {
@ -66,6 +89,8 @@ group "syntax_color_group" struct {
value "key" string: "after";
value "key" string: "alias";
value "key" string: "align";
value "key" string: "anti_alias";
value "key" string: "aspect_mode";
value "key" string: "aspect_preference";
value "key" string: "aspect";
value "key" string: "backface_cull";
@ -75,18 +100,21 @@ group "syntax_color_group" struct {
value "key" string: "border";
value "key" string: "center";
value "key" string: "clip_to";
value "key" string: "code";
value "key" string: "color2";
value "key" string: "color3";
value "key" string: "color_class";
value "key" string: "color_class:";
value "key" string: "color";
value "key" string: "confine";
value "key" string: "cursor_mode";
value "key" string: "effect";
value "key" string: "ellipsis";
value "key" string: "entry_mode";
value "key" string: "file";
value "key" string: "fixed";
value "key" string: "focal";
value "key" string: "font";
value "key" string: "hid";
value "key" string: "ignore_flags";
value "key" string: "image";
value "key" string: "inherit";
@ -100,19 +128,28 @@ group "syntax_color_group" struct {
value "key" string: "mouse_events";
value "key" string: "multiline";
value "key" string: "name";
value "key" string: "nomouse";
value "key" string: "no_render";
value "key" string: "norender";
value "key" string: "normal";
value "key" string: "offset";
value "key" string: "on";
value "key" string: "padding:";
value "key" string: "perspective:";
value "key" string: "perspective_on";
value "key" string: "position";
value "key" string: "prefer";
value "key" string: "relative";
value "key" string: "render";
value "key" string: "repch";
value "key" string: "repeat_events";
value "key" string: "scale";
value "key" string: "select_mode";
value "key" string: "signal";
value "key" string: "span";
value "key" string: "spread";
value "key" string: "state";
value "key" string: "string";
value "key" string: "style";
value "key" string: "smooth";
value "key" string: "source";
@ -129,6 +166,7 @@ group "syntax_color_group" struct {
value "key" string: "type";
value "key" string: "tween";
value "key" string: "visible";
value "key" string: "weight";
value "key" string: "x:";
value "key" string: "y:";
value "key" string: "z:";
@ -140,31 +178,33 @@ group "syntax_color_group" struct {
group "keys" list {
value "key" string: "ACCELERATE_FACTOR";
value "key" string: "ACCELERATE";
value "key" string: "ACCEL_FAC";
value "key" string: "ACTION_STOP";
value "key" string: "BEFORE";
value "key" string: "BOTH";
value "key" string: "BOTTOM";
value "key" string: "BOUNCE";
value "key" string: "BOX";
value "key" string: "CUBIC_BEZIER";
value "key" string: "COMP";
value "key" string: "CURRENT";
value "key" string: "DECELERATE_FACTOR";
value "key" string: "DECELERATE";
value "key" string: "DECEL_FAC";
value "key" string: "DEFAULT";
value "key" string: "DIVISOR_INTERP";
value "key" string: "DIVIS";
value "key" string: "EDITABLE";
value "key" string: "EXPLICIT";
value "key" string: "EXTERNAL";
value "key" string: "FAR_SHADOW";
value "key" string: "FAR_SOFT_SHADOW";
value "key" string: "FOCUS_SET";
value "key" string: "GLOW";
value "key" string: "GRADIENT";
value "key" string: "GROUP";
value "key" string: "HORIZONTAL";
value "key" string: "IMAGE";
value "key" string: "LINEAR";
value "key" string: "LIN";
value "key" string: "LOSSY";
value "key" string: "LOSSY_ETC1";
value "key" string: "LOSSY_ETC2";
value "key" string: "MSG_FLOAT_SET";
value "key" string: "MSG_FLOAT";
value "key" string: "MSG_INT_FLOAT_SET";
@ -175,6 +215,7 @@ group "syntax_color_group" struct {
value "key" string: "MSG_STRING_INT";
value "key" string: "MSG_STRING_SET";
value "key" string: "MSG_STRING";
value "key" string: "NEITHER";
value "key" string: "NONE";
value "key" string: "ON_HOLD";
value "key" string: "OUTLINE_SOFT_SHADOW";
@ -185,23 +226,19 @@ group "syntax_color_group" struct {
value "key" string: "PLAIN";
value "key" string: "PLAY_SAMPLE";
value "key" string: "PROGRAM";
value "key" string: "PROXY";
value "key" string: "RAW";
value "key" string: "RECT";
value "key" string: "SHADOW";
value "key" string: "SIGNAL_EMIT";
value "key" string: "SINUSOIDAL_FACTOR";
value "key" string: "SINUSOIDAL";
value "key" string: "SIN_FAC";
value "key" string: "SIN";
value "key" string: "SOFT_OUTLINE";
value "key" string: "SOFT_SHADOW";
value "key" string: "SOLID";
value "key" string: "SPACER";
value "key" string: "SPRING";
value "key" string: "SOURCE";
value "key" string: "STATE_SET";
value "key" string: "SWALLOW";
value "key" string: "TABLE";
value "key" string: "TEXTBLOCK";
value "key" string: "TEXT";
value "key" string: "USER";
value "key" string: "VERTICAL";
}

19
data/color/meson.build Normal file
View File

@ -0,0 +1,19 @@
custom_target('color.eet',
input : 'edc.src',
output : 'edc.eet',
command : eet_exe + [
'-e',
join_paths(meson.current_build_dir(), 'edc.eet'),
'color',
join_paths(meson.current_source_dir(), 'edc.src'),
'1'
],
install : true,
install_dir : join_paths(dir_pkgdata, 'color')
)
install_data(
sources : 'syntax_template.dat',
install_dir : join_paths(dir_pkgdata, 'color')
)

View File

@ -0,0 +1 @@
<font_size=%3d><color=#%s>//comment</color><br/><color=#%s>#define RECT_COLOR</color> 0 136 170 255<br/><color=#%s>rect</color> <color=#%s>{</color> <color=#%s>&quot;part_name&quot;</color><color=#%s>;</color><br/> <color=#%s>desc</color> <color=#%s>{</color> <color=#%s>&quot;default&quot;</color> <color=#%s>;</color><br/> <color=#%s>rel1</color><color=#%s>.</color><color=#%s>relative</color><color=#%s>:</color> 0.0 0.0<color=#%s>;</color><br/> <color=#%s>rel2</color><color=#%s>.</color><color=#%s>relative</color><color=#%s>:</color> 1.0 1.0<color=#%s>;</color><br/> <color=#%s>color</color><color=#%s>:</color> <color=#%s>RECT_COLOR</color><color=#%s>;</color><br/> <color=#%s>}</color><br/><color=#%s>}</color><br/><color=#%s>program</color> <color=#%s>{</color> <color=#%s>&quot;mouse_down&quot;</color><color=#%s>;</color><br/> <color=#%s>signal</color><color=#%s>:</color> <color=#%s>&quot;mouse,down,1&quot;</color><color=#%s>;</color><br/> <color=#%s>source</color><color=#%s>:</color> <color=#%s>&quot;rect&quot;</color><color=#%s>;</color><br/> <color=#%s>action</color><color=#%s>:</color> <color=#%s>STATE_SET</color> <color=#%s>&quot;default&quot;</color> 0.0<color=#%s>;</color><br/> <color=#%s>target</color><color=#%s>:</color> <color=#%s>&quot;rect&quot;</color><color=#%s>;</color><br/><color=#%s>}</color><br/><color=#%s>script</color> <color=#%s>{</color><br/> <color=#%s>public</color> flag <color=#%s>=</color> 0<color=#%s>;</color><br/> <color=#%s>public</color> func<color=#%s>() {</color><br/> <color=#%s>if</color> <color=#%s>(!</color><color=#%s>get_int</color><color=#%s>(</color>flag<color=#%s>))</color> <color=#%s>set_int</color><color=#%s>(</color>flag<color=#%s>,</color> 1<color=#%s>);</color><br/> <color=#%s>}</color><br/><color=#%s>}</color></font_size>

View File

@ -0,0 +1 @@
<font_size=%3d><color=#%s>//comment</color><br/> <color=#%s>#define RECT_COLOR</color> 0 136 170 255<br/> <color=#%s>part</color> <color=#%s>{</color> <color=#%s>name</color><color=#%s>:</color> <color=#%s>&quot;rect&quot;</color><color=#%s>;</color><br/> <color=#%s>type</color><color=#%s>:</color> <color=#%s>RECT</color><color=#%s>;</color><br/> <color=#%s>description</color> <color=#%s>{</color> <color=#%s>state</color><color=#%s>:</color> <color=#%s>&quot;default&quot;</color> 0.0<color=#%s>;</color><br/> <color=#%s>rel1</color><color=#%s>.</color><color=#%s>relative</color><color=#%s>:</color> 0.0 0.0<color=#%s>;</color><br/> <color=#%s>rel2</color><color=#%s>.</color><color=#%s>relative</color><color=#%s>:</color> 1.0 1.0<color=#%s>;</color><br/> <color=#%s>color</color><color=#%s>:</color> <color=#%s>RECT_COLOR</color><color=#%s>;</color><br/> <color=#%s>}</color><br/> <color=#%s>}</color><br/> <color=#%s>program</color> <color=#%s>{</color> <color=#%s>name</color><color=#%s>:</color> <color=#%s>&quot;mouse_down&quot;</color><color=#%s>;</color><br/> <color=#%s>signal</color><color=#%s>:</color> <color=#%s>&quot;mouse,down,1&quot;</color><color=#%s>;</color><br/> <color=#%s>source</color><color=#%s>:</color> <color=#%s>&quot;rect&quot;</color><color=#%s>;</color><br/> <color=#%s>action</color><color=#%s>:</color> <color=#%s>STATE_SET</color> <color=#%s>&quot;default&quot;</color> 0.0<color=#%s>;</color><br/> <color=#%s>target</color><color=#%s>:</color> <color=#%s>&quot;rect&quot;</color><color=#%s>;</color><br/> <color=#%s>}</color><br/> <color=#%s>script</color> <color=#%s>{</color><br/> <color=#%s>public</color> flag <color=#%s>=</color> 0<color=#%s>;</color><br/> <color=#%s>public</color> func<color=#%s>() {</color><br/> <color=#%s>if</color> <color=#%s>(!</color><color=#%s>get_int</color><color=#%s>(</color>flag<color=#%s>))</color> <color=#%s>set_int</color><color=#%s>(</color>flag<color=#%s>,</color> 1<color=#%s>);</color><br/> <color=#%s>}</color><br/> <color=#%s>}</color></font_size>

View File

@ -3,6 +3,8 @@ Encoding=UTF-8
Type=Application
Name=Enventor
Comment=Enlightenment EDC Editor
Comment[fr]=Éditeur de fichiers EDC
Comment[it]=Editor per i file EDC di Enlightenment
Comment[ru]=Редактор EDC-файлов
Icon=enventor
Exec=enventor

5
data/desktop/meson.build Normal file
View File

@ -0,0 +1,5 @@
install_data(
sources : 'enventor.desktop',
install_dir : join_paths(dir_data, 'applications')
)

2038
data/development/Enventor-05.svg Executable file

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 220 KiB

1809
data/development/Enventor-06.svg Executable file

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 204 KiB

19
data/help/COMMAND Normal file
View File

@ -0,0 +1,19 @@
enventor --help</br>
enventor [input file] [output file] [-t] [-i image path] [-s sound path] [-f font path] [-d data path] [-w workspace path]</br>
</br>
input file = EDC file to open. If input file is skipped, Enventor will open a default template code with a temporary file.</br>
output file = EDJ file to store compiled file. If output file is skipped, Enventor will store the binary file to the temporary directory.</br>
-t = Open template menu when you launch Enventor</br>
-i = path to image resources that the edc includes</br>
-s = path to sound resources that the edc includes</br>
-f = path to font resources that the edc includes</br>
-d = path to data resources that the edc includes</br>
-w = workspace directory path that contains group edc files</br>
</br>
Examples of Enventor command line usage:</br>
$ enventor</br>
$ enventor input.edc -i ./images</br>
$ enventor input.edc output.edj -i ./images</br>
$ enventor -t</br>
$ enventor newfile.edc -t</br>
$ enventor input.edc output.edj -i ./images -s ./sounds -w ./workspace

16
data/help/DEVEL Normal file
View File

@ -0,0 +1,16 @@
Many developers have contributed to Enventor project. The following names are dedicated Enventor developers' names but there are more people who've gladly contributed for Enventor. For a complete list of contributors, See AUTHORS file.</br>
</br>
Copyright (C) 2013 - 2016 by:</br>
</br>
Hermet Park</br>
Jaehyun Cho</br>
Mykyta Biliavskyi</br>
Kateryna Fesyna</br>
Tae-Hyup Kim</br>
Bowon Ryu</br>
Yunho Jeong</br>
Mincheol Seo</br>
Raoul Hecky</br>
Yurii Tsivun</br>
</br>
And various contributors (See AUTHORS)

59
data/help/HISTORY Normal file
View File

@ -0,0 +1,59 @@
<b>Changes since Enventor 0.8.0</b><br>
<br>
<b>Additions:</b><br>
* Mirror Mode: Newly introduced.<br>
* File Browser: Newly introduced.<br>
* Live Edit: Support Auto-Align feature.<br>
* Live Edit: Support relative_to among the exist parts.<br>
* Live Edit: Support Fixed Width and Height Interface.<br>
* Live Edit: Add Edge Attaching Effect.<br>
* Template: Add a Watchface code.<br>
<br>
<b>Improvements:</b><br>
* Live Edit: Improve part name for more formal naming rule.<br>
* Live Edit: Support direction key for moving live edit object item per pixels.<br>
* Live Edit: Do not highlight part during live edit mode.<br>
* Template: Remove a duplicated image comment to look better.<br>
* Syntax Color: Improve string syntax color logic.<br>
* Console: Hide unnecessary error messages.<br>
* RedoUndo: Enhance smart function to support auto indentation.<br>
* RedoUndo: Enable smart analyze for a pushed region text.<br>
* Setting: Redesign GUI.<br>
* Setting: Set Error-Message-Red-Alert-Effect configurable.<br>
* About: Redesign from About to Help.<br>
* EDC Navigator: Provide a program launch/stop functions.<br>
* EDC Navigator: Redesign its basic tree behavior.<br>
* Enventor API: renamed from enventor_object_file_set() -> enventor_object_main_file_set()<br>
* Tools: Support a template insert button.<br>
* Don't overwrite existing EDC with new template code.<br>
* EDC Editor: Turned off focus highlight effect.<br>
<br>
<b>Fixes:</b><br>
* Setting: Fix to activate edc navigator toggle correctly.<br>
* Setting: Show current font correctly.<br>
* EDC Navigator: Fix the editor cursor jumping issue.<br>
* EDC Navigator: Compare name elaborately to search the part correctly.<br>
* Statusbar: Fix view sizing issue when an invert button is clicked repeatedly.<br>
* Indentation: Check '\r' when indented code line is created on Windows.<br>
* Indentation: Fix to calculate indent depth after multi line comment.<br>
* Indentation: Fix to paste a word at correct position.<br>
* EDC Editor: Fix a crash issue on Windows when preview part on live view is clicked.<br>
* EDC Editor: Compare name elaborately to search the clicked part correctly.<br>
* Live Edit: Fix malfunction of key input on Windows.<br>
* Live Edit: Fix center guide text positioning problem.<br>
* Live View: Update dummy part when removing all source code.<br>
* RedoUndo: Correct work with unicode symbols.<br>
* Template: Fix the error of line position when inserting group template.<br>
* Template: Fix line count of textblock part inserted in live edit mode.<br>
* Template: Fix to insert template code to the correct place.<br>
* EDC Parser: Fix wrong minimum value of "base_scale"<br>
* EDC Parser: Fix a crash issue when double click words on Windows.<br>
* Ctxpopup: Fix a broken preview image relay behavior.<br>
* Ctxpopup: Block whole area if the editor ctxpopup is activated.<br>
* Ctxpopup: Don't display image previews if the selected image string is in comments.<br>
* Auto Completion: Fix its list moved to selected part name position.<br>
* Fix a crash issue when removing all code in edc editor.<br>
* Fix a compilation issue when new empty file is opened.<br>
* Fix a color selector to scalable.<br>
<br>
Please see NEWS for more information.

12
data/help/INTRO Normal file
View File

@ -0,0 +1,12 @@
<b>Enventor v1.0.0</b></br>
</br>
Enventor, which is also known as EDC (Edje Data Collections) Editor, is a EDC script editor tool that supports text editing and previewing functions for the EDC source code.</br>
</br>
When your application requires real-time changeable layouts like animated ones, then you can write the layout design using EDC script, compile it into EDJ format file, and import it into your application using a UI layout component. You can also write design layouts from simple to complex ones using the EDC script with Enventor. Enventor helps you write EDC script code easier and finish your work faster. If you are not familiar with EDC programming, see Edje Programming Guide - https://www.enlightenment.org/program_guide/edje_pg for more information.</br>
</br>
Please see the following sites for more information.</br>
</br>
https://www.enlightenment.org/about-enventor</br>
https://phab.enlightenment.org/w/projects/enventor</br>
http://www.openhub.net/p/enventor

10
data/help/Makefile.am Normal file
View File

@ -0,0 +1,10 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/$(PACKAGE)/help
files_DATA = \
INTRO \
HISTORY \
SHORTCUT \
COMMAND \
DEVEL
EXTRA_DIST = $(files_DATA)

43
data/help/SHORTCUT Normal file
View File

@ -0,0 +1,43 @@
<b>Functions:</b></br>
Esc - Open/Close Menu</br>
F1 - Help</br>
F2 - Set Main EDC (in File Browser)</br>
F3 - Quick Jump (Open an including file / Jumping to a referencing part)</br>
F4 - Revert Quick Jump</br>
F5 - Keyword Reference</br>
F7 - Toggle Tools</br>
F8 - Toggle Status</br>
F9 - Toggle File Browser</br>
F10 - Toggle EDC Navigator</br>
F11 - Toggle File Tab</br>
F12 - Settings</br>
</br>
Ctrl+S - Quick Save + Update Live View</br>
Ctrl+U - Toggle Dummy Parts</br>
Ctrl+H - Toggle Part Highlighting</br>
Ctrl+M - Toggle Mirror Mode</br>
Ctrl+W - Toggle Wireframes</br>
Ctrl+T - Insert Default Template Code</br>
Ctrl+Mouse Wheel Up - View Zoom In / Font Size Up</br>
Ctrl+Mouse Wheel Down - View Zoom Out / Font Size Down</br>
</br>
<b>Panes Control:</b></br>
Alt+Left - Toggle Full Edit View</br>
Alt+Right - Toggle Full Live View</br>
Alt+Up - Toggle Full Console View</br>
Alt+Down - Toggle Full Editors View</br>
</br>
<b>Text Editor:</b></br>
Ctrl+A - Select Text All</br>
Ctrl+Double Click - Select a word without openning candidate popup</br>
Ctrl+Z - Undo Text</br>
Ctrl+R - Redo Text</br>
Ctrl+C - Copy Selected Text</br>
Ctrl+V - Paste Copied Text</br>
Ctrl+X - Cut Selected Text</br>
Ctrl+D - Delete a Current line</br>
Ctrl+F - Find/Replace</br>
Ctrl+L - Go to line</br>
Ctrl+Home - Go to the Top line</br>
Ctrl+End - Go to the Bottom line</br>
Ctrl+Space - Search candidate keywords in the context

13
data/help/meson.build Normal file
View File

@ -0,0 +1,13 @@
help_files = [
'INTRO',
'HISTORY',
'SHORTCUT',
'COMMAND',
'DEVEL'
]
install_data(
sources : help_files,
install_dir : join_paths(dir_pkgdata, 'help')
)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

5
data/icon/meson.build Normal file
View File

@ -0,0 +1,5 @@
install_data(
sources : 'enventor.png',
install_dir : join_paths(dir_data, 'icons')
)

View File

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" stroke-linejoin="round" viewBox="50 -100 500 500">
<path fill="none" stroke="black" stroke-width="10" d="M 212,220 C 197,171 156,153 123,221 109,157 120,109 159,63.6 190,114 234,115 254,89.8 260,82.3 268,69.6 270,60.3 273,66.5 275,71.6 280,75.6 286,79.5 294,79.8 300,79.8 306,79.8 314,79.5 320,75.6 325,71.6 327,66.5 330,60.3 332,69.6 340,82.3 346,89.8 366,115 410,114 441,63.6 480,109 491,157 477,221 444,153 403,171 388,220 366,188 316,200 300,248 284,200 234,188 212,220 Z"/>
</svg>

After

Width:  |  Height:  |  Size: 532 B

View File

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" stroke-linejoin="round" viewBox="50 -100 500 500">
<path fill="none" stroke="black" stroke-width="10" d="M 213,222 C 219,150 165,139 130,183 125,123 171,73.8 247,51.6 205,78 236,108 280,102 281,90.3 282,79 286,68.2 287,72 288,75.8 289,79.7 293,79.7 296,79.7 300,79.7 304,79.7 307,79.7 311,79.7 312,75.8 313,72 314,68.2 318,79 319,90.3 320,102 364,108 395,78 353,51.6 429,73.8 475,123 470,183 435,139 381,150 387,222 364,176 315,172 300,248 285,172 236,176 213,222 Z"/>
</svg>

After

Width:  |  Height:  |  Size: 516 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 405 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 436 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 393 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 482 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 679 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 636 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 696 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 716 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 494 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 460 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 755 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 938 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 720 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

View File

@ -0,0 +1,829 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">
<svg version="1.1" baseProfile="basic" id="svg2" xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="900px" height="900px"
viewBox="0 0 900 900" xml:space="preserve">
<path id="path482" fill="none" d="M184.013,144.428"/>
<path id="path6" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M108.956,403.826c0,0,0.178,3.344-1.276,3.311
c-1.455-0.033-30.507-84.917-66.752-80.957C40.928,326.18,72.326,313.197,108.956,403.826z"/>
<path id="path10" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M115.189,398.488c0,0-0.97,3.207-2.327,2.679
c-1.356-0.526,0.203-90.231-35.227-98.837C77.635,302.33,111.576,300.804,115.189,398.488z"/>
<path id="path14" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M163.727,473.225c0,0,2.888,1.695,2.059,2.892
c-0.832,1.194-87.655-21.408-104.35,11.003C61.436,487.118,67.931,453.771,163.727,473.225z"/>
<path id="path18" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M158.767,491.254c0,0,3.277,0.699,2.864,2.096
c-0.411,1.396-89.935,7.298-95.567,43.318C66.063,536.668,61.723,502.971,158.767,491.254z"/>
<path id="path22" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M151.332,481.498c0,0,3.139,1.171,2.528,2.492
c-0.611,1.319-90.037-5.899-100.864,28.915C52.996,512.905,53.617,478.938,151.332,481.498z"/>
<path id="path26" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M132.43,449.356c0,0,2.31,2.427,1.181,3.347
c-1.128,0.919-78.363-44.729-103.341-18.171C30.27,434.532,45.704,404.264,132.43,449.356z"/>
<path id="path30" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M119.108,456.757c0,0,2.571,2.148,1.554,3.192
c-1.017,1.041-82.921-35.576-104.734-6.36C15.928,453.589,27.837,421.769,119.108,456.757z"/>
<path id="path34" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M114.518,463.946c0,0,2.839,1.778,1.974,2.95
c-0.865,1.171-86.997-23.942-104.623,7.974C11.869,474.87,19.329,441.724,114.518,463.946z"/>
<path id="path38" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M133.47,465.03c0,0,1.981,2.703,0.743,3.472
c-1.237,0.768-71.985-54.405-100.161-31.267C34.052,437.235,53.236,409.195,133.47,465.03z"/>
<path id="path42" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M98.546,413.917c0,0,1.06,3.178-0.353,3.531
c-1.413,0.353-51.91-73.804-85.812-60.385C12.381,357.063,39.22,336.229,98.546,413.917z"/>
<path id="path46" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M99.773,426.239c0,0,1.722,2.876,0.417,3.523
c-1.303,0.649-66.605-60.873-96.813-40.458C3.376,389.306,25.088,363.174,99.773,426.239z"/>
<path id="path50" fill="#FFFFFF" stroke="#000000" stroke-width="0.172" d="M99.57,433.955c0,0,1.981,2.703,0.744,3.472
c-1.238,0.767-71.985-54.405-100.162-31.267C0.152,406.16,19.335,378.12,99.57,433.955z"/>
<path id="path54" fill="#FFFFFF" stroke="#000000" d="M95.668,436.985c0.888,10.678,2.632,22.275,5.703,27.783
c0,0-6.356,21.895,9.181,45.2c0,0-0.707,12.712,2.119,18.362c0,0,7.063,14.832,15.538,16.244c6.858,1.143,22.26,6.561,39.67,9.04
c0,0,30.249,24.859,24.599,47.461c0,0-0.706,28.956-7.063,31.781c0,0,20.481-19.775,3.531,9.888l-7.769,33.192
c0,0,45.201-38.138,17.657-5.648l-17.657,45.906c0,0,34.607-32.487,21.894-17.656l-5.65,15.538c0,0,76.276-48.025,21.894,4.237
c0,0,14.125-6.356,21.894-1.412c0,0,12.006-2.119,10.594,0.706c0,0-36.726,18.361-43.082,50.851c0,0,14.831-17.657,9.181,1.412
l0.706,20.48c0,0,7.063-38.138,6.356,28.25c0,0,33.9-31.78,13.419,4.944v29.662c0,0,26.838-28.956,15.538-6.354
c0,0,17.656-15.538,10.594,11.3c0,0-1.413,18.361,6.356-1.412c0,0,28.25-54.029,17.656-7.771c0,0-1.412,33.9,7.063,7.771
c0,0,0.706,18.362,16.95,31.075c0,0-2.119-89.695,20.48-26.133l7.063,28.957c0,0,4.943-16.244,4.237-25.426
c0,0,26.132-28.957,14.125,14.125c0,0,26.838-40.257,21.188-16.95c0,0-13.419,28.251-10.594,36.727c0,0,29.663-61.444,31.782-64.271
c0,0-3.531,74.865,15.537,11.3c0,0,9.888,21.188,4.943,28.957c0,0,14.125-14.125,12.712-19.774c0,0,8.122-14.479,13.066,9.534
c0,0,3.178,16.598,6.003,10.946c0,0,7.063,42.377,9.182,2.119c0,0,2.825-24.013-9.888-44.494c0,0,1.412-5.649-3.531-12.713
c0,0,24.014,38.139,11.3-12.713c0,0,19.777,14.125,21.896,14.125c0,0-24.015-40.963-8.477-32.487c0,0-9.183-18.362,22.602,2.825
c0,0-28.252-28.251,2.825-11.301c0,0,14.125,11.301,0.706-6.356c0,0-25.428-28.25,13.419,3.532c0,0,20.48,28.956,21.895,33.9
c0,0-17.655-51.559-25.426-56.501c0,0,14.832-64.271,87.576-36.727c0,0,12.007,30.369,19.774-2.118c0,0,22.602-11.301,42.375,37.432
c0,0,7.063-24.013,5.65-28.956c0,0,12.007,2.119,10.594,0c0,0,23.308,7.769,25.427,6.356c0,0,12.006,12.006,12.712,5.648
c0,0,16.244,4.944,12.713-1.412c0,0,15.538,27.544,16.244,33.9l4.236-24.719l3.531,4.942c0,0,2.825-13.419,1.413-15.537
c-1.413-2.119,35.313,12.006,43.787,48.731l3.531,14.831c0,0,10.594-26.131,7.77-33.193c0,0,9.181,1.412,9.888,9.181
c0,0,7.063-40.963-1.412-51.557c0,0,7.769-1.412,9.888,4.944V714.78c0,0,12.713,1.411,12.713-2.825c0,0,7.769-7.063,11.3,1.412
c0,0-21.894-62.15,10.594-28.25c0,0,12.714,19.068,6.356-14.125c-6.357-33.194-13.419-36.021-4.943-36.727
c0,0,1.412-6.355-2.118-9.181c-3.531-2.825,2.118,0,2.118,0s8.476,7.063-0.707-31.782c0,0,11.302,2.825-9.888-48.73
c0,0,4.944-4.237-2.118-19.069c0,0,14.125,7.77,19.069,4.944c0,0-0.707-2.825-6.356-9.889c0,0-38.139-96.759-2.118-57.913
c0,0,20.923,23.925,9.623-16.332c0,0-16.088-42.394-14.716-49.979L95.668,436.985z"/>
<path id="path58" fill="#CC7226" stroke="#000000" d="M854.095,396.693c1.108,0.32,5.004,2.304,7.211,5.217
c0,0,12.006,19.068,2.825-13.418c0,0-16.244-50.851-0.707-31.076c0,0,10.594,12.713,4.944-11.3
c-6.824-29.004-11.301-40.257-11.301-40.257s20.48,8.475-26.837-61.444l15.536,6.356c0,0-34.605-69.919-72.743-79.101
l-14.125-10.594c0,0,67.8-67.094,45.199-132.07c0,0-12.007-9.182-28.957,7.063c0,0-11.3,8.475-21.894,5.65
c0,0-54.382,2.119-57.913,2.119S630.359-21.844,514.533,9.231c0,0-9.183,3.531-16.95,1.413c0,0-32.489-28.25-118.653,12.006
c0,0-17.655,3.531-20.48,3.531s-7.77,0-21.895,11.3c-14.125,11.3-14.832,12.712-18.362,15.538c0,0-28.957,19.775-37.432,21.188
c0,0-20.481,11.3-28.25,28.957l-6.356,2.119c0,0-2.825,12.713-3.532,14.832c0,0-8.475,6.356-9.887,16.244
c0,0-15.538,10.594-14.832,18.362c0,0-2.825,9.182-4.238,17.657c0,0-12.712,8.475-11.3,13.419c0,0-13.419,24.719-11.3,36.725
c0,0-11.3-0.706-16.244,3.531c0,0-1.413,8.475-4.238,9.182c0,0-4.944,2.119-0.706,9.181c0,0-2.825,4.944-3.531,7.769
c0,0,1.412,4.944-6.356,14.831c0,0-11.3,33.194-7.769,42.375c0,0,0.707,8.475-4.237,11.3c0,0-6.356-0.707,8.475,20.481
c0,0,1.413,2.119-4.238,6.356c0,0-30.369,6.356-34.606,35.313c0,0-24.013,26.131-24.013,35.313c0,4.069,0.479,9.626,1.713,17.771
c0,0-1.007,14.718,47.725,16.131C191.772,453.469,854.095,396.693,854.095,396.693z"/>
<path id="path62" fill="#CC7226" d="M120.793,436.164c-44.141-69.566-18.716,30.018-18.716,30.018
c15.538,60.738,244.365-5.649,244.365-5.649s298.042-53.677,317.816-60.739c19.775-7.063,187.864,4.237,187.864,4.237l-9.888-29.663
c-114.414-81.926-148.314-40.963-172.327-48.025c-24.013-7.062-19.774,9.888-25.425,11.3c-5.651,1.412-74.863-42.375-86.163-40.963
c-11.301,1.413-56.045-40.523-29.663,15.538c28.25,60.032-103.115,69.213-132.778,49.438
c-29.663-19.775,12.713,32.488,12.713,32.488c32.487,35.313-28.25,5.65-28.25,5.65c-60.737-22.601-103.114,22.6-108.764,24.013
c-5.65,1.412-14.125,7.063-15.538-4.237c-1.412-11.301-14.672-40.789-70.625,5.649c-35.313,29.313-59.679-9.534-59.679-9.534
L120.793,436.164z"/>
<path id="path66" fill="#E87F3A" d="M560.632,299.761c-11.3,1.413-56.089-40.502-29.662,15.538
c29.311,62.151-103.113,69.213-132.775,49.438c-29.665-19.775,12.712,32.488,12.712,32.488c32.488,35.313-28.252,5.649-28.252,5.649
c-60.737-22.6-103.113,22.601-108.763,24.013c-5.65,1.413-14.125,7.063-15.538-4.236c-1.413-11.301-14.441-40.494-70.626,5.649
c-37.495,30.627-61.315-7.255-61.315-7.255l-5.65,17.849c-44.141-70.271-17.529,32.682-17.529,32.682
c15.54,60.739,245.521-7.962,245.521-7.962s298.043-53.676,317.817-60.738c19.774-7.062,186.325,4.109,186.325,4.109l-9.762-30.563
c-114.413-81.926-146.9-39.935-170.914-46.998c-24.013-7.063-19.774,9.888-25.425,11.3
C641.146,342.136,571.933,298.349,560.632,299.761z"/>
<path id="path70" fill="#EA8C4D" d="M562.943,302.842c-11.301,1.413-54.973-41.014-29.663,15.538
c28.604,63.918-103.113,69.215-132.776,49.44c-29.662-19.775,12.713,32.488,12.713,32.488c32.488,35.313-28.25,5.649-28.25,5.649
c-60.738-22.6-103.115,22.601-108.766,24.013c-5.65,1.413-14.125,7.063-15.538-4.236c-1.413-11.301-14.21-40.198-70.625,5.649
c-39.68,31.942-62.952-4.976-62.952-4.976l-6.356,15.216c-42.022-68.86-16.341,35.345-16.341,35.345
c15.538,60.738,246.678-10.271,246.678-10.271s298.04-53.677,317.814-60.738c19.775-7.063,184.783,3.979,184.783,3.979l-9.63-31.46
c-114.415-81.926-145.49-38.909-169.503-45.972c-24.014-7.063-19.775,9.888-25.427,11.302
C643.457,345.219,574.243,301.429,562.943,302.842z"/>
<path id="path74" fill="#EC9961" d="M565.255,305.925c-11.301,1.413-54.963-41.02-29.663,15.538
c29.663,66.311-104.057,68.586-132.775,49.438c-29.663-19.775,12.713,32.488,12.713,32.488c32.486,35.313-28.25,5.649-28.25,5.649
c-60.738-22.6-103.114,22.601-108.764,24.013c-5.65,1.413-14.125,7.063-15.538-4.236c-1.413-11.301-13.979-39.9-70.627,5.649
c-41.862,33.259-64.591-2.696-64.591-2.696l-7.063,12.584c-38.491-64.976-15.151,38.012-15.151,38.012
c15.538,60.736,247.833-12.586,247.833-12.586s298.04-53.677,317.817-60.738c19.773-7.063,183.24,3.853,183.24,3.853l-9.502-32.358
c-114.414-81.928-144.076-37.882-168.09-44.945c-24.015-7.063-19.775,9.888-25.427,11.3
C645.766,348.301,576.555,304.512,565.255,305.925z"/>
<path id="path78" fill="#EEA575" d="M567.567,309.008c-11.303,1.412-54.07-41.412-29.664,15.538
c29.664,69.213-103.114,69.213-132.776,49.438c-29.663-19.775,12.713,32.487,12.713,32.487c32.487,35.313-28.251,5.65-28.251,5.65
c-60.738-22.6-103.113,22.601-108.763,24.013c-5.65,1.412-14.125,7.063-15.538-4.237s-13.746-39.604-70.626,5.649
c-44.046,34.575-66.229-0.418-66.229-0.418l-7.769,9.953c-34.96-61.446-13.964,40.673-13.964,40.673
c15.538,60.74,248.989-14.895,248.989-14.895s298.043-53.677,317.816-60.738c19.775-7.063,181.701,3.724,181.701,3.724
l-9.374-33.259c-114.414-81.926-142.664-36.853-166.677-43.915c-24.014-7.062-19.775,9.888-25.426,11.3
C648.081,351.383,578.868,307.595,567.567,309.008z"/>
<path id="path82" fill="#F1B288" d="M569.879,312.089c-11.3,1.412-57.144-39.994-29.663,15.538
c33.9,68.507-103.115,69.213-132.778,49.438c-29.661-19.775,12.714,32.487,12.714,32.487c32.487,35.313-28.25,5.65-28.25,5.65
c-60.738-22.6-103.114,22.601-108.764,24.013c-5.65,1.412-14.125,7.063-15.538-4.237c-1.413-11.3-13.514-39.309-70.626,5.649
c-46.228,35.893-67.866,1.863-67.866,1.863l-8.475,7.317c-31.782-58.619-12.776,43.341-12.776,43.341
C123.394,553.887,358,475.94,358,475.94s298.042-53.677,317.817-60.738c19.774-7.063,180.158,3.595,180.158,3.595l-9.244-34.156
c-114.413-81.926-141.251-35.827-165.265-42.889c-24.013-7.062-19.774,9.888-25.426,11.3
C650.393,354.464,581.179,310.676,569.879,312.089z"/>
<path id="path86" fill="#F3BF9C" d="M572.19,315.169c-11.303,1.413-57.813-39.656-29.665,15.538
c36.021,70.627-103.113,69.214-132.776,49.439s12.713,32.488,12.713,32.488c32.487,35.313-28.25,5.65-28.25,5.65
c-60.738-22.601-103.114,22.6-108.764,24.013c-5.65,1.412-14.125,7.063-15.538-4.237c-1.412-11.301-13.283-39.014-70.625,5.649
c-48.412,37.208-69.503,4.141-69.503,4.141l-9.181,4.688c-28.25-53.322-11.59,46.004-11.59,46.004
c15.538,60.738,251.301-19.519,251.301-19.519s298.041-53.677,317.816-60.738c19.775-7.063,178.619,3.466,178.619,3.466
l-9.117-35.055c-114.414-81.926-139.84-34.799-163.853-41.862c-24.014-7.064-19.774,9.888-25.425,11.3
C652.702,357.546,583.49,313.757,572.19,315.169z"/>
<path id="path90" fill="#F5CCB0" d="M574.501,318.252c-11.3,1.413-59.753-38.624-29.662,15.538
c38.844,69.92-103.115,69.213-132.778,49.438c-29.662-19.775,12.714,32.488,12.714,32.488c32.486,35.313-28.251,5.65-28.251,5.65
c-60.737-22.602-103.113,22.6-108.764,24.013c-5.65,1.412-14.125,7.063-15.538-4.237c-1.413-11.301-13.05-38.716-70.626,5.649
c-50.594,38.524-71.14,6.422-71.14,6.422l-9.887,2.054c-25.427-50.145-10.401,48.668-10.401,48.668
c15.538,60.74,252.455-21.829,252.455-21.829s298.043-53.677,317.816-60.738c19.775-7.063,177.078,3.339,177.078,3.339
l-8.987-35.956c-114.414-81.926-138.428-33.771-162.439-40.834c-24.013-7.063-19.774,9.888-25.425,11.3
C655.015,360.628,585.802,316.84,574.501,318.252z"/>
<path id="path94" fill="#F8D8C4" d="M576.813,321.335c-11.3,1.413-59.753-38.625-29.662,15.538
c38.845,69.919-103.113,69.213-132.776,49.438c-29.662-19.775,12.713,32.488,12.713,32.488c32.488,35.313-28.25,5.65-28.25,5.65
c-60.74-22.602-103.115,22.6-108.766,24.013c-5.65,1.412-14.125,7.063-15.538-4.238c-1.413-11.3-12.817-38.42-70.625,5.65
c-52.777,39.84-72.776,8.701-72.776,8.701l-10.594-0.579c-24.015-46.615-9.213,51.332-9.213,51.332
c15.538,60.738,253.609-24.143,253.609-24.143s298.042-53.675,317.817-60.736c19.775-7.063,175.538,3.21,175.538,3.21l-8.859-36.854
c-114.416-81.926-137.016-32.744-161.027-39.807c-24.013-7.063-19.775,9.888-25.427,11.3
C657.326,363.711,588.112,319.923,576.813,321.335z"/>
<path id="path98" fill="#FAE5D7" d="M579.124,324.417c-11.301,1.413-59.068-38.998-29.663,15.538
c38.844,72.038-103.113,69.213-132.776,49.438c-29.662-19.775,12.714,32.488,12.714,32.488c32.486,35.313-28.251,5.65-28.251,5.65
c-60.737-22.602-103.113,22.6-108.764,24.013c-5.652,1.412-14.127,7.063-15.54-4.238c-1.412-11.3-12.585-38.123-70.625,5.65
c-54.959,41.157-74.413,10.979-74.413,10.979l-11.302-3.212c-22.954-42.375-8.025,53.999-8.025,53.999
c15.538,60.738,254.769-26.455,254.769-26.455s298.04-53.675,317.814-60.736c19.775-7.063,173.997,3.082,173.997,3.082
l-8.732-37.752c-114.413-81.928-135.602-31.718-159.613-38.781c-24.014-7.063-19.774,9.888-25.426,11.3
S590.424,323.004,579.124,324.417z"/>
<path id="path102" fill="#FCF2EB" d="M581.435,327.498c-11.3,1.412-57.161-39.981-29.661,15.538
c37.432,75.571-103.114,69.215-132.776,49.439c-29.663-19.775,12.713,32.488,12.713,32.488c32.487,35.313-28.251,5.649-28.251,5.649
c-60.738-22.601-103.113,22.601-108.763,24.013c-5.65,1.413-14.125,7.063-15.538-4.237c-1.413-11.3-12.354-37.827-70.626,5.65
c-57.145,42.473-76.053,13.258-76.053,13.258l-12.006-5.842c-22.6-40.964-6.836,56.661-6.836,56.661
c15.538,60.736,255.921-28.766,255.921-28.766s298.043-53.676,317.817-60.737c19.775-7.063,172.454,2.951,172.454,2.951
l-8.604-38.65c-114.415-81.926-134.188-30.688-158.2-37.751c-24.014-7.064-19.775,9.887-25.426,11.3
C661.948,369.875,592.735,326.085,581.435,327.498z"/>
<path id="path106" fill="#FFFFFF" d="M120.44,466.182c-22.601-38.846-5.65,59.325-5.65,59.325
c15.538,60.738,257.078-31.075,257.078-31.075s298.042-53.677,317.816-60.738c19.775-7.063,170.914,2.823,170.914,2.823
l-8.475-39.55c-114.414-81.926-132.776-29.663-156.789-36.726c-24.013-7.063-19.775,9.888-25.426,11.3
c-5.649,1.413-74.862-42.375-86.163-40.963c-11.3,1.412-55.829-40.623-29.663,15.538c39.245,84.232-107.28,66.436-132.777,49.438
c-29.663-19.775,12.712,32.488,12.712,32.488c32.488,35.313-28.25,5.65-28.25,5.65c-60.737-22.602-103.113,22.602-108.764,24.014
c-5.65,1.413-14.125,7.063-15.538-4.237c-1.413-11.302-12.121-37.532-70.625,5.65c-59.326,43.788-77.688,15.537-77.688,15.537
L120.44,466.182z"/>
<path id="path110" d="M193.891,519.15c0,0-12.713,20.48,24.013,43.788c0,0,2.472,2.473-29.31-4.943c0,0-10.947-3.531-13.771-21.896
c0,0-8.475-7.769-16.95-17.655C149.397,508.557,193.891,519.15,193.891,519.15z"/>
<path id="path114" fill="#CCCCCC" d="M441.08,435.104c0,0,31.249,47.356,30.193,55.797c-2.297,18.362-2.648,35.313,3.001,42.376
c5.651,7.063,21.188,65.682,21.188,65.682s-0.706,2.119,21.188-64.976c0,0,20.48-28.25-14.831-60.738
C501.82,473.244,439.668,422.392,441.08,435.104z"/>
<path id="path118" d="M229.204,566.47c0,0,19.775,12.713-5.65,67.802l11.3-4.237c0,0-1.413,19.774-7.063,24.013l12.712-5.65
c0,0,8.475,14.127,1.413,22.602c0,0,29.663,14.125,28.25,25.425c0,0,11.3-14.125,4.237-25.425s-19.775-4.237-18.363-36.727
l-15.538,5.65c0,0,9.888-15.538,9.888-26.838l-14.125,4.237c0,0,27.313-46.928,8.475-49.438
C234.147,566.47,229.204,566.47,229.204,566.47z"/>
<path id="path122" fill="#CCCCCC" d="M286.41,596.133c0,0,4.944-7.769,0-6.355c-4.944,1.413-60.032,27.544-70.625,44.494
C215.785,634.271,276.522,591.189,286.41,596.133z"/>
<path id="path126" fill="#CCCCCC" d="M304.773,610.258c0,0,4.944-7.769,0-6.355s-60.032,27.544-70.625,44.494
C234.147,648.396,294.885,605.314,304.773,610.258z"/>
<path id="path130" fill="#CCCCCC" d="M328.079,583.42c0,0,4.944-7.769,0-6.355c-4.943,1.412-60.032,27.545-70.625,44.494
C257.454,621.559,318.191,578.477,328.079,583.42z"/>
<path id="path134" fill="#CCCCCC" d="M287.117,660.402c0,0,0-10.595-4.944-9.183c-4.944,1.413-68.507,32.488-79.101,49.438
C203.072,700.659,277.229,655.458,287.117,660.402z"/>
<path id="path138" fill="#CCCCCC" d="M289.235,641.333c0,0,2.119-8.475-2.825-7.063c-3.531,0-50.144,20.481-60.738,37.433
C225.672,671.702,277.935,633.564,289.235,641.333z"/>
<path id="path142" fill="#CCCCCC" d="M263.81,725.378l-17.656,13.419c0,0,18.362-13.419,24.719-11.3
c0,0-12.006,19.774-13.419,28.956c0,0,18.363-22.602,28.25-21.895c0,0,13.419,0.706,13.419,19.774c0,0,9.888-18.362,15.537-17.656
c0,0,2.119,11.302,0,23.308c0,0,7.063-13.419,14.125-10.595c0,0,11.301-3.53,9.888,16.95c0,0,0,18.362-1.412,23.308
c0,0,9.889-46.613,14.125-47.319c0,0,14.125-2.119,22.602,13.419c0,0-7.063-13.419,1.412-9.888c0,0,19.068,2.824,24.719,14.831
c0,0-12.006-21.188-2.118-15.537c0,0,12.006,0,14.125,11.3c0,0,14.831,37.432,18.362,40.257c0,0-13.419-38.138-10.595-38.138
c0,0-3.53-21.188,5.65,4.942c0,0-5.65-24.719,4.237-23.307c9.888,1.413,17.655,19.069,32.487,14.832
c0,0,16.952,9.888,20.483-112.295L263.81,725.378z"/>
<path id="path146" d="M272.285,561.526c0,0,26.131-10.595,96.757,0c0,0,12.713,0.706,24.72-14.831
c12.006-15.538,59.325-28.251,70.625-24.721l16.952,11.302l1.413,2.118c0,0,21.895,18.362,22.6,31.781
c0.706,13.418-25.425,98.169-42.377,126.42c-16.949,28.25-33.899,50.145-67.801,45.906c0,0-36.726-7.063-81.926,0
c0,0-51.557-2.825-56.5-16.95s19.775-40.963,19.775-40.963s7.769-14.831,5.65-40.257C280.054,615.908,280.76,566.47,272.285,561.526
z"/>
<path id="path150" fill="#E5668C" d="M311.129,565.058c14.832,32.487-37.431,147.607-37.431,147.607
c-3.531,2.825,22.353,13.499,40.256,9.182c19.327-4.657,90.401,2.825,90.401,2.825c41.669-27.544,64.27-105.938,64.27-105.938
s18.364-42.376-12.713-48.025C424.837,565.058,311.129,565.058,311.129,565.058z"/>
<path id="path154" fill="#B23259" d="M307.543,619.608c5.873-22.582,8.67-43.419,3.586-54.552c0,0,110.177,11.301,129.951-25.426
c7.488-13.904,33.55,40.257,32.842,57.207c0,0-111.236,25.426-137.367,5.65L307.543,619.608z"/>
<path id="path158" fill="#A5264C" d="M315.367,648.396c0,0,3.531,12.713-0.707,19.774c0,0-2.824,1.413-4.943,2.119
c0,0,2.119,6.356,12.713,9.182c0,0,3.531,7.77,7.77,8.476s12.713,10.594,19.774,8.475c7.063-2.118,26.839-9.181,26.839-9.181
s9.888-5.65,25.425,0.706c0,0,4.192-1.416,4.942-8.476c0.884-8.299,6.356-14.832,9.889-18.362
c3.531-3.531,20.48-26.133,18.362-26.838C433.313,633.564,315.367,648.396,315.367,648.396z"/>
<path id="path162" fill="#FF727F" stroke="#000000" d="M307.598,562.938c0,0-4.943,39.552,0.707,54.383
c5.649,14.832,4.237,18.362,2.824,25.426c-1.412,7.063,6.356,24.719,16.244,35.313l21.188,2.825c0,0,26.839-6.355,43.082-1.412
c0,0,15.881,2.371,21.895-24.014c0,0,8.476-11.3,21.188-16.243c12.713-4.943,25.426-78.395,18.362-92.52
c-7.063-14.126-32.488-21.896-60.738,5.648S360.567,550.227,307.598,562.938z"/>
<path id="path166" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M310.423,695.009c0,0-1.412-3.531-9.181-4.237
c0,0-39.55-6.355-54.382-28.25c0,0-12.006-9.888-4.238,10.595c0,0,18.363,36.019,30.369,40.963
C272.991,714.078,301.948,721.141,310.423,695.009z"/>
<path id="path170" fill="#CC3F4C" d="M451.572,582.058c1.163-13.96,4.61-29.169,1.515-35.361
c-11.382-22.768-41.35-13.253-60.738,5.648c-28.25,27.544-31.78-2.118-84.751,10.595c0,0-3.081,24.653-1.598,42.332
c0,0,65.867-20.438,67.28-10.551c0,0,2.823-5.649,19.067-5.649S448.747,587.001,451.572,582.058z"/>
<path id="path174" stroke="#A51926" stroke-width="2" d="M375.398,564.352c0,0,8.476,8.476,2.118,25.426
c0,0-25.426,28.25-21.895,52.97"/>
<path id="path178" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M290.648,714.078c0,0-7.769-22.602,7.769-10.594
c0,0,8.475,3.53,6.356,6.354C302.654,712.665,292.767,719.729,290.648,714.078z"/>
<path id="path182" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M299.547,716.196c0,0-6.215-18.08,6.215-8.476
c0,0,7.806,4.322,5.084,5.085C302.795,715.066,310.847,719.587,299.547,716.196z"/>
<path id="path186" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M308.021,716.196c0,0-6.215-18.08,6.215-8.476
c0,0,7.725,4.078,5.086,5.085C313.39,715.066,319.322,719.587,308.021,716.196z"/>
<path id="path190" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M319.675,716.55c0,0-6.215-18.08,6.215-8.476
c0,0,7.739,4.118,5.087,5.085C325.749,715.066,330.977,719.939,319.675,716.55z"/>
<path id="path194" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M331.116,716.408c0,0-6.215-18.08,6.217-8.476
c0,0,6.78,2.825,5.085,5.085C340.723,715.278,342.418,719.799,331.116,716.408z"/>
<path id="path198" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M342.911,717.609c0,0-8.477-21.896,7.769-10.595
c0,0,8.476,3.531,6.356,6.355C354.917,716.196,357.036,721.847,342.911,717.609z"/>
<path id="path202" stroke="#A5264C" stroke-width="2" d="M292.767,687.24c0,0,23.307-4.944,33.9,0.706
c0,0,10.594,2.119,12.713,1.412c2.118-0.706,7.77-1.412,7.77-1.412"/>
<path id="path206" stroke="#A5264C" stroke-width="2" d="M352.799,702.777c0,0,21.188-24.014,42.375-16.243
c12.389,4.543,10.594-1.413,12.006-6.356c1.413-4.943,1.768-12.358,10.596-17.656"/>
<path id="path210" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M383.168,674.527c0,0-7.063-19.069-12.007,3.53
c-4.944,22.602-10.594,28.957-13.419,33.9c0,0,0,9.182,14.831,8.476c0,0,19.068-0.707,19.774-5.649
C393.055,709.84,390.23,689.358,383.168,674.527z"/>
<path id="path214" stroke="#A5264C" stroke-width="2" d="M407.887,687.24c0,0,6.356-4.237,10.594-2.119"/>
<path id="path218" stroke="#A5264C" stroke-width="2" d="M419.363,658.283c0,0,5.12-8.651,13.596-10.063"/>
<path id="path222" fill="#B2B2B2" d="M279.348,723.259c0,0,31.781,5.65,39.551,2.825c0,0,15.536,0,0.706,3.531
c0,0-22.602,0-36.727-2.118C282.879,727.497,262.397,717.609,279.348,723.259z"/>
<path id="path226" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M304.066,558.701c0,0,31.075,0,34.606,1.412
c0,0,12.713,54.382,6.356,67.801c0,0-2.118,4.944-7.063-4.943c0,0-32.488-57.913-38.138-61.443
C294.177,557.996,301.948,558.701,304.066,558.701z"/>
<path id="path230" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M167.936,553.934c0,0,15.714,3.002,37.961,7.594
c0,0,8.475,39.551,14.125,48.024c5.65,8.475-0.706,8.476-7.063,3.531s-32.488-29.663-36.019-37.432
C173.409,567.882,167.936,553.934,167.936,553.934z"/>
<path id="path234" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M206.534,561.909c0,0,10.241,2.732,12.022,6.645
c1.78,3.909-2.123,9.73-2.123,9.73s-1.766,5.835-3.888,2.018C210.424,576.483,205.353,562.958,206.534,561.909z"/>
<path id="path238" d="M206.603,561.526c0,0,6.356,9.182,12.713,9.182c6.356,0,7.031-0.729,12.006,0.353
c8.122,1.767,7.416-1.766,19.069,0.354c4.661,0.848,9.181-0.706,14.125,1.412c4.944,2.119,10.594,0.706,12.713-2.825
s10.594-10.946,10.594-10.946s-22.6,3.179-27.544,4.591C260.279,563.645,220.729,565.764,206.603,561.526z"/>
<path id="path242" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M285.351,561.879c0,0-11.389,6.182-12.095,10.418
c-0.707,4.237,9.27,10.771,9.27,10.771s4.855,8.122,5.915,3.884C289.5,582.714,286.763,562.586,285.351,561.879z"/>
<path id="path246" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M219.166,571.527c0,0,12.372,19.754,12.755-0.041
c0,0,0.983-2.223-2.124-2.261C219.07,569.092,221.756,561.85,219.166,571.527z"/>
<path id="path250" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M231.839,571.967c0,0,13.986,19.752,12.863-0.164
c0,0,0.012-0.587-3.083-0.855C233.238,570.215,233.847,562.238,231.839,571.967z"/>
<path id="path254" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M244.575,571.98c0,0,14.054,18.766,12.873,1.697
c0,0,0.21-2.177-2.71-2.708C247.866,569.725,247.494,563.987,244.575,571.98z"/>
<path id="path258" fill="#FFFFCC" stroke="#000000" stroke-width="0.5" d="M256.716,572.122c0,0,13.948,20.412,14.563,3.143
c0,0,2.903-2.433-0.18-2.824C260.826,571.133,262.235,563.269,256.716,572.122z"/>
<path id="path262" fill="#E5E5B2" d="M192.845,578.354l-13.521-2.702c-4.591-8.828-8.299-19.688-8.299-19.688
s11.212,1.767,33.282,6.709c0,0,1.547,5.858,4.146,16.091L192.845,578.354z"/>
<path id="path266" fill="#E5E5B2" d="M307.732,570.123c-2.942-4.425-5.268-7.528-6.416-8.245c-5.32-3.325,1.995-2.659,3.989-2.659
c0,0,29.258,0,32.583,1.329c0,0,0.926,3.959,2.134,9.946C340.022,570.494,322.21,566.945,307.732,570.123z"/>
<path id="path270" fill="#CC7226" d="M402.378,326.201c48.945,6.992,94.004-55.936,97.112-73.028
c3.106-17.092-14.762-38.067-14.762-38.067c2.33-5.438-6.216-30.298-15.537-46.613c-9.322-16.314-37.398-14.595-68.367-16.314
c-27.968-1.554-60.599,39.621-62.928,42.729c-2.331,3.108,8.546,70.698,10.876,80.798s-2.33,56.712-2.33,56.712
C406.897,316.349,353.434,319.209,402.378,326.201z"/>
<path id="path274" fill="#EA8E51" d="M339.182,196.051c-2.288,3.051,8.392,69.413,10.68,79.328
c2.288,9.916-2.288,55.682-2.288,55.682c57.687-15.679,6.864-12.967,54.918-6.102c48.056,6.865,92.296-54.918,95.347-71.701
c3.051-16.781-14.492-37.375-14.492-37.375c2.288-5.339-6.103-29.748-15.255-45.766c-9.153-16.018-36.717-14.328-67.125-16.018
C373.506,152.573,341.47,193,339.182,196.051z"/>
<path id="path278" fill="#EFAA7C" d="M340.467,197.195c-2.245,2.995,8.235,68.127,10.481,77.859s-2.246,54.65-2.246,54.65
c55.448-16.173,6.737-12.727,53.9-5.989c47.166,6.738,90.587-53.901,93.581-70.373c2.994-16.47-14.224-36.683-14.224-36.683
c2.245-5.24-5.989-29.197-14.973-44.918c-8.984-15.721-36.037-14.063-65.882-15.721C374.155,154.522,342.713,194.2,340.467,197.195z
"/>
<path id="path282" fill="#F4C6A8" d="M341.753,198.339c-2.204,2.938,8.079,66.842,10.282,76.391
c2.204,9.548-2.203,53.619-2.203,53.619c51.974-15.961,6.61-12.487,52.885-5.876c46.275,6.611,88.877-52.884,91.815-69.043
c2.938-16.161-13.956-35.993-13.956-35.993c2.203-5.142-5.876-28.646-14.69-44.07c-8.813-15.425-35.355-13.799-64.638-15.425
C374.806,156.472,343.956,195.401,341.753,198.339z"/>
<path id="path286" fill="#F9E2D3" d="M343.038,199.483c-2.161,2.881,7.924,65.557,10.085,74.921
c2.161,9.365-2.161,52.588-2.161,52.588c49.205-15.75,6.483-12.246,51.868-5.763c45.386,6.483,87.168-51.868,90.049-67.718
c2.882-15.849-13.687-35.299-13.687-35.299c2.161-5.042-5.765-28.095-14.408-43.223c-8.646-15.128-34.677-13.534-63.396-15.128
C375.455,158.421,345.199,196.602,343.038,199.483z"/>
<path id="path290" fill="#FFFFFF" d="M402.942,319.984c44.493,6.356,85.459-50.85,88.283-66.388
c2.825-15.538-13.419-34.606-13.419-34.606c2.119-4.944-5.65-27.544-14.127-42.375c-8.475-14.831-33.995-13.267-62.149-14.831
c-25.427-1.413-55.088,36.019-57.207,38.844c-2.119,2.825,7.769,64.27,9.888,73.451c2.119,9.182-2.119,51.557-2.119,51.557
C397.116,310.45,358.448,313.628,402.942,319.984z"/>
<path id="path294" fill="#CCCCCC" d="M484.87,259.953c0,0-49.087,13.419-69.568,10.594c0,0-27.896-11.653-43.435,26.838
c0,0-6.356,12.713-9.889,16.244C358.447,317.16,484.87,259.953,484.87,259.953z"/>
<path id="path298" d="M491.58,256.068c0,0-51.206,21.541-68.862,20.834c0,0-28.956-8.122-43.788,17.656
c0,0-14.831,16.244-20.48,19.069c0,0-0.706,2.825,10.594-4.238l18.363,9.182c0,0,26.131,16.95,43.081-11.3
c0,0,7.063-19.775,7.063-23.307c0-3.532,37.433-13.419,40.259-14.125C480.633,269.134,492.286,261.718,491.58,256.068z"/>
<path id="path302" fill="#99CC32" d="M407.887,319.479c-12.134,0-26.918-6.824-26.918-17.857c0-11.032,14.784-22.094,26.918-22.094
c12.138,0,21.976,8.943,21.976,19.975C429.861,310.537,420.023,319.479,407.887,319.479z"/>
<path id="path306" fill="#659900" d="M401.489,290.021c-8.557,1.275-17.541,3.929-17.414,3.547
c2.719-8.156,13.95-14.041,23.812-14.041c7.585,0,14.273,3.493,18.222,8.807C426.107,288.335,416.722,287.753,401.489,290.021z"/>
<path id="path310" fill="#FFFFFF" d="M422.718,289.616c0,0-7.769-5.65-7.769-1.766C414.949,287.85,421.306,295.619,422.718,289.616z
"/>
<path id="path314" d="M405.063,303.963c-4.412,0-7.989-3.577-7.989-7.991c0-4.412,3.577-7.989,7.989-7.989
c4.413,0,7.99,3.577,7.99,7.989C413.053,300.386,409.476,303.963,405.063,303.963z"/>
<path id="path318" fill="#CC7226" d="M221.435,280.434c0,0-5.65-37.432-1.413-45.2c0,0,19.069-17.657,18.363-24.013
c0,0-0.706-31.782-2.825-33.194c-2.119-1.413-15.538-12.006-26.131-0.706c0,0-18.363,31.781-16.95,43.082v3.531
c0,0-13.419-0.706-16.244,2.825c0,0-2.119,9.181-4.238,9.888c0,0-4.944,4.237-1.413,9.181c0,0-3.531,4.237-2.825,11.3l13.419,7.063
c0,0,3.531,25.425,22.601,34.606C212.317,302.909,217.903,291.028,221.435,280.434z"/>
<path id="path322" fill="#FFFFFF" d="M219.669,277.186c0,0-5.085-33.688-1.271-40.681c0,0,17.162-15.891,16.527-21.611
c0,0-0.636-28.604-2.543-29.875c-1.907-1.271-13.984-10.806-23.518-0.636c0,0-16.526,28.604-15.255,38.773v3.178
c0,0-12.077-0.636-14.62,2.542c0,0-1.907,8.263-3.813,8.899c0,0-4.45,3.813-1.271,8.263c0,0-3.178,3.813-2.542,10.17l12.077,6.356
c0,0,3.178,22.883,20.34,31.146C211.462,297.411,216.491,286.72,219.669,277.186z"/>
<path id="path326" fill="#EB955C" d="M234.765,179.775c-1.924-1.519-15.149-11.706-25.478-0.688c0,0-17.904,30.987-16.526,42.004
v3.443c0,0-13.083-0.688-15.838,2.754c0,0-2.066,8.952-4.132,9.641c0,0-4.82,4.132-1.377,8.952c0,0-3.443,4.132-2.754,11.018
l13.083,6.886c0,0,3.443,24.79,22.035,33.741c8.323,4.008,13.772-7.574,17.215-17.903c0,0-5.509-36.496-1.377-44.07
c0,0,18.592-17.215,17.903-23.413C237.52,212.139,236.831,181.152,234.765,179.775z"/>
<path id="path330" fill="#F2B892" d="M233.971,181.523c-1.73-1.625-14.761-11.406-24.825-0.671c0,0-17.444,30.192-16.103,40.927
v3.355c0,0-12.748-0.671-15.432,2.684c0,0-2.013,8.722-4.026,9.394c0,0-4.696,4.025-1.342,8.722c0,0-3.354,4.025-2.684,10.735
l12.748,6.709c0,0,3.354,24.154,21.47,32.876c8.111,3.906,13.419-7.38,16.773-17.445c0,0-5.368-35.56-1.342-42.94
c0,0,18.115-16.773,17.444-22.812C236.654,213.057,235.983,182.865,233.971,181.523z"/>
<path id="path334" fill="#F8DCC8" d="M233.176,183.271c-1.536-1.73-14.373-11.106-24.172-0.653c0,0-16.985,29.398-15.679,39.851
v3.266c0,0-12.413-0.653-15.026,2.613c0,0-1.96,8.493-3.919,9.146c0,0-4.573,3.92-1.307,8.493c0,0-3.267,3.92-2.613,10.453
l12.413,6.533c0,0,3.266,23.518,20.905,32.011c7.897,3.803,13.065-7.186,16.332-16.985c0,0-5.227-34.624-1.307-41.811
c0,0,17.639-16.332,16.985-22.211C235.789,213.976,235.136,184.578,233.176,183.271z"/>
<path id="path338" fill="#FFFFFF" d="M219.669,277.009c0,0-5.085-33.512-1.271-40.504c0,0,17.162-15.891,16.527-21.611
c0,0-0.636-28.604-2.543-29.875c-1.342-1.836-13.984-10.806-23.518-0.636c0,0-16.526,28.604-15.255,38.773v3.178
c0,0-12.077-0.636-14.62,2.542c0,0-1.907,8.263-3.813,8.899c0,0-4.45,3.813-1.271,8.263c0,0-3.178,3.813-2.542,10.17l12.077,6.356
c0,0,3.178,22.883,20.34,31.146C211.462,297.411,216.491,286.543,219.669,277.009z"/>
<path id="path342" fill="#CCCCCC" d="M214.195,265.956c0,0-38.138-18.01-39.727-19.422c0,0,16.067,14.479,17.48,14.479
C193.361,261.013,214.195,265.956,214.195,265.956z"/>
<path id="path346" d="M184.003,255.009c0,0,32.488,6.356,32.488,14.125c0,5.141-0.429,28.834-9.888,26.131
C191.772,291.028,198.128,265.603,184.003,255.009z"/>
<path id="path350" fill="#99CC32" d="M198.834,261.718c0,0,15.852,2.603,17.656,7.416c1.06,2.825,2.23,17.494-7.416,19.422
C201.038,290.165,197.101,272.118,198.834,261.718z"/>
<path id="path354" d="M350.671,336.845c-0.878-3.076,1.438-2.845,4.601-3.794c3.53-1.06,25.071-7.769,26.483-12.359
c1.413-4.591,24.719,3.178,24.719,3.178c3.18,1.412,10.947,6.003,10.947,6.003c8.476,2.119,20.128,2.825,20.128,2.825
c4.238,1.766,10.241,6.709,10.241,6.709c25.778,18.009,47.674,5.297,47.674,5.297c35.313-11.653,24.72-42.022,24.72-42.022
c-5.298-15.891,0.354-21.894,0.354-21.894c0.354-6.709,13.064,4.591,13.064,4.591c4.592,7.416,6.005,16.244,6.005,16.244
c14.125,19.775,8.122-11.653,8.122-11.653c0.353-1.766-4.592-8.122-4.592-10.241s-3.179-8.122-3.179-8.122
c-5.297-6.003-1.06-18.363-1.06-18.363c3.179-24.366-0.706-21.188-0.706-21.188c-2.118-3.178-18.362,14.478-18.362,14.478
c-3.885,6.003-14.479,8.828-14.479,8.828c-4.942,3.178-10.946,0.707-10.946,0.707c-4.59-0.707-14.479,11.653-14.479,11.653
c4.943-0.354,9.182,7.416,13.419,7.769c4.237,0.354,7.415-4.237,10.24-5.297c2.825-1.059,7.769,9.182,7.769,9.182
c0.707,4.59-9.181,13.065-9.181,13.065c-0.707,8.122-3.531,5.297-3.531,5.297c-5.297-1.059-7.415,5.65-9.182,13.772
c-1.766,8.122-9.182,8.829-9.182,8.829c-2.825,13.065-4.945,7.769-4.945,7.769c-0.354-9.888-10.947,0.353-10.947,0.353
c-2.118,3.531-10.239-0.353-10.239-0.353c-12.008-3.531-7.77-7.063-7.77-7.063c3.178-3.884,22.953,0,22.953,0
c3.884-2.825-10.241-9.888-10.241-9.888c-1.06-3.178,0.706-10.947,0.706-10.947c2.119-5.65,14.126-15.538,14.126-15.538
c16.599-2.119,11.654-4.944,11.654-4.944c-10.946-9.182-21.189,4.237-21.189,4.237c-3.884,10.947-34.605,37.432-34.605,37.432
c-8.476,6.003-3.884-6.003-10.947,0c-7.063,6.003-43.435-9.888-43.435-9.888c-20.414-2.106-25.238,25.688-31.47,20.18
C343.93,331.689,353.496,346.732,350.671,336.845z"/>
<path id="path358" d="M694.629,43.132c0,0-45.201,14.125-50.145,47.319c0,0-4.237,40.256,31.78,71.332c0,0,0.707,11.3,4.238,16.95
c0,0-2.825,8.475,30.368-4.944l48.025-14.832c0,0,11.301-4.238,20.481-19.775c9.181-15.538,36.019-48.731,29.662-93.226
c0,0,2.119-19.775-8.475-20.481c0,0-14.832-2.825-27.544,10.594c0,0-12.008,5.65-16.244,4.944L694.629,43.132z"/>
<path id="path362" d="M791.069,41.384c0,0,3.708-15.767-4.837-7.222c0,0-12.432,10.1-25.641,10.1c0,0-25.637,3.884-33.404,27.191
c0,0-6.992,47.39,6.99,57.489c0,0,8.546,13.207,20.978,1.554C767.587,118.843,794.954,65.467,791.069,41.384z"/>
<path id="path366" fill="#323232" d="M790.409,42.016c0,0,3.689-15.438-4.7-7.048c0,0-12.204,9.916-25.173,9.916
c0,0-25.171,3.814-32.798,26.697c0,0-6.865,46.528,6.863,56.444c0,0,8.392,12.967,20.596,1.525
C767.403,118.108,794.224,65.661,790.409,42.016z"/>
<path id="path370" fill="#666666" d="M789.749,42.648c0,0,3.673-15.11-4.563-6.875c0,0-11.978,9.732-24.705,9.732
c0,0-24.705,3.743-32.191,26.202c0,0-6.738,45.667,6.737,55.399c0,0,8.234,12.727,20.213,1.497
C767.22,117.374,793.492,65.855,789.749,42.648z"/>
<path id="path374" fill="#999999" d="M789.089,43.28c0,0,3.654-14.782-4.425-6.703c0,0-11.752,9.549-24.24,9.549
c0,0-24.239,3.672-31.584,25.708c0,0-6.609,44.805,6.61,54.354c0,0,8.08,12.487,19.832,1.469
C767.036,116.639,792.762,66.05,789.089,43.28z"/>
<path id="path378" fill="#CCCCCC" d="M788.429,43.912c0,0,3.638-14.454-4.287-6.529c0,0-11.527,9.365-23.773,9.365
c0,0-23.772,3.602-30.978,25.213c0,0-6.482,43.943,6.483,53.309c0,0,7.924,12.247,19.45,1.441
C766.851,115.904,792.03,66.244,788.429,43.912z"/>
<path id="path382" fill="#FFFFFF" d="M787.767,44.544c0,0,3.619-14.125-4.148-6.356c0,0-11.301,9.181-23.308,9.181
c0,0-23.307,3.531-30.368,24.719c0,0-6.356,43.082,6.355,52.263c0,0,7.77,12.006,19.069,1.412
C766.667,115.17,791.298,66.438,787.767,44.544z"/>
<path id="path386" fill="#992600" d="M414.243,403.323c0,0-36.021-33.901-50.146-35.313c0,0-60.738-7.063-86.87,24.719
c0,0,31.076-36.019,79.807-26.131c0,0-38.138-7.769-60.032-2.119c0,0-29.663,0-46.613,24.719l-4.944,8.475
c0,0,7.063-26.131,39.55-36.726c0,0,40.256-8.475,59.326,0c0,0-38.138-12.006-55.794-8.475c0,0-53.675-4.237-76.275,42.375
c0,0,7.063-25.425,33.194-38.138c0,0,24.013-15.538,60.032-10.594c0,0,25.425,5.65,34.607,9.888
c9.182,4.237,7.063-0.707-7.769-9.182c0,0-9.889-17.656-34.607-16.95c0,0-75.57,6.356-93.932,27.544
c0,0,24.013-19.775,42.375-24.719c0,0,39.55-14.125,54.381-12.713c0,0,43.788,1.766,57.207-5.297c0,0-19.775,8.828-14.125,14.479
c5.649,5.65,17.656,19.069,17.656,21.188s42.729,41.14,49.085,48.908L414.243,403.323z"/>
<path id="path390" fill="#CCCCCC" d="M658.607,745.857c0,0-27.367-64.445-49.438-81.221c0,0,45.906,28.251,52.086,60.032
C661.256,724.67,661.256,742.326,658.607,745.857z"/>
<path id="path394" fill="#CCCCCC" d="M741.593,759.1c0,0-46.789-97.109-79.454-139.484c0,0,76.807,66.212,85.635,113.001
l0.883,9.711l-5.297-4.414C743.358,737.912,742.476,753.803,741.593,759.1z"/>
<path id="path398" fill="#CCCCCC" d="M841.352,673.466c0,0-110.353-105.056-113.001-109.47c0,0,106.821,116.533,112.118,129.775
C840.469,693.771,836.938,677.88,841.352,673.466z"/>
<path id="path402" fill="#CCCCCC" d="M508.528,750.271c0,0,34.43-91.813,67.977-52.087c0,0,26.485,17.656,25.604,22.953
c0,0-7.063-11.477-38.846-10.594C563.263,710.545,529.716,705.248,508.528,750.271z"/>
<path id="path406" fill="#CCCCCC" d="M844.883,525.152c0,0-79.454-50.321-92.695-52.971c-20.848-4.168,87.398,51.204,96.228,69.743
C848.414,541.926,851.945,537.512,844.883,525.152z"/>
<path id="path410" d="M578.803,713.371c0,0,36.02-3.531,48.025-15.537l7.769,6.356l31.075-67.802l6.356,9.183
c0,0,25.426-26.132,24.013-40.257c-1.412-14.125,22.601,10.594,22.601,10.594s-1.413-20.481,11.301-8.477
c0,0-4.237-27.544,10.594-13.419c0,0-18.604-53.246,21.188-7.769c9.889,11.3,2.119-0.706,2.119-0.706s-45.905-84.751-7.769-59.325
c0,0,3.531-40.257,1.412-48.026c-2.118-7.769-5.649-47.319-14.125-56.502c-8.477-9.182,0.706-12.006,10.594-2.824
c0,0-19.775-42.375,3.531-21.188c0,0-6.356-26.838-14.125-31.782c0,0-9.889-30.369,16.949-11.3c0,0-7.769-21.894-13.419-27.544
c0,0-20.48-48.732-7.769-40.257l7.769,6.356c0,0-12.007-24.719-0.706-16.95s11.301,7.063,11.301,7.063s-37.433-58.62-1.412-27.544
c0,0-14.406-24.574-20.481-36.726c0,0-33.193-36.019-7.77-24.719l8.476,2.825c0,0-15.538-17.656-29.663-20.481
c-14.125-2.825,4.237-14.125,15.538-10.594c11.3,3.531,38.844,16.95,38.844,16.95s22.602,33.194,29.663,33.9
c0,0-35.313-13.419-24.719,0.706c0,0,25.425,24.719,12.712,24.013c0,0-10.594,12.713-2.118,28.25c0,0-32.592-32.472-6.355,12.712
l12.006,28.957c0,0-43.081-43.788-23.306-4.944c0,0,30.369,41.669,33.899,42.375c3.531,0.707,11.3,16.244,11.3,16.244l-7.769-3.531
l9.181,15.538c0,0-19.774-21.188-9.181,2.119l9.887,25.425c0,0-36.019-38.844-12.006,13.42c0,0-28.957-9.183-13.419,21.188
c0,0-2.825,28.252-2.119,37.434c0.707,9.183,2.825,59.325-4.942,73.451c-7.77,14.125,10.594,48.025,14.125,55.088
c3.53,7.063,9.888,26.131-5.65,9.889c-15.537-16.244-7.769-6.356-4.237,9.181c3.531,15.538,14.125,43.082,12.713,52.97
c0,0-2.118,2.119-7.769-4.236c0,0-26.132-40.258-23.307-14.832c0,0-2.119,14.125-7.77,29.663c0,0-5.649,19.068-5.649,3.53
c0,0-5.65-29.663-10.595-16.244c-4.943,13.42-11.301,24.014-16.244,28.251c-4.942,4.237-14.125-36.02-16.243-17.656
c0,0-21.188-21.895-29.662,7.063l-20.482,28.957c0,0-0.706-21.894-2.824-11.3C650.135,710.547,597.165,721.141,578.803,713.371z"/>
<path id="path414" d="M518.064,83.389c0,0-20.481-14.125-27.545-13.419c-7.063,0.706,48.731-15.538,121.477,33.194
c0,0,8.476,4.944,14.832,4.238c0,0,5.648,4.237,0.706,10.594c0,0-15.538,16.95,4.237,36.725c0,0,32.487,12.006,22.601-3.531
c0,0,19.069,7.063,23.307,14.125c4.238,7.062,2.118,0,2.118,0s-11.3-12.713-21.894-21.894c0,0-9.183-3.531-14.125-18.363
c-4.944-14.832-9.183-32.488-1.413-38.138c0,0-7.063,7.769-5.649,0.706c1.412-7.063,7.77-13.419,10.594-14.125
c2.825-0.707,31.781-28.604,43.788-29.31c0,0-16.244,2.472-21.541,0.706S617.293,23.003,606.7,20.884c0,0-29.662-11.653-8.476-8.122
c0,0,63.211,6.709,95.346,30.016c0,0-12.713-14.832-45.2-27.191c0,0-39.197-22.247-101.349-13.419c0,0-31.429,5.65-45.2,8.828
c0,0-4.591-1.06-5.65-1.766c-1.059-0.706-21.896-16.597-70.627-4.237c0,0-30.016,8.122-45.2,16.597c0,0-26.838,2.119-33.193,7.769
c0,0-32.842,25.778-36.372,27.191c-3.531,1.413-23.66,14.831-25.072,15.538c0,0,43.435-11.653,47.672-15.891
c4.238-4.237,34.96-8.828,39.197-6.356c4.238,2.472,19.069,1.413,2.119,2.472c0,0,133.483,26.132,134.896,29.663
C511.002,85.507,518.064,83.389,518.064,83.389z"/>
<path id="path418" fill="#CC7226" d="M644.131,67.145c0,0-18.009-13.066-21.54-13.066c-3.532,0-25.426-18.009-32.842-17.303
c-7.415,0.707-28.956-16.95-77.335-2.472c0,0-1.061-3.531,5.297-4.944c0,0,11.301-3.884,12.007-4.944c0,0,35.666-7.416,48.378-1.06
c0,0,16.244,4.591,27.191,15.538c0,0,19.775,5.65,25.425,3.885c0,0,15.538,3.884,16.244,7.063c0,0,10.241,5.297,7.063,9.888
C654.019,59.729,654.725,62.554,644.131,67.145z"/>
<path id="path422" fill="#CC7226" d="M622.112,63.421c1.425,1.116,3.224,1.289,4.292,2.717c0.413,0.554-0.099,1.13-0.653,1.301
c-1.842,0.56-3.706-0.447-5.723,0.591c-0.71,0.366-1.844,0.044-2.819-0.219c-2.882-0.779-6.111-0.823-9.097,0.392
c-3.505-1.994-7.672-0.962-11.348-2.73c-0.102-0.047-0.493,0.563-0.625,0.516c-5.378-2.021-11.985-1.522-16.278-5.555
c-4.286-0.728-8.448-1.543-12.735-2.744c-3.21-0.899-5.697-2.645-8.558-4.114c-2.433-1.25-5.004-2.171-7.713-2.828
c-3.289-0.798-6.521-0.601-9.864-1.519c-0.164-0.044-0.503,0.563-0.648,0.516c-0.57-0.191-1.084-1.22-1.386-1.127
c-2.968,0.922-5.595-0.794-8.533-0.19c-2.08-2.161-5.131-1.729-7.859-2.509c-5.233-1.498-10.804,0.745-16.152-1.022
c7.262-3.252,15.538-1.077,22.71-4.73c4.11-2.094,8.811-0.148,13.348-1.49c0.86-0.254,2.08-0.611,2.786,0.57
c0.237-0.239,0.56-0.661,0.661-0.611c4.325,2.042,8.413,4.292,12.795,6.174c0.604,0.258,1.542-0.152,1.986,0.205
c2.684,2.147,6.114,1.965,8.569,4.119c2.998-0.886,6.164-0.215,9.218-1.317c0.137-0.048,0.55,0.554,0.606,0.516
c1.995-1.321,4.035-0.842,5.609-0.306c0.597,0.203,1.768,0.639,2.307,0.77c1.987,0.487,3.499,1.335,5.581,1.658
c0.201,0.032,0.527-0.568,0.655-0.519c1.982,0.773,3.822,0.674,4.979,2.729c0.238-0.238,0.529-0.658,0.676-0.611
c1.813,0.597,2.959,1.93,4.901,2.355c0.856,0.187,1.938,1.292,2.954,1.603c4.224,1.291,7.479,3.991,11.353,5.571
C619.447,62.132,620.994,62.545,622.112,63.421z"/>
<path id="path426" fill="#CC7226" d="M486.804,38.296c-4.445-3.046-8.627-4.999-12.938-8.152c-0.32-0.235-0.955,0.065-1.313-0.15
c-1.776-1.075-3.346-2.101-5.079-3.33c-0.952-0.674-2.4-0.655-3.299-1.11c-4.491-2.281-9.134-3.267-13.56-5.375
c1.204-1.126,3.185-0.695,4.236-2.119c0.346,0.495,0.766,0.996,1.389,0.659c2.963-1.596,6.229-1.866,9.188-1.708
c3.01,0.163,6.046,0.701,9.181,1.181c0.542,0.083,0.894,1.006,1.464,1.178c3.934,1.171,8.15,0.244,11.894,1.723
c2.81,1.111,5.581,2.564,7.77,4.815c0.444,0.459-0.13,0.991-0.623,1.333c0.685-0.193,1.167,0.171,1.361,0.724
c0.148,0.422,0.148,0.955,0,1.377c-0.196,0.551-0.689,0.729-1.351,0.819c-2.484,0.336,0.645-2.101-0.591-1.31
c-2.248,1.438-0.932,3.92-2.246,6.159c-0.494-0.342-0.9-0.728-0.706-1.413c0.413,0.922-0.65,1.434-0.947,1.992
C489.953,36.869,488.366,39.367,486.804,38.296z"/>
<path id="path430" fill="#CC7226" d="M429.424,51.27c-5.568-1.402-10.954-1.199-16.279-3.452c-0.117-0.049-0.512,0.563-0.625,0.516
c-2.411-1.049-4.032-2.754-5.933-4.602c-1.612-1.568-4.539-0.884-6.789-1.744c-0.572-0.219-0.931-1.123-1.462-1.192
c-2.152-0.277-3.789-1.953-5.634-2.961c4.124-1.404,8.381-1.349,12.729-2.027c0.199-0.031,0.455,0.535,0.69,0.535
c0.24,0,0.47-0.39,0.706-0.627c0.345,0.495,0.878,1.07,1.331,0.622c0.968-0.953,1.949-0.618,2.902-0.547
c0.255,0.018,0.476,0.553,0.709,0.553c0.24,0,0.473-0.549,0.707-0.549c0.239,0.001,0.472,0.549,0.706,0.549
c0.24,0,0.471-0.39,0.706-0.627c1.223,1.381,2.784,0.403,4.235,0.719c1.833,0.401,2.305,2.428,4.201,2.954
c8.324,2.302,15.629,6.09,23.333,9.774c0.542,0.26,0.912,0.698,0.719,1.384c0.471,0,1.023-0.155,1.359,0.078
c1.867,1.292,3.706,2.26,4.937,4.199c0.381,0.599-0.199,1.317-0.61,1.226C444.243,54.292,437.17,53.219,429.424,51.27z"/>
<path id="path434" fill="#CC7226" d="M404.952,129.332c-2.813-2.152-3.842-5.738-5.834-8.902c-0.378-0.6,0.105-1.154,0.666-1.312
c0.987-0.281,1.946,0.563,2.669,0.92c3.081,1.522,5.792,3.715,9.316,3.96c3.515,3.945,11.036,4.625,11.049,10.594
c0.002,1.517-2.521-0.104-3.278,1.412c-4.328-1.771-8.546-1.589-12.748-4.179C405.702,131.152,406.285,130.353,404.952,129.332z"/>
<path id="path438" fill="#CC7226" d="M356.33,36.5c0.238,0.002,12.652,0.413,12.622,0.614c-0.079,0.546-13.729,2.398-14.37,2.098
c-0.29-0.134-13.554,4.156-13.79,3.92C341.266,42.894,355.86,36.5,356.33,36.5z"/>
<path id="path442" d="M383.521,53.726c0,0-26.133,3.178-33.9,5.297c-7.77,2.119-40.609,15.538-45.907,19.069
c0,0-23.66,9.535-53.675,44.848c0,0,13.419-6.003,17.303-10.947c0,0,24.013-22.247,23.66-17.656c0,0,21.541-15.185,20.481-11.3
c0,0,43.082-19.775,39.551-14.125c0,0,38.138-8.122,36.372-4.591c0,0,33.192,7.769,28.25,8.122c0,0-10.241,2.119,1.06,8.475
c0,0-6.003,7.769-15.538,0.707c-9.534-7.063-4.236-3.178-13.064-1.413c0,0-4.592,1.413-12.713-5.65c0,0-9.889-8.122-25.426-1.766
c0,0-54.029,22.247-57.56,23.307c0,0-6.356,4.944-10.594,11.3c0,0-10.241,7.769-15.538,10.241c0,0-22.6,20.481-24.719,22.953
c0,0-6.003,9.181-7.416,9.888c0,0,11.3-6.709,14.831-10.241c0,0,24.719-17.656,34.253-19.069c0,0,7.769-5.297,9.182-7.769
c0,0,25.425-16.244,32.84-16.244c0,0,16.244,9.181,20.482-3.178c0,0,10.239-3.178,20.128-1.06c0,0,5.649-4.591,4.236-8.475
c0,0,2.825-3.178,4.592,3.531c0,0,6.003,6.356,14.479,2.825c0,0,7.063-0.353,3.531,3.884c0,0-7.77,6.709-28.604,7.063
c0,0-21.895,1.06-50.851,14.479c0,0-52.616,18.363-68.86,36.725c0,0-11.3,15.538-20.834,17.657c0,0-10.241,1.412-20.834,14.478
c0,0,17.303-10.241,33.194-10.241c0,0,7.063-4.237,0.353,2.119c0,0-6.356,13.418-3.531,22.953c0,0-1.06,9.181-2.472,12.006
c0,0-13.772,22.6-13.772,26.838c0,4.237,2.119,21.541,2.825,22.6c0.706,1.06-1.766-2.825,4.944,1.413
c6.709,4.237,11.653,7.063,13.065,12.006c1.413,4.944-3.531-9.535-3.884-12.713c-0.353-3.178-7.769-15.891-6.356-20.128
c0,0,1.766,1.766,3.178,4.237c0,0-1.059-1.06,0-7.416c0,0,1.413-9.182,3.885-14.832s6.003-12.359,6.709-13.772
c0.707-1.413,0.707-11.653,3.178-7.063l6.003,4.59c0,0-4.944-4.59-1.06-8.475c0,0-1.766-9.888,1.413-14.479
c0,0,12.359-14.832,15.185-16.597c2.826-1.765,0.353-1.059,0.353-1.059s10.594-7.416,0.353-4.591c0,0-7.063,2.825-12.359,2.825
c0,0-13.419,3.531-6.356-3.885s24.719-16.95,31.429-16.597l1.413,2.825l19.775-4.237l-2.119,1.413c0,0-0.353-0.354,7.063-1.06
s17.656,1.766,20.128-1.413c2.473-3.178,8.477-4.944,7.771-2.472c-0.706,2.472-1.061,6.003-1.061,6.003s8.828-10.241,7.77-6.356
c-1.061,3.884-15.537,13.065-18.011,24.013l18.363-14.479l6.356-5.297c0,0,6.355,3.884,6.709,1.06
c0.354-2.825,8.476-13.066,10.594-12.713c2.119,0.353,5.649-4.591,5.297,0c-0.353,4.591,13.066,14.125,13.066,14.125
s5.648-3.178,8.122-0.706c2.472,2.472,9.887-34.96,9.887-34.96l44.142-18.716l76.983-6.003l-30.017-12.006L383.521,53.726z"/>
<path id="path446" stroke="#4C0000" stroke-width="2" d="M415.655,405.089c0,0-26.484-29.663-41.316-34.254
c0,0-23.659-12.006-67.094,1.766"/>
<path id="path450" stroke="#4C0000" stroke-width="2" d="M368.689,368.363c0,0-44.494-14.125-71.687-6.709
c0,0-32.488,3.531-47.319,27.897"/>
<path id="path454" stroke="#4C0000" stroke-width="2" d="M362.333,366.245c0,0-30.016-12.713-56.147-16.597
c0,0-29.31-4.591-58.62,8.122c0,0-21.541,10.594-31.075,28.603"/>
<path id="path458" stroke="#4C0000" stroke-width="2" d="M364.099,366.951c0,0-27.19-19.422-28.957-21.894
c0,0-12.358-19.422-35.313-20.128c0,0-37.785,1.413-68.154,15.538"/>
<path id="path462" d="M361.794,351.072c2.723,2.583,50.33,53.664,50.33,53.664c62.15,64.624,12.713,4.236,12.713,4.236
c-13.419-8.475-29.663-41.669-29.663-41.669c-2.119-4.944,24.719,12.713,24.719,12.713c7.063,1.412,31.075,35.313,31.075,35.313
c-12.006-4.237-3.53,8.476-3.53,8.476c4.943,3.531,40.965,31.077,40.965,31.077c6.355,7.063,13.419,9.888,13.419,9.888
c24.719-9.182,13.419,14.125,13.419,14.125c4.236,12.007,14.125-8.476,14.125-8.476c19.774-29.664-9.182-25.425-9.182-25.425
c-52.972,4.942-64.978-23.31-64.978-23.31c-4.238-4.236,11.3,0,11.3,0c14.833,3.531-12.713-21.894-12.713-21.894
c4.237,0,20.481,12.006,20.481,12.006c18.363,16.244,21.896,12.713,21.896,12.713c31.782-15.538,50.146-2.119,50.146-2.119
c3.53,2.825-6.356,14.832-3.531,24.016c2.825,9.182,11.3,31.075,11.3,31.075c-4.237,2.824-3.531,21.895-3.531,21.895
c29.663,40.963,12.713,37.432,12.713,37.432c-27.544-0.707-1.411,12.712-1.411,12.712c5.648,3.531,21.188,16.244,21.188,16.244
c-4.944-2.119-7.769,7.063-7.769,7.063c8.475,7.063,3.53,15.538,3.53,15.538c-10.594,2.118-12.713,9.181-12.713,9.181
c12.006,14.126-5.649,14.832-5.649,14.832c6.355,7.769-2.118,28.956-2.118,28.956c-8.477,0-19.775,9.888-19.775,9.888
c4.237,8.477-14.125,18.363-14.125,18.363c-14.832,2.824-9.888,14.831-9.888,14.831c-14.125,10.594-18.363,38.844-18.363,38.844
c-1.412,18.363-5.648,24.014,3.531,20.481c9.182-3.531,7.77-25.425,7.77-25.425c-8.476-27.545,67.095-55.795,67.095-55.795
c7.063-2.824,8.476-12.007,8.476-12.007c3.531,0.706,19.069,14.125,19.069,14.125c13.418,19.775,14.125,3.531,14.125,3.531
c2.118-6.356-0.707-16.95-0.707-16.95c10.595-38.138-14.125-49.438-14.125-49.438c-17.656-59.326,7.063-44.494,7.063-44.494
c4.944,9.888,24.014,19.068,24.014,19.068l6.355-4.237c-2.824-8.477,12.007-19.069,12.007-19.069
c4.943,11.301,15.537-2.824,15.537-2.824c6.356-43.082,28.251-17.656,28.251-17.656c7.063,2.119,9.182-9.889,9.182-9.889
c6.355-18.361,0-42.375,0-42.375c6.355-0.706,23.307,9.889,23.307,9.889c4.944-6.356-11.3-36.021-4.237-31.781
c7.063,4.237,14.831,7.063,14.831,7.063c1.413-3.53-16.243-25.426-16.243-25.426c-7.77-4.945-16.949-40.965-16.949-40.965
c12.712,6.356-4.944-20.481-4.944-20.481c0-5.65,10.594-25.425,10.594-25.425c-1.412-12.006,0-11.3,0-11.3
c4.944,2.119,19.069,4.944,7.063-6.356c-12.006-11.3,1.413-19.775,1.413-19.775c7.769-4.944-16.244-4.238-16.244-4.238
c-9.183-7.769-8.477-14.831-8.477-14.831c14.126,3.531-11.3-21.894-15.536-28.25c-4.237-6.356,12.713-15.538,12.713-15.538
c23.307-6.356,2.823-12.006,2.823-12.006c-34.605,0.706-15.536-18.363-15.536-18.363c10.594,0.707,7.769-3.531,7.769-3.531
c-9.181-2.119-26.132-13.419-26.132-13.419c-7.063-6.356-0.706-4.944-0.706-4.944c29.663,2.119-21.188-17.656-21.188-17.656
c14.125,0-17.655-18.363-17.655-18.363c-3.531-2.825-9.183-16.244-9.183-16.244c-10.594-9.182-19.067-21.188-19.067-21.188
c-0.707-7.769-9.183-16.244-9.183-16.244c-20.48-24.013-30.369-23.307-30.369-23.307c-26.132-6.356-35.313-4.944-35.313-4.944
l-93.229,7.769c-46.612,22.6-32.842,59.679-32.842,59.679c11.301,14.831,27.544,8.122,27.544,8.122
c8.122-10.947,28.604-7.063,28.604-7.063c36.021,5.65,31.431-0.706,31.431-0.706c-4.237-8.122-32.843-19.069-33.196-20.128
c-0.353-1.06-15.891-7.063-15.891-7.063c-5.297-2.119-13.065-18.363-13.065-18.363c-5.649-6.003,22.247,4.238,22.247,4.238
c-2.119,1.766,10.947,8.828,10.947,8.828c30.724-1.766,49.439,17.303,49.439,17.303c19.068,29.31,19.422,14.832,19.422,14.832
c4.943-16.597-15.892-54.029-15.892-54.029c0.706-3.531,15.186,8.122,15.186,8.122c2.472-3.531,3.885,6.709,3.885,6.709
c0.353,4.237,7.063,18.362,7.063,18.362c4.942,22.954,11.3,9.888,11.3,9.888l8.122,16.597c2.472,4.591-8.122,18.01-8.122,18.01
c-0.354,4.944,1.06,4.59-8.828,18.009s-3.885,21.188-3.885,21.188c-2.473,11.653,13.064,10.947,13.064,10.947
c4.591,3.884,10.595,3.884,10.595,3.884c3.179,3.531,7.415,2.472,7.415,2.472c2.825-6.709,13.772-3.178,13.772-3.178
c2.472-4.238,16.95-4.944,16.95-4.944c1.766-4.591,2.472-7.416,8.475-8.475c6.004-1.06-37.432-76.982-37.432-76.982
c11.301-1.413-3.179-23.307-3.179-23.307c-3.885-11.653,16.244,14.125,20.128,16.597c3.886,2.472,5.65,6.356,2.825,6.003
s-6.003,3.532-3.531,3.885c2.473,0.354,25.427,26.837,31.43,44.847c6.003,18.01,16.597,25.072,27.544,35.666
c10.947,10.594,9.534,53.322,9.534,53.322c-0.706,15.538,9.888,34.253,9.888,34.253c3.531,6.709-3.885,38.844-3.885,38.844
c-3.531,3.884-1.06,5.297-1.06,5.297c1.767,2.119,13.771,25.425,13.771,25.425c-3.178-0.353,3.179,6.003,3.179,6.003
c9.181,10.594-2.119,5.297-2.119,5.297c-10.594-2.825,1.767,14.479,1.767,14.479c2.119,3.178-13.772-4.944-13.772-4.944
c-16.243-1.06,4.238,11.653,4.238,11.653c15.185,12.713-4.944,4.943-4.944,4.943c-8.122-3.179-2.472,8.828-2.472,8.828
c5.649,2.824,36.02,15.186,36.02,15.186c0.706,6.711-4.591,15.539-4.591,15.539c0.706,7.063-3.179,13.064-3.179,13.064
c-2.118,14.479-3.178,15.891-3.178,15.891c-7.416,0.354-20.481,24.721-20.481,24.721c-3.179,4.591-21.188,25.777-21.188,25.777
c-3.531,12.359-35.313-0.354-35.313-0.354c-11.653,6.003-8.122,0-8.122,0c-0.706-3.884,7.771-14.479,7.771-14.479
c12.358-4.59,7.769-23.658,7.769-23.658c7.063-2.473-12.713-7.416-12.359-9.534c0.354-2.119,10.595-4.591,10.595-4.591
c14.125-3.531,6.355-7.77,6.355-7.77c-1.06-7.063,4.237-16.95,4.237-16.95c20.48-1.413,0-30.019,0-30.019
c-19.068-13.418-20.835-23.659-20.835-23.659c22.247-14.478,7.77-36.372,8.122-42.729c0.354-6.356,2.473-44.494,2.473-44.494
c-3.531-10.947-8.828-34.96-8.828-34.96c3.885-9.181,16.949-31.428,16.949-31.428c4.944-7.416,20.481-15.891,16.598-21.188
c-3.885-5.297-17.655-2.119-17.655-2.119c-13.772-2.472-12.713,6.709-12.713,6.709c-2.825,1.766-4.237,10.594-4.237,10.594
c-1.273,14.007-16.95,25.072-16.95,25.072c-19.775,10.947-3.531,18.01-3.531,18.01c10.595,11.653-6.71,12.006-6.71,12.006
c-19.422-3.178-4.942,14.831-4.942,14.831c19.067,22.601,13.771,27.544,13.771,27.544c-18.009,1.766,4.237,18.009,4.237,18.009
s-1.412-3.531-1.06-0.353c0.354,3.178,5.649,10.594,7.063,14.125c1.412,3.531-5.65,3.885-5.65,3.885
c1.061,16.95-26.132,9.534-26.132,9.534s0,0-2.824,0.353c-2.824,0.354-22.601-1.059-32.841-4.944
c-10.241-3.884-22.248-3.884-22.248-3.884s-7.063,3.178-20.481,2.825s-27.544,4.59-27.544,4.59
c-7.771-0.706,7.415-8.475,7.769-8.122s10.24-9.535-3.885-8.475c-38.485,2.887-57.561-15.185-57.561-15.185
c-3.53-2.472-8.122-7.416-8.122-7.416c-17.655-3.531,2.473,21.894,2.473,21.894c2.119,2.472-0.354,4.238-0.354,4.238
c-1.413-2.825-15.185-12.359-15.185-12.359C368.316,357.817,365.91,355.461,361.794,351.072z"/>
<path id="path466" fill="#4C0000" d="M319.604,330.579c0,0,20.481,9.887,25.072,14.831c4.591,4.944,29.311,25.072,29.311,25.072
s-9.535-3.531-14.125-6.709c-4.592-3.178-23.66-17.656-23.66-17.656S329.492,335.522,319.604,330.579z"/>
<path id="path470" fill="#99CC32" d="M217.181,275.496c0.595-0.261-0.33-5.05-0.69-6.008c-1.804-4.813-17.656-7.416-17.656-7.416
c-0.401,2.41-0.498,5.229-0.311,8.121C198.523,270.192,207.119,279.936,217.181,275.496z"/>
<path id="path474" fill="#659900" d="M217.181,275.143c-0.793,0.279-0.026-4.827-0.337-5.655
c-1.804-4.813-18.009-7.592-18.009-7.592c-0.401,2.41-0.498,5.228-0.311,8.12C198.523,270.015,206.06,279.053,217.181,275.143z"/>
<path id="path478" d="M209.428,275.395c-1.104,0-1.997-2.013-1.997-4.495c0-2.481,0.894-4.494,1.997-4.494
c1.104,0,1.999,2.013,1.999,4.494C211.427,273.382,210.532,275.395,209.428,275.395z"/>
<path id="path486" d="M128.915,448.525c0,0-9.888,17.655,33.9,7.063c0,0,24.719-2.119,28.957-6.355
c2.119,1.411,16.89,6.591,21.894,7.769c12.006,2.825,26.838-14.833,26.838-14.833s8.122-18.539,13.066-18.539
c4.944,0-0.707,2.825-0.707,2.825s-11.653,17.834-10.947,20.659c0,0-9.181,35.313-37.432,36.726c0,0-28.515,1.678-26.131,12.007
c0,0,15.538-4.237,19.775,0c0,0,19.069-0.707,4.944,10.595l-12.006,20.48c0,0,0.247,6.918-17.656,0.706
c-17.303-6.003-35.489-28.78-35.489-28.78S109.758,473.156,128.915,448.525z"/>
<path id="path490" fill="#E59999" d="M126.796,455.588c0,0-3.531,16.95,61.444-1.413c0,0,7.769,0,12.007,1.413
c4.237,1.412,25.425,6.356,28.957,4.237c0,0-12.713,24.013-33.194,21.188c0,0-23.307,2.825-22.6,11.302
c0,0,7.063,12.712,15.538,16.949c0,0,4.944,4.237,4.237,9.888c-0.706,5.649-5.65,8.476-9.181,9.888
c-3.531,1.413-9.181-4.237-12.006-4.237s-17.656-11.3-25.425-19.774c-7.769-8.476-22.6-29.662-21.894-34.606
C125.384,465.476,126.796,455.588,126.796,455.588z"/>
<path id="path494" fill="#B26565" d="M132.446,486.398c4.591,6.974,10.241,14.39,14.125,18.627
c7.769,8.476,22.6,19.774,25.425,19.774c2.825,0,8.475,5.65,12.006,4.237c3.531-1.412,8.475-4.237,9.181-9.888
c0.707-5.649-4.237-9.888-4.237-9.888c-5.414-2.707-10.251-8.873-13.04-12.975c0,0,0.327,4.499-8.854,3.087
c-9.181-1.413-18.363-6.356-21.188-12.007c-2.825-5.65-7.063-9.888-4.238-3.531s7.063,12.713,9.888,13.419
c2.825,0.706,2.119,2.825-2.119,2.119c-4.238-0.707-9.182-1.413-16.95-10.594L132.446,486.398L132.446,486.398z"/>
<path id="path498" fill="#992600" d="M127.855,449.231c0,0,3.178-24.016,5.297-31.077c0,0-1.413-12.007,2.825-19.422
c4.237-7.417,7.769-18.363,13.066-27.897s5.65-16.597,12.712-19.422c7.062-2.825,17.656-18.01,22.6-19.775
c4.944-1.765,4.591-0.353,4.591-0.353s12.006-26.131,36.019-19.069c0,0-28.604-4.944-0.706-21.541c0,0-8.475,1.942-2.648-10.417
c3.886-8.242,3.001,3.708-16.421,24.542c0,0-8.828,15.185-18.009,20.481c-9.181,5.297-30.369,17.657-32.488,24.366
c-2.119,6.709-7.769,16.95-11.3,19.775c-3.531,2.825-8.475,10.241-9.181,16.244c0,0-2.119,7.063-4.591,9.181
c-2.472,2.119-2.825,7.769-2.825,11.299c0,3.532-3.531,8.477-3.178,12.714c0,0,1.412,33.549,0.706,37.079L127.855,449.231z"/>
<path id="path502" fill="#FFFFFF" d="M112.671,457.354c0,0-3.531-2.472-11.3,8.122c0,0,12.889,58.267,12.889,60.738
c0,0,1.942-3.708-0.354-16.421c-2.295-12.713-3.884-35.137-3.884-35.137L112.671,457.354z"/>
<path id="path506" fill="#992600" d="M150.809,350.354c0,0-31.076,5.65-30.369,57.207l-1.413,43.79c0,0-2.119-45.202-4.238-48.026
c-2.119-2.825,4.944-22.601-0.706-12.007c0,0-24.719,24.719-10.594,62.152c0,0,2.648,5.827-2.648-2.295
c0,0-8.122-22.249-6.18-33.549c0,0,0.353-3.885,3.708-8.828c0,0,15.185-20.659,19.952-24.72c0,0,3.178-25.425,30.369-34.606
C148.69,349.471,158.754,345.41,150.809,350.354z"/>
<path id="path510" d="M396.939,233.468c1.164-0.625,1.148-2.338,2.174-2.644c2.027-0.607,2.317-2.491,3.231-3.875
c1.542-2.329,1.883-5.036,2.91-7.668c0.48-1.236,0.527-2.922-0.024-4.087c-2.072-4.381-3.313-8.705-5.858-12.988
c-0.473-0.794-0.937-2.196-1.29-3.252c-0.817-2.443-3.037-4.193-4.556-6.524c-0.51-0.779,0.419-2.412-0.847-2.56
c-1.584-0.186-4.143-1.209-4.554,0.602c-1.038,4.568,0.747,9.022,2.456,13.334c-1.381,1.222-0.791,2.848-0.522,4.202
c1.255,6.367-0.86,12.286-2.204,18.419c-0.041,0.184,0.563,0.533,0.514,0.643c-2.158,4.743-4.722,9.06-7.935,13.264
c-1.338,1.751-2.878,3.369-3.755,5.246c-0.649,1.39-1.37,3.095-0.929,4.84c-6.065,4.908-10.038,11.697-14.647,18.488
c-0.815,1.201-0.303,3.335,0.672,3.811c1.435,0.703,3.123-1.105,3.953-2.599c0.687-1.232,1.31-2.38,2.177-3.516
c0.233-0.309-0.081-1.049,0.157-1.262c4.647-4.144,7.596-9.328,11.927-13.509c3.442-0.581,6.157-2.343,9.243-4.131
c0.544-0.316,1.469,0.124,1.98-0.221c3.095-2.078,3.091-5.673,3.278-9.045C394.58,236.872,394.927,234.547,396.939,233.468z"/>
<path id="path514" d="M381.329,225.583c0.22-0.136-0.055-0.883,0.138-1.264c0.286-0.572,0.998-0.904,1.284-1.476
c0.192-0.381-0.096-1.052,0.146-1.303c4.118-4.321,4.572-9.66,2.743-14.909c1.809-1.095,1.915-3.323,1.165-4.818
c-1.506-3.002-1.847-6.402-3.567-9.127c-1.416-2.24-4.202-4.437-6.623-2.136c-0.743,0.706-1.311,2.096-0.819,3.353
c0.113,0.288,0.616,0.545,0.568,0.69c-0.188,0.572-1.152,0.967-1.163,1.448c-0.053,2.641-1.737,5.309-0.625,7.656
c1.363,2.876,2.809,6.155,4.003,9.291c-2.179,3.736-0.355,8.06-3.45,11.374c-0.24,0.258-0.225,0.939-0.009,1.296
c0.516,0.858,1.231,1.575,2.09,2.091c0.357,0.213,0.972,0.217,1.324-0.002C379.553,227.106,380.256,226.247,381.329,225.583z"/>
<path id="path518" d="M492.233,207.377c2.451,3.164,2.964,8.099-0.653,10.554c0.971,5.842,6.888,2.348,10.594,1.412
c-0.191-0.685,0.208-1.292,0.708-1.301c1.866-0.026,3.066-1.849,4.941-1.523c0.767-2.75,3.659-3.989,4.796-6.425
c3.048-6.524,2.004-14.069-2.559-19.8c-0.356-0.449,0.025-1.361-0.192-2c-1.335-3.904-4.986-4.46-8.401-5.675
c-2.078-6.842-3.245-13.959-6.354-20.481c-2.851-0.441-4.082-3.512-6.443-4.783c-2.354-1.27-3.355,1.519-3.284,3.365
c0.014,0.362,0.812,0.757,0.512,1.402c-0.136,0.29-0.595,0.486-0.595,0.722c0.002,0.238,0.394,0.47,0.629,0.707
c-1.62,1.448-4.134,2.29-4.653,4.312c-1.686,6.55,2.857,12.068,5.804,17.72c1.044,2.004-0.256,4.249-1.598,6.381
c-0.773,1.227-0.583,3.217-0.097,4.729C486.714,200.806,489.521,203.876,492.233,207.377z"/>
<path id="path522" d="M426.622,239.84c-2.626,3.268-8.65,7.804-3.5,11.208c0.343,0.228,0.996,0.234,1.302-0.002
c3.568-2.763,7.104-4.357,11.405-5.385c0.22-0.051,0.703,0.773,1.354,0.489c2.849-1.242,6.397-1.139,8.487-3.501
c6.651,0.396,12.946-1.575,18.934-3.884c2.051-0.791,4.293-1.778,6.412-2.665c2.431-1.017,4.557-2.655,6.521-4.67
c0.233-0.24,0.858-0.082,1.331-0.082c-0.07-1.523,1.628-1.748,2.063-2.846c0.163-0.41-0.102-1.109,0.133-1.289
c3.775-2.878,5.399-6.441,3.336-10.638c-0.504-1.021-0.942-2.112-1.941-2.952c-1.916-1.608-3.862-0.101-5.711-0.637
c-0.28,1.108-1.567,0.805-2.249,1.155c-1.517,0.775-3.87-0.258-5.387,0.515c-2.405,1.227-4.598,1.526-7.106,2.191
c-0.552,0.145-1.925-0.025-2.208,1.083c-0.236-0.237-0.497-0.65-0.685-0.611c-3.369,0.699-5.595,1.077-7.892,4.064
c-0.182,0.235-0.962-0.081-1.243,0.157c-1.688,1.427-2.403,3.605-4.349,4.792c-0.354,0.217-0.977-0.079-1.319,0.148
c-1.141,0.761-1.787,1.893-2.922,2.682c-0.581,0.404-1.287-0.169-1.229-0.622c0.433-3.438,1.585-6.593,0.569-9.905
c3.667-4.449,8.111-7.891,11.301-12.713c0.025-3.824,1.248-7.613,1.049-11.28c-0.019-0.341-0.526-1.635-0.748-2.248
c-0.552-1.508,1.049-3.39-0.441-4.668c-2.479-2.124-4.761-0.578-6.216,1.953c-3.245,0.688-6.893,1.912-9.679-0.267
c-1.778-1.39-2.799-2.989-4.21-4.854c-1.738-2.299-1.147-4.834-1.023-7.596c0.011-0.226-0.546-0.466-0.546-0.703
c0.002-0.238,0.391-0.47,0.627-0.706c-1.246-1.105-1.731-2.974-3.531-3.532c0.538-1.928-0.654-3.489-2.192-4.022
c-3.522-1.22-6.483,2.156-9.823,2.285c-0.908,0.034-1.732-1.799-2.878-2.373c-0.764-0.381-2.006-0.439-2.646,0.03
c-1.215,0.89-2.255,1.091-3.593,1.453c-2.854,0.77-5.11,2.701-7.725,4.211c-2.622,1.513-4.31,4.05-6.216,6.381
c-1.661,2.034-1.901,6.296,0.605,7.179c3.254,1.148,5.557-3.625,9.027-3.049c0.551,0.09,0.915,0.639,0.721,1.324
c0.688,0.193,1.071-0.212,1.412-0.706c1.515,1.799,3.57,2.394,5.227,3.936c1.714,1.596,4.796,0.858,6.589,2.619
c2.698,2.652,1.712,7.386,5.136,9.69c-1.034,2.318-2.106,4.573-2.698,7.092c-0.497,2.129,1.258,4.243,3.396,4.082
c2.222-0.166,2.684-1.506,3.54-3.406c0.472,0.472,1.3,0.996,1.228,1.377c-0.807,4.214-2.62,7.733-3.429,12.025
c-0.104,0.56-0.644,0.917-1.33,0.722c-0.826,7.326-7.98,11.553-12.475,17.141c-0.712,0.886-0.719,3.092,0.004,3.803
c2.478,2.449,5.938-0.281,8.938-1.169c0.376-2.129,1.893-3.792,4.245-3.694c0.452,0.018,0.866-0.939,1.438-1.169
c0.614-0.244,1.501,0.152,2.007-0.198c3.053-2.11,5.539-4.063,8.606-6.162c0.339-0.231,0.946,0.05,1.328-0.141
c0.574-0.286,0.904-0.969,1.475-1.296c0.614-0.353,1.041,0.159,1.383,0.653c-1.142,0.616-1.147,2.306-2.176,2.663
c-1.367,0.473-2.358,1.379-3.549,2.168c-0.516,0.341-1.68-0.097-1.862,0.219C429.966,237.508,427.875,238.281,426.622,239.84z"/>
<path id="path526" d="M328.785,152.602c0,0-16.312-5.071-36.019,40.257c0,0-4.238,9.181-8.475,12.712
c-4.238,3.531-24.013,9.888-27.544,16.95l-18.363,28.25c0,0,26.131-28.25,31.782-32.488c0,0,14.125-14.832,8.475-2.825
c0,0-24.719,19.069-22.601,35.313c0,0-9.887,25.425-11.3,28.957c0,0,28.25-56.5,32.488-58.62c4.237-2.119,6.356-2.119,4.237,4.238
c-2.119,6.357-2.825,35.313-7.769,38.844c0,0,14.125-36.02,12.712-41.669c0,0,5.65-6.356,9.888,2.825l-2.119,28.25l7.769,21.188
c0,0-4.237-19.775-1.413-47.319c0,0-3.531-18.363,3.531-8.475c7.062,9.888,24.013,20.481,24.013,28.957
c0,0-9.181-31.075-25.425-39.55l-7.063,10.594l-2.119-3.531c0,0-6.356-1.413,1.413-13.419c7.769-12.006,7.063-13.419,7.063-13.419
s11.3,12.713,14.125,12.713c0,0,23.307-13.419,25.425,29.663c0,0,12.007-25.425-4.237-37.432c0,0-26.132-3.531-24.013-12.712
l12.713-21.894c6.356-9.182,3.531-4.238,3.531-4.238L328.785,152.602z"/>
<path id="path530" d="M293.473,181.558c0,0-22.6,0-28.25,9.181l-12.713,16.95c0,0,30.369-17.656,37.432-19.775
S293.473,181.558,293.473,181.558z"/>
<path id="path534" d="M222.847,192.858c0,0-3.531,2.119-4.238,7.063c-0.706,4.944-4.944,5.65-3.531,10.594
c1.413,4.944,4.944,9.182,4.944,2.119c0-7.063,2.825-10.594,4.238-12.712C225.672,197.802,228.497,190.033,222.847,192.858z"/>
<path id="path538" d="M207.31,300.916c0,0-14.832-7.063-20.481-13.419c-5.65-6.356-4.852,2.765-13.419,2.119
c-10.324-0.779-8.475-28.957-8.475-28.957l-7.063,13.418c0,0-2.119,25.425,12.006,21.188c6.898-2.069,9.181,0.706,6.356,2.119
c-2.825,1.413,9.887,2.119,4.943,4.944c-4.943,2.825,20.481-6.356,16.244,12.006L207.31,300.916z"/>
<path id="path542" d="M185.063,326.341c0,0-27.191,7.769-33.547-9.181c0,0-8.475,4.237-4.591,9.534
c3.885,5.297,6.003,6.003,6.003,6.003s9.534,2.119,8.475,3.531c-1.06,1.413-5.297,7.416-5.297,7.416S174.115,333.05,185.063,326.341
z"/>
<path id="path546" fill="#FFFFFF" d="M588.337,464.416c-0.754,3.768-3.704,5.182-7.063,6.355c-3.386-1.69-7.973-7.176-11.301-3.53
c-0.837-0.849-2.213-0.954-2.819-2.123c-0.82-1.585-0.342-3.433-0.944-4.841c-0.962-2.246-2.214-4.658-1.886-7.161
c3.188-1.258,4.239-4.623,3.401-7.735c-0.122-0.454-0.879-0.802-0.525-1.418c0.329-0.57,0.89-0.972,1.36-1.441
c-0.237,0.237-0.493,0.648-0.689,0.613c-1.077-0.188-0.857-1.313-0.628-1.995c1.032-3.083,4.589-3.549,6.969-1.443
c0.452-0.998,1.352-0.655,2.118-0.706c-0.088-1.022,0.633-1.953,0.982-2.694c0.913-1.938,3.791,0.014,5.197-1.065
c1.899-1.457,3.776-2.691,5.681-1.628c3.193,1.789,6.212,3.93,8.327,7.004c1.017,1.473,1.439,3.733,1.338,5.426
c-0.067,1.143-2.507,0.521-3.111,2.161c-1.139,3.086,2.095,4.003,3.43,6.364c0.35,0.616-0.117,1.153-0.673,1.326
c-0.726,0.227-2.11-0.107-1.866,0.691C597.351,462.212,592.484,463.409,588.337,464.416z"/>
<path id="path550" fill="#FFFFFF" d="M571.385,499.022c-0.012-3.068-2.839-6.17-0.704-9.183c0.238,0.237,0.471,0.627,0.706,0.627
c0.238,0,0.471-0.39,0.706-0.627c2.641,3.913,9.088,5.552,8.837,10.576c-0.038,0.79-1.958,2.41-0.36,3.55
c-3.201,2.38-3.3,6.564-4.944,9.887c-2.186-0.505-4.325-1.146-6.356-2.117c0.622-2.624,0.415-5.599,1.863-7.929
C571.896,502.575,571.391,500.67,571.385,499.022z"/>
<path id="path554" fill="#CCCCCC" d="M277.935,483.132c0,0-29.765,17.896-4.944-9.182c15.538-16.95,33.194-26.838,33.194-26.838
s18.362-7.771,24.719-9.89c6.355-2.119,33.193-11.301,38.845-12.007c5.649-0.706,22.6-7.769,34.606-0.706
c12.006,7.063,26.131,14.831,26.131,14.831s-28.956-14.831-35.313-10.594c-6.356,4.237-19.069,3.531-29.663,9.182
c0,0-26.131,7.771-31.781,11.303c-5.649,3.53-24.013,24.013-26.837,22.601c-2.825-1.413,0.706-2.119,2.825-7.063
c2.119-4.943-1.412-7.77-15.538,3.531C280.054,479.601,277.935,483.132,277.935,483.132z"/>
<path id="path558" d="M291.01,472.596c0,0,2.49-23.022,17.459-20.084c0,0,14.523-7.361,19.33-10.837c0,0,14.37-3.006,16.685-4.095
c32.627-15.361,58.614-7.383,59.581-9.359c0.965-1.977,35.614,10.59,41.986,17.806c0.69,0.781-18.063-9.884-35.188-13.223
c-14.607-2.85-52.748,0.438-72.005,10.211c-5.249,2.664-21.043,12.877-25.513,12.682C308.878,455.498,291.01,472.596,291.01,472.596
z"/>
<path id="path562" fill="#CCCCCC" d="M284.292,517.738c0,0-26.838-4.237,2.825-7.063c0,0,31.782-3.531,38.844-12.713
c0,0,24.013-16.244,28.956-16.95c4.944-0.706,57.913-13.419,58.619-17.656c0.707-4.236,10.595-4.236,13.419-2.824
c2.825,1.413,1.413,3.53-3.531,4.943c-4.943,1.412-60.031,30.369-71.332,32.487c-11.3,2.119-31.781,15.538-40.256,17.656
C303.36,517.738,284.292,517.738,284.292,517.738z"/>
<path id="path566" d="M318.757,504.676c0,0-15.153-1.464,0.033-2.909c0,0,15.566-6.046,19.183-10.748c0,0,12.296-8.316,14.826-8.678
c2.531-0.362,27.18-6.872,27.542-9.04c0.362-2.17,60.51-24.384,68.314-18.751c5.14,3.709-12.343,0.748-29.354,8.535
c-2.393,1.095-62.164,26.85-67.95,27.934c-5.785,1.087-16.271,7.956-20.611,9.04C326.402,501.145,318.757,504.676,318.757,504.676z"
/>
<path id="path570" d="M304.773,508.557c0,0,9.181-0.706,7.063,2.119c-2.119,2.825-6.357,1.412-6.357,1.412L304.773,508.557z"/>
<path id="path574" d="M292.061,511.382c0,0,9.181-0.706,7.063,2.119c-2.119,2.825-6.356,1.412-6.356,1.412L292.061,511.382z"/>
<path id="path578" d="M273.698,514.207c0,0,9.181-0.706,7.063,2.119c-2.119,2.824-6.356,1.412-6.356,1.412L273.698,514.207z"/>
<path id="path582" d="M260.279,515.619c0,0,9.181-0.706,7.063,2.119c-2.118,2.825-6.356,1.412-6.356,1.412L260.279,515.619z"/>
<path id="path586" d="M328.079,445.7c0,0,7.77,0,5.649,2.825c-2.119,2.824-7.769,2.117-7.769,2.117L328.079,445.7z"/>
<path id="path590" d="M310.423,455.588c0,0,11.487-3.78,7.063,2.118c-2.118,2.825-6.356,1.413-6.356,1.413L310.423,455.588z"/>
<path id="path594" d="M290.648,464.063c0,0,9.181-0.705,7.063,2.119c-2.118,2.825-6.356,1.412-6.356,1.412L290.648,464.063z"/>
<path id="path598" d="M277.229,474.656c0,0,9.181-0.706,7.063,2.119c-2.118,2.824-6.356,1.411-6.356,1.411L277.229,474.656z"/>
<path id="path602" d="M265.223,483.132c0,0,9.181-0.706,7.063,2.118c-2.119,2.825-6.356,1.413-6.356,1.413L265.223,483.132z"/>
<path id="path606" d="M334.228,494.427c0,0,12.221-0.938,9.4,2.819c-2.82,3.761-8.461,1.881-8.461,1.881L334.228,494.427z"/>
<path id="path610" d="M352.59,485.951c0,0,12.221-0.939,9.4,2.82c-2.819,3.761-8.461,1.88-8.461,1.88L352.59,485.951z"/>
<path id="path614" d="M371.659,478.183c0,0,12.22-0.938,9.399,2.819c-2.819,3.761-8.461,1.881-8.461,1.881L371.659,478.183z"/>
<path id="path618" d="M390.021,469.708c0,0,12.221-0.939,9.399,2.819c-2.819,3.761-8.461,1.88-8.461,1.88L390.021,469.708z"/>
<path id="path622" d="M341.29,437.926c0,0,12.22-0.938,9.4,2.82c-2.82,3.761-9.874,3.293-9.874,3.293L341.29,437.926z"/>
<path id="path626" d="M358.946,432.276c0,0,12.22-0.939,9.399,2.818c-2.818,3.762-10.58,3.293-10.58,3.293L358.946,432.276z"/>
<path id="path630" d="M318.898,502.907c0,0,9.181-0.706,7.063,2.118c-2.119,2.824-6.355,1.413-6.355,1.413L318.898,502.907z"/>
<path id="path634" fill="#992600" d="M189.653,327.753c0,0-7.769,15.538-8.475,21.188c0,0,1.413-15.538,3.531-19.069
C186.828,326.341,189.653,327.753,189.653,327.753z"/>
<path id="path638" fill="#992600" d="M157.165,352.472c0,0-5.65,25.425-4.944,30.369c0,0-2.119-20.481-1.412-22.6
C151.515,358.123,157.165,352.472,157.165,352.472z"/>
<path id="path642" fill="#CCCCCC" d="M193.891,220.755l-0.353,5.65l-3.885,0.354c0,0,25.072,22.247,26.132,35.666
C215.785,262.425,217.197,247.946,193.891,220.755z"/>
<path id="path646" d="M200.925,222.989c-0.761-0.734-0.374-2.05-1.095-2.509c-1.428-0.911,2.292-1.012,1.889-2.276
c-0.676-2.129-0.346-2.167-0.562-4.419c-0.101-1.056,0.938-3.775,1.618-4.552c2.553-2.917,0.215-8.094,3.111-10.833
c0.537-0.51,1.201-1.485,1.704-2.223c1.164-1.7,3.254-2.562,4.931-4.024c0.562-0.487,0.207-1.948,1.211-1.785
c1.261,0.203,3.452-0.026,3.373,1.458c-0.2,3.743-2.546,6.78-4.806,9.725c0.796,1.243-0.013,2.364-0.514,3.348
c-2.357,4.626-2.023,9.642-2.331,14.657c-0.009,0.15-0.551,0.288-0.537,0.381c0.623,4.123,1.654,8.005,3.207,11.941
c0.646,1.642,1.478,3.222,1.743,4.859c0.196,1.211,0.378,2.682-0.343,3.927c3.593,5.103,1.282,9.783,3.346,16.018
c0.365,1.104,3.353,4.483,2.535,4.199c-4.437-1.538-4.635-2.241-4.947-3.57c-0.258-1.1-0.84-3.531-1.259-4.594
c-0.113-0.29-0.415-3.616-0.553-3.832c-2.671-4.206-0.274-3.895-2.692-8.059c-2.521-1.201-4.227-3.15-6.21-5.202
c-0.35-0.36,1.668-1.638,1.349-2.014c-1.928-2.276-3.964-3.63-3.371-6.267C201.997,226.126,202.238,224.26,200.925,222.989z"/>
<path id="path650" d="M194.597,226.052c0,0,0.707,12.006,4.944,14.832c4.238,2.825,2.119,1.413-3.531-0.706
c-5.65-2.119-3.531-3.531-3.531-3.531s-4.944,0.706-0.706,4.237c4.237,3.531,10.594,7.769,7.769,7.769s-16.244-7.063-16.244-12.006
c0-4.944-1.766-12.183-1.766-12.183s1.942-1.413,10.417-1.236C191.948,223.228,194.42,224.463,194.597,226.052z"/>
<path id="path654" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M193.184,258.894c0,0-15.043-4.928-47.672,1.059
c0,0,15.946-3.669,49.085,0.353C212.783,262.513,193.184,258.894,193.184,258.894z"/>
<path id="path658" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M196.889,258.768c0,0-14.56-6.211-47.586-3.067
c0,0,16.205-2.276,48.871,4.596C216.103,264.068,196.889,258.768,196.889,258.768z"/>
<path id="path662" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M200.045,258.932c0,0-14.058-7.276-47.226-6.596
c0,0,16.329-1.066,48.395,8.217C218.811,265.647,200.045,258.932,200.045,258.932z"/>
<path id="path666" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M202.288,259.326c0,0-12.049-7.604-41.842-9.543
c0,0,14.724,0.3,42.764,11.086C218.599,266.789,202.288,259.326,202.288,259.326z"/>
<path id="path670" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M405.838,277.894c0,0-1.642,1.137-1.264-0.948
c0.38-2.085,50.185-25.339,56.564-24.897C461.14,252.048,407.732,275.365,405.838,277.894z"/>
<path id="path674" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M399.846,279.021c0,0-1.547,1.263-1.333-0.846
c0.214-2.108,48.04-29.202,54.436-29.262C452.947,248.914,401.537,276.354,399.846,279.021z"/>
<path id="path678" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M394.044,281.449c0,0-1.462,1.363-1.388-0.755
c0.074-2.117,35.063-29.479,52.389-32.788C445.045,247.906,413.21,262.255,394.044,281.449z"/>
<path id="path682" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M388.966,284.739c0,0-1.314,1.226-1.248-0.68
c0.066-1.907,31.557-26.532,47.147-29.509C434.865,254.55,406.216,267.464,388.966,284.739z"/>
<path id="path686" fill="#CCCCCC" d="M333.023,545.988c0,0-26.838-4.237,2.824-7.063c0,0,31.781-3.531,38.845-12.712
c0,0,24.013-16.244,28.956-16.95c4.943-0.707,33.899-7.063,34.606-11.301c0.706-4.237,11.3-8.475,14.125-7.063
c2.825,1.413,2.825,17.655-2.119,19.068c-4.942,1.412-38.138,14.125-49.438,16.244c-11.301,2.118-31.782,15.537-40.257,17.656
C352.092,545.988,333.023,545.988,333.023,545.988z"/>
<path id="path690" d="M461.915,479.953c0,0-5.297,2.825-7.416,7.416c0,0-11.3,18.716-36.372,24.366c0,0-40.609,15.891-54.382,19.422
c0,0-23.659,8.828-36.727,7.416c0,0-12.358,0.353-1.411,3.178c0,0,35.666-3.531,41.669-6.709c0,0,27.544-9.182,32.841-13.772
c5.297-4.59,37.432-13.419,41.315-16.949C445.317,500.789,462.621,485.957,461.915,479.953z"/>
<path id="path694" d="M358.24,535.589c0,0,9.231-0.398,7.195,2.336c-2.034,2.737-6.356,1.193-6.356,1.193L358.24,535.589z"/>
<path id="path698" d="M345.523,537.977c0,0,9.23-0.398,7.196,2.336c-2.036,2.736-6.357,1.195-6.357,1.195L345.523,537.977z"/>
<path id="path702" d="M327.11,540.18c0,0,9.231-0.399,7.195,2.336c-2.034,2.735-6.356,1.193-6.356,1.193L327.11,540.18z"/>
<path id="path706" d="M313.631,541.141c0,0,9.232-0.398,7.197,2.336c-2.036,2.736-6.358,1.193-6.358,1.193L313.631,541.141z"/>
<path id="path710" d="M387.432,522.526c0,0,12.289-0.531,9.578,3.108c-2.708,3.642-8.463,1.59-8.463,1.59L387.432,522.526z"/>
<path id="path714" d="M405.645,514.714c0,0,10.521-5.828,9.578,3.109c-0.477,4.513-8.463,1.589-8.463,1.589L405.645,514.714z"/>
<path id="path718" d="M421.768,509.745c0,0,12.642-6.534,9.579,3.108c-1.374,4.326-8.465,1.59-8.465,1.59L421.768,509.745z"/>
<path id="path722" d="M438.566,501.226c0,0,7.695-8.652,9.578,3.109c0.717,4.481-8.464,1.59-8.464,1.59L438.566,501.226z"/>
<path id="path726" d="M372.28,530.444c0,0,9.23-0.401,7.196,2.336c-2.035,2.733-6.359,1.192-6.359,1.192L372.28,530.444z"/>
<path id="path730" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M435.138,316.105c0,0-1.282,1.174-1.284-0.717
c0-1.889,30.871-25.309,46.484-27.752C480.338,287.636,451.913,299.517,435.138,316.105z"/>
<path id="path734" d="M440.374,428.748c0,0,38.847,39.553,55.09,45.908c0,0,16.244,19.774,9.183,65.683
c0,0-5.65,13.419-11.301-23.307c0,0,5.649-44.494-14.125-16.244c0,0-14.834-17.479-3.533-16.95c0,0,5.651,3.531,6.357,0.706
c0.707-2.825-13.42-26.838-43.789-52.265C407.887,406.854,440.374,428.748,440.374,428.748z"/>
<path id="path738" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M337.261,497.257c0,0-0.354-3.178,2.825-1.766
c3.178,1.412,169.503,12.358,225.298,54.734C565.384,550.227,485.576,509.264,337.261,497.257z"/>
<path id="path742" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M355.623,489.488c0,0-0.354-3.18,2.825-1.767
c3.179,1.412,244.367-0.354,286.036,56.854C644.484,544.576,605.641,500.082,355.623,489.488z"/>
<path id="path746" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M376.104,482.426c0,0-0.353-3.179,2.825-1.766
c3.18,1.412,309.343-21.541,351.013,35.666C729.941,516.326,712.991,471.125,376.104,482.426z"/>
<path id="path750" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M393.762,473.95c0,0-0.354-3.178,2.824-1.767
c3.179,1.413,218.941-66.742,260.611-9.533C657.197,462.65,633.537,419.214,393.762,473.95z"/>
<path id="path754" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M291.354,514.207c0,0-0.353-3.178,2.825-1.766
c3.178,1.412,34.606,5.297,38.138,73.804C332.317,586.245,319.604,512.088,291.354,514.207z"/>
<path id="path758" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M275.816,517.032c0,0-0.353-3.18,2.825-1.767
c3.178,1.412,28.25-6.71,23.306,61.797C301.948,577.063,304.066,514.913,275.816,517.032z"/>
<path id="path762" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M261.691,517.738c0,0-0.354-3.179,2.825-1.767
c3.179,1.412,30.369,2.473,8.475,42.022C272.991,557.995,289.941,515.619,261.691,517.738z"/>
<path id="path766" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M345.252,439.457c0,0-0.784,3.529,1.951,1.381
c28.37-22.292,85.65-126.292,183.971-136.239C531.174,304.599,463.536,283.217,345.252,439.457z"/>
<path id="path770" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M365.027,436.278c0,0-2.406-2.106,0.892-3.21
c3.298-1.104,201.831-129.115,271.194-115.05C637.113,318.018,589.252,304.758,365.027,436.278z"/>
<path id="path774" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M328.229,447.053c0,0-0.897,2.823,2.122,1.101
c15.848-9.04,22.229-110.054,99.171-112.271C429.521,335.882,372.297,309.903,328.229,447.053z"/>
<path id="path778" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M293.053,466.521c0,0-1.902,2.271,1.546,1.821
c18.091-2.352,55.884-75.222,134.348-66.254C428.947,402.089,372.507,376.759,293.053,466.521z"/>
<path id="path782" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M312.895,455.704c0,0-1.432,2.594,1.868,1.49
c17.303-5.78,40.403-84.549,119.13-90.813C433.893,366.382,373.639,352.357,312.895,455.704z"/>
<path id="path786" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M280.623,475.559c0,0-1.542,1.841,1.252,1.478
c14.653-1.905,45.265-60.929,108.822-53.665C390.696,423.37,344.979,402.854,280.623,475.559z"/>
<path id="path790" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M267.206,485.992c0,0-1.775,1.845,1.035,1.637
c7.359-0.546,61.455-58.951,94.063-31.58C362.303,456.049,341.089,422.99,267.206,485.992z"/>
<path id="path794" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M389.974,429.627c0,0-2.12-2.392,1.291-3.071
c3.411-0.679,216.529-102.579,283.56-79.862C674.823,346.693,629.021,327.494,389.974,429.627z"/>
<path id="path798" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M330.904,543.164c0,0-0.354-3.179,2.824-1.768
c3.179,1.413,30.369,2.474,8.476,42.022C342.204,583.42,359.154,541.045,330.904,543.164z"/>
<path id="path802" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M349.268,540.339c0,0-0.354-3.179,2.824-1.766
c3.18,1.412,34.607,5.297,38.14,73.804C390.23,612.377,377.518,538.22,349.268,540.339z"/>
<path id="path806" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M361.273,537.514c0,0-0.354-3.179,2.824-1.766
c3.179,1.412,46.613,7.416,88.282,64.622C452.381,600.37,389.523,535.395,361.273,537.514z"/>
<path id="path810" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M374.736,533.931c0,0-0.771-3.104,2.564-2.125
c3.337,0.979,39.416-2.375,106.684,57.969C483.984,589.773,402.455,528.076,374.736,533.931z"/>
<path id="path814" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M393.1,526.162c0,0-0.771-3.104,2.565-2.126
c3.337,0.979,64.841,8.926,156.119,70.681C551.784,594.717,420.818,520.308,393.1,526.162z"/>
<path id="path818" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M321.723,505.732c0,0-0.353-3.18,2.825-1.767
c3.179,1.412,97.464,6.003,151.14,53.322C475.688,557.289,414.064,513.545,321.723,505.732z"/>
<path id="path822" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M304.066,512.795c0,0-0.353-3.179,2.825-1.766
c3.179,1.412,46.613,7.415,88.282,64.622C395.174,575.651,332.317,510.676,304.066,512.795z"/>
<path id="path826" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M412.306,518.021c0,0-0.997-3.037,2.403-2.308
s65.321,4.147,160.88,59.049C575.589,574.764,438.462,514.036,412.306,518.021z"/>
<path id="path830" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M427.138,513.785c0,0-0.998-3.039,2.402-2.309
c3.401,0.729,65.322,4.147,160.88,59.049C590.42,570.525,454.354,509.092,427.138,513.785z"/>
<path id="path834" fill="#FFFFFF" stroke="#000000" stroke-width="0.1" d="M444.088,504.957c0,0-0.998-3.039,2.402-2.308
c3.399,0.729,79.447,8.385,237.863,68.936C684.354,571.585,471.303,500.264,444.088,504.957z"/>
<path id="path838" d="M247.566,517.032c0,0,9.182-0.706,7.063,2.118s-6.356,1.412-6.356,1.412L247.566,517.032z"/>
<path id="path842" d="M301.948,541.751c0,0,9.181-0.706,7.063,2.119c-2.119,2.825-6.356,1.412-6.356,1.412L301.948,541.751z"/>
<path id="path846" d="M286.41,541.045c0,0,9.182-0.706,7.063,2.119c-2.119,2.824-6.356,1.412-6.356,1.412L286.41,541.045z"/>
<path id="path850" d="M118.022,520.177c0,0,8.908,2.336,5.98,4.313c-2.926,1.978-6.469-0.745-6.469-0.745L118.022,520.177z"/>
<path id="path854" d="M121.554,503.227c0,0,8.908,2.336,5.98,4.313c-2.926,1.978-6.469-0.745-6.469-0.745L121.554,503.227z"/>
<path id="path858" d="M108.841,495.458c0,0,8.908,2.336,5.98,4.312c-2.925,1.979-6.469-0.744-6.469-0.744L108.841,495.458z"/>
<path id="path862" fill="#CCCCCC" d="M249.685,627.914c0,0-2.825,0-9.888,3.531c-3.531,0-23.307,6.355-33.194,24.013
C206.603,655.458,228.497,638.508,249.685,627.914z"/>
<path id="path866" fill="#CCCCCC" d="M404.56,791.494c0.249,0.456,0.348,1.197,0.862,1.228c1.161,0.07,3.339,0.603,3.118-0.521
c-1.497-7.604-3.041-16.319-10.338-19.51c-1.129-0.493-3.675,0.235-3.806,1.797c-0.225,2.69-0.432,5.072,0.114,7.661
c0.529,2.509,4.34,2.525,5.959,0.083C402.123,785.184,402.886,788.438,404.56,791.494z"/>
<path id="path870" fill="#CCCCCC" d="M385,799.854c1.321,2.494,1.097,5.776,3.595,6.771c1.308,0.519,4.573-1.202,3.835-3.099
c-1.416-3.64-2.101-7.594-4.554-10.79c-0.353-0.463,0.071-1.403-0.212-1.982c-1.048-2.154-3.07-3.452-5.556-2.871
c-1.97,3.891,0.058,7.648,2.744,10.666C385.094,798.816,384.801,799.48,385,799.854z"/>
<path id="path874" fill="#CCCCCC" d="M315.077,790.689c-0.19-0.666-0.258-1.483,0.033-2.052c0.938-1.822,2.338-3.805,1.742-5.608
c-0.613-1.864-2.585-1.543-3.731-0.538c-2.004,1.755-2.091,4.979-3.312,7.379c-0.347,0.682-0.256,1.692-1.034,2.383
c-0.838,0.744-1.613,3.435-1.444,4.442c0.094,0.553-0.229,18.047,0.163,17.583c1.093-1.295,6.478-18.481,6.6-20.058
C314.194,792.932,315.487,792.11,315.077,790.689z"/>
<path id="path878" fill="#CCCCCC" d="M269.81,778.697c4.651-4.413,9.577-9.642,8.796-16.195c-0.205-1.723-3.339-0.792-3.669,0.701
c-1.416,6.4-5.016,11.099-9.55,15.322c-3.877,3.613-7.165,14.814-7.58,15.713C264.334,784.958,268.319,780.109,269.81,778.697z"/>
<path id="path882" fill="#CCCCCC" d="M245.843,768.167c0.923-0.653,0.39-1.521,0.773-2.106c1.683-2.574,3.979-4.773,4.012-7.844
c0.005-0.489-0.662-1.034-1.254-0.639c-0.489,0.324-1.093,0.555-1.284,0.784c-3.584,4.322-6.056,9.04-8.604,14.005
c-0.323,0.63-2.343,8.56-1.79,8.756c0.422,0.148,3.459-7.232,3.83-7.434C243.756,772.479,243.777,769.627,245.843,768.167z"/>
<path id="path886" fill="#CCCCCC" d="M275.387,802.674c0.784-1.534,3.567-3.656,3.367-5.226c-0.208-1.64,0.618-4.188-0.992-2.973
c-2.22,1.675-8.309,4.057-8.786,14.312C268.93,809.795,274.182,805.04,275.387,802.674z"/>
<path id="path890" fill="#CCCCCC" d="M300.889,772.344c0.706-1.179,1.956-0.344,2.767-0.809c1.144-0.656,2.223-1.643,2.738-2.788
c1.713-3.794,4.836-7.008,5.089-11.234c-2.634-2.479-3.831,1.121-4.944,2.825c-2.336-2.908-4.1,0.4-6.395,1.316
c-0.124,0.05-0.5-0.563-0.632-0.516c-2.078,0.776-3.279,2.687-5.041,4.064c-0.302,0.236-1.017-0.082-1.276,0.158
c-1.151,1.064-2.869,1.639-3.364,2.843c-1.959,4.78-7.504,8.479-10.835,21.795c0.672,1.604,7.966-11.728,8.826-12.959
c1.476-2.112,1.685,2.933,3.938,1.757c0.09-0.048,0.418,0.372,0.655,0.608c0.342-0.494,0.727-0.898,1.413-0.706
c0-0.706-0.237-1.688,0.118-1.969c2.184-1.726,2.036-3.61,3.413-5.801C298.166,772.324,300.039,771.055,300.889,772.344z"/>
<path id="path894" fill="#CCCCCC" d="M406.474,868.395c0,0,13.066-36.019,5.298-55.794c0,0,20.129,38.139,12.007,57.913
c0,0-0.706-18.361-7.77-27.189C416.009,843.323,408.946,865.923,406.474,868.395z"/>
<path id="path898" fill="#CCCCCC" d="M380.343,863.805c0,0,9.534-15.538-4.591-48.024c0,0-1.413,36.019-13.419,55.439
C362.333,871.22,387.405,835.554,380.343,863.805z"/>
<path id="path902" fill="#CCCCCC" d="M362.686,860.273c0,0-0.353-35.313,0.354-40.61c0,0-6.709,29.31-24.719,46.26
C338.32,865.923,363.745,844.735,362.686,860.273z"/>
<path id="path906" fill="#CCCCCC" d="M345.736,803.771c0,0,10.594,24.014-7.063,56.502c0,0,11.301-21.541,2.825-33.9
C341.498,826.373,346.089,820.369,345.736,803.771z"/>
<path id="path910" fill="#CCCCCC" d="M311.836,859.566c0,0-1.766-27.545,1.412-31.429c0,0,0.354-11.301-0.354-13.065
c0,0,7.063-10.946,7.416,2.119c0,0,2.473,13.771,7.416,21.894c0,0,6.356,9.535,6.003,20.835
C333.729,859.92,316.073,806.598,311.836,859.566z"/>
<path id="path914" fill="#CCCCCC" d="M305.479,810.835c0,0-11.653,19.069-14.831,52.616c0,0-2.472-10.947,4.237-36.372
C294.885,827.079,302.301,799.888,305.479,810.835z"/>
<path id="path918" fill="#CCCCCC" d="M266.988,845.795c0,0,8.828-9.535,11.3-18.363c0,0,6.356-27.896-4.943-12.712
c0,0,0.353,14.125-14.125,27.19C259.219,841.91,267.694,837.673,266.988,845.795z"/>
<path id="path922" fill="#CCCCCC" d="M256.748,836.967c0,0,6.003-30.723,7.416-32.135c0,0,3.178-6.003-1.766-0.354
c0,0-15.538,33.9-22.6,45.555C239.797,850.032,253.922,833.788,256.748,836.967z"/>
<path id="path926" fill="#CCCCCC" d="M246.507,807.657c0,0,20.481-39.552-18.01,6.003
C228.497,813.66,247.919,796.356,246.507,807.657z"/>
<path id="path930" fill="#CCCCCC" d="M219.316,781.879c0,0,8.475-33.193,13.065-32.842c0,0,14.479-15.891,2.825,2.825
c0,0-10.594,16.95-9.535,34.254C225.672,786.116,224.613,769.166,219.316,781.879z"/>
<path id="path934" fill="#CCCCCC" d="M802.508,761.748c0,0-21.188-17.656-25.602-23.836c0,0,23.836,32.664,23.836,45.023
C800.742,782.938,805.156,769.693,802.508,761.748z"/>
<path id="path938" fill="#CCCCCC" d="M812.219,722.904c0,0-37.078-26.484-43.259-39.728c0,0,46.79,52.086,46.79,60.031
C815.75,743.209,816.633,727.318,812.219,722.904z"/>
<path id="path942" fill="#CCCCCC" d="M842.234,450.995c0,0-21.188-14.125-23.836-10.594c0,0,18.539,11.477,22.952,26.483
C841.352,466.886,838.703,450.995,842.234,450.995z"/>
<path id="path946" fill="#CCCCCC" d="M857.242,593.13l-30.898-21.188c0,0,33.547,30.017,34.431,37.079L857.242,593.13z"/>
<path id="path950" stroke="#000000" d="M167.317,553.402l38.844,8.387"/>
<path id="path954" stroke="#000000" d="M256.041,839.438c0,0-0.883-6.181-16.773,12.358"/>
<path id="path958" stroke="#000000" d="M265.752,848.265c0,0,3.531-11.477-7.946-3.53"/>
<path id="path962" stroke="#000000" d="M361.097,863.271c0,0,2.648-19.422-17.655,3.531"/>
</svg>

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 829 B

View File

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View File

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

View File

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

View File

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 100 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -1,18 +1,56 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/$(PACKAGE)/images
files_DATA = logo.png \
TRIAB-01.png \
TRIAB-02.png \
TRIAB-03.png \
TRIAB-04.png \
TRIAB-05.png \
TRIAB-06.png \
TRIAB-07.png \
TRIAB-08.png \
TRIAB-09.png \
TRIAB-10.png \
TRIAB-11.png \
TRIAB-12.png
files_DATA = ENVENTOR_EMBEDDED_IMAGE.png \
ENVENTOR_EMBEDDED_TRIAB-01.png \
ENVENTOR_EMBEDDED_TRIAB-02.png \
ENVENTOR_EMBEDDED_TRIAB-03.png \
ENVENTOR_EMBEDDED_TRIAB-04.png \
ENVENTOR_EMBEDDED_TRIAB-05.png \
ENVENTOR_EMBEDDED_TRIAB-06.png \
ENVENTOR_EMBEDDED_TRIAB-07.png \
ENVENTOR_EMBEDDED_TRIAB-08.png \
ENVENTOR_EMBEDDED_TRIAB-09.png \
ENVENTOR_EMBEDDED_TRIAB-10.png \
ENVENTOR_EMBEDDED_TRIAB-11.png \
ENVENTOR_EMBEDDED_TRIAB-12.png \
ENVENTOR_EMBEDDED_MONTH_STROKE.png \
ENVENTOR_EMBEDDED_MOONPHASE_COVER.png \
ENVENTOR_EMBEDDED_MOONPHASE_MOON.png \
ENVENTOR_EMBEDDED_NEEDLE_HOUR.png \
ENVENTOR_EMBEDDED_NEEDLE_MINUTE.png \
ENVENTOR_EMBEDDED_NEEDLE_SECOND.png \
ENVENTOR_EMBEDDED_WATCHFACE.png \
ENVENTOR_EMBEDDED_NEEDLE_HOUR_RECT.png \
ENVENTOR_EMBEDDED_NEEDLE_MINUTE_RECT.png \
ENVENTOR_EMBEDDED_NEEDLE_SECOND_RECT.png \
ENVENTOR_EMBEDDED_WATCHFACE_RECT.png \
ENVENTOR_EMBEDDED_BUTTON_BG.png \
ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png \
ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png \
ENVENTOR_EMBEDDED_ICON_ARROW.png \
ENVENTOR_EMBEDDED_ICON_BADGE.png \
ENVENTOR_EMBEDDED_ICON_BADGE_DOWN.png \
ENVENTOR_EMBEDDED_ICON_CLIP.png \
ENVENTOR_EMBEDDED_ICON_CLIP_DOWN.png \
ENVENTOR_EMBEDDED_ICON_DOCK.png \
ENVENTOR_EMBEDDED_ICON_DOCK_DOWN.png \
ENVENTOR_EMBEDDED_ICON_LOCK.png \
ENVENTOR_EMBEDDED_ICON_LOCK_DOWN.png \
ENVENTOR_EMBEDDED_BAT1.svg \
ENVENTOR_EMBEDDED_BAT2.svg \
ENVENTOR_EMBEDDED_SVG.svg \
ENVENTOR_EMBEDDED_BG1.png \
ENVENTOR_EMBEDDED_BG2.png \
ENVENTOR_EMBEDDED_BG3.png \
ENVENTOR_EMBEDDED_FIELD.png \
ENVENTOR_EMBEDDED_PLATFORM.png \
ENVENTOR_EMBEDDED_LADDER.png \
ENVENTOR_EMBEDDED_TACK.png \
ENVENTOR_EMBEDDED_CHERRY.png \
ENVENTOR_EMBEDDED_MELON.png \
ENVENTOR_EMBEDDED_WATERMELON.png \
ENVENTOR_EMBEDDED_MASK.png \
enventor_logo.png
EXTRA_DIST = $(files_DATA)

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

59
data/images/meson.build Normal file
View File

@ -0,0 +1,59 @@
image_files = [
'ENVENTOR_EMBEDDED_BAT1.svg',
'ENVENTOR_EMBEDDED_BAT2.svg',
'ENVENTOR_EMBEDDED_BG1.png',
'ENVENTOR_EMBEDDED_BG2.png',
'ENVENTOR_EMBEDDED_BG3.png',
'ENVENTOR_EMBEDDED_BUTTON_BG.png',
'ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png',
'ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png',
'ENVENTOR_EMBEDDED_CHERRY.png',
'ENVENTOR_EMBEDDED_FIELD.png',
'ENVENTOR_EMBEDDED_ICON_ARROW.png',
'ENVENTOR_EMBEDDED_ICON_BADGE.png',
'ENVENTOR_EMBEDDED_ICON_BADGE_DOWN.png',
'ENVENTOR_EMBEDDED_ICON_CLIP.png',
'ENVENTOR_EMBEDDED_ICON_CLIP_DOWN.png',
'ENVENTOR_EMBEDDED_ICON_DOCK.png',
'ENVENTOR_EMBEDDED_ICON_DOCK_DOWN.png',
'ENVENTOR_EMBEDDED_ICON_LOCK.png',
'ENVENTOR_EMBEDDED_ICON_LOCK_DOWN.png',
'ENVENTOR_EMBEDDED_IMAGE.png',
'ENVENTOR_EMBEDDED_LADDER.png',
'ENVENTOR_EMBEDDED_MASK.png',
'ENVENTOR_EMBEDDED_MELON.png',
'ENVENTOR_EMBEDDED_MONTH_STROKE.png',
'ENVENTOR_EMBEDDED_MOONPHASE_COVER.png',
'ENVENTOR_EMBEDDED_MOONPHASE_MOON.png',
'ENVENTOR_EMBEDDED_NEEDLE_HOUR.png',
'ENVENTOR_EMBEDDED_NEEDLE_HOUR_RECT.png',
'ENVENTOR_EMBEDDED_NEEDLE_MINUTE.png',
'ENVENTOR_EMBEDDED_NEEDLE_MINUTE_RECT.png',
'ENVENTOR_EMBEDDED_NEEDLE_SECOND.png',
'ENVENTOR_EMBEDDED_NEEDLE_SECOND_RECT.png',
'ENVENTOR_EMBEDDED_PLATFORM.png',
'ENVENTOR_EMBEDDED_SVG.svg',
'ENVENTOR_EMBEDDED_TACK.png',
'ENVENTOR_EMBEDDED_TRIAB-01.png',
'ENVENTOR_EMBEDDED_TRIAB-02.png',
'ENVENTOR_EMBEDDED_TRIAB-03.png',
'ENVENTOR_EMBEDDED_TRIAB-04.png',
'ENVENTOR_EMBEDDED_TRIAB-05.png',
'ENVENTOR_EMBEDDED_TRIAB-06.png',
'ENVENTOR_EMBEDDED_TRIAB-07.png',
'ENVENTOR_EMBEDDED_TRIAB-08.png',
'ENVENTOR_EMBEDDED_TRIAB-09.png',
'ENVENTOR_EMBEDDED_TRIAB-10.png',
'ENVENTOR_EMBEDDED_TRIAB-11.png',
'ENVENTOR_EMBEDDED_TRIAB-12.png',
'ENVENTOR_EMBEDDED_WATCHFACE.png',
'ENVENTOR_EMBEDDED_WATCHFACE_RECT.png',
'ENVENTOR_EMBEDDED_WATERMELON.png',
'enventor_logo.png',
]
install_data(
sources : image_files,
install_dir : join_paths(dir_pkgdata, 'images')
)

View File

@ -0,0 +1,5 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/$(PACKAGE)/reference
files_DATA = reference.src
EXTRA_DIST = $(files_DATA)

View File

@ -0,0 +1,5 @@
install_data(
sources : 'reference.src',
install_dir : join_paths(dir_pkgdata, 'reference')
)

View File

@ -0,0 +1,555 @@
collections { "The <hilight>collections</hilight> represents a theme.</br>The <hilight>collections</hilight> block contains a list of groups that composes a theme.";
base_scale { "The <hilight>base_scale</hilight> indicates the scale factor that the edc file is based on.</br>The size of a scalable object is multiplied with the device scale value. If the scalable object with the size 10 is created in a device with the scale 1.0, the size of the object is 20 in a device with the scale 2.0, and 40 in a device with the scale 4.0.</br>The relationship among scale, device scale and base scale is as follows.</br>Scale = Device Scale / Base Scale.";
}
color_classes { "The <hilight>color_classes</hilight> block contains a list of one or more <hilight>color_class</hilight> blocks.</br>Each <hilight>color_class</hilight> allows designers to name an arbitary group of colors to be used in the theme, the application can use that name to alter the color values at runtime.";
color_class { "The <hilight>color_class</hilight> allows designers to name an arbitrary group of colors to be used in the theme, the application can use that name to alter the color values at runtime.";
color { "The main color.";
}
color2 { "Used as outline in text and textblock parts.";
}
color3 { "Used as shadow in text and textblock parts.";
}
name { "Sets the name for the color class, used as reference by both the theme and the application.";
}
}
}
fonts { "The <hilight>fonts</hilight> block is used to list each font file with an alias used later in the theme.";
font { "Defines each font file and alias.";
}
}
group { "The <hilight>group</hilight> represents a widget style.</br>The <hilight>group</hilight> block contains parts and programs that compose a widget style.";
alias { "Additional name to be used as an identifier. Defining multiple aliases is supported.";
}
broadcast_signal { "Signal gets automatically broadcasted to all sub group parts. Default is "on".";
}
data { "The <hilight>data</hilight> block is used to pass arbitrary parameters from the theme to the application.";
item { "Defines a new parameter, the value is the string specified next to it.";
}
}
fonts { "The <hilight>fonts</hilight> block is used to list each font file with an alias used later in the theme.";
font { "Defines each font file and alias.";
}
}
images { "The <hilight>images</hilight> block is used to list each image file which are used in the theme. If any compression method is used, it is also defined here.";
image { "The <hilight>image</hilight> represents an image file which is used in the theme. If any compression method is used, it is also defined here.";
}
set { "The <hilight>set</hilight> block is used to define an image with different content depending on their size.";
image { "The <hilight>image</hilight> block inside the <hilight>set</hilight> block defines the characteristic of an image. Every block describes one image and the size rule to use it.";
size { "Defines the minimum and maximum size that selects the specified image.";
}
image { "This is included in each image file. Available compression methods are RAW, COMP, LOSSY, and USER.";
}
}
name { "Defines the name that refer to this image description.";
}
}
}
inherit { "Parent group name for inheritance.</br>Group inherit is used to inherit any predefined group and change some property which belongs to part, description, items or program. The child group has the same properties as its parent group.</br>If you specify the type again in an inherited part, it causes an error.";
}
limits { "This block is used to trigger signals when the Edje object is resized.";
horizontal { "This sends a signal limit,name,over when the object is resized and passes the limit by growing over it.</br>When the object's size is reduced below the limit, signal limit,name,below is sent.</br>This limit is applied on the y axis and is given in pixels.";
}
vertical { "This sends a signal limit,name,over when the object is resized and passes the limit by growing over it.</br>When the object's size is reduced below the limit, signal limit,name,below is sent.</br>This limit is applied on the x axis and is given in pixels.";
}
}
max { "The maximum size for the container defined by the totality of the parts.";
}
min { "The minimum size for the container defined by the composition of the parts.";
}
parts { "The <hilight>parts</hilight> represents visual elements.</br>The <hilight>parts</hilight> block contains a list of parts that describes a basic design element.";
part { "The <hilight>part</hilight> represents a basic design element such as an image, rectangle or text.</br>The <hilight>part</hilight> block contains a list of descriptions that defines a state of the element.";
access { "Specifies whether the part uses accessibility feature (1), or not (0).</br>It is set to 0 by default.";
}
box { "On a box part, the <hilight>box</hilight> block is used to set other groups as elements of the box.</br>These can be mixed with external objects set by the application through the edje_object_part_box*() functions.";
items { "The <hilight>items</hilight> block contains a list of <hilight>item</hilight> blocks.</br>Each <hilight>item</hilight> item block contains other group as an element of the box.";
item { "The <hilight>item</hilight> item block contains other group as an element of the box.";
align { "Moves the item relatively along both axis inside the part.</br>For horizontal alignment, 0.0 moves the item to touch the left edge of the part and 1.0 moves the item to touch the right edge of the part.</br>For vertical alignment, 0.0 moves the item to touch the top edge of the part and 1.0 moves the item to touch the bottom edge of the part.</br>The default value is 0.5 0.5.";
}
aspect { "Sets the aspect width and height hints for this object.";
}
aspect_mode { "Sets the aspect control hints for this object.</br>The available hints are NONE, NEITHER, HORIZONTAL, VERTICAL, and BOTH.";
}
max { "Sets the maximum size hints for this object.";
}
min { "Sets the minimum size hints for this object.";
}
name { "Sets the name of the object via evas_object_name_set()";
}
options { "Sets extra options for the object.";
}
padding { "Sets the padding hints for this object.";
}
prefer { "Sets the preferred size hints for this object.";
}
source { "Sets the group this object is made of.";
}
spread { "Replicates the item in a rectangle of size width x height box starting from the defined position of this item.</br>The default value is 1 1.";
}
type { "Sets the type of the object this item holds.</br>The supported type is GROUP.";
}
weight { "Sets the weight hints for this object.";
}
}
}
}
clip_to { "Only renders the area of the part that coincides with the given part.";
}
cursor_mode { "Sets where to draw the (blinking) cursor for textblock parts.</br>The available modes are UNDER and BEFORE.";
}
desc { "The <hilight>desc</hilight> defines a state of a part.</br>The <hilight>desc</hilight> block contains properties of a part such as size, position, color, image and text.";
align { "Moves the object relatively along both axis inside its container.</br>For horizontal alignment, 0.0 moves the object to touch the left edge of its container and 1.0 moves the object to touch the right edge of its container.</br>For vertical alignment, 0.0 moves the object to touch the top edge of its container and 1.0 moves the object to touch the bottom edge of its container.</br>The default value is 0.5 0.5.";
}
aspect { "Forces the ratio of the width to height to be kept between the minimum and maximum set.</br>For example, 1.0 1.0 increases the width a pixel for every pixel added to height and 2.0 2.0 increases the width two pixels for every pixel added to height.</br>The default value is 0.0 0.0 which disables <hilight>aspect</hilight>.";
}
aspect_preference { "Sets the dimensions to which the <hilight>aspect</hilight> property applies.</br>For example, if the dimension is HORIZONTAL, then the object fits its width to its container's width so its height can be longer than its container's height.</br>Available options are BOTH, VERTICAL, HORIZONTAL, SOURCE, and NONE.";
}
box { "On a box part, the <hilight>box</hilight> block is used to define how items are displayed inside of the box part.";
align { "Moves items relatively along both axis inside the box.</br>For horizontal alignment, 0.0 moves items to touch the left edge of the box and 1.0 moves items to touch the right edge of the box.</br>For vertical alignment, 0.0 moves items to touch the top edge of the box and 1.0 moves items to touch the bottom edge of the box.</br>The default value is 0.5 0.5.";
}
layout { "Sets how the items are arranged in the box.</br>The available layouts are horizontal (default), vertical, horizontal_homogeneous, vertical_homogeneous, horizontal_max, vertical_max, horizontal_flow, vertical_flow, and stack.";
}
min { "When any of the parameters is enabled (1) it forces the minimum size of the box to be equal to the minimum size of the items.</br>The default value is 0 0.";
}
padding { "Sets the padding in pixels between items of the box.</br>The default value is 0 0.";
}
}
clip_to { "Only renders the area of the part that coincides with the given part.";
}
color { "Sets the main color to the specified values in RGBA (between 0 and 255).</br>Notice that the <hilight>color</hilight> of the textblock part is set in the text style.";
}
color2 { "Sets the text outline color to the specified values in RGBA (0 to 255).</br>Notice that <hilight>color2</hilight> is valid only for the text part with the outline effect.</br>Notice that the <hilight>color2</hilight> of the textblock part is set in the text style.";
}
color3 { "Sets the text shadow color to the specified values in RGBA (0 to 255).</br>Notice that <hilight>color3</hilight> is valid only for the text part with the shadow effect.</br>Notice that the <hilight>color3</hilight> of the textblock part is set in the text style.";
}
color_class { "The part uses the color values of the named color_class, these values can be overridden by the <hilight>color</hilight>, <hilight>color2</hilight>, and <hilight>color3</hilight> properties.";
}
fill { "Sets how the image is going to fill the image part.";
origin { "Sets the starting point of the image relatively to the image part.";
offset { "Sets the starting point of the image in pixels from the top-left of the image part.</br>For example, 50 50 fills the image from 50 pixels right and 50 pixels down from the top-left point of the image part.";
}
relative { "Sets the starting point of the image relatively from the top-left of the image part.</br>For example, 0.1 0.1 fills the image from the 0.1 0.1 relative position of the image part.";
}
}
size { "Sets the tile size.";
offset { "Increases the tile size in pixels along each axis.</br>For example, 50 50 increases the tile size by 50 pixels along x and y axis.";
}
relative { "Sets the tile size relatively to the image size.</br>For example, 0.5 0.5 shrinks the tile size to 1/4 of the image size.";
}
}
smooth { "Specifies whether the smooth scaling is applied to the image when the image is scaled.</br>The default value is 1 (enabled).";
}
type { "Spicifies whether the image is scaled or tiled to fill the image part.</br>The available types are SCALE (default) and TILE.";
}
}
fixed { "Specifies whether the minimum size of this part affects the minimum size of the widget (group).</br>Normally, <hilight>fixed</hilight> is used to set a minimum width or height to a line or a point shaped part.</br>For example, rel1 and rel2 of a part are the same position along x axis and the part has a minimum width, then fixed: 1 0 should be applied not to increase the minimum width of the widget infinitely.</br>The default value is 0 0 (the minimum size of the part affects the minimum size of the widget).";
}
image { "On an image part, the <hilight>image</hilight> block is used to define how the image is displayed.";
border { "Sets the area (in pixels) of each side of the image (left, right, top, and bottom) which is displayed as a fixed size border from the side.</br>The border area is not resized when the image is resized to fill the image part.";
}
border_scale { "Specifies whether the border is scaled by the object/global scale factors.";
}
border_scale_by { "If border scaling is enabled then normally the OUTPUT border sizes (e.g. if 3 pixels on the left edge are set as a border, then normally at scale 1.0, those 3 columns are always exactly 3 columns of output, or at scale 2.0 they are 6 columns, or 0.33 they merge into a single column).</br>This property multiplies the input scale factor by this multiplier, allowing the creation of supersampled borders to make higher resolution outputs possible by always using the highest resolution artwork and then runtime scaling it down.</br>Value can be: 0.0 or bigger (0.0 or 1.0 to turn it off).";
}
middle { "Specifies how the rest of the image (not covered by the defined border) is displayed.</br>The rest of the image can be displayed with alpha (DEFAULT), displayed without alpha (SOLID), or not displayed (NONE).</br>The default value is DEFAULT.";
}
normal { "Sets the name of an image to be used.</br>Notice that the name of the image should be declared in the <hilight>images</hilight> block.";
}
scale_hint { "Sets the evas image scale hint letting the engine more effectively save cached copies of the scaled image if it makes sense.</br>The available values are NONE, DYNAMIC, and STATIC.";
}
tween { "Sets the name of an image to be animated during the transition to the state of the part containing the <hilight>image</hilight> block.</br>The <hilight>image</hilight> block can have none, one or multiple <hilight>tween</hilight> declarations.</br>Images declared with <hilight>tween</hilight> are displayed in the order they are listed during the transition to the state they are declared in.</br>The <hilight>normal</hilight> image is displayed in the beginning and in the end.";
}
}
inherit { "Inherits all the properties from the named description.</br>The properties defined in the description override the inherited properties, reducing the amount of necessary code for simple state changes.";
}
limit { "Emits a signal when the part size changes from zero or to a zero ("limit,width,over" or "limit,width,zero"). By default no signal are emitted.</br>The available values are NONE, WIDTH, HEIGHT, and BOTH.";
}
link { "The <hilight>link</hilight> block can be used to create transitions to the enclosing part description state.</br>The result of the above block is identical to creating a program with.";
after { "Specifies a program that is run after the current program completes.</br>The source and signal parameters of a program run as an after are ignored.</br>Multiple after statements can be specified per program.";
}
base { "Specifies a signal and a source which triggers the transition to this state.</br>The source parameter is optional here and is filled with the current group's default value if it is not provided.";
}
in { "in [from] [range]</br>Waits [from] seconds before executing the program and adds a random number of seconds (from 0 to [range]) to the total waiting time.";
}
transition { "transition [type] [length] (interp val 1) (interp val 2) (option)</br>Defines how transitions occur using STATE_SET action.</br>[type] is the style of the transition and [length] is a double specifying the number of seconds in which to preform the transition.</br>The available types are LINEAR, SINUSOIDAL, ACCELERATE, ACCELERATE_FACTOR, DECELERATE_FACTOR, SINUSOIDAL_FACTOR, DIVISOR_INTERP, BOUNCE, and SPRING";
}
}
map { "The <hilight>map</hilight> block is used to apply evas map rendering functions (e.g. perspective effect, rotation effect, lighting, and color blending).";
alpha { "Specifies whether alpha channel is enabled or not during map rendering.</br>The default value is 1 (enabled).";
}
backface_cull { "Specifies whether backface culling is enabled or not.";
}
color { "color [point] [red] [green] [blue] [alpha]</br>Sets the color of a vertex in the map.</br>Colors are linearly interpolated between vertex points through the map.</br>The default color of a vertex in a map is white solid (255, 255, 255, 255) which means it has no affect on modifying the part pixels.</br>Currently only four points are supported: 0 - Left-Top point of a part. 1 - Right-Top point of a part. 2 - Left-Bottom point of a part. 3 - Right-Bottom point of a part.";
}
light { "Sets the part that is used as the light for calculating the brightness (based on how directly the part's surface is facing the light source point).</br>Like the perspective point part, the center point is used and zplane is used for the z position (0 being the zero-plane where all 2D objects normally live) and positive values being further away into the distance.</br>The light part color is used as the light color (alpha not used for light color). The color2 color is used for the ambient lighting when calculating brightness (alpha also not used).";
}
on { "Specifies whether mapping is enabled or not for the part.</br>The default value is 0 (disabled).";
}
perspective { "Sets the part that is used as the perspective point for giving a part a 3D look.</br>The perspective point must have a perspective section that provides zplane and focal properties. The center of this part is used as the focal point, thus size, color and visibility are not relevant, just center point, zplane and focal are used. This also implicitly enables perspective transforms.";
}
perspective_on { "Specifies whether perspective effect is enabled or not.";
}
rotation { "The <hilight>rotation</hilight> is used to rotate the part, optionally with the center on another part.";
center { "Sets the part that is used as the center of rotation when rotating the part with this description.</br>The part's center point is used as the rotation center when applying rotation around the x, y and z axes.</br>If no center is given, the parts original center itself is used for the rotation center.";
}
x { "Sets the rotation around the x axis of the part considering the <hilight>center</hilight> set.</br>The value is given in degrees.";
}
y { "Sets the rotation around the y axis of the part considering the <hilight>center</hilight> set.</br>The value is given in degrees.";
}
z { "Sets the rotation around the x axis of the part considering the <hilight>center</hilight> set.</br>The value is given in degrees.";
}
}
smooth { "Specifies whether smooth map rendering is enabled or not.</br>This may be linear interpolation, anisotropic filtering or anything the engine decides is smooth. This is a best-effort hint and may not produce precisely the same results in all engines and situations.</br>The default value is 1 (enabled).";
}
}
max { "Sets the maximum size of the part.</br>The size of -1.0 means that it is ignored in that direction.";
}
min { "Sets the minimum size of the part.</br>To make this <hilight>min</hilight> size not affect to the minimum size of the object, <hilight>fixed</hilight> should be set with 1 for that direction.";
}
minmul { "Sets a multiplier forcibly applied to whatever minimum size is only during minimum size calculation.";
}
perspective { "The <hilight>perspective</hilight> is used to add focal and plane perspective to the part.</br>Must be provided if the part is being used by other parts as it is perspective target.";
focal { "Sets the z value that is not scaled.</br>Normally this is 0 as that is the z distance.";
}
zplane { "Sets the distance from the focal z plane (zplane) and the camera (i.e. equating to focal length of the camera).";
}
}
rel1 { "The <hilight>rel1</hilight> block is used to define the position of the top-left corner of the part.</br>";
offset { "Adds an absoute offset (in pixels) along each axis.";
}
relative { "Moves the corner to a relative position of the part given to the keyword <hilight>to</hilight>.</br>The value for the left side of the part is 0.0 and the value for the right side of the part is 1.0.</br>The value for the top side of the part is 0.0 and the value for the bottom side of the part is 1.0";
}
to { "Sets another part referenced for positioning the corners along both x axis and y axis.";
}
to_x { "Sets another part referenced for positioning the corners along x axis.";
}
to_y { "Sets another part referenced for positioning the corners along y axis.";
}
}
rel2 { "The <hilight>rel2</hilight> block is used to define the position of the bottom-right corner of the part.";
#inherit "collections.group.parts.part.desc.rel1";
}
source { "Sets another part to be used by the part's content.</br>Notice that this works only with proxy parts.";
}
step { "Restricts resizing of each dimension to values divisible by its value.</br>This causes the part to jump from value to value while resizing.</br>The default value is 0 0 which disables stepping.";
}
table { "On a table part, the <hilight>table</hilight> block is used to define how items are displayed inside of the table part.";
align { "Moves items relatively along both axis inside the table.</br>For horizontal alignment, 0.0 moves items to touch the left edge of the table and 1.0 moves items to touch the right edge of the table.</br>For vertical alignment, 0.0 moves items to touch the top edge of the table and 1.0 moves items to touch the bottom edge of the table.</br>The default value is 0.5 0.5.";
}
homogeneous { "Sets how the space for each item is arranged in the table.</br>The available modes are NONE (default), TABLE, and ITEM.";
}
min { "When any of the parameters is enabled (1) it forces the minimum size of the table to be equal to the minimum size of the items.</br>The default value is 0 0.";
}
padding { "Sets the padding in pixels between items of the table.</br>The default value is 0 0.";
}
}
text { "The <hilight>text</hilight> block is used to define text properties.";
align { "Moves the text relatively along both axis inside the part.</br>For horizontal alignment, 0.0 moves the text to touch the left edge of the part and 1.0 moves the text to touch the right edge of the part.</br>For vertical alignment, 0.0 moves the text to touch the top edge of the part and 1.0 moves the text to touch the bottom edge of the part.</br>The default value is 0.5 0.5.";
}
domain { "Sets the domain name of the .mo file which has to be checked for translation.";
}
ellipsis { "Balances the text in a relative point from 0.0 to 1.0, this point is the last section of the string to be cut out in case of a resize that is smaller than the text itself.</br>The default value is 0.0.";
}
fit { "Specifies whether resizing the text to fit in the part or not.</br>The default value is 0 0 (disabled).";
}
font { "Sets the font family to one of the aliases set up in the <hilight>fonts</hilight> block.";
}
max { "When any of the parameters is enabled (1) it forces the maximum size of the container to be equal to the maximum size of the text (width and height).</br>The default value is 0 0 (disabled).";
}
min { "When any of the parameters is enabled (1) it forces the minimum size of the container to be equal to the minimum size of the text (width and height).</br>The default value is 0 0 (disabled).";
}
repch { "Sets a replacement character string to hide the details in the password mode.</br>This works only if the part is <hilight>textblock</hilight> and the <hilight>entry_mode</hilight> is PASSWORD.</br>Normally * is used, but you can use anything you like.";
}
size { "Sets the default font size.";
}
size_range { "Sets the allowed font size.</br>Setting min and max to 0 means that sizing is not restricted.</br>The default value is 0 0 (sizing is not restricted).";
}
source { "Uses text properties of the given part (e.g. font and size).";
}
style { "Uses the default style and tags defined in the <hilight>style</hilight> block with the specified name.";
}
text { "Sets the default text string.";
}
text_class { "Sets the text's class which can be used to factor font and font size properties.";
}
text_source { "Sets the text string the same as the given part's text string.</br>The text string is updated when the given part's text string changes.";
}
}
visible { "Specifies whether the part is visible or not.</br>If the part is not visible, then the part does not receive mouse events.</br>The default value is 1 (visible).";
}
}
description { "The <hilight>description</hilight> defines a state of a part.</br>The <hilight>description</hilight> block contains properties of a part such as size, position, color, image and text.";
#inherit "collections.group.parts.part.desc";
}
dragable { "When this block is used the part can be dragged around the interface, do not confuse with external drag and drop.</br>By default Edje (and most applications) attempts to use the minimal size possible for a draggable part.</br>If the min property is not set in the description the part is (most likely) set to 0px width and 0px height, thus invisible.";
confine { "Limits the movement of the dragged part to another part's container.</br>Set a min size for the part, or the dragged object will not show up.";
}
events { "Causes the part to forward the drag events to another part, thus ignoring them for itself.";
}
threshold { "When set, the movement of the dragged part can only start when it get moved enough to be outside of the threshold part.";
}
x { "Used to set up dragging events for the X axis.</br>The first parameter is used to enable (1 or -1) and disable (0) dragging along the axis.</br>When enabled, 1 sets the starting point at 0.0 and -1 at 1.0.</br>The second parameter takes any integer and limits movement to values divisible by it, causing the part to jump from position to position.</br>If the second parameter, step, is set to 0 it is calculated as width of confine part divided by the third parameter,count.";
}
y { "Used to set up dragging events for the Y axis.</br>The first parameter is used to enable (1 or -1) and disable (0) dragging along the axis.</br>When enabled, 1 sets the starting point at 0.0 and -1 at 1.0.</br>The second parameter takes any integer and limits movement to values divisible by it, causing the part to jump from position to position.</br>If the second parameter, step, is set to 0 it is calculated as height of confine part divided by the third parameter, count.";
}
}
effect { "Applies the selected outline, shadow, or glow effect to textblock parts.</br>The available effects are PLAIN, OUTLINE, SOFT_OUTLINE, SHADOW, SOFT_SHADOW, OUTLINE_SHADOW, OUTLINE_SOFT_SHADOW, FAR_SHADOW, FAR_SOFT_SHADOW, and GLOW.</br>The available shadow directions definitions are BOTTOM_RIGHT, BOTTOM, BOTTOM_LEFT, LEFT, TOP_LEFT, TOP, TOP_RIGHT, and RIGHT (default is BOTTOM_RIGHT).";
}
entry_mode { "Sets the edit mode for textblock parts.</br>The available modes are NONE, PLAIN, EDITABLE, and PASSWORD.";
}
ignore_flags { "Specifies whether events with the given flags are ignored, i.e., do not emit signals to the parts.</br>Multiple flags must be separated by spaces, the effect is ignoring all events with one of the flags specified.</br>The available flags are NONE and ON_HOLD";
}
insert_after { "Inserts the part above the given part.</br>Notice that one part cannot have both insert_before and insert_after.</br>Notice that one part cannot refer more than one by insert_after.";
}
insert_before { "Inserts the part below the given part.</br>Notice that one part cannot have both insert_before and insert_after.</br>Notice that one part cannot refer more than one by insert_before.";
}
mouse_events { "Specifies whether the part receives mouse events or not.</br>The default value is 1 (receiving mouse events).";
}
multiline { "Specifies whether multiple lines are allowed for editable textblock parts.";
}
pointer_mode { "Sets the mouse pointer behavior for the given part.</br>The default value is AUTOGRAB.</br>The available modes are AUTOGRAB and NOGRAB.";
}
repeat_events { "Specifies whether the part passes mouse events to other parts below it.</br>The default value is 0 (not passing mouse events).";
}
scale { "Specifies whether the part scales its size with an Edje scaling factor.</br>This is used to scale properties such as font size, min/max size of the part, and it can also be used to scale based on DPI of the target device.</br>The default value is 0 (not scaling).";
}
select_mode { "Sets how the text selection is triggered for textblock parts.</br>The available modes are DEFAULT and EXPLICIT.";
}
source { "Sets the given group to the group/textblock parts.</br>Sets the given elementary widget to the external part. (e.g. elm/button)";
}
table { "On a box part, the <hilight>table</hilight> block is used to set other groups as elements of the box.</br>These can be mixed with external objects set by the application through the edje_object_part_box*() functions.";
items { "The <hilight>items</hilight> block contains a list of <hilight>item</hilight> blocks.</br>Each <hilight>item</hilight> item block contains other group as an element of the box.";
item { "The <hilight>item</hilight> item block contains other group as an element of the box.";
align { "Moves the item relatively along both axis inside the part.</br>For horizontal alignment, 0.0 moves the item to touch the left edge of the part and 1.0 moves the item to touch the right edge of the part.</br>For vertical alignment, 0.0 moves the item to touch the top edge of the part and 1.0 moves the item to touch the bottom edge of the part.</br>The default value is 0.5 0.5.";
}
aspect { "Sets the aspect width and height hints for this object.";
}
aspect_mode { "Sets the aspect control hints for this object.</br>The available hints are NONE, NEITHER, HORIZONTAL, VERTICAL, and BOTH.";
}
max { "Sets the maximum size hints for this object.";
}
min { "Sets the minimum size hints for this object.";
}
name { "Sets the name of the object via evas_object_name_set()";
}
options { "Sets extra options for the object.";
}
padding { "Sets the padding hints for this object.";
}
position { "Sets the position in the table.";
}
prefer { "Sets the preferred size hints for this object.";
}
source { "Sets the group this object is made of.";
}
span { "Sets how many columns and rows this item uses.</br>The default value is 1 1.";
}
spread { "Replicates the item in a rectangle of size width x height box starting from the defined position of this item.</br>The default value is 1 1.";
}
type { "Sets the type of the object this item holds.</br>The supported type is GROUP.";
}
weight { "Sets the weight hints for this object.";
}
}
}
}
type { "Sets the part type.</br>The available types are IMAGE (default), RECT, SWALLOW, TEXT, TEXTBLOCK, SPACER, GROUP, BOX, TABLE, PROXY and EXTERNAL.";
}
}
box { "The <hilight>box</hilight> represents a box part. The <hilight>box</hilight> part is used to contain other objects.</br>The <hilight>box</hilight> block contains a list of descriptions that defines a state of the box part.</br>It also has a row or column.";
#inherit "collections.group.parts.part";
}
external { "The <hilight>external</hilight> represents an external part. The <hilight>external</hilight> part is used to set a widget inside of it.</br>The <hilight>external</hilight> block contains a list of descriptions that defines a state of the external part.";
#inherit "collections.group.parts.part";
}
group { "The <hilight>group</hilight> represents a group part. The <hilight>group</hilight> part is used to include other group (widget style) inside of it.</br>The <hilight>group</hilight> block contains a list of descriptions that defines a state of the group part.";
#inherit "collections.group.parts.part";
}
image { "The <hilight>image</hilight> represents an image part. The <hilight>image</hilight> part is used to display an image file.</br>The <hilight>image</hilight> block contains a list of descriptions that defines a state of the image part.";
#inherit "collections.group.parts.part";
}
proxy { "The <hilight>proxy</hilight> represents a proxy part. The <hilight>proxy</hilight> part is used to clone other part in the same group.</br>The <hilight>proxy</hilight> block contains a list of descriptions that defines a state of the proxy part.";
#inherit "collections.group.parts.part";
}
rect { "The <hilight>rect</hilight> represents a rectangle part. The <hilight>rect</hilight> part is used to draw a rectangle.</br>The <hilight>rect</hilight> block contains a list of descriptions that defines a state of the rectangle part.";
#inherit "collections.group.parts.part";
}
spacer { "The <hilight>spacer</hilight> represents a spacer part. The <hilight>spacer</hilight> part is used as a padding area (it is not visible and it does not receive mouse events and it also does not need any memory allocation unlike other parts.).</br>The <hilight>spacer</hilight> block contains a list of descriptions that defines a state of the spacer part.";
#inherit "collections.group.parts.part";
}
swallow { "The <hilight>swallow</hilight> represents a swallow part. The <hilight>swallow</hilight> part is used to set a widget into this part.</br>The <hilight>swallow</hilight> block contains a list of descriptions that defines a state of the swallow part.";
#inherit "collections.group.parts.part";
}
table { "The <hilight>table</hilight> represents a table part. The <hilight>table</hilight> part is used to contain other parts.</br>The <hilight>table</hilight> block contains a list of descriptions that defines a state of the table part.</br>It also has a row and column.";
#inherit "collections.group.parts.part";
}
text { "The <hilight>text</hilight> represents a text part. The <hilight>text</hilight> part is used to write a simple string with single line in this part.</br>The <hilight>text</hilight> block contains a list of descriptions that defines a state of the text part.";
#inherit "collections.group.parts.part";
}
textblock { "The <hilight>textblock</hilight> represents a textblock part. The <hilight>textblock</hilight> part is used to write complex strings and mark-up elements with multiple lines in this part.</br>The <hilight>textblock</hilight> block contains a list of descriptions that defines a state of the textblock part.";
#inherit "collections.group.parts.part";
}
vector { "The <hilight>vector</hilight> represents a vector part. The <hilight>vector</hilight> part is used to display a vector file.</br>The <hilight>vector</hilight> block contains a list of descriptions that defines a state of the vector part.";
#inherit "collections.group.parts.part";
}
}
programs { "The <hilight>programs</hilight> defines how your interface reacts to events.</br>The <hilight>programs</hilight> block contains a list of programs that reacts to events.";
program { "The <hilight>program</hilight> defines how your interface reacts to events. The <hilight>program</hilight> can change the state of parts and trigger/listen events.</br>The <hilight>program</hilight> block contains signal, source, action and target.</br>signal is an event that the program is waiting for.</br>source is a part that catches the signal. (e.g. mouse clicking area)</br>action defines what is going to do when the signal is caught. (e.g. changing the state of a part)</br>target is a part that changes its state.";
action { "action [type] (param1) (param2) (param3) (param4)</br>Specifies an action to be performed by the program.</br>The available types are STATE_SET, SIGNAL_EMIT, etc.";
}
after {"Specifies a program that is run after the current program completes.</br>The source and signal parameters of a program run as an after are ignored.</br>Multiple after statements can be specified per program.";
}
filter { "filter [part] [state]</br>Filters signals to be only accepted if the part is in state named [state].</br>Only one filter per program can be used.</br>If [state] is not given, the source of the event is used instead.";
}
in { "in [from] [range]</br>Waits [from] seconds before executing the program and adds a random number of seconds (from 0 to [range]) to the total waiting time.";
}
name { "Sets the name of the program as a unique identifier.";
}
signal { "Specifies a signal which triggers the transition to this state.</br>Only one signal per program can be used.</br>The available predefined signals are "mouse,in", "mouse,out", "mouse,move", "mouse,down,*", "mouse,up,*", "mouse,wheel,0,*", etc.";
}
source { "Specifies a source which filters the incoming signals depending on the sender name.</br>The part name which receives the signal is used as the source name (e.g. If a user does mouse down to a part named "abc", then "mouse,down,*" signal and "abc" source can catches this event.).</br>Only one source per program can be used.";
}
target { "Specifies a program or a part on which the specified action acts.";
}
transition { "transition [type] [length] (interp val 1) (interp val 2) (option)</br>Defines how transitions occur using STATE_SET action.</br>[type] is the style of the transition and [length] is a double specifying the number of seconds in which to preform the transition.</br>The available types are LINEAR, SINUSOIDAL, ACCELERATE, ACCELERATE_FACTOR, DECELERATE_FACTOR, SINUSOIDAL_FACTOR, DIVISOR_INTERP, BOUNCE, and SPRING";
}
}
}
script { "The <hilight>script</hilight> block is used to inject embryo scripts to a given Edje theme and it functions in two modalities. When it is included inside a program block, the script is executed every time the program is run, on the other hand, when included directly into a group, part, or description block, it is executed once at the load time, in the load order.";
}
sounds { "The <hilight>sounds</hilight> block contains a list of one or more sound samples and tone items.";
sample { "The <hilight>sample</hilight> block defines the sound sample.";
name { "Used to include each sound file. Valid types are RAW, COMP, LOSSY, and AS_IS.";
}
source { "The sound source file name.";
}
}
tone { "A sound of the given frequency.";
}
}
styles { "The <hilight>styles</hilight> block contains a list of one or more <hilight>style</hilight> blocks.</br>The <hilight>style</hilight> block is used to create style <tags> for advanced TEXTBLOCK formatting.";
style { "The <hilight>style</hilight> block is used to create style <tags> for advanced TEXTBLOCK formatting.";
base { "The <hilight>base</hilight> represents style properties that are applied to the text.</br>The available tags that can be used in the style property are as follows.</br>font, font_size, color, color_class, text_class, ellipsis, wrap, style, valign, and align.";
}
name { "The name of the style to be used as reference later in the theme.";
}
tag { "The <hilight>tag</hilight> defines the meaning of each tag in the style.</br>Style is applied to the text between the beginning tag <tags> and the ending tag </tags>.";
}
}
}
}
images { "The <hilight>images</hilight> block is used to list each image file which are used in the theme. If any compression method is used, it is also defined here.";
image { "The <hilight>image</hilight> represents an image file which is used in the theme. If any compression method is used, it is also defined here.";
}
set { "The <hilight>set</hilight> block is used to define an image with different content depending on their size.";
image { "The <hilight>image</hilight> block inside the <hilight>set</hilight> block defines the characteristic of an image. Every block describes one image and the size rule to use it.";
size { "Defines the minimum and maximum size that selects the specified image.";
}
image { "This is included in each image file. Available compression methods are RAW, COMP, LOSSY, and USER.";
}
}
name { "Defines the name that refer to this image description.";
}
}
}
sounds { "The <hilight>sounds</hilight> block contains a list of one or more sound samples and tone items.";
sample { "The <hilight>sample</hilight> block defines the sound sample.";
name { "Used to include each sound file. Valid types are RAW, COMP, LOSSY, and AS_IS.";
}
source { "The sound source file name.";
}
}
tone { "A sound of the given frequency.";
}
}
styles { "The <hilight>styles</hilight> block contains a list of one or more <hilight>style</hilight> blocks.</br>The <hilight>style</hilight> block is used to create style <tags> for advanced TEXTBLOCK formatting.";
style { "The <hilight>style</hilight> block is used to create style <tags> for advanced TEXTBLOCK formatting.";
base { "The <hilight>base</hilight> represents style properties that are applied to the text.</br>The available tags that can be used in the style property are as follows.</br>font, font_size, color, color_class, text_class, ellipsis, wrap, style, valign, and align.";
}
name { "The name of the style to be used as reference later in the theme.";
}
tag { "The <hilight>tag</hilight> defines the meaning of each tag in the style.</br>Style is applied to the text between the beginning tag <tags> and the ending tag </tags>.";
}
}
}
}
color_classes { "The <hilight>color_classes</hilight> block contains a list of one or more <hilight>color_class</hilight> blocks.</br>Each <hilight>color_class</hilight> allows designers to name an arbitary group of colors to be used in the theme, the application can use that name to alter the color values at runtime.";
color_class { "The <hilight>color_class</hilight> allows designers to name an arbitrary group of colors to be used in the theme, the application can use that name to alter the color values at runtime.";
color { "The main color.";
}
color2 { "Used as outline in text and textblock parts.";
}
color3 { "Used as shadow in text and textblock parts.";
}
name { "Sets the name for the color class, used as reference by both the theme and the application.";
}
}
}
data { "The <hilight>data</hilight> block is used to pass arbitrary parameters from the theme to the application.";
file { "Defines a new parameter, the value is the contents of the specified file formatted as a single string of text.</br>This property only works with plain text files.";
}
item { "Defines a new parameter, the value is the string specified next to it.";
}
}
fonts { "The <hilight>fonts</hilight> block is used to list each font file with an alias used later in the theme.";
font { "Defines each font file and alias.";
}
}
images { "The <hilight>images</hilight> block is used to list each image file which are used in the theme. If any compression method is used, it is also defined here.";
image { "The <hilight>image</hilight> represents an image file which is used in the theme. If any compression method is used, it is also defined here.";
}
set { "The <hilight>set</hilight> block is used to define an image with different content depending on their size.";
image { "The <hilight>image</hilight> block inside the <hilight>set</hilight> block defines the characteristic of an image. Every block describes one image and the size rule to use it.";
size { "Defines the minimum and maximum size that selects the specified image.";
}
image { "This is included in each image file. Available compression methods are RAW, COMP, LOSSY, and USER.";
}
}
name { "Defines the name that refer to this image description.";
}
}
}
styles { "The <hilight>styles</hilight> block contains a list of one or more <hilight>style</hilight> blocks.</br>The <hilight>style</hilight> block is used to create style <tags> for advanced TEXTBLOCK formatting.";
style { "The <hilight>style</hilight> block is used to create style <tags> for advanced TEXTBLOCK formatting.";
base { "The <hilight>base</hilight> represents style properties that are applied to the text.</br>The available tags that can be used in the style property are as follows.</br>font, font_size, color, color_class, text_class, ellipsis, wrap, style, valign, and align.";
}
name { "The name of the style to be used as reference later in the theme.";
}
tag { "The <hilight>tag</hilight> defines the meaning of each tag in the style.</br>Style is applied to the text between the beginning tag <tags> and the ending tag </tags>.";
}
}
}

View File

@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/$(PACKAGE)/sounds
files_DATA = \
kbd-tap.wav
ENVENTOR_EMBEDDED_TAP.wav
EXTRA_DIST = $(files_DATA)

5
data/sounds/meson.build Normal file
View File

@ -0,0 +1,5 @@
install_data(
sources : 'ENVENTOR_EMBEDDED_TAP.wav',
install_dir : join_paths(dir_pkgdata, 'sounds')
)

71
data/templates/Basic.edc Normal file
View File

@ -0,0 +1,71 @@
collections {
base_scale: 1.0;
group { "main";
/* TODO: Please replace embedded image files to your application image files. */
images {
image: "ENVENTOR_EMBEDDED_IMAGE.png" COMP;
}
parts {
image { "logo";
desc { "default";
rel1.relative: 0.0 0.0;
rel2.relative: 0.5 0.5;
/* TODO: Please replace embedded image files to your application image files. */
image.normal: "ENVENTOR_EMBEDDED_IMAGE.png";
aspect: 1 1;
aspect_preference: BOTH;
}
}
rect { "rect";
desc { "default";
rel1.relative: 0.5 0.0;
rel2.relative: 1.0 0.5;
color: 0 136 170 255;
}
desc { "clicked";
rel1.relative: 0.65 0.15;
rel2.relative: 0.85 0.35;
color: 170 136 0 255;
}
}
text { "text";
scale;
effect: SOFT_OUTLINE;
desc { "default";
rel1.relative: 0.0 0.5;
rel2.relative: 0.5 1.0;
color: 255 255 255 255;
color2: 0 136 170 100;
text {
size: 25;
font: "Sans";
text: "enventor";
align: 0.5 0.5;
}
}
}
swallow { "content";
desc { "default";
rel1.relative: 0.5 0.5;
rel2.relative: 1.0 1.0;
}
}
}
/*
programs {
program { "mouse_down";
signal: "mouse,down,1";
source: "rect";
action: STATE_SET "clicked";
target: "rect";
}
program { "mouse_up";
signal: "mouse,up,1";
source: "rect";
action: STATE_SET "default";
target: "rect";
}
}
*/
}
}

View File

@ -0,0 +1,60 @@
collections {
base_scale: 1.0;
group { "main";
/* TODO: Please replace embedded image files to your application image files. */
images {
image: "ENVENTOR_EMBEDDED_BG1.png" COMP;
image: "ENVENTOR_EMBEDDED_BG2.png" COMP;
image: "ENVENTOR_EMBEDDED_BG3.png" COMP;
}
parts {
image { "night";
desc { "default";
/* TODO: Please replace embedded image files to your application image files. */
image.normal: "ENVENTOR_EMBEDDED_BG1.png";
}
}
image { "sky";
desc { "default";
/* TODO: Please replace embedded image files to your application image files. */
image.normal: "ENVENTOR_EMBEDDED_BG2.png";
}
desc { "sunset";
inherit: "default";
color: 255 125 125 255;
}
desc { "night";
inherit: "default";
color: 0 0 0 0;
}
}
image { "mountain";
desc { "default";
/* TODO: Please replace embedded image files to your application image files. */
image.normal: "ENVENTOR_EMBEDDED_BG3.png";
}
}
}
programs {
program { "sunset";
signal: "load";
action: STATE_SET "sunset";
transition: LINEAR 5.0;
target: "sky";
after: "night";
}
program { "night";
action: STATE_SET "night";
transition: LINEAR 5.0;
target: "sky";
after: "day";
}
program { "day";
action: STATE_SET "default";
transition: LINEAR 5.0;
target: "sky";
after: "sunset";
}
}
}
}

29
data/templates/Clip.edc Normal file
View File

@ -0,0 +1,29 @@
collections {
base_scale: 1.0;
group { "main";
/* TODO: Please replace embedded image files to your application image files. */
images {
image: "ENVENTOR_EMBEDDED_IMAGE.png" COMP;
}
parts {
rect { "clipper";
desc { "default";
rel1.relative: 0.0 0.0;
rel2.relative: 0.5 1.0;
color: 0 136 170 255;
}
}
image { "logo";
clip_to: "clipper";
desc { "default";
rel1.relative: 0.0 0.0;
rel2.relative: 1.0 1.0;
/* TODO: Please replace embedded image files to your application image files. */
image.normal: "ENVENTOR_EMBEDDED_IMAGE.png";
aspect: 1 1;
aspect_preference: BOTH;
}
}
}
}
}

View File

@ -0,0 +1,449 @@
collections {
base_scale: 1.0;
group { "main";
/* TODO: Please replace embedded image files to your application image files. */
images {
image: "ENVENTOR_EMBEDDED_BUTTON_BG.png" COMP;
image: "ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png" COMP;
image: "ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png" COMP;
}
#define ICON 1
#define LABEL 2
#define MASK 3
#define DISABLE 4
#define PRESSED 8
#define BACKGROUND 16
script {
public btmode;
public eval_mode(m) {
new m1 = m & MASK;
new d = m & DISABLE;
new p = m & PRESSED;
new bg = m & BACKGROUND;
if (bg) {
set_state(PART:"base", "hidden", 0.0);
set_state(PART:"elm.swallow.background", "visible", 0.0);
} else {
set_state(PART:"elm.swallow.background", "default", 0.0);
if (!d) {
if (!p)
{
set_state(PART:"base", "default", 0.0);
set_state(PART:"base", "default", 0.0);
}
else {
set_state(PART:"base", "pressed", 0.0);
}
} else {
set_state(PART:"base", "disabled", 0.0);
}
}
if (m1 == (ICON | LABEL)) {
if (!d) {
set_state(PART:"elm.swallow.content", "visible", 0.0);
set_state(PART:"sizer.content", "visible", 0.0);
set_state(PART:"event", "default", 0.0);
if (!p) {
set_state(PART:"elm.text", "visible", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
} else {
set_state(PART:"elm.text", "pressed_visible", 0.0);
set_state(PART:"icon_clip", "pressed", 0.0);
}
} else {
set_state(PART:"elm.swallow.content", "visible", 0.0);
set_state(PART:"sizer.content", "visible", 0.0);
set_state(PART:"elm.text", "disabled_visible", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
} else if (m1 == (ICON)) {
if (!d) {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
set_state(PART:"sizer.content", "icononly", 0.0);
set_state(PART:"event", "default", 0.0);
set_state(PART:"elm.text", "default", 0.0);
if (!p)
set_state(PART:"icon_clip", "default", 0.0);
else
set_state(PART:"icon_clip", "pressed", 0.0);
} else {
set_state(PART:"elm.swallow.content", "icononly", 0.0);
set_state(PART:"sizer.content", "icononly", 0.0);
set_state(PART:"elm.text", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
} else if (m1 == (LABEL)) {
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
if (!p)
set_state(PART:"elm.text", "textonly", 0.0);
else
set_state(PART:"elm.text", "pressed_textonly", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
set_state(PART:"elm.text", "disabled_textonly", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
} else {
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
}
}
}
parts {
image { "base";
nomouse;
desc { "default";
/* TODO: Please replace embedded image files to your application image files. */
image.normal: "ENVENTOR_EMBEDDED_BUTTON_BG.png";
image.border: 3 3 3 3;
image.middle: SOLID;
rel1.offset: -1 0;
rel2.offset: 0 1;
fill.smooth: 0;
color_class: "button_bg";
}
desc { "hovered";
inherit: "default";
/* TODO: Please replace embedded image files to your application image files. */
image.normal: "ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png";
}
desc { "pressed";
inherit: "default";
/* TODO: Please replace embedded image files to your application image files. */
image.normal: "ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png";
color_class: "button_bg_pressed";
}
desc { "disabled";
inherit: "default";
color_class: "button_bg_disabled";
}
desc { "hidden";
inherit: "default";
visible: 0;
}
}
swallow { "elm.swallow.background";
nomouse;
desc { "default";
rel1.to: "base";
rel2.to: "base";
visible: 0;
}
desc { "visible";
inherit: "default";
visible: 1;
}
}
rect { "icon_clip";
desc { "default";
color_class: "button_icon";
}
desc { "pressed";
inherit: "default";
color_class: "button_icon_pressed";
}
desc { "disabled";
inherit: "default";
color_class: "button_icon_disabled";
}
}
swallow { "elm.swallow.content";
nomouse;
clip_to: "icon_clip";
desc { "default";
fixed: 1 0;
align: 0.0 0.5;
rel1.offset: 6 5;
rel1.to: "base";
rel2.relative: 0.0 1.0;
rel2.offset: 6 -8;
rel2.to: "base";
visible: 0;
}
desc { "visible";
inherit: "default";
fixed: 1 0;
aspect: 1.0 1.0;
visible: 1;
}
desc { "icononly";
inherit: "default";
fixed: 0 0;
align: 0.5 0.5;
rel2.relative: 1.0 1.0;
rel2.offset: -7 -8;
visible: 1;
}
}
text { "sizer.content";
nomouse;
scale;
desc { "default";
visible: 0;
text {
font: FN;
size: 10;
min: 0 0;
text_class: "button_text";
}
}
desc { "visible";
inherit: "default";
rel1.to: "elm.swallow.content";
rel2.to: "elm.swallow.content";
text {
min: 1 1;
ellipsis: -1;
text: "M";
}
}
desc { "icononly";
inherit: "default";
rel1.to: "elm.swallow.content";
rel2.to: "elm.swallow.content";
text {
min: 1 1;
ellipsis: -1;
text: "M";
}
}
}
text { "elm.text";
nomouse;
effect: SHADOW BOTTOM;
scale;
desc { "default";
rel1.offset: 0 5;
rel1.relative: 1.0 0.0;
rel1.to_x: "elm.swallow.content";
rel1.to_y: "base";
rel2.offset: -8 -8;
rel2.to: "base";
color_class: "button_text";
color3: 255 255 255 255;
text {
font: FN;
size: 10;
align: 0.5 0.5;
min: 0 0;
text_class: "button";
}
visible: 0;
fixed: 1 1;
}
desc { "visible";
inherit: "default";
rel1.offset: 2 5;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
fixed: 0 0;
}
desc { "pressed_visible";
inherit: "default";
rel1.offset: 2 5;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
fixed: 0 0;
color_class: "button_text_pressed";
}
desc { "textonly";
inherit: "default";
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
fixed: 0 0;
}
desc { "pressed_textonly";
inherit: "default";
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
fixed: 0 0;
color_class: "button_text_pressed";
}
desc { "disabled_visible";
inherit: "default";
rel1.offset: 2 5;
color_class: "button_text_disabled";
color3: 255 255 255 255;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
fixed: 0 0;
}
desc { "disabled_textonly";
inherit: "default";
color_class: "button_text_disabled";
color3: 255 255 255 255;
text.min: 1 1;
text.ellipsis: -1;
visible: 1;
fixed: 0 0;
}
}
rect { "event";
desc { "default";
color: 0 0 0 0;
}
desc { "disabled";
inherit: "default";
visible: 0;
}
}
}
programs {
program {
signal: "mouse,down,1";
source: "event";
action: SIGNAL_EMIT "elm,action,press" "elm";
after: "button_click_anim";
}
program { "button_click_anim";
script {
new m = get_int(btmode);
m |= PRESSED; set_int(btmode, m);
eval_mode(m);
}
}
program { "button_unclick";
signal: "mouse,up,1";
source: "event";
action: SIGNAL_EMIT "elm,action,unpress" "elm";
after: "button_unclick_anim";
}
program { "button_unclick_anim";
script {
new m = get_int(btmode);
m &= ~PRESSED; set_int(btmode, m);
eval_mode(m);
}
}
program { "button_hover";
signal: "mouse,in";
source: "event";
action: STATE_SET "hovered";
target: "base";
}
program { "button_unhover";
signal: "mouse,out";
source: "event";
action: STATE_SET "default";
target: "base";
}
program { "buttonactivate";
signal: "elm,anim,activate";
source: "elm";
action: STATE_SET "pressed" 0.0;
target: "base";
after: "button_unpressed_anim";
}
program { "button_unpressed_anim";
action: STATE_SET "default" 0.0;
in: 0.5 0.0;
target: "base";
}
program {
signal: "mouse,clicked,1";
source: "event";
action: SIGNAL_EMIT "elm,action,click" "elm";
}
program { "button_text_visible";
signal: "elm,state,text,visible";
source: "elm";
script {
new m = get_int(btmode);
m |= LABEL; set_int(btmode, m);
eval_mode(m);
}
}
program { "button_text_hidden";
signal: "elm,state,text,hidden";
source: "elm";
script {
new m = get_int(btmode);
m &= ~LABEL; set_int(btmode, m);
eval_mode(m);
}
}
program { "button_icon_visible";
signal: "elm,state,icon,visible";
source: "elm";
script {
new m = get_int(btmode);
m |= ICON; set_int(btmode, m);
eval_mode(m);
}
}
program { "button_icon_hidden";
signal: "elm,state,icon,hidden";
source: "elm";
script {
new m = get_int(btmode);
m &= ~ICON; set_int(btmode, m);
eval_mode(m);
}
}
program { "button_background_visible";
signal: "elm,state,background,visible";
source: "elm";
script {
new m = get_int(btmode);
m |= BACKGROUND; set_int(btmode, m);
eval_mode(m);
}
}
program { "button_background_hidden";
signal: "elm,state,background,hidden";
source: "elm";
script {
new m = get_int(btmode);
m &= ~BACKGROUND; set_int(btmode, m);
eval_mode(m);
}
}
program { "button_state_disabled";
signal: "elm,state,disabled";
source: "elm";
script {
new m = get_int(btmode);
m |= DISABLE; set_int(btmode, m);
eval_mode(m);
}
}
program { "button_state_enabled";
signal: "elm,state,enabled";
source: "elm";
script {
new m = get_int(btmode);
m &= ~DISABLE; set_int(btmode, m);
eval_mode(m);
}
}
}
#undef ICON
#undef LABEL
#undef MASK
#undef DISABLE
#undef PRESSED
#undef BACKGROUND
}
}

View File

@ -1,5 +1,6 @@
collections {
group { name: "main";
base_scale: 1.0;
group { "main";
parts {
}
}

Some files were not shown because too many files have changed in this diff Show More