scroll/status bar enable now also in display menu (were in F3 menu only). Now all F2/F3 settings are accessible in the main menu, consistent and better for F2/F3 hijacking

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3575 a1c6a512-1295-4272-9138-f99709370657

17 files changed, 174 insertions, 0 deletions

diff --git a/apps/lang/afrikaans.lang b/apps/lang/afrikaans.lang
index 7b1bb9e..2287881 100644
--- a/apps/lang/afrikaans.lang
+++ b/apps/lang/afrikaans.lang
@@ -590,6 +590,16 @@ desc: in wps F3 pressed
 eng: "bar"
 new: "balk"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "Status balk"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Rol balk"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End of list"
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index 6777c1e..17e1fde 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -629,6 +629,18 @@ eng: "bar"
 ### Not previously translated
 new:
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+### Not previously translated
+new:
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+### Not previously translated
+new:
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End of list"
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 89a20f7..7b4e842 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -589,6 +589,16 @@ desc: in wps F3 pressed
 eng: "Bar"
 new: "leiste"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "Statusleiste"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Scrollleiste"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End Of List"
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 15d9039..4b630d6 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -608,6 +608,16 @@ desc: in wps F3 pressed
 eng: "Bar"
 new:
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new:
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new:
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End Of List"
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index fd925d5..e54cee8 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -589,6 +589,16 @@ desc: in wps F3 pressed
 eng: "Bar"
 new: "Barra"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "Estado Barra"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Desplazamiento Barra"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End Of List"
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index e7776c7..9843b81 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -583,6 +583,16 @@ desc: in wps F3 pressed
 eng: "Bar"
 new: "Barre"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "Statut Barre"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Défilement Barre"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End Of List"
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 56b1c39..a034f82 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -593,6 +593,16 @@ desc: in wps F3 pressed
 eng: "bar"
 new: "ÌðÜñá"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "ÊáôÜóôáóç ÌðÜñá"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Êýëéóç ÌðÜñá"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End of list"
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 8bc4e62..5307a5c 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -604,6 +604,16 @@ desc: in wps F3 pressed
 eng: "bar"
 new: "֌"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "ñèèåñ ÷å"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "äçì÷ä ÷å"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End of list"
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index efa0e48..cc92b61 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -592,6 +592,16 @@ desc: in wps F3 pressed
 eng: "bar"
 new: "Barra"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "Stato Barra"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Scorrimento Barra"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End of list"
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index 5ca4790..71ae87f 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -590,6 +590,16 @@ desc: in wps F3 pressed
 eng: "Bar"
 new: "balk"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "Status balk"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Scroll balk"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End Of List"
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index 7cf4d1f..0d01402 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -594,6 +594,16 @@ desc: in wps F3 pressed
 eng: "Bar"
 new: "pasek"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "Gorny pasek"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Lewy pasek"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End Of List"
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 3c7b08d..55a4d1a 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -599,6 +599,16 @@ desc: in wps F3 pressed
 eng: "bar"
 new: "barra"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "Estado barra"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Scroll barra"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End of list"
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index 9e481fd..e1669bf 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -593,6 +593,16 @@ desc: in wps F3 pressed
 eng: "bar"
 new: "Ïàíåëü ïðîêðóòêè"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new:
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new:
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End of list"
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index 3e62aaf..0a95855 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -589,6 +589,16 @@ desc: in wps F3 pressed
 eng: "Bar"
 new: "List"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "Statuslist"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Rulllist"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End Of List"
diff --git a/apps/lang/turkce.lang b/apps/lang/turkce.lang
index 2ad2a2a..4da357c 100644
--- a/apps/lang/turkce.lang
+++ b/apps/lang/turkce.lang
@@ -592,6 +592,16 @@ desc: in wps F3 pressed
 eng: "bar"
 new: "cubugu"
  
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "Durum cubugu"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Kaydirma cubugu"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End of list"
diff --git a/apps/lang/wallisertitsch.lang b/apps/lang/wallisertitsch.lang
index 074aaa3..2e061fd 100644
--- a/apps/lang/wallisertitsch.lang
+++ b/apps/lang/wallisertitsch.lang
@@ -594,6 +594,16 @@ desc: in wps F3 pressed
 eng: "bar"
 new: "Liischta"
 
+id: LANG_STATUS_BAR
+desc: display menu, F3 substitute
+eng: "Status Bar"
+new: "Schtatusliischta"
+
+id: LANG_SCROLL_BAR
+desc: display menu, F3 substitute
+eng: "Scroll Bar"
+new: "Scrollliischta"
+
 id: LANG_END_PLAYLIST_PLAYER
 desc: when playlist has finished
 eng: "End of list"
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 6f2fe28..3110937 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -596,6 +596,16 @@ static bool browse_current(void)
     return set_bool( str(LANG_FOLLOW), &global_settings.browse_current );
 }
 
+static bool scroll_bar(void)
+{
+    return set_bool( str(LANG_SCROLL_BAR), &global_settings.scrollbar );
+}
+
+static bool status_bar(void)
+{
+    return set_bool( str(LANG_STATUS_BAR), &global_settings.statusbar );
+}
+
 static bool playback_settings_menu(void)
 {
     int m;
@@ -733,6 +743,8 @@ static bool display_settings_menu(void)
         { str(LANG_BACKLIGHT_ON_WHEN_CHARGING), backlight_on_when_charging },
         { str(LANG_CONTRAST),        contrast        },  
 #ifdef HAVE_LCD_BITMAP
+        { str(LANG_SCROLL_BAR),      scroll_bar },
+        { str(LANG_STATUS_BAR),      status_bar },
         { str(LANG_INVERT),          invert },
         { str(LANG_INVERT_CURSOR),   invert_cursor },
         { str(LANG_PM_MENU),         peak_meter_menu },