diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-06 00:29:46 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-06 00:29:46 +0000 |
| commit | a9b5f4d810903996d868b0fcdcf9859cf3f47d7d (patch) | |
| tree | 4acbdcace28f00451d5b5c9687cc53c6f997886c /apps/settings_list.c | |
| parent | 43ed678b4645a48cf2072ab72c93e730f4d329ff (diff) | |
| download | rockbox-a9b5f4d810903996d868b0fcdcf9859cf3f47d7d.tar.gz rockbox-a9b5f4d810903996d868b0fcdcf9859cf3f47d7d.zip | |
cleanup statusbar+base skin relationship...
* remove the "custom" option from the statusbar setting. if a sbs file is set then statusbar setting is ignored, no other user visible change there.
* new tag, %wi - use to draw the inbuilt statusbar in the current viewport
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25038 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
| -rw-r--r-- | apps/settings_list.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 0a7c3c5b99..5759e24286 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
| @@ -624,14 +624,14 @@ const struct settings_list settings[] = { | |||
| 624 | ID2P(LANG_INVERT_CURSOR_BAR)), | 624 | ID2P(LANG_INVERT_CURSOR_BAR)), |
| 625 | #endif | 625 | #endif |
| 626 | CHOICE_SETTING(F_THEMESETTING|F_TEMPVAR, statusbar, | 626 | CHOICE_SETTING(F_THEMESETTING|F_TEMPVAR, statusbar, |
| 627 | LANG_STATUS_BAR, STATUSBAR_TOP, "statusbar","off,top,bottom,custom", | 627 | LANG_STATUS_BAR, STATUSBAR_TOP, "statusbar","off,top,bottom", |
| 628 | NULL, 4, ID2P(LANG_OFF), ID2P(LANG_STATUSBAR_TOP), | 628 | NULL, 3, ID2P(LANG_OFF), ID2P(LANG_STATUSBAR_TOP), |
| 629 | ID2P(LANG_STATUSBAR_BOTTOM), ID2P(LANG_STATUSBAR_CUSTOM)), | 629 | ID2P(LANG_STATUSBAR_BOTTOM)), |
| 630 | #ifdef HAVE_REMOTE_LCD | 630 | #ifdef HAVE_REMOTE_LCD |
| 631 | CHOICE_SETTING(F_THEMESETTING|F_TEMPVAR, remote_statusbar, | 631 | CHOICE_SETTING(F_THEMESETTING|F_TEMPVAR, remote_statusbar, |
| 632 | LANG_REMOTE_STATUSBAR, STATUSBAR_TOP, "remote statusbar","off,top,bottom,custom", | 632 | LANG_REMOTE_STATUSBAR, STATUSBAR_TOP, "remote statusbar","off,top,bottom", |
| 633 | NULL, 4, ID2P(LANG_OFF), ID2P(LANG_STATUSBAR_TOP), | 633 | NULL, 3, ID2P(LANG_OFF), ID2P(LANG_STATUSBAR_TOP), |
| 634 | ID2P(LANG_STATUSBAR_BOTTOM), ID2P(LANG_STATUSBAR_CUSTOM)), | 634 | ID2P(LANG_STATUSBAR_BOTTOM)), |
| 635 | #endif | 635 | #endif |
| 636 | CHOICE_SETTING(F_THEMESETTING|F_TEMPVAR, scrollbar, | 636 | CHOICE_SETTING(F_THEMESETTING|F_TEMPVAR, scrollbar, |
| 637 | LANG_SCROLL_BAR, SCROLLBAR_LEFT, "scrollbar","off,left,right", | 637 | LANG_SCROLL_BAR, SCROLLBAR_LEFT, "scrollbar","off,left,right", |