From b7294b97d0eb0fda59df4ce903b9a06e6bc1d3d5 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Thu, 4 Mar 2010 04:10:20 +0000
Subject: [PATCH] nicer clock hands when small :)

SVN revision: 46862
---
 data/themes/default.edc        |  36 +++++++++++++++++++++++++++++++++
 data/themes/images/Makefile.am |  12 +++++++++++
 data/themes/images/ch-h1-2.png | Bin 0 -> 306 bytes
 data/themes/images/ch-h1-3.png | Bin 0 -> 221 bytes
 data/themes/images/ch-h2-2.png | Bin 0 -> 295 bytes
 data/themes/images/ch-h2-3.png | Bin 0 -> 188 bytes
 data/themes/images/ch-m1-2.png | Bin 0 -> 356 bytes
 data/themes/images/ch-m1-3.png | Bin 0 -> 254 bytes
 data/themes/images/ch-m2-2.png | Bin 0 -> 398 bytes
 data/themes/images/ch-m2-3.png | Bin 0 -> 202 bytes
 data/themes/images/ch-s1-2.png | Bin 0 -> 278 bytes
 data/themes/images/ch-s1-3.png | Bin 0 -> 215 bytes
 data/themes/images/ch-s2-2.png | Bin 0 -> 317 bytes
 data/themes/images/ch-s2-3.png | Bin 0 -> 217 bytes
 14 files changed, 48 insertions(+)
 create mode 100644 data/themes/images/ch-h1-2.png
 create mode 100644 data/themes/images/ch-h1-3.png
 create mode 100644 data/themes/images/ch-h2-2.png
 create mode 100644 data/themes/images/ch-h2-3.png
 create mode 100644 data/themes/images/ch-m1-2.png
 create mode 100644 data/themes/images/ch-m1-3.png
 create mode 100644 data/themes/images/ch-m2-2.png
 create mode 100644 data/themes/images/ch-m2-3.png
 create mode 100644 data/themes/images/ch-s1-2.png
 create mode 100644 data/themes/images/ch-s1-3.png
 create mode 100644 data/themes/images/ch-s2-2.png
 create mode 100644 data/themes/images/ch-s2-3.png

diff --git a/data/themes/default.edc b/data/themes/default.edc
index 4fb12593e..48a5598a9 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -9810,6 +9810,22 @@ collections { /* begin the collection of edje groups that are in this file */
 #ifdef CLOCK_SECONDS
          image: "ch-s1.png" COMP;
          image: "ch-s2.png" COMP;
+#endif
+         image: "ch-h1-2.png" COMP;
+         image: "ch-h2-2.png" COMP;
+         image: "ch-m1-2.png" COMP;
+         image: "ch-m2-2.png" COMP;
+#ifdef CLOCK_SECONDS
+         image: "ch-s1-2.png" COMP;
+         image: "ch-s2-2.png" COMP;
+#endif
+         image: "ch-h1-3.png" COMP;
+         image: "ch-h2-3.png" COMP;
+         image: "ch-m1-3.png" COMP;
+         image: "ch-m2-3.png" COMP;
+#ifdef CLOCK_SECONDS
+         image: "ch-s1-3.png" COMP;
+         image: "ch-s2-3.png" COMP;
 #endif
       }
       min: 16 16;
