? wps-load-new1.patch
? build
? wrap-int-fix.patch
? wps-load-new.patch
? remote-settings.patch
? apps/gui/combined-bmp-tmp.c
? apps/plugins/zip_read.c
? tools/uclpack
? tools/iaudio
? tools/rdf2binary
? tools/mkboot
? tools/codepages
? tools/ipod_fw
? wps/tt.txt
Index: apps/settings.c
===================================================================
RCS file: /cvsroot/rockbox/apps/settings.c,v
retrieving revision 1.343
diff -u -r1.343 settings.c
--- apps/settings.c	7 Dec 2005 15:37:21 -0000	1.343
+++ apps/settings.c	7 Dec 2005 21:05:17 -0000
@@ -85,7 +85,7 @@
 #include "dsp.h"
 #endif
 
-#define CONFIG_BLOCK_VERSION 35
+#define CONFIG_BLOCK_VERSION 36
 #define CONFIG_BLOCK_SIZE 512
 #define RTC_BLOCK_SIZE 44
 
@@ -278,6 +278,19 @@
     {1, S_O(remote_flip_display), false, "remote flip display", off_on },
     {5, S_O(remote_backlight_timeout), 5, "remote backlight timeout",
         backlight_times_conf },
+    {1, S_O(remote_statusbar), true, "remote statusbar", off_on },
+    {1, S_O(remote_scrollbar), true, "remote scrollbar", off_on },
+    {1, S_O(remote_volume_type), 0, "remote volume display", graphic_numeric },
+    {1, S_O(remote_battery_display), 0, "remote battery display", graphic_numeric },
+    {1, S_O(remote_invert_cursor), false, "remote invert cursor", off_on },
+    {1, S_O(remote_show_icons), true, "remote_show icons", off_on },
+    {4, S_O(remote_scroll_speed), 9, "remote scroll speed", NULL }, /* 0...15 */
+    {7, S_O(remote_scroll_step), 6, "remote scroll step", NULL }, /* 1...112 */
+    {8, S_O(remote_scroll_delay), 100, "remote scroll delay", NULL }, /* 0...250 */
+    {8, S_O(remote_bidir_limit), 50, "remote bidir limit", NULL }, /* 0...200 */
+#ifdef CONFIG_BACKLIGHT
+    {1, S_O(remote_caption_backlight), false, "remote caption backlight", off_on },
+#endif
 #ifdef HAVE_CHARGING
     {5, S_O(remote_backlight_timeout_plugged), 11,
         "remote backlight timeout plugged", backlight_times_conf },
@@ -871,9 +884,10 @@
     lcd_remote_set_contrast(global_settings.remote_contrast);
     lcd_remote_set_invert_display(global_settings.remote_invert);
     lcd_remote_set_flip(global_settings.remote_flip_display);
-    lcd_remote_scroll_speed(global_settings.scroll_speed);
-    lcd_remote_scroll_step(global_settings.scroll_step);
-    lcd_remote_scroll_delay(global_settings.scroll_delay * (HZ/10));
+    lcd_remote_scroll_speed(global_settings.remote_scroll_speed);
+    lcd_remote_scroll_step(global_settings.remote_scroll_step);
+    lcd_remote_scroll_delay(global_settings.remote_scroll_delay * (1000/HZ));
+    lcd_remote_bidir_scroll(global_settings.remote_bidir_limit);
 #ifdef HAVE_REMOTE_LCD_TICKING
     lcd_remote_emireduce(global_settings.remote_reduce_ticking);
 #endif
@@ -913,6 +927,9 @@
     lcd_set_flip(global_settings.flip_display);
     button_set_flip(global_settings.flip_display);
     lcd_update(); /* refresh after flipping the screen */
