Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

revert my previous commit and use a conditional for the time format instead which is probably better.

Browse source 
%?cf<24 hour stuff|12 hour stuff>


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15830 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2007-11-27 01:41:59 +00:00
parent a8f900384b
commit 923cbe3224
3 changed files with 8 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/gui/gwps-common.c
View file

@ -767,24 +767,8 @@ static char *get_token_value(struct gui_wps *gwps,
limit = *intval;
*intval = -1;
}
#if CONFIG_RTC
int new_token = token->type;
if (token->type == WPS_TOKEN_RTC_HOUR_CFG_ZERO_PADDED)
{
new_token = global_settings.timeformat == 0?
WPS_TOKEN_RTC_HOUR_24_ZERO_PADDED:
WPS_TOKEN_RTC_HOUR_12_ZERO_PADDED;
}
else if (token->type == WPS_TOKEN_RTC_HOUR_CFG)
{
new_token = global_settings.timeformat == 0?
WPS_TOKEN_RTC_HOUR_24:
WPS_TOKEN_RTC_HOUR_12;
}
switch (new_token)
#else
switch (token->type)
#endif
{
case WPS_TOKEN_CHARACTER:
return &(token->value.c);
@ -1110,7 +1094,11 @@ static char *get_token_value(struct gui_wps *gwps,
*intval = global_settings.repeat_mode + 1;
snprintf(buf, buf_size, "%d", *intval);
return buf;
case WPS_TOKEN_RTC_12HOUR_CFG:
if (intval)
*intval = global_settings.timeformat + 1;
snprintf(buf, buf_size, "%d", *intval);
return buf;
#if CONFIG_RTC
case WPS_TOKEN_RTC_DAY_OF_MONTH:
/* d: day of month (01..31) */

3
apps/gui/gwps.h
View file

@ -152,8 +152,7 @@ enum wps_token_type {
WPS_TOKEN_RTC_DAY_OF_MONTH,
WPS_TOKEN_RTC_DAY_OF_MONTH_BLANK_PADDED,
WPS_TOKEN_RTC_HOUR_CFG_ZERO_PADDED,
WPS_TOKEN_RTC_HOUR_CFG,
WPS_TOKEN_RTC_12HOUR_CFG,
WPS_TOKEN_RTC_HOUR_24_ZERO_PADDED,
WPS_TOKEN_RTC_HOUR_24,
WPS_TOKEN_RTC_HOUR_12_ZERO_PADDED,

3
apps/gui/wps_parser.c
View file

@ -166,8 +166,7 @@ static const struct wps_tag all_tags[] = {
{ 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_HOUR_CFG_ZERO_PADDED, "cf", WPS_RTC_REFRESH, NULL },
{ WPS_TOKEN_RTC_HOUR_CFG, "cg", WPS_RTC_REFRESH, NULL },
{ WPS_TOKEN_RTC_12HOUR_CFG, "cf", WPS_RTC_REFRESH, NULL },
{ WPS_TOKEN_RTC_HOUR_24_ZERO_PADDED, "cH", WPS_RTC_REFRESH, NULL },
{ WPS_TOKEN_RTC_HOUR_24, "ck", WPS_RTC_REFRESH, NULL },
{ WPS_TOKEN_RTC_HOUR_12_ZERO_PADDED, "cI", WPS_RTC_REFRESH, NULL },