fix regression using ctrl-alt-n for new tab (fixes processing#2979)

benfry · benfry · commit 4fa8d55ff222 · 2014-11-24T15:49:30.000-05:00
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
@@ -872,7 +872,8 @@ public void actionPerformed(ActionEvent e) {
     menu.add(item);
 
     // For Arduino and Mac, this should be command-E, but that currently conflicts with Export Applet
-    item = Toolkit.newJMenuItemAlt(Language.text("menu.edit.use_selection_for_find"), 'F');
+    //item = Toolkit.newJMenuItemAlt(Language.text("menu.edit.use_selection_for_find"), 'F');
+    item = Toolkit.newJMenuItem(Language.text("menu.edit.use_selection_for_find"), 'E');
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
           if (find == null) {
@@ -882,19 +883,16 @@ public void actionPerformed(ActionEvent e) {
         }
       });
     menu.add(item);
- // Listener to the Edit menu item
+    
+    // Update copy/cut state on selection/de-selection
     menu.addMenuListener(new MenuListener() {
     
       @Override
-      public void menuCanceled(MenuEvent e) {
-      }
+      public void menuCanceled(MenuEvent e) { }
     
       @Override
-      public void menuDeselected(MenuEvent e) {
-      }
-        /* Updating the copy and cut JMenuItems
-         * as soon as the Edit menu is selected
-        */
+      public void menuDeselected(MenuEvent e) { }
+
       @Override
       public void menuSelected(MenuEvent e) {
         copyAction.updateCopyState();
diff --git a/app/src/processing/app/EditorHeader.java b/app/src/processing/app/EditorHeader.java
@@ -520,7 +520,7 @@ public void actionPerformed(ActionEvent e) {
       }
     };
     mapKey = "editor.header.new_tab";
-    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.SHORTCUT_ALT_KEY_MASK);
+    keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.SHORTCUT_SHIFT_KEY_MASK);
     mInputMap.put(keyStroke, mapKey);
     mActionMap.put(mapKey, action);
     item.addActionListener(action);
diff --git a/app/src/processing/app/Toolkit.java b/app/src/processing/app/Toolkit.java
@@ -76,12 +76,16 @@ public class Toolkit {
   /** Command on Mac OS X, Ctrl on Windows and Linux */
   static final int SHORTCUT_KEY_MASK =
     awtToolkit.getMenuShortcutKeyMask();
+  
   /** Command-W on Mac OS X, Ctrl-W on Windows and Linux */
   public static final KeyStroke WINDOW_CLOSE_KEYSTROKE =
-    KeyStroke.getKeyStroke('W', SHORTCUT_KEY_MASK);
+    KeyStroke.getKeyStroke('W', SHORTCUT_KEY_MASK);  
   /** Command-Option on Mac OS X, Ctrl-Alt on Windows and Linux */
-  static final int SHORTCUT_ALT_KEY_MASK = ActionEvent.ALT_MASK |
-    awtToolkit.getMenuShortcutKeyMask();
+  static final int SHORTCUT_ALT_KEY_MASK = 
+    ActionEvent.ALT_MASK | SHORTCUT_KEY_MASK;
+  /** Command-Shift on Mac OS X, Ctrl-Shift on Windows and Linux */
+  static final int SHORTCUT_SHIFT_KEY_MASK = 
+    ActionEvent.SHIFT_MASK | SHORTCUT_KEY_MASK;
 
 
   /**
@@ -112,7 +116,9 @@ static public JMenuItem newJMenuItemShift(String title, int what) {
 
   /**
    * Same as newJMenuItem(), but adds the ALT (on Linux and Windows)
-   * or OPTION (on Mac OS X) key as a modifier.
+   * or OPTION (on Mac OS X) key as a modifier. This function should almost 
+   * never be used, because it's bad for non-US keyboards that use ALT in 
+   * strange and wondrous ways.
    */
   static public JMenuItem newJMenuItemAlt(String title, int what) {
     JMenuItem menuItem = new JMenuItem(title);
diff --git a/app/src/processing/mode/java/JavaEditor.java b/app/src/processing/mode/java/JavaEditor.java
@@ -55,7 +55,7 @@ public Formatter createFormatter() {
   public JMenu buildFileMenu() {
     //String appTitle = JavaToolbar.getTitle(JavaToolbar.EXPORT, false);
     String appTitle = Language.text("toolbar.export_application");
-    JMenuItem exportApplication = Toolkit.newJMenuItem(appTitle, 'E');
+    JMenuItem exportApplication = Toolkit.newJMenuItemShift(appTitle, 'E');
     exportApplication.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         handleExportApplication();

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ public void actionPerformed(ActionEvent e) {`
`520`	`520`	`}`
`521`	`521`	`};`
`522`	`522`	`mapKey = "editor.header.new_tab";`
`523`		`- keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.SHORTCUT_ALT_KEY_MASK);`
	`523`	`+ keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_N, Toolkit.SHORTCUT_SHIFT_KEY_MASK);`
`524`	`524`	`mInputMap.put(keyStroke, mapKey);`
`525`	`525`	`mActionMap.put(mapKey, action);`
`526`	`526`	`item.addActionListener(action);`