diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java index defcbf8f8401..7407764a4595 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java @@ -20,11 +20,11 @@ import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +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.ui.TextFieldWithBrowseButton; -import com.intellij.openapi.ui.ex.MultiLineLabel; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -55,7 +55,7 @@ import java.util.Map; * @author Eugene Zhuravlev * Date: Oct 5, 2009 */ -public class AnnotationProcessorsConfigurable implements SearchableConfigurable { +public class AnnotationProcessorsConfigurable implements SearchableConfigurable, Configurable.NoScroll { private ProcessedModulesTable myModulesTable; private final Project myProject; private JRadioButton myRbClasspath; @@ -144,28 +144,27 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable processorTablePanel.add(myProcessorPanel, BorderLayout.CENTER); - processorTablePanel.setPreferredSize(new Dimension(processorTablePanel.getPreferredSize().width, 50)); myModulesTable = new ProcessedModulesTable(myProject); myModulesTable.setBorder(IdeBorderFactory.createTitledBorder("Processed Modules", false, false, true)); - final JLabel noteMessage = new MultiLineLabel("Source files generated by annotation processors will be stored under the project output directory.\n" + - "To override this behaviour for certain modules you may specify the directory name in the table below.\n" + - "If specified, the directory will be created under corresponding module's content root."); + final JLabel noteMessage = new JLabel("Source files generated by annotation processors will be stored under the project output directory. " + + "To override this behaviour for certain modules you may specify the directory name in the table below. " + + "If specified, the directory will be created under corresponding module's content root."); - final JLabel warning = new MultiLineLabel("WARNING!\n" + - "All source files located in the generated sources output directory WILL BE EXCLUDED from annotation processing.\n" + - "If option 'Clear output directory on rebuild' is enabled,\n" + - "the entire contents of directories specified in the table below WILL BE CLEARED on rebuild."); + final JLabel warning = new JLabel("WARNING!
" + + "All source files located in the generated sources output directory WILL BE EXCLUDED from annotation processing. " + + "If option 'Clear output directory on rebuild' is enabled, " + + "the entire contents of directories specified in the table below WILL BE CLEARED on rebuild."); warning.setFont(warning.getFont().deriveFont(Font.BOLD)); - mainPanel.add(myCbEnableProcessing, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); - mainPanel.add(myRbClasspath, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(10, 0, 0, 0), 0, 0)); - mainPanel.add(myRbProcessorsPath, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 0, 0), 0, 0)); - mainPanel.add(myProcessorPathField, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 0, 0), 0, 0)); - mainPanel.add(processorTablePanel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(10, 0, 0, 0), 0, 0)); - mainPanel.add(noteMessage, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 5, 0, 0), 0, 0)); - mainPanel.add(warning, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 5, 0, 0), 0, 0)); - mainPanel.add(myModulesTable, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(10, 0, 0, 0), 0, 0)); + mainPanel.add(myCbEnableProcessing, new GridBagConstraints(0, 0, 2, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0)); + mainPanel.add(myRbClasspath, new GridBagConstraints(0, 1, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(10, 0, 0, 0), 0, 0)); + mainPanel.add(myRbProcessorsPath, new GridBagConstraints(0, 2, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(5, 0, 0, 0), 0, 0)); + mainPanel.add(myProcessorPathField, new GridBagConstraints(1, 2, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 0, 0), 0, 0)); + mainPanel.add(processorTablePanel, new GridBagConstraints(0, 3, 2, 1, 1.0, 1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(10, 0, 0, 0), 0, 0)); + mainPanel.add(noteMessage, new GridBagConstraints(0, 4, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 5, 0, 0), 0, 0)); + mainPanel.add(warning, new GridBagConstraints(0, 5, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(10, 5, 0, 0), 0, 0)); + mainPanel.add(myModulesTable, new GridBagConstraints(0, 6, 2, 1, 1.0, 1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(10, 0, 0, 0), 0, 0)); myRbClasspath.addItemListener(new ItemListener() { diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java index a25e7a5d2953..f48a81ed0589 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java @@ -43,7 +43,7 @@ import java.util.List; public class CompilerConfigurable implements SearchableConfigurable.Parent { private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.options.CompilerConfigurable"); - + private final Project myProject; private static final Icon ICON = IconLoader.getIcon("/general/configurableCompiler.png"); private final CompilerUIConfigurable myCompilerUIConfigurable; @@ -111,13 +111,14 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent { CompilerConfigurationImpl compilerConfiguration = (CompilerConfigurationImpl)CompilerConfiguration.getInstance(myProject); final FileChooserDescriptor descriptor = new FileChooserDescriptor(true, true, false, false, false, true); - final ExcludedEntriesConfigurable excludes = new ExcludedEntriesConfigurable(myProject, descriptor, compilerConfiguration.getExcludedEntriesConfiguration()) { - public void apply() { - super.apply(); - FileStatusManager.getInstance(myProject).fileStatusesChanged(); // refresh exclude from compile status - //ProjectView.getInstance(myProject).refresh(); - } - }; + final ExcludedEntriesConfigurable excludes = + new ExcludedEntriesConfigurable(myProject, descriptor, compilerConfiguration.getExcludedEntriesConfiguration()) { + public void apply() { + super.apply(); + FileStatusManager.getInstance(myProject).fileStatusesChanged(); // refresh exclude from compile status + //ProjectView.getInstance(myProject).refresh(); + } + }; kids.add(createExcludesWrapper(excludes)); @@ -145,50 +146,50 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent { additional.add(0, new RmicConfigurable(RmicConfiguration.getSettings(myProject))); additional.add(0, new AnnotationProcessorsConfigurable(myProject)); - additional.add(0, new JavaCompilersTab(myProject, compilerConfiguration.getRegisteredJavaCompilers(), compilerConfiguration.getDefaultCompiler())); + additional.add(0, new JavaCompilersTab(myProject, compilerConfiguration.getRegisteredJavaCompilers(), + compilerConfiguration.getDefaultCompiler())); kids.addAll(additional); myKids = kids.toArray(new Configurable[kids.size()]); } return myKids; - } private static Configurable createExcludesWrapper(final ExcludedEntriesConfigurable excludes) { - return new SearchableConfigurable(){ - @Nls - public String getDisplayName() { - return "Excludes"; - } + return new SearchableConfigurable() { + @Nls + public String getDisplayName() { + return "Excludes"; + } - public Icon getIcon() { - return null; - } + public Icon getIcon() { + return null; + } - public String getHelpTopic() { - return "reference.projectsettings.compiler.excludes"; - } + public String getHelpTopic() { + return "reference.projectsettings.compiler.excludes"; + } - public JComponent createComponent() { - return excludes.createComponent(); - } + public JComponent createComponent() { + return excludes.createComponent(); + } - public void apply() { - excludes.apply(); - } + public void apply() { + excludes.apply(); + } - public boolean isModified() { - return excludes.isModified(); - } + public boolean isModified() { + return excludes.isModified(); + } - public void reset() { - excludes.reset(); - } + public void reset() { + excludes.reset(); + } - public void disposeUIResources() { - excludes.disposeUIResources(); - } + public void disposeUIResources() { + excludes.disposeUIResources(); + } @NotNull public String getId() { diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form index cc9c62b89e0f..5294042ebf11 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form @@ -1,6 +1,6 @@
- + @@ -106,6 +106,11 @@ + + + + + diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java index bc08e2859798..24ed7b49b907 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java @@ -22,6 +22,7 @@ import com.intellij.compiler.MalformedPatternException; import com.intellij.compiler.impl.TranslatingCompilerFilesMonitor; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -32,7 +33,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -public class CompilerUIConfigurable implements SearchableConfigurable { +public class CompilerUIConfigurable implements SearchableConfigurable, Configurable.NoScroll { private JPanel myPanel; private final Project myProject; diff --git a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java index 0614ec5b25b1..c9ddd77afbd3 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java @@ -39,7 +39,7 @@ import java.util.Vector; * @author Eugene Zhuravlev * Date: Mar 30, 2004 */ -public class JavaCompilersTab implements SearchableConfigurable { +public class JavaCompilersTab implements SearchableConfigurable, Configurable.NoScroll { private JPanel myPanel; private JPanel myContentPanel; private JComboBox myCompiler; diff --git a/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java index 55ff69f568d5..c235bcb343f9 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java @@ -17,6 +17,7 @@ package com.intellij.compiler.options; import com.intellij.compiler.impl.rmiCompiler.RmicSettings; import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.ui.RawCommandLineEditor; @@ -30,7 +31,7 @@ import java.awt.event.ItemListener; * @author Eugene Zhuravlev * Date: Mar 30, 2004 */ -public class RmicConfigurable implements SearchableConfigurable { +public class RmicConfigurable implements SearchableConfigurable, Configurable.NoScroll { private JPanel myPanel; private JCheckBox myCbEnabled; private JCheckBox myCbGenerateIiopStubs; diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java index a8141be6e9e7..2e49584a1dfd 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/DebuggerSteppingConfigurable.java @@ -17,6 +17,7 @@ package com.intellij.debugger.settings; import com.intellij.debugger.DebuggerBundle; import com.intellij.debugger.ui.JavaDebuggerSupport; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; import com.intellij.ui.classFilter.ClassFilterEditor; @@ -27,7 +28,7 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -public class DebuggerSteppingConfigurable implements SearchableConfigurable { +public class DebuggerSteppingConfigurable implements SearchableConfigurable, Configurable.NoScroll { private JCheckBox myCbStepInfoFiltersEnabled; private JCheckBox myCbSkipSyntheticMethods; private JCheckBox myCbSkipConstructors; diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java b/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java index 1ef9ce1d580d..3998a5c7a491 100644 --- a/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java +++ b/java/debugger/impl/src/com/intellij/debugger/settings/UserRenderersConfigurable.java @@ -21,6 +21,7 @@ import com.intellij.debugger.ui.tree.render.NodeRenderer; import com.intellij.ide.util.ElementsChooser; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -41,7 +42,7 @@ import java.util.ArrayList; * @author Eugene Zhuravlev * Date: Feb 19, 2005 */ -public class UserRenderersConfigurable implements SearchableConfigurable { +public class UserRenderersConfigurable implements SearchableConfigurable, Configurable.NoScroll { private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.settings.UserRenderersConfigurable"); private static final Icon ADD_ICON = IconLoader.getIcon("/general/add.png"); private static final Icon REMOVE_ICON = IconLoader.getIcon("/general/remove.png"); diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java index c09424d2f1f6..9d3bbd0c49f2 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java @@ -19,6 +19,7 @@ package com.intellij.application.options; import com.intellij.application.options.editor.EditorOptionsProvider; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.options.BaseConfigurable; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; @@ -26,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; -public class CodeCompletionOptions extends BaseConfigurable implements SearchableConfigurable, EditorOptionsProvider { +public class CodeCompletionOptions extends BaseConfigurable implements SearchableConfigurable, EditorOptionsProvider, Configurable.NoScroll { private CodeCompletionPanel myPanel; public boolean isModified() { diff --git a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.form b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.form index 016984141d7b..76abc2f76c32 100644 --- a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.form +++ b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.form @@ -65,6 +65,9 @@ + + + diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java index 987b9f3ed598..b371e512db51 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleBlankLinesPanel.java @@ -85,8 +85,7 @@ public class CodeStyleBlankLinesPanel extends MultilanguageCodeStyleAbstractPane JScrollPane scroll = ScrollPaneFactory.createScrollPane(optionsPanel); scroll.setBorder(null); - scroll.setMinimumSize(new Dimension(optionsPanel.getPreferredSize().width + scroll.getVerticalScrollBar().getPreferredSize().width + 5, - optionsPanel.getPreferredSize().height)); + scroll.setMinimumSize(new Dimension(optionsPanel.getPreferredSize().width + scroll.getVerticalScrollBar().getPreferredSize().width + 5, -1)); scroll.setPreferredSize(scroll.getMinimumSize()); myPanel diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.form b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.form index e4275fd9a8eb..d1f280abb23a 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.form +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSchemesPanel.form @@ -3,7 +3,7 @@ - + @@ -11,7 +11,8 @@ - + + @@ -19,8 +20,8 @@ - - + + @@ -28,7 +29,7 @@ - + @@ -92,7 +93,7 @@ - + @@ -128,7 +129,7 @@ - + @@ -145,7 +146,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java index 49bb84e74286..c5b1034f706d 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/editor/AutoImportOptionsConfigurable.java @@ -52,12 +52,16 @@ public class AutoImportOptionsConfigurable extends CompositeConfigurable
- + - + @@ -13,7 +13,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -95,6 +95,11 @@ + + + + +
diff --git a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java index 0f42d68e0703..3f8e26441e84 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java +++ b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java @@ -20,6 +20,7 @@ import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.application.ApplicationNamesInfo; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.OptionalConfigurable; import com.intellij.openapi.options.SearchableConfigurable; @@ -42,7 +43,7 @@ import java.awt.*; import java.nio.charset.Charset; import java.util.Map; -public class FileEncodingConfigurable implements SearchableConfigurable, OptionalConfigurable { +public class FileEncodingConfigurable implements SearchableConfigurable, OptionalConfigurable, Configurable.NoScroll { private static final String SYSTEM_DEFAULT = IdeBundle.message("encoding.name.system.default"); private final Project myProject; private FileTreeTable myTreeView; diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.form b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.form index 892582214232..365527c4f34a 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.form +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.form @@ -3,98 +3,108 @@ - + - + - - + - + + + + - - - - - - - + - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - + diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java index 07870ea33199..4f336fc92a80 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java @@ -38,6 +38,7 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.options.BaseConfigurable; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.ui.DialogWrapper; @@ -50,6 +51,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.profile.Profile; import com.intellij.profile.codeInspection.InspectionProfileManager; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; +import com.intellij.ui.components.JBScrollPane; import com.intellij.util.Alarm; import com.intellij.util.SystemProperties; import com.intellij.util.containers.HashMap; @@ -66,7 +68,8 @@ import java.io.File; import java.io.IOException; import java.util.*; -public abstract class InspectionToolsConfigurable extends BaseConfigurable implements ErrorsConfigurable, SearchableConfigurable { +public abstract class InspectionToolsConfigurable extends BaseConfigurable implements ErrorsConfigurable, SearchableConfigurable, + Configurable.NoScroll { private final CardLayout myLayout = new CardLayout(); private JPanel myPanel; @@ -83,6 +86,7 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple private JButton myExportButton; private JCheckBox myShareProfileCheckBox; private JButton myCopyButton; + private JBScrollPane myJBScrollPane; private final ArrayList myDeletedProfiles = new ArrayList(); protected final InspectionProfileManager myProfileManager; @@ -225,6 +229,8 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple myProjectProfileManager = projectProfileManager; myProfileManager = profileManager; + + myJBScrollPane.setBorder(null); } private void addProfile(InspectionProfileImpl model) { diff --git a/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java b/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java index fdc19212ac8e..a1e6e62042e9 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java @@ -16,6 +16,7 @@ package com.intellij.tools; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.util.IconLoader; @@ -25,7 +26,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.io.IOException; -public class ToolConfigurable implements SearchableConfigurable { +public class ToolConfigurable implements SearchableConfigurable, Configurable.NoScroll { private static final Icon ourIcon = IconLoader.getIcon("/general/externalTools.png"); private ToolsPanel myPanel; diff --git a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java index 078502f0df8e..2bc95674938a 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java @@ -131,28 +131,9 @@ public class ToolEditorDialog extends DialogWrapper { panel.add(myDescriptionField, constr); // check boxes - JPanel panel0 = new JPanel(new GridBagLayout()); - constr = new GridBagConstraints(); - constr.gridheight = 2; - panel0.add(getShowInPanel(), constr); - constr = new GridBagConstraints(); - constr.gridx = 1; - constr.weightx = 1.0; - constr.anchor = GridBagConstraints.NORTHEAST; - constr.fill = GridBagConstraints.HORIZONTAL; - constr.insets = new Insets(5, 10, 0, 0); - panel0.add(myUseConsoleCheckbox, constr); - constr = new GridBagConstraints(); - constr.gridx = 1; - constr.gridy = 1; - constr.weightx = 1.0; - constr.anchor = GridBagConstraints.NORTHEAST; - constr.fill = GridBagConstraints.HORIZONTAL; - constr.insets = new Insets(0, 10, 0, 0); - panel0.add(mySynchronizedAfterRunCheckbox, constr); - - // Placed temporarily here, might be moved elsewhere in the future. - panel0.add(myOutputFiltersButton); + JPanel panel0 = new JPanel(new BorderLayout()); + panel0.add(getOptionsPanel(), BorderLayout.NORTH); + panel0.add(getShowInPanel(), BorderLayout.SOUTH); constr = new GridBagConstraints(); constr.gridy = 4; @@ -162,14 +143,6 @@ public class ToolEditorDialog extends DialogWrapper { constr.insets = new Insets(5, 0, 0, 0); panel.add(panel0, constr); - constr = new GridBagConstraints(); - constr.gridx = 0; - constr.gridy = 6; - constr.gridwidth = 2; - constr.anchor = GridBagConstraints.WEST; - constr.insets = new Insets(10, 0, 0, 0); - panel.add(Box.createVerticalStrut(10), constr); - // custom panels (put into same place) constr = new GridBagConstraints(); constr.gridx = 0; @@ -461,7 +434,7 @@ public class ToolEditorDialog extends DialogWrapper { } private JPanel getShowInPanel() { - JPanel panel = new JPanel(new GridLayout(2, 2, 10, 3)); + JPanel panel = new JPanel(new GridLayout(1, 4, 10, 0)); panel.setBorder(IdeBorderFactory.createTitledBorder(ToolsBundle.message("tools.menu.group"), false, true, true)); panel.add(myShowInMainMenuCheckbox); panel.add(myShowInEditorCheckbox); @@ -470,6 +443,14 @@ public class ToolEditorDialog extends DialogWrapper { return panel; } + private JPanel getOptionsPanel() { + JPanel panel = new JPanel(new FlowLayout(FlowLayout.LEFT)); + panel.add(mySynchronizedAfterRunCheckbox); + panel.add(myUseConsoleCheckbox); + panel.add(myOutputFiltersButton); + return panel; + } + private String convertString(String s) { if (s != null && s.trim().length() == 0) return null; return s; diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java index 9e36417b2682..eaba927ca82a 100644 --- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurable.java @@ -31,7 +31,7 @@ import javax.swing.*; /** * @author spleaner */ -public class FileColorsConfigurable implements SearchableConfigurable { +public class FileColorsConfigurable implements SearchableConfigurable, Configurable.NoScroll { private final Project myProject; private FileColorsConfigurablePanel myPanel; diff --git a/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.form b/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.form index 1bc76a7ee5a0..557f48555408 100644 --- a/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.form +++ b/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.form @@ -10,7 +10,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java b/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java index dee54edcd5b8..2d6299709cb8 100644 --- a/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java +++ b/platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.java @@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.ComboBoxAction; import com.intellij.openapi.actionSystem.impl.SimpleDataContext; import com.intellij.openapi.fileTypes.FileType; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -43,7 +44,7 @@ import java.util.List; /** * @author peter */ -public abstract class LanguagePerFileConfigurable implements SearchableConfigurable { +public abstract class LanguagePerFileConfigurable implements SearchableConfigurable, Configurable.NoScroll { protected final Project myProject; private final Class myValueClass; private final PerFileMappings myMappings; diff --git a/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsPanel.java b/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsPanel.java index 74376bc0cfaf..43fb90248fff 100644 --- a/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsPanel.java +++ b/platform/platform-api/src/com/intellij/util/net/HTTPProxySettingsPanel.java @@ -15,6 +15,7 @@ */ package com.intellij.util.net; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.util.Comparing; import org.jetbrains.annotations.Nls; @@ -33,7 +34,7 @@ import java.awt.event.ActionListener; * Time: 3:52:47 PM * To change this template use Options | File Templates. */ -public class HTTPProxySettingsPanel implements SearchableConfigurable { +public class HTTPProxySettingsPanel implements SearchableConfigurable, Configurable.NoScroll { private JPanel myMainPanel; private JTextField myProxyLoginTextField; diff --git a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java index f4fa0bd7d49d..f3346ab507a0 100644 --- a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java +++ b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java @@ -16,6 +16,7 @@ package com.intellij.application.options.pathMacros; import com.intellij.openapi.application.ApplicationBundle; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -31,7 +32,7 @@ import javax.swing.*; /** * @author dsl */ -public class PathMacroConfigurable implements SearchableConfigurable { +public class PathMacroConfigurable implements SearchableConfigurable, Configurable.NoScroll { public static final Icon ICON = IconLoader.getIcon("/general/pathVariables.png"); @NonNls public static final String HELP_ID = "preferences.pathVariables"; diff --git a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java index c9e0254b23ee..3fc1d36b617c 100644 --- a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java @@ -36,7 +36,7 @@ import java.util.List; *

* A new instance of the specified class will be created each time then the Settings dialog is opened */ -public class GeneralSettingsConfigurable extends CompositeConfigurable implements SearchableConfigurable { +public class GeneralSettingsConfigurable extends CompositeConfigurable implements SearchableConfigurable, Configurable.NoScroll { private static ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.generalOptionsProvider"); private MyComponent myComponent; diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeConfigurable.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeConfigurable.java index 245f3e51afaa..37933b96ffdd 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeConfigurable.java @@ -1,6 +1,7 @@ package com.intellij.ide.passwordSafe.config; import com.intellij.ide.passwordSafe.PasswordSafe; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import org.jetbrains.annotations.Nls; @@ -11,7 +12,7 @@ import javax.swing.*; /** * A configurable for password safe */ -public class PasswordSafeConfigurable implements SearchableConfigurable { +public class PasswordSafeConfigurable implements SearchableConfigurable, Configurable.NoScroll { /** * The settings for the password safe */ diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeOptionsPanel.form b/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeOptionsPanel.form index 0302528af002..3bd6a7fce49a 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeOptionsPanel.form +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeOptionsPanel.form @@ -1,17 +1,55 @@

- + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -19,74 +57,41 @@ - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java index a2216760ed6b..6a8603b1876b 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java @@ -20,6 +20,7 @@ import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.application.ex.ApplicationEx; import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.options.BaseConfigurable; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.ui.Messages; @@ -41,7 +42,7 @@ import java.util.List; * Time: 9:30:44 PM * To change this template use Options | File Templates. */ -public class PluginManagerConfigurable extends BaseConfigurable implements SearchableConfigurable { +public class PluginManagerConfigurable extends BaseConfigurable implements SearchableConfigurable, Configurable.NoScroll { @NonNls private static final String POSTPONE = "&Postpone"; public boolean EXPANDED = false; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java index f323c29639a4..03225650157a 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java @@ -17,6 +17,7 @@ package com.intellij.ide.ui.customization; import com.intellij.ide.IdeBundle; import com.intellij.openapi.options.BaseConfigurable; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.util.IconLoader; @@ -29,7 +30,7 @@ import javax.swing.*; * User: anna * Date: Mar 17, 2005 */ -public class CustomizationConfigurable extends BaseConfigurable implements SearchableConfigurable{ +public class CustomizationConfigurable extends BaseConfigurable implements SearchableConfigurable, Configurable.NoScroll { private CustomizableActionsPanel myPanel; public JComponent createComponent() { diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form index 11d077c0dad6..db08ea54b131 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form +++ b/platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurationComponent.form @@ -1,23 +1,19 @@ - + - + - + - + - - - - - - + + @@ -25,78 +21,91 @@ - - - - - - - - - - - - - - - + - + - + - - - - - - - - - + - + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + + + + + - + - - - - - - - - - - - + diff --git a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfigurable.java b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfigurable.java index 2bac1deb1ce5..3c0322794da6 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsConfigurable.java @@ -29,7 +29,7 @@ import javax.swing.*; /** * @author spleaner */ -public class NotificationsConfigurable implements Configurable, SearchableConfigurable, OptionalConfigurable { +public class NotificationsConfigurable implements Configurable, SearchableConfigurable, OptionalConfigurable, Configurable.NoScroll { public static final String DISPLAY_NAME = "Notifications"; private NotificationsConfigurablePanel myComponent; diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java index ebf51bcdcae4..7e673a38f626 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java @@ -17,6 +17,7 @@ package com.intellij.openapi.diff.impl.external; import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.ui.TextComponentAccessor; import com.intellij.openapi.ui.TextFieldWithBrowseButton; @@ -31,7 +32,7 @@ import javax.swing.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -public class DiffOptionsForm implements SearchableConfigurable { +public class DiffOptionsForm implements SearchableConfigurable, Configurable.NoScroll { private JComponent myPanel; // Garbage private JCheckBox myEnableFolders; diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java index c8a600cbb655..a53ec8bed25b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java @@ -32,6 +32,7 @@ import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.keymap.ex.KeymapManagerEx; import com.intellij.openapi.keymap.impl.KeymapImpl; import com.intellij.openapi.keymap.impl.KeymapManagerImpl; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SchemesManager; import com.intellij.openapi.options.SearchableConfigurable; @@ -63,7 +64,7 @@ import java.beans.PropertyChangeListener; import java.util.*; import java.util.List; -public class KeymapPanel extends JPanel implements SearchableConfigurable { +public class KeymapPanel extends JPanel implements SearchableConfigurable, Configurable.NoScroll { private JComboBox myKeymapList; private final DefaultComboBoxModel myKeymapListModel = new DefaultComboBoxModel(); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.form b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.form index 9ecdd6dfd7f2..758323b6d653 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.form +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.form @@ -1,7 +1,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java index f5c593f8ed09..57965494f569 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListsPanel.java @@ -26,10 +26,12 @@ import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.ex.QuickList; import com.intellij.openapi.actionSystem.ex.QuickListsManager; import com.intellij.openapi.keymap.KeyMapBundle; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SchemesManager; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DetailsComponent; +import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Factory; import com.intellij.ui.*; @@ -53,7 +55,7 @@ import java.util.List; * User: anna * Date: 13-Apr-2006 */ -public class QuickListsPanel extends JPanel implements SearchableConfigurable { +public class QuickListsPanel extends JPanel implements SearchableConfigurable, Configurable.NoScroll { private final DefaultListModel myQuickListsModel = new DefaultListModel(); private JBList myQuickListsList = new JBList(myQuickListsModel); private final JPanel myRightPanel = new JPanel(new BorderLayout()); @@ -69,8 +71,10 @@ public class QuickListsPanel extends JPanel implements SearchableConfigurable { public QuickListsPanel(KeymapPanel panel) { super(new BorderLayout()); myKeymapPanel = panel; - add(createQuickListsPanel(), BorderLayout.WEST); - add(myRightPanel, BorderLayout.CENTER); + Splitter splitter = new Splitter(); + splitter.setFirstComponent(createQuickListsPanel()); + splitter.setSecondComponent(myRightPanel); + add(splitter, BorderLayout.CENTER); } public void initUi() { diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java index 8a68b66d82b6..cff762ce268a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsEditor.java @@ -206,8 +206,8 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat */ myLeftSide.add(mySearchWrapper, BorderLayout.NORTH); - myLeftSide.add(myTree, BorderLayout.CENTER); + myLeftSide.setMinimumSize(new Dimension(150, -1)); setLayout(new BorderLayout()); @@ -218,8 +218,8 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat myMainSplitter.setSecondComponent(myLoadingDecorator.getComponent()); - myMainSplitter.setProportion(readPropertion(0.3f, MAIN_SPLITTER_PROPORTION)); - myContentWrapper.mySplitter.setProportion(readPropertion(0.2f, DETAILS_SPLITTER_PROPORTION)); + myMainSplitter.setProportion(readProportion(0.3f, MAIN_SPLITTER_PROPORTION)); + myContentWrapper.mySplitter.setProportion(readProportion(0.2f, DETAILS_SPLITTER_PROPORTION)); add(myMainSplitter, BorderLayout.CENTER); @@ -292,7 +292,7 @@ public class OptionsEditor extends JPanel implements DataProvider, Place.Navigat return myTree.select(configurable); } - private float readPropertion(final float defaultValue, final String propertyName) { + private float readProportion(final float defaultValue, final String propertyName) { float proportion = defaultValue; try { final String p = myProperties.getValue(propertyName); diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java index 7678ebe44c28..34c8f76d896f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java @@ -20,6 +20,7 @@ import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationInfo; import com.intellij.openapi.options.BaseConfigurable; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form index be7a651c6b6e..4aea541a022d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesSettingsPanel.form @@ -25,7 +25,7 @@ - + @@ -89,7 +89,7 @@ - + diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index cc048f6a38f5..6783626334cd 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -1037,13 +1037,7 @@ finished.with.exit.code.text.message=Process finished with exit code {0} # Encodings file.encodings.configurable=File Encodings file.encodings.not.configured=Encodings are not configured -encodings.dialog.caption=\ - To change encoding $productName uses for a file, directory, or an entire project,
\ - click an item and then select encoding from the Default Encoding list.
\ - Notes:
\ - Built-in file encoding (e.g. JSP, HTML or XML) overrides encoding you specify here.
\ - If not specified, files and directories inherit encoding settings from parent.
\ - +encodings.dialog.caption=To change encoding $productName uses for a file, directory, or an entire project, click an item and then select encoding from the Default Encoding list.
Notes\:
Built-in file encoding (e.g. JSP, HTML or XML) overrides encoding you specify here. If not specified, files and directories inherit encoding settings from parent. encoding.name.system.default= quick.lists.presentable.name=Quick lists @@ -1079,7 +1073,7 @@ scripting.lib.docUrl.specify=&Specify... scripting.lib.docUrl.remove=&Remove scripting.lib.docUrl.title=Documentation URLs scripting.lib.usageScope=Usage Scope -scripting.lib.usageScope.caption=Specify which libraries are used in specific files and/or directories +scripting.lib.usageScope.caption=Specify which libraries are used in specific files and/or directories scripting.lib.usageScope.tableTitle=Library scripting.lib.usageScope.override.question=Override library settings for child directories and files? scripting.lib.usageScope.override.title=Override Library Settings diff --git a/platform/platform-resources-en/src/messages/KeyMapBundle.properties b/platform/platform-resources-en/src/messages/KeyMapBundle.properties index 66e81601d021..6adb0b11b22c 100644 --- a/platform/platform-resources-en/src/messages/KeyMapBundle.properties +++ b/platform/platform-resources-en/src/messages/KeyMapBundle.properties @@ -83,8 +83,8 @@ keymap.noname.presentable.name= quick.list.panel.move.down.button=Move &Down quick.list.panel.move.up.button=Move &Up quick.list.panel.add.separator.button=Add Separator -quick.list.panel.description.label=Description -quick.list.panel.display.name.label=Display name +quick.list.panel.description.label=Description: +quick.list.panel.display.name.label=Display name: no.actions=No actions #0 - modifiers (with + for windows or empty str), 1 - button num (1 - left, 2 - center, 3 - right 0 - no button) diff --git a/platform/platform-resources-en/src/messages/LangBundle.properties b/platform/platform-resources-en/src/messages/LangBundle.properties index 5ba8e2d85fa9..e65e01f21caa 100644 --- a/platform/platform-resources-en/src/messages/LangBundle.properties +++ b/platform/platform-resources-en/src/messages/LangBundle.properties @@ -42,11 +42,10 @@ xml.terms.variable=variable error.cannot.resolve=Cannot resolve dialog.template.data.language.caption=\ Template data languages are the underlying languages in template files like those of FreeMarker/Velocity frameworks.
\ - To change template data language settings {0} uses for a file, directory, or an entire project,
\ - click an item and then select a language from the Template Data Language list.

\ + To change template data language settings {0} uses for a file, directory, or an entire project, \ + click an item and then select a language from the Template Data Language list.

\ Note:
\ - If not specified, files and directories inherit Template Data Language settings from parent.\ - + If not specified, files and directories inherit Template Data Language settings from parent.
template.data.language.configurable=Template Data Languages template.data.language.configurable.tree.table.title=Template data language template.data.language.override.warning.text=There are template data languages specified for the subdirectories. Override them? diff --git a/platform/platform-resources-en/src/messages/VcsBundle.properties b/platform/platform-resources-en/src/messages/VcsBundle.properties index 3cf9fb572fab..026cdcc8ae9d 100644 --- a/platform/platform-resources-en/src/messages/VcsBundle.properties +++ b/platform/platform-resources-en/src/messages/VcsBundle.properties @@ -118,12 +118,12 @@ border.display.dialog.when.commands.invoked=Display options dialog when these co border.display.dialog.for.files.creation.deletion=Files Creation/Deletion checkbox.show.clear.read.only.status.dialog=Show "&Clear Read-only Status" Dialog radio.after.deletion.do.not.remove=Do ¬ remove -radio.after.deletion.show.options=Show &options before removing from version control +radio.after.deletion.show.options=Show &options before removing
from version control radio.after.deletion.remove.silently=Re&move silently label.after.deletion.group=When files are deleted with IDEA: radio.after.creation.do.not.add=&Do not add radio.after.creation.add.silently=&Add silently -radio.after.creation.show.options=&Show options before adding to version control +radio.after.creation.show.options=Show options before adding
to version control label.after.creation.=When files are created with IDEA: checkbox.force.non.empty.messages=Force non-&empty checkin comments tooltip.text.action.applicable.to.vcses=Applicable to: {0} diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java index 23ad4c732b2d..9c49f5aa5e85 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictConfigurable.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.vcs.changes.conflicts; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.options.binding.BindControl; @@ -36,7 +37,7 @@ import java.util.Collection; /** * @author Dmitry Avdeev */ -public class ChangelistConflictConfigurable extends BindableConfigurable implements SearchableConfigurable { +public class ChangelistConflictConfigurable extends BindableConfigurable implements SearchableConfigurable, Configurable.NoScroll { private JPanel myPanel; private JPanel myOptionsPanel; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.java index c42d53bfee7f..370a0d1b8483 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/IgnoredSettingsPanel.java @@ -22,6 +22,7 @@ */ package com.intellij.openapi.vcs.changes.ui; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; @@ -40,7 +41,7 @@ import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -public class IgnoredSettingsPanel implements SearchableConfigurable { +public class IgnoredSettingsPanel implements SearchableConfigurable, Configurable.NoScroll { private JBList myList; private JButton myAddButton; private JButton myEditButton; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.form index d6f33769bc98..534b9ca7bb8b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.form +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.form @@ -8,7 +8,7 @@ - + @@ -58,24 +58,6 @@ - - - - - - - - - - - - - - - - - - @@ -84,6 +66,14 @@ + + + + + + + +

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java index ed946423548a..2551f8405143 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueNavigationConfigurationPanel.java @@ -16,6 +16,7 @@ package com.intellij.openapi.vcs.configurable; import com.intellij.openapi.application.ApplicationNamesInfo; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; @@ -40,7 +41,7 @@ import java.util.List; /** * @author yole */ -public class IssueNavigationConfigurationPanel extends JPanel implements SearchableConfigurable { +public class IssueNavigationConfigurationPanel extends JPanel implements SearchableConfigurable, Configurable.NoScroll { private JPanel myPanel; private JBTable myLinkTable; private JButton myAddButton; @@ -69,7 +70,7 @@ public class IssueNavigationConfigurationPanel extends JPanel implements Searcha myProject = project; add(myPanel, BorderLayout.CENTER); myDescriptionLabel.setText("" + ApplicationNamesInfo.getInstance().getFullProductName() + " will search for the specified patterns in " + - "checkin comments
and link them to issues in your issue tracker:"); + "checkin comments and link them to issues in your issue tracker:"); reset(); myAddButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java index 06a54b0aa32e..4463eef17b8e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsContentAnnotationConfigurable.java @@ -58,7 +58,7 @@ public class VcsContentAnnotationConfigurable implements Configurable { @Override public JComponent createComponent() { - JPanel wrapper = new JPanel(new FlowLayout(FlowLayout.LEFT)); + JPanel wrapper = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); myHighlightRecentlyChanged = new JCheckBox("Show changed in last"); myHighlightRecentlyChanged.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); myHighlightInterval = new JSpinner(new SpinnerNumberModel(1, 1, VcsContentAnnotationSettings.ourMaxDays, 1)); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java index 49333f504959..ff3fcbb08794 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java @@ -21,10 +21,12 @@ import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.impl.VcsDescriptor; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.*; +import com.intellij.ui.components.JBLabel; import com.intellij.ui.table.TableView; import com.intellij.util.ui.AbstractTableCellEditor; import com.intellij.util.ui.ColumnInfo; @@ -163,7 +165,7 @@ public class VcsDirectoryConfigurationPanel extends PanelWithButtons implements public VcsDirectoryConfigurationPanel(final Project project) { myProject = project; myVcsConfiguration = VcsConfiguration.getInstance(myProject); - myProjectMessage = VcsDirectoryMapping.PROJECT_CONSTANT + " - " + VcsMappingConfigurationDialog.getProjectMessage(myProject).replace('\n', ' '); + myProjectMessage = "" + StringUtil.escapeXml(VcsDirectoryMapping.PROJECT_CONSTANT) + " - " + VcsMappingConfigurationDialog.getProjectMessage(myProject).replace('\n', ' ') + ""; myIsDisabled = myProject.isDefault(); myVcsManager = ProjectLevelVcsManager.getInstance(project); final VcsDescriptor[] vcsDescriptors = myVcsManager.getAllVcss(); @@ -320,20 +322,22 @@ public class VcsDirectoryConfigurationPanel extends PanelWithButtons implements panel.add(scroll, BorderLayout.CENTER); final JPanel wrapper = new JPanel(new BorderLayout()); myRecentlyChangedConfigurable = new VcsContentAnnotationConfigurable(myProject); - final JLabel label = new JLabel(myProjectMessage); - label.setForeground(UIUtil.getInactiveTextColor()); - label.setBorder(BorderFactory.createEmptyBorder(2, 0, 2, 0)); + final JBLabel label = new JBLabel(myProjectMessage); + label.setComponentStyle(UIUtil.ComponentStyle.SMALL); + label.setFontColor(UIUtil.FontColor.BRIGHTER); + label.setBorder(BorderFactory.createEmptyBorder(2, 5, 2, 0)); wrapper.add(label, BorderLayout.CENTER); - final JLabel noteLabel = new JLabel("File texts bigger than " + VcsConfiguration.ourMaximumFileForBaseRevisionSize / 1000 + "K are not stored"); - noteLabel.setForeground(UIUtil.getInactiveTextColor()); + final JBLabel noteLabel = new JBLabel("File texts bigger than " + VcsConfiguration.ourMaximumFileForBaseRevisionSize / 1000 + "K are not stored"); + noteLabel.setComponentStyle(UIUtil.ComponentStyle.SMALL); + noteLabel.setFontColor(UIUtil.FontColor.BRIGHTER); + noteLabel.setBorder(BorderFactory.createEmptyBorder(2, 25, 5, 0)); final JPanel twoPanel = new JPanel(new BorderLayout()); twoPanel.add(myBaseRevisionTexts, BorderLayout.NORTH); twoPanel.add(noteLabel, BorderLayout.SOUTH); final JPanel wr2 = new JPanel(new BorderLayout()); wr2.add(twoPanel, BorderLayout.WEST); - myBaseRevisionTexts.setBorder(BorderFactory.createEmptyBorder(5,5,0,0)); - noteLabel.setBorder(BorderFactory.createEmptyBorder(0,5,5,0)); + myBaseRevisionTexts.setBorder(BorderFactory.createEmptyBorder(5,0,0,0)); final JPanel wr3 = new JPanel(new BorderLayout()); wr3.add(wr2, BorderLayout.NORTH); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form index 2ef773fbea34..f771e3418650 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form @@ -54,7 +54,9 @@ - + + + @@ -134,8 +136,8 @@ - - + + diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java index 86dc3940cd42..71613ab35ee3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java @@ -36,7 +36,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstract { +public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstract implements Configurable.NoScroll { public static final Icon ICON = IconLoader.getIcon("/general/configurableVcs.png"); private final Project myProject; private VcsDirectoryConfigurationPanel myMappings; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.form index 2a229baa6358..83ca9d1b5efd 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.form +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.form @@ -1,6 +1,6 @@
- + @@ -10,12 +10,12 @@ - + - + @@ -24,7 +24,7 @@ - + @@ -32,13 +32,13 @@ - + - + @@ -54,17 +54,19 @@ - + - + - + - + + + diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java index 6ff32f6ad20a..fa9e50480a45 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsMappingConfigurationDialog.java @@ -25,13 +25,16 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ex.ProjectEx; import com.intellij.openapi.ui.*; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsDirectoryMapping; import com.intellij.openapi.vcs.impl.VcsDescriptor; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.ui.components.JBLabel; import com.intellij.util.ui.UIUtil; +import com.sun.xml.internal.ws.util.StringUtils; import javax.swing.*; import java.awt.*; @@ -51,7 +54,7 @@ public class VcsMappingConfigurationDialog extends DialogWrapper { private JPanel myVcsConfigurablePlaceholder; private JRadioButton myProjectRadioButton; private JRadioButton myDirectoryRadioButton; - private JLabel myProjectButtonComment; + private JBLabel myProjectButtonComment; private UnnamedConfigurable myVcsConfigurable; private VcsDirectoryMapping myMappingCopy; private JComponent myVcsConfigurableComponent; @@ -175,22 +178,20 @@ public class VcsMappingConfigurationDialog extends DialogWrapper { ".idea directory contents"}; final StringBuilder sb = new StringBuilder(parts[0]); if (isDirectoryBased) { - sb.append(",\n"); + sb.append(", "); } else { - sb.append(", and\n"); + sb.append(", and "); } sb.append(parts[1]); if (isDirectoryBased) { - sb.append(", and\n"); + sb.append(", and "); sb.append(parts[2]); } return sb.toString(); } public void initProjectMessage() { - myProjectButtonComment.setForeground(UIUtil.getInactiveTextColor()); - myProjectButtonComment.setText(getProjectMessage(myProject)); - myProjectButtonComment.setUI(new MultiLineLabelUI()); + myProjectButtonComment.setText("" + getProjectMessage(myProject) + ""); } private class MyBrowseFolderListener extends ComponentWithBrowseButton.BrowseFolderActionListener { diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java index f7e8a5e7a283..14b31a450adc 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java @@ -72,7 +72,7 @@ import java.util.List; /** * @author Gregory.Shrago */ -public class InjectionsSettingsUI implements SearchableConfigurable.Parent, NonDefaultProjectConfigurable { +public class InjectionsSettingsUI implements SearchableConfigurable.Parent, NonDefaultProjectConfigurable, Configurable.NoScroll { private final Project myProject; private final CfgInfo[] myInfos; diff --git a/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompilerSettingsFactory.java b/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompilerSettingsFactory.java index 4afcfc11a93c..4ee4b1e51d0a 100644 --- a/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompilerSettingsFactory.java +++ b/plugins/android/src/org/jetbrains/android/compiler/AndroidDexCompilerSettingsFactory.java @@ -37,7 +37,7 @@ public class AndroidDexCompilerSettingsFactory implements CompilerSettingsFactor return new AndroidDexCompilerSettingsConfigurable(project); } - private static class AndroidDexCompilerSettingsConfigurable implements SearchableConfigurable { + private static class AndroidDexCompilerSettingsConfigurable implements SearchableConfigurable, Configurable.NoScroll { private final AndroidDexCompilerConfiguration myConfig; private JPanel myContentPanel; private JSpinner myHeapSizeSpinner; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java index 5deaa00d0348..83ee88914c06 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.util.Arrays; -public class CopyrightFormattingConfigurable extends SearchableConfigurable.Parent.Abstract { +public class CopyrightFormattingConfigurable extends SearchableConfigurable.Parent.Abstract implements Configurable.NoScroll { private final Project myProject; private final TemplateCommentPanel myPanel; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java index fd50a1afee86..5d675b252b3b 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; -public class CopyrightProjectConfigurable extends SearchableConfigurable.Parent.Abstract { +public class CopyrightProjectConfigurable extends SearchableConfigurable.Parent.Abstract implements Configurable.NoScroll{ private final Project project; private ProjectSettingsPanel optionsPanel = null; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java index 05abdf3f5637..8f504709e8df 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleConfigurable.java @@ -18,6 +18,7 @@ package org.jetbrains.plugins.gradle.config; import com.intellij.ide.util.PropertiesComponent; import com.intellij.ide.util.projectWizard.NamePathComponent; import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; @@ -43,7 +44,7 @@ import java.util.concurrent.TimeUnit; /** * @author peter */ -public class GradleConfigurable implements SearchableConfigurable { +public class GradleConfigurable implements SearchableConfigurable, Configurable.NoScroll { @NonNls public static final String HELP_TOPIC = "reference.settingsdialog.project.gradle"; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java index 1726988c5400..efdaeefa51aa 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompilerConfigurable.java @@ -21,6 +21,7 @@ import com.intellij.openapi.compiler.options.ExcludedEntriesConfiguration; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -38,7 +39,7 @@ import javax.swing.*; /** * @author peter */ -public class GroovyCompilerConfigurable implements SearchableConfigurable { +public class GroovyCompilerConfigurable implements SearchableConfigurable, Configurable.NoScroll { private JTextField myHeapSize; private JPanel myMainPanel; private JPanel myExcludesPanel; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantConfigurable.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantConfigurable.java index 771340ecac5f..10154b43f9c6 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantConfigurable.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantConfigurable.java @@ -15,6 +15,7 @@ */ package org.jetbrains.plugins.groovy.gant; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.plugins.groovy.util.SdkHomeConfigurable; @@ -24,7 +25,7 @@ import javax.swing.*; /** * @author peter */ -public class GantConfigurable extends SdkHomeConfigurable { +public class GantConfigurable extends SdkHomeConfigurable implements Configurable.NoScroll { public GantConfigurable(Project project) { super(project, "Gant"); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java index d92d54e6399c..7f97fe601051 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerConfigurable.java @@ -17,6 +17,7 @@ package org.jetbrains.idea.maven.execution; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -37,7 +38,7 @@ import java.awt.*; import java.util.*; import java.util.List; -public abstract class MavenRunnerConfigurable implements SearchableConfigurable { +public abstract class MavenRunnerConfigurable implements SearchableConfigurable, Configurable.NoScroll { private final Project myProject; private final boolean myRunConfigurationMode; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java index df5c80012a48..559aadb923e9 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.maven.indices; import com.intellij.openapi.options.BaseConfigurable; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -55,7 +56,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -public class MavenRepositoriesConfigurable extends BaseConfigurable implements SearchableConfigurable { +public class MavenRepositoriesConfigurable extends BaseConfigurable implements SearchableConfigurable, Configurable.NoScroll { private final MavenProjectIndicesManager myManager; private JPanel myMainPanel; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java index 6938e478a9ea..40fad94c41c5 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.maven.project; import com.intellij.ide.util.ElementsChooser; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.util.io.FileUtil; @@ -31,7 +32,7 @@ import javax.swing.*; import java.util.Collection; import java.util.Comparator; -public class MavenIgnoredFilesConfigurable implements SearchableConfigurable { +public class MavenIgnoredFilesConfigurable implements SearchableConfigurable, Configurable.NoScroll { private static final char SEPARATOR = ','; private final MavenProjectsManager myManager; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form index b5b70f229a4e..afbaec959a37 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form @@ -1,131 +1,67 @@ - + - + - - - - - - - - - - - - - - - - - + - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - - - - - - - - - - - + - + - - + - + @@ -137,7 +73,7 @@ - + @@ -145,38 +81,136 @@ - - + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java index 0382cbac06ce..9b636230d2be 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java @@ -47,14 +47,14 @@ public class MavenImportingSettingsForm { private JCheckBox myDownloadDocsCheckBox; private JPanel myAdditionalSettingsPanel; + private JPanel mySeparateModulesDirPanel; public MavenImportingSettingsForm(boolean isImportStep) { if (!isImportStep) { mySearchRecursivelyCheckBox.setVisible(false); myProjectFormatLabel.setVisible(false); myProjectFormatComboBox.setVisible(false); - mySeparateModulesDirCheckBox.setVisible(false); - mySeparateModulesDirChooser.setVisible(false); + mySeparateModulesDirPanel.setVisible(false); } ActionListener listener = new ActionListener() { diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java index aae70db22a6b..6fe58742a913 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java +++ b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsManager.java @@ -15,6 +15,7 @@ */ package com.intellij.spellchecker.settings; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -26,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; -public class SpellCheckerSettingsManager implements SearchableConfigurable { +public class SpellCheckerSettingsManager implements SearchableConfigurable, Configurable.NoScroll { private SpellCheckerSettingsPane settingsPane; private final SpellCheckerSettings settings; private final Project project; diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskRepositoriesConfigurable.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskRepositoriesConfigurable.java index 183ee2606cbd..6797b6023f80 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskRepositoriesConfigurable.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskRepositoriesConfigurable.java @@ -6,6 +6,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.actionSystem.Separator; import com.intellij.openapi.options.BaseConfigurable; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ui.configuration.actions.IconWithTextAction; @@ -39,7 +40,7 @@ import java.util.Set; * @author Dmitry Avdeev */ @SuppressWarnings("unchecked") -public class TaskRepositoriesConfigurable extends BaseConfigurable { +public class TaskRepositoriesConfigurable extends BaseConfigurable implements Configurable.NoScroll { private JPanel myPanel; private JPanel myServersPanel; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java index de5fca8b6356..4d9a541ea6ef 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java @@ -20,6 +20,7 @@ import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.util.DispatchThreadProgressWindow; @@ -43,7 +44,7 @@ import javax.swing.*; * @author Anton Katilin * @author Vladimir Kondratyev */ -public final class GuiDesignerConfigurable implements SearchableConfigurable { +public final class GuiDesignerConfigurable implements SearchableConfigurable, Configurable.NoScroll { private static final Logger LOG = Logger.getInstance("#com.intellij.uiDesigner.GuiDesignerConfigurable"); private final Project myProject; private MyGeneralUI myGeneralUI; diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java index 20a78e27eaa4..88b687ae69d8 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/FileAssociationsConfigurable.java @@ -23,10 +23,7 @@ import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; -import com.intellij.openapi.options.ConfigurationException; -import com.intellij.openapi.options.NonDefaultProjectConfigurable; -import com.intellij.openapi.options.SearchableConfigurable; -import com.intellij.openapi.options.ShowSettingsUtil; +import com.intellij.openapi.options.*; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiFile; @@ -34,7 +31,7 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; -public class FileAssociationsConfigurable implements SearchableConfigurable, NonDefaultProjectConfigurable { +public class FileAssociationsConfigurable implements SearchableConfigurable, NonDefaultProjectConfigurable, Configurable.NoScroll { private final Project myProject; private final UIState myState; private AssociationsEditor myEditor; diff --git a/resources-en/src/messages/CompilerBundle.properties b/resources-en/src/messages/CompilerBundle.properties index 7f88ea16ae69..2a8cebb6cceb 100644 --- a/resources-en/src/messages/CompilerBundle.properties +++ b/resources-en/src/messages/CompilerBundle.properties @@ -110,7 +110,7 @@ label.option.deploy.never=Never label.option.deploy.always=Always label.option.deploy.text=Deploy web applications to server after compilation: label.option.clear.output.directory.on.rebuild=C&lear output directory on rebuild -label.option.resource.patterns.text=Resource patterns +label.option.resource.patterns.text=Resource Patterns error.compiler.configurable.malformed.patterns=The following resource patterns are malformed:\n{0} exclude.from.compile.table.path.column.name=Path exclude.from.compile.table.recursively.column.name=Recursively diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java index 412aa4d367e3..d6c4cad04b0d 100644 --- a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java +++ b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java @@ -17,6 +17,7 @@ package com.intellij.javaee; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.options.BaseConfigurable; +import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.OptionalConfigurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; @@ -42,7 +43,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class ExternalResourceConfigurable extends BaseConfigurable implements SearchableConfigurable, OptionalConfigurable { +public class ExternalResourceConfigurable extends BaseConfigurable implements SearchableConfigurable, OptionalConfigurable, Configurable.NoScroll { private JPanel myPanel; private List myPairs; private List myIgnoredUrls;