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

(-)ide/applemenu/nbproject/project.xml (-13 lines)
Lines 30-48 Link Here
30
                    </run-dependency>
30
                    </run-dependency>
31
                </dependency>
31
                </dependency>
32
                <dependency>
32
                <dependency>
33
                    <code-name-base>org.netbeans.modules.editor</code-name-base>
34
                    <run-dependency>
35
                        <release-version>3</release-version>
36
                    </run-dependency>
37
                </dependency>
38
                <dependency>
39
                    <code-name-base>org.netbeans.modules.java.editor</code-name-base>
40
                    <run-dependency>
41
                        <release-version>1</release-version>
42
                        <specification-version>1.3</specification-version>
43
                    </run-dependency>
44
                </dependency>
45
                <dependency>
46
                    <code-name-base>org.openide.filesystems</code-name-base>
33
                    <code-name-base>org.openide.filesystems</code-name-base>
47
                    <build-prerequisite/>
34
                    <build-prerequisite/>
48
                    <compile-dependency/>
35
                    <compile-dependency/>
(-)ide/applemenu/src/org/netbeans/modules/applemenu/DefaultGlobalKeyBindings.xml (-156 lines)
Removed Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!--
3
The contents of this file are subject to the terms of the Common Development
4
and Distribution License (the License). You may not use this file except in
5
compliance with the License.
6
7
You can obtain a copy of the License at http://www.netbeans.org/cddl.html
8
or http://www.netbeans.org/cddl.txt.
9
10
When distributing Covered Code, include this CDDL Header Notice in each file
11
and include the License file at http://www.netbeans.org/cddl.txt.
12
If applicable, add the following below the CDDL Header, with the fields
13
enclosed by brackets [] replaced by your own identifying information:
14
"Portions Copyrighted [year] [name of copyright owner]"
15
16
The Original Software is NetBeans. The Initial Developer of the Original
17
Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
18
Microsystems, Inc. All Rights Reserved.
19
-->
20
<!DOCTYPE bindings PUBLIC "-//NetBeans//DTD Editor KeyBindings settings 1.1//EN" "http://www.netbeans.org/dtds/EditorKeyBindings-1_1.dtd">
21
22
<!-- See editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings.xml -
23
     that is the original version -->
24
     
25
<bindings>
26
    <!-- Things we add that replace standard keybindings -->
27
    
28
    <bind actionName="find-next" key="M-G"/> 
29
    <bind actionName="find-previous" key="MS-G"/> 
30
    <bind actionName="find-selection" key="CA-G"/> 
31
    <bind actionName="caret-previous-word" key="A-LEFT"/> 
32
    <bind actionName="caret-next-word" key="A-RIGHT"/> 
33
    <bind actionName="selection-previous-word" key="AS-LEFT"/> 
34
    <bind actionName="selection-next-word" key="AS-RIGHT"/> 
35
    <bind actionName="caret-next-word" key="A-RIGHT"/> 
36
    
37
    
38
    <!-- Things we add only on the mac -->
39
    
40
    <bind actionName="caret-begin" key="M-UP"/> 
41
    <bind actionName="caret-end" key="M-DOWN"/>
42
    <bind actionName="selection-begin-line" key="MS-LEFT"/>
43
    <bind actionName="selection-end-line" key="MS-RIGHT"/>
44
    <bind actionName="caret-end-line" key="M-RIGHT"/>
45
    <bind actionName="caret-begin-line" key="M-LEFT"/>
46
    
47
    <!-- Everything else - verbatim copy with what we override commented out -->
48
    
49
    <bind actionName="find" key="FIND"/>
50
    <bind actionName="copy-to-clipboard" key="COPY"/>
51
    <bind actionName="undo" key="UNDO"/>
52
    <bind actionName="paste-from-clipboard" key="PASTE"/>
53
    <bind actionName="cut-to-clipboard" key="CUT"/>
54
    <bind actionName="adjust-window-center" key="O-U$M"/>
55
    <bind actionName="to-lower-case" key="O-U$L"/>
56
    <bind actionName="caret-backward" key="LEFT"/>
57
    <bind actionName="selection-page-up" key="S-PAGE_UP"/>
58
    <bind actionName="caret-end-word" key="O-U$E"/>
59
<!--    <bind actionName="caret-previous-word" key="S-LEFT"/> -->
60
    <bind actionName="adjust-window-bottom" key="O-U$B"/>
61
    <bind actionName="caret-forward" key="RIGHT"/>
62
    <bind actionName="selection-begin" key="DS-HOME"/>
63
    <bind actionName="undo" key="D-Z"/>
64
    <bind actionName="scroll-down" key="C-UP"/>
65
    <bind actionName="redo" key="D-Y"/>
66
    <bind actionName="cut-to-clipboard" key="D-X"/>
