Attachment #129910 for bug #213458

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 213458
Collapse All | Expand All

Lines 129-134 Link Here

(-)a/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings.xml (+2 lines)
129	<bind actionName="replace" key="D-F"/>	129	<bind actionName="replace" key="D-F"/>
130	<bind actionName="scroll-down" key="D-UP"/>	130	<bind actionName="scroll-down" key="D-UP"/>
131	<bind actionName="scroll-up" key="D-DOWN"/>	131	<bind actionName="scroll-up" key="D-DOWN"/>
		132	<bind actionName="scroll-left" key="D-LEFT"/>
		133	<bind actionName="scroll-right" key="D-RIGHT"/>
132	<bind actionName="select-all" key="D-A"/>	134	<bind actionName="select-all" key="D-A"/>
133	<bind actionName="select-element-next" key="OS-RIGHT"/>	135	<bind actionName="select-element-next" key="OS-RIGHT"/>
134	<bind actionName="select-element-previous" key="OS-LEFT"/>	136	<bind actionName="select-element-previous" key="OS-LEFT"/>

Lines 133-138 Link Here

(-)a/defaults/src/org/netbeans/modules/defaults/Emacs-keybindings.xml (+2 lines)
133	<bind actionName="replace" key="OS-5"/>	133	<bind actionName="replace" key="OS-5"/>
134	<bind actionName="scroll-down" key="C-UP"/>	134	<bind actionName="scroll-down" key="C-UP"/>
135	<bind actionName="scroll-up" key="C-DOWN"/>	135	<bind actionName="scroll-up" key="C-DOWN"/>
		136	<bind actionName="scroll-left" key="C-LEFT"/>
		137	<bind actionName="scroll-right" key="C-RIGHT"/>
136	<bind actionName="select-all" key="C-X$H"/>	138	<bind actionName="select-all" key="C-X$H"/>
137	<bind actionName="select-word" key="CO-W"/>	139	<bind actionName="select-word" key="CO-W"/>
138	<bind actionName="selection-backward" key="S-LEFT"/>	140	<bind actionName="selection-backward" key="S-LEFT"/>

Lines 117-122 Link Here

(-)a/defaults/src/org/netbeans/modules/defaults/Idea-keybindings.xml (+2 lines)
117	<bind actionName="replace" key="C-R"/>	117	<bind actionName="replace" key="C-R"/>
118	<bind actionName="scroll-down" key="C-UP"/>	118	<bind actionName="scroll-down" key="C-UP"/>
119	<bind actionName="scroll-up" key="C-DOWN"/>	119	<bind actionName="scroll-up" key="C-DOWN"/>
		120	<bind actionName="scroll-left" key="C-LEFT"/>
		121	<bind actionName="scroll-right" key="C-RIGHT"/>
120	<bind actionName="select-all" key="C-A"/>	122	<bind actionName="select-all" key="C-A"/>
121	<bind actionName="selection-backward" key="S-LEFT"/>	123	<bind actionName="selection-backward" key="S-LEFT"/>
122	<bind actionName="selection-begin" key="CS-HOME"/>	124	<bind actionName="selection-begin" key="CS-HOME"/>

Lines 131-136 Link Here

(-)a/defaults/src/org/netbeans/modules/defaults/NetBeans55-keybindings.xml (+2 lines)
131	<bind actionName="replace" key="D-H"/>	131	<bind actionName="replace" key="D-H"/>
132	<bind actionName="scroll-down" key="D-UP"/>	132	<bind actionName="scroll-down" key="D-UP"/>
133	<bind actionName="scroll-up" key="D-DOWN"/>	133	<bind actionName="scroll-up" key="D-DOWN"/>
		134	<bind actionName="scroll-left" key="D-LEFT"/>
		135	<bind actionName="scroll-right" key="D-RIGHT"/>
134	<bind actionName="select-all" key="D-A"/>	136	<bind actionName="select-all" key="D-A"/>
135	<bind actionName="select-identifier" key="O-J"/>	137	<bind actionName="select-identifier" key="O-J"/>
136	<bind actionName="selection-backward" key="S-LEFT"/>	138	<bind actionName="selection-backward" key="S-LEFT"/>

