po: add Georgian translation

Test Plan: Compilation, comparison with autotools, and run of enventor (on Windows)

Reviewers: Hermet, raster

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

.arcconfig

@@ -1,4 +0,0 @@
-{
-  "project_id" : "Enventor",
-  "conduit_uri" : "https://phab.enlightenment.org/"
-}

.gitignore

@@ -4,6 +4,7 @@
 *.edj
 *.swp
 *.eet
+*.exe
 *~
 .*
 *.eo.*

AUTHORS

@@ -1,4 +1,4 @@
-Hermet 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>
@@ -28,3 +28,7 @@ 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>

Makefile_Eolian_Cxx_Helper.am

@@ -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)

Makefile_Eolian_Helper.am

@@ -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) --legacy $(EOLIAN_FLAGS) --gc -o $@ $<
-
-%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
-	$(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $<
-
-%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
-	$(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<
-
-CLEANFILES += $(BUILT_SOURCES)

NEWS

@@ -1,7 +1,57 @@
 ==============
-Enventor 0.9.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:
 -----------------------------
 
@@ -46,7 +96,7 @@ Fixes:
    * 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 dummpy part when removing all source code.
+   * 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.
@@ -58,7 +108,7 @@ Fixes:
    * 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 complation issue when new empty file is opened.
+   * Fix a compilation issue when new empty file is opened.
    * Fix a color selector to scalable.
 
 Changes since Enventor 0.7.0:

README

@@ -1,22 +1,21 @@
-[Enventor v0.9.0]
+[Enventor v1.0.0]
 
-This is an EDC editor with some convenient functions. Enventor supports text edit and preview function for EDC source code. You can edit EDC source code to create complex application layout using Enventor. This was started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature. However, considering its young age, it does a lot.
+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.17.0)
-  elementary (>= 1.17.0)
+  efl (>= 1.18.0)
 
-Please note that some features may not quite function correctly or completely prior to EFL 1.17. Newer would be better.
+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.
 
-http://www.enlightenment.org
-https://phab.enlightenment.org/w/projects/enventor/
+https://www.enlightenment.org/about-enventor
+https://phab.enlightenment.org/w/projects/enventor
 http://www.openhub.net/p/enventor
 
-
 [Compiling]
 
 Once you have met the requirements, compiling and installing is simple:
@@ -24,18 +23,17 @@ 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) 
+  $ sudo ldconfig (it may need on Linux System)
 
 
 [Short Cut Keys]
 
 Esc - Open/Close Menu
-F1 - About
-F2 - New
-F3 - Save
-F4 - Load
-F5 - Quick Jump
-F6 - Keyword Reference
+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
@@ -48,7 +46,7 @@ Ctrl+U - Toggle Dummy Parts
 Ctrl+H - Toggle Part Highlighting
 Ctrl+M - Toggle Mirror Mode
 Ctrl+W - Toggle Wireframes
-Ctrl+T - Insert Defaut Template Code
+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
 
@@ -58,7 +56,7 @@ Alt+Up - Toggle Full Console View
 Alt+Down - Toggle Full Editors View
 
 Ctrl+A - Select Text All
-Ctrl+Double Click - Select a word
+Ctrl+Double Click - Select a word without openning candidate popup
 Ctrl+Z - Undo Text
 Ctrl+R - Redo Text
 Ctrl+C - Copy Selected Text
@@ -106,6 +104,7 @@ Jaehyun Cho
 Mykyta Biliavskyi
 Kateryna Fesyna
 Tae-Hyup Kim
+Bowon Ryu
 Yunho Jeong
 Mincheol Seo
 Raoul Hecky

configure.ac

@@ -1,8 +1,8 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-m4_define([v_maj], [0])
-m4_define([v_min], [9])
-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,7 +17,7 @@ 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])
@@ -30,6 +30,8 @@ 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
@@ -69,14 +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.17.0"
+efl_version="1.18.0"
 requirement_enventor=" \
 eo >= ${efl_version} \
+efl >= ${efl_version} \
 eina >= ${efl_version} \
 eet >= ${efl_version} \
 elementary >= ${efl_version} \
@@ -93,21 +96,9 @@ PKG_CHECK_MODULES([ENVENTOR], [${requirement_enventor}])
 
 ### Checks for linker characteristics
 
-# 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
@@ -115,7 +106,6 @@ Makefile
 src/Makefile
 src/include/Makefile
 src/lib/Makefile
-src/lib/Enventor.h
 src/bin/Makefile
 data/Makefile
 data/desktop/Makefile

data/autocomp/autocomp.src

@@ -2,6 +2,20 @@ group "lexem" struct {
    group "nodes" list {
       group "lexem" struct {
          group "nodes" list {
+            group "lexem" struct {
+               group "nodes" list {
+               }
+               group "txt" var_array {
+                   count 1;
+                   value "string" string: "%s: ;"
+               }
+               value "cursor_offset" int: 1;
+               value "line_back" int: 0;
+               group "name" var_array {
+                  count 1;
+                  value "string" string: "base_scale";
+               }
+            }
             group "lexem" struct {
                group "nodes" list {
                   group "lexem" struct {
@@ -1581,12 +1595,13 @@ group "lexem" struct {
                             value "cursor_offset" int: 4;
                             value "line_back" int: 1;
                             group "name" var_array {
-                               count 13;
+                               count 14;
                                value "string" string: "image";
                                value "string" string: "group";
                                value "string" string: "swallow";
                                value "string" string: "external";
                                value "string" string: "rect";
+                               value "string" string: "snapshot";
                                value "string" string: "spacer";
                                value "string" string: "proxy";
                                value "string" string: "box";

data/autocomp/meson.build

@@ -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')
+)

data/color/edc.src

@@ -40,6 +40,9 @@ group "syntax_color_group" struct {
             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";
@@ -65,6 +68,7 @@ group "syntax_color_group" struct {
             value "key" string: "script";
             value "key" string: "set.";
             value "key" string: "set ";
+            value "key" string: "snapshot";
             value "key" string: "sounds";
             value "key" string: "spacer";
             value "key" string: "styles";
@@ -96,6 +100,7 @@ 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:";
@@ -105,9 +110,11 @@ group "syntax_color_group" struct {
             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";

data/color/meson.build

@@ -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')
+)

data/color/syntax_template.dat

@@ -1 +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>
+<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>

data/color/syntax_template_old.dat

@@ -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>

data/desktop/enventor.desktop

@@ -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

data/desktop/meson.build

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

data/help/HISTORY

@@ -41,7 +41,7 @@
    * 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 dummpy part when removing all source code.<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>
@@ -53,7 +53,7 @@
    * 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 complation issue when new empty file is opened.<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.

data/help/INTRO

@@ -1,10 +1,12 @@
-<b>Enventor v0.9.0</b></br>
+<b>Enventor v1.0.0</b></br>
 </br>
-This is an EDC editor with some convenient functions. Enventor supports text edit and preview function for EDC source code. You can edit EDC source code to create complex application layout using Enventor. This was started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature. However, considering its young age, it does a lot.</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>
-http://www.enlightenment.org</br>
-https://phab.enlightenment.org/w/projects/enventor/</br>
+https://www.enlightenment.org/about-enventor</br>
+https://phab.enlightenment.org/w/projects/enventor</br>
 http://www.openhub.net/p/enventor
 

data/help/SHORTCUT

@@ -1,11 +1,10 @@
 <b>Functions:</b></br>
   Esc - Open/Close Menu</br>
-  F1 - About</br>
-  F2 - New</br>
-  F3 - Save</br>
-  F4 - Load</br>
-  F5 - Quick Jump</br>
-  F6 - Keyword Reference</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>
@@ -18,7 +17,7 @@
   Ctrl+H - Toggle Part Highlighting</br>
   Ctrl+M - Toggle Mirror Mode</br>
   Ctrl+W - Toggle Wireframes</br>
-  Ctrl+T - Insert Defaut Template Code</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>
@@ -30,7 +29,7 @@
 </br>
 <b>Text Editor:</b></br>
   Ctrl+A - Select Text All</br>
-  Ctrl+Double Click - Select a word</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>

data/help/meson.build

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

data/icon/meson.build

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

data/images/ENVENTOR_EMBEDDED_BAT1.svg

@@ -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>

data/images/ENVENTOR_EMBEDDED_BAT2.svg

@@ -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>

data/images/ENVENTOR_EMBEDDED_SVG.svg

@@ -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>

data/images/Makefile.am

@@ -25,6 +25,9 @@ files_DATA = ENVENTOR_EMBEDDED_IMAGE.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 \
@@ -34,6 +37,20 @@ files_DATA = ENVENTOR_EMBEDDED_IMAGE.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)

data/images/meson.build

@@ -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')
+)

data/reference/meson.build

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

data/reference/reference.src

@@ -1,4 +1,6 @@
 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.";
@@ -72,7 +74,7 @@ collections { "The <hilight>collections</hilight> represents a theme.</br>The <h
             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 { "Sets the alignment hints for this object.";
+                     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.";
                      }
@@ -106,6 +108,188 @@ collections { "The <hilight>collections</hilight> represents a theme.</br>The <h
             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.";
@@ -141,12 +325,12 @@ collections { "The <hilight>collections</hilight> represents a theme.</br>The <h
             }
             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.";
+            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 { "Sets the alignment hints for this object.";
+                     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.";
                      }
@@ -179,12 +363,18 @@ collections { "The <hilight>collections</hilight> represents a theme.</br>The <h
                   }
                }
             }
+            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";
          }
@@ -228,6 +418,24 @@ collections { "The <hilight>collections</hilight> represents a theme.</br>The <h
 
       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";
+            }
          }
       }
 
@@ -344,4 +552,4 @@ styles { "The <hilight>styles</hilight> block contains a list of one or more <hi
       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>.";
       }
    }
-}
+}

data/sounds/meson.build

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

data/templates/Basic.edc

@@ -29,7 +29,7 @@ collections {
             }
          }
          text { "text";
-            scale: 1;
+            scale;
             effect: SOFT_OUTLINE;
             desc { "default";
                rel1.relative: 0.0 0.5;
@@ -68,4 +68,4 @@ collections {
       }
       */
    }
-}
+}

data/templates/BgAnimation.edc

@@ -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";
+         }
+      }
+   }
+}

data/templates/CustomButton.edc

@@ -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
+   }
+}

data/templates/GameStage.edc

@@ -0,0 +1,257 @@
+ /* TODO: Please replace embedded image files to your application image files. */
+#define LADDER_POS(x1, y1, y2) \
+ image.normal: "ENVENTOR_EMBEDDED_LADDER.png"; \
+ min: 32 32; \
+ rel1.relative: x1 y1; \
+ rel2.relative: x1 y2; \
+ align: 0.5 0.5; \
+ fill.size.relative: 0 0; \
+ fill.size.offset: 32 32
+
+ /* TODO: Please replace embedded image files to your application image files. */
+#define TACK_POS(x1, y1) \
+ image.normal: "ENVENTOR_EMBEDDED_TACK.png"; \
+ min: 25 25; \
+ rel1.relative: x1 y1; \
+ rel2.relative: x1 y1; \
+ align: 0.5 1; \
+ fill.size.relative: 0 0; \
+ fill.size.offset: 25 25
+
+ /* TODO: Please replace embedded image files to your application image files. */
+#define PLATFORM_POS(x1, y1, x2) \
+ image.normal: "ENVENTOR_EMBEDDED_PLATFORM.png"; \
+ min: 33 20; \
+ rel1.relative: x1 y1; \
+ rel2.relative: x2 y1; \
+ rel2.offset: 0 -1; \
+ align: 0.5 0; \
+ fill.size.relative: 0 0; \
+ fill.size.offset: 33 20;
+
+#define FRUIT_POS(x1, y1) \
+ min: 35 35; \
+ rel1.relative: x1 y1; \
+ rel2.relative: x1 y1; \
+ align: 0.5 1; \
+ fill.size.relative: 0 0; \
+ fill.size.offset: 35 35; \
+} \
+desc { state:"hide" 0.0; \
+  inherit: "default" 0.0; \
+  visible: 0 \
+
+#define FRUIT_REMOVE(num, sig) \
+ program { num##_remove;\
+    signal: sig; \
+    source: ""; \
+    action: STATE_SET "hide" 0.0; \
+    target: num; \
+  }
+
+collections {
+   group { "main";
+      /* TODO: Please replace embedded image files to your application image files. */
+      images {
+         image: "ENVENTOR_EMBEDDED_FIELD.png" COMP;
+         image: "ENVENTOR_EMBEDDED_PLATFORM.png" COMP;
+         image: "ENVENTOR_EMBEDDED_LADDER.png" COMP;
+         image: "ENVENTOR_EMBEDDED_TACK.png" COMP;
+         image: "ENVENTOR_EMBEDDED_CHERRY.png" COMP;
+         image: "ENVENTOR_EMBEDDED_MELON.png" COMP;
+         image: "ENVENTOR_EMBEDDED_WATERMELON.png" COMP;
+      }
+      parts {
+         image { "foothold1";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_FIELD.png";
+               min: 33 80;
+               rel1.relative: 0 0.88;
+               rel2.relative: 1 1;
+               align: 0 0;
+               fill.size.relative: 0 0;
+               fill.size.offset: 33 110;
+            }
+         }
+         image { "foothold2";
+            desc { "default";
+               PLATFORM_POS(0, 0.7, 0.3);
+            }
+         }
+         image { "foothold3";
+            desc { "default";
+               PLATFORM_POS(0.35, 0.7, 1.0);
+            }
+         }
+         image { "foothold4";
+            desc { "default";
+               PLATFORM_POS(0.7, 0.5, 1.0);
+            }
+         }
+         image { "foothold5";
+            desc { "default";
+               PLATFORM_POS(0.3, 0.5, 0.65);
+            }
+         }
+         image { "foothold6";
+            desc { "default";
+               PLATFORM_POS(0.0, 0.45, 0.2);
+            }
+         }
+         image { "foothold7";
+            desc { "default";
+               PLATFORM_POS(0.1, 0.3, 0.7);
+            }
+         }
+         image { "foothold8";
+            desc { "default";
+               PLATFORM_POS(0.9, 0.3, 1.0);
+            }
+         }
+         image { "foothold9";
+            desc { "default";
+               PLATFORM_POS(0.7, 0.3, 0.75);
+            }
+            desc { "move";
+               PLATFORM_POS(0.8, 0.3, 0.85);
+            }
+         }
+         image { "ladder1";
+            desc { "default";
+               LADDER_POS(0.2, 0.7, 0.89);
+            }
+         }
+         image { "ladder2";
+            desc { "default";
+               LADDER_POS(0.6, 0.7, 0.89);
+            }
+         }
+         image { "ladder3";
+            desc { "default";
+               LADDER_POS(0.8, 0.5, 0.7);
+            }
+         }
+         image { "ladder4";
+            desc { "default";
+               LADDER_POS(0.5, 0.3, 0.5);
+            }
+         }
+         image { "ladder5";
+            desc { "default";
+               LADDER_POS(0.1, 0.45, 0.7);
+            }
+         }
+         image { "tack1";
+            desc { "default";
+               TACK_POS(0.6, 0.505);
+            }
+         }
+         image { "tack2";
+            desc { "default";
+               TACK_POS(0.4, 0.705);
+            }
+         }
+         image { "tack3";
+            desc { "default";
+               TACK_POS(0.7, 0.89);
+            }
+         }
+         image { "tack4";
+            desc { "default";
+               TACK_POS(0.4, 0.305);
+            }
+         }
+         image { "tack5";
+            desc { "default";
+               TACK_POS(0.3, 0.305);
+            }
+         }
+         image { "tack6";
+            desc { "default";
+               TACK_POS(0.22, 0.305);
+            }
+         }
+         image { "fruit1";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_CHERRY.png";
+               FRUIT_POS(0.92, 0.3);
+            }
+         }
+         image { "fruit2";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_MELON.png";
+               FRUIT_POS(0.4, 0.89);
+            }
+         }
+         image { "fruit3";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_WATERMELON.png";
+               FRUIT_POS(0.9, 0.708);
+            }
+         }
+         image { "fruit4";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_MELON.png";
+               FRUIT_POS(0.05, 0.46);
+            }
+         }
+         image { "fruit5";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_CHERRY.png";
+               FRUIT_POS(0.65, 0.7);
+            }
+         }
+         image { "fruit6";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_MELON.png";
+               FRUIT_POS(0.85, 0.51);
+            }
+         }
+         image { "fruit7";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_WATERMELON.png";
+               FRUIT_POS(0.35, 0.51);
+            }
+         }
+         image { "fruit8";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_CHERRY.png";
+               FRUIT_POS(0.15, 0.3);
+            }
+         }
+      }
+      programs {
+         program { "foothold_move1";
+            signal: "load";
+            action: STATE_SET "move";
+            target: "foothold9";
+            transition: LINEAR 5.0;
+            after: "foothold_move2";
+         }
+         program { "foothold_move2";
+            signal: "load";
+            action: STATE_SET "default";
+            target: "foothold9";
+            transition: LINEAR 5.0;
+            after: "foothold_move1";
+         }
+         FRUIT_REMOVE("fruit1", "fruit1,remove");
+         FRUIT_REMOVE("fruit2", "fruit2,remove");
+         FRUIT_REMOVE("fruit3", "fruit3,remove");
+         FRUIT_REMOVE("fruit4", "fruit4,remove");
+         FRUIT_REMOVE("fruit5", "fruit5,remove");
+         FRUIT_REMOVE("fruit6", "fruit6,remove");
+         FRUIT_REMOVE("fruit7", "fruit7,remove");
+         FRUIT_REMOVE("fruit8", "fruit8,remove");
+      }
+   }
+}

data/templates/Group.edc

@@ -21,7 +21,7 @@ collections {
    group { "my_group";
       parts {
          text { "text";
-            scale: 1;
+            scale;
             effect: SOFT_OUTLINE;
             desc { "default";
                color: 255 255 255 255;
@@ -35,4 +35,4 @@ collections {
          }
       }
    }
-}
+}

data/templates/Interpolation.edc

@@ -0,0 +1,84 @@
+#define PART(NAME, POS_Y1, POS_Y2, COLOR) \
+   rect { NAME; \
+   desc { "default"; \
+      rel1.relative: 0.0 POS_Y1; \
+      rel2.relative: 0.2 POS_Y2; \
+      color: COLOR 255; \
+   } \
+   desc { "changed"; \
+      inherit: "default"; \
+      rel1.relative: 0.8 POS_Y1; \
+      rel2.relative: 1.0 POS_Y2; \
+   } \
+}
+
+#define PROGRAM1(NAME1, NAME2, TARGET, INTERPOL) \
+   program { NAME1; \
+      signal: "load"; \
+      action: STATE_SET "changed"; \
+      target: TARGET; \
+      transition: INTERPOL 1.0 CURRENT; \
+      after: NAME2; \
+   } \
+   program { NAME2; \
+      action: STATE_SET "default"; \
+      target: TARGET; \
+      transition: INTERPOL 1.0 CURRENT; \
+      after: NAME1; \
+   }
+
+#define PROGRAM2(NAME1, NAME2, TARGET, INTERPOL) \
+   program { NAME1; \
+      signal: "load"; \
+      action: STATE_SET "changed"; \
+      target: TARGET; \
+      transition: INTERPOL 1.0 1.0 1.0 CURRENT; \
+      after: NAME2; \
+   } \
+   program { NAME2; \
+      action: STATE_SET "default"; \
+      target: TARGET; \
+      transition: INTERPOL 1.0 1.0 1.0 CURRENT; \
+      after: NAME1; \
+   }
+
+#define PROGRAM3(NAME1, NAME2, TARGET, INTERPOL) \
+   program { NAME1; \
+      signal: "load"; \
+      action: STATE_SET "changed"; \
+      target: TARGET; \
+      transition: INTERPOL 1.0 0.14 0.84 0.79 0.27 CURRENT; \
+      after: NAME2; \
+   } \
+   program { NAME2; \
+      action: STATE_SET "default"; \
+      target: TARGET; \
+      transition: INTERPOL 1.0 0.14 0.84 0.79 0.27 CURRENT; \
+      after: NAME1; \
+   }
+
+collections {
+   base_scale: 1.0;
+   group { "main";
+      parts {
+         PART("rect1", 0.0, 0.125, 255 255 0);
+         PART("rect2", 0.125, 0.25, 0 255 0);
+         PART("rect3", 0.25, 0.375, 0 0 255);
+         PART("rect4", 0.375, 0.5, 0 255 255);
+         PART("rect5", 0.5, 0.625, 255 255 255);
+         PART("rect6", 0.625, 0.75, 0 0 0);
+         PART("rect7", 0.75, 0.875, 255 0 0);
+         PART("rect8", 0.875, 1.0, 255 0 255);
+      }
+      programs {
+         PROGRAM1("anim1", "anim2", "rect1", LINEAR);
+         PROGRAM1("anim3", "anim4", "rect2", ACCELERATE);
+         PROGRAM1("anim5", "anim6", "rect3", DECELERATE);
+         PROGRAM1("anim7", "anim8", "rect4", SINUSOIDAL);
+         PROGRAM2("anim9", "anim10", "rect5", DIVISOR_INTERP);
+         PROGRAM2("anim11", "anim12", "rect6", BOUNCE);
+         PROGRAM2("anim13", "anim14", "rect7", SPRING);
+         PROGRAM3("anim15", "anim16", "rect8", CUBIC_BEZIER);
+      }
+   }
+}

data/templates/Listitem.edc

@@ -14,7 +14,7 @@ collections {
       }
       parts {
          rect { "bg";
-            scale: 1;
+            scale;
             desc { "default";
                color: 233 242 242 255;
                align: 0.5 0.5;
@@ -26,7 +26,7 @@ collections {
             }
          }
          rect { "point_rect";
-            scale: 1;
+            scale;
             desc { "default";
                color: 0 176 137 255;
                align: 0.0 0.0;
@@ -39,7 +39,7 @@ collections {
             }
          }
          spacer { "padding_left";
-            scale: 1;
+            scale;
             desc { "default";
                align: 0.0 0.5;
                rel1.to: "point_rect";
@@ -50,7 +50,7 @@ collections {
             }
          }
          image { "icon_status";
-            scale: 1;
+            scale;
             desc { "default";
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_ICON_ARROW.png";
@@ -65,7 +65,7 @@ collections {
             }
          }
          swallow { "icon_user";
-            scale: 1;
+            scale;
             desc { "default";
                align: 0.0 0.5;
                rel1.to: "icon_status";
@@ -76,13 +76,13 @@ collections {
             }
          }
          text { "user_name";
-            scale: 1;
+            scale;
             desc { "default";
                color: 130 130 130 255;
                text {
                   size: 15;
                   font: "Sans";
-                  text: "Bowon Ryu";
+                  text: "Lisa";
                   align: 0.0 0.5;
                   min: 0 0;
                }
@@ -95,7 +95,7 @@ collections {
             }
          }
          text { "message";
-            scale: 1;
+            scale;
             desc { "default";
                color: 145 145 145 255;
                text {
@@ -116,7 +116,7 @@ collections {
             }
          }
          spacer { "padding_right";
-            scale: 1;
+            scale;
             desc { "default";
                align: 1.0 0.5;
                rel1.to: "bg";
@@ -127,7 +127,7 @@ collections {
             }
          }
          text { "date";
-            scale: 1;
+            scale;
             desc { "default";
                color: 135 135 135 255;
                text {
@@ -148,7 +148,7 @@ collections {
             }
          }
          image { "icon_clip";
-            scale: 1;
+            scale;
             desc { "default";
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_ICON_CLIP.png";
@@ -167,7 +167,7 @@ collections {
             }
          }
          image { "icon_badge";
-            scale: 1;
+            scale;
             desc { "default";
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_ICON_BADGE.png";
@@ -185,7 +185,7 @@ collections {
             }
          }
          image { "icon_lock";
-            scale: 1;
+            scale;
             desc { "default";
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_ICON_LOCK.png";
@@ -204,7 +204,7 @@ collections {
             }
          }
          swallow { "icon_check";
-            scale: 1;
+            scale;
             desc { "default";
                align: 1.0 0.5;
                rel1.to: "padding_right";
@@ -217,7 +217,7 @@ collections {
             }
          }
          spacer { "padding_icon";
-            scale: 1;
+            scale;
             desc { "default";
                align: 1.0 0.5;
                rel1.to: "icon_check";

data/templates/Makefile.am

@@ -1,11 +1,13 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 EDJE_CC = @edje_cc@
-EDJE_FLAGS = -id $(top_srcdir)/data/images -sd $(top_srcdir)/data/sounds
+EDJE_FLAGS = -id $(top_srcdir)/data/images -sd $(top_srcdir)/data/sounds -beta
 
 filesdir = $(datadir)/$(PACKAGE)/templates
 files_DATA = Basic.edc \
              Basic.edj \
+             CustomButton.edc \
+             CustomButton.edj \
              Clip.edc \
              Clip.edj \
              Empty.edc \
@@ -20,6 +22,8 @@ files_DATA = Basic.edc \
              Map.edj \
              MobileLayout.edc \
              MobileLayout.edj \
+             MouseEvent.edc \
+             MouseEvent.edj \
              Proxy.edc \
              Proxy.edj \
              Rect.edc \
@@ -41,7 +45,19 @@ files_DATA = Basic.edc \
              Watchface.edc \
              Watchface.edj \
              Watchface2.edc \
-             Watchface2.edj
+             Watchface2.edj \
+             Morphing.edc \
+             Morphing.edj \
+             Vector.edc \
+             Vector.edj \
+             Interpolation.edc \
+             Interpolation.edj \
+             BgAnimation.edc \
+             BgAnimation.edj \
+             GameStage.edc \
+             GameStage.edj \
+             Mask.edc \
+             Mask.edj
 
 EXTRA_DIST = $(files_DATA)
 
@@ -51,6 +67,9 @@ builddir = $(top_builddir)/data/templates
 Basic.edj: Makefile Basic.edc
 	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Basic.edc $(builddir)/Basic.edj
 
+CustomButton.edj: Makefile CustomButton.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/CustomButton.edc $(builddir)/CustomButton.edj
+
 Empty.edj: Makefile Empty.edc
 	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Empty.edc $(builddir)/Empty.edj
 
@@ -58,7 +77,10 @@ Map.edj: Makefile Map.edc
 	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Map.edc $(builddir)/Map.edj
 
 MobileLayout.edj: Makefile MobileLayout.edc
-	        $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/MobileLayout.edc $(builddir)/MobileLayout.edj
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/MobileLayout.edc $(builddir)/MobileLayout.edj
+
+MouseEvent.edj: Makefile MouseEvent.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/MouseEvent.edc $(builddir)/MouseEvent.edj
 
 Textblock.edj: Makefile Textblock.edc
 	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Textblock.edc $(builddir)/Textblock.edj
@@ -105,6 +127,24 @@ Watchface.edj: Makefile Watchface.edc
 Watchface2.edj: Makefile Watchface2.edc
 	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Watchface2.edc $(builddir)/Watchface2.edj
 
+Morphing.edj: Makefile Morphing.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Morphing.edc $(builddir)/Morphing.edj
+
+Vector.edj: Makefile Vector.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Vector.edc $(builddir)/Vector.edj
+
+Interpolation.edj: Makefile Interpolation.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Interpolation.edc $(builddir)/Interpolation.edj
+
+BgAnimation.edj: Makefile BgAnimation.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/BgAnimation.edc $(builddir)/BgAnimation.edj
+
+GameStage.edj: Makefile GameStage.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/GameStage.edc $(builddir)/GameStage.edj
+
+Mask.edj: Makefile Mask.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Mask.edc $(builddir)/Mask.edj
+
 clean-local:
 	rm -f *.edj
 	rm -f $(datadir)/$(PACKAGE)/templates/*edj

data/templates/Map.edc

@@ -41,7 +41,7 @@ collections {
             }
          }
          text { "text";
-            scale: 1;
+            scale;
             effect: SOFT_OUTLINE;
             desc { "default";
                rel1.relative: 0.0 0.5;
@@ -75,4 +75,4 @@ collections {
          }
       }
    }
-}
+}

data/templates/Mask.edc

@@ -0,0 +1,54 @@
+collections {
+   base_scale: 1.0;
+   group { "main";
+      /* TODO: Please replace embedded image files to your application image files. */
+      images {
+         image: "ENVENTOR_EMBEDDED_TRIAB-12.png" COMP;
+         image: "ENVENTOR_EMBEDDED_MASK.png" COMP;
+         image: "ENVENTOR_EMBEDDED_BG2.png" COMP;
+      }
+      parts {
+         image { "bg"
+            desc { "default"
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_BG2.png";
+            };
+         }
+         image { "mask";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_MASK.png";
+            }
+         }
+         image { "image";
+            clip_to: "mask";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_TRIAB-12.png";
+               rel1.relative: -1.0 0;
+               rel2.relative: 0.0 1.0;
+            }
+            desc { "anim";
+               inherit: "default";
+               rel1.relative: 1.0 0;
+               rel2.relative: 2.0 1.0;
+            }            
+         }
+      }
+      programs {
+         program { "anim1";
+            signal: "load";
+            action: STATE_SET "anim";
+            transition: LINEAR 3;
+            target: "image";
+            after: "anim2";
+         }
+         program { "anim2";
+            action: STATE_SET "default";
+            transition: LINEAR 3;
+            target: "image";
+            after: "anim1";
+         }
+      }
+   }
+}

data/templates/MobileLayout.edc

@@ -8,14 +8,14 @@ collections {
       }
       parts {
          rect { "base";
-            scale: 1;
+            scale;
             desc { "default";
                min: 200 300;
             }
          }
          /* Header */
          rect { "header";
-            scale: 1;
+            scale;
             desc { "default";
                color: 200 0 0 255;
                align: 0.0 0.0;
@@ -28,7 +28,7 @@ collections {
             }
          }
          spacer { "header_padding";
-            scale: 1;
+            scale;
             desc { "default";
                align: 0.0 0.5;
                rel1.to: "header";
@@ -38,7 +38,7 @@ collections {
             }
          }
          image { "header_button_panel_open";
-            scale: 1;
+            scale;
             desc { "default";
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_ICON_DOCK.png";
@@ -56,7 +56,7 @@ collections {
             }
          }
          image { "header_button_panel_close";
-            scale: 1;
+            scale;
             desc { "default";
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_ICON_DOCK_DOWN.png";
@@ -75,7 +75,7 @@ collections {
             }
          }
          text { "header_title";
-            scale: 1;
+            scale;
             desc { "default";
                text {
                   size: 15;
@@ -89,7 +89,7 @@ collections {
          }
          /* Content */
          spacer { "content_padding_top";
-            scale: 1;
+            scale;
             desc { "default";
                align: 0.0 0.0;
                rel1.to: "header";
@@ -100,7 +100,7 @@ collections {
             }
          }
          rect { "content_main";
-            scale: 1;
+            scale;
             desc { "default";
                color: 30 46 93 255;
                align: 0.5 0.0;
@@ -113,7 +113,7 @@ collections {
             }
          }
          text { "content_main_text";
-            scale: 1;
+            scale;
             desc { "default";
                text {
                   size: 15;
@@ -126,7 +126,7 @@ collections {
             }
          }
          spacer { "content_padding_middle";
-            scale: 1;
+            scale;
             desc { "default";
                align: 0.0 0.0;
                rel1.to: "base";
@@ -136,7 +136,7 @@ collections {
             }
          }
          rect { "content_sub_1";
-            scale: 1;
+            scale;
             desc { "default";
                color: 0 136 170 255;
                align: 0.0 0.0;
@@ -148,7 +148,7 @@ collections {
             }
          }
          text { "content_sub_1_text";
-            scale: 1;
+            scale;
             desc { "default";
                text {
                   size: 15;
@@ -161,7 +161,7 @@ collections {
             }
          }
          rect { "content_sub_2";
-            scale: 1;
+            scale;
             desc { "default";
                color: 66 118 189 255;
                align: 0.0 0.5;
@@ -175,7 +175,7 @@ collections {
             }
          }
          text { "content_sub_2_text";
-            scale: 1;
+            scale;
             desc { "default";
                text {
                   size: 15;
@@ -188,7 +188,7 @@ collections {
             }
          }
          rect { "content_sub_3";
-            scale: 1;
+            scale;
             desc { "default";
                color: 83 66 189 255;
                align: 0.0 0.5;
@@ -201,7 +201,7 @@ collections {
             }
          }
          text { "content_sub_3_text";
-            scale: 1;
+            scale;
             desc { "default";
                text {
                   size: 15;
@@ -214,7 +214,7 @@ collections {
             }
          }
          rect { "content_bottom";
-            scale: 1;
+            scale;
             desc { "default";
                color: 95 95 95 255;
                rel1.to: "content_sub_1";
@@ -225,7 +225,7 @@ collections {
             }
          }
          text { "content_bottom_text";
-            scale: 1;
+            scale;
             desc { "default";
                text {
                   size: 15;
@@ -240,7 +240,7 @@ collections {
          }
          /* Mask */
          rect { "mask";
-            scale: 1;
+            scale;
             desc { "default";
                color: 0 0 0 155;
                rel1.to: "header";
@@ -255,7 +255,7 @@ collections {
          }
          /* Panel */
          rect { "panel_base";
-            scale: 1;
+            scale;
             desc { "default";
                align: 0.0 0.0;
                rel1.to: "header";
@@ -270,7 +270,7 @@ collections {
             }
          }
          rect { "panel_content_1";
-            scale: 1;
+            scale;
             desc { "default";
                color: 255 94 0 255;
                rel1.to: "panel_base";
@@ -286,7 +286,7 @@ collections {
             }
          }
          text { "panel_content_1_text";
-            scale: 1;
+            scale;
             desc { "default";
                color: 0 0 0 255;
                text {
@@ -308,7 +308,7 @@ collections {
             }
          }
          rect { "panel_content_2";
-            scale: 1;
+            scale;
             desc { "default";
                color: 255 130 36 255;
                rel1.to: "panel_base";
@@ -325,7 +325,7 @@ collections {
             }
          }
          text { "panel_content_2_text";
-            scale: 1;
+            scale;
             desc { "default";
                color: 0 0 0 255;
                text {
@@ -346,7 +346,7 @@ collections {
             }
          }
          rect { "panel_content_3";
-            scale: 1;
+            scale;
             desc { "default";
                color: 255 166 72 255;
                rel1.to: "panel_base";
@@ -363,7 +363,7 @@ collections {
             }
          }
          text { "panel_content_3_text";
-            scale: 1;
+            scale;
             desc { "default";
                color: 0 0 0 255;
                text {
@@ -384,7 +384,7 @@ collections {
             }
          }
          rect { "panel_content_4";
-            scale: 1;
+            scale;
             desc { "default";
                color: 255 202 108 255;
                rel1.to: "panel_base";
@@ -401,7 +401,7 @@ collections {
             }
          }
          text { "panel_content_4_text";
-            scale: 1;
+            scale;
             desc { "default";
                color: 0 0 0 255;
                text {
@@ -422,7 +422,7 @@ collections {
             }
          }
          swallow { "panel_swallow";
-            scale: 1;
+            scale;
             desc { "default";
                visible: 0;
                rel1.to: "panel_base";

data/templates/Morphing.edc

@@ -0,0 +1,37 @@
+collections {
+   base_scale: 1.0;
+   group { "main";
+      /* TODO: Please replace embedded image files to your application image files. */
+      images {
+         vector: "ENVENTOR_EMBEDDED_BAT1.svg";
+         vector: "ENVENTOR_EMBEDDED_BAT2.svg";
+      }
+      parts {
+         vector { "svg";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_BAT1.svg";
+            }
+            desc { "changed";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_BAT2.svg";
+            }
+         }
+      }
+      programs {
+         program { "load";
+            signal: "load";
+            action: STATE_SET "changed";
+            target: "svg";
+            transition: LINEAR 1;
+            after: "rewind";
+         }
+         program { "rewind";
+            action: STATE_SET "default";
+            target: "svg";
+            transition: LINEAR 1;
+            after: "load";
+         }
+      }
+   }
+}

data/templates/MouseEvent.edc

@@ -0,0 +1,81 @@
+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;
+      }
+      parts {
+         rect { "button_shadow";
+            scale;
+            desc { "default";
+               color: 0 0 0 155;
+               rel1.to: "button_bg";
+               rel1.offset: 5 5;
+               rel2.to: "button_bg";
+               rel2.offset: 4 4;
+            }
+         }
+         image { "button_bg";
+            scale;
+            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;
+               min: 50 20;
+               max: 200 50;
+            }
+            desc { "hovered";
+               inherit: "default";
+               image.normal: "ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png";
+            }
+            desc { "clicked";
+               inherit: "default";
+               image.normal: "ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png";
+            }
+         }
+         text { "button_text";
+            scale;
+            nomouse;
+            desc { "default";
+               color: 70 70 70 255;
+               text {
+                  size: 15;
+                  font: "Sans";
+                  text: "Mouse Event Example";
+               }
+               rel1.to: "button_bg";
+               rel2.to: "button_bg";
+            }
+         }
+      }
+      programs {
+         program { "mouse_down";
+            signal: "mouse,down,1";
+            source: "button_bg";
+            action: STATE_SET "clicked";
+            target: "button_bg";
+         }
+         program { "mouse_up";
+            signal: "mouse,up,1";
+            source: "button_bg";
+            action: STATE_SET "hovered";
+            target: "button_bg";
+         }
+         program { "mouse_in";
+            signal: "mouse,in";
+            source: "button_bg";
+            action: STATE_SET "hovered";
+            target: "button_bg";
+         }
+         program { "mouse_out";
+            signal: "mouse,out";
+            source: "button_bg";
+            action: STATE_SET "default";
+            target: "button_bg";
+         }
+      }
+   }
+}

data/templates/Spacer.edc

@@ -3,7 +3,7 @@ collections {
    group { "main";
       parts {
          spacer { "spacer1";
-            scale: 1;
+            scale;
             desc { "default";
                min: 50 50;
                fixed: 1 1;
@@ -13,7 +13,7 @@ collections {
             }
          }
          spacer { "spacer2";
-            scale: 1;
+            scale;
             desc { "default";
                min: 50 50;
                fixed: 1 1;
@@ -33,4 +33,4 @@ collections {
          }
       }
    }
-}
+}

data/templates/Text.edc

@@ -3,7 +3,7 @@ collections {
    group { "main";
       parts {
          text { "text";
-            scale: 1;
+            scale;
             effect: SOFT_OUTLINE;
             desc { "default";
                rel1.relative: 0.0 0.0;
@@ -20,4 +20,4 @@ collections {
          }
       }
    }
-}
+}

data/templates/Textblock.edc

@@ -1,23 +1,128 @@
+efl_version: 1 22;
+
 collections {
    base_scale: 1.0;
    styles {
-      style { "text_style";
-         base: "font="Sans" font_size=30 text_class=entry color=#FFFFFF style=soft_outline outline_color=#0088AA64 valign=0.5 ellipsis=1.0 wrap=none align=center";
+      style { "basic_style";
+         base: "font="Sans" font_size=20 text_class=entry color=#FFFFFF style=soft_outline outline_color=#0088AA64 valign=0.5 ellipsis=1.0 wrap=none align=center";
+      }
+      style { "wrap_none_style";
+         base: "font="Sans" font_size=15 text_class=entry color=#FFFFFF style=outline outline_color=#FF0000 valign=0.5 wrap=none align=center";
+      }
+      style { "wrap_char_style";
+         base: "font="Sans" font_size=15 text_class=entry color=#FFFFFF style=outline outline_color=#FF5E00 valign=0.5 wrap=char align=center";
+      }
+      style { "wrap_word_style";
+         base: "font="Sans" font_size=15 text_class=entry color=#FFFFFF style=outline outline_color=#FFBB00 valign=0.5 wrap=word align=center";
+      }
+      style { "wrap_mixed_style";
+         base: "font="Sans" font_size=15 text_class=entry color=#FFFFFF style=outline outline_color=#1DDB16 valign=0.5 wrap=mixed align=center";
+      }
+      style { "ellipsis_1_style";
+         base: "font="Sans" font_size=15 text_class=entry color=#FFFFFF style=soft_outline outline_color=#0054FF valign=0.5 ellipsis=1.0 wrap=none align=center";
+      }
+      style { "ellipsis_0_style";
+         base: "font="Sans" font_size=15 text_class=entry color=#FFFFFF style=soft_outline outline_color=#5F00FF valign=0.5 ellipsis=0.0 wrap=none align=center";
       }
    }
    group { "main";
       parts {
-         textblock { "text";
-            scale: 1;
+         textblock { "text_block";
+            scale;
             desc { "default";
+               text {
+                  style: "basic_style";
+                  text: "Try resizing view!";
+                  min: 0 1;
+               }
                rel1.relative: 0.0 0.0;
+               rel2.relative: 1.0 0.1;
+            }
+         }
+      }
+      parts {
+         textblock { "text_wrap_none";
+            scale;
+            desc { "default";
+               rel1.to: "text_block";
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 0.25;
+               text {
+                  style: "wrap_none_style";
+                  text: "[wrap = none] https://www.enlightenment.org/";
+               }
+            }
+         }
+      }
+      parts {
+         textblock { "text_wrap_char";
+            scale;
+            desc { "default";
+               rel1.to: "text_wrap_none";
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 0.4;
+               text {
+                  style: "wrap_char_style";
+                  text: "[wrap = char] https://www.enlightenment.org/";
+               }
+            }
+         }
+      }
+      parts {
+         textblock { "text_wrap_word";
+            scale;
+            desc { "default";
+               rel1.to: "text_wrap_char";
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 0.55;
+               text {
+                  style: "wrap_word_style";
+                  text: "[wrap = word] https://www.enlightenment.org/";
+               }
+            }
+         }
+      }
+      parts {
+         textblock { "text_wrap_mixed";
+            scale;
+            desc { "default";
+               rel1.to: "text_wrap_word";
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 0.7;
+               text {
+                  style: "wrap_mixed_style";
+                  text: "[wrap = mixed] https://www.enlightenment.org/";
+               }
+            }
+         }
+      }
+      parts {
+         textblock { "text_ellipsis_1";
+            scale;
+            desc { "default";
+               rel1.to: "text_wrap_mixed";
+               rel1.relative: 0.0 1.0;
+               rel2.relative: 1.0 0.85;
+               text {
+                  style: "ellipsis_1_style";
+                  text: "[ellipsis = 1] https://www.enlightenment.org/";
+               }
+            }
+         }
+      }
+      parts {
+         textblock { "text_ellipsis_0";
+            scale;
+            desc { "default";
+               rel1.to: "text_ellipsis_1";
+               rel1.relative: 0.0 1.0;
                rel2.relative: 1.0 1.0;
                text {
-                  style: "text_style";
-                  text: "TEXTBLOCK";
+                  style: "ellipsis_0_style";
+                  text: "[ellipsis = 0] https://www.enlightenment.org/";
                }
             }
          }
       }
    }
-}
+}

data/templates/Vector.edc

@@ -0,0 +1,38 @@
+collections {
+   base_scale: 1.0;
+   group { "main";
+      /* TODO: Please replace embedded image files to your application image files. */
+      images {
+         vector: "ENVENTOR_EMBEDDED_SVG.svg";
+      }
+      parts {
+         vector { "svg";
+            desc { "default";
+               /* TODO: Please replace embedded image files to your application image files. */
+               image.normal: "ENVENTOR_EMBEDDED_SVG.svg";
+            }
+            desc { "changed";
+               inherit: "default";
+               rel1.relative: 0.25 0.25;
+               rel2.relative: 0.75 0.75;
+            }
+         }
+      }
+      programs {
+         program { "mouse_down";
+            signal: "mouse,down,1";
+            source: "svg";
+            action: STATE_SET "changed";
+            target: "svg";
+            transition: DECELERATE 0.5;
+         }
+         program { "mouse_up";
+            signal: "mouse,up,1";
+            source: "svg";
+            action: STATE_SET "default";
+            target: "svg";
+            transition: DECELERATE 0.5;
+         }
+      }
+   }
+}

data/templates/Watchface.edc

@@ -13,7 +13,7 @@ collections {
       }
       parts {
          image { "bg";
-            scale: 1;
+            scale;
             desc { "default";
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_WATCHFACE.png";
@@ -24,7 +24,7 @@ collections {
             }
          }
          image { "moonphase_moon";
-            scale: 1;
+            scale;
             desc { "default";
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_MOONPHASE_MOON.png";
@@ -40,7 +40,7 @@ collections {
             }
          }
          image { "moonphase_cover";
-            scale: 1;
+            scale;
             desc { "default";
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_MOONPHASE_COVER.png";
@@ -54,7 +54,7 @@ collections {
             }
          }
          image { "month_stroke";
-            scale: 1;
+            scale;
             desc { "default";
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_MONTH_STROKE.png";
@@ -110,7 +110,7 @@ collections {
             }
          }
          text { "date";
-            scale: 1;
+            scale;
             desc { "default";
                color: 0 0 0 255;
                fixed: 1 1;
@@ -131,7 +131,7 @@ collections {
             }
          }
          image { "hour";
-            scale: 1;
+            scale;
             nomouse;
             desc { "default";
                rel1.to: "bg";
@@ -151,7 +151,7 @@ collections {
             }
          }
          image { "minute";
-            scale: 1;
+            scale;
             nomouse;
             desc { "default";
                rel1.to: "bg";
@@ -159,7 +159,7 @@ collections {
                rel1.relative: 0.5 0.0;
                rel2.relative: 0.5 1.0;
                min: 35 0;
-               fixed: 1 0;               
+               fixed: 1 0;
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_NEEDLE_MINUTE.png";
                map.on: 1;
@@ -171,7 +171,7 @@ collections {
             }
          }
          image { "second";
-            scale: 1;
+            scale;
             nomouse;
             desc { "default";
                rel1.to: "bg";
@@ -179,7 +179,7 @@ collections {
                rel1.relative: 0.5 0.0;
                rel2.relative: 0.5 1.0;
                min: 25 0;
-               fixed: 1 0;                 
+               fixed: 1 0;
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_NEEDLE_SECOND.png";
                map.on: 1;

data/templates/Watchface2.edc

@@ -10,7 +10,7 @@ collections {
       }
       parts {
          image { "bg";
-            scale: 1;
+            scale;
             desc { "default";
                visible: 1;
                /* TODO: Please replace embedded image files to your application image files. */
@@ -22,7 +22,7 @@ collections {
             }
          }
          text { "date";
-            scale: 1;
+            scale;
             desc { "default";
                color: 219 219 219 255;
                fixed: 1 1;
@@ -43,14 +43,14 @@ collections {
             }
          }
          text { "meridiem";
-            scale: 1;
+            scale;
             desc { "default";
                color: 255 120 0 255;
                fixed: 1 1;
                text {
                   size: 20;
                   font: "Mono";
-                  text: "AM";                  
+                  text: "AM";
                }
                min: 150 0;
                fixed: 1 0;
@@ -62,14 +62,14 @@ collections {
             }
          }
          text { "time";
-            scale: 1;
+            scale;
             desc { "default";
                color: 250 250 250 255;
                fixed: 1 1;
                text {
                   size: 20;
                   font: "Mono";
-                  text: "12:00";                  
+                  text: "12:00";
                }
                min: 150 0;
                fixed: 1 0;
@@ -81,7 +81,7 @@ collections {
             }
          }
          image { "hour";
-            scale: 1;
+            scale;
             nomouse;
             desc { "default";
                rel1.to: "bg";
@@ -101,7 +101,7 @@ collections {
             }
          }
          image { "minute";
-            scale: 1;
+            scale;
             nomouse;
             desc { "default";
                rel1.to: "bg";
@@ -109,7 +109,7 @@ collections {
                rel1.relative: 0.5 0.0;
                rel2.relative: 0.5 1.0;
                min: 30 0;
-               fixed: 1 0;               
+               fixed: 1 0;
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_NEEDLE_MINUTE_RECT.png";
                map.on: 1;
@@ -121,7 +121,7 @@ collections {
             }
          }
          image { "second";
-            scale: 1;
+            scale;
             nomouse;
             desc { "default";
                rel1.to: "bg";
@@ -129,7 +129,7 @@ collections {
                rel1.relative: 0.5 0.0;
                rel2.relative: 0.5 1.0;
                min: 30 0;
-               fixed: 1 0;                 
+               fixed: 1 0;
                /* TODO: Please replace embedded image files to your application image files. */
                image.normal: "ENVENTOR_EMBEDDED_NEEDLE_SECOND_RECT.png";
                map.on: 1;
@@ -140,59 +140,46 @@ collections {
                map.rotation.z: 360;
             }
          }
-         programs {
-            program { "load";
-               signal: "load";
-               source: "";
-               action: STATE_SET "rotated";
-               target: "bg";
-               transition: LINEAR 30;
-               after: "reset";
-            }
-            program { "reset";
-               action: STATE_SET "default";
-               target: "bg";
-               after: "load";
-            }
-            program { "hour_begin";
-               signal: "load";
-               source: "";
-               action: STATE_SET "rotated";
-               target: "hour";
-               transition: LINEAR 216000;
-               after: "hour_reset";
-            }
-            program { "hour_reset";
-               action: STATE_SET "default";
-               target: "hour";
-               after: "hour_begin";
-            }
-            program { "minute_begin";
-               signal: "load";
-               source: "";
-               action: STATE_SET "rotated";
-               target: "minute";
-               transition: LINEAR 3600;
-               after: "minute_begin";
-            }
-            program { "minute_reset";
-               action: STATE_SET "default";
-               target: "minute";
-               after: "minute_begin";
-            }
-            program { "second_begin";
-               signal: "load";
-               source: "";
-               action: STATE_SET "rotated";
-               target: "second";
-               transition: LINEAR 60;
-               after: "second_reset";
-            }
-            program { "second_reset";
-               action: STATE_SET "default";
-               target: "second";
-               after: "second_begin";
-            }
+      }
+      programs {
+         program { "hour_begin";
+            signal: "load";
+            source: "";
+            action: STATE_SET "rotated";
+            target: "hour";
+            transition: LINEAR 216000;
+            after: "hour_reset";
+         }
+         program { "hour_reset";
+            action: STATE_SET "default";
+            target: "hour";
+            after: "hour_begin";
+         }
+         program { "minute_begin";
+            signal: "load";
+            source: "";
+            action: STATE_SET "rotated";
+            target: "minute";
+            transition: LINEAR 3600;
+            after: "minute_begin";
+         }
+         program { "minute_reset";
+            action: STATE_SET "default";
+            target: "minute";
+            after: "minute_begin";
+         }
+         program { "second_begin";
+            signal: "load";
+            source: "";
+            action: STATE_SET "rotated";
+            target: "second";
+            transition: LINEAR 60;
+            after: "second_reset";
+         }
+         program { "second_reset";
+            action: STATE_SET "default";
+            target: "second";
+            after: "second_begin";
          }
       }
    }

data/templates/meson.build

@@ -0,0 +1,54 @@
+
+edc_template_files = [
+  'Basic.edc',
+  'BgAnimation.edc',
+  'Clip.edc',
+  'CustomButton.edc',
+  'Empty.edc',
+  'GameStage.edc',
+  'Group.edc',
+  'Image.edc',
+  'Interpolation.edc',
+  'Listitem.edc',
+  'Map.edc',
+  'Mask.edc',
+  'MobileLayout.edc',
+  'Morphing.edc',
+  'MouseEvent.edc',
+  'Proxy.edc',
+  'Rect.edc',
+  'Rotation+Zoom.edc',
+  'Sound.edc',
+  'Spacer.edc',
+  'Text.edc',
+  'Textblock.edc',
+  'Transition.edc',
+  'Tween.edc',
+  'Vector.edc',
+  'Watchface.edc',
+  'Watchface2.edc'
+]
+
+enventor_templates = []
+
+foreach edc_file : edc_template_files
+  enventor_templates += custom_target('edje_cc_' + edc_file,
+    input       : edc_file,
+    depfile     : '@BASENAME@.edj.d',
+    output      : '@BASENAME@.edj',
+    command     : edje_cc_exe +
+                  [
+                   '-beta',
+                   '-sd', join_paths(meson.source_root(), 'data/sounds'),
+                   '-id', join_paths(meson.source_root(), 'data/images'),
+                   '@INPUT@', '@OUTPUT@'
+                  ],
+    install     : true,
+    install_dir : join_paths(dir_pkgdata, 'templates'),
+  )
+endforeach
+
+install_data(
+  sources     : edc_template_files,
+  install_dir : join_paths(dir_pkgdata, 'templates')
+)

data/themes/default/images.edc

@@ -48,6 +48,7 @@ images {
    image: "left.png" COMP;
    image: "right.png" COMP;
    image: "filetab.png" COMP;
+   image: "navi_vector.png" COMP;
 }
 
 #define ICON_GROUP(_group_name, _image_path) \
@@ -109,5 +110,6 @@ ICON_GROUP("wireframes_icon", "icon_wireframes.png")
 ICON_GROUP("left_arrow", "left.png")
 ICON_GROUP("right_arrow", "right.png")
 ICON_GROUP("filetab", "filetab.png")
+ICON_GROUP("navi_vector", "navi_vector.png")
 
 #undef ICON_GROUP

data/themes/default/images/Makefile.am

@@ -1,5 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = \
+   help_bg.png \
    bevel_in.png \
    bevel_out.png \
    bg_glow_in.png \
@@ -11,7 +12,6 @@ EXTRA_DIST = \
    bt_hilight.png \
    bt_shine.png \
    bub_over_bot.png \
-   folder.png \
    glow_small.png \
    holes_tiny_glow_horiz.png \
    holes_tiny_glow_vert.png \
@@ -58,7 +58,6 @@ EXTRA_DIST = \
    live_spacer_icon.png \
    live_text.png \
    live_textblock.png \
-   new.png \
    slider_up.png \
    slider_down.png \
    save.png \
@@ -101,4 +100,5 @@ EXTRA_DIST = \
    bevel_curved_vert_out.png \
    vgrad_med_dark.png \
    shadow_rounded_vert.png \
-   wireframes.png
+   wireframes.png \
+   navi_vector.png

data/themes/default/layout_setting.edc

@@ -1,29 +1,30 @@
 images {
    image: "frame_bg.png" COMP;
    image: "setting_icon.png" COMP;
-   image: "folder.png" COMP;
+   image: "icon_folder.png" COMP;
+   image: "brows_logo.png" COMP;
 }
 
 group { "setting_layout";
    parts {
       rect { "clipper";
-         desc { state: "default";
+         desc { "default";
             color: 127 127 127 127;
          }
-         desc { state: "show";
+         desc { "show";
             color: 255 255 255 255;
          }
       }
       rect { "bg";
          clip_to: "clipper";
-         desc { state: "default";
+         desc { "default";
             color: 0 0 0 175;
          }
       }
       image { "base_frame_img";
          scale: 1;
          clip_to: "clipper";
-         desc {
+         desc { "default";
             min: 650 435;
             max: 600 435;
             fixed: 1 1;
@@ -35,7 +36,7 @@ group { "setting_layout";
       image { "shine_img";
          scale: 1;
          clip_to: "clipper";
-         desc {
+         desc { "default";
             rel1 { to: "base_frame_img"; relative: 0 0; }
             rel2 { to: "base_frame_img"; relative: 1 0; }
             align: 0.5 0;
@@ -45,7 +46,7 @@ group { "setting_layout";
          }
       }
       spacer { "base_frame";
-         desc {
+         desc { "default";
             rel1 {to: "base_frame_img"; offset: 10 10;}
             rel2 {to: "base_frame_img"; offset: -11 -11;}
          }
@@ -53,7 +54,7 @@ group { "setting_layout";
       rect { "title_frame";
          clip_to: "clipper";
          scale: 1;
-         desc {
+         desc { "default";
             rel1 { to: "base_frame"; relative: 0 0; }
             rel2 { to: "base_frame"; relative: 1 0; }
             align: 0.5 0;
@@ -65,7 +66,7 @@ group { "setting_layout";
       image { "title_icon";
          scale: 1;
          clip_to: "clipper";
-         desc {
+         desc { "default";
             align: 0 0.5;
             min: 20 20;
             max: 20 20;
@@ -79,7 +80,7 @@ group { "setting_layout";
          scale: 1;
          clip_to: "clipper";
          effect: GLOW;
-         desc {
+         desc { "default";
             rel1.to: "title_frame";
             rel2.to: "title_frame";
             align: 0.5 0.5;
@@ -98,7 +99,7 @@ group { "setting_layout";
       swallow { "elm.swallow.toolbar";
          scale: 1;
          clip_to: "clipper";
-         desc { state: "default";
+         desc { "default";
             min: 0 25;
             max: -1 25;
             align: 0.5 0.0;
@@ -110,7 +111,7 @@ group { "setting_layout";
       swallow { "elm.swallow.content";
          scale: 1;
          clip_to: "clipper";
-         desc { state: "default";
+         desc { "default";
             rel1 {
                to: "elm.swallow.toolbar";
                relative: 0.0 1.0;
@@ -125,7 +126,7 @@ group { "setting_layout";
       }
       swallow { "elm.swallow.apply_btn";
          scale: 1;
-         desc {
+         desc { "default";
             align: 1 0.5;
             min: 50 25;
             fixed: 1 1;
@@ -137,7 +138,7 @@ group { "setting_layout";
       }
       swallow { "elm.swallow.reset_btn";
          scale: 1;
-         desc {
+         desc { "default";
             align: 0.5 1;
             min: 50 25;
             fixed: 1 1;
@@ -149,7 +150,7 @@ group { "setting_layout";
       }
       swallow { "elm.swallow.cancel_btn";
          scale: 1;
-         desc {
+         desc { "default";
             align: 0 0.5;
             min: 50 25;
             fixed: 1 1;
@@ -160,11 +161,11 @@ group { "setting_layout";
          }
       }
       rect { "event_blocker";
-         desc { state: "default";
+         desc { "default";
             color: 0 0 0 0;
             visible: 1;
          }
-         desc { state: "hide";
+         desc { "hide";
             inherit: "default";
             visible: 0;
          }
@@ -173,7 +174,7 @@ group { "setting_layout";
          scale: 1;
          clip_to: "clipper";
          nomouse;
-         desc {
+         desc { "default";
             rel1 { to: "base_frame_img"; }
             rel2 { to: "base_frame_img"; }
             image.normal: "bub_over_bot.png";
@@ -210,8 +211,8 @@ group { "setting_layout";
 
 group { "build_setting_layout";
    parts {
-      spacer { "img_path_frame";
-         desc {
+      spacer { "main_edc_frame";
+         desc { "default";
             rel1 { relative: 0 0; }
             rel2 { relative: 1 0; }
             align: 0.5 0;
@@ -219,9 +220,18 @@ group { "build_setting_layout";
             fixed: 0 1;
          }
       }
+      spacer { "img_path_frame";
+         desc { "default";
+            rel1 { to: "main_edc_frame"; relative: 0 1; }
+            rel2 { to: "main_edc_frame"; relative: 1 1; }
+            align: 0.5 0;
+            min: 0 30;
+            fixed: 0 1;
+         }
+      }
       spacer { "snd_path_frame";
          scale: 1;
-         desc {
+         desc { "default";
             rel1 { to: "img_path_frame"; relative: 0 1; }
             rel2 { to: "img_path_frame"; relative: 1 1; }
             align: 0.5 0;
@@ -231,7 +241,7 @@ group { "build_setting_layout";
       }
       spacer { "fnt_path_frame";
          scale: 1;
-         desc {
+         desc { "default";
             rel1 { to: "snd_path_frame"; relative: 0 1; }
             rel2 { to: "snd_path_frame"; relative: 1 1; }
             align: 0.5 0;
@@ -241,7 +251,7 @@ group { "build_setting_layout";
       }
       spacer { "dat_path_frame";
          scale: 1;
-         desc {
+         desc { "default";
             rel1 { to: "fnt_path_frame"; relative: 0 1; }
             rel2 { to: "fnt_path_frame"; relative: 1 1; }
             align: 0.5 0;
@@ -251,7 +261,7 @@ group { "build_setting_layout";
       }
       spacer { "preference_frame";
          scale: 1;
-         desc {
+         desc { "default";
             rel1 { to: "dat_path_frame"; relative: 0 1; offset: 0 5; }
             rel2 { to: "dat_path_frame"; relative: 1 1; }
             align: 0.5 0;
@@ -259,22 +269,73 @@ group { "build_setting_layout";
             fixed: 0 1;
          }
       }
+      image { "main_edc_icon";
+         scale: 1;
+         desc { "default";
+            align: 0 0.5;
+            min: 20 20;
+            max: 20 20;
+            fixed: 1 1;
+            rel1.to: "main_edc_frame";
+            rel2.to: "main_edc_frame";
+            image.normal: "brows_logo.png";
+         }
+      }
+      text { "main_edc_guide";
+         scale: 1;
+         effect: SHADOW BOTTOM;
+         desc { "default";
+            rel1 { to: "main_edc_icon"; relative: 1 0; offset: 5 1; }
+            rel2 { to: "main_edc_icon"; relative: 1 1; }
+            color: COL_NM;
+            align: 0 0.5;
+            fixed: 1 1;
+            text {
+               font: FN;
+               text: "Main EDC File:";
+               size: 11;
+               align: 0 0.5;
+               min: 1 0;
+               ellipsis: -1;
+            }
+         }
+      }
+      swallow { "elm.swallow.main_edc_entry";
+         scale: 1;
+         desc { "default";
+            align: 0 0;
+            fixed: 1 1;
+            rel1.to_x: "main_edc_guide";
+            rel1.to_y: "main_edc_guide";
+            rel1.offset: 5 0;
+            rel1.relative: 1 0;
+            rel2.to: "main_edc_frame";
+         }
+      }
+      swallow { "main_edc_tooltip";
+         repeat_events: 1;
+         desc { "default";
+            rel1.to: "main_edc_frame";
+            rel2.to: "main_edc_frame";
+            fixed: 1 1;
+         }
+      }
       image { "img_path_icon";
          scale: 1;
-         desc {
+         desc { "default";
             align: 0 0.5;
             min: 20 20;
             max: 20 20;
             fixed: 1 1;
             rel1.to: "img_path_frame";
             rel2.to: "img_path_frame";
-            image.normal: "folder.png";
+            image.normal: "icon_folder.png";
          }
       }
       text { "img_path_guide";
          scale: 1;
          effect: SHADOW BOTTOM;
-         desc {
+         desc { "default";
             rel1 { to: "img_path_icon"; relative: 1 0; offset: 5 1; }
             rel2 { to: "img_path_icon"; relative: 1 1; }
             color: COL_NM;
@@ -292,7 +353,7 @@ group { "build_setting_layout";
       }
       swallow { "elm.swallow.img_path_entry";
          scale: 1;
-         desc {
+         desc { "default";
             align: 0 0;
             fixed: 1 1;
             rel1.to_x: "img_path_guide";
@@ -304,7 +365,7 @@ group { "build_setting_layout";
       }
       swallow { "img_path_tooltip";
          repeat_events: 1;
-         desc {
+         desc { "default";
             rel1.to: "img_path_frame";
             rel2.to: "img_path_frame";
             fixed: 1 1;
@@ -312,20 +373,20 @@ group { "build_setting_layout";
       }
       image { "snd_path_icon";
          scale: 1;
-         desc {
+         desc { "default";
             align: 0 0.5;
             min: 20 20;
             max: 20 20;
             fixed: 1 1;
             rel1.to: "snd_path_frame";
             rel2.to: "snd_path_frame";
-            image.normal: "folder.png";
+            image.normal: "icon_folder.png";
          }
       }
       text { "snd_path_guide";
          effect: SHADOW BOTTOM;
          scale: 1;
-         desc {
+         desc { "default";
             rel1 { to: "snd_path_icon"; relative: 1 0; offset: 5 1; }
             rel2 { to: "snd_path_icon"; relative: 1 1; }
             color: COL_NM;
@@ -343,7 +404,7 @@ group { "build_setting_layout";
       }
       swallow { "elm.swallow.snd_path_entry";
          scale: 1;
-         desc {
+         desc { "default";
             align: 0 0;
             fixed: 1 1;
             rel1.to_x: "snd_path_guide";
@@ -355,7 +416,7 @@ group { "build_setting_layout";
       }
       swallow { "snd_path_tooltip";
          repeat_events: 1;
-         desc {
+         desc { "default";
             rel1.to: "snd_path_frame";
             rel2.to: "snd_path_frame";
             fixed: 1 1;
@@ -363,20 +424,20 @@ group { "build_setting_layout";
       }
       image { "fnt_path_icon";
          scale: 1;
-         desc {
+         desc { "default";
             align: 0 0.5;
             min: 20 20;
             max: 20 20;
             fixed: 1 1;
             rel1.to: "fnt_path_frame";
             rel2.to: "fnt_path_frame";
-            image.normal: "folder.png";
+            image.normal: "icon_folder.png";
          }
       }
       text { "fnt_path_guide";
          effect: SHADOW BOTTOM;
          scale: 1;
-         desc {
+         desc { "default";
             rel1 { to: "fnt_path_icon"; relative: 1 0; offset: 5 1; }
             rel2 { to: "fnt_path_icon"; relative: 1 1; }
             color: COL_NM;
@@ -394,7 +455,7 @@ group { "build_setting_layout";
       }
       swallow { "elm.swallow.fnt_path_entry";
          scale: 1;
-         desc {
+         desc { "default";
             align: 0 0;
             fixed: 1 1;
             rel1.to_x: "fnt_path_guide";
@@ -406,7 +467,7 @@ group { "build_setting_layout";
       }
       swallow { "fnt_path_tooltip";
          repeat_events: 1;
-         desc {
+         desc { "default";
             rel1.to: "fnt_path_frame";
             rel2.to: "fnt_path_frame";
             fixed: 1 1;
@@ -414,20 +475,20 @@ group { "build_setting_layout";
       }
       image { "dat_path_icon";
          scale: 1;
-         desc {
+         desc { "default";
             align: 0 0.5;
             min: 20 20;
             max: 20 20;
             fixed: 1 1;
             rel1.to: "dat_path_frame";
             rel2.to: "dat_path_frame";
-            image.normal: "folder.png";
+            image.normal: "icon_folder.png";
          }
       }
       text { "dat_path_guide";
          effect: SHADOW BOTTOM;
          scale: 1;
-         desc {
+         desc { "default";
             rel1 { to: "dat_path_icon"; relative: 1 0; offset: 5 1; }
             rel2 { to: "dat_path_icon"; relative: 1 1; }
             color: COL_NM;
@@ -445,7 +506,7 @@ group { "build_setting_layout";
       }
       swallow { "elm.swallow.dat_path_entry";
          scale: 1;
-         desc {
+         desc { "default";
             align: 0 0;
             fixed: 1 1;
             rel1.to_x: "dat_path_guide";
@@ -457,7 +518,7 @@ group { "build_setting_layout";
       }
       swallow { "data_path_tooltip";
          repeat_events: 1;
-         desc {
+         desc { "default";
             rel1.to: "dat_path_frame";
             rel2.to: "dat_path_frame";
             fixed: 1 1;
@@ -470,7 +531,7 @@ group { "text_setting_layout";
    parts {
       spacer { "preference_frame";
          scale: 1;
-         desc {
+         desc { "default";
             rel1.relative: 0 0;
             rel2.relative: 1 0;
             rel1.offset: 0 3;
@@ -481,7 +542,7 @@ group { "text_setting_layout";
       }
       text { "text_font_size";
          scale: 1;
-         desc {
+         desc { "default";
             rel1.to: "preference_frame";
             rel2 { to: "preference_frame"; relative: 0.0 1.0; }
             rel1.offset: 2 0;
@@ -499,7 +560,7 @@ group { "text_setting_layout";
       }
       swallow { "elm.swallow.font_size";
          scale: 1;
-         desc {
+         desc { "default";
             align: 0.0 0.5;
             rel1 { to: "text_font_size"; relative: 1.0 0.0; }
             rel2 { to_x: "preference_frame"; to_y: "text_font_size"; }
@@ -517,7 +578,7 @@ group { "text_setting_layout";
       text { "text_setting_guide";
          scale: 1;
          effect: SHADOW BOTTOM;
-         desc {
+         desc { "default";
             rel1 { to: "padding1"; relative: 0 1; offset: 2 0; }
             rel2 { to: "padding1"; relative: 0.65 1; }
             color: COL_NM;
@@ -536,21 +597,21 @@ group { "text_setting_layout";
       }
       spacer { "text_setting_frame";
          scale: 1;
-         desc {
+         desc { "default";
             rel1 { to_y: "text_setting_guide"; relative: 0 1; }
             rel2 { to_x: "text_setting_guide"; }
          }
       }
       swallow { "elm.swallow.text_setting";
          scale: 1;
-         desc { state: "default";
+         desc { "default";
             fixed: 0 1;
             rel1.to: "text_setting_frame";
             rel2.to: "text_setting_frame";
          }
       }
       spacer { "padding2";
-         desc {
+         desc { "default";
             rel1 { to: "text_setting_guide"; relative: 1 0; }
             rel2 { to: "text_setting_frame"; }
             align: 0 0.5;
@@ -560,13 +621,13 @@ group { "text_setting_layout";
       }
       spacer { "font_frame";
          scale: 1;
-         desc {
+         desc { "default";
             rel1 { to: "padding2"; relative: 1 0; }
          }
       }
       swallow { "elm.swallow.font";
          scale: 1;
-         desc {
+         desc { "default";
             rel1.to: "font_frame";
             rel2.to: "font_frame";
          }

data/themes/default/meson.build

@@ -0,0 +1,25 @@
+
+edc_theme_files = [
+  'enventor.edc'
+]
+
+enventor_themes = []
+
+_edje_cc = find_program('edje_cc', native: true)
+edje_cc_exe = [_edje_cc]
+
+foreach edc_file : edc_theme_files
+  enventor_themes += custom_target('edje_cc_' + edc_file,
+    input       : edc_file,
+    depfile     : '@BASENAME@.edj.d',
+    output      : '@BASENAME@.edj',
+    command     : edje_cc_exe +
+                  [
+                   '-sd', join_paths(meson.current_source_dir(), 'sounds'),
+                   '-id', join_paths(meson.current_source_dir(), 'images'),
+                   '@INPUT@', '@OUTPUT@'
+                  ],
+    install     : true,
+    install_dir : join_paths(dir_pkgdata, 'themes'),
+  )
+endforeach

data/themes/default/theme_ext.edc

@@ -144,6 +144,7 @@ group { name: "elm/list/h_item/enventor";
    images.image: "vgrad_med_dark.png" COMP;
    images.image: "bevel_out.png" COMP;
    images.image: "shine.png" COMP;
+   images.image: "brows_logo.png" COMP;
    parts {
       part { name: "event"; type: RECT;
          description { state: "default" 0.0;
@@ -159,14 +160,14 @@ group { name: "elm/list/h_item/enventor";
             color: 64 64 64 255;
             color_class: "list_item_base";
          }
-         description { state: "odd" 0.0;
+         description { state: "odd";
             color: 56 56 56 255;
             color_class: "list_item_base_odd";
          }
       }
       program {
          signal: "elm,state,odd"; source: "elm";
-         action: STATE_SET "odd" 1.0;
+         action: STATE_SET "odd";
          target: "base";
       }
       program {
@@ -253,13 +254,15 @@ group { name: "elm/list/h_item/enventor";
             rel1.offset: 5 2;
             rel1.relative: 1.0 0;
             rel1.to_x: "elm.swallow.icon";
-            rel2.offset: -11 -3;
+            rel2.offset: -7 -3;
+            rel2.relative: 0.0 1.0;
+            rel2.to_x: "elm.swallow.end";
             color3: 0 0 0 128;
             color_class: "list_item";
             text { font: FN; size: 10;
                min: 1 1;
                ellipsis: -1;
-               align: 0.5 0;
+               align: 0.5 0.5;
                text_class: "list_item";
             }
          }
@@ -351,7 +354,20 @@ group { name: "elm/list/h_item/enventor";
          target: "label2";
          target: "label3";
       }
-      swallow {"elm.swallow.icon";
+      image { "icon";
+         scale: 1;
+         desc { "default";
+            fixed: 1 1;
+            min: 15 15;
+            align: 0 0.5;
+            rel1.relative: 0.0 0.5;
+            rel1.offset: 5 -1;
+            rel2.relative: 0.0 0.5;
+            rel2.offset: 5 -2;
+            image.normal: "brows_logo.png";
+         }
+      }
+      swallow { "elm.swallow.icon";
          scale: 1;
          desc { "default";
             fixed: 1 1;
@@ -389,15 +405,34 @@ group { name: "elm/list/h_item/enventor";
             visible: 1;
          }
       }
+      swallow { "elm.swallow.end";
+         repeat_events: 1;
+         desc { "default";
+            visible: 0;
+            fixed: 1 1;
+            min: 15 15;
+            align: 1.0 0.5;
+            aspect: 1.0 1.0;
+            rel1.offset: 5 -3;
+            rel1.relative: 1.0 0.0;
+            rel2.offset: 0 -2;
+         }
+         desc { "selected";
+            inherit: "default";
+            visible: 1;
+         }
+      }
       program {
          signal: "elm,state,selected"; source: "elm";
          action: STATE_SET "selected" 0.0;
          target: "sel_shine";
+         target: "elm.swallow.end";
       }
       program {
          signal: "elm,state,unselected"; source: "elm";
          action: STATE_SET "default" 0.0;
          target: "sel_shine";
+         target: "elm.swallow.end";
       }
       program {
          signal: "elm,state,disabled"; source: "elm";
@@ -568,7 +603,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,down,1*"; source: "sb_vbar_a1";
          action: STATE_SET "clicked" 0.0;
-         target: "sb_vbar_a1";
          target: "arrow1_vbar";
       }
       program {
@@ -579,13 +613,11 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "sb_vbar_a1";
          action: STATE_SET "default" 0.0;
-         target: "sb_vbar_a1";
          target: "arrow1_vbar";
       }
       program {
          signal: "mouse,down,1*"; source: "sb_vbar_a2";
          action: STATE_SET "clicked" 0.0;
-         target: "sb_vbar_a2";
          target: "arrow2_vbar";
       }
       program {
@@ -596,7 +628,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "sb_vbar_a2";
          action: STATE_SET "default" 0.0;
-         target: "sb_vbar_a2";
          target: "arrow2_vbar";
       }
       program {
@@ -728,7 +759,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,down,1*"; source: "sb_hbar_a1";
          action: STATE_SET "clicked" 0.0;
-         target: "sb_hbar_a1";
          target: "arrow1_hbar";
       }
       program {
@@ -739,13 +769,11 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "sb_hbar_a1";
          action: STATE_SET "default" 0.0;
-         target: "sb_hbar_a1";
          target: "arrow1_hbar";
       }
       program {
          signal: "mouse,down,1*"; source: "sb_hbar_a2";
          action: STATE_SET "clicked" 0.0;
-         target: "sb_hbar_a2";
          target: "arrow2_hbar";
       }
       program {
@@ -756,7 +784,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "sb_hbar_a2";
          action: STATE_SET "default" 0.0;
-         target: "sb_hbar_a2";
          target: "arrow2_hbar";
       }
       program {
@@ -1111,7 +1138,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,down,1*"; source: "elm.dragable.vbar";
          action: STATE_SET "clicked" 0.0;
-         target: "elm.dragable.vbar";
          target: "shadow_vbar";
          target: "glow_vbar";
          target: "center_glow_vbar";
@@ -1119,7 +1145,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "elm.dragable.vbar";
          action: STATE_SET "default" 0.0;
-         target: "elm.dragable.vbar";
          target: "shadow_vbar";
          target: "glow_vbar";
          target: "center_glow_vbar";
@@ -1127,7 +1152,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,down,1*"; source: "elm.dragable.hbar";
          action: STATE_SET "clicked" 0.0;
-         target: "elm.dragable.hbar";
          target: "shadow_hbar";
          target: "glow_hbar";
          target: "center_glow_hbar";
@@ -1135,7 +1159,6 @@ group { name: "elm/scroller/base/enventor";
       program {
          signal: "mouse,up,1"; source: "elm.dragable.hbar";
          action: STATE_SET "default" 0.0;
-         target: "elm.dragable.hbar";
          target: "shadow_hbar";
          target: "glow_hbar";
          target: "center_glow_hbar";
@@ -1299,8 +1322,8 @@ group { name: "elm/panes/vertical/enventor";
             align: 1.0 0.5;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
          }
       }
       part { name: "glow1b"; mouse_events: 0;
@@ -1312,8 +1335,8 @@ group { name: "elm/panes/vertical/enventor";
             align: 0.0 0.5;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
          }
       }
       part { name: "glow2a"; mouse_events: 0;
@@ -1325,8 +1348,8 @@ group { name: "elm/panes/vertical/enventor";
             align: 1.0 0.5;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
          }
       }
       part { name: "glow2b"; mouse_events: 0;
@@ -1339,8 +1362,8 @@ group { name: "elm/panes/vertical/enventor";
             align: 0.0 0.5;
          }
          description { state: "active" 0.0;
-           inherit: "default" 0.0;
-           color: 255 255 255 255;
+            inherit: "default" 0.0;
+            color: 255 255 255 255;
          }
       }
       part { name: "bar1"; type: RECT; repeat_events: 1;
@@ -1671,14 +1694,12 @@ group { name: "elm/button/base/enventor";
       program {
          signal: "elm,anim,activate"; source: "elm";
          action: STATE_SET "clicked" 0.0;
-         target: "base";
          target: "text2";
          after: "button_unpressed_anim";
       }
       program { name: "button_unpressed_anim";
          action: STATE_SET "default" 0.0;
          in: 0.5 0.0;
-         target: "base";
          target: "text2";
       }
       program {
@@ -1881,7 +1902,7 @@ group { name: "elm/entry/base/enventor";
          source: "kbd-tap5.wav";
       }
    }
-   
+
    styles {
       style { name: "entry_style";
          base: "font="FN" font_size=10 color=#ffffff style=shadow,bottom shadow_color=#00000080 wrap=word text_class=enventor_entry color_class=enventor_entry left_margin=2 right_margin=2 tabstops=10";

m4/efl_attribute.m4

@@ -1,56 +0,0 @@
-dnl Copyright (C) 2011 Vincent Torri <vtorri at univ-evry dot fr>
-dnl That code is public domain and can be freely used or copied.
-
-dnl Macros for checking if the compiler supports some __attribute__ uses
-
-dnl Usage: EFL_ATTRIBUTE_UNUSED
-dnl call AC_DEFINE for __UNUSED__ if __attribute__((unused)) is available
-
-AC_DEFUN([EFL_ATTRIBUTE_UNUSED],
-[
-AC_MSG_CHECKING([for __attribute__ ((unused))])
-AC_COMPILE_IFELSE(
-   [AC_LANG_PROGRAM(
-       [[
-void foo(int x __attribute__ ((unused))) {}
-       ]],
-       [[
-       ]])],
-   [have_attribute_unused="yes"],
-   [have_attribute_unused="no"])
-AC_MSG_RESULT([${have_attribute_unused}])
-
-if test "x${have_attribute_unused}" = "xyes" ; then
-   AC_DEFINE([__UNUSED__], [__attribute__ ((unused))], [Macro declaring a function argument to be unused.])
-else
-   AC_DEFINE([__UNUSED__], [], [__attribute__ ((unused)) is not supported.])
-fi
-])
-
-dnl Usage: EFL_ATTRIBUTE_VECTOR
-dnl call AC_DEFINE for HAVE_GCC_ATTRIBUTE_VECTOR if __attribute__((vector)) is available
-
-AC_DEFUN([EFL_ATTRIBUTE_VECTOR],
-[
-AC_MSG_CHECKING([for __attribute__ ((vector))])
-AC_COMPILE_IFELSE(
-   [AC_LANG_PROGRAM(
-       [[
-typedef int v4si __attribute__ ((vector_size (16)));
-       ]],
-       [[
-if (sizeof(v4si) == 16)
-  return 0;
-else
-  return -1;
-       ]])],
-   [have_attribute_vector="yes"],
-   [have_attribute_vector="no"])
-AC_MSG_RESULT([${have_attribute_vector}])
-
-if test "x${have_attribute_vector}" = "xyes" ; then
-   AC_DEFINE([HAVE_GCC_ATTRIBUTE_VECTOR], [1], [Define to 1 if your compiler supports __attribute__ ((vector)).])
-fi
-])
-
-dnl End of efl_attribute.m4

meson.build

@@ -0,0 +1,150 @@
+project('enventor', 'c',
+  version : '1.0.99',
+  meson_version : '>= 0.53',
+  default_options : [
+    'warning_level=2',
+    'buildtype=debugoptimized',
+    'c_std=c99'
+  ]
+)
+
+v_array = meson.project_version().split('.')
+v_maj = v_array[0]
+v_min = v_array[1]
+v_mic = v_array[2]
+
+# install paths
+
+dir_prefix = get_option('prefix')
+dir_include = join_paths(dir_prefix, get_option('includedir'))
+dir_pkginclude = join_paths(dir_include, meson.project_name())
+dir_bin = join_paths(dir_prefix, get_option('bindir'))
+dir_lib = join_paths(dir_prefix, get_option('libdir'))
+dir_data = join_paths(dir_prefix, get_option('datadir'))
+dir_pkgdata = join_paths(dir_data, meson.project_name())
+dir_locale = join_paths(dir_prefix, get_option('localedir'))
+
+# binaries
+
+cc = meson.get_compiler('c')
+
+enventor_cflags = []
+enventor_cflags_try = [
+  '-Wshadow',
+  '-Wstrict-prototypes',
+  '-Werror=missing-prototypes',
+  '-Werror=pointer-arith',
+  '-Wno-missing-field-initializers']
+
+foreach cf: enventor_cflags_try
+  if cc.has_argument(cf) == true
+    enventor_cflags += cf
+  endif
+endforeach
+add_global_arguments(enventor_cflags, language: 'c')
+
+have_visibility_hidden = cc.has_argument('-fvisibility=hidden')
+if have_visibility_hidden
+  add_global_arguments('-fvisibility=hidden', language: 'c')
+endif
+
+pkgconfig = import('pkgconfig')
+windows = import('windows')
+
+eet = find_program('eet', native: true)
+eet_exe = [ eet ]
+
+edje_cc = find_program('edje_cc', native: true)
+edje_cc_exe = [ edje_cc ]
+
+# libraries
+
+config_dir = [include_directories('.')]
+
+efl_req = '>= 1.18.0'
+enventor_deps = [
+  dependency('eina', version : efl_req),
+  dependency('eo', version : efl_req),
+  dependency('efl', version : efl_req),
+  dependency('eet', version : efl_req),
+  dependency('ecore', version : efl_req),
+  dependency('ecore-file', version : efl_req),
+  dependency('evas', version : efl_req),
+  dependency('eio', version : efl_req),
+  dependency('efreet', version : efl_req),
+  dependency('edje', version : efl_req),
+  dependency('elementary', version : efl_req)
+]
+
+requirement_enventor_pc = ' eina ' + efl_req + ' eo ' + efl_req + ' efl ' + efl_req + ' eet ' + efl_req + ' ecore ' + efl_req + ' ecore-file ' + efl_req + ' evas ' + efl_req + ' eio ' + efl_req + ' efreet ' + efl_req + ' edje ' + efl_req + ' elementary ' + efl_req
+
+enventor_cargs = [
+  '-D_POSIX_C_SOURCE=200809L',
+  '-D_XOPEN_SOURCE=500' ]
+
+have_nls = false
+if get_option('nls') == true
+  intl_dep = cc.find_library('intl', required: false)
+  if intl_dep.found() == true and cc.has_header('libintl.h') == true
+    enventor_deps += cc.find_library('intl', required: true)
+    enventor_cargs += '-DENABLE_NLS'
+    have_nls = true
+  endif
+endif
+
+# configuration
+
+config_h = configuration_data()
+config_h.set_quoted('PACKAGE_NAME', meson.project_name())
+config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
+config_h.set_quoted('PACKAGE_BIN_DIR', dir_bin)
+config_h.set_quoted('PACKAGE_LIB_DIR', dir_lib)
+config_h.set_quoted('PACKAGE_DATA_DIR', dir_pkgdata)
+config_h.set_quoted('LOCALE_DIR', dir_locale)
+config_h.set('EFL_BETA_API_SUPPORT', '1')
+config_h.set('EFL_UI_FOCUS_OBJECT_PROTECTED', '1')
+config_h.set('ENVENTOR_BETA_API_SUPPORT', '1')
+
+subdir('src/lib')
+subdir('src/bin')
+subdir('data/autocomp')
+subdir('data/color')
+subdir('data/desktop')
+subdir('data/help')
+subdir('data/icon')
+subdir('data/images')
+subdir('data/reference')
+subdir('data/sounds')
+subdir('data/templates')
+subdir('data/themes/default')
+subdir('pc')
+subdir('po')
+
+install_data(
+  sources     : 'README',
+  install_dir : join_paths(dir_pkgdata, 'docs')
+)
+
+# Use config_h after all subdirs have set values
+
+configure_file(output : 'config.h', configuration : config_h)
+
+# output
+
+summary({'OS': host_machine.system(),
+         'NLS': have_nls ? 'yes' : 'no'
+        }, section: 'Configuration Options Summary:')
+
+summary({'prefix': dir_prefix,
+         'bindir': dir_bin,
+         'libdir': dir_lib,
+         'incdir': dir_include,
+         'pkgincdir': dir_pkginclude,
+         'datadir': dir_data,
+         'pkgdatadir': dir_pkgdata,
+         'localedir': dir_locale,
+        }, section: 'Directories:')
+
+summary({'compilation': 'ninja',
+         'installation': 'ninja install',
+        }, section: 'Compilation')

meson_options.txt

@@ -0,0 +1,6 @@
+
+option('nls',
+  type: 'boolean',
+  value: true,
+  description: 'enable localization: (default=true)'
+)

pc/meson.build

@@ -0,0 +1,20 @@
+
+pkgconf = configuration_data()
+
+pkgconf.set('prefix', get_option('prefix'))
+pkgconf.set('exec_prefix', '${prefix}')
+pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
+pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
+pkgconf.set('pkgincludedir', '${prefix}/@0@'.format(get_option('includedir')) + '/enventor')
+pkgconf.set('ENVENTOR_VERSION_MAJOR', v_maj)
+pkgconf.set('VERSION', meson.project_version())
+pkgconf.set('requirement_enventor', requirement_enventor_pc)
+
+pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
+
+configure_file(
+  input : join_paths(meson.source_root(), 'pc/enventor.pc.in'),
+  output : 'enventor.pc',
+  configuration : pkgconf,
+  install_dir : pkg_install_dir
+)

po/LINGUAS

@@ -1 +1 @@
-en ru
+en fr it ka sl ru

po/POTFILES.in

@@ -2,7 +2,6 @@ src/bin/base_gui.c
 src/bin/config_data.c
 src/bin/console.c
 src/bin/file_mgr.c
-src/bin/globals.c
 src/bin/goto.c
 src/bin/live_edit.c
 src/bin/main.c

po/en.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enventor 0.6.0\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2016-06-05 13:38+0900\n"
+"POT-Creation-Date: 2016-08-28 01:00+0900\n"
 "PO-Revision-Date: 2015-11-17 17:37+0000\n"
 "Last-Translator: nikawhite belyavskijnb@gmail.com \n"
 "Language-Team: \n"
@@ -16,399 +16,481 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/bin/base_gui.c:67
+#: src/bin/base_gui.c:70
 #, c-format
 msgid "%s - Enventor"
 msgstr ""
 
-#: src/bin/config_data.c:72
+#: src/bin/config_data.c:76
 msgid "Failed to generate tmp folder!"
 msgstr ""
 
-#: src/bin/config_data.c:91 src/bin/config_data.c:104
+#: src/bin/config_data.c:97
 #, c-format
 msgid "Cannot create a config folder \"%s\""
 msgstr ""
 
-#: src/bin/config_data.c:115
+#: src/bin/config_data.c:111
+#, c-format
+msgid "Cannot create a enventor config folder \"%s\""
+msgstr ""
+
+#: src/bin/config_data.c:122
 #, c-format
 msgid "Cannot save a config file \"%s\""
 msgstr ""
 
-#: src/bin/config_data.c:157
+#: src/bin/config_data.c:161
 #, c-format
 msgid "Cannot load a config file \"%s\""
 msgstr ""
 
-#: src/bin/config_data.c:165 src/bin/file_mgr.c:193 src/bin/goto.c:136
-#: src/bin/menu.c:613 src/bin/newfile.c:144 src/bin/panes.c:321
-#: src/bin/search.c:337 src/bin/setting.c:187 src/bin/statusbar.c:312
-#: src/bin/text_setting.c:405 src/bin/text_setting.c:456
-#: src/bin/text_setting.c:487 src/bin/text_setting.c:956 src/bin/tools.c:186
+#: src/bin/config_data.c:169
 msgid "Failed to allocate Memory!"
 msgstr ""
 
-#: src/bin/file_mgr.c:71
+#: src/bin/file_mgr.c:89
 msgid "EDC has been changed on the file system."
 msgstr ""
 
-#: src/bin/file_mgr.c:73
+#: src/bin/file_mgr.c:91
 msgid "Do you want to replace the contents?"
 msgstr ""
 
-#: src/bin/file_mgr.c:84
+#: src/bin/file_mgr.c:102
 msgid "Save As"
 msgstr ""
 
-#: src/bin/file_mgr.c:92 src/bin/search.c:407
+#: src/bin/file_mgr.c:110 src/bin/search.c:421
 msgid "Replace"
 msgstr ""
 
-#: src/bin/file_mgr.c:98
+#: src/bin/file_mgr.c:116
 msgid "Ignore"
 msgstr ""
 
-#: src/bin/file_mgr.c:157
+#: src/bin/file_mgr.c:197
 #, c-format
 msgid "File saved. \"%s\""
 msgstr ""
 
-#: src/bin/file_mgr.c:159
+#: src/bin/file_mgr.c:199
 #, c-format
 msgid "Already saved. \"%s\""
 msgstr ""
 
-#: src/bin/goto.c:93
+#: src/bin/goto.c:78
 msgid "Invalid line number"
 msgstr ""
 
-#: src/bin/goto.c:142
+#: src/bin/goto.c:133
 msgid "Enventor Goto Line"
 msgstr ""
 
-#: src/bin/goto.c:146
+#: src/bin/goto.c:137
 msgid "Go to Line"
 msgstr ""
 
-#: src/bin/goto.c:168
+#: src/bin/goto.c:158
 #, c-format
 msgid "Enter line number [1..%d]:"
 msgstr ""
 
-#: src/bin/goto.c:192 src/bin/menu.c:150
+#: src/bin/goto.c:182 src/bin/menu.c:154
 msgid "Ok"
 msgstr ""
 
-#: src/bin/goto.c:204 src/bin/search.c:429
+#: src/bin/goto.c:194 src/bin/search.c:443
 msgid "Failed to grab key - Escape"
 msgstr ""
 
-#: src/bin/live_edit.c:2019 src/bin/live_edit.c:2063 src/bin/live_edit.c:2065
-#: src/bin/main.c:850 src/lib/auto_comp.c:369 src/lib/ctxpopup.c:766
+#: src/bin/live_edit.c:2020 src/bin/live_edit.c:2057 src/bin/live_edit.c:2059
+#: src/bin/main.c:870 src/lib/auto_comp.c:410 src/lib/ctxpopup.c:779
 #, c-format
 msgid "Failed to grab key - %s"
 msgstr ""
 
-#: src/bin/live_edit.c:2132
+#: src/bin/live_edit.c:2140
 msgid ""
-"Double click part to confirm. (Esc = cancel, Direction Key = move item per "
-"pixel, Ctrl = disable auto-aligning)"
+"Double click part to confirm.(Esc = cancel, Direction Key = move item per "
+"pixel,Ctrl = disable auto-aligning)"
 msgstr ""
 
-#: src/bin/live_edit.c:2280
+#: src/bin/live_edit.c:2160
+msgid ""
+"Add a Rect part to the live view.<br>A Rect part is used as a solid "
+"color<br>component or clipping other components."
+msgstr ""
+
+#: src/bin/live_edit.c:2166
+msgid ""
+"Add a Text part to the live view.<br>A Text part is used for plain text."
+msgstr ""
+
+#: src/bin/live_edit.c:2171
+msgid ""
+"Add an Image part to the live view.<br>An Image part contains a single "
+"image<br>resource, usually an image file."
+msgstr ""
+
+#: src/bin/live_edit.c:2177
+msgid ""
+"Add a Swallow part to the live view.<br>A Swallow part is a placeholder "
+"for<br>objects that you may want to<br>include in the layout later."
+msgstr ""
+
+#: src/bin/live_edit.c:2184
+msgid ""
+"Add a Textblock part to the live view.<br>A Textblock part is a rich-text "
+"part<br>that can show big chunks of text."
+msgstr ""
+
+#: src/bin/live_edit.c:2190
+msgid ""
+"Add a Spacer part to the live view.<br>A Spacer part is an anchor to locate "
+"<br>other parts. It is invisible and<br>normally used for padding."
+msgstr ""
+
+#: src/bin/live_edit.c:2350
 msgid "Faild to allocate Memory!"
 msgstr ""
 
-#: src/bin/main.c:24
-msgid "Auto Completion Enabled."
-msgstr ""
-
-#: src/bin/main.c:25
-msgid "Auto Completion Disabled."
-msgstr ""
-
-#: src/bin/main.c:34
-msgid "Auto Indentation Enabled."
-msgstr ""
-
-#: src/bin/main.c:35
-msgid "Auto Indentation Disabled."
-msgstr ""
-
-#: src/bin/main.c:207
+#: src/bin/main.c:208
 #, c-format
 msgid "Font Size: %1.1fx"
 msgstr ""
 
-#: src/bin/menu.c:137
-msgid "New File: Choose a template"
+#: src/bin/main.c:942
+#, c-format
+msgid "Cannot create temporary diretory \"%s\""
 msgstr ""
 
-#: src/bin/menu.c:156 src/bin/menu.c:202 src/bin/setting.c:245
+#: src/bin/menu.c:141
+msgid "New File: Choose a Template"
+msgstr ""
+
+#: src/bin/menu.c:160 src/bin/menu.c:206 src/bin/setting.c:242
 msgid "Cancel"
 msgstr ""
 
-#: src/bin/menu.c:175
-msgid "Without save, you will lose last changes!"
+#: src/bin/menu.c:179
+msgid "You have unsaved changes."
 msgstr ""
 
-#: src/bin/menu.c:177
-msgid "Will you save changes?"
+#: src/bin/menu.c:181
+msgid "Do you want to save the changes?"
 msgstr ""
 
-#: src/bin/menu.c:188 src/bin/menu.c:466 src/bin/menu.c:582
+#: src/bin/menu.c:192 src/bin/menu.c:475 src/bin/menu.c:591
 msgid "Save"
 msgstr ""
 
-#: src/bin/menu.c:196
+#: src/bin/menu.c:200
 msgid "Discard"
 msgstr ""
 
-#: src/bin/menu.c:324
+#: src/bin/menu.c:328
 msgid "Choose a file to save"
 msgstr ""
 
-#: src/bin/menu.c:351
+#: src/bin/menu.c:365
 #, c-format
 msgid "Failed to save: %s."
 msgstr ""
 
-#: src/bin/menu.c:406
+#: src/bin/menu.c:419
 msgid "Support only .edc file."
 msgstr ""
 
-#: src/bin/menu.c:416
+#: src/bin/menu.c:429
 msgid "Choose a file to load."
 msgstr ""
 
-#: src/bin/menu.c:427
+#: src/bin/menu.c:440
 #, c-format
 msgid "Failed to load: %s."
 msgstr ""
 
-#: src/bin/menu.c:458
+#: src/bin/menu.c:467
 msgid "Save File: Choose a EDC"
 msgstr ""
 
-#: src/bin/menu.c:467 src/bin/menu.c:502
+#: src/bin/menu.c:476 src/bin/menu.c:511
 msgid "Close"
 msgstr ""
 
-#: src/bin/menu.c:492
+#: src/bin/menu.c:501
 msgid "Load File: Choose a EDC"
 msgstr ""
 
-#: src/bin/menu.c:501 src/bin/menu.c:586
+#: src/bin/menu.c:510 src/bin/menu.c:595
 msgid "Load"
 msgstr ""
 
-#: src/bin/menu.c:577
+#: src/bin/menu.c:586
 msgid "New"
 msgstr ""
 
-#: src/bin/menu.c:590 src/bin/setting.c:201
+#: src/bin/menu.c:599 src/bin/setting.c:198
 msgid "Settings"
 msgstr ""
 
-#: src/bin/menu.c:594
+#: src/bin/menu.c:603
 msgid "Help"
 msgstr ""
 
-#: src/bin/menu.c:598
+#: src/bin/menu.c:607
 msgid "Exit"
 msgstr ""
 
-#: src/bin/newfile.c:57 src/bin/newfile.c:82
-#, c-format
-msgid "Cannot find file! \"%s\""
-msgstr ""
-
-#: src/bin/newfile.c:128
+#: src/bin/newfile.c:79
 #, c-format
 msgid "Cannot find templates folder! \"%s\""
 msgstr ""
 
-#: src/bin/search.c:82
+#: src/bin/newfile.c:124 src/bin/newfile.c:146
+#, c-format
+msgid "Cannot find file! \"%s\""
+msgstr ""
+
+#: src/bin/search.c:96
 #, c-format
 msgid "%d matches replaced"
 msgstr ""
 
-#: src/bin/search.c:132 src/bin/search.c:194
+#: src/bin/search.c:145 src/bin/search.c:205
 #, c-format
 msgid "No \"%s\" in the text"
 msgstr ""
 
-#: src/bin/search.c:233 src/bin/search.c:399
-msgid "Backward"
+#: src/bin/search.c:242 src/bin/search.c:407
+msgid "Previous"
 msgstr ""
 
-#: src/bin/search.c:265 src/bin/search.c:392
-msgid "Forward"
+#: src/bin/search.c:274 src/bin/search.c:414
+msgid "Next"
 msgstr ""
 
-#: src/bin/search.c:343
+#: src/bin/search.c:358
 msgid "Enventor Search"
 msgstr ""
 
-#: src/bin/search.c:346
+#: src/bin/search.c:361
 msgid "Find/Replace"
 msgstr ""
 
-#: src/bin/search.c:414
+#: src/bin/search.c:428
 msgid "Replace All"
 msgstr ""
 
-#: src/bin/setting.c:213
+#: src/bin/setting.c:210
 msgid "Preferences"
 msgstr ""
 
-#: src/bin/setting.c:215
+#: src/bin/setting.c:212
 msgid "Text Editor"
 msgstr ""
 
-#: src/bin/setting.c:217
+#: src/bin/setting.c:214
 msgid "EDC Build"
 msgstr ""
 
-#: src/bin/setting.c:231
+#: src/bin/setting.c:228
 msgid "Apply"
 msgstr ""
 
-#: src/bin/setting.c:238
+#: src/bin/setting.c:235
 msgid "Reset"
 msgstr ""
 
-#: src/bin/text_setting.c:438
+#: src/bin/statusbar.c:319
+msgid "View zoom level (Ctrl + Mouse Wheel)<br>Zoom the live view in or out."
+msgstr ""
+
+#: src/bin/statusbar.c:325
+msgid "Resize the width and height of the live view."
+msgstr ""
+
+#: src/bin/statusbar.c:330
+msgid "Swap the width and height of the live view."
+msgstr ""
+
+#: src/bin/statusbar.c:340
+msgid ""
+"Mouse cursor position in live view.<br>Absolute coordinate | Relative "
+"coordinate."
+msgstr ""
+
+#: src/bin/statusbar.c:351
+msgid "Name of the current editing group."
+msgstr ""
+
+#: src/bin/statusbar.c:361
+msgid "Cursor line number : Max line number"
+msgstr ""
+
+#: src/bin/text_setting.c:552
 #, c-format
 msgid "Failed to open file \"%s\""
 msgstr ""
 
-#: src/bin/text_setting.c:759
+#: src/bin/text_setting.c:909
 msgid "Double click a keyword to change its color :"
 msgstr ""
 
-#: src/bin/text_setting.c:796
-msgid "Font Size "
-msgstr ""
-
-#: src/bin/text_setting.c:829
+#: src/bin/text_setting.c:1004
 msgid "Font Name"
 msgstr ""
 
-#: src/bin/text_setting.c:856
+#: src/bin/text_setting.c:1031
 msgid "Font Style"
 msgstr ""
 
-#: src/bin/tools.c:134
+#: src/bin/tools.c:142
 msgid "Redo text."
 msgstr ""
 
-#: src/bin/tools.c:136
+#: src/bin/tools.c:144
 msgid "No text to be redo."
 msgstr ""
 
-#: src/bin/tools.c:144
+#: src/bin/tools.c:152
 msgid "Undo text."
 msgstr ""
 
-#: src/bin/tools.c:146
+#: src/bin/tools.c:154
 msgid "No text to be undo."
 msgstr ""
 
-#: src/bin/tools.c:201
-msgid "Part Highlighting (Ctrl + H)"
+#: src/bin/tools.c:209
+msgid ""
+"Part highlighting (Ctrl + H)<br>Show a highlight effect on the selected "
+"part<br>in the live view."
 msgstr ""
 
-#: src/bin/tools.c:208
-msgid "Dummy Parts (Ctrl + W)"
+#: src/bin/tools.c:220
+msgid ""
+"Dummy parts (Ctrl + U)<br>Display virtual images for the swallow "
+"and<br>spacer parts."
 msgstr ""
 
-#: src/bin/tools.c:217
-msgid "Mirror Mode (Ctrl + M)"
+#: src/bin/tools.c:231
+msgid ""
+"Wireframes (Ctrl + W)<br>Display wireframes to identify the "
+"parts<br>boundaries."
 msgstr ""
 
-#: src/bin/tools.c:251
-msgid "Save File (Ctrl + S)"
+#: src/bin/tools.c:242
+msgid ""
+"Mirror mode (Ctrl + M)<br>Invert the layout horizontally and review<br>the "
+"designed layout in RTL(right-to-left)<br>LTR(left-to-right) settings."
 msgstr ""
 
-#: src/bin/tools.c:257
-msgid "Undo Text (Ctrl + Z)"
+#: src/bin/tools.c:280
+msgid "Save the file (Ctrl + S)<br>Save the current script to a file."
 msgstr ""
 
-#: src/bin/tools.c:263
-msgid "Redo Text (Ctrl + R)"
+#: src/bin/tools.c:288
+msgid "Undo text (Ctrl + Z)"
 msgstr ""
 
-#: src/bin/tools.c:269
-msgid "Find/Replace (Ctrl + F)"
+#: src/bin/tools.c:295
+msgid "Redo text (Ctrl + R)"
 msgstr ""
 
-#: src/bin/tools.c:276
-msgid "Goto Lines (Ctrl + L)"
+#: src/bin/tools.c:302
+msgid "Find/Replace (Ctrl + F)<br>Find or replace text."
 msgstr ""
 
-#: src/bin/tools.c:283
-msgid "Line Numbers (F5)"
+#: src/bin/tools.c:311
+msgid ""
+"Go to line (Ctrl + L)<br>Open the Go to window to move the cursor<br>line "
+"position."
 msgstr ""
 
-#: src/bin/tools.c:291
-msgid "Insert Template (Ctrl + T)"
+#: src/bin/tools.c:321
+msgid "Line numbers<br>Display the script line numbers."
 msgstr ""
 
-#: src/bin/tools.c:298
-msgid "Console Box (Alt + Down)"
+#: src/bin/tools.c:330
+msgid ""
+"Insert a code snippet (Ctrl + T)<br>Enventor chooses the best code with "
+"regards<br>to the current editing context. For instance,<br>if the cursor is "
+"inside a part section,<br>description code is generated."
 msgstr ""
 
-#: src/bin/tools.c:305
-msgid "File Browser (F9)"
+#: src/bin/tools.c:342
+msgid ""
+"Console box (Alt + Down)<br>Display the console box, which shows the "
+"EDC<br>build logs, such as error messages. It pops<br>up automatically when "
+"compliation errors occur."
 msgstr ""
 
-#: src/bin/tools.c:312
-msgid "EDC Navigator (F10)"
+#: src/bin/tools.c:353
+msgid ""
+"File browser (F9)<br>Display the file browser, which shows a file list<br>in "
+"current workspace."
 msgstr ""
 
-#: src/bin/tools.c:319
-msgid "Status (F11)"
+#: src/bin/tools.c:363
+msgid ""
+"EDC navigator (F10)<br>Display the EDC navigator, which shows the "
+"current<br>group hierarchy tree that contains parts,<br>descriptions and "
+"programs lists."
 msgstr ""
 
-#: src/bin/tools.c:326
-msgid "Enventor Menu (Esc)"
+#: src/bin/tools.c:375
+msgid ""
+"File tab (F11)<br>Display the file tab in the bottom area<br>It shows an "
+"opened file list to switch<br>files quickly. to switch files quickly."
 msgstr ""
 
-#: src/bin/tools.c:371
-msgid "Part Highlighting Enabled."
+#: src/bin/tools.c:386
+msgid "Enventor menu (Esc)<br>Open the Enventor main menu."
 msgstr ""
 
-#: src/bin/tools.c:373
-msgid "Part Highlighting Disabled."
+#: src/bin/tools.c:432
+msgid "Part highlighting enabled."
 msgstr ""
 
-#: src/bin/tools.c:458
-msgid "Dummy Parts Enabled."
+#: src/bin/tools.c:434
+msgid "Part highlighting disabled."
 msgstr ""
 
-#: src/bin/tools.c:460
-msgid "Dummy Parts Disabled."
+#: src/bin/tools.c:519
+msgid "Dummy parts enabled."
 msgstr ""
 
-#: src/bin/tools.c:483
-msgid "Mirror Mode Enabled."
+#: src/bin/tools.c:521
+msgid "Dummy parts disabled."
 msgstr ""
 
-#: src/bin/tools.c:485
-msgid "Mirror Mode Disabled."
+#: src/bin/tools.c:543
+msgid "Wireframes enabled."
 msgstr ""
 
-#: src/bin/tools.c:539
+#: src/bin/tools.c:545
+msgid "Wireframes disabled."
+msgstr ""
+
+#: src/bin/tools.c:568
+msgid "Mirror mode enabled."
+msgstr ""
+
+#: src/bin/tools.c:570
+msgid "Mirror mode disabled."
+msgstr ""
+
+#: src/bin/tools.c:624
 msgid "Insertion of template code is disabled while in Live Edit mode"
 msgstr ""
 
-#: src/bin/tools.c:548
+#: src/bin/tools.c:635
 #, c-format
 msgid "Template code inserted, (%s)"
 msgstr ""
 
-#: src/bin/tools.c:554
+#: src/bin/tools.c:641
 msgid ""
 "Can't insert template code here. Move the cursor inside the \"Collections,"
 "Images,Parts,Part,Programs\" scope."

po/enventor.pot

@@ -1,14 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Enventor development team
-# This file is distributed under the same license as the PACKAGE package.
+# This file is put in the public domain.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: enventor 0.9.0\n"
-"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2016-06-05 13:38+0900\n"
+"Project-Id-Version: enventor\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-05 11:59+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,399 +16,481 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/bin/base_gui.c:67
+#: src/bin/base_gui.c:70
 #, c-format
 msgid "%s - Enventor"
 msgstr ""
 
-#: src/bin/config_data.c:72
+#: src/bin/config_data.c:78
 msgid "Failed to generate tmp folder!"
 msgstr ""
 
-#: src/bin/config_data.c:91 src/bin/config_data.c:104
+#: src/bin/config_data.c:99
 #, c-format
 msgid "Cannot create a config folder \"%s\""
 msgstr ""
 
-#: src/bin/config_data.c:115
+#: src/bin/config_data.c:113
+#, c-format
+msgid "Cannot create a enventor config folder \"%s\""
+msgstr ""
+
+#: src/bin/config_data.c:124
 #, c-format
 msgid "Cannot save a config file \"%s\""
 msgstr ""
 
-#: src/bin/config_data.c:157
+#: src/bin/config_data.c:163
 #, c-format
 msgid "Cannot load a config file \"%s\""
 msgstr ""
 
-#: src/bin/config_data.c:165 src/bin/file_mgr.c:193 src/bin/goto.c:136
-#: src/bin/menu.c:613 src/bin/newfile.c:144 src/bin/panes.c:321
-#: src/bin/search.c:337 src/bin/setting.c:187 src/bin/statusbar.c:312
-#: src/bin/text_setting.c:405 src/bin/text_setting.c:456
-#: src/bin/text_setting.c:487 src/bin/text_setting.c:956 src/bin/tools.c:186
+#: src/bin/config_data.c:171
 msgid "Failed to allocate Memory!"
 msgstr ""
 
-#: src/bin/file_mgr.c:71
+#: src/bin/file_mgr.c:89
 msgid "EDC has been changed on the file system."
 msgstr ""
 
-#: src/bin/file_mgr.c:73
+#: src/bin/file_mgr.c:91
 msgid "Do you want to replace the contents?"
 msgstr ""
 
-#: src/bin/file_mgr.c:84
+#: src/bin/file_mgr.c:102
 msgid "Save As"
 msgstr ""
 
-#: src/bin/file_mgr.c:92 src/bin/search.c:407
+#: src/bin/file_mgr.c:110 src/bin/search.c:427
 msgid "Replace"
 msgstr ""
 
-#: src/bin/file_mgr.c:98
+#: src/bin/file_mgr.c:116
 msgid "Ignore"
 msgstr ""
 
-#: src/bin/file_mgr.c:157
+#: src/bin/file_mgr.c:197
 #, c-format
 msgid "File saved. \"%s\""
 msgstr ""
 
-#: src/bin/file_mgr.c:159
+#: src/bin/file_mgr.c:199
 #, c-format
 msgid "Already saved. \"%s\""
 msgstr ""
 
-#: src/bin/goto.c:93
+#: src/bin/goto.c:78
 msgid "Invalid line number"
 msgstr ""
 
-#: src/bin/goto.c:142
+#: src/bin/goto.c:133
 msgid "Enventor Goto Line"
 msgstr ""
 
-#: src/bin/goto.c:146
+#: src/bin/goto.c:137
 msgid "Go to Line"
 msgstr ""
 
-#: src/bin/goto.c:168
+#: src/bin/goto.c:158
 #, c-format
 msgid "Enter line number [1..%d]:"
 msgstr ""
 
-#: src/bin/goto.c:192 src/bin/menu.c:150
+#: src/bin/goto.c:182 src/bin/menu.c:154
 msgid "Ok"
 msgstr ""
 
-#: src/bin/goto.c:204 src/bin/search.c:429
+#: src/bin/goto.c:194 src/bin/search.c:449
 msgid "Failed to grab key - Escape"
 msgstr ""
 
-#: src/bin/live_edit.c:2019 src/bin/live_edit.c:2063 src/bin/live_edit.c:2065
-#: src/bin/main.c:850 src/lib/auto_comp.c:369 src/lib/ctxpopup.c:766
+#: src/bin/live_edit.c:2020 src/bin/live_edit.c:2057 src/bin/live_edit.c:2059
+#: src/bin/main.c:872 src/lib/auto_comp.c:410 src/lib/ctxpopup.c:813
 #, c-format
 msgid "Failed to grab key - %s"
 msgstr ""
 
-#: src/bin/live_edit.c:2132
+#: src/bin/live_edit.c:2140
 msgid ""
-"Double click part to confirm. (Esc = cancel, Direction Key = move item per "
-"pixel, Ctrl = disable auto-aligning)"
+"Double click part to confirm.(Esc = cancel, Direction Key = move item per "
+"pixel,Ctrl = disable auto-aligning)"
 msgstr ""
 
-#: src/bin/live_edit.c:2280
+#: src/bin/live_edit.c:2160
+msgid ""
+"Add a Rect part to the live view.<br>A Rect part is used as a solid "
+"color<br>component or clipping other components."
+msgstr ""
+
+#: src/bin/live_edit.c:2166
+msgid ""
+"Add a Text part to the live view.<br>A Text part is used for plain text."
+msgstr ""
+
+#: src/bin/live_edit.c:2171
+msgid ""
+"Add an Image part to the live view.<br>An Image part contains a single "
+"image<br>resource, usually an image file."
+msgstr ""
+
+#: src/bin/live_edit.c:2177
+msgid ""
+"Add a Swallow part to the live view.<br>A Swallow part is a placeholder "
+"for<br>objects that you may want to<br>include in the layout later."
+msgstr ""
+
+#: src/bin/live_edit.c:2184
+msgid ""
+"Add a Textblock part to the live view.<br>A Textblock part is a rich-text "
+"part<br>that can show big chunks of text."
+msgstr ""
+
+#: src/bin/live_edit.c:2190
+msgid ""
+"Add a Spacer part to the live view.<br>A Spacer part is an anchor to locate "
+"<br>other parts. It is invisible and<br>normally used for padding."
+msgstr ""
+
+#: src/bin/live_edit.c:2350
 msgid "Faild to allocate Memory!"
 msgstr ""
 
-#: src/bin/main.c:24
-msgid "Auto Completion Enabled."
-msgstr ""
-
-#: src/bin/main.c:25
-msgid "Auto Completion Disabled."
-msgstr ""
-
-#: src/bin/main.c:34
-msgid "Auto Indentation Enabled."
-msgstr ""
-
-#: src/bin/main.c:35
-msgid "Auto Indentation Disabled."
-msgstr ""
-
-#: src/bin/main.c:207
+#: src/bin/main.c:212
 #, c-format
 msgid "Font Size: %1.1fx"
 msgstr ""
 
-#: src/bin/menu.c:137
-msgid "New File: Choose a template"
+#: src/bin/main.c:944
+#, c-format
+msgid "Cannot create temporary diretory \"%s\""
 msgstr ""
 
-#: src/bin/menu.c:156 src/bin/menu.c:202 src/bin/setting.c:245
+#: src/bin/menu.c:141
+msgid "New File: Choose a Template"
+msgstr ""
+
+#: src/bin/menu.c:160 src/bin/menu.c:206 src/bin/setting.c:242
 msgid "Cancel"
 msgstr ""
 
-#: src/bin/menu.c:175
-msgid "Without save, you will lose last changes!"
+#: src/bin/menu.c:179
+msgid "You have unsaved changes."
 msgstr ""
 
-#: src/bin/menu.c:177
-msgid "Will you save changes?"
+#: src/bin/menu.c:181
+msgid "Do you want to save the changes?"
 msgstr ""
 
-#: src/bin/menu.c:188 src/bin/menu.c:466 src/bin/menu.c:582
+#: src/bin/menu.c:192 src/bin/menu.c:475 src/bin/menu.c:591
 msgid "Save"
 msgstr ""
 
-#: src/bin/menu.c:196
+#: src/bin/menu.c:200
 msgid "Discard"
 msgstr ""
 
-#: src/bin/menu.c:324
+#: src/bin/menu.c:328
 msgid "Choose a file to save"
 msgstr ""
 
-#: src/bin/menu.c:351
+#: src/bin/menu.c:365
 #, c-format
 msgid "Failed to save: %s."
 msgstr ""
 
-#: src/bin/menu.c:406
+#: src/bin/menu.c:419
 msgid "Support only .edc file."
 msgstr ""
 
-#: src/bin/menu.c:416
+#: src/bin/menu.c:429
 msgid "Choose a file to load."
 msgstr ""
 
-#: src/bin/menu.c:427
+#: src/bin/menu.c:440
 #, c-format
 msgid "Failed to load: %s."
 msgstr ""
 
-#: src/bin/menu.c:458
+#: src/bin/menu.c:467
 msgid "Save File: Choose a EDC"
 msgstr ""
 
-#: src/bin/menu.c:467 src/bin/menu.c:502
+#: src/bin/menu.c:476 src/bin/menu.c:511
 msgid "Close"
 msgstr ""
 
-#: src/bin/menu.c:492
+#: src/bin/menu.c:501
 msgid "Load File: Choose a EDC"
 msgstr ""
 
-#: src/bin/menu.c:501 src/bin/menu.c:586
+#: src/bin/menu.c:510 src/bin/menu.c:595
 msgid "Load"
 msgstr ""
 
-#: src/bin/menu.c:577
+#: src/bin/menu.c:586
 msgid "New"
 msgstr ""
 
-#: src/bin/menu.c:590 src/bin/setting.c:201
+#: src/bin/menu.c:599 src/bin/setting.c:198
 msgid "Settings"
 msgstr ""
 
-#: src/bin/menu.c:594
+#: src/bin/menu.c:603
 msgid "Help"
 msgstr ""
 
-#: src/bin/menu.c:598
+#: src/bin/menu.c:607
 msgid "Exit"
 msgstr ""
 
-#: src/bin/newfile.c:57 src/bin/newfile.c:82
-#, c-format
-msgid "Cannot find file! \"%s\""
-msgstr ""
-
-#: src/bin/newfile.c:128
+#: src/bin/newfile.c:79
 #, c-format
 msgid "Cannot find templates folder! \"%s\""
 msgstr ""
 
-#: src/bin/search.c:82
+#: src/bin/newfile.c:124 src/bin/newfile.c:146
+#, c-format
+msgid "Cannot find file! \"%s\""
+msgstr ""
+
+#: src/bin/search.c:96
 #, c-format
 msgid "%d matches replaced"
 msgstr ""
 
-#: src/bin/search.c:132 src/bin/search.c:194
+#: src/bin/search.c:150 src/bin/search.c:210
 #, c-format
 msgid "No \"%s\" in the text"
 msgstr ""
 
-#: src/bin/search.c:233 src/bin/search.c:399
-msgid "Backward"
+#: src/bin/search.c:248 src/bin/search.c:413
+msgid "Previous"
 msgstr ""
 
-#: src/bin/search.c:265 src/bin/search.c:392
-msgid "Forward"
+#: src/bin/search.c:280 src/bin/search.c:420
+msgid "Next"
 msgstr ""
 
-#: src/bin/search.c:343
+#: src/bin/search.c:364
 msgid "Enventor Search"
 msgstr ""
 
-#: src/bin/search.c:346
+#: src/bin/search.c:367
 msgid "Find/Replace"
 msgstr ""
 
-#: src/bin/search.c:414
+#: src/bin/search.c:434
 msgid "Replace All"
 msgstr ""
 
-#: src/bin/setting.c:213
+#: src/bin/setting.c:210
 msgid "Preferences"
 msgstr ""
 
-#: src/bin/setting.c:215
+#: src/bin/setting.c:212
 msgid "Text Editor"
 msgstr ""
 
-#: src/bin/setting.c:217
+#: src/bin/setting.c:214
 msgid "EDC Build"
 msgstr ""
 
-#: src/bin/setting.c:231
+#: src/bin/setting.c:228
 msgid "Apply"
 msgstr ""
 
-#: src/bin/setting.c:238
+#: src/bin/setting.c:235
 msgid "Reset"
 msgstr ""
 
-#: src/bin/text_setting.c:438
+#: src/bin/statusbar.c:319
+msgid "View zoom level (Ctrl + Mouse Wheel)<br>Zoom the live view in or out."
+msgstr ""
+
+#: src/bin/statusbar.c:325
+msgid "Resize the width and height of the live view."
+msgstr ""
+
+#: src/bin/statusbar.c:330
+msgid "Swap the width and height of the live view."
+msgstr ""
+
+#: src/bin/statusbar.c:340
+msgid ""
+"Mouse cursor position in live view.<br>Absolute coordinate | Relative "
+"coordinate."
+msgstr ""
+
+#: src/bin/statusbar.c:351
+msgid "Name of the current editing group."
+msgstr ""
+
+#: src/bin/statusbar.c:361
+msgid "Cursor line number : Max line number"
+msgstr ""
+
+#: src/bin/text_setting.c:552
 #, c-format
 msgid "Failed to open file \"%s\""
 msgstr ""
 
-#: src/bin/text_setting.c:759
+#: src/bin/text_setting.c:915
 msgid "Double click a keyword to change its color :"
 msgstr ""
 
-#: src/bin/text_setting.c:796
-msgid "Font Size "
-msgstr ""
-
-#: src/bin/text_setting.c:829
+#: src/bin/text_setting.c:1010
 msgid "Font Name"
 msgstr ""
 
-#: src/bin/text_setting.c:856
+#: src/bin/text_setting.c:1037
 msgid "Font Style"
 msgstr ""
 
-#: src/bin/tools.c:134
+#: src/bin/tools.c:142
 msgid "Redo text."
 msgstr ""
 
-#: src/bin/tools.c:136
+#: src/bin/tools.c:144
 msgid "No text to be redo."
 msgstr ""
 
-#: src/bin/tools.c:144
+#: src/bin/tools.c:152
 msgid "Undo text."
 msgstr ""
 
-#: src/bin/tools.c:146
+#: src/bin/tools.c:154
 msgid "No text to be undo."
 msgstr ""
 
-#: src/bin/tools.c:201
-msgid "Part Highlighting (Ctrl + H)"
+#: src/bin/tools.c:244
+msgid ""
+"Part highlighting (Ctrl + H)<br>Show a highlight effect on the selected "
+"part<br>in the live view."
 msgstr ""
 
-#: src/bin/tools.c:208
-msgid "Dummy Parts (Ctrl + W)"
+#: src/bin/tools.c:256
+msgid ""
+"Dummy parts (Ctrl + U)<br>Display virtual images for the swallow "
+"and<br>spacer parts."
 msgstr ""
 
-#: src/bin/tools.c:217
-msgid "Mirror Mode (Ctrl + M)"
+#: src/bin/tools.c:268
+msgid ""
+"Wireframes (Ctrl + W)<br>Display wireframes to identify the "
+"parts<br>boundaries."
 msgstr ""
 
-#: src/bin/tools.c:251
-msgid "Save File (Ctrl + S)"
+#: src/bin/tools.c:280
+msgid ""
+"Mirror mode (Ctrl + M)<br>Invert the layout horizontally and review<br>the "
+"designed layout in RTL(right-to-left)<br>LTR(left-to-right) settings."
 msgstr ""
 
-#: src/bin/tools.c:257
-msgid "Undo Text (Ctrl + Z)"
+#: src/bin/tools.c:348
+msgid "Save the file (Ctrl + S)<br>Save the current script to a file."
 msgstr ""
 
-#: src/bin/tools.c:263
-msgid "Redo Text (Ctrl + R)"
+#: src/bin/tools.c:357
+msgid "Undo text (Ctrl + Z)"
 msgstr ""
 
-#: src/bin/tools.c:269
-msgid "Find/Replace (Ctrl + F)"
-msgstr ""
-
-#: src/bin/tools.c:276
-msgid "Goto Lines (Ctrl + L)"
-msgstr ""
-
-#: src/bin/tools.c:283
-msgid "Line Numbers (F5)"
-msgstr ""
-
-#: src/bin/tools.c:291
-msgid "Insert Template (Ctrl + T)"
-msgstr ""
-
-#: src/bin/tools.c:298
-msgid "Console Box (Alt + Down)"
-msgstr ""
-
-#: src/bin/tools.c:305
-msgid "File Browser (F9)"
-msgstr ""
-
-#: src/bin/tools.c:312
-msgid "EDC Navigator (F10)"
-msgstr ""
-
-#: src/bin/tools.c:319
-msgid "Status (F11)"
-msgstr ""
-
-#: src/bin/tools.c:326
-msgid "Enventor Menu (Esc)"
-msgstr ""
-
-#: src/bin/tools.c:371
-msgid "Part Highlighting Enabled."
+#: src/bin/tools.c:365
+msgid "Redo text (Ctrl + R)"
 msgstr ""
 
 #: src/bin/tools.c:373
-msgid "Part Highlighting Disabled."
+msgid "Find/Replace (Ctrl + F)<br>Find or replace text."
 msgstr ""
 
-#: src/bin/tools.c:458
-msgid "Dummy Parts Enabled."
+#: src/bin/tools.c:383
+msgid ""
+"Go to line (Ctrl + L)<br>Open the Go to window to move the cursor<br>line "
+"position."
 msgstr ""
 
-#: src/bin/tools.c:460
-msgid "Dummy Parts Disabled."
+#: src/bin/tools.c:394
+msgid "Line numbers<br>Display the script line numbers."
 msgstr ""
 
-#: src/bin/tools.c:483
-msgid "Mirror Mode Enabled."
+#: src/bin/tools.c:404
+msgid ""
+"Insert a code snippet (Ctrl + T)<br>Enventor chooses the best code with "
+"regards<br>to the current editing context. For instance,<br>if the cursor is "
+"inside a part section,<br>description code is generated."
 msgstr ""
 
-#: src/bin/tools.c:485
-msgid "Mirror Mode Disabled."
+#: src/bin/tools.c:418
+msgid ""
+"Console box (Alt + Down)<br>Display the console box, which shows the "
+"EDC<br>build logs, such as error messages. It pops<br>up automatically when "
+"compilation errors occur."
 msgstr ""
 
-#: src/bin/tools.c:539
+#: src/bin/tools.c:430
+msgid ""
+"File browser (F9)<br>Display the file browser, which shows a file list<br>in "
+"current workspace."
+msgstr ""
+
+#: src/bin/tools.c:441
+msgid ""
+"EDC navigator (F10)<br>Display the EDC navigator, which shows the "
+"current<br>group hierarchy tree that contains parts,<br>descriptions and "
+"programs lists."
+msgstr ""
+
+#: src/bin/tools.c:453
+msgid ""
+"File tab (F11)<br>Display the file tab in the bottom area<br>It shows an "
+"opened file list to switch<br>files quickly."
+msgstr ""
+
+#: src/bin/tools.c:467
+msgid "Enventor menu (Esc)<br>Open the Enventor main menu."
+msgstr ""
+
+#: src/bin/tools.c:514
+msgid "Part highlighting enabled."
+msgstr ""
+
+#: src/bin/tools.c:516
+msgid "Part highlighting disabled."
+msgstr ""
+
+#: src/bin/tools.c:601
+msgid "Dummy parts enabled."
+msgstr ""
+
+#: src/bin/tools.c:603
+msgid "Dummy parts disabled."
+msgstr ""
+
+#: src/bin/tools.c:625
+msgid "Wireframes enabled."
+msgstr ""
+
+#: src/bin/tools.c:627
+msgid "Wireframes disabled."
+msgstr ""
+
+#: src/bin/tools.c:650
+msgid "Mirror mode enabled."
+msgstr ""
+
+#: src/bin/tools.c:652
+msgid "Mirror mode disabled."
+msgstr ""
+
+#: src/bin/tools.c:706
 msgid "Insertion of template code is disabled while in Live Edit mode"
 msgstr ""
 
-#: src/bin/tools.c:548
+#: src/bin/tools.c:717
 #, c-format
 msgid "Template code inserted, (%s)"
 msgstr ""
 
-#: src/bin/tools.c:554
+#: src/bin/tools.c:723
 msgid ""
 "Can't insert template code here. Move the cursor inside the \"Collections,"
 "Images,Parts,Part,Programs\" scope."

po/fr.po

@@ -0,0 +1,545 @@
+# French translation for Enventor.
+# This file is distributed under the same license as the enventor package.
+# similar <similar@orange.fr>, 2020, 2021.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enventor\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2021-12-05 11:59+0100\n"
+"PO-Revision-Date: 2021-12-05 13:42+0100\n"
+"Last-Translator: Philippe Jean Guillaumie <similar@orange.fr>\n"
+"Language-Team: French\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 3.0\n"
+
+#: src/bin/base_gui.c:70
+#, c-format
+msgid "%s - Enventor"
+msgstr "%s - Enventor"
+
+#: src/bin/config_data.c:78
+msgid "Failed to generate tmp folder!"
+msgstr "Impossible de générer un dossier temporaire !"
+
+#: src/bin/config_data.c:99
+#, c-format
+msgid "Cannot create a config folder \"%s\""
+msgstr "Impossible de créer le dossier de configuration « %s »"
+
+#: src/bin/config_data.c:113
+#, c-format
+msgid "Cannot create a enventor config folder \"%s\""
+msgstr "Impossible de créer le dossier de configuration Enventor « %s »"
+
+#: src/bin/config_data.c:124
+#, c-format
+msgid "Cannot save a config file \"%s\""
+msgstr "Échec de l'enregistrement du fichier de configuration « %s »"
+
+#: src/bin/config_data.c:163
+#, c-format
+msgid "Cannot load a config file \"%s\""
+msgstr "Échec du chargement du fichier de configuration « %s »"
+
+#: src/bin/config_data.c:171
+msgid "Failed to allocate Memory!"
+msgstr "Impossible d'allouer de la mémoire !"
+
+#: src/bin/file_mgr.c:89
+msgid "EDC has been changed on the file system."
+msgstr "EDC a été modifié sur le système de fichiers."
+
+#: src/bin/file_mgr.c:91
+msgid "Do you want to replace the contents?"
+msgstr "Voulez-vous remplacer le contenu ?"
+
+#: src/bin/file_mgr.c:102
+msgid "Save As"
+msgstr "Enregistrer sous"
+
+#: src/bin/file_mgr.c:110 src/bin/search.c:427
+msgid "Replace"
+msgstr "Remplacer"
+
+#: src/bin/file_mgr.c:116
+msgid "Ignore"
+msgstr "Ignorer"
+
+#: src/bin/file_mgr.c:197
+#, c-format
+msgid "File saved. \"%s\""
+msgstr "Fichier « %s » enregistré."
+
+#: src/bin/file_mgr.c:199
+#, c-format
+msgid "Already saved. \"%s\""
+msgstr "Fichier « %s » déjà enregistré."
+
+#: src/bin/goto.c:78
+msgid "Invalid line number"
+msgstr "Numéro de ligne non valide"
+
+#: src/bin/goto.c:133
+msgid "Enventor Goto Line"
+msgstr "Enventor Se rendre à une ligne"
+
+#: src/bin/goto.c:137
+msgid "Go to Line"
+msgstr "Aller à la ligne"
+
+#: src/bin/goto.c:158
+#, c-format
+msgid "Enter line number [1..%d]:"
+msgstr "Entrer le numéro de ligne [1..%d] :"
+
+#: src/bin/goto.c:182 src/bin/menu.c:154
+msgid "Ok"
+msgstr "OK"
+
+#: src/bin/goto.c:194 src/bin/search.c:449
+msgid "Failed to grab key - Escape"
+msgstr "Impossible d'accaparer la touche - Échap"
+
+#: src/bin/live_edit.c:2020 src/bin/live_edit.c:2057 src/bin/live_edit.c:2059
+#: src/bin/main.c:872 src/lib/auto_comp.c:410 src/lib/ctxpopup.c:813
+#, c-format
+msgid "Failed to grab key - %s"
+msgstr "Impossible d'accaparer la touche - %s"
+
+#: src/bin/live_edit.c:2140
+msgid ""
+"Double click part to confirm.(Esc = cancel, Direction Key = move item per "
+"pixel,Ctrl = disable auto-aligning)"
+msgstr ""
+"Double clic sur la partie pour confirmer. (Échap = annuler, touches de "
+"direction = déplacer d'un pixel à la fois, Ctrl = désactiver l'auto-"
+"alignement)"
+
+#: src/bin/live_edit.c:2160
+msgid ""
+"Add a Rect part to the live view.<br>A Rect part is used as a solid "
+"color<br>component or clipping other components."
+msgstr ""
+"Ajouter une partie Rect à l'aperçu.<br>Cette partie est utilisée comme un "
+"élément de couleur<br>unie ou pour cacher d'autres éléments."
+
+#: src/bin/live_edit.c:2166
+msgid ""
+"Add a Text part to the live view.<br>A Text part is used for plain text."
+msgstr ""
+"Ajouter une partie Text à l'aperçu.<br>Cette partie est utilisée pour le "
+"texte ordinaire."
+
+#: src/bin/live_edit.c:2171
+msgid ""
+"Add an Image part to the live view.<br>An Image part contains a single "
+"image<br>resource, usually an image file."
+msgstr ""
+"Ajouter une partie Image à l'aperçu.<br>Cette partie contient une seule "
+"ressource,<br>généralement un fichier image."
+
+#: src/bin/live_edit.c:2177
+msgid ""
+"Add a Swallow part to the live view.<br>A Swallow part is a placeholder "
+"for<br>objects that you may want to<br>include in the layout later."
+msgstr ""
+"Ajouter une partie Swallow à l'aperçu.<br>Cette partie est un espace réservé "
+"pour<br>des objets que vous souhaitez inclure <br>plus tard dans votre "
+"composition."
+
+#: src/bin/live_edit.c:2184
+msgid ""
+"Add a Textblock part to the live view.<br>A Textblock part is a rich-text "
+"part<br>that can show big chunks of text."
+msgstr ""
+"Ajouter une partie Textblock à l'aperçu.<br>Cette partie affiche du texte "
+"formaté pouvant<br>contenir de gros blocs de texte."
+
+#: src/bin/live_edit.c:2190
+msgid ""
+"Add a Spacer part to the live view.<br>A Spacer part is an anchor to locate "
+"<br>other parts. It is invisible and<br>normally used for padding."
+msgstr ""
+"Ajouter une partie Spacer à l'aperçu.<br>Cette partie est un ancrage pour "
+"accueillir<br>d'autres éléments. Elle est invisible et<br>sert "
+"principalement pour le padding."
+
+#: src/bin/live_edit.c:2350
+msgid "Faild to allocate Memory!"
+msgstr "Impossible d'allouer de la mémoire !"
+
+#: src/bin/main.c:212
+#, c-format
+msgid "Font Size: %1.1fx"
+msgstr "Taille de la police : %1.1fx"
+
+#: src/bin/main.c:944
+#, c-format
+msgid "Cannot create temporary diretory \"%s\""
+msgstr "Impossible de créer le dossier temporaire « %s »"
+
+#: src/bin/menu.c:141
+msgid "New File: Choose a Template"
+msgstr "Nouveau fichier : choisir un modèle"
+
+#: src/bin/menu.c:160 src/bin/menu.c:206 src/bin/setting.c:242
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/bin/menu.c:179
+msgid "You have unsaved changes."
+msgstr "Des changements n'ont pas été enregistrés."
+
+#: src/bin/menu.c:181
+msgid "Do you want to save the changes?"
+msgstr "Voulez-vous enregistrer les modifications ?"
+
+#: src/bin/menu.c:192 src/bin/menu.c:475 src/bin/menu.c:591
+msgid "Save"
+msgstr "Enregistrer"
+
+#: src/bin/menu.c:200
+msgid "Discard"
+msgstr "Abandonner"
+
+#: src/bin/menu.c:328
+msgid "Choose a file to save"
+msgstr "Choisir un fichier à enregistrer"
+
+#: src/bin/menu.c:365
+#, c-format
+msgid "Failed to save: %s."
+msgstr "Impossible d'enregistrer : %s."
+
+#: src/bin/menu.c:419
+msgid "Support only .edc file."
+msgstr "Seuls les fichiers .edc sont pris en charge."
+
+#: src/bin/menu.c:429
+msgid "Choose a file to load."
+msgstr "Choisir un fichier à charger."
+
+#: src/bin/menu.c:440
+#, c-format
+msgid "Failed to load: %s."
+msgstr "Impossible de charger : %s."
+
+#: src/bin/menu.c:467
+msgid "Save File: Choose a EDC"
+msgstr "Enregistrer un fichier : choisir un EDC"
+
+#: src/bin/menu.c:476 src/bin/menu.c:511
+msgid "Close"
+msgstr "Fermer"
+
+#: src/bin/menu.c:501
+msgid "Load File: Choose a EDC"
+msgstr "Charger un fichier : choisir un EDC"
+
+#: src/bin/menu.c:510 src/bin/menu.c:595
+msgid "Load"
+msgstr "Charger"
+
+#: src/bin/menu.c:586
+msgid "New"
+msgstr "Nouveau"
+
+#: src/bin/menu.c:599 src/bin/setting.c:198
+msgid "Settings"
+msgstr "Configuration"
+
+#: src/bin/menu.c:603
+msgid "Help"
+msgstr "Aide"
+
+#: src/bin/menu.c:607
+msgid "Exit"
+msgstr "Quitter"
+
+#: src/bin/newfile.c:79
+#, c-format
+msgid "Cannot find templates folder! \"%s\""
+msgstr "Dossier des modèles « %s » introuvable !"
+
+#: src/bin/newfile.c:124 src/bin/newfile.c:146
+#, c-format
+msgid "Cannot find file! \"%s\""
+msgstr "Fichier « %s » introuvable !"
+
+#: src/bin/search.c:96
+#, c-format
+msgid "%d matches replaced"
+msgstr "%d correspondances remplacées"
+
+#: src/bin/search.c:150 src/bin/search.c:210
+#, c-format
+msgid "No \"%s\" in the text"
+msgstr "Aucun « %s » dans le texte"
+
+#: src/bin/search.c:248 src/bin/search.c:413
+msgid "Previous"
+msgstr "Précédent"
+
+#: src/bin/search.c:280 src/bin/search.c:420
+msgid "Next"
+msgstr "Suivant"
+
+#: src/bin/search.c:364
+msgid "Enventor Search"
+msgstr "Enventor Rechercher"
+
+#: src/bin/search.c:367
+msgid "Find/Replace"
+msgstr "Rechercher / Remplacer"
+
+#: src/bin/search.c:434
+msgid "Replace All"
+msgstr "Remplacer tout"
+
+#: src/bin/setting.c:210
+msgid "Preferences"
+msgstr "Préférences"
+
+#: src/bin/setting.c:212
+msgid "Text Editor"
+msgstr "Éditeur de texte"
+
+#: src/bin/setting.c:214
+msgid "EDC Build"
+msgstr "Construire EDC"
+
+#: src/bin/setting.c:228
+msgid "Apply"
+msgstr "Appliquer"
+
+#: src/bin/setting.c:235
+msgid "Reset"
+msgstr "Rétablir"
+
+#: src/bin/statusbar.c:319
+msgid "View zoom level (Ctrl + Mouse Wheel)<br>Zoom the live view in or out."
+msgstr "Niveau de zoom (Ctrl+molette souris)<br>Agrandir ou réduire l'aperçu."
+
+#: src/bin/statusbar.c:325
+msgid "Resize the width and height of the live view."
+msgstr "Redimensionner la largeur et la hauteur de l'aperçu."
+
+#: src/bin/statusbar.c:330
+msgid "Swap the width and height of the live view."
+msgstr "Interchanger la largeur et la hauteur de l'aperçu."
+
+#: src/bin/statusbar.c:340
+msgid ""
+"Mouse cursor position in live view.<br>Absolute coordinate | Relative "
+"coordinate."
+msgstr ""
+"Position du pointeur de la souris dans l'aperçu.<br>Coordonnée absolue | "
+"Coordonnée relative."
+
+#: src/bin/statusbar.c:351
+msgid "Name of the current editing group."
+msgstr "Nom du groupe en cours d'édition."
+
+#: src/bin/statusbar.c:361
+msgid "Cursor line number : Max line number"
+msgstr "Numéro de ligne du curseur : nombre de lignes max."
+
+#: src/bin/text_setting.c:552
+#, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Impossible d'ouvrir le fichier « %s »"
+
+#: src/bin/text_setting.c:915
+msgid "Double click a keyword to change its color :"
+msgstr "Double clic sur un mot-clé pour changer sa couleur :"
+
+#: src/bin/text_setting.c:1010
+msgid "Font Name"
+msgstr "Nom de la police"
+
+#: src/bin/text_setting.c:1037
+msgid "Font Style"
+msgstr "Style de la police"
+
+#: src/bin/tools.c:142
+msgid "Redo text."
+msgstr "Répéter le texte."
+
+#: src/bin/tools.c:144
+msgid "No text to be redo."
+msgstr "Aucun texte à répéter."
+
+#: src/bin/tools.c:152
+msgid "Undo text."
+msgstr "Annuler le texte."
+
+#: src/bin/tools.c:154
+msgid "No text to be undo."
+msgstr "Aucun texte à annuler."
+
+#: src/bin/tools.c:244
+msgid ""
+"Part highlighting (Ctrl + H)<br>Show a highlight effect on the selected "
+"part<br>in the live view."
+msgstr ""
+"Surbrillance (Ctrl+H)<br>Mise en évidence de la partie<br>sélectionnée dans "
+"l'aperçu."
+
+#: src/bin/tools.c:256
+msgid ""
+"Dummy parts (Ctrl + U)<br>Display virtual images for the swallow "
+"and<br>spacer parts."
+msgstr ""
+"Maquette (Ctrl+U)<br>Affiche des images factices pour les<br>parties Swallow "
+"et Spacer."
+
+#: src/bin/tools.c:268
+msgid ""
+"Wireframes (Ctrl + W)<br>Display wireframes to identify the "
+"parts<br>boundaries."
+msgstr ""
+"Encadrement (Ctrl+W)<br>Affiche des guides pour délimiter<br>les différentes "
+"parties."
+
+#: src/bin/tools.c:280
+msgid ""
+"Mirror mode (Ctrl + M)<br>Invert the layout horizontally and review<br>the "
+"designed layout in RTL(right-to-left)<br>LTR(left-to-right) settings."
+msgstr ""
+"Miroir (Ctrl+M)<br>Inverse horizontalement la composition et permet "
+"de<br>tester les dispositions RTL (de droite à gauche)<br>et LTR (de gauche "
+"à droite)."
+
+#: src/bin/tools.c:348
+msgid "Save the file (Ctrl + S)<br>Save the current script to a file."
+msgstr ""
+"Enregistrer le fichier (Ctrl+S)<br>Enregistre le script actuel dans un "
+"fichier."
+
+#: src/bin/tools.c:357
+msgid "Undo text (Ctrl + Z)"
+msgstr "Annuler texte (Ctrl+Z)"
+
+#: src/bin/tools.c:365
+msgid "Redo text (Ctrl + R)"
+msgstr "Répéter texte (Ctrl+R)"
+
+#: src/bin/tools.c:373
+msgid "Find/Replace (Ctrl + F)<br>Find or replace text."
+msgstr "Chercher / Remplacer (Ctrl+F)<br>Cherche ou remplace du texte."
+
+#: src/bin/tools.c:383
+msgid ""
+"Go to line (Ctrl + L)<br>Open the Go to window to move the cursor<br>line "
+"position."
+msgstr ""
+"Aller à la ligne (Ctrl+L)<br>Ouvre une boîte de dialogue pour déplacer<br>le "
+"curseur à la ligne indiquée."
+
+#: src/bin/tools.c:394
+msgid "Line numbers<br>Display the script line numbers."
+msgstr "Numéros de lignes<br>Affiche les numéros de lignes."
+
+#: src/bin/tools.c:404
+msgid ""
+"Insert a code snippet (Ctrl + T)<br>Enventor chooses the best code with "
+"regards<br>to the current editing context. For instance,<br>if the cursor is "
+"inside a part section,<br>description code is generated."
+msgstr ""
+"Insérer un extrait de code (Ctrl+T)<br>Enventor sélectionne le code le plus "
+"adapté au contexte<br>actuel. Par exemple, si le curseur se trouve<br>dans "
+"une section Part, un code de<br>description est généré."
+
+#: src/bin/tools.c:418
+msgid ""
+"Console box (Alt + Down)<br>Display the console box, which shows the "
+"EDC<br>build logs, such as error messages. It pops<br>up automatically when "
+"compilation errors occur."
+msgstr ""
+"Console (Alt+Flèche bas)<br>Affiche les journaux EDC tels que les messages "
+"d'erreur.<br>Elle apparaît automatiquement quand des<br>erreurs de "
+"compilation se produisent."
+
+#: src/bin/tools.c:430
+msgid ""
+"File browser (F9)<br>Display the file browser, which shows a file list<br>in "
+"current workspace."
+msgstr ""
+"Navigateur de fichiers (F9)<br>Affiche le navigateur pour lister les "
+"fichiers<br>de l'espace de travail actuel."
+
+#: src/bin/tools.c:441
+msgid ""
+"EDC navigator (F10)<br>Display the EDC navigator, which shows the "
+"current<br>group hierarchy tree that contains parts,<br>descriptions and "
+"programs lists."
+msgstr ""
+"Navigateur EDC (F10)<br>Affiche le navigateur montrant l'arbre hiérarchique "
+"de<br>l'EDC actuel qui contient les parties, descriptions<br>et listes de "
+"programmes."
+
+#: src/bin/tools.c:453
+msgid ""
+"File tab (F11)<br>Display the file tab in the bottom area<br>It shows an "
+"opened file list to switch<br>files quickly."
+msgstr ""
+"Onglet (F11)<br>Affiche l'onglet de la zone inférieure qui regroupe<br>les "
+"fichiers EDC et permet de passer<br>rapidement de l'un à l'autre."
+
+#: src/bin/tools.c:467
+msgid "Enventor menu (Esc)<br>Open the Enventor main menu."
+msgstr "Enventor Menu (Échap)<br>Ouvre le menu principal d'Enventor."
+
+#: src/bin/tools.c:514
+msgid "Part highlighting enabled."
+msgstr "Mode surbrillance activé."
+
+#: src/bin/tools.c:516
+msgid "Part highlighting disabled."
+msgstr "Mode surbrillance désactivé."
+
+#: src/bin/tools.c:601
+msgid "Dummy parts enabled."
+msgstr "Mode maquette activé."
+
+#: src/bin/tools.c:603
+msgid "Dummy parts disabled."
+msgstr "Mode maquette désactivé."
+
+#: src/bin/tools.c:625
+msgid "Wireframes enabled."
+msgstr "Mode encadrement activé."
+
+#: src/bin/tools.c:627
+msgid "Wireframes disabled."
+msgstr "Mode encadrement désactivé."
+
+#: src/bin/tools.c:650
+msgid "Mirror mode enabled."
+msgstr "Mode miroir activé."
+
+#: src/bin/tools.c:652
+msgid "Mirror mode disabled."
+msgstr "Mode miroir désactivé."
+
+#: src/bin/tools.c:706
+msgid "Insertion of template code is disabled while in Live Edit mode"
+msgstr "L'insertion de modèles de code est désactivée en mode Live Edit"
+
+#: src/bin/tools.c:717
+#, c-format
+msgid "Template code inserted, (%s)"
+msgstr "Insertion du modèle de code, (%s)"
+
+#: src/bin/tools.c:723
+msgid ""
+"Can't insert template code here. Move the cursor inside the \"Collections,"
+"Images,Parts,Part,Programs\" scope."
+msgstr ""
+"L'insertion d'un modèle de code n'est pas possible ici. Déplacer le curseur "
+"dans la section « Collections,Images,Parts,Part,Programs »."

po/it.po

@@ -0,0 +1,540 @@
+# Italian translation for enventor.
+# This file is distributed under the same license as the enventor package.
+# Massimo Maiurana <maiurana@gmail.com>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enventor 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-05 11:59+0100\n"
+"PO-Revision-Date: 2021-12-05 12:01+0100\n"
+"Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
+"Language-Team: none\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/bin/base_gui.c:70
+#, c-format
+msgid "%s - Enventor"
+msgstr "%s - Enventor"
+
+#: src/bin/config_data.c:78
+msgid "Failed to generate tmp folder!"
+msgstr "Non ho potuto creare la directory temporanea!"
+
+#: src/bin/config_data.c:99
+#, c-format
+msgid "Cannot create a config folder \"%s\""
+msgstr "Non ho potuto creare una directory di configurazione \"%s\""
+
+#: src/bin/config_data.c:113
+#, c-format
+msgid "Cannot create a enventor config folder \"%s\""
+msgstr ""
+"Non ho potuto creare una directory di configurazione di enventor \"%s\""
+
+#: src/bin/config_data.c:124
+#, c-format
+msgid "Cannot save a config file \"%s\""
+msgstr "Non ho potuto salvare un file di configurazione \"%s\""
+
+#: src/bin/config_data.c:163
+#, c-format
+msgid "Cannot load a config file \"%s\""
+msgstr "Non ho potuto caricare un file di configurazione \"%s\""
+
+#: src/bin/config_data.c:171
+msgid "Failed to allocate Memory!"
+msgstr "Non ho potuto allocare memoria!"
+
+#: src/bin/file_mgr.c:89
+msgid "EDC has been changed on the file system."
+msgstr "Il file EDC è cambiato sul file system."
+
+#: src/bin/file_mgr.c:91
+msgid "Do you want to replace the contents?"
+msgstr "Vuoi sostituire il contenuto?"
+
+#: src/bin/file_mgr.c:102
+msgid "Save As"
+msgstr "Salva con nome"
+
+#: src/bin/file_mgr.c:110 src/bin/search.c:427
+msgid "Replace"
+msgstr "Sostituisci"
+
+#: src/bin/file_mgr.c:116
+msgid "Ignore"
+msgstr "Ignora"
+
+#: src/bin/file_mgr.c:197
+#, c-format
+msgid "File saved. \"%s\""
+msgstr "File salvato. \"%s\""
+
+#: src/bin/file_mgr.c:199
+#, c-format
+msgid "Already saved. \"%s\""
+msgstr "Già salvato. \"%s\""
+
+#: src/bin/goto.c:78
+msgid "Invalid line number"
+msgstr "Numero di riga non valido"
+
+#: src/bin/goto.c:133
+msgid "Enventor Goto Line"
+msgstr "Enventor va alla riga"
+
+#: src/bin/goto.c:137
+msgid "Go to Line"
+msgstr "Vai alla riga"
+
+#: src/bin/goto.c:158
+#, c-format
+msgid "Enter line number [1..%d]:"
+msgstr "Inserire il numero della rigar [1..%d]:"
+
+#: src/bin/goto.c:182 src/bin/menu.c:154
+msgid "Ok"
+msgstr "Ok"
+
+#: src/bin/goto.c:194 src/bin/search.c:449
+msgid "Failed to grab key - Escape"
+msgstr "Non ho potuto acquisire il tasto - Escape"
+
+#: src/bin/live_edit.c:2020 src/bin/live_edit.c:2057 src/bin/live_edit.c:2059
+#: src/bin/main.c:872 src/lib/auto_comp.c:410 src/lib/ctxpopup.c:813
+#, c-format
+msgid "Failed to grab key - %s"
+msgstr "Non ho potuto acquisire il tasto -%s"
+
+#: src/bin/live_edit.c:2140
+msgid ""
+"Double click part to confirm.(Esc = cancel, Direction Key = move item per "
+"pixel,Ctrl = disable auto-aligning)"
+msgstr ""
+"Doppio clic sulla parte per confermare. (Esc = annulla, tasti direzione = "
+"sposta un pixel per volta, Ctrl = disabilita allineamento automatico)"
+
+#: src/bin/live_edit.c:2160
+msgid ""
+"Add a Rect part to the live view.<br>A Rect part is used as a solid "
+"color<br>component or clipping other components."
+msgstr ""
+"Aggiunge una parte Rect all'anteprima.<br>Una parte Rect viene usata come un "
+"componente<br>di colore pieno o per il clipping di altri componenti."
+
+#: src/bin/live_edit.c:2166
+msgid ""
+"Add a Text part to the live view.<br>A Text part is used for plain text."
+msgstr ""
+"§Aggiunge una parte Text all'anteprima.<br> Una parte Text viene usata per "
+"il testo semplice."
+
+#: src/bin/live_edit.c:2171
+msgid ""
+"Add an Image part to the live view.<br>An Image part contains a single "
+"image<br>resource, usually an image file."
+msgstr ""
+"Aggiunge una parte Image all'anteprima.<br> Una parte Image contiene solo "
+"una risorsa immagine,<br> di solito un file"
+
+#: src/bin/live_edit.c:2177
+msgid ""
+"Add a Swallow part to the live view.<br>A Swallow part is a placeholder "
+"for<br>objects that you may want to<br>include in the layout later."
+msgstr ""
+"Aggiunge una parte Swallow all'anteprima.<br>Una parte Swallow è un "
+"segnaposto per oggetti che<br>possono essere inclusi nel layout "
+"successivamente."
+
+#: src/bin/live_edit.c:2184
+msgid ""
+"Add a Textblock part to the live view.<br>A Textblock part is a rich-text "
+"part<br>that can show big chunks of text."
+msgstr ""
+"Aggiunge una parte Textblok all'anteprima.<br>Una parte Textblock contiene "
+"testo formattato e<br>può visualizzare grossi spezzoni di testo."
+
+#: src/bin/live_edit.c:2190
+msgid ""
+"Add a Spacer part to the live view.<br>A Spacer part is an anchor to locate "
+"<br>other parts. It is invisible and<br>normally used for padding."
+msgstr ""
+"Aggiunge una parte Spacer all'anteprima.<br>Una parte Spacer è un'ancora per "
+"altre parti.<br>È invisibile e viene usata normalmente per il padding."
+
+#: src/bin/live_edit.c:2350
+msgid "Faild to allocate Memory!"
+msgstr "Non ho potuto allocare memoria!"
+
+#: src/bin/main.c:212
+#, c-format
+msgid "Font Size: %1.1fx"
+msgstr "Dimensione font: %1.1fx"
+
+#: src/bin/main.c:944
+#, c-format
+msgid "Cannot create temporary diretory \"%s\""
+msgstr "Non ho potuto creare la directory temporanea \"%s\""
+
+#: src/bin/menu.c:141
+msgid "New File: Choose a Template"
+msgstr "Nuovo file: scegliere un modello"
+
+#: src/bin/menu.c:160 src/bin/menu.c:206 src/bin/setting.c:242
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/bin/menu.c:179
+msgid "You have unsaved changes."
+msgstr "Ci sono modifiche non salvate."
+
+#: src/bin/menu.c:181
+msgid "Do you want to save the changes?"
+msgstr "Volete salvare le modifiche?"
+
+#: src/bin/menu.c:192 src/bin/menu.c:475 src/bin/menu.c:591
+msgid "Save"
+msgstr "Salva"
+
+#: src/bin/menu.c:200
+msgid "Discard"
+msgstr "Scarta"
+
+#: src/bin/menu.c:328
+msgid "Choose a file to save"
+msgstr "Scegliere un file da salvare"
+
+#: src/bin/menu.c:365
+#, c-format
+msgid "Failed to save: %s."
+msgstr "Impossibile salvare: %s."
+
+#: src/bin/menu.c:419
+msgid "Support only .edc file."
+msgstr "Solo i file .edc sono supportati."
+
+#: src/bin/menu.c:429
+msgid "Choose a file to load."
+msgstr "Scegliere un file da aprire."
+
+#: src/bin/menu.c:440
+#, c-format
+msgid "Failed to load: %s."
+msgstr "Impossibile aprire: %s."
+
+#: src/bin/menu.c:467
+msgid "Save File: Choose a EDC"
+msgstr "Salva file: scegliere un EDC"
+
+#: src/bin/menu.c:476 src/bin/menu.c:511
+msgid "Close"
+msgstr "Chiudi"
+
+#: src/bin/menu.c:501
+msgid "Load File: Choose a EDC"
+msgstr "Apri file: scegliere un EDC"
+
+#: src/bin/menu.c:510 src/bin/menu.c:595
+msgid "Load"
+msgstr "Apri"
+
+#: src/bin/menu.c:586
+msgid "New"
+msgstr "Nuovo"
+
+#: src/bin/menu.c:599 src/bin/setting.c:198
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: src/bin/menu.c:603
+msgid "Help"
+msgstr "Aiuto"
+
+#: src/bin/menu.c:607
+msgid "Exit"
+msgstr "Esci"
+
+#: src/bin/newfile.c:79
+#, c-format
+msgid "Cannot find templates folder! \"%s\""
+msgstr "Non riesco a trovare la cartella dei modelli! \"%s\""
+
+#: src/bin/newfile.c:124 src/bin/newfile.c:146
+#, c-format
+msgid "Cannot find file! \"%s\""
+msgstr "Non riesco a trovare il file! \"%s\""
+
+#: src/bin/search.c:96
+#, c-format
+msgid "%d matches replaced"
+msgstr "%d corrispondenze sostituite"
+
+#: src/bin/search.c:150 src/bin/search.c:210
+#, c-format
+msgid "No \"%s\" in the text"
+msgstr "Non esiste \"%s\" nel testo"
+
+#: src/bin/search.c:248 src/bin/search.c:413
+msgid "Previous"
+msgstr "Precedente"
+
+#: src/bin/search.c:280 src/bin/search.c:420
+msgid "Next"
+msgstr "Successivo"
+
+#: src/bin/search.c:364
+msgid "Enventor Search"
+msgstr "Ricerca di Enventor"
+
+#: src/bin/search.c:367
+msgid "Find/Replace"
+msgstr "Trova/Sostituisci"
+
+#: src/bin/search.c:434
+msgid "Replace All"
+msgstr "Sostituisci tutto"
+
+#: src/bin/setting.c:210
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: src/bin/setting.c:212
+msgid "Text Editor"
+msgstr "Editor di testo"
+
+#: src/bin/setting.c:214
+msgid "EDC Build"
+msgstr "Compila EDC"
+
+#: src/bin/setting.c:228
+msgid "Apply"
+msgstr "Applica"
+
+#: src/bin/setting.c:235
+msgid "Reset"
+msgstr "Reimposta"
+
+#: src/bin/statusbar.c:319
+msgid "View zoom level (Ctrl + Mouse Wheel)<br>Zoom the live view in or out."
+msgstr ""
+"Livello dello zoom (Ctrl + rotella mouse)<br>Ingrandisce e rimpicciolisce "
+"l'anteprima"
+
+#: src/bin/statusbar.c:325
+msgid "Resize the width and height of the live view."
+msgstr "Ridimensiona larghezza e altezza dell'anteprima"
+
+#: src/bin/statusbar.c:330
+msgid "Swap the width and height of the live view."
+msgstr "Scambia larghezza e altezza dell'anteprima"
+
+#: src/bin/statusbar.c:340
+msgid ""
+"Mouse cursor position in live view.<br>Absolute coordinate | Relative "
+"coordinate."
+msgstr ""
+"Posizione puntatore nell'anteprima.<br> Coordinate assolute | Coordinate "
+"relative."
+
+#: src/bin/statusbar.c:351
+msgid "Name of the current editing group."
+msgstr "Nome del gruppo attualmente in modifica"
+
+#: src/bin/statusbar.c:361
+msgid "Cursor line number : Max line number"
+msgstr "Numero riga del cursore : numero massimo di righe"
+
+#: src/bin/text_setting.c:552
+#, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Non ho potuto aprire il file \"%s\""
+
+#: src/bin/text_setting.c:915
+msgid "Double click a keyword to change its color :"
+msgstr "Doppio clic su una keyword per cambiarne il colore"
+
+#: src/bin/text_setting.c:1010
+msgid "Font Name"
+msgstr "Nome del font"
+
+#: src/bin/text_setting.c:1037
+msgid "Font Style"
+msgstr "Stile del font"
+
+#: src/bin/tools.c:142
+msgid "Redo text."
+msgstr "Ripeti testo."
+
+#: src/bin/tools.c:144
+msgid "No text to be redo."
+msgstr "Nessun testo da ripetere."
+
+#: src/bin/tools.c:152
+msgid "Undo text."
+msgstr "Annulla testo"
+
+#: src/bin/tools.c:154
+msgid "No text to be undo."
+msgstr "Nessun testo da annullare"
+
+#: src/bin/tools.c:244
+msgid ""
+"Part highlighting (Ctrl + H)<br>Show a highlight effect on the selected "
+"part<br>in the live view."
+msgstr ""
+"Evidenziazione parte (Ctrl + H)<br>Mostra un effetto evidenziazione "
+"sulla<br>parte selezionata nell'anteprima."
+
+#: src/bin/tools.c:256
+msgid ""
+"Dummy parts (Ctrl + U)<br>Display virtual images for the swallow "
+"and<br>spacer parts."
+msgstr ""
+"Parti fittizie (Ctrl + U)<br>Mostra immagini virtuali per le "
+"parti<br>Swallow e Spacer."
+
+#: src/bin/tools.c:268
+msgid ""
+"Wireframes (Ctrl + W)<br>Display wireframes to identify the "
+"parts<br>boundaries."
+msgstr ""
+"Incorniciamento (Ctrl + W)<br>Mostra una cornice che identifica i<br>confini "
+"della parte."
+
+#: src/bin/tools.c:280
+msgid ""
+"Mirror mode (Ctrl + M)<br>Invert the layout horizontally and review<br>the "
+"designed layout in RTL(right-to-left)<br>LTR(left-to-right) settings."
+msgstr ""
+"Modalità specchio (§Ctrl + M)<br>Inverte orizzontalmente il layout e ne "
+"rivede le<br>impostazioni RTL (da destra a sinistra) e LTR<br>(da sinistra a "
+"destra)."
+
+#: src/bin/tools.c:348
+msgid "Save the file (Ctrl + S)<br>Save the current script to a file."
+msgstr "Salva il file (Ctrl + S)<br>Salva l'attuale script in un file."
+
+#: src/bin/tools.c:357
+msgid "Undo text (Ctrl + Z)"
+msgstr "Annulla testo (Ctrl + Z)"
+
+#: src/bin/tools.c:365
+msgid "Redo text (Ctrl + R)"
+msgstr "Ripeti testo (Ctrl + R)"
+
+#: src/bin/tools.c:373
+msgid "Find/Replace (Ctrl + F)<br>Find or replace text."
+msgstr "Trova/Sostituisci (Ctrl + F)<br>Trova o sostituisce il testo."
+
+#: src/bin/tools.c:383
+msgid ""
+"Go to line (Ctrl + L)<br>Open the Go to window to move the cursor<br>line "
+"position."
+msgstr ""
+"Vai alla riga (Ctrl + L)<br>Apre la fienstre \"Vai a\" per spostare "
+"la<br>riga in cui è posizionato il cursore."
+
+#: src/bin/tools.c:394
+msgid "Line numbers<br>Display the script line numbers."
+msgstr "Numeri di riga<br>Visualizza i numeri di riga dello script."
+
+#: src/bin/tools.c:404
+msgid ""
+"Insert a code snippet (Ctrl + T)<br>Enventor chooses the best code with "
+"regards<br>to the current editing context. For instance,<br>if the cursor is "
+"inside a part section,<br>description code is generated."
+msgstr ""
+"Inserisci codice (Ctrl + T)<br>Enventor sceglie il codice migliore sulla "
+"base del<br>contesto attuale. Ad esempio, se il cursore si trova<br>nella "
+"sezione \"part\" viene generato un codice<br>\"description\"."
+
+#: src/bin/tools.c:418
+msgid ""
+"Console box (Alt + Down)<br>Display the console box, which shows the "
+"EDC<br>build logs, such as error messages. It pops<br>up automatically when "
+"compilation errors occur."
+msgstr "Box console (Alt + Giù)<br>Visualizza il box console che mostra i messaggi del log<br>di compilazione dell'EDC, come quelli di errore. Viene<br>visualizzato automaticamente quando avviene un errore di<br>compilazione."
+
+#: src/bin/tools.c:430
+msgid ""
+"File browser (F9)<br>Display the file browser, which shows a file list<br>in "
+"current workspace."
+msgstr ""
+"Navigatore file (F9)<br>Visualizza un navigatore di file che mostra una "
+"lista<br>dei file nell'attuale spazio di lavoro."
+
+#: src/bin/tools.c:441
+msgid ""
+"EDC navigator (F10)<br>Display the EDC navigator, which shows the "
+"current<br>group hierarchy tree that contains parts,<br>descriptions and "
+"programs lists."
+msgstr ""
+"Navigatore EDC (F10)<br>Visualizza un navigatore di EDC che mostra "
+"l'albero<br>gerarchico dell'attuale EDC che contiene l'elenco di<br>parti, "
+"descrizioni e programmi."
+
+#: src/bin/tools.c:453
+msgid ""
+"File tab (F11)<br>Display the file tab in the bottom area<br>It shows an "
+"opened file list to switch<br>files quickly."
+msgstr ""
+"Etichette file (F11)<br>Visualizza le etichette dei file nell'area in fondo "
+"per<br>passare rapidamente da un file aperto all'altro."
+
+#: src/bin/tools.c:467
+msgid "Enventor menu (Esc)<br>Open the Enventor main menu."
+msgstr "Menù di Enventor (Esc)<br>Apre il menù principale di Enventor."
+
+#: src/bin/tools.c:514
+msgid "Part highlighting enabled."
+msgstr "Evidenziazione parte abilitata."
+
+#: src/bin/tools.c:516
+msgid "Part highlighting disabled."
+msgstr "Evidenziazione parte disabilitata."
+
+#: src/bin/tools.c:601
+msgid "Dummy parts enabled."
+msgstr "Parti fittizie abilitate."
+
+#: src/bin/tools.c:603
+msgid "Dummy parts disabled."
+msgstr "Parti fittizie disabilitate."
+
+#: src/bin/tools.c:625
+msgid "Wireframes enabled."
+msgstr "Incorniciamenti abilitati."
+
+#: src/bin/tools.c:627
+msgid "Wireframes disabled."
+msgstr "Incorniciamenti disabilitati."
+
+#: src/bin/tools.c:650
+msgid "Mirror mode enabled."
+msgstr "Modalità specchio abilitata."
+
+#: src/bin/tools.c:652
+msgid "Mirror mode disabled."
+msgstr "Modalità specchio disabilitata."
+
+#: src/bin/tools.c:706
+msgid "Insertion of template code is disabled while in Live Edit mode"
+msgstr ""
+"L'inserimento di modelli di codice è disabilitata in modalità Live Edit"
+
+#: src/bin/tools.c:717
+#, c-format
+msgid "Template code inserted, (%s)"
+msgstr "Modello di codice inserito, (%s)"
+
+#: src/bin/tools.c:723
+msgid ""
+"Can't insert template code here. Move the cursor inside the \"Collections,"
+"Images,Parts,Part,Programs\" scope."
+msgstr ""
+"Impossibile inserire modelli di codice qui. Spostare il cursore in "
+"\"Collections,Images,Parts,Part,Programs\\\""

po/ka.po

@@ -0,0 +1,543 @@
+# Georgian translation for enventor.
+# This file is put in the public domain.
+# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2023.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enventor\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-12-05 11:59+0100\n"
+"PO-Revision-Date: 2023-02-10 18:54+0100\n"
+"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
+"Language-Team: Georgian <(nothing)>\n"
+"Language: ka\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 3.2.2\n"
+
+#: src/bin/base_gui.c:70
+#, c-format
+msgid "%s - Enventor"
+msgstr "%s - Enventor"
+
+#: src/bin/config_data.c:78
+msgid "Failed to generate tmp folder!"
+msgstr "დროებითი საქაღალდის შექმნის შეცდომა!"
+
+#: src/bin/config_data.c:99
+#, c-format
+msgid "Cannot create a config folder \"%s\""
+msgstr "კონფიგურაციის საქაღალდის (\"%s\") შექმნის შეცდომა"
+
+#: src/bin/config_data.c:113
+#, c-format
+msgid "Cannot create a enventor config folder \"%s\""
+msgstr "Enventor-ის კონფიგურაციის საქაღალდის (\"%s\") შექმნის შეცდომა"
+
+#: src/bin/config_data.c:124
+#, c-format
+msgid "Cannot save a config file \"%s\""
+msgstr "კონფიგურაციის ფაილის (\"%s\") შენახვის შეცდომა"
+
+#: src/bin/config_data.c:163
+#, c-format
+msgid "Cannot load a config file \"%s\""
+msgstr "კონფიგურაციის ფაილის (\"%s\") ჩატვირთვის შეცდომა"
+
+#: src/bin/config_data.c:171
+msgid "Failed to allocate Memory!"
+msgstr "მეხსიერების გამოყოფის შეცდომა!"
+
+#: src/bin/file_mgr.c:89
+msgid "EDC has been changed on the file system."
+msgstr "ფაილურ სისტემაზე EDC შეიცვალა."
+
+#: src/bin/file_mgr.c:91
+msgid "Do you want to replace the contents?"
+msgstr "გნებავთ შემცველობის ჩანაცვლება?"
+
+#: src/bin/file_mgr.c:102
+msgid "Save As"
+msgstr "შენახვა, როგორც"
+
+#: src/bin/file_mgr.c:110 src/bin/search.c:427
+msgid "Replace"
+msgstr "ჩანაცვლება"
+
+#: src/bin/file_mgr.c:116
+msgid "Ignore"
+msgstr "იგნორი"
+
+#: src/bin/file_mgr.c:197
+#, c-format
+msgid "File saved. \"%s\""
+msgstr "ფაილი შენახულია. \"%s\""
+
+#: src/bin/file_mgr.c:199
+#, c-format
+msgid "Already saved. \"%s\""
+msgstr "უკვე შენახულია. \"%s\""
+
+#: src/bin/goto.c:78
+msgid "Invalid line number"
+msgstr "ხაზის არასწორი ნომერი"
+
+#: src/bin/goto.c:133
+msgid "Enventor Goto Line"
+msgstr "Enventor ხაზზე გადასვლა"
+
+#: src/bin/goto.c:137
+msgid "Go to Line"
+msgstr "ხაზზე გადასვლა"
+
+#: src/bin/goto.c:158
+#, c-format
+msgid "Enter line number [1..%d]:"
+msgstr "შეიყვანეთ ხაზის ნომერი [1..%d]:"
+
+#: src/bin/goto.c:182 src/bin/menu.c:154
+msgid "Ok"
+msgstr "დიახ"
+
+#: src/bin/goto.c:194 src/bin/search.c:449
+msgid "Failed to grab key - Escape"
+msgstr "ღილაკის ჩაჭერის შეცდომა - Escape"
+
+#: src/bin/live_edit.c:2020 src/bin/live_edit.c:2057 src/bin/live_edit.c:2059
+#: src/bin/main.c:872 src/lib/auto_comp.c:410 src/lib/ctxpopup.c:813
+#, c-format
+msgid "Failed to grab key - %s"
+msgstr "ღილაკის ჩაჭერის შეცდომა - %s"
+
+#: src/bin/live_edit.c:2140
+msgid ""
+"Double click part to confirm.(Esc = cancel, Direction Key = move item per "
+"pixel,Ctrl = disable auto-aligning)"
+msgstr ""
+"ორმაგი წკაპი დასადასტურებლად .(Esc = გასაუქმებლად, მიმართულების ისარი = "
+"ჩანაწერის ერთი პიქსელით გადატანა,Ctrl = ავტომატური სწორების გამორთვა)"
+
+#: src/bin/live_edit.c:2160
+msgid ""
+"Add a Rect part to the live view.<br>A Rect part is used as a solid "
+"color<br>component or clipping other components."
+msgstr ""
+"ცოცხალი ხედისთვის მრავალკუთხედი ნაწილის დამატება.<br>მრავალკუთხედი ნაწილი "
+"შეგიძლიათ ერთგვარი ფერის<br>კომპონენტის ან სხვა კომპონენტების მისამაგრებლად "
+"გამოიყენოთ."
+
+#: src/bin/live_edit.c:2166
+msgid ""
+"Add a Text part to the live view.<br>A Text part is used for plain text."
+msgstr ""
+"ცოცხალ ხედზე ტექსტის ნაწილის დამატება.<br>ტექსტის ნაწილი უბრალო ტექსტისთვის "
+"გამოიყენება."
+
+#: src/bin/live_edit.c:2171
+msgid ""
+"Add an Image part to the live view.<br>An Image part contains a single "
+"image<br>resource, usually an image file."
+msgstr ""
+"ცოცხალი ხედისთვის გამოსახულების ნაწილის დამატება.<br>გამოსახულების ნაწილი "
+"ერთ გამოსახულების<br>რესურსს შეიცავს, ჩვეულებრივ სურათის ფაილს."
+
+#: src/bin/live_edit.c:2177
+msgid ""
+"Add a Swallow part to the live view.<br>A Swallow part is a placeholder "
+"for<br>objects that you may want to<br>include in the layout later."
+msgstr ""
+"ცოცხალი ხედისთვის Swallow ნაწილის დამატება.<br>Swallow ნაწილი ადგილმჭერია "
+"<br> ობიექტებისთვის, რომლების ჩასმაც შეიძლება<br>მოგვიანებით მოგინდეთ."
+
+#: src/bin/live_edit.c:2184
+msgid ""
+"Add a Textblock part to the live view.<br>A Textblock part is a rich-text "
+"part<br>that can show big chunks of text."
+msgstr ""
+"ცოცხალი ხედისთვის ტექსტური ბლოკის ნაწილის დამატება.<br>ტექსტური ბლოკის ნაწილ "
+"მდიდარი ტექსტის ნაწილია,<br>რომელსაც დიდი ტექსტების ჩვენება შეუძლია."
+
+#: src/bin/live_edit.c:2190
+msgid ""
+"Add a Spacer part to the live view.<br>A Spacer part is an anchor to locate "
+"<br>other parts. It is invisible and<br>normally used for padding."
+msgstr ""
+"ცოცხალი ხედისთვის Spacer ნაწილის დამატება.<br>ნაწილი Spacer მარყუჟია, "
+"რითიც<br>სხვა ნაწილებს იპოვით. ის უჩინარია და "
+"ჩვეულებრივ<br>გამოტოვებებისთვის გამოიყენება."
+
+#: src/bin/live_edit.c:2350
+msgid "Faild to allocate Memory!"
+msgstr "მეხსიერების გამოყოფის შეცდომა!"
+
+#: src/bin/main.c:212
+#, c-format
+msgid "Font Size: %1.1fx"
+msgstr "ფონტის ზომა: %1.1fx"
+
+#: src/bin/main.c:944
+#, c-format
+msgid "Cannot create temporary diretory \"%s\""
+msgstr "დროებითი საქაღალდის შექმნის შეცდომა (%s)"
+
+#: src/bin/menu.c:141
+msgid "New File: Choose a Template"
+msgstr "ახალი ფაილი: აირჩიეთ ნიმუში"
+
+#: src/bin/menu.c:160 src/bin/menu.c:206 src/bin/setting.c:242
+msgid "Cancel"
+msgstr "გაუქმება"
+
+#: src/bin/menu.c:179
+msgid "You have unsaved changes."
+msgstr "გაქვთ შეუნახავი ცვლილებები."
+
+#: src/bin/menu.c:181
+msgid "Do you want to save the changes?"
+msgstr "გსურთ ცვლილებების შენახვა?"
+
+#: src/bin/menu.c:192 src/bin/menu.c:475 src/bin/menu.c:591
+msgid "Save"
+msgstr "შენახვა"
+
+#: src/bin/menu.c:200
+msgid "Discard"
+msgstr "გაუქმება"
+
+#: src/bin/menu.c:328
+msgid "Choose a file to save"
+msgstr "აირჩიეთ შესანახი ფაილი"
+
+#: src/bin/menu.c:365
+#, c-format
+msgid "Failed to save: %s."
+msgstr "შენახვის შეცდომა: %s."
+
+#: src/bin/menu.c:419
+msgid "Support only .edc file."
+msgstr "მხარდაჭერილია მხოლოდ .edc ფაილი."
+
+#: src/bin/menu.c:429
+msgid "Choose a file to load."
+msgstr "აირჩიეთ ჩასატვირთი ფაილი."
+
+#: src/bin/menu.c:440
+#, c-format
+msgid "Failed to load: %s."
+msgstr "ჩატვირთვის შეცდომა: %s."
+
+#: src/bin/menu.c:467
+msgid "Save File: Choose a EDC"
+msgstr "ფაილის შენახვა: აირჩიეთ EDC"
+
+#: src/bin/menu.c:476 src/bin/menu.c:511
+msgid "Close"
+msgstr "დახურვა"
+
+#: src/bin/menu.c:501
+msgid "Load File: Choose a EDC"
+msgstr "ფაილის ჩატვირთვა: აირჩიეთ EDC"
+
+#: src/bin/menu.c:510 src/bin/menu.c:595
+msgid "Load"
+msgstr "ჩატვირთვა"
+
+#: src/bin/menu.c:586
+msgid "New"
+msgstr "ახალი"
+
+#: src/bin/menu.c:599 src/bin/setting.c:198
+msgid "Settings"
+msgstr "მორგება"
+
+#: src/bin/menu.c:603
+msgid "Help"
+msgstr "დახმარება"
+
+#: src/bin/menu.c:607
+msgid "Exit"
+msgstr "გასვლა"
+
+#: src/bin/newfile.c:79
+#, c-format
+msgid "Cannot find templates folder! \"%s\""
+msgstr "ნიმუშების საქაღალდე ვერ ვიპოვე! \"%s\""
+
+#: src/bin/newfile.c:124 src/bin/newfile.c:146
+#, c-format
+msgid "Cannot find file! \"%s\""
+msgstr "ფაილი ვერ ვიპოვე! \"%s\""
+
+#: src/bin/search.c:96
+#, c-format
+msgid "%d matches replaced"
+msgstr "ჩანაცვლებულია %d დამთხვევა"
+
+#: src/bin/search.c:150 src/bin/search.c:210
+#, c-format
+msgid "No \"%s\" in the text"
+msgstr "ტექსტში \"%s\" აღმოჩენილი არაა"
+
+#: src/bin/search.c:248 src/bin/search.c:413
+msgid "Previous"
+msgstr "წინა"
+
+#: src/bin/search.c:280 src/bin/search.c:420
+msgid "Next"
+msgstr "შემდეგი"
+
+#: src/bin/search.c:364
+msgid "Enventor Search"
+msgstr "Enventor-ით ძებნა"
+
+#: src/bin/search.c:367
+msgid "Find/Replace"
+msgstr "ძებნა/ჩანაცვლება"
+
+#: src/bin/search.c:434
+msgid "Replace All"
+msgstr "ყველას ჩანაცვლება"
+
+#: src/bin/setting.c:210
+msgid "Preferences"
+msgstr "მორგება"
+
+#: src/bin/setting.c:212
+msgid "Text Editor"
+msgstr "ტექსტური რედაქტორი"
+
+#: src/bin/setting.c:214
+msgid "EDC Build"
+msgstr "EDC-ის აგება"
+
+#: src/bin/setting.c:228
+msgid "Apply"
+msgstr "გადატარება"
+
+#: src/bin/setting.c:235
+msgid "Reset"
+msgstr "საწყისი მნიშვნელობებზე დაბრუნება"
+
+#: src/bin/statusbar.c:319
+msgid "View zoom level (Ctrl + Mouse Wheel)<br>Zoom the live view in or out."
+msgstr ""
+"გადიდების დონის ნახვა (Ctrl + თაგუნას ბორბალი)<br>ცოცხალი ხედის გადიდება/"
+"დაპატარავება."
+
+#: src/bin/statusbar.c:325
+msgid "Resize the width and height of the live view."
+msgstr "ცოცხალი ხედის სიგრძისა და სიგანის შეცვლა."
+
+#: src/bin/statusbar.c:330
+msgid "Swap the width and height of the live view."
+msgstr "ცოცხალი ხედის სიგრძისა და სიგანის მიმოცვლა."
+
+#: src/bin/statusbar.c:340
+msgid ""
+"Mouse cursor position in live view.<br>Absolute coordinate | Relative "
+"coordinate."
+msgstr ""
+"თაგუნას კურსორის პოზიცია ცოცხალ ხედში.<br>აბსოლუტური კოორდინატები | "
+"ფარდობითი კოორდინატები."
+
+#: src/bin/statusbar.c:351
+msgid "Name of the current editing group."
+msgstr "მიმდინარე ჩასწორების ჯგუფის სახელი."
+
+#: src/bin/statusbar.c:361
+msgid "Cursor line number : Max line number"
+msgstr "კურსორის ხაზის სახელი : მაქს ხაზის ნომერი"
+
+#: src/bin/text_setting.c:552
+#, c-format
+msgid "Failed to open file \"%s\""
+msgstr "ვერ მოხერხდა ფაილის გახსნა \"%s\""
+
+#: src/bin/text_setting.c:915
+msgid "Double click a keyword to change its color :"
+msgstr "საკვანძო სიტყვის ფერის შესაცვლელად ორჯერ დააწკაპუნეთ :"
+
+#: src/bin/text_setting.c:1010
+msgid "Font Name"
+msgstr "ფონტის სახელი"
+
+#: src/bin/text_setting.c:1037
+msgid "Font Style"
+msgstr "ფონტის სტილი"
+
+#: src/bin/tools.c:142
+msgid "Redo text."
+msgstr "ტექსტის დაბრუნება."
+
+#: src/bin/tools.c:144
+msgid "No text to be redo."
+msgstr "დასაბრუნებელი ტექსტის გარეშე."
+
+#: src/bin/tools.c:152
+msgid "Undo text."
+msgstr "ტექსტის გაუქმება."
+
+#: src/bin/tools.c:154
+msgid "No text to be undo."
+msgstr "გასაუქმებელი ტექსტის გარეშე."
+
+#: src/bin/tools.c:244
+msgid ""
+"Part highlighting (Ctrl + H)<br>Show a highlight effect on the selected "
+"part<br>in the live view."
+msgstr ""
+"ნაწილის გამოკვეთა (Ctrl + H)<br>ცოცხალ ხედში მონიშნული ნაწილის<br>გამოკვეთის "
+"ეფექტი."
+
+#: src/bin/tools.c:256
+msgid ""
+"Dummy parts (Ctrl + U)<br>Display virtual images for the swallow "
+"and<br>spacer parts."
+msgstr ""
+"ცარიელი ნაწილები (Ctrl + U)<br>აჩვენებს ვირტუალურ გამოსახულებებს Swallow და "
+"<br>Spacer ნაწილებისთვის."
+
+#: src/bin/tools.c:268
+msgid ""
+"Wireframes (Ctrl + W)<br>Display wireframes to identify the "
+"parts<br>boundaries."
+msgstr ""
+"მოდელები (Ctrl + W)<br>მოდელების ჩვენება ნაწილების<br>საზღვრების საცნობად."
+
+#: src/bin/tools.c:280
+msgid ""
+"Mirror mode (Ctrl + M)<br>Invert the layout horizontally and review<br>the "
+"designed layout in RTL(right-to-left)<br>LTR(left-to-right) settings."
+msgstr ""
+"სარკის რეჟიმი (Ctrl + M)<br>განლაგების ჰორიზონტალური ინვერსია<br>და მიღებული "
+"განლაგების მიმოხილვა RTL(მარჯვნიდან მარცხნივ)<br>LTR(მარცხნიდან მარჯვნივ) "
+"პარამეტრებში."
+
+#: src/bin/tools.c:348
+msgid "Save the file (Ctrl + S)<br>Save the current script to a file."
+msgstr "ფაილის შენახვა (Ctrl + S)<br>მიმდინარე სკრიპტის ფაილში შენახვა."
+
+#: src/bin/tools.c:357
+msgid "Undo text (Ctrl + Z)"
+msgstr "ტექსტის გაუქმება (Ctrl + Z)"
+
+#: src/bin/tools.c:365
+msgid "Redo text (Ctrl + R)"
+msgstr "ტექსტის დაბრუნება (Ctrl + R)"
+
+#: src/bin/tools.c:373
+msgid "Find/Replace (Ctrl + F)<br>Find or replace text."
+msgstr "პოვნა/ჩანაცვლება (Ctrl + F)<br>იპოვეთ ან ჩაანაცვლეთ ტექსტი."
+
+#: src/bin/tools.c:383
+msgid ""
+"Go to line (Ctrl + L)<br>Open the Go to window to move the cursor<br>line "
+"position."
+msgstr ""
+"ხაზზე გადასვლა (Ctrl + L)<br>გადასვლის განჯრის გახსნა კურსორის<br>სასურველ "
+"ხაზზე გადასატანად."
+
+#: src/bin/tools.c:394
+msgid "Line numbers<br>Display the script line numbers."
+msgstr "ხაზის ნომრები<br>სკრიპტის ხაზის ნომრების ჩვენება."
+
+#: src/bin/tools.c:404
+msgid ""
+"Insert a code snippet (Ctrl + T)<br>Enventor chooses the best code with "
+"regards<br>to the current editing context. For instance,<br>if the cursor is "
+"inside a part section,<br>description code is generated."
+msgstr ""
+"კოდის ნაწყვეტის ჩასმა (Ctrl + T)<br>Enventor აირჩევს კოდის საუკეთსო ნაწილს "
+"მიმდინარე ჩასწორების კონტექსტის გათვალისწინებით.<br>მაგალითად, თუ კურსორი,"
+"<br>ნაწილის კოდის სექციაშია,<br>გენერირდება აღწერის კოდი."
+
+#: src/bin/tools.c:418
+msgid ""
+"Console box (Alt + Down)<br>Display the console box, which shows the "
+"EDC<br>build logs, such as error messages. It pops<br>up automatically when "
+"compilation errors occur."
+msgstr ""
+"კონსოლის ფანჯარა (Alt + Down)<br>აჩვენებს კონსოლის ფანჯარა, რომელშიც EDC-ის "
+"ნახვა შეგეძლებათ, როგორიცაა<br>აგების ჟურნალი და შეცდომები.<br>ის აგების "
+"შეცდომების დროს ავტომატურად ამოხტება."
+
+#: src/bin/tools.c:430
+msgid ""
+"File browser (F9)<br>Display the file browser, which shows a file list<br>in "
+"current workspace."
+msgstr ""
+"ფაილების ბრაუზერი (F9)<br>ფაილების ბრაუზერის ჩვენება. ს მიმდინარე სამუშაო "
+"სივრცეში<br>არსებულ ფაილებს აჩვენებს."
+
+#: src/bin/tools.c:441
+msgid ""
+"EDC navigator (F10)<br>Display the EDC navigator, which shows the "
+"current<br>group hierarchy tree that contains parts,<br>descriptions and "
+"programs lists."
+msgstr ""
+"EDC ნავიგატორი (F10)<br>EDC ნავიგატორი, რომელიც აჩვენებს მიმდინარე<br>ჯგუფის "
+"იერარქიას, რომელიც ნაწილებს,<br>აღწერებს და პროგრამის სიებს შეიძლება "
+"შეიცავდეს."
+
+#: src/bin/tools.c:453
+msgid ""
+"File tab (F11)<br>Display the file tab in the bottom area<br>It shows an "
+"opened file list to switch<br>files quickly."
+msgstr ""
+"ფაილის ჩანართი (F11)<br>აჩვენებს ფაილის ჩანართს ქვედა მხარეში<br>ის ჩვენებს "
+"გახსნილი ფაილების სიას<br>მათ შორის ადგილად გადასართველად."
+
+#: src/bin/tools.c:467
+msgid "Enventor menu (Esc)<br>Open the Enventor main menu."
+msgstr "Enventor-ის მენიუ (Esc)<br>Enventor-ის მთავარი მენიუს გახსნა."
+
+#: src/bin/tools.c:514
+msgid "Part highlighting enabled."
+msgstr "ნაწილის გამოკვეთა ჩართულია."
+
+#: src/bin/tools.c:516
+msgid "Part highlighting disabled."
+msgstr "ნაწილის გამოკვეთა გამორთულია."
+
+#: src/bin/tools.c:601
+msgid "Dummy parts enabled."
+msgstr "უაზრო ნაწილები ჩართულია."
+
+#: src/bin/tools.c:603
+msgid "Dummy parts disabled."
+msgstr "უაზრო ნაწილები გამორთულია."
+
+#: src/bin/tools.c:625
+msgid "Wireframes enabled."
+msgstr "მოდელი ჩართულია."
+
+#: src/bin/tools.c:627
+msgid "Wireframes disabled."
+msgstr "მოდელი გამორთულია."
+
+#: src/bin/tools.c:650
+msgid "Mirror mode enabled."
+msgstr "სარკის რეჟიი ჩართულია."
+
+#: src/bin/tools.c:652
+msgid "Mirror mode disabled."
+msgstr "სარკის რეჟიი გამორთულია."
+
+#: src/bin/tools.c:706
+msgid "Insertion of template code is disabled while in Live Edit mode"
+msgstr "ცოცხალი ჩასწორების რეჟიმში ნიმუშის ჩართვა გათიშულია"
+
+#: src/bin/tools.c:717
+#, c-format
+msgid "Template code inserted, (%s)"
+msgstr "ნიმუშის კოდი ჩასმულია. (%s)"
+
+#: src/bin/tools.c:723
+msgid ""
+"Can't insert template code here. Move the cursor inside the \"Collections,"
+"Images,Parts,Part,Programs\" scope."
+msgstr ""
+"აქ ნიმუშის კოდს ვერ ჩასვამთ. გადაიტანეთ კურსორი \"Collections,Images,Parts,"
+"Part,Programs\" დიაპაზონში."

po/meson.build

@@ -0,0 +1,18 @@
+
+if get_option('nls')
+    i18n = import('i18n')
+    i18n.gettext(meson.project_name(),
+          args: [
+            '--directory=' + meson.source_root(),
+            '--keyword=_',
+            '--keyword=d_:1',
+            '--keyword=P_:1,2',
+            '--keyword=dP_:1,2',
+            '--keyword=N_',
+            '--keyword=NP_:1,2',
+            '--from-code=UTF-8',
+            '--foreign-user'
+            ])
+  config_h.set('HAVE_GETTEXT', '1')
+  dep_intl = cc.find_library('intl', required : false)
+endif

po/ru.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: enventor 0.6.0\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2016-06-05 13:38+0900\n"
+"POT-Creation-Date: 2016-08-28 01:00+0900\n"
 "PO-Revision-Date: 2015-12-10 12:07+0000\n"
 "Last-Translator: NikaWhite belyavskijnb@gmail.com \n"
 "Language-Team: \n"
@@ -16,403 +16,495 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/bin/base_gui.c:67
+#: src/bin/base_gui.c:70
 #, c-format
 msgid "%s - Enventor"
 msgstr "%s - Enventor"
 
-#: src/bin/config_data.c:72
+#: src/bin/config_data.c:76
 msgid "Failed to generate tmp folder!"
 msgstr "Невозможно создать временную директорию!"
 
-#: src/bin/config_data.c:91 src/bin/config_data.c:104
+#: src/bin/config_data.c:97
 #, c-format
 msgid "Cannot create a config folder \"%s\""
 msgstr "Невозможно создать директорию с конфигурационными файлами. \"%s\""
 
-#: src/bin/config_data.c:115
+#: src/bin/config_data.c:111
+#, fuzzy, c-format
+msgid "Cannot create a enventor config folder \"%s\""
+msgstr "Невозможно создать директорию с конфигурационными файлами. \"%s\""
+
+#: src/bin/config_data.c:122
 #, c-format
 msgid "Cannot save a config file \"%s\""
 msgstr "Неудалось сохранить файл настроек \"%s\""
 
-#: src/bin/config_data.c:157
+#: src/bin/config_data.c:161
 #, c-format
 msgid "Cannot load a config file \"%s\""
 msgstr "Неудалось загрузить настройки из файла \"%s\""
 
-#: src/bin/config_data.c:165 src/bin/file_mgr.c:193 src/bin/goto.c:136
-#: src/bin/menu.c:613 src/bin/newfile.c:144 src/bin/panes.c:321
-#: src/bin/search.c:337 src/bin/setting.c:187 src/bin/statusbar.c:312
-#: src/bin/text_setting.c:405 src/bin/text_setting.c:456
-#: src/bin/text_setting.c:487 src/bin/text_setting.c:956 src/bin/tools.c:186
+#: src/bin/config_data.c:169
 msgid "Failed to allocate Memory!"
 msgstr "Ошибка выделения памяти!"
 
-#: src/bin/file_mgr.c:71
+#: src/bin/file_mgr.c:89
 msgid "EDC has been changed on the file system."
 msgstr "EDC-файл был изменен друшим приложением."
 
-#: src/bin/file_mgr.c:73
+#: src/bin/file_mgr.c:91
 msgid "Do you want to replace the contents?"
 msgstr "Вы уверенны, что хотите заменить файл?"
 
-#: src/bin/file_mgr.c:84
+#: src/bin/file_mgr.c:102
 msgid "Save As"
 msgstr "Сохранить как"
 
-#: src/bin/file_mgr.c:92 src/bin/search.c:407
+#: src/bin/file_mgr.c:110 src/bin/search.c:421
 msgid "Replace"
 msgstr "Замена"
 
-#: src/bin/file_mgr.c:98
+#: src/bin/file_mgr.c:116
 msgid "Ignore"
 msgstr "Пропустить"
 
-#: src/bin/file_mgr.c:157
+#: src/bin/file_mgr.c:197
 #, c-format
 msgid "File saved. \"%s\""
 msgstr "Файл сохранен. \"%s\""
 
-#: src/bin/file_mgr.c:159
+#: src/bin/file_mgr.c:199
 #, c-format
 msgid "Already saved. \"%s\""
 msgstr "Сохранен. \"%s\""
 
-#: src/bin/goto.c:93
+#: src/bin/goto.c:78
 msgid "Invalid line number"
 msgstr "Неверный номер строки."
 
-#: src/bin/goto.c:142
+#: src/bin/goto.c:133
 msgid "Enventor Goto Line"
 msgstr "Enventor Перейти к строке"
 
-#: src/bin/goto.c:146
+#: src/bin/goto.c:137
 msgid "Go to Line"
 msgstr "Перейти к строке"
 
-#: src/bin/goto.c:168
+#: src/bin/goto.c:158
 #, c-format
 msgid "Enter line number [1..%d]:"
 msgstr "Введите номер строки [1..%d]:"
 
-#: src/bin/goto.c:192 src/bin/menu.c:150
+#: src/bin/goto.c:182 src/bin/menu.c:154
 msgid "Ok"
 msgstr "Перейти"
 
-#: src/bin/goto.c:204 src/bin/search.c:429
+#: src/bin/goto.c:194 src/bin/search.c:443
 msgid "Failed to grab key - Escape"
 msgstr "Ошибка перехвата нажатия - Escape"
 
-#: src/bin/live_edit.c:2019 src/bin/live_edit.c:2063 src/bin/live_edit.c:2065
-#: src/bin/main.c:850 src/lib/auto_comp.c:369 src/lib/ctxpopup.c:766
+#: src/bin/live_edit.c:2020 src/bin/live_edit.c:2057 src/bin/live_edit.c:2059
+#: src/bin/main.c:870 src/lib/auto_comp.c:410 src/lib/ctxpopup.c:779
 #, c-format
 msgid "Failed to grab key - %s"
 msgstr "Ошибка перехвата клавиши - %s"
 
-#: src/bin/live_edit.c:2132
+#: src/bin/live_edit.c:2140
 msgid ""
-"Double click part to confirm. (Esc = cancel, Direction Key = move item per "
-"pixel, Ctrl = disable auto-aligning)"
+"Double click part to confirm.(Esc = cancel, Direction Key = move item per "
+"pixel,Ctrl = disable auto-aligning)"
 msgstr ""
 
-#: src/bin/live_edit.c:2280
+#: src/bin/live_edit.c:2160
+msgid ""
+"Add a Rect part to the live view.<br>A Rect part is used as a solid "
+"color<br>component or clipping other components."
+msgstr ""
+
+#: src/bin/live_edit.c:2166
+msgid ""
+"Add a Text part to the live view.<br>A Text part is used for plain text."
+msgstr ""
+
+#: src/bin/live_edit.c:2171
+msgid ""
+"Add an Image part to the live view.<br>An Image part contains a single "
+"image<br>resource, usually an image file."
+msgstr ""
+
+#: src/bin/live_edit.c:2177
+msgid ""
+"Add a Swallow part to the live view.<br>A Swallow part is a placeholder "
+"for<br>objects that you may want to<br>include in the layout later."
+msgstr ""
+
+#: src/bin/live_edit.c:2184
+msgid ""
+"Add a Textblock part to the live view.<br>A Textblock part is a rich-text "
+"part<br>that can show big chunks of text."
+msgstr ""
+
+#: src/bin/live_edit.c:2190
+msgid ""
+"Add a Spacer part to the live view.<br>A Spacer part is an anchor to locate "
+"<br>other parts. It is invisible and<br>normally used for padding."
+msgstr ""
+
+#: src/bin/live_edit.c:2350
 msgid "Faild to allocate Memory!"
 msgstr "Ошибка выделения памяти!"
 
-#: src/bin/main.c:24
-msgid "Auto Completion Enabled."
-msgstr "Автодополнение Включено."
-
-#: src/bin/main.c:25
-msgid "Auto Completion Disabled."
-msgstr "Автодополнение Выключенно"
-
-#: src/bin/main.c:34
-msgid "Auto Indentation Enabled."
-msgstr "Автовыравнивание Включено"
-
-#: src/bin/main.c:35
-msgid "Auto Indentation Disabled."
-msgstr "Автовыравнивание Выключено"
-
-#: src/bin/main.c:207
+#: src/bin/main.c:208
 #, c-format
 msgid "Font Size: %1.1fx"
 msgstr "Размер шрифта: %1.1fx"
 
-#: src/bin/menu.c:137
-msgid "New File: Choose a template"
+#: src/bin/main.c:942
+#, fuzzy, c-format
+msgid "Cannot create temporary diretory \"%s\""
+msgstr "Невозможно создать директорию с конфигурационными файлами. \"%s\""
+
+#: src/bin/menu.c:141
+#, fuzzy
+msgid "New File: Choose a Template"
 msgstr "Новый файл: Выберите шаблон"
 
-#: src/bin/menu.c:156 src/bin/menu.c:202 src/bin/setting.c:245
+#: src/bin/menu.c:160 src/bin/menu.c:206 src/bin/setting.c:242
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/bin/menu.c:175
-msgid "Without save, you will lose last changes!"
-msgstr "Без сохранения все изменения будут утеряны!"
-
-#: src/bin/menu.c:177
-msgid "Will you save changes?"
+#: src/bin/menu.c:179
+#, fuzzy
+msgid "You have unsaved changes."
 msgstr "Сохранить изменения?"
 
-#: src/bin/menu.c:188 src/bin/menu.c:466 src/bin/menu.c:582
+#: src/bin/menu.c:181
+#, fuzzy
+msgid "Do you want to save the changes?"
+msgstr "Вы уверенны, что хотите заменить файл?"
+
+#: src/bin/menu.c:192 src/bin/menu.c:475 src/bin/menu.c:591
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/bin/menu.c:196
+#: src/bin/menu.c:200
 msgid "Discard"
 msgstr "Не сохранять"
 
-#: src/bin/menu.c:324
+#: src/bin/menu.c:328
 msgid "Choose a file to save"
 msgstr "Выбирете файл для сохранения"
 
-#: src/bin/menu.c:351
+#: src/bin/menu.c:365
 #, c-format
 msgid "Failed to save: %s."
 msgstr "Неудалось сохранить: %s."
 
-#: src/bin/menu.c:406
+#: src/bin/menu.c:419
 msgid "Support only .edc file."
 msgstr "Поддерживаются файлы с расширением .edc."
 
-#: src/bin/menu.c:416
+#: src/bin/menu.c:429
 msgid "Choose a file to load."
 msgstr "Выбирете файл для загрузки."
 
-#: src/bin/menu.c:427
+#: src/bin/menu.c:440
 #, c-format
 msgid "Failed to load: %s."
 msgstr "Невозможно загрузить: %s."
 
-#: src/bin/menu.c:458
+#: src/bin/menu.c:467
 msgid "Save File: Choose a EDC"
 msgstr "Сохранение: Выберите .edc файл"
 
-#: src/bin/menu.c:467 src/bin/menu.c:502
+#: src/bin/menu.c:476 src/bin/menu.c:511
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/bin/menu.c:492
+#: src/bin/menu.c:501
 msgid "Load File: Choose a EDC"
 msgstr "Загрузка: Выберите .edc файл"
 
-#: src/bin/menu.c:501 src/bin/menu.c:586
+#: src/bin/menu.c:510 src/bin/menu.c:595
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/bin/menu.c:577
+#: src/bin/menu.c:586
 msgid "New"
 msgstr "Новый"
 
-#: src/bin/menu.c:590 src/bin/setting.c:201
+#: src/bin/menu.c:599 src/bin/setting.c:198
 msgid "Settings"
 msgstr "Настройки"
 
-#: src/bin/menu.c:594
+#: src/bin/menu.c:603
 msgid "Help"
 msgstr ""
 
-#: src/bin/menu.c:598
+#: src/bin/menu.c:607
 msgid "Exit"
 msgstr "Выход"
 
-#: src/bin/newfile.c:57 src/bin/newfile.c:82
-#, c-format
-msgid "Cannot find file! \"%s\""
-msgstr "Неудалось найти файл! \"%s\""
-
-#: src/bin/newfile.c:128
+#: src/bin/newfile.c:79
 #, c-format
 msgid "Cannot find templates folder! \"%s\""
 msgstr "Неудалось найди директорию с шаблонами! \"%s\""
 
-#: src/bin/search.c:82
+#: src/bin/newfile.c:124 src/bin/newfile.c:146
+#, c-format
+msgid "Cannot find file! \"%s\""
+msgstr "Неудалось найти файл! \"%s\""
+
+#: src/bin/search.c:96
 #, c-format
 msgid "%d matches replaced"
 msgstr "%d совпадений заменено."
 
-#: src/bin/search.c:132 src/bin/search.c:194
+#: src/bin/search.c:145 src/bin/search.c:205
 #, c-format
 msgid "No \"%s\" in the text"
 msgstr "Строка \"%s\" не найдена"
 
-#: src/bin/search.c:233 src/bin/search.c:399
-msgid "Backward"
-msgstr "Назад"
+#: src/bin/search.c:242 src/bin/search.c:407
+msgid "Previous"
+msgstr ""
 
-#: src/bin/search.c:265 src/bin/search.c:392
-msgid "Forward"
-msgstr "Вперед"
+#: src/bin/search.c:274 src/bin/search.c:414
+msgid "Next"
+msgstr ""
 
-#: src/bin/search.c:343
+#: src/bin/search.c:358
 msgid "Enventor Search"
 msgstr "Поиск"
 
-#: src/bin/search.c:346
+#: src/bin/search.c:361
 msgid "Find/Replace"
 msgstr "Поиск/Замена"
 
-#: src/bin/search.c:414
+#: src/bin/search.c:428
 msgid "Replace All"
 msgstr "Заменить все совпадения"
 
-#: src/bin/setting.c:213
+#: src/bin/setting.c:210
 #, fuzzy
 msgid "Preferences"
 msgstr "Дополнительные настройки:"
 
-#: src/bin/setting.c:215
+#: src/bin/setting.c:212
 msgid "Text Editor"
 msgstr "Текст"
 
-#: src/bin/setting.c:217
+#: src/bin/setting.c:214
 msgid "EDC Build"
 msgstr ""
 
-#: src/bin/setting.c:231
+#: src/bin/setting.c:228
 msgid "Apply"
 msgstr "Применить"
 
-#: src/bin/setting.c:238
+#: src/bin/setting.c:235
 msgid "Reset"
 msgstr "Сбросить"
 
-#: src/bin/text_setting.c:438
+#: src/bin/statusbar.c:319
+msgid "View zoom level (Ctrl + Mouse Wheel)<br>Zoom the live view in or out."
+msgstr ""
+
+#: src/bin/statusbar.c:325
+msgid "Resize the width and height of the live view."
+msgstr ""
+
+#: src/bin/statusbar.c:330
+msgid "Swap the width and height of the live view."
+msgstr ""
+
+#: src/bin/statusbar.c:340
+msgid ""
+"Mouse cursor position in live view.<br>Absolute coordinate | Relative "
+"coordinate."
+msgstr ""
+
+#: src/bin/statusbar.c:351
+msgid "Name of the current editing group."
+msgstr ""
+
+#: src/bin/statusbar.c:361
+msgid "Cursor line number : Max line number"
+msgstr ""
+
+#: src/bin/text_setting.c:552
 #, c-format
 msgid "Failed to open file \"%s\""
 msgstr "Неудалось открыть файл \"%s\""
 
-#: src/bin/text_setting.c:759
+#: src/bin/text_setting.c:909
 msgid "Double click a keyword to change its color :"
 msgstr "Двойной клик по слову позволит задать цвет:"
 
-#: src/bin/text_setting.c:796
-msgid "Font Size "
-msgstr "Размер шрифта "
-
-#: src/bin/text_setting.c:829
+#: src/bin/text_setting.c:1004
 msgid "Font Name"
 msgstr "Имя шрифта"
 
-#: src/bin/text_setting.c:856
+#: src/bin/text_setting.c:1031
 msgid "Font Style"
 msgstr "Стиль шрифта"
 
-#: src/bin/tools.c:134
+#: src/bin/tools.c:142
 msgid "Redo text."
 msgstr "Восстановить изменения"
 
-#: src/bin/tools.c:136
+#: src/bin/tools.c:144
 msgid "No text to be redo."
 msgstr "Нет действий для восстановления"
 
-#: src/bin/tools.c:144
+#: src/bin/tools.c:152
 msgid "Undo text."
 msgstr "Отменить изменения"
 
-#: src/bin/tools.c:146
+#: src/bin/tools.c:154
 msgid "No text to be undo."
 msgstr "Нет изменений для отмены"
 
-#: src/bin/tools.c:201
-msgid "Part Highlighting (Ctrl + H)"
-msgstr "Подсветка примитивов (Ctrl + H)"
+#: src/bin/tools.c:209
+msgid ""
+"Part highlighting (Ctrl + H)<br>Show a highlight effect on the selected "
+"part<br>in the live view."
+msgstr ""
 
-#: src/bin/tools.c:208
-msgid "Dummy Parts (Ctrl + W)"
-msgstr "Изображение для контейнеров (Ctrl + W)"
+#: src/bin/tools.c:220
+msgid ""
+"Dummy parts (Ctrl + U)<br>Display virtual images for the swallow "
+"and<br>spacer parts."
+msgstr ""
 
-#: src/bin/tools.c:217
+#: src/bin/tools.c:231
+msgid ""
+"Wireframes (Ctrl + W)<br>Display wireframes to identify the "
+"parts<br>boundaries."
+msgstr ""
+
+#: src/bin/tools.c:242
+msgid ""
+"Mirror mode (Ctrl + M)<br>Invert the layout horizontally and review<br>the "
+"designed layout in RTL(right-to-left)<br>LTR(left-to-right) settings."
+msgstr ""
+
+#: src/bin/tools.c:280
+msgid "Save the file (Ctrl + S)<br>Save the current script to a file."
+msgstr ""
+
+#: src/bin/tools.c:288
 #, fuzzy
-msgid "Mirror Mode (Ctrl + M)"
+msgid "Undo text (Ctrl + Z)"
 msgstr "Отменить (Ctrl + Z)"
 
-#: src/bin/tools.c:251
-msgid "Save File (Ctrl + S)"
-msgstr "Сохранить (Ctrl + S)"
-
-#: src/bin/tools.c:257
-msgid "Undo Text (Ctrl + Z)"
-msgstr "Отменить (Ctrl + Z)"
-
-#: src/bin/tools.c:263
-msgid "Redo Text (Ctrl + R)"
+#: src/bin/tools.c:295
+#, fuzzy
+msgid "Redo text (Ctrl + R)"
 msgstr "Повторить (Ctrl + R)"
 
-#: src/bin/tools.c:269
-msgid "Find/Replace (Ctrl + F)"
-msgstr "Поиск/Замена (Ctrl + F)"
-
-#: src/bin/tools.c:276
-msgid "Goto Lines (Ctrl + L)"
-msgstr "Перейти к строке (Ctrl + L)"
-
-#: src/bin/tools.c:283
-msgid "Line Numbers (F5)"
-msgstr "Номера строк (F5)"
-
-#: src/bin/tools.c:291
+#: src/bin/tools.c:302
 #, fuzzy
-msgid "Insert Template (Ctrl + T)"
+msgid "Find/Replace (Ctrl + F)<br>Find or replace text."
 msgstr "Поиск/Замена (Ctrl + F)"
 
-#: src/bin/tools.c:298
-msgid "Console Box (Alt + Down)"
-msgstr "Показать/Скрыть консоль (Alt + Down)"
-
-#: src/bin/tools.c:305
-msgid "File Browser (F9)"
+#: src/bin/tools.c:311
+msgid ""
+"Go to line (Ctrl + L)<br>Open the Go to window to move the cursor<br>line "
+"position."
 msgstr ""
 
-#: src/bin/tools.c:312
-msgid "EDC Navigator (F10)"
+#: src/bin/tools.c:321
+msgid "Line numbers<br>Display the script line numbers."
 msgstr ""
 
-#: src/bin/tools.c:319
-msgid "Status (F11)"
-msgstr "Строка статуса (F11)"
+#: src/bin/tools.c:330
+msgid ""
+"Insert a code snippet (Ctrl + T)<br>Enventor chooses the best code with "
+"regards<br>to the current editing context. For instance,<br>if the cursor is "
+"inside a part section,<br>description code is generated."
+msgstr ""
 
-#: src/bin/tools.c:326
-msgid "Enventor Menu (Esc)"
-msgstr "Меню (Esc)"
+#: src/bin/tools.c:342
+msgid ""
+"Console box (Alt + Down)<br>Display the console box, which shows the "
+"EDC<br>build logs, such as error messages. It pops<br>up automatically when "
+"compliation errors occur."
+msgstr ""
 
-#: src/bin/tools.c:371
-msgid "Part Highlighting Enabled."
+#: src/bin/tools.c:353
+msgid ""
+"File browser (F9)<br>Display the file browser, which shows a file list<br>in "
+"current workspace."
+msgstr ""
+
+#: src/bin/tools.c:363
+msgid ""
+"EDC navigator (F10)<br>Display the EDC navigator, which shows the "
+"current<br>group hierarchy tree that contains parts,<br>descriptions and "
+"programs lists."
+msgstr ""
+
+#: src/bin/tools.c:375
+msgid ""
+"File tab (F11)<br>Display the file tab in the bottom area<br>It shows an "
+"opened file list to switch<br>files quickly. to switch files quickly."
+msgstr ""
+
+#: src/bin/tools.c:386
+msgid "Enventor menu (Esc)<br>Open the Enventor main menu."
+msgstr ""
+
+#: src/bin/tools.c:432
+#, fuzzy
+msgid "Part highlighting enabled."
 msgstr "Подсветка примитивов Включена"
 
-#: src/bin/tools.c:373
-msgid "Part Highlighting Disabled."
+#: src/bin/tools.c:434
+#, fuzzy
+msgid "Part highlighting disabled."
 msgstr "Подсветка примитивов Выключена"
 
-#: src/bin/tools.c:458
-msgid "Dummy Parts Enabled."
+#: src/bin/tools.c:519
+#, fuzzy
+msgid "Dummy parts enabled."
 msgstr "Изображение для контейнеров Включено"
 
-#: src/bin/tools.c:460
-msgid "Dummy Parts Disabled."
+#: src/bin/tools.c:521
+#, fuzzy
+msgid "Dummy parts disabled."
 msgstr "Изображения для контейнеров Выключено"
 
-#: src/bin/tools.c:483
-msgid "Mirror Mode Enabled."
+#: src/bin/tools.c:543
+msgid "Wireframes enabled."
 msgstr ""
 
-#: src/bin/tools.c:485
+#: src/bin/tools.c:545
 #, fuzzy
-msgid "Mirror Mode Disabled."
+msgid "Wireframes disabled."
 msgstr "Автодополнение Выключенно"
 
-#: src/bin/tools.c:539
+#: src/bin/tools.c:568
+#, fuzzy
+msgid "Mirror mode enabled."
+msgstr "Автодополнение Выключенно"
+
+#: src/bin/tools.c:570
+#, fuzzy
+msgid "Mirror mode disabled."
+msgstr "Автодополнение Выключенно"
+
+#: src/bin/tools.c:624
 msgid "Insertion of template code is disabled while in Live Edit mode"
 msgstr "Невозможно вставить шаблон, пока активен режим Live Edit"
 
-#: src/bin/tools.c:548
+#: src/bin/tools.c:635
 #, c-format
 msgid "Template code inserted, (%s)"
 msgstr "Шаблон вставлен, (%s)"
 
-#: src/bin/tools.c:554
+#: src/bin/tools.c:641
 msgid ""
 "Can't insert template code here. Move the cursor inside the \"Collections,"
 "Images,Parts,Part,Programs\" scope."
@@ -420,6 +512,62 @@ msgstr ""
 "Невозможно втавить шаблон в это место. Переместите курсор внутрь одного из "
 "блоков: \"Collections, Images,Parts,Part,Programs\""
 
+#~ msgid "Auto Completion Enabled."
+#~ msgstr "Автодополнение Включено."
+
+#~ msgid "Auto Completion Disabled."
+#~ msgstr "Автодополнение Выключенно"
+
+#~ msgid "Auto Indentation Enabled."
+#~ msgstr "Автовыравнивание Включено"
+
+#~ msgid "Auto Indentation Disabled."
+#~ msgstr "Автовыравнивание Выключено"
+
+#~ msgid "Without save, you will lose last changes!"
+#~ msgstr "Без сохранения все изменения будут утеряны!"
+
+#~ msgid "Backward"
+#~ msgstr "Назад"
+
+#~ msgid "Forward"
+#~ msgstr "Вперед"
+
+#~ msgid "Font Size "
+#~ msgstr "Размер шрифта "
+
+#~ msgid "Part Highlighting (Ctrl + H)"
+#~ msgstr "Подсветка примитивов (Ctrl + H)"
+
+#~ msgid "Dummy Parts (Ctrl + W)"
+#~ msgstr "Изображение для контейнеров (Ctrl + W)"
+
+#, fuzzy
+#~ msgid "Mirror Mode (Ctrl + M)"
+#~ msgstr "Отменить (Ctrl + Z)"
+
+#~ msgid "Save File (Ctrl + S)"
+#~ msgstr "Сохранить (Ctrl + S)"
+
+#~ msgid "Goto Lines (Ctrl + L)"
+#~ msgstr "Перейти к строке (Ctrl + L)"
+
+#~ msgid "Line Numbers (F5)"
+#~ msgstr "Номера строк (F5)"
+
+#, fuzzy
+#~ msgid "Insert Template (Ctrl + T)"
+#~ msgstr "Поиск/Замена (Ctrl + F)"
+
+#~ msgid "Console Box (Alt + Down)"
+#~ msgstr "Показать/Скрыть консоль (Alt + Down)"
+
+#~ msgid "Status (F11)"
+#~ msgstr "Строка статуса (F11)"
+
+#~ msgid "Enventor Menu (Esc)"
+#~ msgstr "Меню (Esc)"
+
 #~ msgid "Double click the part to confirm."
 #~ msgstr "Сделайте двойной клик мыши по примитиву для вставки."
 

po/sl.po

@@ -0,0 +1,423 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Enventor development team
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: enventor 0.9.0\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2016-09-19 14:56+0200\n"
+"PO-Revision-Date: 2016-09-21 17:09+0200\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.8.9\n"
+"Last-Translator: Renato Rener <renato.rener@gmail.com>\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 "
+"|| n%100==4 ? 2 : 3);\n"
+"Language: sl_SI\n"
+
+#: src/bin/base_gui.c:67
+#, c-format
+msgid "%s - Enventor"
+msgstr "%s - Enventor"
+
+#: src/bin/config_data.c:72
+msgid "Failed to generate tmp folder!"
+msgstr "Neuspeh pri ustvarjanju začasne mape!"
+
+#: src/bin/config_data.c:91 src/bin/config_data.c:104
+#, c-format
+msgid "Cannot create a config folder \"%s\""
+msgstr "Ne morem ustvariti nastavitvene mape \"%s\""
+
+#: src/bin/config_data.c:115
+#, c-format
+msgid "Cannot save a config file \"%s\""
+msgstr "Ne morem shraniti nastavitvene datoteke \"%s\""
+
+#: src/bin/config_data.c:157
+#, c-format
+msgid "Cannot load a config file \"%s\""
+msgstr "Ne morem naložiti nastavitvene datoteke \"%s\""
+
+#: src/bin/config_data.c:165 src/bin/file_mgr.c:193 src/bin/goto.c:136
+#: src/bin/menu.c:613 src/bin/newfile.c:144 src/bin/panes.c:321
+#: src/bin/search.c:337 src/bin/setting.c:187 src/bin/statusbar.c:312
+#: src/bin/text_setting.c:405 src/bin/text_setting.c:456
+#: src/bin/text_setting.c:487 src/bin/text_setting.c:956 src/bin/tools.c:186
+msgid "Failed to allocate Memory!"
+msgstr "Dodeljevanje spomina spodletelo!"
+
+#: src/bin/file_mgr.c:71
+msgid "EDC has been changed on the file system."
+msgstr "EDC je bil spremenjen na datotečnem sistemu."
+
+#: src/bin/file_mgr.c:73
+msgid "Do you want to replace the contents?"
+msgstr "Ali želite zamenjati vsebino?"
+
+#: src/bin/file_mgr.c:84
+msgid "Save As"
+msgstr "Shrani kot"
+
+#: src/bin/file_mgr.c:92 src/bin/search.c:407
+msgid "Replace"
+msgstr "Zamenjaj"
+
+#: src/bin/file_mgr.c:98
+msgid "Ignore"
+msgstr "Spreglej"
+
+#: src/bin/file_mgr.c:157
+#, c-format
+msgid "File saved. \"%s\""
+msgstr "Datoteka shranjena. \"%s\""
+
+#: src/bin/file_mgr.c:159
+#, c-format
+msgid "Already saved. \"%s\""
+msgstr "Že shranjeno. \"%s\""
+
+#: src/bin/goto.c:93
+msgid "Invalid line number"
+msgstr "Napačno število vrstice"
+
+#: src/bin/goto.c:142
+msgid "Enventor Goto Line"
+msgstr "Enventor Skoči na vrstico"
+
+#: src/bin/goto.c:146
+msgid "Go to Line"
+msgstr "Skoči na vrstico"
+
+#: src/bin/goto.c:168
+#, c-format
+msgid "Enter line number [1..%d]:"
+msgstr "Vnesi vrstico številka [1..%d]:"
+
+#: src/bin/goto.c:192 src/bin/menu.c:150
+msgid "Ok"
+msgstr "V Redu"
+
+#: src/bin/goto.c:204 src/bin/search.c:429
+msgid "Failed to grab key - Escape"
+msgstr "Zajetje tipke Esc spodletelo"
+
+#: src/bin/live_edit.c:1983 src/bin/live_edit.c:2028 src/bin/live_edit.c:2030
+#: src/bin/main.c:851 src/lib/auto_comp.c:369 src/lib/ctxpopup.c:766
+#, c-format
+msgid "Failed to grab key - %s"
+msgstr "Zajetje znaka spodletelo - %s"
+
+#: src/bin/live_edit.c:2091
+msgid ""
+"Double click part to confirm. (Esc = cancel, Direction Key = move item per "
+"pixel, Ctrl = disable auto-aligning)"
+msgstr ""
+"Dvoklikni del za potrditev. (Esc = preklic, Smerna tipka = premikanje en "
+"predmet na piksel, Ctrl = onemogoči samodejno poravnavo)"
+
+#: src/bin/live_edit.c:2247
+msgid "Faild to allocate Memory!"
+msgstr "Dodeljevanje spomina spodletelo!"
+
+#: src/bin/main.c:24
+msgid "Auto Completion Enabled."
+msgstr "Samodokončanje omogočeno."
+
+#: src/bin/main.c:25
+msgid "Auto Completion Disabled."
+msgstr "Samodokončanje onemogočeno."
+
+#: src/bin/main.c:34
+msgid "Auto Indentation Enabled."
+msgstr "Samozamik omogočen."
+
+#: src/bin/main.c:35
+msgid "Auto Indentation Disabled."
+msgstr "Samozamik onemogočen."
+
+#: src/bin/main.c:207
+#, c-format
+msgid "Font Size: %1.1fx"
+msgstr "Velikost pisave: %1.1fx"
+
+#: src/bin/menu.c:137
+msgid "New File: Choose a template"
+msgstr "Nova datoteka: izberi predlogo"
+
+#: src/bin/menu.c:156 src/bin/menu.c:202 src/bin/setting.c:245
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: src/bin/menu.c:175
+msgid "Without save, you will lose last changes!"
+msgstr "Brez shranitve boste izgubili zadnje spremembe!"
+
+#: src/bin/menu.c:177
+msgid "Will you save changes?"
+msgstr "Ali boste shranili spremembe?"
+
+#: src/bin/menu.c:188 src/bin/menu.c:466 src/bin/menu.c:582
+msgid "Save"
+msgstr "Shrani"
+
+#: src/bin/menu.c:196
+msgid "Discard"
+msgstr "Zavrži"
+
+#: src/bin/menu.c:324
+msgid "Choose a file to save"
+msgstr "Izberite datoteko za shranjevanje"
+
+#: src/bin/menu.c:351
+#, c-format
+msgid "Failed to save: %s."
+msgstr "Neuspeh pri shranjevanju: %s."
+
+#: src/bin/menu.c:406
+msgid "Support only .edc file."
+msgstr "Podpora le za .edc datoteke."
+
+#: src/bin/menu.c:416
+msgid "Choose a file to load."
+msgstr "Izberite datoteko za naložitev."
+
+#: src/bin/menu.c:427
+#, c-format
+msgid "Failed to load: %s."
+msgstr "Neuspeh pri nalaganju: %s."
+
+#: src/bin/menu.c:458
+msgid "Save File: Choose a EDC"
+msgstr "Shrani datoteko: Izberi EDC"
+
+#: src/bin/menu.c:467 src/bin/menu.c:502
+msgid "Close"
+msgstr "Zapri"
+
+#: src/bin/menu.c:492
+msgid "Load File: Choose a EDC"
+msgstr "Naloži datoteko : Izberi EDC"
+
+#: src/bin/menu.c:501 src/bin/menu.c:586
+msgid "Load"
+msgstr "Naloži"
+
+#: src/bin/menu.c:577
+msgid "New"
+msgstr "Nov"
+
+#: src/bin/menu.c:590 src/bin/setting.c:201
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: src/bin/menu.c:594
+msgid "Help"
+msgstr "Pomoč"
+
+#: src/bin/menu.c:598
+msgid "Exit"
+msgstr "Izhod"
+
+#: src/bin/newfile.c:57 src/bin/newfile.c:82
+#, c-format
+msgid "Cannot find file! \"%s\""
+msgstr "Ne najdem datoteke! \"%s\""
+
+#: src/bin/newfile.c:128
+#, c-format
+msgid "Cannot find templates folder! \"%s\""
+msgstr "Ne najdem mape predlog! \"%s\""
+
+#: src/bin/search.c:82
+#, c-format
+msgid "%d matches replaced"
+msgstr "%d zadetki zamenjani"
+
+#: src/bin/search.c:132 src/bin/search.c:194
+#, c-format
+msgid "No \"%s\" in the text"
+msgstr "Ni \"%s\" v besedilu"
+
+#: src/bin/search.c:233 src/bin/search.c:399
+msgid "Backward"
+msgstr "Nazaj"
+
+#: src/bin/search.c:265 src/bin/search.c:392
+msgid "Forward"
+msgstr "Naprej"
+
+#: src/bin/search.c:343
+msgid "Enventor Search"
+msgstr "Enventor Iskanje"
+
+#: src/bin/search.c:346
+msgid "Find/Replace"
+msgstr "Najdi/Zamenjaj"
+
+#: src/bin/search.c:414
+msgid "Replace All"
+msgstr "Zamenjaj vse"
+
+#: src/bin/setting.c:213
+msgid "Preferences"
+msgstr "Prednostne nastavitve"
+
+#: src/bin/setting.c:215
+msgid "Text Editor"
+msgstr "Urejevalnik besedil"
+
+#: src/bin/setting.c:217
+msgid "EDC Build"
+msgstr "EDC izgradnja"
+
+#: src/bin/setting.c:231
+msgid "Apply"
+msgstr "Uveljavi"
+
+#: src/bin/setting.c:238
+msgid "Reset"
+msgstr "Obnovi"
+
+#: src/bin/text_setting.c:438
+#, c-format
+msgid "Failed to open file \"%s\""
+msgstr "Neuspeh pri odpiranju datoteke \"%s\""
+
+#: src/bin/text_setting.c:759
+msgid "Double click a keyword to change its color :"
+msgstr "Dvoklikni ključno besedo za spremembo njene barve :"
+
+#: src/bin/text_setting.c:796
+msgid "Font Size "
+msgstr "Velikost pisave:"
+
+#: src/bin/text_setting.c:829
+msgid "Font Name"
+msgstr "Ime pisave"
+
+#: src/bin/text_setting.c:856
+msgid "Font Style"
+msgstr "Slog pisave:"
+
+#: src/bin/tools.c:134
+msgid "Redo text."
+msgstr "Ponovno uveljavi besedilo."
+
+#: src/bin/tools.c:136
+msgid "No text to be redo."
+msgstr "Ni besedila za ponovno uveljavitev."
+
+#: src/bin/tools.c:144
+msgid "Undo text."
+msgstr "Razveljavi besedilo."
+
+#: src/bin/tools.c:146
+msgid "No text to be undo."
+msgstr "Ni besedila za razveljavitev."
+
+#: src/bin/tools.c:201
+msgid "Part Highlighting (Ctrl + H)"
+msgstr "Poudarjanje dela (Ctrl + H)"
+
+#: src/bin/tools.c:208
+msgid "Dummy Parts (Ctrl + W)"
+msgstr "Butasti deli (Ctrl + W)"
+
+#: src/bin/tools.c:217
+msgid "Mirror Mode (Ctrl + M)"
+msgstr "Način ogledala (Ctrl + M)"
+
+#: src/bin/tools.c:251
+msgid "Save File (Ctrl + S)"
+msgstr "Shrani datoteko (Ctrl + S)"
+
+#: src/bin/tools.c:257
+msgid "Undo Text (Ctrl + Z)"
+msgstr "Razveljavi besedilo (Ctrl + Z)"
+
+#: src/bin/tools.c:263
+msgid "Redo Text (Ctrl + R)"
+msgstr "Ponovno uveljavi besedilo (Ctrl + R)"
+
+#: src/bin/tools.c:269
+msgid "Find/Replace (Ctrl + F)"
+msgstr "Najdi/Zamenjaj (Ctrl + F)"
+
+#: src/bin/tools.c:276
+msgid "Goto Lines (Ctrl + L)"
+msgstr "Pojdi na vrstice (Ctrl + L)"
+
+#: src/bin/tools.c:283
+msgid "Line Numbers (F5)"
+msgstr "Številke vrstic (F5)"
+
+#: src/bin/tools.c:291
+msgid "Insert Template (Ctrl + T)"
+msgstr "Vstavi predlogo (Ctrl + T)"
+
+#: src/bin/tools.c:298
+msgid "Console Box (Alt + Down)"
+msgstr "Konzolna škatla (Alt + Down)"
+
+#: src/bin/tools.c:305
+msgid "File Browser (F9)"
+msgstr "Brskalnik datotek (F9)"
+
+#: src/bin/tools.c:312
+msgid "EDC Navigator (F10)"
+msgstr "EDC Navigator (F10)"
+
+#: src/bin/tools.c:319
+msgid "Status (F11)"
+msgstr "Stanje (F11)"
+
+#: src/bin/tools.c:326
+msgid "Enventor Menu (Esc)"
+msgstr "Enventor Meni (Esc)"
+
+#: src/bin/tools.c:371
+msgid "Part Highlighting Enabled."
+msgstr "Omogočeno poudarjanje delov."
+
+#: src/bin/tools.c:373
+msgid "Part Highlighting Disabled."
+msgstr "Onemogočeno poudarjanje delov."
+
+#: src/bin/tools.c:458
+msgid "Dummy Parts Enabled."
+msgstr "Omogočeni butasti deli."
+
+#: src/bin/tools.c:460
+msgid "Dummy Parts Disabled."
+msgstr "Onemogočeni butasti deli."
+
+#: src/bin/tools.c:483
+msgid "Mirror Mode Enabled."
+msgstr "Omogočen način ogledala."
+
+#: src/bin/tools.c:485
+msgid "Mirror Mode Disabled."
+msgstr "Onemogočen način ogledala."
+
+#: src/bin/tools.c:539
+msgid "Insertion of template code is disabled while in Live Edit mode"
+msgstr ""
+"Med načinom urejanja v živo, je vstavljanje kode predloge onemogočeno"
+
+#: src/bin/tools.c:548
+#, c-format
+msgid "Template code inserted, (%s)"
+msgstr "Vstavljena koda predloge, (%s)"
+
+#: src/bin/tools.c:554
+msgid ""
+"Can't insert template code here. Move the cursor inside the \"Collections,"
+"Images,Parts,Part,Programs\" scope."
+msgstr ""
+"Tukaj ne morem vstaviti kode predloge. Premaknite kurzor znotraj okvirja "
+"\"Zbirke,Slike,Deli,Del,Programi\"."

src/bin/base_gui.c

@@ -105,7 +105,20 @@ base_file_tab_toggle(Eina_Bool toggle)
      }
 }
 
-void base_file_browser_toggle(Eina_Bool toggle)
+static void
+file_browser_hide_done(void *data, Evas_Object *obj EINA_UNUSED,
+                       const char *emission EINA_UNUSED,
+                       const char *source EINA_UNUSED)
+{
+   base_data *bd = data;
+   elm_object_signal_callback_del(bd->layout,
+                                  "elm,state,file_browser_hide,done", "",
+                                  file_browser_hide_done);
+   file_browser_hide();
+}
+
+void
+base_file_browser_toggle(Eina_Bool toggle)
 {
    base_data *bd = g_bd;
    EINA_SAFETY_ON_NULL_RETURN(bd);
@@ -113,17 +126,38 @@ void base_file_browser_toggle(Eina_Bool toggle)
    if (toggle) config_file_browser_set(!config_file_browser_get());
 
    if (config_file_browser_get())
-     elm_object_signal_emit(bd->layout, "elm,state,file_browser,show", "");
+     {
+        elm_object_signal_emit(bd->layout, "elm,state,file_browser,show", "");
+        file_browser_show();
+     }
    else
-     elm_object_signal_emit(bd->layout, "elm,state,file_browser,hide", "");
+     {
+        elm_object_signal_callback_add(bd->layout,
+                                       "elm,state,file_browser_hide,done", "",
+                                       file_browser_hide_done, bd);
+        elm_object_signal_emit(bd->layout, "elm,state,file_browser,hide", "");
+     }
 }
 
-void base_edc_navigator_deselect(void)
+void
+base_edc_navigator_deselect(void)
 {
    if (config_edc_navigator_get())
      edc_navigator_deselect();
 }
 
+static void
+edc_navigator_hide_done(void *data, Evas_Object *obj EINA_UNUSED,
+                        const char *emission EINA_UNUSED,
+                        const char *source EINA_UNUSED)
+{
+   base_data *bd = data;
+   elm_object_signal_callback_del(bd->layout,
+                                  "elm,state,edc_navigator_hide,done", "",
+                                  edc_navigator_hide_done);
+   edc_navigator_hide();
+}
+
 void base_edc_navigator_toggle(Eina_Bool toggle)
 {
    base_data *bd = g_bd;
@@ -135,9 +169,13 @@ void base_edc_navigator_toggle(Eina_Bool toggle)
      {
         base_edc_navigator_group_update();
         elm_object_signal_emit(bd->layout, "elm,state,edc_navigator,show", "");
+        edc_navigator_show();
      }
    else
      {
+        elm_object_signal_callback_add(bd->layout,
+                                       "elm,state,edc_navigator_hide,done", "",
+                                       edc_navigator_hide_done, bd);
         elm_object_signal_emit(bd->layout, "elm,state,edc_navigator,hide", "");
         edc_navigator_deselect();
      }
@@ -266,7 +304,7 @@ void
 base_gui_term(void)
 {
    base_data *bd = g_bd;
-   EINA_SAFETY_ON_NULL_RETURN(bd);
+   if (!bd) return;
 
    ecore_timer_del(bd->edc_navi_update_timer);
    file_browser_term();
@@ -382,6 +420,7 @@ base_gui_show(void)
    base_data *bd = g_bd;
    EINA_SAFETY_ON_NULL_RETURN(bd);
 
+   evas_object_resize(bd->win, INIT_WIN_W, INIT_WIN_H);
    evas_object_show(bd->win);
 }
 

src/bin/build_setting.c

@@ -6,6 +6,7 @@
 typedef struct build_setting_s
 {
    Evas_Object *layout;
+   Evas_Object *main_edc_entry;
    Evas_Object *img_path_entry;
    Evas_Object *snd_path_entry;
    Evas_Object *fnt_path_entry;
@@ -28,6 +29,12 @@ entry_create(Evas_Object *parent)
    return entry;
 }
 
+static void
+main_edc_entry_update(Evas_Object *entry, const char *path)
+{
+   elm_entry_entry_set(entry, path);
+}
+
 static void
 img_path_entry_update(Evas_Object *entry, Eina_List *edc_img_paths)
 {
@@ -93,7 +100,7 @@ build_setting_focus_set(build_setting_data *bsd)
 {
    EINA_SAFETY_ON_NULL_RETURN(bsd);
 
-   elm_object_focus_set(bsd->img_path_entry, EINA_TRUE);
+   elm_object_focus_set(bsd->main_edc_entry, EINA_TRUE);
 }
 
 void
@@ -101,6 +108,7 @@ build_setting_config_set(build_setting_data *bsd)
 {
    if (!bsd) return;
 
+   config_input_path_set(elm_object_text_get(bsd->main_edc_entry));
    config_img_path_set(elm_object_text_get(bsd->img_path_entry));
    config_snd_path_set(elm_object_text_get(bsd->snd_path_entry));
    config_fnt_path_set(elm_object_text_get(bsd->fnt_path_entry));
@@ -112,6 +120,7 @@ build_setting_reset(build_setting_data *bsd)
 {
    if (!bsd) return;
 
+   main_edc_entry_update(bsd->main_edc_entry, config_input_path_get());
    img_path_entry_update(bsd->img_path_entry,
                          (Eina_List *)config_img_path_list_get());
    snd_path_entry_update(bsd->snd_path_entry,
@@ -135,11 +144,29 @@ build_setting_content_get(build_setting_data *bsd, Evas_Object *parent)
    evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_show(layout);
 
+   //Main EDC Path Entry
+   Evas_Object *main_edc_entry = entry_create(layout);
+   main_edc_entry_update(main_edc_entry, config_input_path_get());
+   elm_object_focus_set(main_edc_entry, EINA_TRUE);
+   elm_object_part_content_set(layout, "elm.swallow.main_edc_entry",
+                               main_edc_entry);
+   elm_layout_text_set(layout, "main_edc_guide", _("Main EDC File:"));
+
+   //Main EDC Path Tooltip
+   Evas_Object *main_edc_tooltip = elm_button_add(layout);
+   elm_object_style_set(main_edc_tooltip, ENVENTOR_NAME);
+   elm_object_part_content_set(layout, "main_edc_tooltip", main_edc_tooltip);
+
+   elm_object_tooltip_text_set(main_edc_tooltip,
+                               _("Main EDC File path, which is containing<br>"
+                                 "collections, used for a current<br>"
+                                 "project."));
+   elm_object_focus_allow_set(main_edc_tooltip, EINA_FALSE);
+
    //Image Path Entry
    Evas_Object *img_path_entry = entry_create(layout);
    img_path_entry_update(img_path_entry,
                          (Eina_List *)config_img_path_list_get());
-   elm_object_focus_set(img_path_entry, EINA_TRUE);
    elm_object_part_content_set(layout, "elm.swallow.img_path_entry",
                                img_path_entry);
    elm_layout_text_set(layout, "img_path_guide", _("Image paths:"));
@@ -209,6 +236,7 @@ build_setting_content_get(build_setting_data *bsd, Evas_Object *parent)
    elm_object_focus_allow_set(data_path_tooltip, EINA_FALSE);
 
    bsd->layout = layout;
+   bsd->main_edc_entry = main_edc_entry;
    bsd->img_path_entry = img_path_entry;
    bsd->snd_path_entry = snd_path_entry;
    bsd->fnt_path_entry = fnt_path_entry;

src/bin/config_data.c

@@ -21,9 +21,10 @@ typedef struct config_s
 
    unsigned int version;
    float font_scale;
-   double view_scale;
    double editor_size;
    double console_size;
+   double file_browser_size;
+   double edc_navigator_size;
 
    void (*update_cb)(void *data);
    void *update_cb_data;
@@ -45,15 +46,6 @@ typedef struct config_s
    Eina_Bool edc_navigator;
    Eina_Bool red_alert;
    Eina_Bool file_tab;
-
-   /* These two loaded variables are used for value overriding.
-      file_browser and file_tab will be forcely disabled if the workspace were
-      not given by user. In that case, these variables would have false always.
-      So, store original setting values here to keep the Enventor config
-      properly. */
-   Eina_Bool file_browser_loaded;
-   Eina_Bool file_tab_loaded;
-
 } config_data;
 
 static config_data *g_cd = NULL;
@@ -95,19 +87,22 @@ static void
 config_save(config_data *cd)
 {
    char buf[PATH_MAX];
+   const char *config_home = efreet_config_home_get();
+   if (!config_home) return;
 
    //Create config home directory if it doesn't exist.
-   if (!ecore_file_exists(efreet_config_home_get()))
+   if (!ecore_file_exists(config_home))
      {
-        Eina_Bool success = ecore_file_mkdir(efreet_config_home_get());
+        Eina_Bool success = ecore_file_mkdir(config_home);
         if (!success)
           {
-             EINA_LOG_ERR(_("Cannot create a config folder \"%s\""), efreet_config_home_get());
+             EINA_LOG_ERR(_("Cannot create a config folder \"%s\""),
+                          config_home);
              return;
           }
      }
 
-   snprintf(buf, sizeof(buf), "%s/enventor", efreet_config_home_get());
+   snprintf(buf, sizeof(buf), "%s/enventor", config_home);
 
    //Create enventor config folder if it doesn't exist.
    if (!ecore_file_exists(buf))
@@ -115,14 +110,14 @@ config_save(config_data *cd)
         Eina_Bool success = ecore_file_mkdir(buf);
         if (!success)
           {
-             EINA_LOG_ERR(_("Cannot create a config folder \"%s\""), buf);
+             EINA_LOG_ERR(_("Cannot create a enventor config folder \"%s\""),
+                          buf);
              return;
           }
      }
 
    //Save config file.
-   snprintf(buf, sizeof(buf), "%s/enventor/config.eet",
-            efreet_config_home_get());
+   snprintf(buf, sizeof(buf), "%s/enventor/config.eet", config_home);
    Eet_File *ef = eet_open(buf, EET_FILE_MODE_WRITE);
    if (!ef)
      {
@@ -130,10 +125,6 @@ config_save(config_data *cd)
         return;
      }
 
-   //Restore loaded file browser & file tab config.
-   cd->file_browser = cd->file_browser_loaded;
-   cd->file_tab = cd->file_tab_loaded;
-
    eet_data_write(ef, edd_base, "config", cd, 1);
    eet_close(ef);
 }
@@ -189,13 +180,14 @@ config_load(void)
         cd->fnt_path_list = NULL;
         cd->dat_path_list = NULL;
         cd->font_scale = 1;
-        cd->view_scale = 1;
         cd->view_size_w = 300;
         cd->view_size_h = 300;
         cd->win_size_w = WIN_DEFAULT_W;
         cd->win_size_h = WIN_DEFAULT_H;
         cd->editor_size = DEFAULT_EDITOR_SIZE;
         cd->console_size = DEFAULT_CONSOLE_SIZE;
+        cd->file_browser_size = DEFAULT_FILE_BROWSER_SIZE;
+        cd->edc_navigator_size = DEFAULT_EDC_NAVIGATOR_SIZE;
         cd->stats_bar = EINA_TRUE;
         cd->linenumber = EINA_TRUE;
         cd->part_highlight = EINA_TRUE;
@@ -208,10 +200,10 @@ config_load(void)
         cd->auto_complete = EINA_TRUE;
         cd->version = ENVENTOR_CONFIG_VERSION;
         cd->smart_undo_redo = EINA_FALSE;
-        cd->file_browser = EINA_FALSE;
+        cd->file_browser = EINA_TRUE;
         cd->edc_navigator = EINA_TRUE;
         cd->red_alert = EINA_TRUE;
-        cd->file_tab = EINA_FALSE;
+        cd->file_tab = EINA_TRUE;
      }
 
    g_cd = cd;
@@ -267,10 +259,6 @@ config_load(void)
    if (!cd->font_style)
      eina_stringshare_replace(&cd->font_style, "Regular");
 
-   //Store loaded file browser config.
-   cd->file_browser_loaded = cd->file_browser;
-   cd->file_tab_loaded = cd->file_tab;
-
    return cd;
 }
 
@@ -299,12 +287,14 @@ eddc_init(void)
                                  EET_T_STRING);
    EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "font_scale", font_scale,
                                  EET_T_FLOAT);
-   EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "view_scale",
-                                 view_scale, EET_T_DOUBLE);
    EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "editor_size",
                                  editor_size, EET_T_DOUBLE);
    EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "console_size",
                                  console_size, EET_T_DOUBLE);
+   EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "file_browser_size",
+                                 file_browser_size, EET_T_DOUBLE);
+   EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "edc_navigator_size",
+                                 edc_navigator_size, EET_T_DOUBLE);
    EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "view_size_w",
                                  view_size_w, EET_T_INT);
    EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "view_size_h",
@@ -357,8 +347,7 @@ Eina_Bool
 config_init(const char *input_path, const char *output_path,
             const char *workspace_path,
             Eina_List *img_path, Eina_List *snd_path,
-            Eina_List *fnt_path, Eina_List *dat_path,
-            Eina_Bool default_workspace)
+            Eina_List *fnt_path, Eina_List *dat_path)
 {
    eddc_init();
 
@@ -372,14 +361,6 @@ config_init(const char *input_path, const char *output_path,
    if (workspace_path[0])
      eina_stringshare_replace(&cd->workspace_path, workspace_path);
 
-   //In case of default workspace
-   //we don't turn on file browser and file tab in default.
-   if (default_workspace)
-     {
-        cd->file_browser = EINA_FALSE;
-        cd->file_tab = EINA_FALSE;
-     }
-
    if (img_path)
      cd->img_path_list = img_path;
 
@@ -399,6 +380,7 @@ void
 config_term(void)
 {
    config_data *cd = g_cd;
+   if (!cd) return;
 
    config_save(cd);
 
@@ -739,7 +721,6 @@ config_file_tab_set(Eina_Bool enabled)
    EINA_SAFETY_ON_NULL_RETURN(cd);
 
    cd->file_tab = enabled;
-   cd->file_tab_loaded = enabled;
 }
 
 Eina_Bool
@@ -939,28 +920,6 @@ config_auto_indent_set(Eina_Bool auto_indent)
    cd->auto_indent = auto_indent;
 }
 
-void
-config_view_scale_set(double view_scale)
-{
-   config_data *cd = g_cd;
-   EINA_SAFETY_ON_NULL_RETURN(cd);
-
-   if (view_scale > MAX_VIEW_SCALE)
-     view_scale = MAX_VIEW_SCALE;
-   else if (view_scale < MIN_VIEW_SCALE)
-     view_scale = MIN_VIEW_SCALE;
-   cd->view_scale = view_scale;
-}
-
-double
-config_view_scale_get(void)
-{
-   config_data *cd = g_cd;
-   EINA_SAFETY_ON_NULL_RETURN_VAL(cd, 0);
-
-   return cd->view_scale;
-}
-
 void
 config_view_size_set(Evas_Coord w, Evas_Coord h)
 {
@@ -1098,7 +1057,6 @@ config_file_browser_set(Eina_Bool enabled)
    EINA_SAFETY_ON_NULL_RETURN(cd);
 
    cd->file_browser = enabled;
-   cd->file_browser_loaded = enabled;
 }
 
 Eina_Bool
@@ -1110,6 +1068,24 @@ config_file_browser_get(void)
    return cd->file_browser;
 }
 
+void
+config_file_browser_size_set(double size)
+{
+   config_data *cd = g_cd;
+   EINA_SAFETY_ON_NULL_RETURN(cd);
+
+   cd->file_browser_size = size;
+}
+
+double
+config_file_browser_size_get(void)
+{
+   config_data *cd = g_cd;
+   EINA_SAFETY_ON_NULL_RETURN_VAL(cd, 0.0);
+
+   return cd->file_browser_size;
+}
+
 void
 config_edc_navigator_set(Eina_Bool enabled)
 {
@@ -1127,3 +1103,21 @@ config_edc_navigator_get(void)
 
    return cd->edc_navigator;
 }
+
+void
+config_edc_navigator_size_set(double size)
+{
+   config_data *cd = g_cd;
+   EINA_SAFETY_ON_NULL_RETURN(cd);
+
+   cd->edc_navigator_size = size;
+}
+
+double
+config_edc_navigator_size_get(void)
+{
+   config_data *cd = g_cd;
+   EINA_SAFETY_ON_NULL_RETURN_VAL(cd, 0.0);
+
+   return cd->edc_navigator_size;
+}

src/bin/console.c

@@ -9,7 +9,7 @@ token_value_get(char *src, char *key_str, char end_key, int offset, char *dst)
 {
    char *psrc = src;
    int count = 0;
-   psrc += (strlen(key_str) + offset ) * sizeof(char);
+   psrc += strlen(key_str) + offset;
    while (*psrc != end_key)
      dst[count++] = *psrc++;
    dst[count] = '\0';
@@ -18,56 +18,75 @@ token_value_get(char *src, char *key_str, char end_key, int offset, char *dst)
 static void
 error_word_select(Evas_Object *console)
 {
-   const char *console_text = elm_entry_entry_get(console);
-   if (console_text == NULL) return;
+   Enventor_Item *it = file_mgr_focused_item_get();
+   if (!it)
+     {
+        EINA_LOG_ERR("No focused item??");
+        return;
+     }
+
+   if (elm_entry_is_empty(console)) return;
+
+   //Convert console text including markup text to the plain text
+   const char *markup_text = elm_entry_entry_get(console);
+   if (!markup_text) return;
+   char *console_text = elm_entry_markup_to_utf8(markup_text);
+   if (!console_text) return;
 
    char error_word[1024];
    char error_line[1024];
    char *error_token, *edc_token;
 
-   //parse edc line
-   if ((edc_token = strstr(console_text, "edc:")))
-     token_value_get(edc_token, "edc:", ' ', 0, error_line);
-   else return;
+   //Parse edc line
+   if ((edc_token = strstr(console_text, "edc : ")))
+     token_value_get(edc_token, "edc : ", ' ', 0, error_line);
+   else
+     goto end;
 
-   //parse error word
+   //Parse error word
    if ((error_token = strstr(console_text, "keyword")))
-     token_value_get(error_token, "keyword", '\0', 1, error_word);
+     token_value_get(error_token, "keyword", ' ', 1, error_word);
    else if ((error_token = strstr(console_text, "name")))
-     token_value_get(error_token, "name", '\0', 1, error_word);
-   else return;
+     token_value_get(error_token, "name", ' ', 1, error_word);
+   else
+     goto end;
 
-    //FIXME: Need to get the file that contains errors.
-    Enventor_Item *it = file_mgr_focused_item_get();
-    EINA_SAFETY_ON_NULL_RETURN(it);
+   //Find error word position
+   enventor_item_line_goto(it, atoi(error_line));
+   int pos = enventor_item_cursor_pos_get(it);
+   const char *entry_text = enventor_item_text_get(it);
+   char *utf8 = elm_entry_markup_to_utf8(entry_text);
+   if(!utf8) goto end;
 
-    //find error word position
-    enventor_item_line_goto(it, atoi(error_line));
-    int pos = enventor_item_cursor_pos_get(it);
-    const char *entry_text = enventor_item_text_get(it);
-    char *utf8 = elm_entry_markup_to_utf8(entry_text);
-    const char *search_line = utf8 + pos * sizeof(char);
-    const char *matched = strstr(search_line, error_word);
+   const char *search_line = utf8 + pos;
+   const char *matched = strstr(search_line, error_word);
+   if (!matched)
+     {
+        free(utf8);
+        goto end;
+     }
 
-    if (matched == NULL)
-      {
-         free(utf8);
-         return;
-      }
+   int start, end;
+   start = matched - utf8;
+   end = start + strlen(error_word);
 
-    int start, end;
-    start = matched - utf8;
-    end = start + strlen(error_word);
+   //Select error word
+   enventor_item_select_region_set(it, start, end);
+   free(utf8);
 
-    free(utf8);
-
-    //select error word
-    enventor_item_select_region_set(it, start, end);
+end:
+   free(console_text);
 }
 
 static void
 set_console_error_msg(Evas_Object *console, const char *src)
 {
+   if (!src || !strcmp(src, ""))
+     {
+        elm_entry_entry_set(console, NULL);
+        return;
+     }
+
    /* We cut error messages since it contains unnecessary information.
       Most of the time, first one line has a practical information. */
    const char *new_line  = "<br/>";
@@ -85,7 +104,7 @@ set_console_error_msg(Evas_Object *console, const char *src)
    free(color_msg);
 }
 
-static char*
+char*
 error_msg_syntax_color_set(char *text)
 {
    char *color_error_msg;

src/bin/edc_navigator.c

@@ -120,6 +120,7 @@ static const char *IMAGE_TYPE_STR = "image";
 static const char *SWALLOW_TYPE_STR = "swallow";
 static const char *TEXTBLOCK_TYPE_STR = "textblock";
 static const char *SPACER_TYPE_STR = "spacer";
+static const char *VECTOR_TYPE_STR = "vector";
 static const char *PART_TYPE_STR = "part";
 
 static void group_contract(group_it *git);
@@ -275,6 +276,8 @@ part_type_get(part_it *pit)
          return TEXTBLOCK_TYPE_STR;
       case EDJE_PART_TYPE_SPACER:
          return SPACER_TYPE_STR;
+      case EDJE_PART_TYPE_VECTOR:
+         return VECTOR_TYPE_STR;
       default:
          return PART_TYPE_STR;
      }
@@ -730,7 +733,7 @@ states_update(navi_data *nd, part_it *pit)
         sit->tag.idx = idx;
         //Parsing "default" "0.00". We don't take care 0.00 in the state name.
         const char *brk = strpbrk(name, " ");
-        if (brk) sit->name = strndup(name, brk - name);
+        if (brk) sit->name = eina_strndup(name, brk - name);
         else sit->name = strdup(name);
 
         sit->pit = pit;
@@ -934,7 +937,7 @@ programs_update(navi_data *nd, group_it *git)
    Enventor_Object *enventor = base_enventor_get();
    Eina_List *program_list = enventor_object_programs_list_get(enventor);
 
-   //oh, no programs.. 
+   //oh, no programs..
    if (!program_list)
      {
         navigator_programs_clear(git);
@@ -1116,6 +1119,9 @@ gl_part_content_get_cb(void *data, Evas_Object *obj, const char *part)
       case EDJE_PART_TYPE_SPACER:
          group = "navi_spacer";
          break;
+      case EDJE_PART_TYPE_VECTOR:
+         group = "navi_vector";
+         break;
       default:
          group = "navi_unknown";
          break;
@@ -1345,6 +1351,44 @@ gl_contract_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
      }
 }
 
+static void
+dragable_bar_mouse_up_cb(void *data, Evas *e EINA_UNUSED,
+                         Evas_Object *obj EINA_UNUSED,
+                         void *event_info EINA_UNUSED)
+{
+   Evas_Object *main_layout = data;
+   if (!main_layout) return;
+
+   double w;
+   edje_object_part_drag_value_get
+           (elm_layout_edje_get(main_layout), "elm.bar.right", &w, NULL);
+   if (w > 0.99)
+   {
+      config_edc_navigator_set(EINA_FALSE);
+      tools_edc_navigator_update(EINA_FALSE);
+      config_edc_navigator_size_set(0.0);
+   }
+   else
+      config_edc_navigator_size_set(w);
+}
+
+static void
+dragable_bar_mouse_down_cb(void *data, Evas *e EINA_UNUSED,
+                           Evas_Object *obj EINA_UNUSED,
+                           void *event_info EINA_UNUSED)
+{
+   Evas_Object *main_layout = data;
+   if (!main_layout) return;
+
+   double w;
+   edje_object_part_drag_value_get
+           (elm_layout_edje_get(main_layout), "elm.bar.right", &w, NULL);
+   if (w > 0.99)
+   {
+      config_edc_navigator_set(EINA_TRUE);
+      tools_edc_navigator_update(EINA_FALSE);
+   }
+}
 /*****************************************************************************/
 /* Externally accessible calls                                               */
 /*****************************************************************************/
@@ -1366,7 +1410,7 @@ edc_navigator_group_update(const char *cur_group)
 
    //FIXME: This function is unnecessarily called... why?
 
-   //Cancel item selection if group was not indicated. 
+   //Cancel item selection if group was not indicated.
    if (!cur_group) navigator_item_deselect(nd);
    Eina_List *group_list =
       enventor_item_group_list_get(file_mgr_focused_item_get());
@@ -1530,9 +1574,21 @@ edc_navigator_init(Evas_Object *parent)
 
    nd->program_itc = itc;
 
+   //Dragable Bar
+   Evas_Object *bar = evas_object_rectangle_add(evas_object_evas_get(parent));
+   evas_object_color_set(bar, 0, 0, 0, 0);
+   evas_object_event_callback_add(bar, EVAS_CALLBACK_MOUSE_DOWN,
+                                  dragable_bar_mouse_down_cb, parent);
+   evas_object_event_callback_add(bar, EVAS_CALLBACK_MOUSE_UP,
+                                  dragable_bar_mouse_up_cb, parent);
+   elm_object_part_content_set(parent, "bar_right", bar);
+
    nd->base_layout = base_layout;
    nd->genlist = genlist;
 
+   if (config_edc_navigator_get())
+     config_edc_navigator_size_set(config_edc_navigator_size_get());
+
    return base_layout;
 }
 
@@ -1579,3 +1635,28 @@ edc_navigator_tools_visible_set(Eina_Bool visible)
    else
      elm_object_signal_emit(nd->base_layout, "elm,state,tools,hide", "");
 }
+
+void
+edc_navigator_show()
+{
+   navi_data *nd = g_nd;
+   if (!nd) return;
+
+   Evas_Object *main_layout = evas_object_smart_parent_get(nd->base_layout);
+   if (!main_layout) return;
+
+   double w = config_edc_navigator_size_get();
+   edje_object_part_drag_value_set(main_layout, "elm.bar.right", w, 0.0);
+}
+
+void
+edc_navigator_hide()
+{
+   navi_data *nd = g_nd;
+   if (!nd) return;
+
+   Evas_Object *main_layout = evas_object_smart_parent_get(nd->base_layout);
+   if (!main_layout) return;
+
+   edje_object_part_drag_value_set(main_layout, "elm.bar.right", 1.0, 0.0);
+}

src/bin/file_browser.c

@@ -35,7 +35,6 @@ typedef struct file_browser_s
    brows_file *workspace;       //workspace directory
    Eina_List *search_file_list; /* list of searched files. This is only used for
                                    showing search results. */
-
    Evas_Object *base_layout;
    Evas_Object *search_entry;
    Evas_Object *genlist;
@@ -45,6 +44,8 @@ typedef struct file_browser_s
    Elm_Genlist_Item_Class *search_itc;
 
    File_Browser_Mode mode;
+
+   Elm_Object_Item *main_it;
 } brows_data;
 
 static brows_data *g_bd = NULL;
@@ -90,6 +91,13 @@ gl_item_del_cb(void *data, Evas_Object *obj EINA_UNUSED,
    if (!file) return;
 
    file->it = NULL;
+
+   //Reset Main Item
+   if (file->main)
+     {
+        brows_data *bd = g_bd;
+        bd->main_it = NULL;
+     }
 }
 
 static Elm_Object_Item *
@@ -121,6 +129,13 @@ file_genlist_item_append(brows_file *file, Elm_Object_Item *parent_it,
 
    elm_genlist_item_expanded_set(file->it, EINA_FALSE);
 
+   //Keep Main Item
+   if (file->main)
+     {
+        bd = g_bd;
+        bd->main_it = file->it;
+     }
+
    return file->it;
 }
 
@@ -246,7 +261,7 @@ gl_contract_request_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
 }
 
 static void
-gl_expanded_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info)
+gl_expanded_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    brows_data *bd = g_bd;
    if (!bd) return;
@@ -285,7 +300,7 @@ gl_expanded_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info)
 }
 
 static void
-gl_contracted_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info)
+gl_contracted_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    brows_data *bd = g_bd;
    if (!bd) return;
@@ -402,15 +417,15 @@ sub_brows_file_list_create(brows_file *file)
    Eina_List *sub_file_list = NULL;
 
    Eina_List *sub_file_name_list = ecore_file_ls(file->path);
-   Eina_List *l = NULL;
    char *sub_file_name = NULL;
    char *dir_path = file->path;
-   EINA_LIST_FOREACH(sub_file_name_list, l, sub_file_name)
+   EINA_LIST_FREE(sub_file_name_list, sub_file_name)
      {
         int sub_file_path_len = strlen(dir_path) + strlen(sub_file_name) + 2;
         char *sub_file_path = calloc(1, sizeof(char) * (sub_file_path_len));
         snprintf(sub_file_path, sub_file_path_len, "%s/%s", dir_path,
                  sub_file_name);
+        free(sub_file_name);
 
         //Create sub file without creating its sub file list.
         brows_file *sub_file = brows_file_create(sub_file_path, EINA_FALSE);
@@ -509,15 +524,15 @@ search_file_set_internal(const char *file_path)
 
    //Set sub files by calling function resursively.
    Eina_List *sub_file_name_list = ecore_file_ls(file_path);
-   Eina_List *l = NULL;
    char *sub_file_name = NULL;
    const char *dir_path = file_path;
-   EINA_LIST_FOREACH(sub_file_name_list, l, sub_file_name)
+   EINA_LIST_FREE(sub_file_name_list, sub_file_name)
      {
         int sub_file_path_len = strlen(dir_path) + strlen(sub_file_name) + 2;
         char *sub_file_path = calloc(1, sizeof(char) * (sub_file_path_len));
         snprintf(sub_file_path, sub_file_path_len, "%s/%s", dir_path,
                  sub_file_name);
+        free(sub_file_name);
 
         search_file_set_internal(sub_file_path);
         free(sub_file_path);
@@ -586,20 +601,7 @@ static void
 refresh_btn_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
                        void *event_info EINA_UNUSED)
 {
-   brows_data *bd = g_bd;
-   if (!bd) return;
-
-   if (bd->mode == FILE_BROWSER_MODE_DEFAULT)
-     file_browser_workspace_reset();
-   else
-     {
-        if (bd->search_file_list)
-          {
-             brows_file_list_free(bd->search_file_list);
-             bd->search_file_list = NULL;
-          }
-        search_file_set(config_workspace_path_get());
-     }
+   file_browser_refresh();
 }
 
 static void
@@ -622,6 +624,44 @@ show_all_check_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
      }
 }
 
+static void
+dragable_bar_mouse_up_cb(void *data, Evas *e EINA_UNUSED,
+                            Evas_Object *obj EINA_UNUSED,
+                            void *event_info EINA_UNUSED)
+{
+   Evas_Object *main_layout = data;
+   if (!main_layout) return;
+
+   double w;
+   edje_object_part_drag_value_get
+           (elm_layout_edje_get(main_layout), "elm.bar.left", &w, NULL);
+   if (w < 0.01)
+     {
+        config_file_browser_set(EINA_FALSE);
+        tools_file_browser_update(EINA_FALSE);
+        config_file_browser_size_set(0.0);
+     }
+   else
+     config_file_browser_size_set(w);
+}
+
+static void
+dragable_bar_mouse_down_cb(void *data, Evas *e EINA_UNUSED,
+                            Evas_Object *obj EINA_UNUSED,
+                            void *event_info EINA_UNUSED)
+{
+   Evas_Object *main_layout = data;
+   if (!main_layout) return;
+
+   double w;
+   edje_object_part_drag_value_get
+           (elm_layout_edje_get(main_layout), "elm.bar.left", &w, NULL);
+   if (w < 0.01)
+     {
+        config_file_browser_set(EINA_TRUE);
+        tools_file_browser_update(EINA_FALSE);
+     }
+}
 /*****************************************************************************/
 /* Externally accessible calls                                               */
 /*****************************************************************************/
@@ -770,11 +810,23 @@ file_browser_init(Evas_Object *parent)
    search_itc->func.content_get = gl_search_content_get_cb;
    bd->search_itc = search_itc;
 
+   //Dragable Bar
+   Evas_Object *bar = evas_object_rectangle_add(evas_object_evas_get(parent));
+   evas_object_color_set(bar, 0, 0, 0, 0);
+   evas_object_event_callback_add(bar, EVAS_CALLBACK_MOUSE_DOWN,
+                                  dragable_bar_mouse_down_cb, parent);
+   evas_object_event_callback_add(bar, EVAS_CALLBACK_MOUSE_UP,
+                                  dragable_bar_mouse_up_cb, parent);
+   elm_object_part_content_set(parent, "bar_left", bar);
+
    bd->base_layout = base_layout;
    bd->search_entry = search_entry;
    bd->genlist = genlist;
    bd->show_all_check = show_all_check;
 
+   if (config_file_browser_get())
+     config_file_browser_size_set(config_file_browser_size_get());
+
    elm_object_disabled_set(base_layout, EINA_TRUE);
 
    return base_layout;
@@ -821,3 +873,128 @@ file_browser_tools_visible_set(Eina_Bool visible)
    else
      elm_object_signal_emit(bd->base_layout, "elm,state,tools,hide", "");
 }
+
+void
+file_browser_refresh(void)
+{
+   brows_data *bd = g_bd;
+   if (!bd) return;
+
+   if (bd->mode == FILE_BROWSER_MODE_DEFAULT)
+     file_browser_workspace_reset();
+   else
+     {
+        if (bd->search_file_list)
+          {
+             brows_file_list_free(bd->search_file_list);
+             bd->search_file_list = NULL;
+          }
+        search_file_set(config_workspace_path_get());
+     }
+}
+
+void
+file_browser_main_file_unset(void)
+{
+   brows_data *bd = g_bd;
+   if (!bd || !bd->main_it) return;
+
+   brows_file *file = elm_object_item_data_get(bd->main_it);
+   if (!file)
+     {
+        EINA_LOG_ERR("No item data??");
+        return;
+     }
+
+   file->main = EINA_FALSE;
+   bd->main_it = NULL;
+
+   elm_genlist_realized_items_update(bd->genlist);
+}
+
+void
+file_browser_selected_file_main_set(void)
+{
+   const char *exception_msg = "Please select a main EDC file in file browser.";
+
+   brows_data *bd = g_bd;
+   if (!bd) return;
+
+   Elm_Object_Item *it = elm_genlist_selected_item_get(bd->genlist);
+   if(!it)
+     {
+        stats_info_msg_update(exception_msg);
+        return;
+     }
+
+   //Same to previous item
+   if (it == bd->main_it)
+     {
+        char buf[1024];
+        brows_file *file = elm_object_item_data_get(it);
+        if (!file) return;
+        snprintf(buf, sizeof(buf), "\"%s\" is already set to main", file->name);
+        stats_info_msg_update(buf);
+        return;
+     }
+
+   brows_file *file = elm_object_item_data_get(it);
+   if (!file)
+     {
+        EINA_LOG_ERR("No item data??");
+        return;
+     }
+
+   if (!file->path)
+     {
+        EINA_LOG_ERR("No item file path??");
+        return;
+
+     }
+
+   if (!eina_str_has_extension(file->path, "edc"))
+     {
+        stats_info_msg_update(exception_msg);
+        return;
+     }
+
+   //Replace main item
+   Elm_Object_Item *prev_main_it = bd->main_it;
+   if (prev_main_it)
+     {
+        brows_file *prev_file = elm_object_item_data_get(prev_main_it);
+        if (prev_file) prev_file->main = EINA_FALSE;
+        else EINA_LOG_ERR("No item data??");
+     }
+
+   file->main = EINA_TRUE;
+   bd->main_it = file->it;
+
+   config_input_path_set(file->path);
+   elm_genlist_realized_items_update(bd->genlist);
+}
+
+void
+file_browser_show()
+{
+   brows_data *bd = g_bd;
+   if (!bd) return;
+
+   Evas_Object *main_layout = evas_object_smart_parent_get(bd->base_layout);
+   if (!main_layout) return;
+
+   double w = config_file_browser_size_get();
+   edje_object_part_drag_value_set(main_layout, "elm.bar.left", w, 0.0);
+}
+
+void
+file_browser_hide()
+{
+   brows_data *bd = g_bd;
+   if (!bd) return;
+
+   Evas_Object *main_layout = evas_object_smart_parent_get(bd->base_layout);
+   if (!main_layout) return;
+
+   edje_object_part_drag_value_set(main_layout, "elm.bar.left", 0.0, 0.0);
+}

src/bin/file_mgr.c

@@ -5,9 +5,14 @@
 #include <Eio.h>
 #include "common.h"
 
+#define FILE_QUEUE_CNT 20
+
 typedef struct file_mgr_s {
+     Eina_List *file_queue;
      Evas_Object *warning_layout;
+     Enventor_Item *focused_it;
      Eina_Bool edc_modified : 1;
+     Eina_Bool no_queue : 1;  //file queueing?
 } file_mgr_data;
 
 static file_mgr_data *g_fmd = NULL;
@@ -135,13 +140,28 @@ enventor_edc_modified_cb(void *data, Evas_Object *obj EINA_UNUSED,
 
    fmd->edc_modified = EINA_TRUE;
 
-   /* FIXME: Here ignore edc changes, if any menu is closed, 
+   /* FIXME: Here ignore edc changes, if any menu is closed,
       then we need to open warning box. */
    if (menu_activated_get()) return;
 
    warning_open(fmd);
 }
 
+static void
+file_mgr_file_push(file_mgr_data *fmd, const char *file)
+{
+   if (!file) return;
+   if (fmd->no_queue) return;
+
+   //Prevent overflow. Remove first node.
+   if (eina_list_count(fmd->file_queue) >= FILE_QUEUE_CNT)
+     fmd->file_queue = eina_list_remove_list(fmd->file_queue, fmd->file_queue);
+
+   //Append new file.
+   Eina_Stringshare *tmp = eina_stringshare_add(file);
+   fmd->file_queue = eina_list_append(fmd->file_queue, tmp);
+}
+
 /*****************************************************************************/
 /* Externally accessible calls                                               */
 /*****************************************************************************/
@@ -228,20 +248,37 @@ void
 file_mgr_term(void)
 {
    file_mgr_data *fmd = g_fmd;
-   EINA_SAFETY_ON_NULL_RETURN(fmd);
+   if (!fmd) return;
+
+   //Remove file queue
+   Eina_Stringshare *file;
+   EINA_LIST_FREE(fmd->file_queue, file)
+     eina_stringshare_del(file);
 
    free(fmd);
 }
 
+void
+file_mgr_file_del(Enventor_Item *it)
+{
+   if (!it) return;
+
+   file_mgr_data *fmd = g_fmd;
+
+   if (fmd->focused_it == it)
+     fmd->focused_it = NULL;
+
+   file_tab_it_remove(it);
+}
+
 Enventor_Item *
-file_mgr_sub_file_add(const char *path)
+file_mgr_sub_file_add(const char *path, Eina_Bool focus)
 {
    Enventor_Item *it = enventor_object_sub_item_add(base_enventor_get(), path);
    EINA_SAFETY_ON_NULL_RETURN_VAL(it, NULL);
 
    file_tab_it_add(it);
-   file_tab_it_select(it);
-   file_mgr_file_focus(it);
+   if (focus) file_mgr_file_focus(it);
 
    return it;
 }
@@ -249,15 +286,80 @@ file_mgr_sub_file_add(const char *path)
 Enventor_Item *
 file_mgr_main_file_set(const char *path)
 {
-   Enventor_Item *it = enventor_object_main_item_set(base_enventor_get(), path);
-   EINA_SAFETY_ON_NULL_RETURN_VAL(it, NULL);
+   file_mgr_data *fmd = g_fmd;
+   if (!fmd) return NULL;
 
-   file_tab_clear();
-   file_tab_it_add(it);
-   file_mgr_file_focus(it);
+   if (!path)
+     {
+        EINA_LOG_ERR("No path??");
+        return NULL;
+     }
+
+   char *realpath;
+
+   if (ecore_file_exists(path))
+     realpath = ecore_file_realpath(path);
+   else
+     {
+        //This main file is not created yet.
+        FILE *fp = fopen(path, "w");
+        if (fp) fclose(fp);
+        realpath = ecore_file_realpath(path);
+     }
+
+   //If this file is already openend with sub file, remove it.
+   Eina_List *sub_its =
+      (Eina_List *) enventor_object_sub_items_get(base_enventor_get());
+   Eina_List *l;
+   Enventor_Item *it;
+   Eina_Bool replace_focus = EINA_FALSE;
+
+   EINA_LIST_FOREACH(sub_its, l, it)
+     {
+        const char *path2 = enventor_item_file_get(it);
+        if (!path2) continue;
+        if (strcmp(realpath, path2)) continue;
+        file_mgr_file_del(it);
+        if (!fmd->focused_it)
+          replace_focus = EINA_TRUE;
+        break;
+     }
+
+   //Replace the current main file to a sub file.
+   Enventor_Item *main_it = file_mgr_main_item_get();
+   if (main_it)
+     {
+        const char *prev_path = enventor_item_file_get(main_it);
+        if (prev_path)
+          {
+             //Replace the current main file if it is not the new main file.
+             if (strcmp(realpath, prev_path))
+               {
+                  Enventor_Item *it2 = file_mgr_sub_file_add(prev_path,
+                                                             EINA_FALSE);
+                  if (fmd->focused_it == main_it)
+                    fmd->focused_it = it2;
+               }
+             else
+               replace_focus = EINA_TRUE;
+
+             file_mgr_file_del(main_it);
+          }
+     }
+
+   main_it = enventor_object_main_item_set(base_enventor_get(), realpath);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(main_it, NULL);
+
+   if (replace_focus)
+     fmd->focused_it = main_it;
+
+   file_tab_it_add(main_it);
+   file_mgr_file_focus(main_it);
    base_console_reset();
 
-   return it;
+   free(realpath);
+
+   return main_it;
 }
 
 void
@@ -265,10 +367,16 @@ file_mgr_file_focus(Enventor_Item *it)
 {
    EINA_SAFETY_ON_NULL_RETURN(it);
 
+   file_mgr_data *fmd = g_fmd;
+
+   if (fmd->focused_it && (fmd->focused_it != it))
+     file_mgr_file_push(fmd, enventor_item_file_get(fmd->focused_it));
+
    file_tab_it_select(it);
    enventor_item_represent(it);
    base_title_set(enventor_item_file_get(it));
    base_edc_navigator_group_update();
+   fmd->focused_it = it;
 
    //Reset file based contexts.
    search_reset();
@@ -350,8 +458,6 @@ file_mgr_file_open(const char *file_path)
    if (!(eina_str_has_extension(file_path, "edc") ||
          eina_str_has_extension(file_path, "h"))) return EINA_FALSE;
 
-   unsigned int selected_file_len = strlen(file_path);
-
    Enventor_Item *eit;
    const char *it_file_path;
 
@@ -366,7 +472,7 @@ file_mgr_file_open(const char *file_path)
              return EINA_FALSE;
           }
         //Ok, This selected file is already openend, let's activate the item.
-        if (!strcmp(file_path, ecore_file_file_get(it_file_path)))
+        if (!strcmp(file_path, it_file_path))
           {
              file_mgr_file_focus(eit);
              return EINA_TRUE;
@@ -382,9 +488,6 @@ file_mgr_file_open(const char *file_path)
         it_file_path = enventor_item_file_get(eit);
         if (!it_file_path) continue;
 
-        //Let's check if the file is already opened.
-        if (selected_file_len != strlen(it_file_path)) continue;
-
         //Ok, This selected file is already openend, let's activate the item.
         if (!strcmp(file_path, it_file_path))
           {
@@ -394,5 +497,35 @@ file_mgr_file_open(const char *file_path)
      }
 
    //This selected file hasn't been opened yet, so let's open this file newly.
-   file_mgr_sub_file_add(file_path);
+   file_mgr_sub_file_add(file_path, EINA_TRUE);
+   return EINA_TRUE;
+}
+
+Eina_Bool
+file_mgr_file_backward(void)
+{
+   file_mgr_data *fmd = g_fmd;
+  if (!fmd) return EINA_FALSE;
+
+   Eina_List *last = eina_list_last(fmd->file_queue);
+   if (!last) return EINA_FALSE;
+
+   Eina_Stringshare *file = eina_list_data_get(last);
+   if (!file)
+     {
+        EINA_LOG_ERR("No file path??");
+        return EINA_FALSE;
+     }
+
+   fmd->file_queue = eina_list_remove_list(fmd->file_queue, last);
+
+   Eina_Bool ret;
+
+   fmd->no_queue = EINA_TRUE;
+   ret = file_mgr_file_open(file);
+   fmd->no_queue = EINA_FALSE;
+
+   eina_stringshare_del(file);
+
+   return ret;
 }

src/bin/file_tab.c

@@ -11,6 +11,7 @@ typedef struct file_tab_it_s
 {
    Enventor_Item *enventor_it;
    Elm_Object_Item *it;
+   Ecore_Animator *animator;
 } file_tab_it;
 
 file_data *g_fd = NULL;
@@ -30,7 +31,9 @@ left_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
    if (!it) return;
    it = elm_list_item_prev(it);
    if (!it) return;
+
    elm_list_item_selected_set(it, EINA_TRUE);
+   elm_list_item_bring_in(it);
 }
 
 static void
@@ -45,7 +48,21 @@ right_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
    if (!it) return;
    it = elm_list_item_next(it);
    if (!it) return;
+
    elm_list_item_selected_set(it, EINA_TRUE);
+   elm_list_item_bring_in(it);
+}
+
+static Eina_Bool
+list_item_anim_cb(void *data)
+{
+   file_tab_it *fti = data;
+
+   elm_list_item_bring_in(fti->it);
+   file_mgr_file_focus(fti->enventor_it);
+   fti->animator = NULL;
+
+   return ECORE_CALLBACK_CANCEL;
 }
 
 static void
@@ -58,12 +75,19 @@ list_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED,
    Elm_Object_Item *it = event_info;
 
    if (fd->selected_it == it) return;
+
+   //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.
    file_tab_it *fti = data;
-   file_mgr_file_focus(fti->enventor_it);
+   ecore_animator_del(fti->animator);
+   fti->animator = ecore_animator_add(list_item_anim_cb, fti);
 }
 
 static void
-file_tab_it_del(file_tab_it *fti)
+file_tab_it_remove_internal(file_tab_it *fti)
 {
    Evas_Object *list = elm_object_item_widget_get(fti->it);
 
@@ -87,8 +111,9 @@ file_tab_it_del(file_tab_it *fti)
      }
 
    //Remove item.
-   elm_object_item_del(fti->it);
    enventor_item_del(fti->enventor_it);
+   elm_object_item_del(fti->it);
+   ecore_animator_del(fti->animator);
    free(fti);
 
    elm_list_go(list);
@@ -99,12 +124,33 @@ close_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                      void *event_info EINA_UNUSED)
 {
    file_tab_it *fti = data;
-   file_tab_it_del(fti);
+   file_mgr_file_del(fti->enventor_it);
 }
 
 /*****************************************************************************/
 /* Externally accessible calls                                               */
 /*****************************************************************************/
+void
+file_tab_it_remove(Enventor_Item *enventor_it)
+{
+   file_data *fd = g_fd;
+   EINA_SAFETY_ON_NULL_RETURN(fd);
+
+   Eina_List *list = (Eina_List*) elm_list_items_get(fd->list);
+   Eina_List *l;
+   Elm_Object_Item *it;
+
+   EINA_LIST_FOREACH(list, l, it)
+     {
+        file_tab_it *fti = elm_object_item_data_get(it);
+        if (fti->enventor_it == enventor_it)
+          {
+             file_tab_it_remove_internal(fti);
+             break;
+          }
+     }
+}
+
 Eina_Bool
 file_tab_it_select(Enventor_Item *enventor_it)
 {
@@ -121,6 +167,7 @@ file_tab_it_select(Enventor_Item *enventor_it)
         if (fti->enventor_it != enventor_it) continue;
         fd->selected_it = it;
         elm_list_item_selected_set(it, EINA_TRUE);
+        elm_list_item_bring_in(it);
         return EINA_TRUE;
      }
 
@@ -141,6 +188,7 @@ file_tab_clear(void)
    EINA_LIST_FOREACH(list, l, it)
      {
         file_tab_it *fti = elm_object_item_data_get(it);
+        ecore_animator_del(fti->animator);
         free(fti);
      }
    elm_list_clear(fd->list);
@@ -192,10 +240,15 @@ file_tab_it_add(Enventor_Item *enventor_it)
    elm_image_file_set(img, EDJE_PATH, "close");
    elm_object_content_set(btn, img);
 
-   fti->it = elm_list_item_append(fd->list, filename, btn, NULL,
+   fti->it = elm_list_item_append(fd->list, filename, NULL, btn,
                                   list_item_selected_cb, fti);
+
+   elm_object_item_tooltip_text_set(fti->it, filepath);
+
    elm_list_go(fd->list);
 
+   elm_list_item_bring_in(fti->it);
+
    evas_object_smart_callback_add(btn, "clicked", close_btn_clicked_cb, fti);
 
    free(filename);
@@ -303,6 +356,7 @@ file_tab_term(void)
    EINA_LIST_FOREACH(children, l, it)
      {
         fti = elm_object_item_data_get(it);
+        ecore_animator_del(fti->animator);
         free(fti);
      }
 
@@ -311,3 +365,4 @@ file_tab_term(void)
    free(fd);
    g_fd = NULL;
 }
+

src/bin/help.c

@@ -9,6 +9,7 @@ static Evas_Coord win_y = -1;
 static Evas_Coord win_w = DEFAULT_HELP_WIN_W;
 static Evas_Coord win_h = DEFAULT_HELP_WIN_H;
 static Evas_Object *g_win = NULL;
+static Evas_Object *g_layout = NULL;
 
 /*****************************************************************************/
 /* Internal method implementation                                            */
@@ -39,6 +40,74 @@ win_moved_cb(void *data EINA_UNUSED, Evas_Object *obj,
    evas_object_smart_callback_del(obj, "moved", win_moved_cb);
 }
 
+static void
+list_item_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Evas_Object *layout;
+   Evas_Object *label;
+   Evas_Object *entry;
+   char buf[PATH_MAX];
+   char *item = data;
+
+   layout = g_layout;
+   label = elm_object_part_content_get(layout, "swallow_label");
+   entry = elm_object_part_content_get(layout, "swallow_entry");
+   elm_scroller_region_show(entry, 0, 0, 0, 0);
+   elm_object_signal_emit(layout, "elm,state,content,show", "");
+
+   //Read each contents from files.
+
+   //About
+   if (!strcmp(item, "about"))
+   {
+      elm_object_text_set(label, "<font_size=11><b>About</b></font_size>");
+      snprintf(buf, sizeof(buf), "%s/help/INTRO", elm_app_data_dir_get());
+      elm_entry_autosave_set(entry, EINA_FALSE);
+      elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
+   }
+   //History
+   else if (!strcmp(item, "history"))
+   {
+      elm_object_text_set(label, "<font_size=11><b>Version History</b></font_size>");
+      snprintf(buf, sizeof(buf), "%s/help/HISTORY", elm_app_data_dir_get());
+      elm_entry_autosave_set(entry, EINA_FALSE);
+      elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
+   }
+   //Shortcut key
+   else if (!strcmp(item, "shortcut"))
+   {
+      elm_object_text_set(label, "<font_size=11><b>Shortcut Keys</b></font_size>");
+      snprintf(buf, sizeof(buf), "%s/help/SHORTCUT", elm_app_data_dir_get());
+      elm_entry_autosave_set(entry, EINA_FALSE);
+      elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
+   }
+   //Commandline
+   else if (!strcmp(item, "command"))
+   {
+      elm_object_text_set(label, "<font_size=11><b>Commandline Usage</b></font_size>");
+      snprintf(buf, sizeof(buf), "%s/help/COMMAND", elm_app_data_dir_get());
+      elm_entry_autosave_set(entry, EINA_FALSE);
+      elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
+   }
+   //Developers
+   else if (!strcmp(item, "devel"))
+   {
+      elm_object_text_set(label, "<font_size=11><b>Developers</b></font_size>");
+      snprintf(buf, sizeof(buf), "%s/help/DEVEL", elm_app_data_dir_get());
+      elm_entry_autosave_set(entry, EINA_FALSE);
+      elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
+   }
+}
+
+static void
+button_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   Evas_Object *layout = g_layout;
+   Evas_Object *list = elm_object_part_content_get(layout, "swallow_list");
+   elm_list_item_selected_set(elm_list_selected_item_get(list), EINA_FALSE);
+   elm_object_signal_emit(layout, "elm,state,content,hide", "");
+}
+
 /*****************************************************************************/
 /* Externally accessible calls                                               */
 /*****************************************************************************/
@@ -53,163 +122,86 @@ help_open(void)
       return;
    }
 
-   Evas_Object *entry;
    char buf[PATH_MAX];
 
    //Win
    win = elm_win_add(base_win_get(), _("Enventor Help"), ELM_WIN_BASIC);
    elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
-   elm_win_title_set(win, _("Help"));
+   snprintf(buf, sizeof(buf), "Enventor v%s", PACKAGE_VERSION);
+   elm_win_title_set(win, buf);
    evas_object_smart_callback_add(win, "delete,request", win_delete_request_cb,
                                   NULL);
    evas_object_smart_callback_add(win, "moved", win_moved_cb, NULL);
 
-   //Bg
-   Evas_Object *bg = elm_bg_add(win);
-   evas_object_show(bg);
-   elm_win_resize_object_add(win, bg);
+   //Layout
+   Evas_Object *layout = elm_layout_add(win);
+   elm_layout_file_set(layout, EDJE_PATH, "help_layout");
+   evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   elm_win_resize_object_add(win, layout);
+   evas_object_show(layout);
+   g_layout = layout;
 
-   //Scroller
-   Evas_Object *scroller = elm_scroller_add(win);
-   evas_object_show(scroller);
-   elm_win_resize_object_add(win, scroller);
+   //List
+   Evas_Object *list = elm_list_add(win);
+   evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_object_tree_focus_allow_set(list, EINA_FALSE);
+   elm_list_select_mode_set(list, ELM_OBJECT_SELECT_MODE_DEFAULT);
+   evas_object_show(list);
 
-   //Box
-   Evas_Object *box = elm_box_add(win);
-   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, 0);
-   evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   evas_object_show(box);
-   elm_object_content_set(scroller, box);
+   elm_object_part_content_set(layout, "swallow_list", list);
 
-   //Frame1: Introduction
-   Evas_Object *intro_frame = elm_frame_add(box);
-   elm_frame_autocollapse_set(intro_frame, EINA_TRUE);
-   elm_object_text_set(intro_frame, "About");
-   evas_object_size_hint_weight_set(intro_frame, EVAS_HINT_EXPAND, 0);
-   evas_object_size_hint_align_set(intro_frame, EVAS_HINT_FILL, 0);
-   evas_object_show(intro_frame);
-   elm_box_pack_end(box, intro_frame);
+   elm_list_item_append(list, "About", NULL, NULL, list_item_selected_cb,
+                        "about");
+   elm_list_item_append(list, "Version History", NULL, NULL, list_item_selected_cb,
+                        "history");
+   elm_list_item_append(list, "Shortcut Keys", NULL, NULL, list_item_selected_cb,
+                        "shortcut");
+   elm_list_item_append(list, "Commandline Usage", NULL, NULL, list_item_selected_cb,
+                        "command");
+   elm_list_item_append(list, "Developers", NULL, NULL, list_item_selected_cb,
+                        "devel");
+
+   //Label
+   Evas_Object *label =  elm_label_add(win);
+   evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(label);
+
+   elm_object_part_content_set(layout, "swallow_label", label);
 
    //Entry
-   entry = elm_entry_add(intro_frame);
-   elm_entry_scrollable_set(entry, EINA_FALSE);
-   elm_entry_line_wrap_set(entry, EINA_TRUE);
+   Evas_Object *entry = elm_entry_add(win);
+   elm_entry_scrollable_set(entry, EINA_TRUE);
    elm_entry_editable_set(entry, EINA_FALSE);
-   elm_entry_line_wrap_set(entry, ELM_WRAP_MIXED);
-   elm_object_content_set(intro_frame, entry);
+   elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
+   evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(entry);
 
-   //Read File
-   snprintf(buf, sizeof(buf), "%s/help/INTRO", elm_app_data_dir_get());
-   elm_entry_autosave_set(entry, EINA_FALSE);
-   elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
+   elm_object_part_content_set(layout, "swallow_entry", entry);
 
+   //Back Button
+   Evas_Object *button = elm_button_add(win);
+   evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_smart_callback_add(button, "clicked", button_clicked_cb, NULL);
+   elm_object_focus_allow_set(button, EINA_FALSE);
+   elm_object_style_set(button, ENVENTOR_NAME);
+   evas_object_show(button);
 
-   //Frame2: Version History
-   Evas_Object *version_frame = elm_frame_add(box);
-   elm_frame_autocollapse_set(version_frame, EINA_TRUE);
-   elm_frame_collapse_set(version_frame, EINA_TRUE);
-   elm_object_text_set(version_frame, "Version History");
-   evas_object_size_hint_weight_set(version_frame, EVAS_HINT_EXPAND, 0);
-   evas_object_size_hint_align_set(version_frame, EVAS_HINT_FILL,
-                                   0);
-   evas_object_show(version_frame);
-   elm_box_pack_end(box, version_frame);
+   //Back Button Icon
+   Evas_Object *back_img = elm_image_add(button);
+   elm_image_file_set(back_img, EDJE_PATH, "close");
+   elm_object_content_set(button, back_img);
 
-   //Entry
-   entry = elm_entry_add(version_frame);
-   elm_entry_scrollable_set(entry, EINA_FALSE);
-   elm_entry_line_wrap_set(entry, EINA_TRUE);
-   elm_entry_editable_set(entry, EINA_FALSE);
-   elm_entry_line_wrap_set(entry, ELM_WRAP_MIXED);
-   elm_object_content_set(version_frame, entry);
-
-   //Read File
-   snprintf(buf, sizeof(buf), "%s/help/HISTORY", elm_app_data_dir_get());
-   elm_entry_autosave_set(entry, EINA_FALSE);
-   elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
-
-
-   //Frame3: Shortcut Keys
-   Evas_Object *key_frame = elm_frame_add(box);
-   elm_frame_autocollapse_set(key_frame, EINA_TRUE);
-   elm_frame_collapse_set(key_frame, EINA_TRUE);
-   elm_object_text_set(key_frame, "Shortcut keys");
-   evas_object_size_hint_weight_set(key_frame, EVAS_HINT_EXPAND, 0);
-   evas_object_size_hint_align_set(key_frame, EVAS_HINT_FILL, 0);
-   evas_object_show(key_frame);
-   elm_box_pack_end(box, key_frame);
-
-   //Entry
-   entry = elm_entry_add(key_frame);
-   elm_entry_scrollable_set(entry, EINA_FALSE);
-   elm_entry_line_wrap_set(entry, EINA_TRUE);
-   elm_entry_editable_set(entry, EINA_FALSE);
-   elm_entry_line_wrap_set(entry, ELM_WRAP_MIXED);
-   elm_object_content_set(key_frame, entry);
-
-   //Read File
-   snprintf(buf, sizeof(buf), "%s/help/SHORTCUT", elm_app_data_dir_get());
-   elm_entry_autosave_set(entry, EINA_FALSE);
-   elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
-
-
-   //Frame4: Commandline
-   Evas_Object *command_frame = elm_frame_add(box);
-   elm_frame_autocollapse_set(command_frame, EINA_TRUE);
-   elm_frame_collapse_set(command_frame, EINA_TRUE);
-   elm_object_text_set(command_frame, "Commandline Usage");
-   evas_object_size_hint_weight_set(command_frame, EVAS_HINT_EXPAND, 0);
-   evas_object_size_hint_align_set(command_frame, EVAS_HINT_FILL, 0);
-   evas_object_show(command_frame);
-   elm_box_pack_end(box, command_frame);
-
-   //Entry
-   entry = elm_entry_add(command_frame);
-   elm_entry_scrollable_set(entry, EINA_FALSE);
-   elm_entry_line_wrap_set(entry, EINA_TRUE);
-   elm_entry_editable_set(entry, EINA_FALSE);
-   elm_entry_line_wrap_set(entry, ELM_WRAP_MIXED);
-   elm_object_content_set(command_frame, entry);
-
-   //Read File
-   snprintf(buf, sizeof(buf), "%s/help/COMMAND", elm_app_data_dir_get());
-   elm_entry_autosave_set(entry, EINA_FALSE);
-   elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
-
-   //Frame5: EDC References
-   Evas_Object *refer_frame = elm_frame_add(box);
-   elm_object_text_set(refer_frame, "EDC References (Not support yet)");
-   evas_object_size_hint_weight_set(refer_frame, EVAS_HINT_EXPAND, 0);
-   evas_object_size_hint_align_set(refer_frame, EVAS_HINT_FILL,
-                                   EVAS_HINT_FILL);
-   evas_object_show(refer_frame);
-   elm_box_pack_end(box, refer_frame);
-
-   //Frame6:Developers
-   Evas_Object *devel_frame = elm_frame_add(box);
-   elm_frame_autocollapse_set(devel_frame, EINA_TRUE);
-   elm_frame_collapse_set(devel_frame, EINA_TRUE);
-   elm_object_text_set(devel_frame, "Developers");
-   evas_object_size_hint_weight_set(devel_frame, EVAS_HINT_EXPAND, 0);
-   evas_object_size_hint_align_set(devel_frame, EVAS_HINT_FILL,
-                                   EVAS_HINT_FILL);
-   evas_object_show(devel_frame);
-   elm_box_pack_end(box, devel_frame);
-
-   //Entry
-   entry = elm_entry_add(devel_frame);
-   elm_entry_scrollable_set(entry, EINA_FALSE);
-   elm_entry_line_wrap_set(entry, EINA_TRUE);
-   elm_entry_editable_set(entry, EINA_FALSE);
-   elm_entry_line_wrap_set(entry, ELM_WRAP_MIXED);
-   elm_object_content_set(devel_frame, entry);
-
-   //Read File
-   snprintf(buf, sizeof(buf), "%s/help/DEVEL", elm_app_data_dir_get());
-   elm_entry_autosave_set(entry, EINA_FALSE);
-   elm_entry_file_set(entry, buf, ELM_TEXT_FORMAT_MARKUP_UTF8);
+   elm_object_part_content_set(layout, "swallow_button", button);
 
+   //Content hide
+   elm_object_signal_emit(layout, "elm,state,content,hide", "");
 
+   //Window
    win_w = (Evas_Coord) ((double) win_w * elm_config_scale_get());
    win_h = (Evas_Coord) ((double) win_h * elm_config_scale_get());
    evas_object_resize(win, win_w, win_h);
@@ -236,5 +228,7 @@ help_close(void)
    evas_object_geometry_get(win, NULL, NULL, &win_w, &win_h);
    elm_win_screen_position_get(win, &win_x, &win_y);
    evas_object_del(win);
+
    g_win = NULL;
+   g_layout = NULL;
 }

src/bin/live_edit.c

@@ -56,6 +56,7 @@ typedef struct live_editor_s
    Evas_Object *ctrl_pt[Ctrl_Pt_Cnt];
    Evas_Object *align_line[Align_Line_Cnt];
    Evas_Object *info_text[Info_Text_Cnt];
+   Evas_Object *info_text_bg[Info_Text_Cnt];
    Evas_Coord_Point move_delta;
    double half_ctrl_size;
    unsigned int type;
@@ -260,11 +261,11 @@ info_text_update(live_data *ld)
    Evas_Coord lx, ly, lw, lh;
    evas_object_geometry_get(ld->live_view, &lx, &ly, &lw, &lh);
 
-   Evas_Coord vw, vh;
-   config_view_size_get(&vw, &vh);
-
    Enventor_Object *enventor = base_enventor_get();
 
+   Evas_Coord vw, vh;
+   enventor_object_live_view_size_get(enventor, &vw, &vh);
+
    //reverse coordinates if mirror mode is enabled.
    double ox = ld->rel_info.rel1_x;
    double ox2 = ld->rel_info.rel2_x;
@@ -294,11 +295,11 @@ info_text_update(live_data *ld)
    evas_object_text_text_set(ld->info_text[Info_Text_Rel2], buf);
 
    //Size
-   vw = (Evas_Coord) (((double) vw) *
-                      (ld->rel_info.rel2_x - ld->rel_info.rel1_x));
-   vh = (Evas_Coord) (((double) vh) *
-                      (ld->rel_info.rel2_y - ld->rel_info.rel1_y));
-   snprintf(buf, sizeof(buf), "[%d x %d]", vw, vh);
+   vw = (Evas_Coord) round(((double) vw) *
+                           (ld->rel_info.rel2_x - ld->rel_info.rel1_x));
+   vh = (Evas_Coord) round(((double) vh) *
+                           (ld->rel_info.rel2_y - ld->rel_info.rel1_y));
+   snprintf(buf, sizeof(buf), "%d X %d", vw, vh);
    evas_object_text_text_set(ld->info_text[Info_Text_Size], buf);
 
    //Update Position
@@ -314,6 +315,10 @@ info_text_update(live_data *ld)
    if (y < ly) y = (ry + rh);
    evas_object_move(ld->info_text[Info_Text_Rel1], x, y);
 
+   //Rel1 BG
+   evas_object_move(ld->info_text_bg[Info_Text_Rel1], x - 2, y);
+   evas_object_resize(ld->info_text_bg[Info_Text_Rel1], w + 4, h);
+
    //Rel2
    evas_object_geometry_get(ld->ctrl_pt[Ctrl_Pt_Rel2], &rx, &ry, &rw, &rh);
    evas_object_geometry_get(ld->info_text[Info_Text_Rel2], NULL, NULL, &w, &h);
@@ -323,6 +328,10 @@ info_text_update(live_data *ld)
    if ((y + h) > (ly + lh)) y = (ry - h);
    evas_object_move(ld->info_text[Info_Text_Rel2], x, y);
 
+   //rel2 BG
+   evas_object_move(ld->info_text_bg[Info_Text_Rel2], x - 2, y);
+   evas_object_resize(ld->info_text_bg[Info_Text_Rel2], w + 4, h);
+
    //Size
    Evas_Coord layout_x, layout_y, layout_w, layout_h;
    evas_object_geometry_get(ld->layout, &layout_x, &layout_y, &layout_w,
@@ -335,6 +344,10 @@ info_text_update(live_data *ld)
    if ((x + w) > (lx + lw)) x = ((lx + lw) - w);
    if ((y + h) > (ly + lh)) y = ((ly + lh) - h);
    evas_object_move(ld->info_text[Info_Text_Size], x, y);
+
+   //Size BG
+   evas_object_move(ld->info_text_bg[Info_Text_Size], x - 2, y);
+   evas_object_resize(ld->info_text_bg[Info_Text_Size], w + 4, h);
 }
 
 static void
@@ -344,7 +357,9 @@ live_edit_symbol_set(live_data *ld)
    snprintf(buf, sizeof(buf), "%s_bg", LIVEEDIT_ITEMS[ld->type].name);
    Evas_Object *layout_symbol = elm_layout_add(ld->layout);
    elm_layout_file_set(layout_symbol, EDJE_PATH, buf);
-   elm_object_scale_set(layout_symbol, config_view_scale_get());
+   elm_object_scale_set(layout_symbol,
+                     (1/enventor_object_base_scale_get(base_enventor_get())) *
+                     enventor_object_live_view_scale_get(base_enventor_get()));
    elm_object_part_content_set(ld->layout, "elm.swallow.symbol", layout_symbol);
 }
 
@@ -361,13 +376,18 @@ calc_relative_info(live_data *ld)
 
    //For real min size of Live Edit Item
    Evas_Coord vw, vh;
-   config_view_size_get(&vw, &vh);
+   enventor_object_live_view_size_get(base_enventor_get(), &vw, &vh);
 
    //Calculate real min size of Live Edit Item base on current relative
-   Evas_Coord min_w = (Evas_Coord) (((double) vw) *
-                          (ld->rel_info.rel2_x - ld->rel_info.rel1_x));
-   Evas_Coord min_h = (Evas_Coord) (((double) vh) *
-                          (ld->rel_info.rel2_y - ld->rel_info.rel1_y));
+   double base_scale = enventor_object_base_scale_get(base_enventor_get());
+   Evas_Coord min_w =
+      (Evas_Coord) round(((double) vw) *
+                         (ld->rel_info.rel2_x - ld->rel_info.rel1_x) *
+                         base_scale);
+   Evas_Coord min_h =
+      (Evas_Coord) round(((double) vh) *
+                         (ld->rel_info.rel2_y - ld->rel_info.rel1_y) *
+                         base_scale);
 
    //Set fixed properties of width for current Live Edit Item
    if (fixed_w)
@@ -377,7 +397,7 @@ calc_relative_info(live_data *ld)
              ld->rel_to_info.align_x = 0.0;
              ld->rel_to_info.rel2_x = ld->rel_to_info.rel1_x;
              free(ld->rel_to_info.rel2_x_part);
-             ld->rel_to_info.rel2_x_part = strndup(ld->rel_to_info.rel1_x_part,
+             ld->rel_to_info.rel2_x_part = eina_strndup(ld->rel_to_info.rel1_x_part,
                                           strlen(ld->rel_to_info.rel1_x_part));
           }
         else if (ld->rel_to_info.rel2_x_part)
@@ -385,7 +405,7 @@ calc_relative_info(live_data *ld)
              ld->rel_to_info.align_x = 1.0;
              ld->rel_to_info.rel1_x = ld->rel_to_info.rel2_x;
              free(ld->rel_to_info.rel1_x_part);
-             ld->rel_to_info.rel1_x_part = strndup(ld->rel_to_info.rel2_x_part,
+             ld->rel_to_info.rel1_x_part = eina_strndup(ld->rel_to_info.rel2_x_part,
                                           strlen(ld->rel_to_info.rel2_x_part));
           }
         else
@@ -413,7 +433,7 @@ calc_relative_info(live_data *ld)
              ld->rel_to_info.align_y = 0.0;
              ld->rel_to_info.rel2_y = ld->rel_to_info.rel1_y;
              free(ld->rel_to_info.rel2_y_part);
-             ld->rel_to_info.rel2_y_part = strndup(ld->rel_to_info.rel1_y_part,
+             ld->rel_to_info.rel2_y_part = eina_strndup(ld->rel_to_info.rel1_y_part,
                                           strlen(ld->rel_to_info.rel1_y_part));
           }
         else if (ld->rel_to_info.rel2_y_part)
@@ -421,7 +441,7 @@ calc_relative_info(live_data *ld)
              ld->rel_to_info.align_y = 1.0;
              ld->rel_to_info.rel1_y = ld->rel_to_info.rel2_y;
              free(ld->rel_to_info.rel1_y_part);
-             ld->rel_to_info.rel1_y_part = strndup(ld->rel_to_info.rel2_y_part,
+             ld->rel_to_info.rel1_y_part = eina_strndup(ld->rel_to_info.rel2_y_part,
                                           strlen(ld->rel_to_info.rel2_y_part));
           }
         else
@@ -505,7 +525,7 @@ keygrabber_key_up_cb(void *data, Evas *e EINA_UNUSED,
      ld->ctrl_pressed = EINA_FALSE;
 }
 
-Evas_Coord_Point
+static Evas_Coord_Point
 calc_ctrl_pt_auto_align_pos(live_data *ld, int cursor_x, int cursor_y,
                             int align_in, int *align_out)
 {
@@ -818,10 +838,16 @@ keygrabber_direction_key_down_cb(void *data, Evas *e EINA_UNUSED,
    //Calculate the relative value of live view item to 4 places of decimals
    double orig_rel1_x = ld->rel_info.rel1_x;
    double orig_rel1_y = ld->rel_info.rel1_y;
-   ld->rel_info.rel1_x = ROUNDING(((double) (x - vx) / vw), 4);
-   ld->rel_info.rel1_y = ROUNDING(((double) (y - vy) / vh), 4);
-   ld->rel_info.rel2_x += ROUNDING((ld->rel_info.rel1_x - orig_rel1_x), 4);
-   ld->rel_info.rel2_y += ROUNDING((ld->rel_info.rel1_y - orig_rel1_y), 4);
+   ld->rel_info.rel1_x = (double) (x - vx) / vw;
+   ld->rel_info.rel1_y = (double) (y - vy) / vh;
+   ld->rel_info.rel2_x += ld->rel_info.rel1_x - orig_rel1_x;
+   ld->rel_info.rel2_y += ld->rel_info.rel1_y - orig_rel1_y;
+
+   //Round off in the end to reduce round-off error.
+   ld->rel_info.rel1_x = ROUNDING(ld->rel_info.rel1_x, 4);
+   ld->rel_info.rel1_y = ROUNDING(ld->rel_info.rel1_y, 4);
+   ld->rel_info.rel2_x = ROUNDING(ld->rel_info.rel2_x, 4);
+   ld->rel_info.rel2_y = ROUNDING(ld->rel_info.rel2_y, 4);
 
    ctrl_pt_update(ld);
    info_text_update(ld);
@@ -1223,7 +1249,7 @@ rel_to_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                       (ld->last_cp == Ctrl_Pt_Left))
                     {
                       free(ld->rel_to_info.rel1_x_part);
-                      ld->rel_to_info.rel1_x_part = strndup(rel_data->part_name,
+                      ld->rel_to_info.rel1_x_part = eina_strndup(rel_data->part_name,
                                                     strlen(rel_data->part_name));
                       ld->rel_to_info.rel1_x = rel_data->rel_x;
                     }
@@ -1233,7 +1259,7 @@ rel_to_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                            (ld->last_cp == Ctrl_Pt_Right))
                     {
                       free(ld->rel_to_info.rel2_x_part);
-                      ld->rel_to_info.rel2_x_part = strndup(rel_data->part_name,
+                      ld->rel_to_info.rel2_x_part = eina_strndup(rel_data->part_name,
                                                     strlen(rel_data->part_name));
                       ld->rel_to_info.rel2_x = rel_data->rel_x;
                     }
@@ -1258,7 +1284,7 @@ rel_to_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                       (ld->last_cp == Ctrl_Pt_Top))
                     {
                       free(ld->rel_to_info.rel1_y_part);
-                      ld->rel_to_info.rel1_y_part = strndup(rel_data->part_name,
+                      ld->rel_to_info.rel1_y_part = eina_strndup(rel_data->part_name,
                                                     strlen(rel_data->part_name));
                       ld->rel_to_info.rel1_y = rel_data->rel_y;
                     }
@@ -1268,7 +1294,7 @@ rel_to_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
                            (ld->last_cp == Ctrl_Pt_Bottom))
                     {
                       free(ld->rel_to_info.rel2_y_part);
-                      ld->rel_to_info.rel2_y_part = strndup(rel_data->part_name,
+                      ld->rel_to_info.rel2_y_part = eina_strndup(rel_data->part_name,
                                                     strlen(rel_data->part_name));
                       ld->rel_to_info.rel2_y = rel_data->rel_y;
                     }
@@ -1350,7 +1376,7 @@ show_relative_to_list(live_data *ld, int x, int y, Ctrl_Pt cp)
    //List for relative X
    Evas_Object *list_x = elm_list_add(layout);
    elm_list_mode_set(list_x, ELM_LIST_EXPAND);
-   evas_object_size_hint_max_set(list_x, 0, ELM_SCALE_SIZE(200));
+   evas_object_size_hint_max_set(list_x, ELM_SCALE_SIZE(115), ELM_SCALE_SIZE(200));
    it = elm_list_item_append(list_x, "(none)", NULL, NULL, NULL, NULL);
    elm_list_item_selected_set(it, EINA_TRUE);
    elm_object_part_content_set(layout, "elm.swallow.x", list_x);
@@ -1358,7 +1384,7 @@ show_relative_to_list(live_data *ld, int x, int y, Ctrl_Pt cp)
    //List for relative Y
    Evas_Object *list_y = elm_list_add(layout);
    elm_list_mode_set(list_y, ELM_LIST_EXPAND);
-   evas_object_size_hint_max_set(list_y, 0, ELM_SCALE_SIZE(200));
+   evas_object_size_hint_max_set(list_y, ELM_SCALE_SIZE(115), ELM_SCALE_SIZE(200));
    it = elm_list_item_append(list_y, "(none)", NULL, NULL, NULL, NULL);
    elm_list_item_selected_set(it, EINA_TRUE);
    elm_object_part_content_set(layout, "elm.swallow.y", list_y);
@@ -1617,6 +1643,10 @@ live_edit_update_internal(live_data *ld)
    ctrl_pt_update(ld);
    align_line_update(ld);
    info_text_update(ld);
+
+   //ctxpopup position won't be valid anymore.
+   if (ld->rel_to_info.ctxpopup)
+     elm_ctxpopup_dismiss(ld->rel_to_info.ctxpopup);
 }
 
 static void
@@ -1858,10 +1888,16 @@ layout_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
 
    double orig_rel1_x = ld->rel_info.rel1_x;
    double orig_rel1_y = ld->rel_info.rel1_y;
-   ld->rel_info.rel1_x = ROUNDING(((double) (x - vx) / vw), 2);
-   ld->rel_info.rel1_y = ROUNDING(((double) (y - vy) / vh), 2);
-   ld->rel_info.rel2_x += ROUNDING((ld->rel_info.rel1_x - orig_rel1_x), 2);
-   ld->rel_info.rel2_y += ROUNDING((ld->rel_info.rel1_y - orig_rel1_y), 2);
+   ld->rel_info.rel1_x = (double) (x - vx) / vw;
+   ld->rel_info.rel1_y = (double) (y - vy) / vh;
+   ld->rel_info.rel2_x += ld->rel_info.rel1_x - orig_rel1_x;
+   ld->rel_info.rel2_y += ld->rel_info.rel1_y - orig_rel1_y;
+
+   //Round off in the end to reduce round-off error.
+   ld->rel_info.rel1_x = ROUNDING(ld->rel_info.rel1_x, 2);
+   ld->rel_info.rel1_y = ROUNDING(ld->rel_info.rel1_y, 2);
+   ld->rel_info.rel2_x = ROUNDING(ld->rel_info.rel2_x, 2);
+   ld->rel_info.rel2_y = ROUNDING(ld->rel_info.rel2_y, 2);
 
    evas_object_move(obj, x, y);
 
@@ -1956,16 +1992,20 @@ info_text_init(live_data *ld)
    int i;
    Evas *e = evas_object_evas_get(ld->layout);
    double scale = elm_config_scale_get();
-   Evas_Object *view_obj = view_obj_get(ld);
    for (i = 0; i < Info_Text_Cnt; i++)
      {
+        Evas_Object *rect = evas_object_rectangle_add(e);
+        view_obj_member_add(ld, rect);
+        evas_object_pass_events_set(rect, EINA_TRUE);
+        evas_object_color_set(rect, 0, 0, 0, 125);
+        evas_object_show(rect);
+        ld->info_text_bg[i] = rect;
+
         Evas_Object *text = evas_object_text_add(e);
         view_obj_member_add(ld, text);
         evas_object_pass_events_set(text, EINA_TRUE);
         evas_object_text_font_set(text, LIVE_EDIT_FONT,
                                   ( LIVE_EDIT_FONT_SIZE * scale));
-        evas_object_text_style_set(text, EVAS_TEXT_STYLE_OUTLINE);
-        evas_object_text_outline_color_set(text, 0, 0, 0, 255);
         evas_object_show(text);
         ld->info_text[i] = text;
      }
@@ -2184,7 +2224,8 @@ live_edit_update(void)
    Evas_Object *layout_symbol =
       elm_object_part_content_get(ld->layout, "elm.swallow.symbol");
    if (layout_symbol)
-     elm_object_scale_set(layout_symbol, config_view_scale_get());
+     elm_object_scale_set(layout_symbol,
+                          enventor_object_live_view_scale_get(base_enventor_get()));
 
    live_edit_update_internal(ld);
 }
@@ -2255,6 +2296,12 @@ live_edit_cancel(Eina_Bool phase_in)
         evas_object_del(ld->info_text[i]);
         ld->info_text[i] = NULL;
      }
+   //Delete Info Text BGs
+   for (i = 0 ; i < Info_Text_Cnt; i++)
+     {
+        evas_object_del(ld->info_text_bg[i]);
+        ld->info_text_bg[i] = NULL;
+     }
 
    ld->on = EINA_FALSE;
    ld->align_left = EINA_FALSE;
@@ -2315,6 +2362,10 @@ live_edit_init(Evas_Object *parent)
    Evas_Object *fixed_w_check = elm_check_add(fixed_box);
    elm_object_focus_allow_set(fixed_w_check, EINA_FALSE);
    elm_object_text_set(fixed_w_check, "Fixed width");
+   elm_object_tooltip_text_set(fixed_w_check,
+                               "When you check Fixed width, width of a new<br>"
+                               "part won't be resizable but it will stick a<br>"
+                               "fixed size.");
    evas_object_show(fixed_w_check);
    elm_box_pack_end(fixed_box, fixed_w_check);
 
@@ -2322,6 +2373,10 @@ live_edit_init(Evas_Object *parent)
    Evas_Object *fixed_h_check = elm_check_add(fixed_box);
    elm_object_focus_allow_set(fixed_h_check, EINA_FALSE);
    elm_object_text_set(fixed_h_check, "Fixed height");
+   elm_object_tooltip_text_set(fixed_h_check,
+                               "When you check Fixed height, height of a<br>"
+                               "new part won't be resizable but it will<br>"
+                               "stick a fixed size.");
    evas_object_show(fixed_h_check);
    elm_box_pack_end(fixed_box, fixed_h_check);
 
@@ -2335,7 +2390,7 @@ void
 live_edit_term(void)
 {
    live_data *ld = g_ld;
-   EINA_SAFETY_ON_NULL_RETURN(ld);
+   if (!ld) return;
 
    live_edit_cancel(EINA_FALSE);
 

src/bin/main.c

@@ -2,10 +2,19 @@
 #include "config.h"
 #endif
 
+#ifdef ENABLE_NLS
+# include <libintl.h>
+#endif
+
 #include <Ecore_Getopt.h>
 #include <Eio.h>
 #include "common.h"
 
+#ifdef _WIN32
+#include <Windows.h>
+static HANDLE hMutex = NULL;
+#endif
+
 typedef struct app_s
 {
    Evas_Object *keygrabber;
@@ -13,6 +22,8 @@ typedef struct app_s
    Eina_Bool lazy_save : 1;
 } app_data;
 
+static Eina_Bool own_lock = EINA_FALSE;  //lock file owner?
+
 int main(int argc, char **argv);
 
 static void
@@ -36,7 +47,6 @@ enventor_common_setup(Enventor_Object *enventor)
    config_font_get(&font_name, &font_style);
    enventor_object_font_set(enventor, font_name, font_style);
    enventor_object_font_scale_set(enventor, config_font_scale_get());
-   enventor_object_live_view_scale_set(enventor, config_view_scale_get());
    enventor_object_auto_indent_set(enventor, config_auto_indent_get());
    enventor_object_auto_complete_set(enventor, config_auto_complete_get());
    enventor_object_smart_undo_redo_set(enventor, config_smart_undo_redo_get());
@@ -71,7 +81,7 @@ syntax_color_update(Enventor_Object *enventor)
           {
              enventor_color = enventor_object_syntax_color_get(enventor,
                                                                color_type);
-             if (strcmp(config_color, enventor_color))
+             if (!enventor_color || strcmp(config_color, enventor_color))
                {
                   enventor_object_syntax_color_set(enventor, color_type,
                                                    config_color);
@@ -114,6 +124,20 @@ syntax_color_init(Enventor_Object *enventor)
      }
 }
 
+static void
+main_edc_update(Eina_Bool refresh)
+{
+   //Update file browser only if main item is changed,
+   Enventor_Item *main_it = enventor_object_main_item_get(base_enventor_get());
+   const char *prev_path = NULL;
+   if (main_it) prev_path = enventor_item_file_get(main_it);
+   if (prev_path == config_input_path_get()) return;
+
+   file_mgr_main_file_set(config_input_path_get());
+
+   if (refresh) file_browser_refresh();
+}
+
 static void
 config_update_cb(void *data EINA_UNUSED)
 {
@@ -123,14 +147,11 @@ config_update_cb(void *data EINA_UNUSED)
 
    syntax_color_update(enventor);
 
-   //Live View Size
-   Evas_Coord w, h;
-   config_view_size_get(&w, &h);
-   enventor_object_live_view_size_set(enventor, w, h);
-   stats_view_scale_update(config_view_scale_get());
    base_tools_toggle(EINA_FALSE);
    base_statusbar_toggle(EINA_FALSE);
    base_console_auto_hide();
+
+   main_edc_update(EINA_TRUE);
 }
 
 static Eina_Bool
@@ -149,18 +170,15 @@ main_mouse_wheel_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev)
    if ((event->x >= x) && (event->x <= (x + w)) &&
        (event->y >= y) && (event->y <= (y + h)))
      {
-        double scale = config_view_scale_get();
+        double scale = enventor_object_live_view_scale_get(base_enventor_get());
 
         if (event->z < 0) scale += 0.05;
         else scale -= 0.05;
 
-        config_view_scale_set(scale);
-        scale = config_view_scale_get();
-        enventor_object_live_view_scale_set(base_enventor_get(), scale);
+        if (scale > MAX_VIEW_SCALE) scale = MAX_VIEW_SCALE;
+        else if (scale < MIN_VIEW_SCALE) scale = MIN_VIEW_SCALE;
 
-        Evas_Coord ww, hh;
-        config_view_size_get(&ww, &hh);
-        enventor_object_live_view_size_set(base_enventor_get(), ww, hh);
+        enventor_object_live_view_scale_set(base_enventor_get(), scale);
 
         //Just in live edit mode case.
         live_edit_update();
@@ -234,7 +252,6 @@ args_dispatch(int argc, char **argv,
 
    Eina_Bool quit = EINA_FALSE;
    Eina_Bool help = EINA_FALSE;
-   Eina_Bool default_workspace = EINA_TRUE;
 
    //No arguments. set defaults
    if (argc == 1) goto defaults;
@@ -242,7 +259,7 @@ args_dispatch(int argc, char **argv,
    static const Ecore_Getopt optdesc = {
      PACKAGE_NAME,
      ENVENTOR_USAGE,
-     VERSION,
+     PACKAGE_VERSION,
      ENVENTOR_COPYRIGHT,
      ENVENTOR_LICENSE,
      ENVENTOR_INFO,
@@ -297,11 +314,12 @@ args_dispatch(int argc, char **argv,
      }
 
    if ((ecore_getopt_parse(&optdesc, values, argc, argv) < 0) || quit)
-        exit(0);
+     return EINA_FALSE;
+
    if (help)
      {
         fprintf(stdout, ENVENTOR_HELP_EXAMPLES);
-        exit(0);
+        return EINA_FALSE;
      }
 
 defaults:
@@ -319,7 +337,7 @@ defaults:
           {
              fprintf(stdout, "\"%s\" already exists! Please input another file "
                      "name with \"-t\" option.\n", edc_path);
-             exit(0);
+             return EINA_FALSE;
           }
      }
 
@@ -348,13 +366,13 @@ defaults:
        {
           sprintf(workspace_path, "%s", (char *)eina_list_data_get(wd));
           EINA_LIST_FREE(wd, s) free(s);
-          default_workspace = EINA_FALSE;
        }
      else
        {
           sprintf(workspace_path, ".");
        }
-     return default_workspace;
+
+     return EINA_TRUE;
 }
 
 static Eina_Bool
@@ -368,13 +386,12 @@ config_data_set(int argc, char **argv, Eina_Bool *default_edc,
    Eina_List *snd_path = NULL;
    Eina_List *fnt_path = NULL;
    Eina_List *dat_path = NULL;
-   Eina_Bool default_workspace =
-      args_dispatch(argc, argv, edc_path, edj_path, workspace_path,
-                 &img_path, &snd_path, &fnt_path, &dat_path,
-                 default_edc, template, PATH_MAX);
+   if (!args_dispatch(argc, argv, edc_path, edj_path, workspace_path,
+                      &img_path, &snd_path, &fnt_path, &dat_path,
+                      default_edc, template, PATH_MAX))
+     return EINA_FALSE;
    if (!config_init(edc_path, edj_path, workspace_path,
-                    img_path, snd_path, fnt_path, dat_path,
-                    default_workspace))
+                    img_path, snd_path, fnt_path, dat_path))
      return EINA_FALSE;
    config_update_cb_set(config_update_cb, NULL);
 
@@ -382,7 +399,7 @@ config_data_set(int argc, char **argv, Eina_Bool *default_edc,
 }
 
 static void
-elm_setup()
+elm_setup(void)
 {
    elm_need_efreet();
    elm_config_profile_set("standard");
@@ -422,13 +439,28 @@ enventor_cursor_line_changed_cb(void *data EINA_UNUSED,
 }
 
 static void
-enventor_cursor_group_changed_cb(void *data EINA_UNUSED,
-                                 Enventor_Object *obj EINA_UNUSED,
+enventor_cursor_group_changed_cb(void *data EINA_UNUSED, Enventor_Object *obj,
                                  void *event_info)
 {
    const char *group_name = event_info;
    stats_edc_group_update(group_name);
    base_edc_navigator_group_update();
+
+   //View Size
+   int w, h;
+   enventor_object_live_view_size_get(obj, &w, &h);
+
+   //Set default view size if this view has no size.
+   if ((w == 0) && (h == 0))
+     {
+        config_view_size_get(&w, &h);
+        enventor_object_live_view_size_set(obj, w, h);
+     }
+   stats_view_size_update(w, h);
+
+   //View Scale
+   double scale = enventor_object_live_view_scale_get(obj);
+   stats_view_scale_update(scale);
 }
 
 static void
@@ -447,16 +479,12 @@ enventor_live_view_resized_cb(void *data EINA_UNUSED,
 {
    Enventor_Live_View_Size *size = event_info;
    stats_view_size_update(size->w, size->h);
-   config_view_size_set(size->w, size->h);
 }
 
 static void
-enventor_live_view_loaded_cb(void *data EINA_UNUSED, Enventor_Object *obj,
+enventor_live_view_loaded_cb(void *data EINA_UNUSED, Enventor_Object *obj EINA_UNUSED,
                              void *event_info EINA_UNUSED)
 {
-   Evas_Coord w, h;
-   config_view_size_get(&w, &h);
-   enventor_object_live_view_size_set(obj, w, h);
    base_edc_navigator_group_update();
 }
 
@@ -537,8 +565,8 @@ enventor_ctxpopup_dismissed_cb(void *data EINA_UNUSED, Enventor_Object *obj,
 }
 
 static void
-enventor_file_open_requested_cb(void *data EINA_UNUSED, Enventor_Object *obj,
-                                void *event_info EINA_UNUSED)
+enventor_file_open_requested_cb(void *data EINA_UNUSED, Enventor_Object *obj EINA_UNUSED,
+                                void *event_info)
 {
    const char *file_name = event_info;
    file_mgr_file_open(file_name);
@@ -560,7 +588,7 @@ enventor_mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
    base_edc_navigator_deselect();
 }
 
-static void
+static Enventor_Object *
 enventor_setup(app_data *ad)
 {
    Enventor_Object *enventor = enventor_object_add(base_layout_get());
@@ -600,15 +628,14 @@ enventor_setup(app_data *ad)
    enventor_common_setup(enventor);
 
    base_enventor_set(enventor);
-   file_mgr_main_file_set(config_input_path_get());
-   base_live_view_set(enventor_object_live_view_get(enventor));
+
+   return enventor;
 }
 
 static Eina_Bool
 alt_func(Evas_Event_Key_Down *event)
 {
-   if (evas_key_modifier_is_set(event->modifiers, "Shift") ||
-       evas_key_modifier_is_set(event->modifiers, "Ctrl"))
+   if (!evas_key_modifier_is_set(event->modifiers, "Alt"))
      return EINA_FALSE;
 
    //Full Edit View
@@ -642,8 +669,7 @@ alt_func(Evas_Event_Key_Down *event)
 static Eina_Bool
 ctrl_func(Evas_Event_Key_Down *event)
 {
-   if (evas_key_modifier_is_set(event->modifiers, "Shift") ||
-       evas_key_modifier_is_set(event->modifiers, "Alt"))
+   if (!evas_key_modifier_is_set(event->modifiers, "Control"))
      return EINA_FALSE;
 
    //Save
@@ -752,7 +778,7 @@ keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
    if (ctrl_func(ev)) return;
    if (alt_func(ev)) return;
 
-   //README
+   //About
    if (!strcmp(ev->key, "F1"))
      {
         enventor_object_ctxpopup_dismiss(base_enventor_get());
@@ -760,37 +786,22 @@ keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
         help_open();
         return;
      }
-   //New
+   //Set Main EDC
    if (!strcmp(ev->key, "F2"))
      {
-        enventor_object_ctxpopup_dismiss(base_enventor_get());
-        live_edit_cancel(EINA_FALSE);
-        menu_edc_new(EINA_FALSE);
+        file_browser_selected_file_main_set();
+        main_edc_update(EINA_FALSE);
         return;
      }
-   //Save
-   if (!strcmp(ev->key, "F3"))
-     {
-        enventor_object_ctxpopup_dismiss(base_enventor_get());
-        live_edit_cancel(EINA_FALSE);
-        menu_edc_save();
-        return;
-     }
-   //Load
+   //Revert Quick Jump
    if (!strcmp(ev->key, "F4"))
      {
-        enventor_object_ctxpopup_dismiss(base_enventor_get());
-        live_edit_cancel(EINA_FALSE);
-        menu_edc_load();
-        return;
-     }
-   //Quick Jump
-   if (!strcmp(ev->key, "F5"))
-     {
+        if (!file_mgr_file_backward())
+          stats_info_msg_update("No files go back.");
         return;
      }
    //Keyword Reference
-   if (!strcmp(ev->key, "F6"))
+   if (!strcmp(ev->key, "F5"))
      {
         enventor_object_ctxpopup_dismiss(base_enventor_get());
         enventor_object_keyword_reference_show(base_enventor_get());
@@ -842,19 +853,18 @@ keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
 }
 
 static void
-statusbar_set()
+statusbar_set(void)
 {
    Evas_Object *obj = stats_init(base_layout_get());
    elm_object_part_content_set(base_layout_get(), "elm.swallow.statusbar", obj);
    base_statusbar_toggle(EINA_FALSE);
-   stats_view_scale_update(config_view_scale_get());
 }
 
 static void
 keygrabber_init(app_data *ad)
 {
    Evas *e = evas_object_evas_get(base_enventor_get());
-   ad->keygrabber = evas_object_rectangle_add(e);
+   ad->keygrabber = base_enventor_get();
    evas_object_event_callback_add(ad->keygrabber, EVAS_CALLBACK_KEY_DOWN,
                                   keygrabber_key_down_cb, NULL);
 #define GRAB_ADD(key, modifier) \
@@ -911,43 +921,221 @@ keygrabber_init(app_data *ad)
    GRAB_ADD("Down", modifier);
 }
 
+static Eina_Bool
+enventor_lock_create(void)
+{
+   //Tempoary Folder
+   const char *tmpdir = eina_environment_tmp_get();
+
+   //Exception 1
+   if (!tmpdir)
+     {
+        EINA_LOG_ERR("No temporary directory?!");
+        return EINA_TRUE;
+     }
+
+   //Exception 2
+   //Create temp directory if it doesn't exist.
+   if (!ecore_file_is_dir(tmpdir))
+     {
+        Eina_Bool success = ecore_file_mkdir(tmpdir);
+        if (!success)
+          {
+             EINA_LOG_ERR(_("Cannot create temporary diretory \"%s\""), tmpdir);
+             return EINA_TRUE;
+          }
+     }
+
+   char buf[PATH_MAX];
+   snprintf(buf, sizeof(buf), "%s/"ENVENTOR_LOCK_FILE, tmpdir);
+
+   //Is there any other Enventor instance?
+   if (ecore_file_exists(buf))
+     {
+#ifdef _WIN32
+        hMutex = OpenMutex(MUTEX_ALL_ACCESS, 0, ENVENTOR_NAME);
+        if (hMutex)
+          {
+             fprintf(stdout, "Enventor program is already running!\n\n"
+                     "If you are really stuck in launching enventor due to "
+                     "this,\nTry removing a file \"%s\"\n", buf);
+             return EINA_FALSE;
+          }
+#else
+        fprintf(stdout, "Enventor program is already running!\n\n"
+                "If you are really stuck in launching enventor due to "
+                "this,\nTry removing a file \"%s\"\n", buf);
+        return EINA_FALSE;
+#endif
+     }
+
+   //Ok, this is an unique instance!
+#ifdef _WIN32
+   hMutex = CreateMutex(NULL, FALSE, ENVENTOR_NAME);
+
+   HANDLE handle = CreateFile(buf, GENERIC_READ, 0, NULL, CREATE_NEW,
+                              FILE_FLAG_DELETE_ON_CLOSE, 0);
+   if (INVALID_HANDLE_VALUE == handle)
+     {
+        EINA_LOG_ERR("Failed to open file \"%s\"", buf);
+        return EINA_TRUE;
+     }
+#else
+   FILE *fp = fopen(buf, "w");
+   if (!fp)
+     {
+        EINA_LOG_ERR("Failed to open file \"%s\"", buf);
+        return EINA_TRUE;
+     }
+   fputs("x", fp);
+   fclose(fp);
+#endif
+
+   own_lock = EINA_TRUE;
+
+   return EINA_TRUE;
+}
+
+static void
+enventor_lock_remove(void)
+{
+   //You are not the owner of the lock.
+   if (!own_lock) return;
+
+#ifdef _WIN32
+   if (hMutex)
+     {
+        CloseHandle(hMutex);
+        hMutex = NULL;
+     }
+#else
+   //Tempoary Folder
+   const char *tmpdir = eina_environment_tmp_get();
+   if (!tmpdir)
+     {
+        EINA_LOG_ERR("No temporary directory?!");
+        return;
+     }
+
+   if (!ecore_file_is_dir(tmpdir))
+     {
+        EINA_LOG_ERR("Cannot access to temporary directory?! = %s", tmpdir);
+        return;
+     }
+
+   char buf[PATH_MAX];
+   snprintf(buf, sizeof(buf), "%s/"ENVENTOR_LOCK_FILE, tmpdir);
+
+   //Just in case.
+   if (!ecore_file_exists(buf))
+     {
+        EINA_LOG_ERR("No enventor lock file?! = %s", buf);
+        return;
+     }
+
+   ecore_file_remove(buf);
+#endif
+}
+
+#ifndef _WIN32
+static void
+crash_handler(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED,
+              void *data EINA_UNUSED)
+{
+   EINA_LOG_ERR("Eeeek! Eventor is terminated abnormally!");
+   enventor_lock_remove();
+}
+#endif
+
+static void
+sigaction_setup(void)
+{
+#ifndef _WIN32
+   //Just in case, if you are debugging using gdb,
+   //you can send signals like this. "handle SIGABRT pass"
+   //Use this for remove the enventor lock.
+
+   struct sigaction action;
+
+   memset(&action, 0x0, sizeof(action));
+   action.sa_handler = SIG_DFL;
+   action.sa_sigaction = crash_handler;
+   action.sa_flags = SA_NODEFER  | SA_RESETHAND | SA_SIGINFO;
+   sigemptyset(&action.sa_mask);
+
+   //Bus error (bad memory access)
+   sigaction(SIGBUS, &action, NULL);
+
+   //Floating pointer exception
+   sigaction(SIGFPE, &action, NULL);
+
+   //Illegal Instruction
+   sigaction(SIGILL, &action, NULL);
+
+   //Invalid memory reference
+   sigaction(SIGSEGV, &action, NULL);
+
+   //Kill
+   sigaction(SIGKILL, &action, NULL);
+
+   //Abort
+   sigaction(SIGABRT, &action, NULL);
+
+   //Stop
+   sigaction(SIGSTOP, &action, NULL);
+
+   //Interrupt from keyboard
+   //sigaction(SIGINT, &action, NULL);
+#else
+   (void) 0;
+#endif
+}
+
 static Eina_Bool
 init(app_data *ad, int argc, char **argv)
 {
 #ifdef ENABLE_NLS
       setlocale(LC_ALL, "");
-      bindtextdomain(PACKAGE, LOCALE_DIR);
-      textdomain(PACKAGE);
+      bindtextdomain(PACKAGE_NAME, LOCALE_DIR);
+      textdomain(PACKAGE_NAME);
 #endif /* set locale */
 
    elm_setup();
-
    enventor_init(argc, argv);
 
+   if (!enventor_lock_create()) return EINA_FALSE;
+
+   sigaction_setup();
+
    Eina_Bool template = EINA_FALSE;
    Eina_Bool default_edc = EINA_TRUE;
    if (!config_data_set(argc, argv, &default_edc, &template))
      return EINA_FALSE;
-   newfile_default_set(default_edc);
+
+   if (!template) newfile_default_set(default_edc);
    base_gui_init();
    statusbar_set();
-   enventor_setup(ad);
+   Enventor_Object *enventor = enventor_setup(ad);
    file_mgr_init();
+
+   file_mgr_main_file_set(config_input_path_get());
+   base_live_view_set(enventor_object_live_view_get(enventor));
+
    tools_set();
    live_edit_set();
 
    base_gui_show();
 
    //Guarantee Enventor editor has focus.
-   enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
+   enventor_object_focus_set(enventor, EINA_TRUE);
 
    menu_init();
 
    if (template) menu_edc_new(EINA_TRUE);
 
    //Initialize syntax color.
-   syntax_color_init(base_enventor_get());
-   syntax_color_update(base_enventor_get());
+   syntax_color_init(enventor);
+   syntax_color_update(enventor);
 
    keygrabber_init(ad);
 
@@ -966,11 +1154,12 @@ term(void)
    base_gui_term();
    file_mgr_term();
    config_term();
+   enventor_lock_remove();
    enventor_shutdown();
 }
 
 EAPI_MAIN
-int elm_main(int argc, char **argv)
+static int elm_main(int argc, char **argv)
 {
    app_data ad;
    memset(&ad, 0x00, sizeof(ad));

src/bin/menu.c

@@ -131,7 +131,7 @@ menu_back_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
    menu_close(md);
 }
 
-void
+static void
 newfile_open(menu_data *md)
 {
    if (md->newfile_layout) return;
@@ -700,7 +700,7 @@ menu_toggle(void)
         return;
      }
 
-   //Main Menu 
+   //Main Menu
    if (md->active_request) menu_close(md);
    else
      {