67
<!--    <bind actionName="find-previous" key="S-F3"/> -->
68
    <bind actionName="remove-word" key="D-W"/>
69
    <bind actionName="paste-from-clipboard" key="D-V"/>
70
    <bind actionName="remove-line-begin" key="D-U"/>
71
    <bind actionName="shift-line-right" key="D-T"/>
72
    <bind actionName="page-up" key="PAGE_UP"/>
73
<!--    <bind actionName="caret-next-word" key="D-RIGHT"/> -->
74
    <bind actionName="caret-backward" key="KP_LEFT"/>
75
    <bind actionName="select-next-parameter" key="D-M"/>
76
    <bind actionName="word-match-next" key="D-L"/>
77
    <bind actionName="word-match-prev" key="D-K"/>
78
    <bind actionName="cut-to-clipboard" key="S-DELETE"/>
79
    <bind actionName="selection-down" key="S-DOWN"/>
80
    <bind actionName="remove-line" key="D-E"/>
81
    <bind actionName="shift-line-left" key="D-D"/>
82
    <bind actionName="copy-to-clipboard" key="D-C"/>
83
    <bind actionName="select-all" key="D-A"/>
84
    <bind actionName="jump-list-next" key="O-L"/>
85
    <bind actionName="copy-to-clipboard" key="D-INSERT"/>
86
    <bind actionName="jump-list-prev" key="O-K"/>
87
    <bind actionName="select-identifier" key="O-J"/>
88
    <bind actionName="delete-previous" key="BACK_SPACE"/>
89
    <bind actionName="selection-page-down" key="S-PAGE_DOWN"/>
90
    <bind actionName="selection-end-line" key="S-END"/>
91
    <bind actionName="adjust-caret-top" key="OS-T"/>
92
    <bind actionName="caret-end" key="D-END"/>
93
<!--    <bind actionName="find-next" key="F3"/> -->
94
    <bind actionName="bookmark-next" key="F2"/>
95
    <bind actionName="adjust-caret-center" key="OS-M"/>
96
    <bind actionName="selection-forward" key="S-RIGHT"/>
97
    <bind actionName="jump-list-next-component" key="OS-L"/>
98
    <bind actionName="jump-list-prev-component" key="OS-K"/>
99
    <bind actionName="toggle-highlight-search" key="OS-H"/>
100
    <bind actionName="adjust-caret-bottom" key="OS-B"/>
101
    <bind actionName="abbrev-reset" key="S-SPACE"/>
102
    <bind actionName="selection-backward" key="S-LEFT"/>
103
    <bind actionName="insert-tab" key="TAB"/>
104
    <bind actionName="format" key="DS-F"/>
105
    <bind actionName="delete-next" key="DELETE"/>
106
<!--    <bind actionName="caret-begin-line" key="HOME"/> -->
107
    <bind actionName="selection-up" key="S-UP"/>
108
<!--    <bind actionName="selection-previous-word" key="DS-LEFT"/> -->
109
    <bind actionName="caret-begin" key="D-HOME"/>
110
<!--    <bind actionName="selection-next-word" key="DS-RIGHT"/> -->
111
    <bind actionName="caret-forward" key="KP_RIGHT"/>
112
    <bind actionName="default-typed" key="NULL"/>
113
<!--    <bind actionName="find-selection" key="D-F3"/> -->
114
    <bind actionName="bookmark-toggle" key="D-F2"/>
115
    <bind actionName="paste-from-clipboard" key="S-INSERT"/>
116
    <bind actionName="start-macro-recording" key="D-J$S"/>
117
    <bind actionName="caret-up" key="KP_UP"/>
118
    <bind actionName="caret-down" key="DOWN"/>
119
    <bind actionName="insert-break" key="ENTER"/>
120
    <bind actionName="caret-up" key="UP"/>
121
    <bind actionName="stop-macro-recording" key="D-J$E"/>
122
    <bind actionName="scroll-up" key="C-DOWN"/>
123
<!--    <bind actionName="caret-end-line" key="END"/> -->
124
    <bind actionName="page-down" key="PAGE_DOWN"/>
125
    <bind actionName="delete-previous" key="S-BACK_SPACE"/>
126
    <bind actionName="selection-end" key="DS-END"/>
127
    <bind actionName="toggle-typing-mode" key="INSERT"/>
128
    <bind actionName="caret-down" key="KP_DOWN"/>
129
    <bind actionName="to-upper-case" key="O-U$U"/>
130
    <bind actionName="adjust-window-top" key="O-U$T"/>
131
    <bind actionName="switch-case" key="O-U$R"/>
132
    <bind actionName="selection-begin-line" key="S-HOME"/>
133
    <bind actionName="remove-tab" key="S-TAB"/>