+#ifdef HAVE_REMOTE_LCD
+    lcd_remote_update(); /* refresh after flipping the screen */
+#endif
     settings_apply_pm_range();
     peak_meter_init_times(
         global_settings.peak_meter_release, global_settings.peak_meter_hold,
@@ -952,10 +969,10 @@
     lcd_scroll_step(global_settings.scroll_step);
 #else
     lcd_jump_scroll(global_settings.jump_scroll);
-    lcd_jump_scroll_delay(global_settings.jump_scroll_delay * (HZ/10));
+    lcd_jump_scroll_delay(global_settings.jump_scroll_delay * (1000/HZ));
 #endif
     lcd_bidir_scroll(global_settings.bidir_limit);
-    lcd_scroll_delay(global_settings.scroll_delay * (HZ/10));
+    lcd_scroll_delay(global_settings.scroll_delay * (1000/HZ));
 
     if ( global_settings.lang_file[0] &&
          global_settings.lang_file[0] != 0xff ) {
@@ -1445,6 +1462,7 @@
     global_settings.contrast    = lcd_default_contrast();
     global_settings.wps_file[0] = '\0';
 #ifdef HAVE_REMOTE_LCD
+    global_settings.remote_contrast    = lcd_remote_default_contrast();
     global_settings.rwps_file[0] = '\0';
 #endif
     global_settings.font_file[0] = '\0';
Index: apps/settings.h
===================================================================
RCS file: /cvsroot/rockbox/apps/settings.h,v
retrieving revision 1.181
diff -u -r1.181 settings.h
--- apps/settings.h	6 Dec 2005 13:27:00 -0000	1.181
+++ apps/settings.h	7 Dec 2005 21:05:18 -0000
@@ -347,6 +347,19 @@
                                then according to timeout_values[] */
     int remote_backlight_timeout_plugged;
     bool remote_caption_backlight; /* turn on backlight at end and start of track */
+    bool remote_invert_cursor; /* invert the current file in dir browser and menu
+                                 instead of using the default cursor */ 
+    int remote_scroll_speed;  /* long texts scrolling speed: 1-30 */
+    int remote_bidir_limit;   /* bidir scroll length limit */
+    int remote_scroll_delay;  /* delay (in 1/10s) before starting scroll */
+    int remote_scroll_step;   /* pixels to advance per update */
+
+    bool remote_scrollbar;    /* 0=hide, 1=show */
+    bool remote_statusbar;    /* 0=hide, 1=show */
+    bool remote_show_icons;   /* 0=hide 1=show */
+
+    int remote_volume_type;   /* how volume is displayed: 0=graphic, 1=percent */
+    int remote_battery_display; /* how battery is displayed: 0=graphic, 1=percent */
 #ifdef HAVE_REMOTE_LCD_TICKING
     bool remote_reduce_ticking; /* 0=normal operation,
                                    1=EMI reduce on with cost more CPU. */
Index: apps/settings_menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/settings_menu.c,v
retrieving revision 1.229
diff -u -r1.229 settings_menu.c
--- apps/settings_menu.c	6 Dec 2005 13:27:00 -0000	1.229
+++ apps/settings_menu.c	7 Dec 2005 21:05:21 -0000
@@ -121,6 +121,84 @@
     return rc;
 }
 
+static bool remote_scroll_speed(void)
+{
+    return set_int(str(LANG_SCROLL), "", UNIT_INT,
+                   &global_settings.remote_scroll_speed,
+                   &lcd_remote_scroll_speed, 1, 0, 15, NULL );
+}
+
+static bool remote_scroll_delay(void)
+{
+    int dummy = global_settings.remote_scroll_delay * (1000/HZ);
+    int rc = set_int(str(LANG_SCROLL_DELAY), "ms", UNIT_MS,
+                     &dummy, 
+                     &lcd_remote_scroll_delay, 100, 0, 2500, NULL );
+    global_settings.remote_scroll_delay = dummy / (1000/HZ);
+    return rc;
+}
+
+static bool remote_scroll_step(void)
+{
+    return set_int(str(LANG_SCROLL_STEP_EXAMPLE), "pixels", UNIT_PIXEL,
+                   &global_settings.remote_scroll_step,
+                   &lcd_remote_scroll_step, 1, 1, LCD_REMOTE_WIDTH, NULL );
+}
+
+static bool remote_bidir_limit(void)
+{
+    return set_int(str(LANG_BIDIR_SCROLL), "%", UNIT_PERCENT,
+                   &global_settings.remote_bidir_limit, 
+                   &lcd_remote_bidir_scroll, 25, 0, 200, NULL );
+}
+
+static bool remote_scroll_bar(void)
+{
+    return set_bool( str(LANG_SCROLL_BAR), &global_settings.remote_scrollbar );
+}
+
+static bool remote_status_bar(void)
+{
+    return set_bool( str(LANG_STATUS_BAR), &global_settings.remote_statusbar );
+}
+
+static bool remote_show_icons(void)
+{
+    return set_bool( str(LANG_SHOW_ICONS), &global_settings.remote_show_icons );
+}
+
+static bool remote_battery_display(void)
+{
+    static const struct opt_items names[] = {
+        { STR(LANG_DISPLAY_GRAPHIC) }, 
+        { STR(LANG_DISPLAY_NUMERIC) }
+    };
+    return set_option( str(LANG_BATTERY_DISPLAY), 
+                       &global_settings.remote_battery_display, INT, names, 2, NULL);
+}
+
+/**
+* Menu to configure the volume display on status bar
+*/
+static bool remote_volume_type(void)
+{
+    static const struct opt_items names[] = { 
+        { STR(LANG_DISPLAY_GRAPHIC) }, 
+        { STR(LANG_DISPLAY_NUMERIC) }
+    };
+    return set_option( str(LANG_VOLUME_DISPLAY), &global_settings.remote_volume_type,
+                       INT, names, 2, NULL);
+}
+
+static bool remote_invert_cursor(void)
+{
+    return set_bool_options(str(LANG_INVERT_CURSOR),
+                            &global_settings.remote_invert_cursor,
+                            STR(LANG_INVERT_CURSOR_BAR),
+                            STR(LANG_INVERT_CURSOR_POINTER),
+                            NULL);
+}
+
 #ifdef HAVE_REMOTE_LCD_TICKING
 static bool remote_reduce_ticking(void)
 {
@@ -740,11 +818,11 @@
 
 static bool scroll_delay(void)
 {
-    int dummy = global_settings.scroll_delay * (HZ/10);
+    int dummy = global_settings.scroll_delay * (1000/HZ);
     int rc = set_int(str(LANG_SCROLL_DELAY), "ms", UNIT_MS,
                      &dummy, 
                      &lcd_scroll_delay, 100, 0, 2500, NULL );
-    global_settings.scroll_delay = dummy / (HZ/10);
+    global_settings.scroll_delay = dummy / (1000/HZ);
     return rc;
 }
 
@@ -782,11 +860,11 @@
 }
 static bool jump_scroll_delay(void)
 {
-    int dummy = global_settings.jump_scroll_delay * (HZ/10);
+    int dummy = global_settings.jump_scroll_delay * (1000/HZ);
     int rc = set_int(str(LANG_JUMP_SCROLL_DELAY), "ms", UNIT_MS,
                      &dummy, 
                      &lcd_jump_scroll_delay, 100, 0, 2500, NULL );
-    global_settings.jump_scroll_delay = dummy / (HZ/10);
+    global_settings.jump_scroll_delay = dummy / (1000/HZ);
     return rc;
 }
 #endif
@@ -1474,6 +1552,9 @@
         { ID2P(LANG_FILTER),       dir_filter          },
         { ID2P(LANG_FOLLOW),       browse_current      },
         { ID2P(LANG_SHOW_ICONS),   show_icons          },
+#ifdef HAVE_REMOTE_LCD
+        { ID2P(LANG_REMOTE_SHOW_ICONS),   remote_show_icons },
+#endif
     };
 
     m=menu_init( items, sizeof(items) / sizeof(*items), NULL,
@@ -1496,6 +1577,12 @@
         { ID2P(LANG_SCROLL_STEP),     scroll_step     },  
 #endif
         { ID2P(LANG_BIDIR_SCROLL),    bidir_limit    },
+#ifdef HAVE_REMOTE_LCD
+        { ID2P(LANG_REMOTE_SCROLL_SPEED),    remote_scroll_speed },
+        { ID2P(LANG_REMOTE_SCROLL_DELAY),    remote_scroll_delay },
+        { ID2P(LANG_REMOTE_SCROLL_STEP),     remote_scroll_step },
+        { ID2P(LANG_REMOTE_BIDIR_SCROLL),    remote_bidir_limit },
+#endif /* REMOTE_LCD */
 #ifdef HAVE_LCD_CHARCELLS
         { ID2P(LANG_JUMP_SCROLL),    jump_scroll    },
         { ID2P(LANG_JUMP_SCROLL_DELAY),    jump_scroll_delay    },
@@ -1557,10 +1644,11 @@
         { ID2P(LANG_CONTRAST),        remote_contrast },
         { ID2P(LANG_INVERT),          remote_invert },
         { ID2P(LANG_FLIP_DISPLAY),    remote_flip_display },
+        { ID2P(LANG_INVERT_CURSOR),   remote_invert_cursor },
 #ifdef HAVE_REMOTE_LCD_TICKING
         { ID2P(LANG_REDUCE_TICKING),  remote_reduce_ticking },
 #endif
-};
+    };
 
     m=menu_init( items, sizeof(items) / sizeof(*items), NULL,
                  NULL, NULL, NULL);
