diff options
Diffstat (limited to 'platform/lang-impl/src/com/intellij/application/options')
6 files changed, 57 insertions, 33 deletions
diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java index 9f38c6605f11..b07c7a62bc47 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java @@ -23,6 +23,7 @@ import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.registry.Registry; import com.intellij.psi.codeStyle.CodeStyleScheme; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; @@ -55,6 +56,9 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent. public JComponent createComponent() { myModel = ensureModel(); + if (Registry.is("ide.file.settings.order.new")) { + return myPanels == null || myPanels.isEmpty() ? null : myPanels.get(0).createComponent(); + } return myRootSchemesPanel.getPanel(); } @@ -232,6 +236,14 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent. } } + if (Registry.is("ide.file.settings.order.new")) { + int size = myPanels.size(); + Configurable[] result = new Configurable[size > 0 ? size - 1 : 0]; + for (int i = 0; i < result.length; i++) { + result[i] = myPanels.get(i + 1); + } + return result; + } return myPanels.toArray(new Configurable[myPanels.size()]); } @@ -255,7 +267,7 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent. @Override public void currentSettingsChanged() { - + } @Override diff --git a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java index d51ddbd827d5..e3dabad85b21 100644 --- a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java @@ -111,7 +111,7 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel { myLineSeparatorCombo.addItem(MACINTOSH_STRING); addPanelToWatch(myPanel); - myRightMarginSpinner.setModel(new SpinnerNumberModel(settings.RIGHT_MARGIN, 1, 1000000, 1)); + myRightMarginSpinner.setModel(new SpinnerNumberModel(settings.getDefaultRightMargin(), 1, 1000000, 1)); myIndentOptionsEditor = new SmartIndentOptionsEditor(); myDefaultIndentOptionsPanel.add(myIndentOptionsEditor.createPanel(), BorderLayout.CENTER); @@ -165,7 +165,7 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel { public void apply(CodeStyleSettings settings) { settings.LINE_SEPARATOR = getSelectedLineSeparator(); - settings.RIGHT_MARGIN = ((Number) myRightMarginSpinner.getValue()).intValue(); + settings.setDefaultRightMargin(((Number) myRightMarginSpinner.getValue()).intValue()); settings.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = myCbWrapWhenTypingReachesRightMargin.isSelected(); myIndentOptionsEditor.setEnabled(true); myIndentOptionsEditor.apply(settings, settings.OTHER_INDENT_OPTIONS); @@ -226,7 +226,7 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel { return true; } - if (!Comparing.equal(myRightMarginSpinner.getValue(), settings.RIGHT_MARGIN)) return true; + if (!Comparing.equal(myRightMarginSpinner.getValue(), settings.getDefaultRightMargin())) return true; myIndentOptionsEditor.setEnabled(true); if (myEnableFormatterTags.isSelected()) { @@ -265,7 +265,7 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel { myLineSeparatorCombo.setSelectedItem(SYSTEM_DEPENDANT_STRING); } - myRightMarginSpinner.setValue(settings.RIGHT_MARGIN); + myRightMarginSpinner.setValue(settings.getDefaultRightMargin()); myCbWrapWhenTypingReachesRightMargin.setSelected(settings.WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN); myIndentOptionsEditor.reset(settings, settings.OTHER_INDENT_OPTIONS); myIndentOptionsEditor.setEnabled(true); diff --git a/platform/lang-impl/src/com/intellij/application/options/OtherTabsAndIndentsPanel.java b/platform/lang-impl/src/com/intellij/application/options/OtherTabsAndIndentsPanel.java index cf118835aa0e..aadc34a0ac1f 100644 --- a/platform/lang-impl/src/com/intellij/application/options/OtherTabsAndIndentsPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/OtherTabsAndIndentsPanel.java @@ -91,7 +91,7 @@ public class OtherTabsAndIndentsPanel extends CodeStyleAbstractPanel { installPreviewPanel(myPreviewPanel); addPanelToWatch(myPanel); - myRightMargin = settings.RIGHT_MARGIN; + myRightMargin = settings.getDefaultRightMargin(); } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.java index 70c747dc11ca..0759052ee623 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/RightMarginForm.java @@ -48,7 +48,7 @@ public class RightMarginForm { public RightMarginForm(@NotNull Language language, @NotNull CodeStyleSettings settings) { myLanguage = language; - myDefaultRightMargin = settings.RIGHT_MARGIN; + myDefaultRightMargin = settings.getDefaultRightMargin(); myDefaultGeneralCheckBox.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { @@ -71,7 +71,7 @@ public class RightMarginForm { } else { myDefaultGeneralCheckBox.setSelected(true); - myRightMarginField.setText(Integer.toString(settings.RIGHT_MARGIN)); + myRightMarginField.setText(Integer.toString(settings.getDefaultRightMargin())); if (langSettings == settings) { myDefaultGeneralCheckBox.setEnabled(false); myRightMarginField.setEnabled(false); @@ -86,7 +86,7 @@ public class RightMarginForm { langSettings.RIGHT_MARGIN = -1; } else { - langSettings.RIGHT_MARGIN = getFieldRightMargin(settings.RIGHT_MARGIN); + langSettings.RIGHT_MARGIN = getFieldRightMargin(settings.getDefaultRightMargin()); } } } @@ -97,7 +97,7 @@ public class RightMarginForm { return langSettings.RIGHT_MARGIN >= 0; } else { - return langSettings.RIGHT_MARGIN != getFieldRightMargin(settings.RIGHT_MARGIN); + return langSettings.RIGHT_MARGIN != getFieldRightMargin(settings.getDefaultRightMargin()); } } diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java index 5e3017206132..ce2a00d3d671 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java @@ -81,6 +81,8 @@ import java.util.*; import java.util.List; public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract implements EditorOptionsProvider { + public static final String ID = "reference.settingsdialog.IDE.editor.colors"; + private HashMap<String,MyColorScheme> mySchemes; private MyColorScheme mySelectedScheme; public static final String DIFF_GROUP = ApplicationBundle.message("title.diff"); @@ -999,7 +1001,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract @Override @NotNull public String getHelpTopic() { - return "reference.settingsdialog.IDE.editor.colors"; + return ID; } private static class MyColorScheme extends EditorColorsSchemeImpl { diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.form b/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.form index db23ce17b2c3..edb9fcdb9e18 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.form +++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.form @@ -3,12 +3,12 @@ <grid id="27dc6" binding="myRootPanel" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <margin top="0" left="0" bottom="0" right="0"/> <constraints> - <xy x="20" y="20" width="500" height="585"/> + <xy x="20" y="20" width="500" height="614"/> </constraints> <properties/> <border type="none"/> <children> - <grid id="ed507" layout-manager="GridLayoutManager" row-count="7" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> + <grid id="ed507" layout-manager="GridLayoutManager" row-count="8" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <margin top="0" left="0" bottom="0" right="0"/> <constraints> <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="3" indent="0" use-parent-layout="false"/> @@ -101,6 +101,35 @@ <text resource-bundle="messages/ApplicationBundle" key="checkbox.show.tabs.tooltips"/> </properties> </component> + <grid id="e3283" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> + <margin top="0" left="0" bottom="0" right="0"/> + <constraints> + <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> + </constraints> + <properties/> + <border type="none"/> + <children> + <component id="2479d" class="javax.swing.JLabel"> + <constraints> + <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/> + </constraints> + <properties> + <text resource-bundle="messages/ApplicationBundle" key="editbox.tab.title.limit"/> + </properties> + </component> + <component id="3499c" class="javax.swing.JTextField" binding="myTabTitleLimitField"> + <constraints> + <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="0" indent="0" use-parent-layout="false"> + <preferred-size width="30" height="27"/> + </grid> + </constraints> + <properties> + <columns value="2"/> + <text value="30"/> + </properties> + </component> + </children> + </grid> </children> </grid> <vspacer id="651b4"> @@ -119,7 +148,7 @@ </clientProperties> <border type="none" title-resource-bundle="messages/ApplicationBundle" title-key="group.tab.closing.policy"/> <children> - <grid id="5a5a7" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> + <grid id="5a5a7" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1"> <margin top="0" left="0" bottom="0" right="0"/> <constraints> <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/> @@ -147,25 +176,6 @@ <text value="15"/> </properties> </component> - <component id="2479d" class="javax.swing.JLabel"> - <constraints> - <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/> - </constraints> - <properties> - <text resource-bundle="messages/ApplicationBundle" key="editbox.tab.title.limit"/> - </properties> - </component> - <component id="3499c" class="javax.swing.JTextField" binding="myTabTitleLimitField"> - <constraints> - <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="0" indent="0" use-parent-layout="false"> - <preferred-size width="30" height="27"/> - </grid> - </constraints> - <properties> - <columns value="2"/> - <text value="30"/> - </properties> - </component> </children> </grid> <grid id="9b723" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="2"> |