diff options
| -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 | ||||
| -rw-r--r-- | wps/classic_statusbar.sbs | 2 |
4 files changed, 1 insertions, 9 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 26ccf47335..c05ebca45e 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -200,7 +200,6 @@ 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 6dbceca906..46adbdc097 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -569,12 +569,6 @@ 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 5f35afc274..6d783551e6 100644 --- a/apps/gui/skin_engine/skin_tokens.h +++ b/apps/gui/skin_engine/skin_tokens.h @@ -62,7 +62,6 @@ 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. */ diff --git a/wps/classic_statusbar.sbs b/wps/classic_statusbar.sbs index c867672e4c..953b9a4a0e 100644 --- a/wps/classic_statusbar.sbs +++ b/wps/classic_statusbar.sbs @@ -63,7 +63,7 @@ # Clock on RTC able targets, and disk access %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" %V|-6|0|-|8|0|-|-| # align on the right with room for 1 SYSFONT digit %?lh<*|> |