@@ -1584,6 +1672,12 @@
 #endif
         { ID2P(LANG_VOLUME_DISPLAY),  volume_type },
         { ID2P(LANG_BATTERY_DISPLAY), battery_display },
+#ifdef HAVE_REMOTE_LCD
+        { ID2P(LANG_REMOTE_SCROLL_BAR),     remote_scroll_bar },
+        { ID2P(LANG_REMOTE_STATUS_BAR),   remote_status_bar },
+        { ID2P(LANG_REMOTE_VOLUME_DISPLAY),  remote_volume_type },
+        { ID2P(LANG_REMOTE_BATTERY_DISPLAY), remote_battery_display },
+#endif
     };
 
     m=menu_init( items, sizeof(items) / sizeof(*items), NULL,
Index: apps/tree.c
===================================================================
RCS file: /cvsroot/rockbox/apps/tree.c,v
retrieving revision 1.381
diff -u -r1.381 tree.c
--- apps/tree.c	5 Dec 2005 22:44:41 -0000	1.381
+++ apps/tree.c	7 Dec 2005 21:05:24 -0000
@@ -220,8 +220,8 @@
 
     strcpy(tc.currdir, "/");
 
-#ifdef HAVE_LCD_CHARCELLS
     int i;
+#ifdef HAVE_LCD_CHARCELLS
     FOR_NB_SCREENS(i)
         screens[i].double_height(false);
 #endif
@@ -231,8 +231,17 @@
     gui_buttonbar_set_display(&tree_buttonbar, &(screens[SCREEN_MAIN]) );
 #endif
     gui_synclist_init(&tree_lists, &tree_get_filename, &tc);
-    gui_synclist_set_icon_callback(&tree_lists,
-                  global_settings.show_icons?&tree_get_fileicon:NULL);
+    FOR_NB_SCREENS(i)
+    {
+        if(screens[i].screen_type == SCREEN_MAIN)
+            gui_list_set_icon_callback(&tree_lists.gui_list[i],
+                          global_settings.show_icons?&tree_get_fileicon:NULL);
+#ifdef HAVE_REMOTE_LCD
+        else if(screens[i].screen_type == SCREEN_REMOTE)
+            gui_list_set_icon_callback(&tree_lists.gui_list[i],
+                          global_settings.remote_show_icons?&tree_get_fileicon:NULL);
+#endif
+    }
 #ifndef SIMULATOR
     dirbrowse();
 #else
@@ -341,8 +350,19 @@
         }
     }
     gui_synclist_set_nb_items(&tree_lists, tc.filesindir);
