TTerminalWindow sixel support wip

[fanfix.git] / src / jexer / menu / TMenu.java

diff --git a/src/jexer/menu/TMenu.java b/src/jexer/menu/TMenu.java
index 8a8ec6be752d1443e60969baa5505671a567279f..1d6a6ad34179c7325d7ed4d457e828059de4b09b 100644 (file)
--- a/src/jexer/menu/TMenu.java
+++ b/src/jexer/menu/TMenu.java
@@ -128,8 +128,9 @@ public class TMenu extends TWindow {
     public static final int MID_TABLE_INSERT_BELOW              = 107;
     public static final int MID_TABLE_COLUMN_NARROW             = 110;
     public static final int MID_TABLE_COLUMN_WIDEN              = 111;
-    public static final int MID_TABLE_FILE_SAVE_CSV             = 115;
-    public static final int MID_TABLE_FILE_SAVE_TEXT            = 116;
+    public static final int MID_TABLE_FILE_OPEN_CSV             = 115;
+    public static final int MID_TABLE_FILE_SAVE_CSV             = 116;
+    public static final int MID_TABLE_FILE_SAVE_TEXT            = 117;
 
     // ------------------------------------------------------------------------
     // Variables --------------------------------------------------------------
@@ -270,15 +271,21 @@ public class TMenu extends TWindow {
         /*
         System.err.printf("keypress: %s active child: %s\n", keypress,
             getActiveChild());
-         */
+        */
 
         if (getActiveChild() != this) {
-            if ((getActiveChild() instanceof TSubMenu)
-                || (getActiveChild() instanceof TMenu)
-            ) {
+            if (getActiveChild() instanceof TMenu) {
                 getActiveChild().onKeypress(keypress);
                 return;
             }
+
+            if (getActiveChild() instanceof TSubMenu) {
+                TSubMenu subMenu = (TSubMenu) getActiveChild();
+                if (subMenu.menu.isActive()) {
+                    subMenu.onKeypress(keypress);
+                    return;
+                }
+            }
         }
 
         if (keypress.equals(kbEsc)) {
@@ -310,12 +317,18 @@ public class TMenu extends TWindow {
         if (!keypress.getKey().isFnKey()
             && !keypress.getKey().isAlt()
             && !keypress.getKey().isCtrl()) {
+
+            // System.err.println("Checking children for mnemonic...");
+
             for (TWidget widget: getChildren()) {
                 TMenuItem item = (TMenuItem) widget;
-                if ((item.getMnemonic() != null)
+                if ((item.isEnabled() == true)
+                    && (item.getMnemonic() != null)
                     && (Character.toLowerCase(item.getMnemonic().getShortcut())
                         == Character.toLowerCase(keypress.getKey().getChar()))
                 ) {
+                    // System.err.println("activate: " + item);
+
                     // Send an enter keystroke to it
                     activate(item);
                     item.handleEvent(new TKeypressEvent(kbEnter));
@@ -659,6 +672,12 @@ public class TMenu extends TWindow {
             label = i18n.getString("menuHelpAbout");
             break;
 
+        case MID_TABLE_RENAME_COLUMN:
+            label = i18n.getString("menuTableRenameColumn");
+            break;
+        case MID_TABLE_RENAME_ROW:
+            label = i18n.getString("menuTableRenameRow");
+            break;
         case MID_TABLE_VIEW_ROW_LABELS:
             label = i18n.getString("menuTableViewRowLabels");
             checkable = true;
@@ -742,6 +761,9 @@ public class TMenu extends TWindow {
             label = i18n.getString("menuTableColumnWiden");
             key = kbShiftRight;
             break;
+        case MID_TABLE_FILE_OPEN_CSV:
+            label = i18n.getString("menuTableFileOpenCsv");
+            break;
         case MID_TABLE_FILE_SAVE_CSV:
             label = i18n.getString("menuTableFileSaveCsv");
             break;