@@ -9819,32 +9835,52 @@ collections { /* begin the collection of edje groups that are in this file */
 	    new year, month, day, yearday, weekday, hour, minute;
 	    new Float:second;
             new v;
+            new x, y, w, h;
 
 	    date(year, month, day, yearday, weekday, hour, minute, second);
+            get_geometry(PART:"hour", x, y, w, h);
 #ifdef CLOCK_SECONDS
             v = round(second);
             timer(1.0 - (second - v), "clock_cb", 1);
             custom_state(PART:"seconds", "default", 0.0);
             set_state_val(PART:"seconds", STATE_MAP_ROT_Z, (v * 360.0) / 60.0);
+            if      (h < 22) set_state_val(PART:"seconds", STATE_IMAGE, IMAGE:"ch-s1-3.png");
+            else if (h < 44) set_state_val(PART:"seconds", STATE_IMAGE, IMAGE:"ch-s1-2.png");
+            else              set_state_val(PART:"seconds", STATE_IMAGE, IMAGE:"ch-s1.png");
             set_state(PART:"seconds", "custom", 0.0);
             custom_state(PART:"seconds-sh", "default", 0.0);
             set_state_val(PART:"seconds-sh", STATE_MAP_ROT_Z, (v * 360.0) / 60.0);
+            if      (h < 22) set_state_val(PART:"seconds-sh", STATE_IMAGE, IMAGE:"ch-s2-3.png");
+            else if (h < 44) set_state_val(PART:"seconds-sh", STATE_IMAGE, IMAGE:"ch-s2-2.png");
+            else              set_state_val(PART:"seconds-sh", STATE_IMAGE, IMAGE:"ch-s2.png");
             set_state(PART:"seconds-sh", "custom", 0.0);
 #else
 	    timer(60.0 - (second), "clock_cb", 1);
 #endif
             custom_state(PART:"minutes", "default", 0.0);
             set_state_val(PART:"minutes", STATE_MAP_ROT_Z, (minute * 360.0) / 60.0);
+            if      (h < 22) set_state_val(PART:"minutes", STATE_IMAGE, IMAGE:"ch-m1-3.png");
+            else if (h < 44) set_state_val(PART:"minutes", STATE_IMAGE, IMAGE:"ch-m1-2.png");
+            else              set_state_val(PART:"minutes", STATE_IMAGE, IMAGE:"ch-m1.png");
             set_state(PART:"minutes", "custom", 0.0);
             custom_state(PART:"minutes-sh", "default", 0.0);
             set_state_val(PART:"minutes-sh", STATE_MAP_ROT_Z, (minute * 360.0) / 60.0);
+            if      (h < 22) set_state_val(PART:"minutes-sh", STATE_IMAGE, IMAGE:"ch-m2-3.png");
+            else if (h < 44) set_state_val(PART:"minutes-sh", STATE_IMAGE, IMAGE:"ch-m2-2.png");
+            else              set_state_val(PART:"minutes-sh", STATE_IMAGE, IMAGE:"ch-m2.png");
             set_state(PART:"minutes-sh", "custom", 0.0);
             
             custom_state(PART:"hour", "default", 0.0);
             set_state_val(PART:"hour", STATE_MAP_ROT_Z, ((hour + minute / 60.0) * 360.0) / 12.0);
+            if      (h < 22) set_state_val(PART:"hour", STATE_IMAGE, IMAGE:"ch-h1-3.png");
+            else if (h < 44) set_state_val(PART:"hour", STATE_IMAGE, IMAGE:"ch-h1-2.png");
+            else              set_state_val(PART:"hour", STATE_IMAGE, IMAGE:"ch-h1.png");
             set_state(PART:"hour", "custom", 0.0);
             custom_state(PART:"hour-sh", "default", 0.0);
             set_state_val(PART:"hour-sh", STATE_MAP_ROT_Z, ((hour + minute / 60.0) * 360.0) / 12.0);
+            if      (h < 22) set_state_val(PART:"hour-sh", STATE_IMAGE, IMAGE:"ch-h2-3.png");
+            else if (h < 44) set_state_val(PART:"hour-sh", STATE_IMAGE, IMAGE:"ch-h2-2.png");
+            else              set_state_val(PART:"hour-sh", STATE_IMAGE, IMAGE:"ch-h2.png");
             set_state(PART:"hour-sh", "custom", 0.0);
 	 }
       }
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
index ec31aea86..e09ea8a57 100644
--- a/data/themes/images/Makefile.am
+++ b/data/themes/images/Makefile.am
@@ -69,6 +69,18 @@ ch-m1.png \
 ch-m2.png \
 ch-s1.png \
 ch-s2.png \
+ch-h1-2.png \
+ch-h2-2.png \
+ch-m1-2.png \
+ch-m2-2.png \
+ch-s1-2.png \
+ch-s2-2.png \
+ch-h1-3.png \
+ch-h2-3.png \
+ch-m1-3.png \
+ch-m2-3.png \
+ch-s1-3.png \
+ch-s2-3.png \
 clock_base.png \
 dia_botshad.png \
 dia_grad.png \
