--- options.editor/src/org/netbeans/modules/options/generaleditor/Bundle.properties
+++ options.editor/src/org/netbeans/modules/options/generaleditor/Bundle.properties
@@ -96,16 +96,16 @@
CTL_Enable_Camel_Case_In_Java=&Enable Camel Case Navigation
AN_Enable_Camel_Case_In_Java=&Enable Camel Case Navigation
AD_Enable_Camel_Case_In_Java=&Enable Camel Case Navigation
-CTL_Camel_Case_Behavior_Example=(Example: Caret stops at S, T, N in "SomeTypeName"
when using next/previous word actions)
-AN_Camel_Case_Behavior_Example=(Example: Caret stops at S, T, N in "SomeTypeName" when using next/previous word actions)
-AD_Camel_Case_Behavior_Example=(Example: Caret stops at S, T, N in "SomeTypeName" when using next/previous word actions)
+CTL_Camel_Case_Behavior_Example=Example: Caret stops at S, T, N in "SomeTypeName" when using next/previous word actions
+AN_Camel_Case_Behavior_Example=Example: Caret stops at S, T, N in "SomeTypeName" when using next/previous word actions
+AD_Camel_Case_Behavior_Example=Example: Caret stops at S, T, N in "SomeTypeName" when using next/previous word actions
CTL_Javadoc_Next_To_CC=Display Documentation Next to Completion
AN_Javadoc_Next_To_CC=Documentation Next To Completion Checkbox
AD_Javadoc_Next_To_CC=Display Documentation Next To Completion
CTL_Search=Search
AN_Search=Search
AD_Search=Search
-CTL_Editor_Search_Type=Editor Search Behavior
+CTL_Editor_Search_Type=Editor &Search Behavior
AN_Editor_Search_Type=Editor Search Behavior
AD_Editor_Search_Type=Editor Search Behavior
EST_closing=Enter to finish search
--- options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form
+++ options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form
@@ -27,23 +27,32 @@
-
+
+
+
+
-
+
+
+
+
+
+
-
-
-
-
+
-
+
+
+
+
+
+
-
@@ -51,26 +60,13 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -79,15 +75,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -105,7 +100,7 @@
-
+
@@ -144,11 +139,14 @@
-
+
+
+
+
--- options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
+++ options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
@@ -136,8 +136,9 @@
cbCamelCaseBehavior.setText("Enable Camel Case Navigation");
- lCamelCaseBehaviorExample.setText("Example: Caret stops at J, T, N in \"JavaTypeName\"
when using next/previous word acctions");
+ lCamelCaseBehaviorExample.setText("Example: Caret stops at J, T, N in \"JavaTypeName\" when using next/previous word actions");
+ lEditorSearchType.setLabelFor(cboEditorSearchType);
lEditorSearchType.setText("Editor Search Type:");
lSearch.setText("Search");
@@ -153,37 +154,34 @@
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jSeparator5))
.addGroup(layout.createSequentialGroup()
+ .addComponent(lBracesMatching)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jSeparator6))
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(lCamelCaseBehavior)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jSeparator3))
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
- .addGap(163, 163, 163)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
- .addGap(175, 175, 175)
- .addComponent(cbBraceTooltip))
- .addComponent(cbCamelCaseBehavior)
- .addGroup(layout.createSequentialGroup()
.addGap(21, 21, 21)
- .addComponent(lCamelCaseBehaviorExample, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
+ .addComponent(lCamelCaseBehaviorExample, javax.swing.GroupLayout.PREFERRED_SIZE, 471, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(cbCamelCaseBehavior))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup()
- .addContainerGap()
- .addComponent(lEditorSearchType)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(lSearchtypeTooltip, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(cboEditorSearchType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
- .addGap(0, 12, Short.MAX_VALUE))
+ .addComponent(cbShowBraceOutline)
.addGroup(layout.createSequentialGroup()
- .addComponent(lBracesMatching)
+ .addComponent(lEditorSearchType)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
- .addComponent(jSeparator6))
- .addGroup(layout.createSequentialGroup()
- .addComponent(lCamelCaseBehavior)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(layout.createSequentialGroup()
- .addComponent(cbShowBraceOutline)
- .addGap(0, 0, Short.MAX_VALUE))
- .addComponent(jSeparator3)))
+ .addComponent(lSearchtypeTooltip, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(cboEditorSearchType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
+ .addComponent(cbBraceTooltip))
+ .addGap(0, 12, Short.MAX_VALUE))))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -191,14 +189,14 @@
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(lBracesMatching)
.addComponent(jSeparator6, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE))
- .addGap(3, 3, 3)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(cbShowBraceOutline)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cbBraceTooltip)
- .addComponent(cbShowBraceOutline))
- .addGap(18, 18, 18)
- .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
- .addComponent(jSeparator3, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addComponent(lCamelCaseBehavior))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(lCamelCaseBehavior, javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(jSeparator3, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cbCamelCaseBehavior)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -213,7 +211,7 @@
.addComponent(cboEditorSearchType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(lSearchtypeTooltip, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
- .addGap(0, 12, Short.MAX_VALUE))
+ .addGap(0, 4, Short.MAX_VALUE))
);
}// //GEN-END:initComponents