len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert r23474 "new skin token: %cx - 24 hour time format enabled in the setting.. e.g %?cx<24 hour|12 hour>"

Browse source 
Committed accidentally with a svn/git desynch

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23475 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2009-11-01 22:51:26 +00:00
parent 9cd15dad9d
commit 6cdb80d7df
4 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/gui/skin_engine/skin_parser.c
View file

@ -200,7 +200,6 @@ static const struct wps_tag all_tags[] = {
#endif #endif
{ WPS_TOKEN_RTC_PRESENT , "cc", WPS_REFRESH_STATIC, NULL }, { 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, "cd", WPS_RTC_REFRESH, NULL },
{ WPS_TOKEN_RTC_DAY_OF_MONTH_BLANK_PADDED,"ce", 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 }, { WPS_TOKEN_RTC_12HOUR_CFG, "cf", WPS_RTC_REFRESH, NULL },

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

@ -569,12 +569,6 @@ const char *get_token_value(struct gui_wps *gwps,
#else #else
return NULL; return NULL;
#endif #endif
case WPS_TOKEN_RTC_24HR_SETTING_MODE:
#if CONFIG_RTC
return global_settings.timeformat?NULL:"z";
#else
return NULL;
#endif
#if CONFIG_RTC #if CONFIG_RTC
case WPS_TOKEN_RTC_12HOUR_CFG: case WPS_TOKEN_RTC_12HOUR_CFG:

1
apps/gui/skin_engine/skin_tokens.h
View file

@ -62,7 +62,6 @@ enum wps_token_type {
/* Time */ /* Time */
WPS_TOKEN_RTC_PRESENT, 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. /* The begin/end values allow us to know if a token is an RTC one.
New RTC tokens should be added between the markers. */ New RTC tokens should be added between the markers. */

2
wps/classic_statusbar.sbs
View file

@ -63,7 +63,7 @@
# Clock on RTC able targets, and disk access # Clock on RTC able targets, and disk access
%V|-36|0|-6|8|0|-|-| # align on the right with room for 6 SYSFONT digits %V|-36|0|-6|8|0|-|-| # align on the right with room for 6 SYSFONT digits
%?cc<%?ca<%?cx<%cH|%cI>:%cM|--:-->|> %?cc<%?ca<%?St|time format|<%cH|%cI>:%cM|--:-->|>
# disk access "icon" # disk access "icon"
%V|-6|0|-|8|0|-|-| # align on the right with room for 1 SYSFONT digit %V|-6|0|-|8|0|-|-| # align on the right with room for 1 SYSFONT digit
%?lh<*|> %?lh<*|>