Attachment #16588 for bug #46808

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 46808
Collapse All | Expand All

Lines 270-276 Link Here

(-)core/ui/src/org/netbeans/core/ui/resources/layer.xml (-1 / +6 lines)
270	<attr name="instanceClass" stringvalue="org.openide.actions.CutAction"/>	270	<attr name="instanceClass" stringvalue="org.openide.actions.CutAction"/>
271	</file>	271	</file>
272		272
273	<file name="C-G.instance">	273	<!-- X- comes from issue 26854 - remap CTRL to Command on mac. We actually
		274	don't want to remap this, because on the mac, Command-G is Find Next.
		275	The X- prepended specifies that this is an explicit mapping which
		276	should not be remapped on the mac. See Issue 46808.
		277	-->
		278	<file name="X-C-G.instance">
274	<attr name="instanceClass" stringvalue="org.openide.actions.GotoAction"/>	279	<attr name="instanceClass" stringvalue="org.openide.actions.GotoAction"/>
275	</file>	280	</file>
276		281




          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;
        
        
    public static final MultiKeyBinding[] defaultKeyBindings
    = new MultiKeyBinding[] {
          new MultiKeyBinding(

              BaseKit.gotoNextBookmarkAction
          ),
          new MultiKeyBinding(
              KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK),
              BaseKit.findNextAction
          ),
          new MultiKeyBinding(
              KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK | InputEvent.SHIFT_MASK),
              BaseKit.findPreviousAction
          ),
          new MultiKeyBinding(
              KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK | InputEvent.CTRL_MASK),
              BaseKit.findSelectionAction
          ),
          new MultiKeyBinding(

Return to bug 46808

Lines 191-196 Link Here

(-)editor/libsrc/org/netbeans/editor/SettingsDefaults.java (-3 / +13 lines)
191	SettingsNames.STATUS_BAR_BOLD_COLORING	191	SettingsNames.STATUS_BAR_BOLD_COLORING
192	};	192	};
193		193
		194
		195	private static final int FIND_NEXT_KEY =
		196	System.getProperty("mrj.version") == null ?
		197	KeyEvent.VK_F3 : KeyEvent.VK_G;
		198
		199	private static final int FIND_NEXT_MASK =
		200	System.getProperty("mrj.version") == null ?
		201	0 : KeyEvent.META_DOWN_MASK;
		202
		203
194	public static final MultiKeyBinding[] defaultKeyBindings	204	public static final MultiKeyBinding[] defaultKeyBindings
195	= new MultiKeyBinding[] {	205	= new MultiKeyBinding[] {
196	new MultiKeyBinding(	206	new MultiKeyBinding(
Lines 455-469 Link Here
455	BaseKit.gotoNextBookmarkAction	465	BaseKit.gotoNextBookmarkAction
456	),	466	),
457	new MultiKeyBinding(	467	new MultiKeyBinding(
458	KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0),	468	KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK),
459	BaseKit.findNextAction	469	BaseKit.findNextAction
460	),	470	),
461	new MultiKeyBinding(	471	new MultiKeyBinding(
462	KeyStroke.getKeyStroke(KeyEvent.VK_F3, InputEvent.SHIFT_MASK),	472	KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK \| InputEvent.SHIFT_MASK),
463	BaseKit.findPreviousAction	473	BaseKit.findPreviousAction
464	),	474	),
465	new MultiKeyBinding(	475	new MultiKeyBinding(
466	KeyStroke.getKeyStroke(KeyEvent.VK_F3, InputEvent.CTRL_MASK),	476	KeyStroke.getKeyStroke(FIND_NEXT_KEY, FIND_NEXT_MASK \| InputEvent.CTRL_MASK),
467	BaseKit.findSelectionAction	477	BaseKit.findSelectionAction
468	),	478	),
469	new MultiKeyBinding(	479	new MultiKeyBinding(