forked from enlightenment/enlightenment
make clock work without seconds hand (analogue) again.
SVN revision: 60560
This commit is contained in:
parent
5f7f314516
commit
2fa5317ee5
|
@ -11734,7 +11734,7 @@ collections {
|
||||||
}
|
}
|
||||||
|
|
||||||
/////////////////////////////////////////////////////////////////////////////
|
/////////////////////////////////////////////////////////////////////////////
|
||||||
#define CLOCK_SECONDS 1
|
|
||||||
/*** MOD: CLOCK ***/
|
/*** MOD: CLOCK ***/
|
||||||
group { name: "e/modules/clock/digital";
|
group { name: "e/modules/clock/digital";
|
||||||
min: 56 16;
|
min: 56 16;
|
||||||
|
@ -12774,26 +12774,20 @@ collections {
|
||||||
image: "ch-h2.png" COMP;
|
image: "ch-h2.png" COMP;
|
||||||
image: "ch-m1.png" COMP;
|
image: "ch-m1.png" COMP;
|
||||||
image: "ch-m2.png" COMP;
|
image: "ch-m2.png" COMP;
|
||||||
#ifdef CLOCK_SECONDS
|
|
||||||
image: "ch-s1.png" COMP;
|
image: "ch-s1.png" COMP;
|
||||||
image: "ch-s2.png" COMP;
|
image: "ch-s2.png" COMP;
|
||||||
#endif
|
|
||||||
image: "ch-h1-2.png" COMP;
|
image: "ch-h1-2.png" COMP;
|
||||||
image: "ch-h2-2.png" COMP;
|
image: "ch-h2-2.png" COMP;
|
||||||
image: "ch-m1-2.png" COMP;
|
image: "ch-m1-2.png" COMP;
|
||||||
image: "ch-m2-2.png" COMP;
|
image: "ch-m2-2.png" COMP;
|
||||||
#ifdef CLOCK_SECONDS
|
|
||||||
image: "ch-s1-2.png" COMP;
|
image: "ch-s1-2.png" COMP;
|
||||||
image: "ch-s2-2.png" COMP;
|
image: "ch-s2-2.png" COMP;
|
||||||
#endif
|
|
||||||
image: "ch-h1-3.png" COMP;
|
image: "ch-h1-3.png" COMP;
|
||||||
image: "ch-h2-3.png" COMP;
|
image: "ch-h2-3.png" COMP;
|
||||||
image: "ch-m1-3.png" COMP;
|
image: "ch-m1-3.png" COMP;
|
||||||
image: "ch-m2-3.png" COMP;
|
image: "ch-m2-3.png" COMP;
|
||||||
#ifdef CLOCK_SECONDS
|
|
||||||
image: "ch-s1-3.png" COMP;
|
image: "ch-s1-3.png" COMP;
|
||||||
image: "ch-s2-3.png" COMP;
|
image: "ch-s2-3.png" COMP;
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
min: 16 16;
|
min: 16 16;
|
||||||
max: 128 128;
|
max: 128 128;
|
||||||
|
@ -12809,7 +12803,6 @@ collections {
|
||||||
date(year, month, day, yearday, weekday, hour, minute, second);
|
date(year, month, day, yearday, weekday, hour, minute, second);
|
||||||
get_geometry(PART:"hour", x, y, w, h);
|
get_geometry(PART:"hour", x, y, w, h);
|
||||||
dosec = get_int(do_seconds);
|
dosec = get_int(do_seconds);
|
||||||
#ifdef CLOCK_SECONDS
|
|
||||||
if (dosec) {
|
if (dosec) {
|
||||||
v = round(second);
|
v = round(second);
|
||||||
tim = timer(1.0 - (second - v), "clock_cb", 1);
|
tim = timer(1.0 - (second - v), "clock_cb", 1);
|
||||||
|
@ -12834,12 +12827,9 @@ collections {
|
||||||
set_state_val(PART:"seconds-sh", STATE_IMAGE, IMAGE:"ch-s2.png");
|
set_state_val(PART:"seconds-sh", STATE_IMAGE, IMAGE:"ch-s2.png");
|
||||||
set_state(PART:"seconds-sh", "custom", 0.0);
|
set_state(PART:"seconds-sh", "custom", 0.0);
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
#else
|
|
||||||
{
|
|
||||||
tim = timer(60.0 - (second), "clock_cb", 1);
|
tim = timer(60.0 - (second), "clock_cb", 1);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
set_int(tick_timer, tim);
|
set_int(tick_timer, tim);
|
||||||
|
|
||||||
custom_state(PART:"minutes", "default", 0.0);
|
custom_state(PART:"minutes", "default", 0.0);
|
||||||
|
@ -12910,7 +12900,6 @@ collections {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#ifdef CLOCK_SECONDS
|
|
||||||
part {
|
part {
|
||||||
name: "seconds-sh";
|
name: "seconds-sh";
|
||||||
mouse_events: 0;
|
mouse_events: 0;
|
||||||
|
@ -12961,7 +12950,6 @@ collections {
|
||||||
visible: 0;
|
visible: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
part {
|
part {
|
||||||
name: "minutes-sh";
|
name: "minutes-sh";
|
||||||
mouse_events: 0;
|
mouse_events: 0;
|
||||||
|
|
Loading…
Reference in New Issue