jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=0aef6bd3972e5e38dcf89e12c91df24c3b05bcfc
commit 0aef6bd3972e5e38dcf89e12c91df24c3b05bcfc Author: Jaehyun Cho <[email protected]> Date: Tue Aug 11 22:20:53 2015 +0900 templates: Change image file names. --- .../{logo.png => ENVENTOR_EMBEDDED_LOGO.png} | Bin ...TRIAB-01.png => ENVENTOR_EMBEDDED_TRIAB-01.png} | Bin ...TRIAB-02.png => ENVENTOR_EMBEDDED_TRIAB-02.png} | Bin ...TRIAB-03.png => ENVENTOR_EMBEDDED_TRIAB-03.png} | Bin ...TRIAB-04.png => ENVENTOR_EMBEDDED_TRIAB-04.png} | Bin ...TRIAB-05.png => ENVENTOR_EMBEDDED_TRIAB-05.png} | Bin ...TRIAB-06.png => ENVENTOR_EMBEDDED_TRIAB-06.png} | Bin ...TRIAB-07.png => ENVENTOR_EMBEDDED_TRIAB-07.png} | Bin ...TRIAB-08.png => ENVENTOR_EMBEDDED_TRIAB-08.png} | Bin ...TRIAB-09.png => ENVENTOR_EMBEDDED_TRIAB-09.png} | Bin ...TRIAB-10.png => ENVENTOR_EMBEDDED_TRIAB-10.png} | Bin ...TRIAB-11.png => ENVENTOR_EMBEDDED_TRIAB-11.png} | Bin ...TRIAB-12.png => ENVENTOR_EMBEDDED_TRIAB-12.png} | Bin data/images/Makefile.am | 26 +++++------ data/templates/basic.edc | 6 ++- data/templates/clip.edc | 6 ++- data/templates/image.edc | 6 ++- data/templates/map.edc | 6 ++- data/templates/proxy.edc | 6 ++- data/templates/rotation+zoom.edc | 6 ++- data/templates/tween.edc | 50 +++++++++++---------- src/bin/base_gui.c | 2 +- src/bin/main.c | 2 +- src/lib/edc_parser.c | 2 +- src/lib/template_code.h | 22 +++++---- 25 files changed, 79 insertions(+), 61 deletions(-) diff --git a/data/images/logo.png b/data/images/ENVENTOR_EMBEDDED_LOGO.png similarity index 100% rename from data/images/logo.png rename to data/images/ENVENTOR_EMBEDDED_LOGO.png diff --git a/data/images/TRIAB-01.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-01.png similarity index 100% rename from data/images/TRIAB-01.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-01.png diff --git a/data/images/TRIAB-02.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-02.png similarity index 100% rename from data/images/TRIAB-02.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-02.png diff --git a/data/images/TRIAB-03.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-03.png similarity index 100% rename from data/images/TRIAB-03.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-03.png diff --git a/data/images/TRIAB-04.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-04.png similarity index 100% rename from data/images/TRIAB-04.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-04.png diff --git a/data/images/TRIAB-05.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-05.png similarity index 100% rename from data/images/TRIAB-05.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-05.png diff --git a/data/images/TRIAB-06.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-06.png similarity index 100% rename from data/images/TRIAB-06.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-06.png diff --git a/data/images/TRIAB-07.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-07.png similarity index 100% rename from data/images/TRIAB-07.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-07.png diff --git a/data/images/TRIAB-08.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-08.png similarity index 100% rename from data/images/TRIAB-08.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-08.png diff --git a/data/images/TRIAB-09.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-09.png similarity index 100% rename from data/images/TRIAB-09.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-09.png diff --git a/data/images/TRIAB-10.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-10.png similarity index 100% rename from data/images/TRIAB-10.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-10.png diff --git a/data/images/TRIAB-11.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-11.png similarity index 100% rename from data/images/TRIAB-11.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-11.png diff --git a/data/images/TRIAB-12.png b/data/images/ENVENTOR_EMBEDDED_TRIAB-12.png similarity index 100% rename from data/images/TRIAB-12.png rename to data/images/ENVENTOR_EMBEDDED_TRIAB-12.png diff --git a/data/images/Makefile.am b/data/images/Makefile.am index 019c937..0e1e3e4 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -1,18 +1,18 @@ MAINTAINERCLEANFILES = Makefile.in filesdir = $(datadir)/$(PACKAGE)/images -files_DATA = logo.png \ - TRIAB-01.png \ - TRIAB-02.png \ - TRIAB-03.png \ - TRIAB-04.png \ - TRIAB-05.png \ - TRIAB-06.png \ - TRIAB-07.png \ - TRIAB-08.png \ - TRIAB-09.png \ - TRIAB-10.png \ - TRIAB-11.png \ - TRIAB-12.png +files_DATA = ENVENTOR_EMBEDDED_LOGO.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 EXTRA_DIST = $(files_DATA) diff --git a/data/templates/basic.edc b/data/templates/basic.edc index 9d98e7b..36b3ded 100644 --- a/data/templates/basic.edc +++ b/data/templates/basic.edc @@ -1,7 +1,8 @@ collections { base_scale: 1.0; + /* TODO: Please replace embedded image files to your application image files. */ images { - image: "logo.png" COMP; + image: "ENVENTOR_EMBEDDED_LOGO.png" COMP; } group { "main"; parts { @@ -9,7 +10,8 @@ collections { desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 0.5 0.5; - image.normal: "logo.png"; + /* TODO: Please replace embedded image files to your application image files. */ + image.normal: "ENVENTOR_EMBEDDED_LOGO.png"; aspect: 1 1; aspect_preference: BOTH; } diff --git a/data/templates/clip.edc b/data/templates/clip.edc index 6f8930c..93f8738 100644 --- a/data/templates/clip.edc +++ b/data/templates/clip.edc @@ -1,7 +1,8 @@ collections { base_scale: 1.0; + /* TODO: Please replace embedded image files to your application image files. */ images { - image: "logo.png" COMP; + image: "ENVENTOR_EMBEDDED_LOGO.png" COMP; } group { "main"; parts { @@ -17,7 +18,8 @@ collections { desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; - image.normal: "logo.png"; + /* TODO: Please replace embedded image files to your application image files. */ + image.normal: "ENVENTOR_EMBEDDED_LOGO.png"; aspect: 1 1; aspect_preference: BOTH; } diff --git a/data/templates/image.edc b/data/templates/image.edc index db81108..82cfa0c 100644 --- a/data/templates/image.edc +++ b/data/templates/image.edc @@ -1,7 +1,8 @@ collections { base_scale: 1.0; + /* TODO: Please replace embedded image files to your application image files. */ images { - image: "logo.png" COMP; + image: "ENVENTOR_EMBEDDED_LOGO.png" COMP; } group { "main"; parts { @@ -9,7 +10,8 @@ collections { desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 1.0 1.0; - image.normal: "logo.png"; + /* TODO: Please replace embedded image files to your application image files. */ + image.normal: "ENVENTOR_EMBEDDED_LOGO.png"; aspect: 1 1; aspect_preference: BOTH; } diff --git a/data/templates/map.edc b/data/templates/map.edc index c1a4fe3..7593dea 100644 --- a/data/templates/map.edc +++ b/data/templates/map.edc @@ -1,7 +1,8 @@ collections { base_scale: 1.0; + /* TODO: Please replace embedded image files to your application image files. */ images { - image: "logo.png" COMP; + image: "ENVENTOR_EMBEDDED_LOGO.png" COMP; } group { "main"; parts { @@ -9,7 +10,8 @@ collections { desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 0.5 0.5; - image.normal: "logo.png"; + /* TODO: Please replace embedded image files to your application image files. */ + image.normal: "ENVENTOR_EMBEDDED_LOGO.png"; aspect: 1 1; aspect_preference: BOTH; map.on: 1; diff --git a/data/templates/proxy.edc b/data/templates/proxy.edc index f6bcdec..a460ed1 100644 --- a/data/templates/proxy.edc +++ b/data/templates/proxy.edc @@ -1,7 +1,8 @@ collections { base_scale: 1.0; + /* TODO: Please replace embedded image files to your application image files. */ images { - image: "logo.png" COMP; + image: "ENVENTOR_EMBEDDED_LOGO.png" COMP; } group { "main"; parts { @@ -9,7 +10,8 @@ collections { desc { "default"; rel1.relative: 0.0 0.0; rel2.relative: 0.5 0.5; - image.normal: "logo.png"; + /* TODO: Please replace embedded image files to your application image files. */ + image.normal: "ENVENTOR_EMBEDDED_LOGO.png"; aspect: 1 1; aspect_preference: BOTH; } diff --git a/data/templates/rotation+zoom.edc b/data/templates/rotation+zoom.edc index 82e0cbf..12bf55f 100644 --- a/data/templates/rotation+zoom.edc +++ b/data/templates/rotation+zoom.edc @@ -1,13 +1,15 @@ collections { base_scale: 1.0; + /* TODO: Please replace embedded image files to your application image files. */ images { - image: "logo.png" COMP; + image: "ENVENTOR_EMBEDDED_LOGO.png" COMP; } group { "main"; parts { image { "logo"; desc { "default"; - image.normal: "logo.png"; + /* TODO: Please replace embedded image files to your application image files. */ + image.normal: "ENVENTOR_EMBEDDED_LOGO.png"; aspect: 1 1; aspect_preference: BOTH; map.on: 1; diff --git a/data/templates/tween.edc b/data/templates/tween.edc index 1f331cd..3c87ed1 100644 --- a/data/templates/tween.edc +++ b/data/templates/tween.edc @@ -1,35 +1,37 @@ collections { base_scale: 1.0; + /* TODO: Please replace embedded image files to your application image files. */ images { - image: "TRIAB-01.png" COMP; - image: "TRIAB-02.png" COMP; - image: "TRIAB-03.png" COMP; - image: "TRIAB-04.png" COMP; - image: "TRIAB-05.png" COMP; - image: "TRIAB-06.png" COMP; - image: "TRIAB-07.png" COMP; - image: "TRIAB-08.png" COMP; - image: "TRIAB-09.png" COMP; - image: "TRIAB-10.png" COMP; - image: "TRIAB-11.png" COMP; - image: "TRIAB-12.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-01.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-02.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-03.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-04.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-05.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-06.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-07.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-08.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-09.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-10.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-11.png" COMP; + image: "ENVENTOR_EMBEDDED_TRIAB-12.png" COMP; } group { "main"; parts { image { "image"; desc { "default"; - image.normal: "TRIAB-01.png"; - image.tween: "TRIAB-02.png"; - image.tween: "TRIAB-03.png"; - image.tween: "TRIAB-04.png"; - image.tween: "TRIAB-05.png"; - image.tween: "TRIAB-06.png"; - image.tween: "TRIAB-07.png"; - image.tween: "TRIAB-08.png"; - image.tween: "TRIAB-09.png"; - image.tween: "TRIAB-10.png"; - image.tween: "TRIAB-11.png"; - image.tween: "TRIAB-12.png"; + /* TODO: Please replace embedded image files to your application image files. */ + image.normal: "ENVENTOR_EMBEDDED_TRIAB-01.png"; + image.tween: "ENVENTOR_EMBEDDED_TRIAB-02.png"; + image.tween: "ENVENTOR_EMBEDDED_TRIAB-03.png"; + image.tween: "ENVENTOR_EMBEDDED_TRIAB-04.png"; + image.tween: "ENVENTOR_EMBEDDED_TRIAB-05.png"; + image.tween: "ENVENTOR_EMBEDDED_TRIAB-06.png"; + image.tween: "ENVENTOR_EMBEDDED_TRIAB-07.png"; + image.tween: "ENVENTOR_EMBEDDED_TRIAB-08.png"; + image.tween: "ENVENTOR_EMBEDDED_TRIAB-09.png"; + image.tween: "ENVENTOR_EMBEDDED_TRIAB-10.png"; + image.tween: "ENVENTOR_EMBEDDED_TRIAB-11.png"; + image.tween: "ENVENTOR_EMBEDDED_TRIAB-12.png"; aspect: 1 1; aspect_preference: BOTH; } diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c index 4d1806e..cf31ad4 100644 --- a/src/bin/base_gui.c +++ b/src/bin/base_gui.c @@ -235,7 +235,7 @@ base_gui_init(void) //Window icon Evas_Object *icon = evas_object_image_add(evas_object_evas_get(win)); - snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get()); + snprintf(buf, sizeof(buf), "%s/images/ENVENTOR_EMBEDDED_LOGO.png", elm_app_data_dir_get()); evas_object_image_file_set(icon, buf, NULL); elm_win_icon_object_set(win, icon); diff --git a/src/bin/main.c b/src/bin/main.c index ad01563..1753669 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -381,7 +381,7 @@ elm_setup() elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR); - elm_app_info_set(main, "enventor", "images/logo.png"); + elm_app_info_set(main, "enventor", "images/ENVENTOR_EMBEDDED_LOGO.png"); snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/themes/enventor.edj", elm_app_data_dir_get()); diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c index 617b2e5..ece12e7 100644 --- a/src/lib/edc_parser.c +++ b/src/lib/edc_parser.c @@ -954,7 +954,7 @@ parser_collections_block_pos_get(const Evas_Object *entry, if (pos) { /* TODO: Remove this check and process lines of the form - "images.image: "logo.png" COMP;" */ + "images.image: "ENVENTOR_EMBEDDED_LOGO.png" COMP;" */ if (*(pos + BLOCK_NAME_LEN + 1) == '.') return EINA_FALSE; diff --git a/src/lib/template_code.h b/src/lib/template_code.h index a7ada0d..1a726fd 100644 --- a/src/lib/template_code.h +++ b/src/lib/template_code.h @@ -1,4 +1,4 @@ -#define TEMPLATE_GROUP_LINE_CNT 26 +#define TEMPLATE_GROUP_LINE_CNT 27 const char *TEMPLATE_GROUP[TEMPLATE_GROUP_LINE_CNT] = { @@ -13,7 +13,8 @@ const char *TEMPLATE_GROUP[TEMPLATE_GROUP_LINE_CNT] = " fixed: 0 0;<br/>", " min: 0 0;<br/>", " visible: 1;<br/>", - " image.normal: \"logo.png\";<br/>", + " /* TODO: Please replace embedded image files to your application image files. */<br/>", + " image.normal: \"ENVENTOR_EMBEDDED_LOGO.png\";<br/>", " //aspect: 1 1;<br/>", " }<br/>", " }<br/>", @@ -38,7 +39,7 @@ const char *TEMPLATE_PART_TALE[TEMPLATE_PART_TALE_LINE_CNT] = "}" }; -#define TEMPLATE_PART_IMAGE_LINE_CNT 8 +#define TEMPLATE_PART_IMAGE_LINE_CNT 9 const char *TEMPLATE_PART_IMAGE[TEMPLATE_PART_IMAGE_LINE_CNT] = { @@ -48,7 +49,8 @@ const char *TEMPLATE_PART_IMAGE[TEMPLATE_PART_IMAGE_LINE_CNT] = " fixed: 0 0;<br/>", " min: 0 0;<br/>", " visible: 1;<br/>", - " image.normal: \"logo.png\";<br/>", + " /* TODO: Please replace embedded image files to your application image files. */<br/>", + " image.normal: \"ENVENTOR_EMBEDDED_LOGO.png\";<br/>", " //aspect: 1 1;<br/>" }; @@ -153,17 +155,19 @@ const char *TEMPLATE_PROG[TEMPLATE_PROG_LINE_CNT] = "}" }; -#define TEMPLATE_IMG_LINE_CNT 1 +#define TEMPLATE_IMG_LINE_CNT 2 const char *TEMPLATE_IMG[TEMPLATE_IMG_LINE_CNT] = { - "image: \"logo.png\" COMP;<br/>" + "/* TODO: Please replace embedded image files to your application image files. */<br/>", + "image: \"ENVENTOR_EMBEDDED_LOGO.png\" COMP;<br/>" }; -#define TEMPLATE_IMG_BLOCK_LINE_CNT 3 +#define TEMPLATE_IMG_BLOCK_LINE_CNT 4 -const char *TEMPLATE_IMG_BLOCK = " images {<br/>" - " image: \"logo.png\" COMP;<br/>" +const char *TEMPLATE_IMG_BLOCK = "/* TODO: Please replace embedded image files to your application image files. */<br/>" + " images {<br/>" + " image: \"ENVENTOR_EMBEDDED_LOGO.png\" COMP;<br/>" " }<br/>"; #define TEMPLATE_TEXTBLOCK_STYLE_LINE_CNT 3 --