134
    <bind actionName="completion-show" key="C-SPACE"/>
135
    <bind actionName="completion-show" key="D-BACK_SLASH"/>
136
    <bind actionName="escape" key="ESCAPE"/>
137
    <bind actionName="find" key="D-F"/>
138
    <bind actionName="goto" key="C-G"/>
139
    <bind actionName="match-brace" key="D-OPEN_BRACKET"/>
140
    <bind actionName="replace" key="C-H"/>
141
    <bind actionName="selection-match-brace" key="DS-B"/>
142
    <bind actionName="shift-insert-break" key="S-ENTER"/>
143
    <bind actionName="show-popup-menu" key="S-F10"/>
144
    <bind actionName="annotations-cycling" key="DS-C"/>
145
    <bind actionName="collapse-all-folds" key="DS-SUBTRACT"/>
146
    <bind actionName="expand-all-folds" key="DS-ADD"/>
147
    <bind actionName="collapse-fold" key="D-SUBTRACT"/>
148
    <bind actionName="expand-fold" key="D-ADD"/>
149
    <bind actionName="collapse-all-folds" key="DS-MINUS"/>
150
    <bind actionName="expand-all-folds" key="DS-EQUALS"/>
151
    <bind actionName="expand-all-folds" key="DS-PLUS"/>
152
    <bind actionName="collapse-fold" key="D-MINUS"/>
153
    <bind actionName="expand-fold" key="D-EQUALS"/>
154
    <bind actionName="expand-fold" key="D-PLUS"/>    
155
    
156
</bindings>
(-)ide/applemenu/src/org/netbeans/modules/applemenu/DefaultKeyBindings.xml (-43 lines)
Removed Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!--
3
The contents of this file are subject to the terms of the Common Development
4
and Distribution License (the License). You may not use this file except in
5
compliance with the License.
6
7
You can obtain a copy of the License at http://www.netbeans.org/cddl.html
8
or http://www.netbeans.org/cddl.txt.
9
10
When distributing Covered Code, include this CDDL Header Notice in each file
11
and include the License file at http://www.netbeans.org/cddl.txt.
12
If applicable, add the following below the CDDL Header, with the fields
13
enclosed by brackets [] replaced by your own identifying information:
14
"Portions Copyrighted [year] [name of copyright owner]"
15
16
The Original Software is NetBeans. The Initial Developer of the Original
17
Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
18
Microsystems, Inc. All Rights Reserved.
19
-->
20
<!DOCTYPE bindings PUBLIC "-//NetBeans//DTD Editor KeyBindings settings 1.1//EN" "http://www.netbeans.org/dtds/EditorKeyBindings-1_1.dtd">
21
22
  <!-- IMPORTANT:  To handle Apple-specific keybindings, there is another copy of
23
     this file, with minor diffs, in ide/applemenu.  Any changes made here should
24
     be made there too -->                            
25
<bindings>
26
    <bind actionName="goto-source" key="O-O"/>
27
    <bind actionName="fast-import" key="OS-I"/>
28
    <bind actionName="fix-imports" key="OS-F"/>
29
30
    <bind actionName="goto-super-implementation" key="D-B"/>
31
    <bind actionName="goto-declaration" key="OS-G"/>    
32
    <bind actionName="comment" key="DS-T"/>
33
    <bind actionName="goto-help" key="O-F1"/>
34
    <bind actionName="make-is" key="O-U$I"/>
35
    <bind actionName="make-getter" key="O-U$G"/>
36
    <bind actionName="macro-debug-var" key="D-J$D"/>
37
    <bind actionName="uncomment" key="DS-D"/>
38
    <bind actionName="make-setter" key="O-U$S"/>
39
    <bind actionName="select-element-next" key="DO-A"/>
40
    <bind actionName="select-element-previous" key="DOS-A"/>
41
    <bind actionName="in-place-refactoring" key="D-R"/>
42
    <bind actionName="generate-code" key="O-INSERT"/>
43
</bindings>
(-)ide/applemenu/src/org/netbeans/modules/applemenu/layer.xml (-16 lines)
Lines 73-92 Link Here
73
	</file>
73
	</file>
74
        
74
        
75
    </folder>
75
    </folder>
76
77
    <folder name="Editors">
78
        <folder name="text">
79
            <folder name="base">
80
                <folder name="Defaults">
81
                    <file name="keybindings.xml" url="DefaultGlobalKeyBindings.xml"/>
82
                </folder>
83
            </folder>
84
            <folder name="x-java">
85
                <folder name="Defaults">
86
                    <file name="keybindings.xml" url="DefaultKeyBindings.xml"/> 
87
                </folder>
88
            </folder>
89
        </folder>
90
    </folder>
91
    
92
</filesystem>
76
</filesystem>

Return to bug 98432