devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

make all the RTC tokens in the skins be useable in conditionals (I dare anyone to use %cY though :D )

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24526 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-02-05 23:58:53 +00:00
parent a70d602f7d
commit 5513c30e34
1 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/gui/skin_engine/skin_tokens.c
View file

@ -610,33 +610,45 @@ const char *get_token_value(struct gui_wps *gwps,
case WPS_TOKEN_RTC_DAY_OF_MONTH: case WPS_TOKEN_RTC_DAY_OF_MONTH:
/* d: day of month (01..31) */ /* d: day of month (01..31) */
snprintf(buf, buf_size, "%02d", tm->tm_mday); snprintf(buf, buf_size, "%02d", tm->tm_mday);
if (intval)
*intval = tm->tm_mday - 1;
return buf; return buf;
case WPS_TOKEN_RTC_DAY_OF_MONTH_BLANK_PADDED: case WPS_TOKEN_RTC_DAY_OF_MONTH_BLANK_PADDED:
/* e: day of month, blank padded ( 1..31) */ /* e: day of month, blank padded ( 1..31) */
snprintf(buf, buf_size, "%2d", tm->tm_mday); snprintf(buf, buf_size, "%2d", tm->tm_mday);
if (intval)
*intval = tm->tm_mday - 1;
return buf; return buf;
case WPS_TOKEN_RTC_HOUR_24_ZERO_PADDED: case WPS_TOKEN_RTC_HOUR_24_ZERO_PADDED:
/* H: hour (00..23) */ /* H: hour (00..23) */
snprintf(buf, buf_size, "%02d", tm->tm_hour); snprintf(buf, buf_size, "%02d", tm->tm_hour);
if (intval)
*intval = tm->tm_hour;
return buf; return buf;
case WPS_TOKEN_RTC_HOUR_24: case WPS_TOKEN_RTC_HOUR_24:
/* k: hour ( 0..23) */ /* k: hour ( 0..23) */
snprintf(buf, buf_size, "%2d", tm->tm_hour); snprintf(buf, buf_size, "%2d", tm->tm_hour);
if (intval)
*intval = tm->tm_hour;
return buf; return buf;
case WPS_TOKEN_RTC_HOUR_12_ZERO_PADDED: case WPS_TOKEN_RTC_HOUR_12_ZERO_PADDED:
/* I: hour (01..12) */ /* I: hour (01..12) */
snprintf(buf, buf_size, "%02d", snprintf(buf, buf_size, "%02d",
(tm->tm_hour % 12 == 0) ? 12 : tm->tm_hour % 12); (tm->tm_hour % 12 == 0) ? 12 : tm->tm_hour % 12);
if (intval)
*intval = (tm->tm_hour % 12 == 0) ? 12 : tm->tm_hour % 12;
return buf; return buf;
case WPS_TOKEN_RTC_HOUR_12: case WPS_TOKEN_RTC_HOUR_12:
/* l: hour ( 1..12) */ /* l: hour ( 1..12) */
snprintf(buf, buf_size, "%2d", snprintf(buf, buf_size, "%2d",
(tm->tm_hour % 12 == 0) ? 12 : tm->tm_hour % 12); (tm->tm_hour % 12 == 0) ? 12 : tm->tm_hour % 12);
if (intval)
*intval = (tm->tm_hour % 12 == 0) ? 12 : tm->tm_hour % 12;
return buf; return buf;
case WPS_TOKEN_RTC_MONTH: case WPS_TOKEN_RTC_MONTH:
@ -649,29 +661,41 @@ const char *get_token_value(struct gui_wps *gwps,
case WPS_TOKEN_RTC_MINUTE: case WPS_TOKEN_RTC_MINUTE:
/* M: minute (00..59) */ /* M: minute (00..59) */
snprintf(buf, buf_size, "%02d", tm->tm_min); snprintf(buf, buf_size, "%02d", tm->tm_min);
if (intval)
*intval = tm->tm_min;
return buf; return buf;
case WPS_TOKEN_RTC_SECOND: case WPS_TOKEN_RTC_SECOND:
/* S: second (00..59) */ /* S: second (00..59) */
snprintf(buf, buf_size, "%02d", tm->tm_sec); snprintf(buf, buf_size, "%02d", tm->tm_sec);
if (intval)
*intval = tm->tm_sec;
return buf; return buf;
case WPS_TOKEN_RTC_YEAR_2_DIGITS: case WPS_TOKEN_RTC_YEAR_2_DIGITS:
/* y: last two digits of year (00..99) */ /* y: last two digits of year (00..99) */
snprintf(buf, buf_size, "%02d", tm->tm_year % 100); snprintf(buf, buf_size, "%02d", tm->tm_year % 100);
if (intval)
*intval = tm->tm_year % 100;
return buf; return buf;
case WPS_TOKEN_RTC_YEAR_4_DIGITS: case WPS_TOKEN_RTC_YEAR_4_DIGITS:
/* Y: year (1970...) */ /* Y: year (1970...) */
snprintf(buf, buf_size, "%04d", tm->tm_year + 1900); snprintf(buf, buf_size, "%04d", tm->tm_year + 1900);
if (intval)
*intval = tm->tm_year + 1900;
return buf; return buf;
case WPS_TOKEN_RTC_AM_PM_UPPER: case WPS_TOKEN_RTC_AM_PM_UPPER:
/* p: upper case AM or PM indicator */ /* p: upper case AM or PM indicator */
if (intval)
*intval = tm->tm_hour/12 == 0 ? 0 : 1;
return tm->tm_hour/12 == 0 ? "AM" : "PM"; return tm->tm_hour/12 == 0 ? "AM" : "PM";
case WPS_TOKEN_RTC_AM_PM_LOWER: case WPS_TOKEN_RTC_AM_PM_LOWER:
/* P: lower case am or pm indicator */ /* P: lower case am or pm indicator */
if (intval)
*intval = tm->tm_hour/12 == 0 ? 0 : 1;
return tm->tm_hour/12 == 0 ? "am" : "pm"; return tm->tm_hour/12 == 0 ? "am" : "pm";
case WPS_TOKEN_RTC_WEEKDAY_NAME: case WPS_TOKEN_RTC_WEEKDAY_NAME: