From 4b831753e799f969b473b0b0fb48317722d7b98e Mon Sep 17 00:00:00 2001 From: Jonas Häggqvist Date: Mon, 22 Jun 2009 17:37:36 +0000 Subject: Center the list on the currently loaded file in the following screens (FS#10093): - Font selection - FM preset selection - WPS/RWPS selection - Language selection Modify the menu wording to make them seem more like a setting and update the manual accordingly. The code could possibly be more compact - any help on that would be appreciated. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21464 a1c6a512-1295-4272-9138-f99709370657 --- apps/lang/english.lang | 24 ++++++------- apps/tree.c | 53 +++++++++++++++++++++++++++++ manual/advanced_topics/main.tex | 6 ++-- manual/configure_rockbox/theme_settings.tex | 8 ++--- 4 files changed, 72 insertions(+), 19 deletions(-) diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 4c6e38d912..78322662d6 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -2649,15 +2649,15 @@ user: core *: none - lcd_bitmap: "Browse Fonts" + lcd_bitmap: "Font" *: none - lcd_bitmap: "Browse Fonts" + lcd_bitmap: "Font" *: none - lcd_bitmap: "Browse Fonts" + lcd_bitmap: "Font" @@ -2665,13 +2665,13 @@ desc: in settings_menu() user: core - *: "Browse .wps files" + *: "While Playing Screen" - *: "Browse .wps files" + *: "While Playing Screen" - *: "Browse while-playing-screen files" + *: "While playing screen" @@ -2680,15 +2680,15 @@ user: core *: none - remote: "Browse .rwps files" + remote: "Remote While Playing Screen" *: none - remote: "Browse .rwps files" + remote: "Remote While Playing Screen" *: none - remote: "Browse remote while-playing-screen files" + remote: "Remote While Playing Screen" @@ -5187,13 +5187,13 @@ desc: in the main menu user: core - *: "Browse Themes" + *: "Browse Theme Files" - *: "Browse Themes" + *: "Browse Theme Files" - *: "Browse Themes" + *: "Browse Theme Files" diff --git a/apps/tree.c b/apps/tree.c index 84224efa85..d1d0ec3b27 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -904,6 +904,7 @@ int rockbox_browse(const char *root, int dirfilter) if (dirfilter >= NUM_FILTER_MODES) { static struct tree_context backup; + char current[MAX_PATH]; int last_context; backup = tc; @@ -913,6 +914,58 @@ int rockbox_browse(const char *root, int dirfilter) start_wps = false; last_context = curr_context; + /* Center on the currently loaded language when browsing languages. */ + if (dirfilter == SHOW_LNG) + { + if (global_settings.lang_file[0]) + { + snprintf(current, sizeof(current), LANG_DIR "/%s.lng", + global_settings.lang_file); + } + else + { + strncpy(current, LANG_DIR "/english.lng", sizeof(current)); + } + } + /* Center on currently loaded WPS */ + else if (dirfilter == SHOW_WPS) + { + snprintf(current, sizeof(current), WPS_DIR "/%s.wps", + global_settings.wps_file); + } +#ifdef HAVE_REMOTE_LCD + /* Center on currently loaded RWPS */ + else if (dirfilter == SHOW_RWPS) + { + snprintf(current, sizeof(current), WPS_DIR "/%s.rwps", + global_settings.rwps_file); + } +#endif +#ifdef HAVE_LCD_BITMAP + /* Center on the currently loaded font when browsing fonts */ + else if (dirfilter == SHOW_FONT) + { + snprintf(current, sizeof(current), FONT_DIR "/%s.fnt", + global_settings.font_file); + } +#endif +#if CONFIG_TUNER + /* Center on the currently loaded FM preset when browsing those */ + else if (dirfilter == SHOW_FMR) + { + snprintf(current, sizeof(current), FMPRESET_PATH "/%s.fmr", + global_settings.fmr_file); + } +#endif + + /* If we've found a file to center on, do it */ + if (current[0] == '/') + { + set_current_file(current); + /* set_current_file changes dirlevel, change it back */ + tc.dirlevel = 0; + } + ret_val = dirbrowse(); tc = backup; curr_context = last_context; diff --git a/manual/advanced_topics/main.tex b/manual/advanced_topics/main.tex index 41c0ba4adb..f6ba4ae52a 100644 --- a/manual/advanced_topics/main.tex +++ b/manual/advanced_topics/main.tex @@ -15,7 +15,7 @@ in the font package at \url{http://www.rockbox.org/daily.shtml}.} be loaded automatically every time you start up, it must be located in the \fname{/.rockbox/fonts} directory and the filename must be at most 24 characters long. You can browse the fonts in \fname{/.rockbox/fonts} under - \setting{Settings $\rightarrow$ Theme Settings $\rightarrow$ Browse Fonts} + \setting{Settings $\rightarrow$ Theme Settings $\rightarrow$ Font} in the \setting{Main Menu}. \note{Advanced Users Only: Any BDF font file up to 16 pixels high should be usable with Rockbox. To convert from \fname{.bdf} to \fname{.fnt}, use @@ -96,7 +96,7 @@ file find the instructions on the Rockbox website: \fname{/.rockbox/themes} directory and then activate the config file from the menu as normal (\setting{Settings} $\rightarrow$ \setting{Theme Settings}% - $\rightarrow$ \setting{Browse Themes}). + $\rightarrow$ \setting{Browse Theme Files}). \subsubsection{Editing} The built-in \setting{Text Editor} (see \reference{sec:text_editor}) @@ -142,7 +142,7 @@ file find the instructions on the Rockbox website: displaying Track name, Artist, Album etc. in the default font as a purely text based layout. There are a number of WPS files included in Rockbox, and you can load one of these at any time by selecting it in - \setting{Settings $\rightarrow$ Theme Settings $\rightarrow$ Browse .wps files}. + \setting{Settings $\rightarrow$ Theme Settings $\rightarrow$ While Playing Screen}. \opt{HAVE_REMOTE_LCD}{There is a related option to browse \fname{.rwps} files for \daps{} with LCD remote controls installed. This will load a similar WPS screen for the remote.} diff --git a/manual/configure_rockbox/theme_settings.tex b/manual/configure_rockbox/theme_settings.tex index 0273fe02ea..ffd437f418 100644 --- a/manual/configure_rockbox/theme_settings.tex +++ b/manual/configure_rockbox/theme_settings.tex @@ -3,7 +3,7 @@ The \setting{Theme Settings} menu offers options that you can change to customize the visual apperance of Rockbox. \begin{description} -\item[Browse Themes.] +\item[Browse Theme Files.] This option will display all the currently installed themes on the \dap{}, press \ActionTreeEnter{} to load the chosen theme and apply it. @@ -31,12 +31,12 @@ customize the visual apperance of Rockbox. \reference{ref:CreateYourOwnWPS} for more details.} \opt{lcd_bitmap}{ - \item[Browse Fonts.] + \item[Font.] Browse the installed fonts on your \dap{}. Selecting one will activate it. See \reference{ref:Loadingfonts} for further details about fonts. } % \nopt{player} -\item[Browse WPS files.] +\item[While Playing Screen.] Opens the \setting{File Browser} in the \fname{/.rockbox/wps} directory and displays all \fname{.wps} files. Selecting one will activate it, stop will exit back to the menu. For further information about the WPS see @@ -44,7 +44,7 @@ customize the visual apperance of Rockbox. \reference{ref:ConfiguringtheWPS}. \opt{HAVE_REMOTE_LCD}{ - \item[Browse RWPS files.] + \item[Remote While Playing Screen.] Opens the \setting{File Browser} in the \fname{/.rockbox/wps} directory and displays all \fname{.rwps} files. Selecting one will activate it, stop will exit back to the menu. -- cgit v1.2.3