diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-11-01 21:35:35 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-11-01 21:35:35 +0000 |
| commit | cb8527d073cccbf044330c60d41aec50ca2536b5 (patch) | |
| tree | 4b85e20e784b83e292012b1c91442a66206fc802 /apps | |
| parent | e8eefe98bfd3768a9f3962bc71f0ee0431bae8b1 (diff) | |
| download | rockbox-cb8527d073cccbf044330c60d41aec50ca2536b5.zip rockbox-cb8527d073cccbf044330c60d41aec50ca2536b5.tar.gz rockbox-cb8527d073cccbf044330c60d41aec50ca2536b5.tar.bz2 rockbox-cb8527d073cccbf044330c60d41aec50ca2536b5.tar.xz | |
new skin token: %cx - 24 hour time format enabled in the setting.. e.g %?cx<24 hour|12 hour>
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23472 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 1 | ||||
| -rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 6 | ||||
| -rw-r--r-- | apps/gui/skin_engine/skin_tokens.h | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index c05ebca..26ccf47 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -200,6 +200,7 @@ static const struct wps_tag all_tags[] = { #endif { WPS_TOKEN_RTC_PRESENT , "cc", WPS_REFRESH_STATIC, NULL }, + { WPS_TOKEN_RTC_24HR_SETTING_MODE, "cx", WPS_REFRESH_STATIC, NULL }, { WPS_TOKEN_RTC_DAY_OF_MONTH, "cd", WPS_RTC_REFRESH, NULL }, { WPS_TOKEN_RTC_DAY_OF_MONTH_BLANK_PADDED,"ce", WPS_RTC_REFRESH, NULL }, { WPS_TOKEN_RTC_12HOUR_CFG, "cf", WPS_RTC_REFRESH, NULL }, diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 46adbdc..6dbceca 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -569,6 +569,12 @@ const char *get_token_value(struct gui_wps *gwps, #else return NULL; #endif + case WPS_TOKEN_RTC_24HR_SETTING_MODE: +#if CONFIG_RTC + return global_settings.timeformat?NULL:"z"; +#else + return NULL; +#endif #if CONFIG_RTC case WPS_TOKEN_RTC_12HOUR_CFG: diff --git a/apps/gui/skin_engine/skin_tokens.h b/apps/gui/skin_engine/skin_tokens.h index 6d78355..5f35afc 100644 --- a/apps/gui/skin_engine/skin_tokens.h +++ b/apps/gui/skin_engine/skin_tokens.h @@ -62,6 +62,7 @@ enum wps_token_type { /* Time */ WPS_TOKEN_RTC_PRESENT, + WPS_TOKEN_RTC_24HR_SETTING_MODE, /* The begin/end values allow us to know if a token is an RTC one. New RTC tokens should be added between the markers. */ |