diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-03 14:23:03 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-03 14:23:03 +0000 |
commit | 97090863a6c7a8e5c785a9bc185482c033e89197 (patch) | |
tree | a071c24077c2ca7c9183b17639a5479ee4735071 /apps/menus/display_menu.c | |
parent | 02a871780fdc7e5193028a2eb8b250f88a70074b (diff) | |
download | rockbox-97090863a6c7a8e5c785a9bc185482c033e89197.tar.gz rockbox-97090863a6c7a8e5c785a9bc185482c033e89197.zip |
Allow settings to have a different title in the setting screen than they
have in the menu.
Fixes the scroll speed/step settings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12572 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/display_menu.c')
-rw-r--r-- | apps/menus/display_menu.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 26eac23f21..1cd6f0e246 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -279,16 +279,20 @@ MAKE_MENU(lcd_remote_settings, ID2P(LANG_LCD_REMOTE_MENU), | |||
279 | 279 | ||
280 | /***********************************/ | 280 | /***********************************/ |
281 | /* SCROLL MENU */ | 281 | /* SCROLL MENU */ |
282 | MENUITEM_SETTING(scroll_speed, &global_settings.scroll_speed, NULL); | 282 | MENUITEM_SETTING_W_TEXT(scroll_speed, &global_settings.scroll_speed, |
283 | ID2P(LANG_SCROLL), NULL); | ||
283 | MENUITEM_SETTING(scroll_delay, &global_settings.scroll_delay, NULL); | 284 | MENUITEM_SETTING(scroll_delay, &global_settings.scroll_delay, NULL); |
284 | #ifdef HAVE_LCD_BITMAP | 285 | #ifdef HAVE_LCD_BITMAP |
285 | MENUITEM_SETTING(scroll_step, &global_settings.scroll_step, NULL); | 286 | MENUITEM_SETTING_W_TEXT(scroll_step, &global_settings.scroll_step, |
287 | ID2P(LANG_SCROLL_STEP_EXAMPLE), NULL); | ||
286 | #endif | 288 | #endif |
287 | MENUITEM_SETTING(bidir_limit, &global_settings.bidir_limit, NULL); | 289 | MENUITEM_SETTING(bidir_limit, &global_settings.bidir_limit, NULL); |
288 | #ifdef HAVE_REMOTE_LCD | 290 | #ifdef HAVE_REMOTE_LCD |
289 | MENUITEM_SETTING(remote_scroll_speed, &global_settings.remote_scroll_speed, NULL); | 291 | MENUITEM_SETTING_W_TEXT(remote_scroll_speed, &global_settings.remote_scroll_speed, |
292 | ID2P(LANG_SCROLL), NULL); | ||
290 | MENUITEM_SETTING(remote_scroll_delay, &global_settings.remote_scroll_delay, NULL); | 293 | MENUITEM_SETTING(remote_scroll_delay, &global_settings.remote_scroll_delay, NULL); |
291 | MENUITEM_SETTING(remote_scroll_step, &global_settings.remote_scroll_step, NULL); | 294 | MENUITEM_SETTING_W_TEXT(remote_scroll_step, &global_settings.remote_scroll_step, |
295 | ID2P(LANG_SCROLL_STEP_EXAMPLE), NULL); | ||
292 | MENUITEM_SETTING(remote_bidir_limit, &global_settings.remote_bidir_limit, NULL); | 296 | MENUITEM_SETTING(remote_bidir_limit, &global_settings.remote_bidir_limit, NULL); |
293 | MAKE_MENU(remote_scroll_sets, ID2P(LANG_REMOTE_SCROLL_SETS), 0, Icon_NOICON, | 297 | MAKE_MENU(remote_scroll_sets, ID2P(LANG_REMOTE_SCROLL_SETS), 0, Icon_NOICON, |
294 | &remote_scroll_speed, &remote_scroll_delay, | 298 | &remote_scroll_speed, &remote_scroll_delay, |