Lines 649-654 Link Here

(-)a/editor.lib/apichanges.xml (+2 lines)
649	org.netbeans.editor.ActionFactory$RemoveWordPreviousAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)	649	org.netbeans.editor.ActionFactory$RemoveWordPreviousAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)
650	org.netbeans.editor.ActionFactory$ScrollDownAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)	650	org.netbeans.editor.ActionFactory$ScrollDownAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)
651	org.netbeans.editor.ActionFactory$ScrollUpAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)	651	org.netbeans.editor.ActionFactory$ScrollUpAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)
		652	org.netbeans.editor.ActionFactory$ScrollLeftAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)
		653	org.netbeans.editor.ActionFactory$ScrollRightAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)
652	org.netbeans.editor.ActionFactory$SelectIdentifierAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)	654	org.netbeans.editor.ActionFactory$SelectIdentifierAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)
653	org.netbeans.editor.ActionFactory$SelectNextParameterAction:method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)	655	org.netbeans.editor.ActionFactory$SelectNextParameterAction:method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)
654	org.netbeans.editor.ActionFactory$ShiftLineAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)	656	org.netbeans.editor.ActionFactory$ShiftLineAction: method protected void org.netbeans.editor.BaseAction.settingsChange(org.netbeans.editor.SettingsChangeEvent,java.lang.Class)





    }

    @EditorActionRegistration(name = BaseKit.scrollLeftAction)
    public static class ScrollLeftAction extends LocalBaseAction {

        public ScrollLeftAction() {
        }

        public void actionPerformed(ActionEvent evt, JTextComponent target) {
            if (target != null) {
                EditorUI editorUI = Utilities.getEditorUI(target);
                Rectangle bounds = editorUI.getExtentBounds();
                bounds.x += editorUI.getTextMargin().left - editorUI.getLineHeight(); // use same step size as for vertical scrolling
                editorUI.scrollRectToVisible(bounds, EditorUI.SCROLL_SMALLEST);
            }
        }

    }

    @EditorActionRegistration(name = BaseKit.scrollRightAction)
    public static class ScrollRightAction extends LocalBaseAction {

        public ScrollRightAction() {
        }

        public void actionPerformed(ActionEvent evt, JTextComponent target) {
            if (target != null) {
                EditorUI editorUI = Utilities.getEditorUI(target);
                Rectangle bounds = editorUI.getExtentBounds();
                bounds.x += editorUI.getTextMargin().left + editorUI.getLineHeight(); // use same step size as for vertical scrolling
                editorUI.scrollRectToVisible(bounds, EditorUI.SCROLL_SMALLEST);
            }
        }

    }

    @EditorActionRegistration(name = BaseKit.insertDateTimeAction)
    public static class InsertDateTimeAction extends LocalBaseAction {
        

Lines 304-309 Link Here

(-)a/editor.lib/src/org/netbeans/editor/BaseKit.java (+6 lines)
304	/** Scroll window one line down */	304	/** Scroll window one line down */
305	public static final String scrollDownAction = "scroll-down"; // NOI18N	305	public static final String scrollDownAction = "scroll-down"; // NOI18N
306		306
		307	/** Scroll window one step left */
		308	public static final String scrollLeftAction = "scroll-left"; // NOI18N
		309
		310	/** Scroll window one step right */
		311	public static final String scrollRightAction = "scroll-right"; // NOI18N
		312
307	/** Prefix of all macro-based actions */	313	/** Prefix of all macro-based actions */
308	public static final String macroActionPrefix = "macro-"; // NOI18N	314	public static final String macroActionPrefix = "macro-"; // NOI18N
309		315

Lines 145-150 Link Here

(-)a/editor.lib/src/org/netbeans/editor/Bundle.properties (+2 lines)
145	scroll-down=Scroll Down	145	scroll-down=Scroll Down
146	scroll-top=Scroll to Top	146	scroll-top=Scroll to Top
147	scroll-up=Scroll Up	147	scroll-up=Scroll Up
		148	scroll-left=Scroll Left
		149	scroll-right=Scroll Right
148	select-all=Select All	150	select-all=Select All
149	select-identifier=Select Identifier	151	select-identifier=Select Identifier
150	select-line=Select Line	152	select-line=Select Line

Lines 99-104 Link Here

(-)a/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings-mac.xml (+5 lines)
99	<bind key="D-DOWN" remove="true"/>	99	<bind key="D-DOWN" remove="true"/>
100	<bind actionName="scroll-up" key="C-DOWN"/>	100	<bind actionName="scroll-up" key="C-DOWN"/>
101		101
		102	<bind key="D-LEFT" remove="true"/>
		103	<bind actionName="scroll-left" key="C-LEFT"/>
		104	<bind key="D-RIGHT" remove="true"/>
		105	<bind actionName="scroll-right" key="C-RIGHT"/>
		106
102	<bind key="O-I" actionName="generate-code"/>	107	<bind key="O-I" actionName="generate-code"/>
103		108
104	<!-- Things we add only on the mac -->	109	<!-- Things we add only on the mac -->

Lines 149-154 Link Here

(-)a/editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings.xml (+4 lines)
149	<bind actionName="scroll-down" key="D-KP_UP"/>	149	<bind actionName="scroll-down" key="D-KP_UP"/>
150	<bind actionName="scroll-up" key="D-DOWN"/>	150	<bind actionName="scroll-up" key="D-DOWN"/>
151	<bind actionName="scroll-up" key="D-KP_DOWN"/>	151	<bind actionName="scroll-up" key="D-KP_DOWN"/>
		152	<bind actionName="scroll-left" key="D-LEFT"/>
		153	<bind actionName="scroll-left" key="D-KP_LEFT"/>
		154	<bind actionName="scroll-right" key="D-RIGHT"/>
		155	<bind actionName="scroll-right" key="D-KP_RIGHT"/>
152	<bind actionName="select-all" key="D-A"/>	156	<bind actionName="select-all" key="D-A"/>
153	<bind actionName="select-element-next" key="OS-PERIOD"/>	157	<bind actionName="select-element-next" key="OS-PERIOD"/>
154	<bind actionName="select-element-previous" key="OS-COMMA"/>	158	<bind actionName="select-element-previous" key="OS-COMMA"/>

Return to bug 213458

Lines 2227-2232 Link Here

(-)a/editor.lib/src/org/netbeans/editor/ActionFactory.java (+34 lines)
2227		2227
2228	}	2228	}
2229		2229
		2230	@EditorActionRegistration(name = BaseKit.scrollLeftAction)
		2231	public static class ScrollLeftAction extends LocalBaseAction {
		2232
		2233	public ScrollLeftAction() {
		2234	}
		2235
		2236	public void actionPerformed(ActionEvent evt, JTextComponent target) {
		2237	if (target != null) {
		2238	EditorUI editorUI = Utilities.getEditorUI(target);
		2239	Rectangle bounds = editorUI.getExtentBounds();
		2240	bounds.x += editorUI.getTextMargin().left - editorUI.getLineHeight(); // use same step size as for vertical scrolling
		2241	editorUI.scrollRectToVisible(bounds, EditorUI.SCROLL_SMALLEST);
		2242	}
		2243	}
		2244
		2245	}
		2246
		2247	@EditorActionRegistration(name = BaseKit.scrollRightAction)
		2248	public static class ScrollRightAction extends LocalBaseAction {
		2249
		2250	public ScrollRightAction() {
		2251	}
		2252
		2253	public void actionPerformed(ActionEvent evt, JTextComponent target) {
		2254	if (target != null) {
		2255	EditorUI editorUI = Utilities.getEditorUI(target);
		2256	Rectangle bounds = editorUI.getExtentBounds();
		2257	bounds.x += editorUI.getTextMargin().left + editorUI.getLineHeight(); // use same step size as for vertical scrolling
		2258	editorUI.scrollRectToVisible(bounds, EditorUI.SCROLL_SMALLEST);
		2259	}
		2260	}
		2261
		2262	}
		2263
2230	@EditorActionRegistration(name = BaseKit.insertDateTimeAction)	2264	@EditorActionRegistration(name = BaseKit.insertDateTimeAction)
2231	public static class InsertDateTimeAction extends LocalBaseAction {	2265	public static class InsertDateTimeAction extends LocalBaseAction {
2232		2266