-    gui_synclist_set_icon_callback(&tree_lists,
-                  global_settings.show_icons?&tree_get_fileicon:NULL);
+
+    int i;
+    FOR_NB_SCREENS(i)
+    {
+        if(screens[i].screen_type == SCREEN_MAIN)
+            gui_list_set_icon_callback(&tree_lists.gui_list[i],
+                          global_settings.show_icons?&tree_get_fileicon:NULL);
+#ifdef HAVE_REMOTE_LCD
+        else if(screens[i].screen_type == SCREEN_REMOTE)
+            gui_list_set_icon_callback(&tree_lists.gui_list[i],
+                          global_settings.remote_show_icons?&tree_get_fileicon:NULL);
+#endif
+    }
     if( tc.selected_item >= tc.filesindir)
         tc.selected_item=tc.filesindir-1;
 
Index: apps/gui/gwps-common.c
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/gwps-common.c,v
retrieving revision 1.13
diff -u -r1.13 gwps-common.c
--- apps/gui/gwps-common.c	7 Dec 2005 20:42:06 -0000	1.13
+++ apps/gui/gwps-common.c	7 Dec 2005 21:05:30 -0000
@@ -238,7 +238,14 @@
 #ifdef HAVE_LCD_BITMAP
 static void gui_wps_statusbar_draw(struct gui_wps *wps, bool force)
 {
-    bool draw = global_settings.statusbar;
+    bool draw = false;
+    if(wps->display->screen_type == SCREEN_MAIN)
+        draw = global_settings.statusbar;
+
+#ifdef HAVE_REMOTE_LCD
+    else if(wps->display->screen_type == SCREEN_REMOTE)
+        draw = global_settings.remote_statusbar;
+#endif
     
     if(wps->data->wps_sb_tag 
         && wps->data->show_sb_on_wps)
Index: apps/gui/list.c
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/list.c,v
retrieving revision 1.11
diff -u -r1.11 list.c
--- apps/gui/list.c	5 Dec 2005 23:37:14 -0000	1.11
+++ apps/gui/list.c	7 Dec 2005 21:05:31 -0000
@@ -84,8 +84,16 @@
     }
     else
     {
-        int cursor_xpos=(global_settings.scrollbar &&
-                         display->nb_lines < gui_list->nb_items)?1:0;
+        int cursor_xpos=0;
+        if(display->screen_type == SCREEN_MAIN && global_settings.scrollbar
+            && display->nb_lines < gui_list->nb_items)
+            cursor_xpos = 1;
+#ifdef HAVE_REMOTE_LCD
+        else if(display->screen_type == SCREEN_REMOTE
+                && global_settings.remote_scrollbar
+                && display->nb_lines < gui_list->nb_items)
+            cursor_xpos = 1;
+#endif
         screen_put_cursorxy(display, cursor_xpos, selected_line, gui_list->cursor_flash_state);
     }
     display->update_rect(0, line_ypos,display->width,
@@ -133,8 +141,16 @@
 #ifdef HAVE_LCD_BITMAP
     display->setfont(FONT_UI);
     gui_textarea_update_nblines(display);
-    bool draw_scrollbar = (global_settings.scrollbar &&
+    bool draw_scrollbar = false;
+    if(display->screen_type == SCREEN_MAIN)
+        draw_scrollbar = (global_settings.scrollbar &&
+                           display->nb_lines < gui_list->nb_items);
+#ifdef HAVE_REMOTE_LCD
+    else if(display->screen_type == SCREEN_REMOTE)
+        draw_scrollbar = (global_settings.remote_scrollbar &&
                            display->nb_lines < gui_list->nb_items);
+#endif
+        
     draw_cursor = !global_settings.invert_cursor;
     text_pos = 0; /* here it's in pixels */
     if(draw_scrollbar)
Index: apps/gui/statusbar.c
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/statusbar.c,v
retrieving revision 1.15
diff -u -r1.15 statusbar.c
--- apps/gui/statusbar.c	4 Dec 2005 15:23:46 -0000	1.15
+++ apps/gui/statusbar.c	7 Dec 2005 21:05:33 -0000
@@ -307,6 +307,13 @@
     int fill;
     char buffer[5];
     unsigned int width, height;
+    int battery_display = 0;
+    if(display->screen_type == SCREEN_MAIN)
+        battery_display = global_settings.battery_display;
+#ifdef HAVE_REMOTE_LCD
+    else if(display->screen_type == SCREEN_REMOTE)
+        battery_display = global_settings.remote_battery_display;
+#endif
 
     /* fill battery */
     fill = percent;
@@ -317,11 +324,11 @@
 
 #if defined(HAVE_CHARGE_CTRL) && !defined(SIMULATOR) /* Rec v1 target only */
     /* show graphical animation when charging instead of numbers */
-    if ((global_settings.battery_display) &&
+    if ((battery_display) &&
         (charge_state != 1) &&
         (percent > -1)) {
 #else /* all others */
-    if (global_settings.battery_display && (percent > -1)) {
+    if (battery_display && (percent > -1)) {
 #endif
         /* Numeric display */
         display->setfont(FONT_SYSFIXED);
@@ -364,9 +371,14 @@
     char buffer[4];
     unsigned int width, height;
     bool needs_redraw = false;
-    int type = global_settings.volume_type;
+    int type = 0;
     struct screen * display=bar->display;
-
+    if(display->screen_type == SCREEN_MAIN)
+        type = global_settings.volume_type;
+#ifdef HAVE_REMOTE_LCD
+    else if(display->screen_type == SCREEN_REMOTE)
+        type = global_settings.remote_volume_type;
+#endif
     volume = percent;
     if (volume < 0)
         volume = 0;
@@ -530,12 +542,18 @@
 void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars,
                             bool force_redraw)
 {
-#ifdef HAVE_LCD_BITMAP
-    if(!global_settings.statusbar)
-       return;
-#endif /* HAVE_LCD_BITMAP */
     int i;
     FOR_NB_SCREENS(i) {
+#ifdef HAVE_LCD_BITMAP
+        if(!global_settings.statusbar
+            && bars->statusbars[i].display->screen_type == SCREEN_MAIN)
+            return;
+#ifdef HAVE_REMOTE_LCD
+        else if(!global_settings.remote_statusbar
+                && bars->statusbars[i].display->screen_type == SCREEN_REMOTE)
+            return;
+#endif /* HAVE_REMOTE_LCD */
+#endif /* HAVE_LCD_BITMAP */
         gui_statusbar_draw( &(bars->statusbars[i]), force_redraw );
     }
 }
Index: apps/gui/textarea.c
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/textarea.c,v
retrieving revision 1.6
diff -u -r1.6 textarea.c
--- apps/gui/textarea.c	5 Dec 2005 22:44:42 -0000	1.6
+++ apps/gui/textarea.c	7 Dec 2005 21:05:33 -0000
@@ -20,6 +20,20 @@
 #include "textarea.h"
 #include "font.h"
 
+#ifdef HAVE_LCD_BITMAP
+int gui_textarea_get_ystart(struct screen * display)
+{
+    int res = 0;
+    if(display->screen_type == SCREEN_MAIN)
+        res = (global_settings.statusbar)? STATUSBAR_HEIGHT : 0;
+#ifdef HAVE_REMOTE_LCD
+    else if(display->screen_type == SCREEN_REMOTE)
+        res = (global_settings.remote_statusbar)? STATUSBAR_HEIGHT : 0;
+#endif
+    return res;
+}
+#endif
+
 void gui_textarea_clear(struct screen * display)
 {
 #ifdef HAVE_LCD_BITMAP
@@ -58,8 +72,14 @@
 {
 #ifdef HAVE_LCD_BITMAP
     int height=display->height;
-    if(global_settings.statusbar)
+    if(global_settings.statusbar
+        && display->screen_type == SCREEN_MAIN)
         height -= STATUSBAR_HEIGHT;
+#ifdef HAVE_REMOTE_LCD
+    else if(global_settings.remote_statusbar
+            && display->screen_type == SCREEN_REMOTE)
+        height -= STATUSBAR_HEIGHT;
+#endif
 #ifdef HAS_BUTTONBAR
     if(global_settings.buttonbar && display->has_buttonbar)
         height -= BUTTONBAR_HEIGHT;
Index: apps/gui/textarea.h
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/textarea.h,v
retrieving revision 1.2
diff -u -r1.2 textarea.h
--- apps/gui/textarea.h	18 Nov 2005 02:07:02 -0000	1.2
+++ apps/gui/textarea.h	7 Dec 2005 21:05:33 -0000
@@ -74,8 +74,7 @@
  * - display : the screen structure
  * Returns the number of pixels
  */
-#define gui_textarea_get_ystart(display) \
-    ( (global_settings.statusbar)? STATUSBAR_HEIGHT : 0)
+int gui_textarea_get_ystart(struct screen * display);
 
 /*
  * Compute the number of pixels below which text can't be displayed
Index: apps/lang/english.lang
===================================================================
RCS file: /cvsroot/rockbox/apps/lang/english.lang,v
retrieving revision 1.207
diff -u -r1.207 english.lang
--- apps/lang/english.lang	6 Dec 2005 13:27:00 -0000	1.207
+++ apps/lang/english.lang	7 Dec 2005 21:05:37 -0000
@@ -3580,3 +3580,57 @@
 eng: "Adjust current"
 voice: "Adjust current"
 new:
+
+id: LANG_REMOTE_STATUS_BAR
+desc: in settings_menu()
+eng: "Remote Status Bar"
+voice: "Remote Status Bar"
+new:
+
+id: LANG_REMOTE_SCROLL_BAR
+desc: in settings_menu()
+eng: "Remote Scroll Bar"
+voice: "Remote Scroll Bar"
+new:
+
+id: LANG_REMOTE_SHOW_ICONS
+desc: in settings_menu
+eng: "Show Icons on Remote"
+voice: "Show Icons on Remote"
+new:
+
+id: LANG_REMOTE_SCROLL_SPEED
+desc: in settings_menu()
+eng: "Remote Scroll Speed"
+voice: "Remote Scroll Speed"
+new:
+
+id: LANG_REMOTE_SCROLL_DELAY
+desc: Delay before scrolling
+eng: "Remote Scroll Start Delay"
+voice: "Remote Scroll Start Delay"
+new:
+
+id: LANG_REMOTE_SCROLL_STEP
+desc: Pixels to advance per scroll
+eng: "Remote Scroll Step Size"
+voice: "Remote Scroll Step Size"
+new:
+
+id: LANG_REMOTE_BIDIR_SCROLL
+desc: Bidirectional scroll limit
+eng: "Remote Bidirectional Scroll Limit"
+voice: "Remote Bidirectional Scroll Limit"
+new:
+
+id: LANG_REMOTE_VOLUME_DISPLAY
+desc: Volume type title
+eng: "Remote Volume Display"
+voice: "Remote Volume Display"
+new:
+
+id: LANG_REMOTE_BATTERY_DISPLAY
+desc: Battery type title
+eng: "Remote Battery Display"
+voice: "Remote Battery Display"
+new:
Index: apps/recorder/radio.c
===================================================================
RCS file: /cvsroot/rockbox/apps/recorder/radio.c,v
retrieving revision 1.88
diff -u -r1.88 radio.c
--- apps/recorder/radio.c	29 Nov 2005 15:10:07 -0000	1.88
+++ apps/recorder/radio.c	7 Dec 2005 21:05:41 -0000
@@ -302,6 +302,9 @@
     int hours, minutes;
     bool keep_playing = false;
     bool statusbar = global_settings.statusbar;
+#ifdef HAVE_REMOTE_LCD
+    bool remote_statusbar = global_settings.remote_statusbar;
+#endif
 #ifdef HAS_BUTTONBAR
     struct gui_buttonbar buttonbar;
     gui_buttonbar_init(&buttonbar);
@@ -309,6 +312,9 @@
 #endif
     /* always display status bar in radio screen for now */
     global_settings.statusbar = true;
+#ifdef HAVE_REMOTE_LCD
+    global_settings.remote_statusbar = true;
+#endif
     FOR_NB_SCREENS(i){
         gui_textarea_clear(&screens[i]);
         screen_set_xmargin(&screens[i],0);
@@ -882,6 +888,9 @@
 
     /* restore status bar settings */
     global_settings.statusbar = statusbar;
+#ifdef HAVE_REMOTE_LCD
+    global_settings.remote_statusbar = remote_statusbar;
+#endif
     
     return have_recorded;
 }
Index: firmware/drivers/lcd-16bit.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd-16bit.c,v
retrieving revision 1.19
diff -u -r1.19 lcd-16bit.c
--- firmware/drivers/lcd-16bit.c	6 Dec 2005 13:27:01 -0000	1.19
+++ firmware/drivers/lcd-16bit.c	7 Dec 2005 21:05:42 -0000
@@ -648,7 +648,7 @@
 
 void lcd_scroll_delay(int ms)
 {
-    scroll_delay = ms / (HZ / 10);
+    scroll_delay = ms / (1000/HZ);
 }
 
 void lcd_bidir_scroll(int percent)
Index: firmware/drivers/lcd-h100-remote.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd-h100-remote.c,v
retrieving revision 1.38
diff -u -r1.38 lcd-h100-remote.c
--- firmware/drivers/lcd-h100-remote.c	6 Dec 2005 13:27:01 -0000	1.38
+++ firmware/drivers/lcd-h100-remote.c	7 Dec 2005 21:05:45 -0000
@@ -1197,7 +1197,7 @@
 
 void lcd_remote_scroll_delay(int ms)
 {
-    scroll_delay = ms / (HZ / 10);
+    scroll_delay = ms / (1000/HZ);
 }
 
 void lcd_remote_bidir_scroll(int percent)
Index: firmware/drivers/lcd-h100.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd-h100.c,v
retrieving revision 1.38
diff -u -r1.38 lcd-h100.c
--- firmware/drivers/lcd-h100.c	6 Dec 2005 13:27:01 -0000	1.38
+++ firmware/drivers/lcd-h100.c	7 Dec 2005 21:05:47 -0000
@@ -1119,7 +1119,7 @@
 
 void lcd_scroll_delay(int ms)
 {
-    scroll_delay = ms / (HZ / 10);
+    scroll_delay = ms / (1000/HZ);
 }
 
 void lcd_bidir_scroll(int percent)
Index: firmware/drivers/lcd-player.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd-player.c,v
retrieving revision 1.52
diff -u -r1.52 lcd-player.c
--- firmware/drivers/lcd-player.c	6 Dec 2005 13:27:01 -0000	1.52
+++ firmware/drivers/lcd-player.c	7 Dec 2005 21:05:48 -0000
@@ -728,13 +728,13 @@
 
 void lcd_scroll_delay(int ms)
 {
-    scroll_delay = ms / (HZ / 10);
+    scroll_delay = ms / (1000/HZ);
     DEBUGF("scroll_delay=%d (ms=%d, HZ=%d)\n", scroll_delay, ms, HZ);
 }
 
 void lcd_jump_scroll_delay(int ms)
 {
-    jump_scroll_delay = ms / (HZ / 10);
+    jump_scroll_delay = ms / (1000/HZ);
     DEBUGF("jump_scroll_delay=%d (ms=%d, HZ=%d)\n", jump_scroll_delay, ms, HZ);
 }
 
Index: firmware/drivers/lcd-recorder.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/lcd-recorder.c,v
retrieving revision 1.73
diff -u -r1.73 lcd-recorder.c
--- firmware/drivers/lcd-recorder.c	6 Dec 2005 13:27:01 -0000	1.73
+++ firmware/drivers/lcd-recorder.c	7 Dec 2005 21:05:50 -0000
@@ -948,7 +948,7 @@
 
 void lcd_scroll_delay(int ms)
 {
-    scroll_delay = ms / (HZ / 10);
+    scroll_delay = ms / (1000/HZ);
 }
 
 void lcd_bidir_scroll(int percent)