diff --git a/data/themes/images/ch-h1-2.png b/data/themes/images/ch-h1-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..779dbcbaf5986fa2b314308a1003655e72b46469
GIT binary patch
literal 306
zcmeAS@N?(olHy`uVBq!ia0vp^5<slO!3HGj=TtZYDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)shZ2V>MSxbRJn><|{Ln02p
zo$AQdY#`#2zC`_ku*e<GORe+PzrJ_X_)LlL%5JeqkKQl)@A!b*^VlCr-U%w6lT_+k
z-){f9(&LrtSKaJg(@v_WPYRyF(6F;7ORv{1##70M;ebrihkYxT_+Bcjn#9LcR=Gm-
zh1O+e&%^sRzFl~&d!6DUZqErVZ&j6+ZRh`*$@KVM`K08Q16416N8P>ErXtx8KkdrS
xJ4H>^m5S4>o>*7hsB8JNslG^F#q*P_|LJuRt!`3jGl8yW@O1TaS?83{1OOJrc|8CC

literal 0
HcmV?d00001

diff --git a/data/themes/images/ch-h1-3.png b/data/themes/images/ch-h1-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc553584d1eea5151f869fca916f595982b925ae
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eQ!3HG1Sky`ZDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)sh?A#fe^Zx>cVm)0PLo80e
zo#@Eb;K1QpIwQHHA=2lx-_5B<ucwvuCU!4az}{3d@qggN`QeY=UH&IzteqBiNzZ}(
zS58<{1aHPmR>4U3xhsqVL#J!x@qT%GEmLxdY(s3Qe9fKX77WJIwAP!g`DX;Qh{4m<
K&t;ucLK6TeVM{Uq

literal 0
HcmV?d00001

diff --git a/data/themes/images/ch-h2-2.png b/data/themes/images/ch-h2-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..ebdc0cebfc132c11f38e896689cf796fe645e0f3
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^5<slO!3HGj=TtZYDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)shY!Y94-X{TtmV3H5hD02G
zJH?Rekb{70yvd4#ZX$QpGFTk@wJU`D(-b2ln9S@AQp3`AR~o#T|7xT08z%u4M*$Yr
z8!Od}Pm9Ea9%V7Vn)1r$plbOt%O=(Wv!AbZBbe8oeAlEq!KbcL-;z-}RBK~%*y4jd
zr$P%Z6&-)0wW5J<#_IQb<Zp3Vc!j)V^Y(XSmhstd{<uhRPvi1)hV?e(7nsWv0{$D^
jocgQ(zcxqHr9TWDNBLWpBu=RVI+?-K)z4*}Q$iB}6&7hr

literal 0
HcmV?d00001

diff --git a/data/themes/images/ch-h2-3.png b/data/themes/images/ch-h2-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..fecb654989d9c0743c4764e4068e6e2d350374e3
GIT binary patch
literal 188
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eQ!3HG1Sky`ZDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)sh>>^JUCvgCUY&=~YLo7}w
zCrGd!<}z?J4CBmk;O*+Xwt(@dOZJ7PB%T9J&dq#!=O12L;F+cIHzgtAhiezF?P5)C
bP6meVJIuGWuT{PSn#17f>gTe~DWM4f?=?6=

literal 0
HcmV?d00001

diff --git a/data/themes/images/ch-m1-2.png b/data/themes/images/ch-m1-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..18f463a60135f5a10897c69ccc63544b9f4d9707
GIT binary patch
literal 356
zcmeAS@N?(olHy`uVBq!ia0vp^5<slO!3HGj=TtZYDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)shtd^5btoaWVdgAHg7!q;#
zZJ1*olcB(7L3bC&3%TW-^-qt;@Az!_tHZGU-L{E4-gvy`?pmtRIi=@m#74G^j0$;=
zrX~Bg@(LE7nG>(tE${KojEUi{g$;{JwP*ZH>(@&z+MdjpW<1Gw;NHpy%m<FGe86$w
zm80U#n;Z;0k*qi4{|F22n{%PVM{aGJSRJS3q|<^vN0(VD@pZemE?IbMo@`{vI+3|D
zEK5HfTC^bKSQ#IG*<_|kw~y8vo%G*+a%s?GRfR|y!;cs2lfGR}E6Rxa*EM6h=uGup
xJu)l>(R)@)KVQ9M_tM>~xuc?wx3#s|%)1>{;bYF)`5Ne722WQ%mvv4FO#o_CjGq7i

literal 0
HcmV?d00001

diff --git a/data/themes/images/ch-m1-3.png b/data/themes/images/ch-m1-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a967e4f99e3c0d0026844951f7137f5a1624a3f
GIT binary patch
literal 254
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eQ!3HG1Sky`ZDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)sh>~gGMs>Ogpb)GJcAr_~v
zPIBaOa^!KIT<3T}zp1OICZ-}L|21Qqop_%6%t($|p_vs^rg-dMe<tUgd}wy>8JjJ8
zGW3+YmR#cXh{}nNI`)dUfaO^pLxfV&ecl`Um|johnfz8_XF$VUkG9!M-kz9#Zkzet
tuMBcG?{<qb9Pnt{{r2+rTffq)n9i&=y;Wi!>H>5LgQu&X%Q~loCIFk+T)qGR

literal 0
HcmV?d00001

diff --git a/data/themes/images/ch-m2-2.png b/data/themes/images/ch-m2-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..13f26a75ee68704725ad0204e84d0d6cec63b34d
GIT binary patch
literal 398
zcmeAS@N?(olHy`uVBq!ia0vp^5<slO!3HGj=TtZYDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)shY;63^ml%Pj@Oip8hD02G
zJMCcBVFRAF{VMAwA4`n>%~k#Xcih7EeMj<Ijmo5Qa!%`Uy)c-;V$}Lj-Y3QRk7w6X
ziCMG$&9#zD<2`rw`vJZmTlP(vb57>SzYR`R>JK!MR|q;zI&1!WuUl8&z5M5lZyMNB
z!x?3=nBQeHZDM*N)gZVdxXdDfNi4OUX;(ah>;^Zcv;`+>`q;i)dXYBsed=3lt_dlh
zJzXd0@SYcT3~WfsopSPGyI84>c(%P)pO)ULrtYn?_BO-_FSxwPg?W>e<!#MV6B`2e
zybEPXR!I<A&n|jUg!RTd$9SWF^Y*t}SvN3=KVY#rb<6Wwm^WkO7q*y2@drFMjOWD~
oo=aJ*nE!9JS8#Cf<+Wd#c}-+ae_SfM9vD~*p00i_>zopr01&jA_W%F@

