hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=a7309dd114908b2049e0d3402b2943bf2578e174
commit a7309dd114908b2049e0d3402b2943bf2578e174 Author: ChunEon Park <[email protected]> Date: Thu Jul 10 16:19:08 2014 +0900 added more templates --- data/images/Makefile.am | 14 +++++++- data/images/TRIAB-01.png | Bin 0 -> 11986 bytes data/images/TRIAB-02.png | Bin 0 -> 20327 bytes data/images/TRIAB-03.png | Bin 0 -> 25595 bytes data/images/TRIAB-04.png | Bin 0 -> 32985 bytes data/images/TRIAB-05.png | Bin 0 -> 35054 bytes data/images/TRIAB-06.png | Bin 0 -> 50610 bytes data/images/TRIAB-07.png | Bin 0 -> 47706 bytes data/images/TRIAB-08.png | Bin 0 -> 37297 bytes data/images/TRIAB-09.png | Bin 0 -> 28545 bytes data/images/TRIAB-10.png | Bin 0 -> 33959 bytes data/images/TRIAB-11.png | Bin 0 -> 36823 bytes data/images/TRIAB-12.png | Bin 0 -> 38466 bytes data/templates/Makefile.am | 52 ++++++++++++++++++++++++--- data/templates/image.edc | 19 ++++++++++ data/templates/map.edc | 81 ++++++++++++++++++++++++++++++++++++++++++ data/templates/rect.edc | 14 ++++++++ data/templates/text.edc | 24 +++++++++++++ data/templates/textblock.edc | 4 +-- data/templates/transition.edc | 35 ++++++++++++++++++ data/templates/tween.edc | 49 +++++++++++++++++++++++++ 21 files changed, 284 insertions(+), 8 deletions(-) diff --git a/data/images/Makefile.am b/data/images/Makefile.am index 76b6729..019c937 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -1,6 +1,18 @@ MAINTAINERCLEANFILES = Makefile.in filesdir = $(datadir)/$(PACKAGE)/images -files_DATA = logo.png +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 EXTRA_DIST = $(files_DATA) diff --git a/data/images/TRIAB-01.png b/data/images/TRIAB-01.png new file mode 100644 index 0000000..0b5ad6c Binary files /dev/null and b/data/images/TRIAB-01.png differ diff --git a/data/images/TRIAB-02.png b/data/images/TRIAB-02.png new file mode 100644 index 0000000..78d6e68 Binary files /dev/null and b/data/images/TRIAB-02.png differ diff --git a/data/images/TRIAB-03.png b/data/images/TRIAB-03.png new file mode 100644 index 0000000..2fd39e9 Binary files /dev/null and b/data/images/TRIAB-03.png differ diff --git a/data/images/TRIAB-04.png b/data/images/TRIAB-04.png new file mode 100644 index 0000000..e587614 Binary files /dev/null and b/data/images/TRIAB-04.png differ diff --git a/data/images/TRIAB-05.png b/data/images/TRIAB-05.png new file mode 100644 index 0000000..34967a1 Binary files /dev/null and b/data/images/TRIAB-05.png differ diff --git a/data/images/TRIAB-06.png b/data/images/TRIAB-06.png new file mode 100644 index 0000000..f6e91c5 Binary files /dev/null and b/data/images/TRIAB-06.png differ diff --git a/data/images/TRIAB-07.png b/data/images/TRIAB-07.png new file mode 100644 index 0000000..918f3fa Binary files /dev/null and b/data/images/TRIAB-07.png differ diff --git a/data/images/TRIAB-08.png b/data/images/TRIAB-08.png new file mode 100644 index 0000000..22fab75 Binary files /dev/null and b/data/images/TRIAB-08.png differ diff --git a/data/images/TRIAB-09.png b/data/images/TRIAB-09.png new file mode 100644 index 0000000..de6ca65 Binary files /dev/null and b/data/images/TRIAB-09.png differ diff --git a/data/images/TRIAB-10.png b/data/images/TRIAB-10.png new file mode 100644 index 0000000..8f79950 Binary files /dev/null and b/data/images/TRIAB-10.png differ diff --git a/data/images/TRIAB-11.png b/data/images/TRIAB-11.png new file mode 100644 index 0000000..f0fbaf3 Binary files /dev/null and b/data/images/TRIAB-11.png differ diff --git a/data/images/TRIAB-12.png b/data/images/TRIAB-12.png new file mode 100644 index 0000000..9339e14 Binary files /dev/null and b/data/images/TRIAB-12.png differ diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am index 6a24c6a..d7f76b4 100644 --- a/data/templates/Makefile.am +++ b/data/templates/Makefile.am @@ -5,11 +5,23 @@ EDJE_FLAGS = -id $(top_srcdir)/data/images filesdir = $(datadir)/$(PACKAGE)/templates files_DATA = basic.edc \ - basic.edj \ - empty.edc \ - empty.edj \ - textblock.edc \ - textblock.edj + basic.edj \ + empty.edc \ + empty.edj \ + image.edc \ + image.edj \ + map.edc \ + map.edj \ + rect.edc \ + rect.edj \ + text.edc \ + text.edj \ + textblock.edc \ + textblock.edj \ + transition.edc \ + transition.edj \ + tween.edc \ + tween.edj EXTRA_DIST = $(files_DATA) @@ -23,10 +35,40 @@ empty.edj: Makefile $(EXTRA_DIST) $(top_srcdir)/data/templates/empty.edc \ $(top_builddir)/data/templates/empty.edj +map.edj: Makefile $(EXTRA_DIST) + $(EDJE_CC) $(EDJE_FLAGS) \ + $(top_srcdir)/data/templates/map.edc \ + $(top_builddir)/data/templates/map.edj + textblock.edj: Makefile $(EXTRA_DIST) $(EDJE_CC) $(EDJE_FLAGS) \ $(top_srcdir)/data/templates/textblock.edc \ $(top_builddir)/data/templates/textblock.edj +transition.edj: Makefile $(EXTRA_DIST) + $(EDJE_CC) $(EDJE_FLAGS) \ + $(top_srcdir)/data/templates/transition.edc \ + $(top_builddir)/data/templates/transition.edj + +tween.edj: Makefile $(EXTRA_DIST) + $(EDJE_CC) $(EDJE_FLAGS) \ + $(top_srcdir)/data/templates/tween.edc \ + $(top_builddir)/data/templates/tween.edj + +rect.edj: Makefile $(EXTRA_DIST) + $(EDJE_CC) $(EDJE_FLAGS) \ + $(top_srcdir)/data/templates/rect.edc \ + $(top_builddir)/data/templates/rect.edj + +image.edj: Makefile $(EXTRA_DIST) + $(EDJE_CC) $(EDJE_FLAGS) \ + $(top_srcdir)/data/templates/image.edc \ + $(top_builddir)/data/templates/image.edj + +text.edj: Makefile $(EXTRA_DIST) + $(EDJE_CC) $(EDJE_FLAGS) \ + $(top_srcdir)/data/templates/text.edc \ + $(top_builddir)/data/templates/text.edj + clean-local: rm -f *.edj diff --git a/data/templates/image.edc b/data/templates/image.edc new file mode 100644 index 0000000..488ecce --- /dev/null +++ b/data/templates/image.edc @@ -0,0 +1,19 @@ +collections { + images { + image: "logo.png" COMP; + } + group { name: "main"; + parts { + part { name: "logo"; + type: IMAGE; + description { state: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + image.normal: "logo.png"; + aspect: 1 1; + aspect_preference: BOTH; + } + } + } + } +} \ No newline at end of file diff --git a/data/templates/map.edc b/data/templates/map.edc new file mode 100644 index 0000000..4004df8 --- /dev/null +++ b/data/templates/map.edc @@ -0,0 +1,81 @@ +collections { + images { + image: "logo.png" COMP; + } + group { name: "main"; + parts { + part { name: "logo"; + type: IMAGE; + description { state: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.5 0.5; + image.normal: "logo.png"; + aspect: 1 1; + aspect_preference: BOTH; + map.on: 1; + map.color[2]: 0 0 0 0; + map.color[3]: 0 0 0 0; + } + } + part { name: "perps_point"; + type: RECT; + description { state: "default" 0.0; + rel1.relative: 0.6 0.1; + rel2.relative: 0.9 0.4; + visible: 0; + } + } + part { name: "rect"; + type: RECT; + description { state: "default" 0.0; + rel1.relative: 0.5 0.0; + rel2.relative: 1.0 0.5; + color: 255 255 0 255; + map { + on: 1; + rotation.y: 45; + perspective_on: 1; + perspective: "perps_point"; + backface_cull: 1; + } + } + } + part { name: "rect2"; + type: RECT; + description { state: "default" 0.0; + rel1.relative: 0.0 0.5; + rel2.relative: 0.5 1.0; + map { + on: 1; + color[0]: 255 0 0 255; + color[1]: 0 255 0 255; + color[2]: 0 0 255 255; + color[4]: 255 255 255 255; + } + } + } + part { name: "text"; + type: TEXT; + scale: 1; + effect: FAR_SOFT_SHADOW; + description { state: "default" 0.0; + rel1.relative: 0.5 0.5; + rel2.relative: 1.0 1.0; + color: 0 136 170 255; + color2: 0 136 170 50; + color3: 0 136 170 25; + text { + size: 25; + font: "Sans"; + text: "Enventor"; + align: 0.5 0.5; + } + map { + on: 1; + rotation.z: 90; + } + } + } + } + } +} \ No newline at end of file diff --git a/data/templates/rect.edc b/data/templates/rect.edc new file mode 100644 index 0000000..5efdae0 --- /dev/null +++ b/data/templates/rect.edc @@ -0,0 +1,14 @@ +collections { + group { name: "main"; + parts { + part { name: "rect"; + type: RECT; + description { state: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + color: 255 255 255 255; + } + } + } + } +} diff --git a/data/templates/text.edc b/data/templates/text.edc new file mode 100644 index 0000000..d5eff9b --- /dev/null +++ b/data/templates/text.edc @@ -0,0 +1,24 @@ +collections { + group { name: "main"; + parts { + part { name: "text"; + type: TEXT; + scale: 1; + effect: FAR_SOFT_SHADOW; + description { state: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 1.0; + color: 0 136 170 255; + color2: 0 136 170 50; + color3: 0 136 170 25; + text { + size: 50; + font: "Sans"; + text: "TEXT"; + align: 0.5 0.5; + } + } + } + } + } +} \ No newline at end of file diff --git a/data/templates/textblock.edc b/data/templates/textblock.edc index 55304b4..d7da24c 100644 --- a/data/templates/textblock.edc +++ b/data/templates/textblock.edc @@ -1,7 +1,7 @@ collections { styles { style { name: "text_style"; - base: "font="Sans" font_size=25 text_class=entry color=#ffffff style=shadow,bottom shadow_color=#00000080 valign=0.5 ellipsis=1.0 wrap=none align=center"; + base: "font="Sans" font_size=30 text_class=entry color=#ffffff style=shadow,bottom shadow_color=#00000080 valign=0.5 ellipsis=1.0 wrap=none align=center"; } } group { name: "main"; @@ -14,7 +14,7 @@ collections { rel2.relative: 1.0 1.0; text { style: "text_style"; - text: "Enventor"; + text: "TEXTBLOCK"; } } } diff --git a/data/templates/transition.edc b/data/templates/transition.edc new file mode 100644 index 0000000..602ec04 --- /dev/null +++ b/data/templates/transition.edc @@ -0,0 +1,35 @@ +collections { + group { name: "main"; + parts { + part { name: "rect"; + type: RECT; + description { state: "default" 0.0; + rel1.relative: 0.0 0.0; + rel2.relative: 0.25 0.25; + color: 255 255 0 255; + } + description { state: "changed" 0.0; + rel1.relative: 0.5 0.5; + rel2.relative: 1.0 1.0; + color: 0 255 0 255; + } + } + } + programs { + program { name: "anim1"; + signal: "load"; + source: ""; + action: STATE_SET "changed" 0.0; + target: "rect"; + transition: ACCELERATE 1; + after: "anim2"; + } + program { name: "anim2"; + action: STATE_SET "default" 0.0; + target: "rect"; + transition: DECELERATE 2; + after: "anim1"; + } + } + } +} \ No newline at end of file diff --git a/data/templates/tween.edc b/data/templates/tween.edc new file mode 100644 index 0000000..a37167f --- /dev/null +++ b/data/templates/tween.edc @@ -0,0 +1,49 @@ +collections { + 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; + } + group { name: "main"; + parts { + part { name: "image"; + type: IMAGE; + description { state: "default" 0.0; + 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"; + aspect: 1 1; + aspect_preference: BOTH; + } + } + } + programs { + program { name: "tween_anim"; + signal: "load"; + source: ""; + action: STATE_SET "default" 0.0; + transition: LINEAR 1; + target: "image"; + after: "tween_anim"; + } + } + } +} \ No newline at end of file --
