Index: core/src/org/netbeans/core/ShortcutsEditor.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ShortcutsEditor.java,v
--- core/src/org/netbeans/core/ShortcutsEditor.java 29 Jun 2004 10:27:10 -0000 1.35
+++ core/src/org/netbeans/core/ShortcutsEditor.java 31 Jul 2004 21:49:25 -0000
@@ -190,7 +190,7 @@
if (changes == null) {
changes = new ArrayList();
}
- changes.add(new ShortcutsFolder.ChangeRequest(key, action, true));
+ changes.add(new ShortcutsFolder.ChangeRequest(key, action, true, true));
}
/** Adds removing request to the changes. */
Index: core/src/org/netbeans/core/ShortcutsFolder.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ShortcutsFolder.java,v
--- core/src/org/netbeans/core/ShortcutsFolder.java 27 Jul 2004 04:19:45 -0000 1.19
+++ core/src/org/netbeans/core/ShortcutsFolder.java 31 Jul 2004 21:49:25 -0000
@@ -120,6 +120,10 @@
* @return KeyActionPair or null if it cannot be created
*/
protected InstanceCookie acceptDataObject(final DataObject dob) {
+ if (Boolean.TRUE.equals(dob.getPrimaryFile().getAttribute("hidden"))) {
+ return null;
+ }
+
InstanceCookie ic = super.acceptDataObject(dob);
if (ic != null) {
try {
@@ -444,7 +448,14 @@
}
}
} else {
- InstanceDataObject.remove(f, r.instanceName(), r.instanceClass());
+ String instanceName = r.instanceName();
+ if (!InstanceDataObject.remove(f, instanceName, r.instanceClass())) {
+ //We may be deleting an explicitly (user) defined keystroke,
+ //which will have X- prepended to its filename - explicitly
+ //defined keystrokes do not get CTRL- remapped to Command-
+ //on mac os
+ InstanceDataObject.remove(f, "X-" + instanceName, r.instanceClass());
+ }
}
} else { // It is '.shadow' file
FileObject root = f.getPrimaryFile();
@@ -530,6 +541,12 @@
public boolean add;
public ChangeRequest(KeyStroke key, Action action, boolean add) {
super(Utilities.keyToString(key), action);
+ this.add = add;
+ }
+
+ public ChangeRequest(KeyStroke key, Action action, boolean add, boolean explicit) {
+ super (explicit ? "X-" + Utilities.keyToString(key) : Utilities.keyToString(key),
+ action);
this.add = add;
}
}
Index: core/ui/src/org/netbeans/core/ui/resources/layer.xml
===================================================================
RCS file: /cvs/core/ui/src/org/netbeans/core/ui/resources/layer.xml,v
--- core/ui/src/org/netbeans/core/ui/resources/layer.xml 31 Jul 2004 14:26:51 -0000 1.70
+++ core/ui/src/org/netbeans/core/ui/resources/layer.xml 31 Jul 2004 21:49:29 -0000
@@ -270,7 +270,12 @@
-
+
+
Index: core/windows/src/org/netbeans/core/windows/Constants.java
===================================================================
RCS file: /cvs/core/windows/src/org/netbeans/core/windows/Constants.java,v
--- core/windows/src/org/netbeans/core/windows/Constants.java 21 Jul 2004 10:56:47 -0000 1.13
+++ core/windows/src/org/netbeans/core/windows/Constants.java 31 Jul 2004 21:49:30 -0000
@@ -129,5 +129,18 @@
public static final String CUSTOM_STATUS_LINE_PATH = System.getProperty("netbeans.winsys.status_line.path"); // NOI18N
private Constants() {}
+
+ /**
+ * See the layer file - this controls mapping of keys - alt+arrow should
+ * be select-word, etc. on mac-os, and Command(meta) arrow should switch
+ * views.
+ */
+ public static final boolean isMac() {
+ return Utilities.getOperatingSystem() == Utilities.OS_MAC;
+ }
+
+ public static final boolean isNotMac() {
+ return !isMac();
+ }
}
Index: core/windows/src/org/netbeans/core/windows/resources/layer.xml
===================================================================
RCS file: /cvs/core/windows/src/org/netbeans/core/windows/resources/layer.xml,v
--- core/windows/src/org/netbeans/core/windows/resources/layer.xml 27 Jul 2004 15:47:11 -0000 1.32
+++ core/windows/src/org/netbeans/core/windows/resources/layer.xml 31 Jul 2004 21:49:30 -0000
@@ -130,11 +130,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: openide/src/org/openide/util/Utilities.java
===================================================================
RCS file: /cvs/openide/src/org/openide/util/Utilities.java,v
--- openide/src/org/openide/util/Utilities.java 30 Jul 2004 14:33:20 -0000 1.142
+++ openide/src/org/openide/util/Utilities.java 31 Jul 2004 21:49:43 -0000
@@ -1252,7 +1252,22 @@
} else {
// last text must be the key code
Integer i = (Integer)names.get (el);
+ boolean explicit = (needed & EXPLICIT_MASK) != 0;
+ //Strip out the explicit mask - KeyStroke won't know
+ //what to do with it
+ needed = needed & ~EXPLICIT_MASK;
+
if (i != null) {
+ //#26854 - Default accelerator should be Command on mac
+ boolean remapForMac = !explicit &&
+ getOperatingSystem() == OS_MAC &&
+ (needed & KeyEvent.CTRL_MASK) == KeyEvent.CTRL_MASK &&
+ usableKeyOnMac(i.intValue(), needed);
+
+ if (remapForMac) {
+ needed &= ~KeyEvent.CTRL_MASK;
+ needed |= KeyEvent.META_MASK;
+ }
return KeyStroke.getKeyStroke (i.intValue (), needed);
} else {
return null;
@@ -1263,6 +1278,30 @@
return null;
}
}
+
+ private static final boolean usableKeyOnMac (int key, int mask) {
+ //All permutations fail for Q except ctrl
+ if (key == KeyEvent.VK_Q) return false;
+
+ boolean isCtrl = ((mask & KeyEvent.CTRL_MASK) != 0) ||
+ ((mask & KeyEvent.CTRL_DOWN_MASK) != 0);
+
+ boolean isAlt = ((mask & KeyEvent.ALT_MASK) != 0) ||
+ ((mask & KeyEvent.ALT_DOWN_MASK) != 0);
+
+ boolean isOnlyCtrl = isCtrl && (mask & ~(KeyEvent.CTRL_DOWN_MASK | KeyEvent.CTRL_MASK)) == 0;
+
+ //Mac OS consumes keys Command+ these keys - the app will never see
+ //them, so CTRL should not be remapped for these
+ if (isOnlyCtrl) {
+ return key != KeyEvent.VK_H && key !=
+ KeyEvent.VK_SPACE && key != KeyEvent.VK_TAB;
+ } else if (key == KeyEvent.VK_D && isCtrl && isAlt) {
+ return false;
+ } else {
+ return true;
+ }
+ }
/** Convert a space-separated list of user-friendly key binding names to a list of Swing key strokes.
* @param s the string with keys
@@ -1283,6 +1322,7 @@
return (KeyStroke[])arr.toArray (new KeyStroke[arr.size ()]);
}
+ private static final int EXPLICIT_MASK = 32768;
/** Adds characters for modifiers to the buffer.
* @param buf buffer to add to
@@ -1308,6 +1348,10 @@
buf.append("M"); // NOI18N
b = true;
}
+ if ((modif & EXPLICIT_MASK) != 0) {
+ buf.append("X");
+ b = true;
+ }
return b;
}
@@ -1332,6 +1376,9 @@
break;
case 'S':
m |= KeyEvent.SHIFT_MASK;
+ break;
+ case 'X':
+ m |= EXPLICIT_MASK;
break;
default:
throw new NoSuchElementException ();
Index: editor/libsrc/org/netbeans/editor/SettingsDefaults.java
===================================================================
RCS file: /cvs/editor/libsrc/org/netbeans/editor/SettingsDefaults.java,v
--- editor/libsrc/org/netbeans/editor/SettingsDefaults.java 25 May 2004 13:29:08 -0000 1.33
+++ editor/libsrc/org/netbeans/editor/SettingsDefaults.java 31 Jul 2004 21:49:50 -0000
@@ -191,6 +191,22 @@
SettingsNames.STATUS_BAR_BOLD_COLORING
};
+
+ private static final int FIND_NEXT_KEY =
+ System.getProperty("mrj.version") == null ?
+ KeyEvent.VK_F3 : KeyEvent.VK_G;
+
+ private static final int FIND_NEXT_MASK =
+ System.getProperty("mrj.version") == null ?
+ 0 : KeyEvent.META_DOWN_MASK;
+
+ //#26854 - use Command, not Ctrl, on mac
+ private static final int MENU_MASK = java.awt.Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+
+ //Default behavior on mac is that alt+arrows is word jumps
+ private static final int WORD_SELECT_MASK = System.getProperty("mrj.version") == null ?
+ InputEvent.CTRL_DOWN_MASK : InputEvent.ALT_DOWN_MASK;
+
public static final MultiKeyBinding[] defaultKeyBindings
= new MultiKeyBinding[] {
new MultiKeyBinding(
@@ -202,7 +218,7 @@
BaseKit.insertBreakAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, MENU_MASK),
BaseKit.splitLineAction
),
new MultiKeyBinding(
@@ -234,7 +250,7 @@
BaseKit.deletePrevCharAction
),
/* new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_H, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_H, MENU_MASK | InputEvent.SHIFT_MASK),
BaseKit.deletePrevCharAction
),
*/ new MultiKeyBinding(
@@ -254,11 +270,11 @@
BaseKit.selectionForwardAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, WORD_SELECT_MASK),
BaseKit.nextWordAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.SHIFT_MASK | WORD_SELECT_MASK),
BaseKit.selectionNextWordAction
),
new MultiKeyBinding(
@@ -270,15 +286,15 @@
BaseKit.backwardAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, WORD_SELECT_MASK),
BaseKit.selectionBackwardAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, WORD_SELECT_MASK),
BaseKit.previousWordAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.SHIFT_MASK | MENU_MASK),
BaseKit.selectionPreviousWordAction
),
new MultiKeyBinding(
@@ -294,7 +310,7 @@
BaseKit.selectionDownAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, MENU_MASK),
BaseKit.scrollUpAction
),
new MultiKeyBinding(
@@ -310,7 +326,7 @@
BaseKit.selectionUpAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_UP, MENU_MASK),
BaseKit.scrollDownAction
),
new MultiKeyBinding(
@@ -338,11 +354,11 @@
BaseKit.selectionBeginLineAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_HOME, MENU_MASK),
BaseKit.beginAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.SHIFT_MASK | MENU_MASK),
BaseKit.selectionBeginAction
),
new MultiKeyBinding(
@@ -354,21 +370,21 @@
BaseKit.selectionEndLineAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_END, MENU_MASK),
BaseKit.endAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.SHIFT_MASK | MENU_MASK),
BaseKit.selectionEndAction
),
// clipboard bindings
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_C, MENU_MASK),
BaseKit.copyAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, MENU_MASK),
BaseKit.copyAction
),
new MultiKeyBinding(
@@ -380,7 +396,7 @@
BaseKit.cutAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_X, MENU_MASK),
BaseKit.cutAction
),
new MultiKeyBinding(
@@ -388,7 +404,7 @@
BaseKit.cutAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_V, MENU_MASK),
BaseKit.pasteAction
),
new MultiKeyBinding(
@@ -400,13 +416,13 @@
BaseKit.pasteAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_V, MENU_MASK | InputEvent.SHIFT_MASK),
BaseKit.pasteFormatedAction
),
// undo and redo bindings - handled at system level
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_Z, MENU_MASK),
BaseKit.undoAction
),
new MultiKeyBinding(
@@ -414,13 +430,13 @@
BaseKit.undoAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_Y, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_Y, MENU_MASK),
BaseKit.redoAction
),
// other bindings
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_A, MENU_MASK),
BaseKit.selectAllAction
),
new MultiKeyBinding(
@@ -431,15 +447,15 @@
BaseKit.endWordAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_W, MENU_MASK),
BaseKit.removeWordAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_U, MENU_MASK),
BaseKit.removeLineBeginAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_E, MENU_MASK),
BaseKit.removeLineAction
),
new MultiKeyBinding(
@@ -447,7 +463,7 @@
BaseKit.toggleTypingModeAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_F2, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_F2, MENU_MASK),
BaseKit.toggleBookmarkAction
),
new MultiKeyBinding(
@@ -455,15 +471,15 @@
BaseKit.gotoNextBookmarkAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0),
+ KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK),
BaseKit.findNextAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_F3, InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK | InputEvent.SHIFT_MASK),
BaseKit.findPreviousAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_F3, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK | InputEvent.CTRL_MASK),
BaseKit.findSelectionAction
),
new MultiKeyBinding(
@@ -471,19 +487,19 @@
BaseKit.toggleHighlightSearchAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_L, MENU_MASK),
BaseKit.wordMatchNextAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_K, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_K, MENU_MASK),
BaseKit.wordMatchPrevAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_T, MENU_MASK),
BaseKit.shiftLineRightAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_D, MENU_MASK),
BaseKit.shiftLineLeftAction
),
new MultiKeyBinding(
@@ -491,7 +507,7 @@
BaseKit.abbrevResetAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_C, MENU_MASK | InputEvent.SHIFT_MASK),
BaseKit.annotationsCyclingAction
),
@@ -531,7 +547,7 @@
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK ),
+ KeyStroke.getKeyStroke(KeyEvent.VK_F, MENU_MASK | InputEvent.SHIFT_MASK ),
BaseKit.formatAction
),
new MultiKeyBinding(
@@ -577,13 +593,13 @@
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_M, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_M, MENU_MASK),
BaseKit.selectNextParameterAction
),
new MultiKeyBinding(
new KeyStroke[] {
- KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_J, MENU_MASK),
KeyStroke.getKeyStroke(KeyEvent.VK_S, 0),
},
BaseKit.startMacroRecordingAction
@@ -591,59 +607,59 @@
new MultiKeyBinding(
new KeyStroke[] {
- KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_J, MENU_MASK),
KeyStroke.getKeyStroke(KeyEvent.VK_E, 0),
},
BaseKit.stopMacroRecordingAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT, MENU_MASK),
BaseKit.collapseFoldAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_ADD, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_ADD, MENU_MASK),
BaseKit.expandFoldAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT, MENU_MASK | InputEvent.SHIFT_MASK),
BaseKit.collapseAllFoldsAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_ADD, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_ADD, MENU_MASK | InputEvent.SHIFT_MASK),
BaseKit.expandAllFoldsAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, MENU_MASK),
BaseKit.collapseFoldAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, MENU_MASK),
BaseKit.expandFoldAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, MENU_MASK),
BaseKit.expandFoldAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, MENU_MASK | InputEvent.SHIFT_MASK),
BaseKit.collapseAllFoldsAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, MENU_MASK | InputEvent.SHIFT_MASK),
BaseKit.expandAllFoldsAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, MENU_MASK | InputEvent.SHIFT_MASK),
BaseKit.expandAllFoldsAction
),
Index: editor/libsrc/org/netbeans/editor/ext/ExtSettingsDefaults.java
===================================================================
RCS file: /cvs/editor/libsrc/org/netbeans/editor/ext/ExtSettingsDefaults.java,v
--- editor/libsrc/org/netbeans/editor/ext/ExtSettingsDefaults.java 25 May 2004 13:29:09 -0000 1.33
+++ editor/libsrc/org/netbeans/editor/ext/ExtSettingsDefaults.java 31 Jul 2004 21:49:50 -0000
@@ -72,6 +72,7 @@
public static final Integer defaultJavaDocAutoPopupDelay = new Integer(200);
public static final Dimension defaultJavaDocPreferredSize = new Dimension(500, 300);
public static final Boolean defaultJavaDocAutoPopup = Boolean.TRUE;
+ private static int MENU_MASK = java.awt.Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
public static final MultiKeyBinding[] defaultExtKeyBindings
= new MultiKeyBinding[] {
@@ -80,7 +81,7 @@
ExtKit.gotoDeclarationAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_F, MENU_MASK),
ExtKit.findAction
),
new MultiKeyBinding(
@@ -88,7 +89,7 @@
ExtKit.findAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_H, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_H, MENU_MASK),
ExtKit.replaceAction
),
new MultiKeyBinding(
@@ -108,11 +109,11 @@
ExtKit.escapeAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, MENU_MASK),
ExtKit.matchBraceAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, MENU_MASK | InputEvent.SHIFT_MASK),
ExtKit.selectionMatchBraceAction
),
new MultiKeyBinding(
@@ -120,8 +121,8 @@
ExtKit.showPopupMenuAction
),
/* new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK),
- // KeyStroke.getKeyStroke(KeyEvent.VK_BRACELEFT, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_U, MENU_MASK),
+ // KeyStroke.getKeyStroke(KeyEvent.VK_BRACELEFT, MENU_MASK),
ExtKit.braceCodeSelectAction
),
*/
Index: editor/libsrc/org/netbeans/editor/ext/java/JavaSettingsDefaults.java
===================================================================
RCS file: /cvs/editor/libsrc/org/netbeans/editor/ext/java/JavaSettingsDefaults.java,v
--- editor/libsrc/org/netbeans/editor/ext/java/JavaSettingsDefaults.java 2 Jun 2004 11:49:14 -0000 1.24
+++ editor/libsrc/org/netbeans/editor/ext/java/JavaSettingsDefaults.java 31 Jul 2004 21:49:51 -0000
@@ -154,20 +154,22 @@
}
public static MultiKeyBinding[] getJavaKeyBindings() {
+ int MENU_MASK = java.awt.Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+
return new MultiKeyBinding[] {
new MultiKeyBinding(
new KeyStroke[] {
- KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_J, MENU_MASK),
KeyStroke.getKeyStroke(KeyEvent.VK_D, 0)
},
"macro-debug-var"
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_T, MENU_MASK | InputEvent.SHIFT_MASK),
ExtKit.commentAction
),
new MultiKeyBinding(
- KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ KeyStroke.getKeyStroke(KeyEvent.VK_D, MENU_MASK | InputEvent.SHIFT_MASK),
ExtKit.uncommentAction
)
};
Index: editor/src/org/netbeans/modules/editor/java/NbJavaSettingsInitializer.java
===================================================================
RCS file: /cvs/editor/src/org/netbeans/modules/editor/java/NbJavaSettingsInitializer.java,v
--- editor/src/org/netbeans/modules/editor/java/NbJavaSettingsInitializer.java 13 Jul 2004 07:20:09 -0000 1.28
+++ editor/src/org/netbeans/modules/editor/java/NbJavaSettingsInitializer.java 31 Jul 2004 21:49:52 -0000
@@ -13,6 +13,7 @@
package org.netbeans.modules.editor.java;
+import java.awt.Toolkit;
import java.awt.event.KeyEvent;
import java.awt.event.InputEvent;
import java.util.Map;
@@ -98,6 +99,7 @@
}
public MultiKeyBinding[] getJavaKeyBindings() {
+ int mask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
return new MultiKeyBinding[] {
new MultiKeyBinding(
new KeyStroke[] {
@@ -127,7 +129,7 @@
),
new MultiKeyBinding(
KeyStroke.getKeyStroke(KeyEvent.VK_B,
- InputEvent.CTRL_MASK),
+ mask),
JavaKit.gotoSuperImplementationAction
),
new MultiKeyBinding(
@@ -137,25 +139,25 @@
),
// new MultiKeyBinding(
// KeyStroke.getKeyStroke(KeyEvent.VK_S,
-// InputEvent.ALT_MASK | InputEvent.CTRL_MASK),
+// InputEvent.ALT_MASK | mask),
// JavaKit.tryCatchAction
// ),
new MultiKeyBinding(
KeyStroke.getKeyStroke(KeyEvent.VK_SPACE,
- InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+ mask | InputEvent.SHIFT_MASK),
JavaKit.javaDocShowAction
),
new MultiKeyBinding(
KeyStroke.getKeyStroke(KeyEvent.VK_A,
- InputEvent.CTRL_MASK | InputEvent.ALT_MASK),
+ mask | InputEvent.ALT_MASK),
JavaKit.selectNextElementAction
),
new MultiKeyBinding(
KeyStroke.getKeyStroke(KeyEvent.VK_A,
- InputEvent.CTRL_MASK | InputEvent.ALT_MASK | InputEvent.SHIFT_MASK),
+ mask | InputEvent.ALT_MASK | InputEvent.SHIFT_MASK),
JavaKit.selectPreviousElementAction
)