summaryrefslogtreecommitdiff
path: root/apps/settings_list.c
diff options
context:
space:
mode:
authorTomer Shalev <shalev.tomer@gmail.com>2009-10-05 18:11:41 +0000
committerTomer Shalev <shalev.tomer@gmail.com>2009-10-05 18:11:41 +0000
commit1acacc2dcbb10e7cfc90eef7a4a1c4189268d92d (patch)
tree81b4eea20cf477523af8275d6bcc095f2c19dd0c /apps/settings_list.c
parenta39be4b3073ef32a3e33bdbf88f0c1474c7b1931 (diff)
downloadrockbox-1acacc2dcbb10e7cfc90eef7a4a1c4189268d92d.tar.gz
rockbox-1acacc2dcbb10e7cfc90eef7a4a1c4189268d92d.zip
Revert renaming of the scrollbar global setting by r22945, following discussion in IRC
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22963 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings_list.c')
-rw-r--r--apps/settings_list.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c
index d76c2deb69..62a9351782 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -641,9 +641,8 @@ const struct settings_list settings[] = {
641 ID2P(LANG_STATUSBAR_BOTTOM)), 641 ID2P(LANG_STATUSBAR_BOTTOM)),
642#endif 642#endif
643 CHOICE_SETTING(F_THEMESETTING|F_TEMPVAR, scrollbar, 643 CHOICE_SETTING(F_THEMESETTING|F_TEMPVAR, scrollbar,
644 LANG_SCROLL_BAR, SCROLLBAR_SHOW, 644 LANG_SCROLL_BAR, SCROLLBAR_LEFT, "scrollbar","off,left,right",
645 "scrollbar","hide,show,show_opposite", NULL, 3, 645 NULL, 3, ID2P(LANG_OFF), ID2P(LANG_LEFT), ID2P(LANG_RIGHT)),
646 ID2P(LANG_HIDE), ID2P(LANG_SHOW), ID2P(LANG_SHOW_OPPOSITE)),
647 INT_SETTING(F_THEMESETTING, scrollbar_width, LANG_SCROLLBAR_WIDTH, 6, 646 INT_SETTING(F_THEMESETTING, scrollbar_width, LANG_SCROLLBAR_WIDTH, 6,
648 "scrollbar width",UNIT_INT, 3, MAX(LCD_WIDTH/10,25), 1, 647 "scrollbar width",UNIT_INT, 3, MAX(LCD_WIDTH/10,25), 1,
649 NULL, NULL, NULL), 648 NULL, NULL, NULL),