hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=fc8096c8787d4ff4b04df1c3695ee6b0e127f260
commit fc8096c8787d4ff4b04df1c3695ee6b0e127f260 Author: Hermet Park <[email protected]> Date: Tue May 31 16:01:29 2016 +0900 template: updated watchface. --- data/images/ENVENTOR_EMBEDDED_CALENDAR_UNIT.png | Bin 24493 -> 0 bytes data/images/ENVENTOR_EMBEDDED_DATE_BG.png | Bin 2881 -> 0 bytes data/images/ENVENTOR_EMBEDDED_NEEDLE_HOUR.png | Bin 511 -> 5711 bytes data/images/ENVENTOR_EMBEDDED_NEEDLE_MINUTE.png | Bin 548 -> 1037 bytes data/images/ENVENTOR_EMBEDDED_NEEDLE_SECOND.png | Bin 753 -> 1276 bytes data/images/ENVENTOR_EMBEDDED_WATCHFACE.png | Bin 75840 -> 102692 bytes data/images/Makefile.am | 2 - data/templates/watchface.edc | 73 +++++++++--------------- 8 files changed, 26 insertions(+), 49 deletions(-) diff --git a/data/images/ENVENTOR_EMBEDDED_CALENDAR_UNIT.png b/data/images/ENVENTOR_EMBEDDED_CALENDAR_UNIT.png deleted file mode 100644 index dfe7b80..0000000 Binary files a/data/images/ENVENTOR_EMBEDDED_CALENDAR_UNIT.png and /dev/null differ diff --git a/data/images/ENVENTOR_EMBEDDED_DATE_BG.png b/data/images/ENVENTOR_EMBEDDED_DATE_BG.png deleted file mode 100644 index 14434c9..0000000 Binary files a/data/images/ENVENTOR_EMBEDDED_DATE_BG.png and /dev/null differ diff --git a/data/images/ENVENTOR_EMBEDDED_NEEDLE_HOUR.png b/data/images/ENVENTOR_EMBEDDED_NEEDLE_HOUR.png index 6e51387..d1ad63a 100644 Binary files a/data/images/ENVENTOR_EMBEDDED_NEEDLE_HOUR.png and b/data/images/ENVENTOR_EMBEDDED_NEEDLE_HOUR.png differ diff --git a/data/images/ENVENTOR_EMBEDDED_NEEDLE_MINUTE.png b/data/images/ENVENTOR_EMBEDDED_NEEDLE_MINUTE.png index 987c3e2..93f6d88 100644 Binary files a/data/images/ENVENTOR_EMBEDDED_NEEDLE_MINUTE.png and b/data/images/ENVENTOR_EMBEDDED_NEEDLE_MINUTE.png differ diff --git a/data/images/ENVENTOR_EMBEDDED_NEEDLE_SECOND.png b/data/images/ENVENTOR_EMBEDDED_NEEDLE_SECOND.png index bb89631..f3acc15 100644 Binary files a/data/images/ENVENTOR_EMBEDDED_NEEDLE_SECOND.png and b/data/images/ENVENTOR_EMBEDDED_NEEDLE_SECOND.png differ diff --git a/data/images/ENVENTOR_EMBEDDED_WATCHFACE.png b/data/images/ENVENTOR_EMBEDDED_WATCHFACE.png index 40c0f96..9597790 100644 Binary files a/data/images/ENVENTOR_EMBEDDED_WATCHFACE.png and b/data/images/ENVENTOR_EMBEDDED_WATCHFACE.png differ diff --git a/data/images/Makefile.am b/data/images/Makefile.am index 59c3487..3cfa6f6 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -14,8 +14,6 @@ files_DATA = ENVENTOR_EMBEDDED_IMAGE.png \ ENVENTOR_EMBEDDED_TRIAB-10.png \ ENVENTOR_EMBEDDED_TRIAB-11.png \ ENVENTOR_EMBEDDED_TRIAB-12.png \ - ENVENTOR_EMBEDDED_CALENDAR_UNIT.png \ - ENVENTOR_EMBEDDED_DATE_BG.png \ ENVENTOR_EMBEDDED_MONTH_STROKE.png \ ENVENTOR_EMBEDDED_MOONPHASE_COVER.png \ ENVENTOR_EMBEDDED_MOONPHASE_MOON.png \ diff --git a/data/templates/watchface.edc b/data/templates/watchface.edc index 5798933..2ea5a6c 100644 --- a/data/templates/watchface.edc +++ b/data/templates/watchface.edc @@ -4,11 +4,9 @@ collections { /* TODO: Please replace embedded image files to your application image files. */ images { image: "ENVENTOR_EMBEDDED_WATCHFACE.png" COMP; - image: "ENVENTOR_EMBEDDED_CALENDAR_UNIT.png" COMP; image: "ENVENTOR_EMBEDDED_MOONPHASE_COVER.png" COMP; image: "ENVENTOR_EMBEDDED_MOONPHASE_MOON.png" COMP; image: "ENVENTOR_EMBEDDED_MONTH_STROKE.png" COMP; - image: "ENVENTOR_EMBEDDED_DATE_BG.png" COMP; image: "ENVENTOR_EMBEDDED_NEEDLE_HOUR.png" COMP; image: "ENVENTOR_EMBEDDED_NEEDLE_MINUTE.png" COMP; image: "ENVENTOR_EMBEDDED_NEEDLE_SECOND.png" COMP; @@ -19,18 +17,7 @@ collections { desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_WATCHFACE.png"; - min: 250 250; - rel1.relative: 0.5 0.5; - rel2.relative: 0.5 0.5; - fixed: 1 1; - } - } - image { "calendar"; - scale: 1; - desc { "default"; - /* TODO: Please replace embedded image files to your application image files. */ - image.normal: "ENVENTOR_EMBEDDED_CALENDAR_UNIT.png"; - min: 200 200; + min: 300 300; rel1.relative: 0.5 0.5; rel2.relative: 0.5 0.5; fixed: 1 1; @@ -57,7 +44,7 @@ collections { desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_MOONPHASE_COVER.png"; - min: 109 109; + min: 130 130; align: 0.5 1.0; rel1.to: "bg"; rel2.to: "bg"; @@ -71,9 +58,10 @@ collections { desc { "default"; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_MONTH_STROKE.png"; - rel1.to: "calendar"; - rel2.to: "calendar"; - fixed: 1 1; + rel1.to: "bg"; + rel2.to: "bg"; + rel1.relative: 0.15 0.15; + rel2.relative: 0.85 0.85; map.on: 1; } desc { "feb"; @@ -121,34 +109,25 @@ collections { map.rotation.z: 220; } } - image { "date_bg"; - scale: 1; - desc { "default"; - /* TODO: Please replace embedded image files to your application image files. */ - image.normal: "ENVENTOR_EMBEDDED_DATE_BG.png"; - min: 25 25; - align: 0.5 1.0; - fixed: 1 1; - rel1.to: "bg"; - rel2.to: "bg"; - rel1.relative: 0.92 0.55; - rel2.relative: 0.92 0.55; - } - } text { "date"; scale: 1; desc { "default"; color: 0 0 0 255; fixed: 1 1; text { - size: 10; + size: 11; font: "Sans"; text: "18"; align: 0.5 0.5; min: 0 0; } - rel1.to: "date_bg"; - rel2.to: "date_bg"; + min: 30 30; + align: 0.5 1.0; + fixed: 1 1; + rel1.to: "bg"; + rel2.to: "bg"; + rel1.relative: 0.922 0.545; + rel2.relative: 0.922 0.545; } } image { "hour"; @@ -157,6 +136,10 @@ collections { desc { "default"; rel1.to: "bg"; rel2.to: "bg"; + rel1.relative: 0.5 0.0; + rel2.relative: 0.5 1.0; + min: 35 0; + fixed: 1 0; /* TODO: Please replace embedded image files to your application image files. */ image.normal: "ENVENTOR_EMBEDDED_NEEDLE_HOUR.png"; map.on: 1; @@ -173,6 +156,10 @@ collections { desc { "default"; rel1.to: "bg"; rel2.to: "bg"; + rel1.relative: 0.5 0.0; + rel2.relative: 0.5 1.0; + min: 35 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; @@ -189,6 +176,10 @@ collections { desc { "default"; rel1.to: "bg"; rel2.to: "bg"; + rel1.relative: 0.5 0.0; + rel2.relative: 0.5 1.0; + min: 25 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; @@ -199,18 +190,6 @@ collections { map.rotation.z: 360; } } - image { "roatry"; - scale: 1; - desc { "default"; - /* TODO: Please replace embedded image files to your application image files. */ - image.normal: "ENVENTOR_EMBEDDED_DATE_BG.png"; - min: 15 15; - align: 0.5 0.5; - rel1.relative: 0.5 0.5; - rel2.relative: 0.5 0.5; - fixed: 1 1; - } - } } programs { program { "load"; --
