From e8816552f6adc2bb458860759bd15a31b7d9d0d1 Mon Sep 17 00:00:00 2001 From: Christian Soffke Date: Tue, 22 Nov 2022 21:03:19 +0100 Subject: Offer choice of default browsers The database or playlist catalogue can now be set as the browser that is launched when pressing ACTION_WPS_BROWSE on the WPS, unless another browser has more recently been opened. Previously you'd always have to exit the File Browser first, after the player had been restarted, which is annoying for users who prefer the database. The playlist catalogue has become part of the MRU browser list, so pressing ACTION_WPS_BROWSE after selecting a track from a playlist in the playlist catalogue will now take you back there. Settings menus have been slightly restructured. - Eliminated "Set WPS Context Plugin" and "Hotkey" menus from the General menu - Added "What's Playing Screen" menu in Settings-General with option for setting default browser. The "WPS Hotkey" and "WPS Context Plugin" menu options have been moved to this menu. - "File Browser Hotkey" is now part of the File View menu, which means it is accessible from the browser's context menu as well. Overview of resulting menu structure in Settings->General: What's Playing Screen Default Browser WPS Hotkey Set WPS Context Plugin File View (...) File Browser Hotkey Change-Id: Iaa3619a791c20ce3562a1efd2cf90c72933b729a --- apps/lang/english.lang | 28 ++++++++++++++++++++++++++++ apps/menus/settings_menu.c | 33 +++++++++++++++++++++++---------- apps/root_menu.c | 26 ++++++++++++++++++++++---- apps/settings.h | 11 +++++++++++ apps/settings_list.c | 19 +++++++++++++++++++ 5 files changed, 103 insertions(+), 14 deletions(-) (limited to 'apps') diff --git a/apps/lang/english.lang b/apps/lang/english.lang index b326d5fec0..b060c8230e 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -16683,3 +16683,31 @@ *: "Quick (Ignore Directory Cache)" + + id: LANG_WPS + desc: in Settings + user: core + + *: "What's Playing Screen" + + + *: "What's Playing Screen" + + + *: "What's Playing Screen" + + + + id: LANG_DEFAULT_BROWSER + desc: in Settings + user: core + + *: "Default Browser" + + + *: "Default Browser" + + + *: "Default Browser" + + diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index a71245cf80..191079deb8 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -191,6 +191,9 @@ MENUITEM_SETTING(dirfilter, &global_settings.dirfilter, NULL); MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL); MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL); MENUITEM_SETTING(show_path_in_browser, &global_settings.show_path_in_browser, NULL); +#ifdef HAVE_HOTKEY +MENUITEM_SETTING(hotkey_tree_item, &global_settings.hotkey_tree, NULL); +#endif static int clear_start_directory(void) { path_append(global_settings.start_directory, PATH_ROOTSTR, @@ -229,6 +232,9 @@ MAKE_MENU(file_menu, ID2P(LANG_FILE), filemenu_callback, Icon_file_view_menu, &dirfilter, &show_filename_ext, &browse_current, &show_path_in_browser, &clear_start_directory_item +#ifdef HAVE_HOTKEY + ,&hotkey_tree_item +#endif ); static int filemenu_callback(int action, const struct menu_item_ex *this_item, @@ -776,14 +782,24 @@ MENUITEM_FUNCTION(wps_set_context_plugin, 0, /***********************************/ /***********************************/ -/* HOTKEY MENU */ +/* WPS Settings MENU */ + +MENUITEM_SETTING(browser_default, + &global_settings.browser_default, NULL); + #ifdef HAVE_HOTKEY MENUITEM_SETTING(hotkey_wps_item, &global_settings.hotkey_wps, NULL); -MENUITEM_SETTING(hotkey_tree_item, &global_settings.hotkey_tree, NULL); -MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, - &hotkey_wps_item, &hotkey_tree_item); -#endif /*have_hotkey */ -/* HOTKEY MENU */ +#endif + +MAKE_MENU(wps_settings, ID2P(LANG_WPS), 0, Icon_Playback_menu + ,&browser_default +#ifdef HAVE_HOTKEY + ,&hotkey_wps_item +#endif + ,&wps_set_context_plugin + ); + +/* WPS Settings MENU */ /***********************************/ @@ -797,6 +813,7 @@ MENUITEM_FUNCTION_W_PARAM(browse_langs, 0, ID2P(LANG_LANGUAGE), MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, Icon_General_settings_menu, + &wps_settings, &playlist_settings, &file_menu, #ifdef HAVE_TAGCACHE &tagcache_menu, @@ -808,10 +825,6 @@ MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, &autoresume_menu, #endif &browse_langs, &voice_settings_menu, - &wps_set_context_plugin, -#ifdef HAVE_HOTKEY - &hotkey_menu, -#endif ); /* SETTINGS MENU */ /***********************************/ diff --git a/apps/root_menu.c b/apps/root_menu.c index e606d5cd68..7c75b12586 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -900,9 +900,25 @@ static int root_menu_setup_screens(void) return new_screen; } +static int browser_default(void) +{ + switch (global_settings.browser_default) + { +#ifdef HAVE_TAGCACHE + case BROWSER_DEFAULT_DB: + return GO_TO_DBBROWSER; +#endif + case BROWSER_DEFAULT_PL_CAT: + return GO_TO_PLAYLISTS_SCREEN; + case BROWSER_DEFAULT_FILES: + default: + return GO_TO_FILEBROWSER; + } +} + void root_menu(void) { - int previous_browser = GO_TO_FILEBROWSER; + int previous_browser = browser_default(); int selected = 0; int shortcut_origin = GO_TO_ROOT; @@ -932,12 +948,13 @@ void root_menu(void) last_screen = GO_TO_ROOT; break; #ifdef HAVE_TAGCACHE - case GO_TO_FILEBROWSER: case GO_TO_DBBROWSER: +#endif + case GO_TO_FILEBROWSER: + case GO_TO_PLAYLISTS_SCREEN: previous_browser = next_screen; goto load_next_screen; break; -#endif /* With !HAVE_TAGCACHE previous_browser is always GO_TO_FILEBROWSER */ #if CONFIG_TUNER case GO_TO_WPS: case GO_TO_FM: @@ -1030,7 +1047,8 @@ void root_menu(void) last_screen = GO_TO_PLUGIN; } } - previous_browser = (next_screen != GO_TO_WPS) ? GO_TO_FILEBROWSER : GO_TO_PLUGIN; + previous_browser = (next_screen != GO_TO_WPS) ? browser_default() : + GO_TO_PLUGIN; break; } default: diff --git a/apps/settings.h b/apps/settings.h index ce29e020f7..2277805fec 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -127,6 +127,15 @@ enum QUEUE_SHOW_IN_SUBMENU }; +enum +{ + BROWSER_DEFAULT_FILES = 0, +#ifdef HAVE_TAGCACHE + BROWSER_DEFAULT_DB, +#endif + BROWSER_DEFAULT_PL_CAT +}; + #ifdef HAVE_ALBUMART enum { @@ -608,6 +617,8 @@ struct user_settings unsigned char colors_file[MAX_FILENAME+1]; #endif + int browser_default; /* Default browser when accessed from WPS */ + /* playlist/playback settings */ int repeat_mode; /* 0=off 1=repeat all 2=repeat one 3=shuffle 4=ab */ int next_folder; /* move to next folder */ diff --git a/apps/settings_list.c b/apps/settings_list.c index 7bdb3522c0..dc33c27c95 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -1852,6 +1852,25 @@ const struct settings_list settings[] = { ID2P(LANG_SET_BOOL_YES), ID2P(LANG_IN_SUBMENU)), + CHOICE_SETTING(0, browser_default, LANG_DEFAULT_BROWSER, 0, + "default browser", +#ifdef HAVE_TAGCACHE + "files,database,playlists", +#else + "files,playlists", +#endif + NULL, +#ifdef HAVE_TAGCACHE + 3 +#else + 2 +#endif + ,ID2P(LANG_DIR_BROWSER), +#ifdef HAVE_TAGCACHE + ID2P(LANG_TAGCACHE), +#endif + ID2P(LANG_CATALOG)), + #ifdef HAVE_BACKLIGHT CHOICE_SETTING(0, backlight_on_button_hold, LANG_BACKLIGHT_ON_BUTTON_HOLD, -- cgit v1.2.3