menu plugin: Add separate return button

While working with submenus, its rather inconvenient to move back to
the parent menu. The first button in the line should always be the most
commonly used one in the given context. And while this is "build" for
the main menu, "return" is most common when in a submenu.

To achieve this behavior, add a dedicated return button to submenus
rather than redefining the exit button. Furthermore, the ESC hotkey
gets context dependent semantic: exit when in the main menu, otherwise
return.

Signed-off-by: Jan Kiszka <[email protected]>

kas/plugins/menu.py

@@ -421,12 +421,14 @@ def show_menu(self, title, top_node, is_submenu=False):
             buttons = [
                 ('Build', 'build', 'B'),
                 ('Save & Exit', 'save', 'S'),
-                (' Exit ', 'exit', 'ESC'),
+                (' Exit ', 'exit', 'E'),
                 (' Help ', 'help', 'h')
             ]
             if is_submenu:
-                buttons[3] = (' Return ', 'return', 'ESC')
+                buttons.insert(0, (' Return ', 'return', 'ESC'))
             buttonbar = ButtonBar(self.screen, buttons)
+            if not is_submenu:
+                buttonbar.hotkeys['ESC'] = 'exit'
             listbox = Listbox(height, scroll=scroll, returnExit=1)
             count = 0
             for string, _ in items: