enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

Show 00:00, not 24:00 

SVN revision: 15823
This commit is contained in:
sebastid 2005-07-19 11:07:18 +00:00 committed by sebastid
parent dfed003f00
commit 2977b96cd1
1 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
data/themes/default_clock.edc
View File

@ -199,9 +199,9 @@ group {
new digitalStyle; new digitalStyle;
new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_24HOUR; new DIGITAL_STYLE_NONE, DIGITAL_STYLE_NORMAL, DIGITAL_STYLE_24HOUR;
DIGITAL_STYLE_NONE = 0; DIGITAL_STYLE_NONE = 0;
DIGITAL_STYLE_NORMAL = 1; DIGITAL_STYLE_NORMAL = 1;
DIGITAL_STYLE_24HOUR = 2; DIGITAL_STYLE_24HOUR = 2;
get_text(PART:"digitalStyle", digiBuf, 2); get_text(PART:"digitalStyle", digiBuf, 2);
@ -242,51 +242,49 @@ group {
buf[0] = 0; buf[0] = 0;
if (minute < 10) {snprintf(buf, 10, "0%i", minute);} if (minute < 10) {snprintf(buf, 10, "0%i", minute);}
else {snprintf(buf, 10, "%i", minute);} else {snprintf(buf, 10, "%i", minute);}
snprintf(minuteStr, 3, "%s", buf); snprintf(minuteStr, 3, "%s", buf);
buf[0] = 0; buf[0] = 0;
isAfternoon = 0; isAfternoon = 0;
v = hour; v = hour;
if (hour >= 12 && hour < 24) { isAfternoon = 1; } if (hour >= 12 && hour < 24) { isAfternoon = 1; }
if (digitalStyle == DIGITAL_STYLE_24HOUR) { if (digitalStyle == DIGITAL_STYLE_NORMAL) {
if (v == 0) { v = 24; } v = (v % 12);
} else { if (v == 0) { v = 12; }
v = (v % 12);
if (v == 0) { v = 12; }
} }
if (digitalStyle == DIGITAL_STYLE_24HOUR && v < 10) { if (digitalStyle == DIGITAL_STYLE_24HOUR && v < 10) {
snprintf(buf, 10, "0%i", v); snprintf(buf, 10, "0%i", v);
} else { } else {
snprintf(buf, 10, "%i", v); snprintf(buf, 10, "%i", v);
} }
snprintf(hourStr, 3, "%s", buf); snprintf(hourStr, 3, "%s", buf);
buf[0] = 0; buf[0] = 0;
if (isAfternoon == 1) { if (isAfternoon == 1) {
snprintf(buf, 10, "PM"); snprintf(buf, 10, "PM");
} else { } else {
snprintf(buf, 10, "AM"); snprintf(buf, 10, "AM");
} }
if (digitalStyle != DIGITAL_STYLE_NONE) { if (digitalStyle != DIGITAL_STYLE_NONE) {
if (digitalStyle == DIGITAL_STYLE_NORMAL) { if (digitalStyle == DIGITAL_STYLE_NORMAL) {
snprintf(digitalVal, 14, "%s:%s:%s %s", hourStr, minuteStr, secondStr, buf); snprintf(digitalVal, 14, "%s:%s:%s %s", hourStr, minuteStr, secondStr, buf);
} else if (digitalStyle == DIGITAL_STYLE_24HOUR) { } else if (digitalStyle == DIGITAL_STYLE_24HOUR) {
snprintf(digitalVal, 14, " %s:%s:%s ", hourStr, minuteStr, secondStr); snprintf(digitalVal, 14, " %s:%s:%s ", hourStr, minuteStr, secondStr);
} }
set_text(PART:"digital", digitalVal); set_text(PART:"digital", digitalVal);
set_state(PART:"digital", "digital", 0.0); set_state(PART:"digital", "digital", 0.0);
set_state(PART:"digital_bg", "digital", 0.0); set_state(PART:"digital_bg", "digital", 0.0);
set_state(PART:"digital_bg_overlay", "digital", 0.0); set_state(PART:"digital_bg_overlay", "digital", 0.0);
} else { } else {
set_text(PART:"digital", ""); set_text(PART:"digital", "");
set_state(PART:"digital", "hidden", 0.0); set_state(PART:"digital", "hidden", 0.0);
set_state(PART:"digital_bg", "hidden", 0.0); set_state(PART:"digital_bg", "hidden", 0.0);
set_state(PART:"digital_bg_overlay", "hidden", 0.0); set_state(PART:"digital_bg_overlay", "hidden", 0.0);
} }
} }
} }
parts { parts {