diff options
author | Steve Bavin <pondlife@pondlife.me> | 2008-05-22 08:02:48 +0000 |
---|---|---|
committer | Steve Bavin <pondlife@pondlife.me> | 2008-05-22 08:02:48 +0000 |
commit | 5f8bd63cba88186b05d22581ea9edf02b1538caf (patch) | |
tree | cba7eb9d5998cf43f0d363a7990bf6e26106fa4e | |
parent | 32db049a2adb032e8abe7b63b50543a30589b214 (diff) | |
download | rockbox-5f8bd63cba88186b05d22581ea9edf02b1538caf.tar.gz rockbox-5f8bd63cba88186b05d22581ea9edf02b1538caf.zip |
FS#9019 - Tidied up WPS context menu. Moved playlist to the top, added Playback Settings optiona and removed duplicate options.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17603 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/lang/english.lang | 16 | ||||
-rw-r--r-- | apps/menus/exported_menus.h | 2 | ||||
-rw-r--r-- | apps/menus/playback_menu.c | 2 | ||||
-rw-r--r-- | apps/menus/settings_menu.c | 2 | ||||
-rw-r--r-- | apps/onplay.c | 50 | ||||
-rw-r--r-- | apps/root_menu.c | 2 |
6 files changed, 13 insertions, 61 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index b0795d3e67..6fa052b935 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -1494,13 +1494,13 @@ desc: in settings_menu() user: <source> - *: "Playback" + *: "Playback Settings" </source> <dest> - *: "Playback" + *: "Playback Settings" </dest> <voice> - *: "Playback" + *: "Playback Settings" </voice> </phrase> <phrase> @@ -11645,7 +11645,7 @@ </phrase> <phrase> id: LANG_ENABLE_STUDY_MODE - desc: WPS context menu + desc: playback settings menu user: <source> *: "Enable Study Mode" @@ -11659,16 +11659,16 @@ </phrase> <phrase> id: LANG_DISABLE_STUDY_MODE - desc: WPS context menu + desc: DEPRECATED user: <source> - *: "Disable Study Mode" + *: "" </source> <dest> - *: "Disable Study Mode" + *: "" </dest> <voice> - *: "Disable Study Mode" + *: "" </voice> </phrase> <phrase> diff --git a/apps/menus/exported_menus.h b/apps/menus/exported_menus.h index 55919abcfc..d3a850be84 100644 --- a/apps/menus/exported_menus.h +++ b/apps/menus/exported_menus.h @@ -26,7 +26,7 @@ extern const struct menu_item_ex main_menu_, /* main_menu.c */ display_menu, /* display_menu.c */ - playback_menu_item, /* playback_menu.c */ + playback_settings, /* playback_menu.c */ #ifdef HAVE_RECORDING recording_settings, /* recording_menu.c */ #endif diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c index 1dcb42b0c5..408537e8cf 100644 --- a/apps/menus/playback_menu.c +++ b/apps/menus/playback_menu.c @@ -179,7 +179,7 @@ MENUITEM_SETTING(study_hop_step, &global_settings.study_hop_step, NULL); MAKE_MENU(study_mode_menu, ID2P(LANG_STUDY_MODE), 0, Icon_NOICON, &study_mode, &study_hop_step); -MAKE_MENU(playback_menu_item,ID2P(LANG_PLAYBACK),0, +MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0, Icon_Playback_menu, &shuffle_item, &repeat_mode, &play_selected, &ff_rewind_settings_menu, diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 635651e256..0dbea54496 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -490,7 +490,7 @@ MENUITEM_FUNCTION(browse_langs, 0, ID2P(LANG_LANGUAGE), language_browse, MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0, Icon_General_settings_menu, - &playback_menu_item, &playlist_settings, &file_menu, + &playback_settings, &playlist_settings, &file_menu, #ifdef HAVE_TAGCACHE &tagcache_menu, #endif diff --git a/apps/onplay.c b/apps/onplay.c index 076f90ca59..82185f4e9d 100644 --- a/apps/onplay.c +++ b/apps/onplay.c @@ -55,9 +55,6 @@ #include "icons.h" #endif #include "sound_menu.h" -#if CONFIG_CODEC == SWCODEC -#include "menus/eq_menu.h" -#endif #include "playlist_menu.h" #include "playlist_catalog.h" #ifdef HAVE_TAGCACHE @@ -1007,47 +1004,6 @@ MENUITEM_FUNCTION(browse_id3_item, 0, ID2P(LANG_MENU_SHOW_ID3_INFO), MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), pitch_screen, NULL, NULL, Icon_Audio); #endif -#if CONFIG_CODEC == SWCODEC -MENUITEM_FUNCTION(eq_menu_graphical_item, 0, ID2P(LANG_EQUALIZER_GRAPHICAL), - eq_menu_graphical, NULL, NULL, Icon_Audio); -MENUITEM_FUNCTION(eq_browse_presets_item, 0, ID2P(LANG_EQUALIZER_BROWSE), - eq_browse_presets, NULL, NULL, Icon_Audio); -#endif - -/* study mode setting toggling */ - -static char* study_mode_toggle_get_name(int selected_item, void * data, - char *buffer) -{ - (void)selected_item; - (void)data; - snprintf(buffer, MAX_PATH, - global_settings.study_mode ? str(LANG_DISABLE_STUDY_MODE) - : str(LANG_ENABLE_STUDY_MODE)); - return buffer; -} - -static int study_mode_toggle_speak_item(int selected_item, void * data) -{ - (void)selected_item; - (void)data; - talk_id(global_settings.study_mode ? LANG_DISABLE_STUDY_MODE - : LANG_ENABLE_STUDY_MODE, false); - return 0; -} - -static int toggle_study_mode(void * param) -{ - (void)param; - global_settings.study_mode ^= 1; - return 0; -} - -MENUITEM_FUNCTION_DYNTEXT(study_mode_toggle, 0, - toggle_study_mode, NULL, - study_mode_toggle_get_name, - study_mode_toggle_speak_item, - NULL, NULL, Icon_NOICON); /* CONTEXT_[TREE|ID3DB] items */ static int clipboard_callback(int action,const struct menu_item_ex *this_item); @@ -1179,7 +1135,7 @@ static int clipboard_callback(int action,const struct menu_item_ex *this_item) MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE), onplaymenu_callback, Icon_Audio, - &sound_settings, &wps_playlist_menu, &cat_playlist_menu, + &wps_playlist_menu, &cat_playlist_menu, &sound_settings, &playback_settings, #ifdef HAVE_TAGCACHE &rating_item, #endif @@ -1187,10 +1143,6 @@ MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE), #ifdef HAVE_PITCHSCREEN &pitch_screen_item, #endif -#if CONFIG_CODEC == SWCODEC - &eq_menu_graphical_item, &eq_browse_presets_item, -#endif - &study_mode_toggle, ); /* used when onplay() is not called in the CONTEXT_WPS context */ MAKE_ONPLAYMENU( tree_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE), diff --git a/apps/root_menu.c b/apps/root_menu.c index 229341f71b..369f7d98a6 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -326,7 +326,7 @@ static const struct root_items items[] = { #ifdef HAVE_TAGCACHE [GO_TO_DBBROWSER] = { browser, (void*)GO_TO_DBBROWSER, &tagcache_menu }, #endif - [GO_TO_WPS] = { wpsscrn, NULL, &playback_menu_item }, + [GO_TO_WPS] = { wpsscrn, NULL, &playback_settings }, [GO_TO_MAINMENU] = { menu, NULL, &manage_settings }, #ifdef HAVE_RECORDING |