mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-13 18:17:39 -04:00
FS#11250: Hotkey setting method changed to menu item vs button pres in context menu. Manuals updated to match.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25905 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
8d3553489f
commit
1ad76ff25b
21 changed files with 140 additions and 571 deletions
22
apps/menu.c
22
apps/menu.c
|
@ -61,12 +61,6 @@
|
|||
#include "list.h"
|
||||
#include "buttonbar.h"
|
||||
|
||||
/* hotkey settings */
|
||||
#ifdef HAVE_HOTKEY
|
||||
const struct menu_item_ex *selected_menu_item;
|
||||
bool hotkey_settable_menu = false;
|
||||
#endif
|
||||
|
||||
#define MAX_MENUS 8
|
||||
/* used to allow for dynamic menus */
|
||||
#define MAX_MENU_SUBITEMS 64
|
||||
|
@ -431,22 +425,6 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
|
|||
ret = GO_TO_RECSCREEN;
|
||||
done = true;
|
||||
}
|
||||
#endif
|
||||
#ifdef HAVE_HOTKEY
|
||||
else if (hotkey_settable_menu &&
|
||||
((action == ACTION_WPS_HOTKEY) ||
|
||||
(action == ACTION_TREE_HOTKEY)))
|
||||
{
|
||||
int this = get_menu_selection(gui_synclist_get_sel_pos(&lists),menu);
|
||||
temp = menu->submenus[this];
|
||||
if (temp->flags&MENU_FUNC_HOTKEYABLE)
|
||||
{
|
||||
selected_menu_item = temp;
|
||||
selected = this;
|
||||
ret = MENU_SELECTED_HOTKEY;
|
||||
done = true;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
else if (action == ACTION_TREE_WPS)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue