+4 -4

apps/lang/english.lang

reviewed

··· 16067 16067 </phrase> 16068 16068 <phrase> 16069 16069 id: LANG_DEFAULT_BROWSER 16070 16070 - desc: in Settings 16070 16070 + desc: deprecated 16071 16071 user: core 16072 16072 <source> 16073 16073 - *: "Default Browser" 16073 16073 + *: "" 16074 16074 </source> 16075 16075 <dest> 16076 16076 - *: "Default Browser" 16076 16076 + *: "" 16077 16077 </dest> 16078 16078 <voice> 16079 16079 - *: "Default Browser" 16079 16079 + *: "" 16080 16080 </voice> 16081 16081 </phrase> 16082 16082 <phrase>

-3

apps/menus/settings_menu.c

reviewed

··· 737 737 /***********************************/ 738 738 /* WPS Settings MENU */ 739 739 740 740 - MENUITEM_SETTING(browser_default, 741 741 - &global_settings.browser_default, NULL); 742 740 743 741 #ifdef HAVE_HOTKEY 744 742 MENUITEM_SETTING(hotkey_wps_item, &global_settings.hotkey_wps, NULL); 745 743 #endif 746 744 747 745 MAKE_MENU(wps_settings, ID2P(LANG_WPS), 0, Icon_Playback_menu 748 748 - ,&browser_default 749 746 #ifdef HAVE_HOTKEY 750 747 ,&hotkey_wps_item 751 748 #endif

+4 -19

apps/root_menu.c

reviewed

··· 931 931 return new_screen; 932 932 } 933 933 934 934 - static int browser_default(void) 935 935 - { 936 936 - switch (global_settings.browser_default) 937 937 - { 938 938 - #ifdef HAVE_TAGCACHE 939 939 - case BROWSER_DEFAULT_DB: 940 940 - return GO_TO_DBBROWSER; 941 941 - #endif 942 942 - case BROWSER_DEFAULT_PL_CAT: 943 943 - return GO_TO_PLAYLISTS_SCREEN; 944 944 - case BROWSER_DEFAULT_FILES: 945 945 - default: 946 946 - return GO_TO_FILEBROWSER; 947 947 - } 948 948 - } 949 934 950 935 void root_menu(void) 951 936 { 952 952 - int previous_browser = browser_default(); 937 937 + int previous_browser = global_status.last_browser; 953 938 int selected = 0; 954 939 int shortcut_origin = GO_TO_ROOT; 955 940 ··· 983 968 #endif 984 969 case GO_TO_FILEBROWSER: 985 970 case GO_TO_PLAYLISTS_SCREEN: 986 986 - previous_browser = next_screen; 971 971 + global_status.last_browser = previous_browser = next_screen; 987 972 goto load_next_screen; 988 973 break; 989 974 #if CONFIG_TUNER ··· 1078 1063 last_screen = GO_TO_PLUGIN; 1079 1064 } 1080 1065 } 1081 1081 - previous_browser = (next_screen != GO_TO_WPS) ? browser_default() : 1082 1082 - GO_TO_PLUGIN; 1066 1066 + previous_browser = (next_screen == GO_TO_WPS) ? 1067 1067 + GO_TO_PLUGIN : global_status.last_browser; 1083 1068 break; 1084 1069 } 1085 1070 default:

+1 -11

apps/settings.h

reviewed

··· 135 135 QUEUE_SHOW_IN_SUBMENU 136 136 }; 137 137 138 138 - enum 139 139 - { 140 140 - BROWSER_DEFAULT_FILES = 0, 141 141 - #ifdef HAVE_TAGCACHE 142 142 - BROWSER_DEFAULT_DB, 143 143 - #endif 144 144 - BROWSER_DEFAULT_PL_CAT 145 145 - }; 146 146 - 147 138 #ifdef HAVE_ALBUMART 148 139 enum 149 140 { ··· 360 351 relative to MIN_FREQ */ 361 352 #endif 362 353 int last_screen; 354 354 + int last_browser; 363 355 int viewer_icon_count; 364 356 int last_volume_change; /* tick the last volume change happened. skins use this */ 365 357 int font_id[NB_SCREENS]; /* font id of the settings font for each screen */ ··· 647 639 int lst_color; /* color of the text for the selector */ 648 640 unsigned char colors_file[MAX_FILENAME+1]; 649 641 #endif 650 650 - 651 651 - int browser_default; /* Default browser when accessed from WPS */ 652 642 653 643 /* playlist/playback settings */ 654 644 int repeat_mode; /* 0=off 1=repeat all 2=repeat one 3=shuffle 4=ab */

+1 -19

apps/settings_list.c

reviewed

··· 960 960 SYSTEM_STATUS(0, runtime, 0, "CRT"), 961 961 SYSTEM_STATUS(0, topruntime, 0, "TRT"), 962 962 SYSTEM_STATUS(0, last_screen, -1, "PVS"), 963 963 + SYSTEM_STATUS(0, last_browser, 0, "BRS"), 963 964 /* sound settings */ 964 965 CUSTOM_SETTING(F_NO_WRAP, volume_limit, LANG_VOLUME_LIMIT, 965 966 NULL, "volume limit", ··· 1988 1989 ID2P(LANG_SET_BOOL_NO), 1989 1990 ID2P(LANG_SET_BOOL_YES), 1990 1991 ID2P(LANG_IN_SUBMENU)), 1991 1991 - 1992 1992 - CHOICE_SETTING(0, browser_default, LANG_DEFAULT_BROWSER, 0, 1993 1993 - "default browser", 1994 1994 - #ifdef HAVE_TAGCACHE 1995 1995 - "files,database,playlists", 1996 1996 - #else 1997 1997 - "files,playlists", 1998 1998 - #endif 1999 1999 - NULL, 2000 2000 - #ifdef HAVE_TAGCACHE 2001 2001 - 3 2002 2002 - #else 2003 2003 - 2 2004 2004 - #endif 2005 2005 - ,ID2P(LANG_DIR_BROWSER), 2006 2006 - #ifdef HAVE_TAGCACHE 2007 2007 - ID2P(LANG_TAGCACHE), 2008 2008 - #endif 2009 2009 - ID2P(LANG_PLAYLISTS)), 2010 1992 2011 1993 #ifdef HAVE_BACKLIGHT 2012 1994 CHOICE_SETTING(0, backlight_on_button_hold,

-1

manual/appendix/config_file_options.tex

reviewed

··· 252 252 tagcache\_ram & on, off & N/A\\ 253 253 database path & path to a directory & N/A\\ 254 254 database scan paths & one or more paths, each separated by a colon & N/A\\ 255 255 - default browser & files, database, playlists & N/A\\ 256 255 257 256 \opt{touchpad}{ 258 257 \opt{GIGABEAT_PAD}{

-4

manual/configure_rockbox/wps.tex

reviewed

··· 2 2 \section{\label{ref:WPSSettings}What's Playing Screen} 3 3 4 4 \begin{description} 5 5 - \item[Default Browser.] 6 6 - Decide if you want the \setting{File Browser}, \setting{Database}, or 7 7 - \setting{Playlists} to launch after pressing \ActionWpsBrowse{} 8 8 - on the WPS, when no other browser has recently been used. 9 5 \opt{hotkey}{ 10 6 \item[WPS Hotkey.] Sets the hotkey function for 11 7 the WPS (see \reference{ref:Hotkeys}). The