literal 0
HcmV?d00001

diff --git a/data/themes/images/ch-m2-3.png b/data/themes/images/ch-m2-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe0e8f0461dd2b4e1f8f5b790389965333f9b5f1
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eQ!3HG1Sky`ZDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)sh>}tB-4tD^BygXeTLo7}w
zCrIpT;O;VH5a#236yURk%~0bQgHA<Gf`V)FjR%(%oQipymSiNPCL}y?Px`O6q_MfN
p(UGCkH{ftO8(Z5;k2iq~4EYyXZ!$18DgsSq@O1TaS?83{1OQq1Jn;Yk

literal 0
HcmV?d00001

diff --git a/data/themes/images/ch-s1-2.png b/data/themes/images/ch-s1-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..57cd5ae22a05daac8a7153209866fd26ca3c3089
GIT binary patch
literal 278
zcmeAS@N?(olHy`uVBq!ia0vp^5<slO!3HGj=TtZYDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)shtP0;2v)BWLrg^$JhD02G
zJJp)+Pyi3hals%dsZZA4>t@90?3=3D!NRNLX2^PLWsFVs)4S@@Edow|g#RtGi(XQi
zVQlOBtk6OJ!gNlF61Lc7&nK0<oVL|e+rZ<&W&K@Y{sGzv2BH22q3H%uUs(cm4AOM1
zwsilIEK08KpRZ}aEWPIA3C8wPy&KCu2Bj>vNV~|^eK@G-YF&|0tHAw2_LW5vPxfCt
RbOh)^22WQ%mvv4FO#tZCVEq69

literal 0
HcmV?d00001

diff --git a/data/themes/images/ch-s1-3.png b/data/themes/images/ch-s1-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..75ddbf5472c6449227e2f9325df7de7d95252bd5
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eQ!3HG1Sky`ZDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)sh?D`>E)jB|-a8DP<5R22v
z2@<Sd7>*Zi_}G-p!}I32gv5=FCk-D8h$JQ@2q;D|GrJgu@#@@Q`EP8%@wiBjo3F4g
z$h5<F(xQj<%*{9IgG>yJ3?vLEWE>85n|17q05e1BE3Tfm@3!^;tzhtU^>bP0l+XkK
DRl7nK

literal 0
HcmV?d00001

diff --git a/data/themes/images/ch-s2-2.png b/data/themes/images/ch-s2-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc4ee9e41929f79a71b1b6bee851cdbb177c7c5b
GIT binary patch
literal 317
zcmeAS@N?(olHy`uVBq!ia0vp^5<slO!3HGj=TtZYDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)shteXAxdu9WL_IkQFhD02G
zd&SX<IgqE};d<l6qOUvrT-RS%Tyit^{mYrV1Xv0mI=Oh6TOL^Q#Zmm{!?$tw{!f|^
zAmSP*^5x`jWvf5ud0$LwGL<uClsu@!lI&(MXX3$)Qx_a=xqq!`ewgixk9Rhmw4E2l
z)h5t0b4SkuwYvL01=9WfGkGV7+8mLL;&`{Ai)R+cG{v3$bulp?r1sBGlGD?gvEi_^
z*^P5&lk#-`7aTC(_rb9IrLK@_)j_%W73cN#p4srVYtarpKc^V}o++H}JV1{yc)I$z
JtaD0e0sw1UeT)DA

literal 0
HcmV?d00001

diff --git a/data/themes/images/ch-s2-3.png b/data/themes/images/ch-s2-3.png
new file mode 100644
index 0000000000000000000000000000000000000000..11aac51239317835231e16e8ae353f7f19184619
GIT binary patch
literal 217
zcmeAS@N?(olHy`uVBq!ia0vp^JU}eQ!3HG1Sky`ZDaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9F2yFi%n+P#h9Ktc8rPhVH|Tg)sh>{gcF=N|_OMS8k8hFF|_
zd&!!sA%Mr_;^XDQBCdCPT345=>K*hG$XRnleaYqz(<Jpg6Mp<;a!ra;JY2~Csl{MX
z9aqqy2|}l)^H#e^Y;g5^b<wSb&(~#!fqPxVhJU7eEf~#mSzkprXjcI(VeoYIb6Mw<
G&;$U-Lr3ud

literal 0
HcmV?d00001