From 7668fe7b90186c6dc3a4fd7be7be611aca599d6b Mon Sep 17 00:00:00 2001 From: Bowon Ryu Date: Thu, 7 Jul 2016 10:37:28 +0900 Subject: [PATCH] templates: updated rectangle watchface. Test Plan: 1. enventor 2. esc -> New 3. watchface_rect Reviewers: Hermet, Jaehyun_Cho, herb Differential Revision: https://phab.enlightenment.org/D4131 --- .../ENVENTOR_EMBEDDED_NEEDLE_HOUR_RECT.png | Bin 0 -> 755 bytes .../ENVENTOR_EMBEDDED_NEEDLE_MINUTE_RECT.png | Bin 0 -> 938 bytes .../ENVENTOR_EMBEDDED_NEEDLE_SECOND_RECT.png | Bin 0 -> 720 bytes .../ENVENTOR_EMBEDDED_WATCHFACE_RECT.png | Bin 0 -> 28112 bytes data/images/Makefile.am | 4 + data/templates/Makefile.am | 7 +- data/templates/watchface_rect.edc | 199 ++++++++++++++++++ 7 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 data/images/ENVENTOR_EMBEDDED_NEEDLE_HOUR_RECT.png create mode 100644 data/images/ENVENTOR_EMBEDDED_NEEDLE_MINUTE_RECT.png create mode 100644 data/images/ENVENTOR_EMBEDDED_NEEDLE_SECOND_RECT.png create mode 100644 data/images/ENVENTOR_EMBEDDED_WATCHFACE_RECT.png create mode 100644 data/templates/watchface_rect.edc diff --git a/data/images/ENVENTOR_EMBEDDED_NEEDLE_HOUR_RECT.png b/data/images/ENVENTOR_EMBEDDED_NEEDLE_HOUR_RECT.png new file mode 100644 index 0000000000000000000000000000000000000000..445d8e059b6591d9275fc92ad783ee71c4b41025 GIT binary patch literal 755 zcmeAS@N?(olHy`uVBq!ia0vp^atsWNIvi|3)|Ic!8-NsBlDE4H!+#K5uy^@npa^Gy zM`SSrgSZd~Gp5hK1k%S|;_2(k{(zm8Tf`!Cx~vuh15<;ii(^Q|t+zK%d&xLTv^{+P zzT(UxskVk)9THAFEJe9WN+(ra1O*-UEZfOiI=y$7z(1$OYFVkl%!e)dYJ+0-@SE`5 zjs1JcxAg1*51zCPe z?qmC^>snbZ%aeN4lNU`gkx#bq)buTt^3(J^F43=Y*4H9e?^wl@pjq#p1oFG4Yu`JQ z%aM5X%s@(~6D`nq(|LwcD|Iy#N{r47^eZN2H-qxDC?@w>~6Y)K; z{zbyvpBH|WzLH8j)WRvO<}scIk99{Nwp zJH06+a@wSl+28j@Sa|-@d8x*(nklgV!LyA0LJ?JKnIm6p^C$acNo?@^<%%UlY`y4ooox@d2l z|GRzJY1#hk7N=#u+jsl*SFNMnT^D7IqwC8A&7;e|&(-?4$f@M^88fZ=<{7y=et#?e z_-N*fX)|-L{rhEfyX5;?&ySw9CEr`G5JFzAD`O!rX`!F^UZG+5IcV6&e2^T7v*lr-19=|mP(vzO_ZvY zkbSPS9j~H}X~f!TtB%Z%GRnWLC$x3FVDg)s)>ogR;AsMbv8V7qWBS%Wt>^PTtprJW My85}Sb4q9e06)@8jQ{`u literal 0 HcmV?d00001 diff --git a/data/images/ENVENTOR_EMBEDDED_NEEDLE_MINUTE_RECT.png b/data/images/ENVENTOR_EMBEDDED_NEEDLE_MINUTE_RECT.png new file mode 100644 index 0000000000000000000000000000000000000000..b76ee37cc3e6e61a931729292f53c32ff2644487 GIT binary patch literal 938 zcmeAS@N?(olHy`uVBq!ia0vp^atsWNIvi|3)|Ic!8-NsBlDE4H!+#K5uy^@npa^Gy zM`SSrgSZd~Gp5hK1k%S|;_2(k{(zm8TU2a9l;RQw24-_l7srr_TW_zO_PgyMa_r-K zi{22$9tHjYffdzZYj$=XUn#YuD0aiDBfe9V6zBCs?|#jkVyvxl-ZJ(n3x=P-?huxe!Kl>t?#5|8Otv>7Qef2 z#*U$(GA}%QCC3y$G9q^OHoz|5MYQ+fFO3StFKvvPU%WPz$H9 zn$HXa+>8$^?mb=qV6t;o=Lt@R88`VD{!4}55t?YsV9)U9#P;aPZNh?<>>p+<)4XKD z+Hkxk-bm9za3VJYzaG4GIWnf77#p9o3u zcZ;_lz93W=&F=3Mu=++`7ylW{?T_aC&aRgaN(gQ|>sV1|H>X%TaN16$U3m?X30!N! zA8x$3)h_D5b+sn(3s;Sz4umg$RC?h>g|LZ~UB(2d2Z_w#4(78KvDPSagePc==st*^ zy87~j)qO?_f)YO@zQ5ltTCx7X@9@^Y#y?mdoMeCG$zY{=AXvM8%arsQt!MnsKmP|A zC!FH{XLO=LlX*+cy&W6QH)PuX@l#-4#`|Go!hA;KefQ=wN*V+oaek=7oL0M8(t+)a z)CAVUk_P4+rkfjYtJdgod^_;SAS5(Dz6}rOIC>oeqgG~GY!7_c_WaK#T$I}vcjH*c@YV#s)SlrzuMS4bCsNV z{f%yuc}j=c_iq2SVfn4ltM62i65bGdSbP0l+XkK*$Jq_ literal 0 HcmV?d00001 diff --git a/data/images/ENVENTOR_EMBEDDED_NEEDLE_SECOND_RECT.png b/data/images/ENVENTOR_EMBEDDED_NEEDLE_SECOND_RECT.png new file mode 100644 index 0000000000000000000000000000000000000000..1c8de84128ca9a08c9b1342693c783f1454bcb22 GIT binary patch literal 720 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 literal 0 HcmV?d00001 diff --git a/data/images/Makefile.am b/data/images/Makefile.am index 3cfa6f6..607e075 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -21,6 +21,10 @@ files_DATA = ENVENTOR_EMBEDDED_IMAGE.png \ ENVENTOR_EMBEDDED_NEEDLE_MINUTE.png \ ENVENTOR_EMBEDDED_NEEDLE_SECOND.png \ ENVENTOR_EMBEDDED_WATCHFACE.png \ + ENVENTOR_EMBEDDED_NEEDLE_HOUR_RECT.png \ + ENVENTOR_EMBEDDED_NEEDLE_MINUTE_RECT.png \ + ENVENTOR_EMBEDDED_NEEDLE_SECOND_RECT.png \ + ENVENTOR_EMBEDDED_WATCHFACE_RECT.png \ enventor_logo.png EXTRA_DIST = $(files_DATA) diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am index 6d92d9c..1e2f44f 100644 --- a/data/templates/Makefile.am +++ b/data/templates/Makefile.am @@ -35,7 +35,9 @@ files_DATA = basic.edc \ tween.edc \ tween.edj \ watchface.edc \ - watchface.edj + watchface.edj \ + watchface_rect.edc \ + watchface_rect.edj EXTRA_DIST = $(files_DATA) @@ -90,5 +92,8 @@ sound.edj: Makefile sound.edc watchface.edj: Makefile watchface.edc $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/watchface.edc $(builddir)/watchface.edj +watchface_rect.edj: Makefile watchface_rect.edc + $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/watchface_rect.edc $(builddir)/watchface_rect.edj + clean-local: rm -f *.edj diff --git a/data/templates/watchface_rect.edc b/data/templates/watchface_rect.edc new file mode 100644 index 0000000..360b69f --- /dev/null +++ b/data/templates/watchface_rect.edc @@ -0,0 +1,199 @@ +collections { + base_scale: 1.0; + group { "main"; + /* TODO: Please replace embedded image files to your application image files. */ + images { + image: "ENVENTOR_EMBEDDED_WATCHFACE_RECT.png" COMP; + image: "ENVENTOR_EMBEDDED_NEEDLE_HOUR_RECT.png" COMP; + image: "ENVENTOR_EMBEDDED_NEEDLE_MINUTE_RECT.png" COMP; + image: "ENVENTOR_EMBEDDED_NEEDLE_SECOND_RECT.png" COMP; + } + parts { + image { "bg"; + scale: 1; + desc { "default"; + visible: 1; + /* TODO: Please replace embedded image files to your application image files. */ + image.normal: "ENVENTOR_EMBEDDED_WATCHFACE_RECT.png"; + //aspect: 1 1; + min: 300 300; + rel1.relative: 0.5 0.5; + rel2.relative: 0.5 0.5; + } + } + text { "date"; + scale: 1; + desc { "default"; + color: 219 219 219 255; + fixed: 1 1; + text { + size: 13; + font: "Sans"; + text: "19"; + align: 0.5 0.5; + min: 0 0; + } + min: 30 30; + align: 0.5 1.0; + fixed: 1 1; + rel1.to: "bg"; + rel2.to: "bg"; + rel1.relative: 0.795 0.545; + rel2.relative: 0.795 0.545; + } + } + text { "meridiem"; + scale: 1; + desc { "default"; + color: 255 120 0 255; + fixed: 1 1; + text { + size: 20; + font: "Mono"; + text: "AM"; + } + min: 150 0; + fixed: 1 0; + align: 0.9 0.5; + rel1.to: "bg"; + rel2.to: "bg"; + rel1.relative: 0.5 0.69; + rel2.relative: 0.5 0.69; + } + } + text { "time"; + scale: 1; + desc { "default"; + color: 250 250 250 255; + fixed: 1 1; + text { + size: 20; + font: "Mono"; + text: "12:00"; + } + min: 150 0; + fixed: 1 0; + align: 0.5 0.5; + rel1.to: "bg"; + rel2.to: "bg"; + rel1.relative: 0.5 0.69; + rel2.relative: 0.5 0.69; + } + } + image { "hour"; + scale: 1; + nomouse; + desc { "default"; + rel1.to: "bg"; + rel2.to: "bg"; + rel1.relative: 0.5 0.0; + rel2.relative: 0.5 1.0; + min: 30 0; + fixed: 1 0; + /* TODO: Please replace embedded image files to your application image files. */ + image.normal: "ENVENTOR_EMBEDDED_NEEDLE_HOUR_RECT.png"; + map.on: 1; + map.rotation.z: 0; + } + desc { "rotated"; + inherit: "default"; + map.rotation.z: 360; + } + } + image { "minute"; + scale: 1; + nomouse; + desc { "default"; + rel1.to: "bg"; + rel2.to: "bg"; + rel1.relative: 0.5 0.0; + rel2.relative: 0.5 1.0; + min: 30 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; + map.rotation.z: 0; + } + desc { "rotated"; + inherit: "default"; + map.rotation.z: 360; + } + } + image { "second"; + scale: 1; + nomouse; + desc { "default"; + rel1.to: "bg"; + rel2.to: "bg"; + rel1.relative: 0.5 0.0; + rel2.relative: 0.5 1.0; + min: 30 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; + map.rotation.z: 0; + } + desc { "rotated"; + inherit: "default"; + 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"; + } + } + } + } +}