Commit f0371be9 authored by alex@thinkpad's avatar alex@thinkpad
Browse files

Menu: use PLAY (in addition to Q) for opening submenus (experiment)

https://www.magiclantern.fm/forum/index.php?topic=4386.msg198669#msg198669

--HG--
branch : lua_fix
parent 7469c341609f
......@@ -5227,6 +5227,7 @@ handle_ml_menu_keys(struct event * event)
//~ menu_hidden_should_display_help = 0;
break;
#if 0
case BGMT_PLAY:
if (menu_help_active) { menu_help_active = 0; /* menu_damage = 1; */ break; }
menu_entry_select( menu, 1 ); // decrement
......@@ -5234,6 +5235,7 @@ handle_ml_menu_keys(struct event * event)
//~ menu_damage = 1;
//~ menu_hidden_should_display_help = 0;
break;
#endif
#ifdef CONFIG_TOUCHSCREEN
case BGMT_TOUCH_1_FINGER:
case BGMT_TOUCH_2_FINGER:
......@@ -5245,6 +5247,7 @@ handle_ml_menu_keys(struct event * event)
/* Q is always defined */
case BGMT_Q:
case MLEV_JOYSTICK_LONG:
case BGMT_PLAY:
if (menu_help_active) { menu_help_active = 0; /* menu_damage = 1; */ break; }
menu_entry_select( menu, 2 ); // Q action select
menu_needs_full_redraw = 1;
......
......@@ -34,25 +34,25 @@ static struct menu_entry help_menus[] = {
{
.select = menu_nav_help_open,
#if defined(CONFIG_500D)
.name = "Press LiveView " SYM_LV,
.name = "Press " SYM_LV " / PLAY",
.choices = CHOICES("Open submenu (Q)"),
#elif defined(CONFIG_50D)
.name = "Press FUNC",
.name = "Press FUNC / PLAY",
.choices = CHOICES("Open submenu (Q)"),
#elif defined(CONFIG_5D2)
.name = "Press Pict.Style",
.name = "Pict.Style / PLAY",
.choices = CHOICES("Open submenu (Q)"),
#elif defined(CONFIG_5DC) || defined(CONFIG_40D)
.name = "Press JUMP",
.name = "Press JUMP / PLAY",
.choices = CHOICES("Open submenu (Q)"),
#elif defined(CONFIG_EOSM)
.name = "1-finger Tap",
.name = "Tap or press PLAY",
.choices = CHOICES("Open submenu (Q)"),
#elif defined(CONFIG_100D)
.name = "Press Av",
.name = "Press Av / PLAY",
.choices = CHOICES("Open submenu (Q)"),
#else
.name = "Press Q",
.name = "Press Q / PLAY",
.choices = CHOICES("Open submenu"),
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment