diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java b/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java index 8945d2c5a3ef..f4dcae3ab524 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java @@ -91,7 +91,7 @@ public class CodeStyleImportsPanel extends JPanel { final MultiLineLabel oneImportPerDirectiveLabel = new MultiLineLabel("<% page import=\"com.company.Boo\"%>\n" + "<% page import=\"com.company.Far\"%>"); final JPanel labelPanel = new JPanel(new BorderLayout()); - //labelPanel.setBorder(IdeBorderFactory.createTitledBorder(ApplicationBundle.message("title.preview"))); + labelPanel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(20, 10, 0, 0), IdeBorderFactory.createTitledBorder(ApplicationBundle.message("title.preview")))); JPanel resultPanel = new JPanel(new BorderLayout()); resultPanel.add(btnPanel, BorderLayout.NORTH); diff --git a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java index 1ded7c589922..c0b47025439b 100644 --- a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java @@ -197,10 +197,10 @@ public class ReplaceConstructorWithBuilderDialog extends RefactoringDialog { myTable.getSelectionModel().setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION); final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); - final Border titledBorder = IdeBorderFactory.createTitledBorder("Parameters to Pass to the Builder"); - final Border emptyBorder = BorderFactory.createEmptyBorder(0, 5, 5, 5); - final Border border = BorderFactory.createCompoundBorder(titledBorder, emptyBorder); - scrollPane.setBorder(border); + //final Border titledBorder = IdeBorderFactory.createTitledBorder("Parameters to Pass to the Builder"); + //final Border emptyBorder = BorderFactory.createEmptyBorder(0, 5, 5, 5); + //final Border border = BorderFactory.createCompoundBorder(titledBorder, emptyBorder); + //scrollPane.setBorder(border); return scrollPane; } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionProfileChooserForm.form b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionProfileChooserForm.form index 13ffce609450..40d312d397c4 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionProfileChooserForm.form +++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionProfileChooserForm.form @@ -1,32 +1,29 @@
- - + + - + - + + - + - - - - - - - - - - - - - - + + + + + + + + + + diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java index 3d6b03fd3dc3..97643a8b736e 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java @@ -877,7 +877,7 @@ public class SingleInspectionProfilePanel extends JPanel { fillTreeData(myProfileFilter != null ? myProfileFilter.getFilter() : null, true); JPanel descriptionPanel = new JPanel(new BorderLayout()); - descriptionPanel.setBorder(IdeBorderFactory.createTitledBorder(InspectionsBundle.message("inspection.description.title"))); + //descriptionPanel.setBorder(IdeBorderFactory.createTitledBorder(InspectionsBundle.message("inspection.description.title"))); descriptionPanel.add(ScrollPaneFactory.createScrollPane(myBrowser), BorderLayout.CENTER); Splitter rightPanel = new Splitter(true); diff --git a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java index 22f041c4cdcc..d6abd3790c69 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolEditorDialog.java @@ -207,12 +207,12 @@ public class ToolEditorDialog extends DialogWrapper { private JPanel createCommandPane() { JPanel pane = new JPanel(new GridBagLayout()); - pane.setBorder( - BorderFactory.createCompoundBorder( - BorderFactory.createEtchedBorder(), - BorderFactory.createEmptyBorder(5, 5, 5, 5) - ) - ); + //pane.setBorder( + // BorderFactory.createCompoundBorder( + // BorderFactory.createEtchedBorder(), + // BorderFactory.createEmptyBorder(5, 5, 5, 5) + // ) + //); GridBagConstraints constr; // program 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 fea548da54b8..fd6e19de7d0e 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 @@ -227,13 +227,15 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable { private JPanel createShortcutsPanel() { JPanel panel = new JPanel(new GridBagLayout()); - panel.setBorder(IdeBorderFactory.createTitledBorder(KeyMapBundle.message("shortcuts.keymap.label"))); + JLabel currentKeysLabel = new JLabel(KeyMapBundle.message("shortcuts.keymap.label")); + panel.add(currentKeysLabel, new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST,GridBagConstraints.NONE, new Insets(0, 0, 0, 8), 0, 0)); myShortcutsList = new JBList(new DefaultListModel()); myShortcutsList.getEmptyText().setText(KeyMapBundle.message("shortcuts.keymap.no.shortcuts")); myShortcutsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); myShortcutsList.setCellRenderer(new ShortcutListRenderer()); + currentKeysLabel.setLabelFor(myShortcutsList); JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myShortcutsList); scrollPane.setPreferredSize(new Dimension(160, 200)); panel.add(scrollPane, new GridBagConstraints(1,1,1,1,1,1,GridBagConstraints.WEST,GridBagConstraints.BOTH, new Insets(0, 0, 0, 2), 0, 0)); @@ -463,10 +465,10 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable { return new Dimension(300, -1); } }; + panel.add(new JLabel(KeyMapBundle.message("action.description.ide.border.factory.title")), BorderLayout.NORTH); myDescription = new JEditorPane(UIUtil.HTML_MIME, ""); myDescription.setEditable(false); panel.add(ScrollPaneFactory.createScrollPane(myDescription), BorderLayout.CENTER); - panel.setBorder(IdeBorderFactory.createTitledBorder(KeyMapBundle.message("action.description.ide.border.factory.title"))); return panel; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form index 305fc75c64c7..49ed06a9a0bb 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.form @@ -1,151 +1,144 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form index 57809fdfeb63..bfa08dd66df5 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form +++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubSettingsPanel.form @@ -15,9 +15,6 @@ - - - @@ -48,7 +45,6 @@ - @@ -58,9 +54,6 @@ - - - @@ -90,9 +83,6 @@ - - - diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationProjectPanel.form b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationProjectPanel.form index b1475a9a7636..692cfb7c3d05 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationProjectPanel.form +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgConfigurationProjectPanel.form @@ -3,15 +3,15 @@ - + - + - + diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form index 9c426d511e59..57230746ba1b 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/TaskConfigurable.form @@ -44,7 +44,7 @@ - + diff --git a/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.form b/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.form index 793724899cf9..ef4281209369 100644 --- a/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.form +++ b/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.form @@ -3,7 +3,7 @@ - + @@ -53,7 +53,10 @@ - + + + +