diff --git a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.form b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.form index 8c77c71c0ed7..cb0508610c95 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.form +++ b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.form @@ -9,7 +9,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form index 6e378c843fca..a2bf2a88e87c 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleGenerationConfigurable.form @@ -3,7 +3,7 @@ - + @@ -159,7 +159,7 @@ - + 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 5bca17bd8a64..ba3ba9e9fee3 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java @@ -141,7 +141,7 @@ public class CodeStyleImportsPanel extends JPanel { private JPanel createPackagesPanel() { JPanel panel = new JPanel(new BorderLayout()); - panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(ApplicationBundle.message("title.packages.to.use.import.with"))); + panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithoutIndent(ApplicationBundle.message("title.packages.to.use.import.with"))); panel.add(createPackagesTable(), BorderLayout.CENTER); panel.add(createPackagesButtonsPanel(), BorderLayout.EAST); @@ -151,7 +151,7 @@ public class CodeStyleImportsPanel extends JPanel { private JPanel createImportLayoutPanel() { JPanel panel = new JPanel(new BorderLayout()); - panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(ApplicationBundle.message("title.import.layout"))); + panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithoutIndent(ApplicationBundle.message("title.import.layout"))); myCbLayoutStaticImportsSeparately = new JCheckBox("Layout static imports separately"); myCbLayoutStaticImportsSeparately.addItemListener(new ItemListener(){ diff --git a/java/java-impl/src/com/intellij/refactoring/RefactorJBundle.properties b/java/java-impl/src/com/intellij/refactoring/RefactorJBundle.properties index c1f48afdbbd1..d9ce682c12b6 100644 --- a/java/java-impl/src/com/intellij/refactoring/RefactorJBundle.properties +++ b/java/java-impl/src/com/intellij/refactoring/RefactorJBundle.properties @@ -191,7 +191,7 @@ the.selected.class.has.no.members.to.extract=The selected class has no members t references.to.extract=References to extract extracting.from.class=Extracting from class: extracted.class.command.name=Extracted class {0} -method.to.extract.parameters.from.label=Method to extract parameters from: +method.to.extract.parameters.from.label=Method to extract parameters from name.for.new.parameter.label=Name for new parameter: method.selected.has.no.parameters=Method selected has no parameters. introduced.parameter.class.command.name=Introduced parameter class {0} for {1}.{2}() diff --git a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java index bb7324006261..268ca6ff468e 100644 --- a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java @@ -92,8 +92,6 @@ class CopyClassDialog extends DialogWrapper{ JPanel panel = new JPanel(new GridBagLayout()); GridBagConstraints gbConstraints = new GridBagConstraints(); - panel.setBorder(IdeBorderFactory.createRoundedBorder()); - gbConstraints.insets = new Insets(4,8,4,8); gbConstraints.weightx = 1; gbConstraints.gridwidth = 2; @@ -149,6 +147,8 @@ class CopyClassDialog extends DialogWrapper{ gbConstraints.fill = GridBagConstraints.NONE; panel.add(myCbMoveToAnotherSourceFolder, gbConstraints); + panel.setPreferredSize(new Dimension(400, 120)); + return panel; } diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java index 9d9c70a6c55c..8a89e1803ba9 100644 --- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java @@ -319,7 +319,7 @@ public String getAccessorsVisibility() { leftBox.add(Box.createVerticalStrut(10)); leftBox.add(myCbUseAccessorsWhenAccessible); JPanel leftPanel = new JPanel(new BorderLayout()); - leftPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent( + leftPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent( RefactoringBundle.message("encapsulate.fields.encapsulate.border.title"))); leftPanel.add(leftBox, BorderLayout.CENTER); leftPanel.add(Box.createHorizontalStrut(5), BorderLayout.WEST); @@ -343,7 +343,7 @@ public String getAccessorsVisibility() { fieldsBox.add(myRbFieldProtected); fieldsBox.add(myRbFieldAsIs); JPanel fieldsVisibilityPanel = new JPanel(new BorderLayout()); - fieldsVisibilityPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent( + fieldsVisibilityPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent( RefactoringBundle.message("encapsulate.fields..encapsulated.fields.visibility.border.title"))); fieldsVisibilityPanel.add(fieldsBox, BorderLayout.CENTER); fieldsVisibilityPanel.add(Box.createHorizontalStrut(5), BorderLayout.WEST); @@ -354,7 +354,7 @@ public String getAccessorsVisibility() { methodsBox.add(myRbAccessorPackageLocal); methodsBox.add(myRbAccessorPrivate); JPanel methodsVisibilityPanel = new JPanel(new BorderLayout()); - methodsVisibilityPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent( + methodsVisibilityPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent( RefactoringBundle.message("encapsulate.fields.accessors.visibility.border.title"))); methodsVisibilityPanel.add(methodsBox, BorderLayout.CENTER); methodsVisibilityPanel.add(Box.createHorizontalStrut(5), BorderLayout.WEST); @@ -395,11 +395,12 @@ public String getAccessorsVisibility() { JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); // JLabel label = new JLabel("Fields to Encapsulate"); // CompTitledBorder titledBorder = new CompTitledBorder(label); - Border titledBorder = IdeBorderFactory.createTitledBorderBoldWithIndent( - RefactoringBundle.message("encapsulate.fields.fields.to.encapsulate.border.title")); - Border emptyBorder = BorderFactory.createEmptyBorder(0, 5, 5, 5); - Border border = BorderFactory.createCompoundBorder(titledBorder, emptyBorder); - scrollPane.setBorder(border); + JPanel panel = new JPanel(new BorderLayout()); + Border border = IdeBorderFactory.createTitledBorderSimpleWithoutIndent( + RefactoringBundle.message("encapsulate.fields.fields.to.encapsulate.border.title")); + panel.setBorder(border); + panel.add(scrollPane); + // make ESC and ENTER work when focus is in the table myTable.registerKeyboardAction(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -450,7 +451,7 @@ public String getAccessorsVisibility() { } } ); - return scrollPane; + return panel; } public JComponent getPreferredFocusedComponent() { diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java index 1dc3b0eaa945..b472581d2055 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodDialog.java @@ -188,7 +188,7 @@ public class ExtractMethodDialog extends AbstractExtractDialog { final JPanel main = new JPanel(new BorderLayout()); final JPanel namePanel = new JPanel(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 2, true, false)); final JLabel nameLabel = new JLabel(); - nameLabel.setText(RefactoringBundle.message("name.prompt")); + nameLabel.setText(RefactoringBundle.message("changeSignature.name.prompt")); namePanel.add(nameLabel); namePanel.setBorder(IdeBorderFactory.createEmptyBorder(0, 4, 0, 0)); namePanel.add(myNameField); diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form index 9d2fd1fc0347..361e2292b919 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form +++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form @@ -1,8 +1,9 @@
- + + - + @@ -10,22 +11,15 @@ - - + + - - - - - - - - + @@ -33,7 +27,6 @@ - @@ -43,15 +36,13 @@ - - + - @@ -59,8 +50,7 @@ - - + @@ -68,8 +58,7 @@ - - + @@ -77,8 +66,7 @@ - - + @@ -86,8 +74,7 @@ - - + @@ -95,8 +82,7 @@ - - + @@ -104,8 +90,7 @@ - - + @@ -115,17 +100,16 @@ - - + - + + - - + @@ -133,7 +117,6 @@ - @@ -143,15 +126,13 @@ - - + - - + @@ -161,8 +142,7 @@ - - + @@ -180,7 +160,6 @@ - @@ -189,7 +168,6 @@ - @@ -198,7 +176,6 @@ - @@ -207,7 +184,6 @@ - diff --git a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java index 7f50bdd404de..14511442fecd 100644 --- a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java @@ -231,7 +231,7 @@ public class InheritanceToDelegationDialog extends RefactoringDialog { gbc.weighty = 1.0; gbc.gridwidth = 1; - gbc.insets = new Insets(4, 8, 4, 4); + gbc.insets = new Insets(4, 0, 4, 4); myMemberSelectionPanel = new MemberSelectionPanel(RefactoringBundle.message("delegate.members"), Collections.emptyList(), null); panel.add(myMemberSelectionPanel, gbc); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectForm.form b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectForm.form index 026eedd8c63e..7c3bf2927a4d 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectForm.form +++ b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/IntroduceParameterObjectForm.form @@ -1,44 +1,23 @@ - + + - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -51,10 +30,11 @@ - + + - + @@ -62,7 +42,6 @@ - @@ -74,14 +53,12 @@ - - @@ -90,16 +67,16 @@ - - + + - + @@ -107,7 +84,6 @@ - @@ -116,14 +92,12 @@ - - @@ -132,7 +106,6 @@ - @@ -149,10 +122,11 @@ - + + - + @@ -160,7 +134,6 @@ - @@ -172,7 +145,6 @@ - @@ -189,27 +161,46 @@ - + + - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - diff --git a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java index d73c07a7f4a2..c737e105da7b 100644 --- a/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/makeStatic/MakeParameterizedStaticDialog.java @@ -126,7 +126,6 @@ public class MakeParameterizedStaticDialog extends AbstractMakeStaticDialog { GridBagConstraints gbConstraints = new GridBagConstraints(); JPanel panel = new JPanel(new GridBagLayout()); - panel.setBorder(IdeBorderFactory.createRoundedBorder()); gbConstraints.insets = new Insets(4, 8, 4, 8); gbConstraints.weighty = 0; diff --git a/java/java-impl/src/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java b/java/java-impl/src/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java index 359e9ea264d0..479935a7ac51 100644 --- a/java/java-impl/src/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/makeStatic/SimpleMakeStaticDialog.java @@ -75,7 +75,6 @@ public class SimpleMakeStaticDialog extends AbstractMakeStaticDialog { GridBagConstraints gbConstraints = new GridBagConstraints(); JPanel panel = new JPanel(new GridBagLayout()); - panel.setBorder(IdeBorderFactory.createRoundedBorder()); gbConstraints.insets = new Insets(4, 8, 4, 8); gbConstraints.weighty = 1; diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java index 7b6f1602ab2b..639472e3dbe3 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java @@ -32,7 +32,6 @@ import com.intellij.refactoring.util.classMembers.InterfaceContainmentVerifier; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.refactoring.util.classMembers.MemberInfoStorage; import com.intellij.refactoring.util.classMembers.UsesAndInterfacesDependencyMemberInfoModel; -import com.intellij.ui.IdeBorderFactory; import com.intellij.usageView.UsageViewUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -111,12 +110,10 @@ public class PullUpDialog extends RefactoringDialog { protected JComponent createNorthPanel() { JPanel panel = new JPanel(); - panel.setBorder(IdeBorderFactory.createRoundedBorder()); - panel.setLayout(new GridBagLayout()); GridBagConstraints gbConstraints = new GridBagConstraints(); - gbConstraints.insets = new Insets(4, 8, 4, 8); + gbConstraints.insets = new Insets(4, 5, 4, 8); gbConstraints.weighty = 1; gbConstraints.weightx = 1; gbConstraints.gridy = 0; diff --git a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java index 7736b2f04d28..dd7fa71a4d37 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java @@ -80,7 +80,7 @@ public class PushDownDialog extends RefactoringDialog { JPanel panel = new JPanel(new GridBagLayout()); - gbConstraints.insets = new Insets(4, 8, 4, 8); + gbConstraints.insets = new Insets(4, 5, 10, 8); gbConstraints.weighty = 1; gbConstraints.weightx = 1; gbConstraints.gridy = 0; diff --git a/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java b/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java index 9ddd5b37e928..2c4fdc0464ff 100644 --- a/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/migration/EditMigrationDialog.java @@ -105,7 +105,7 @@ public class EditMigrationDialog extends DialogWrapper{ gbConstraints.weightx = 0; gbConstraints.weighty = 1; gbConstraints.gridwidth = GridBagConstraints.RELATIVE; - gbConstraints.anchor = GridBagConstraints.EAST; + gbConstraints.anchor = GridBagConstraints.NORTHEAST; JLabel descriptionPromptLabel = new JLabel(RefactoringBundle.message("migration.map.description.label")); panel.add(descriptionPromptLabel, gbConstraints); diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.form b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.form index 8bff234f01e8..b4ef75b366a1 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.form +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesDialog.form @@ -2,10 +2,10 @@
- + - + diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java index 02336882f2b3..22c4e9d513f2 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesToNewDirectoryDialog.java @@ -141,7 +141,6 @@ public class MoveClassesOrPackagesToNewDirectoryDialog extends DialogWrapper { @Nullable protected JComponent createCenterPanel() { - myRootPanel.setBorder(IdeBorderFactory.createRoundedBorder()); return myRootPanel; } diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialog.java index 5e5377257c49..67d2b2e16885 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodDialog.java @@ -25,6 +25,7 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.move.MoveInstanceMembersUtil; import com.intellij.ui.EditorTextField; import com.intellij.ui.ScrollPaneFactory; +import com.intellij.ui.TitledSeparatorWithMnemonic; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; @@ -60,8 +61,8 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase { protected JComponent createCenterPanel() { JPanel mainPanel = new JPanel(new GridBagLayout()); - final JLabel jLabel = new JLabel(); - mainPanel.add(jLabel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0,0,0,0), 0,0)); + final TitledSeparatorWithMnemonic separator = new TitledSeparatorWithMnemonic(); + mainPanel.add(separator, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0,0,0,0), 0,0)); myList = createTargetVariableChooser(); myList.addListSelectionListener(new ListSelectionListener() { @@ -70,7 +71,7 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase { } }); - jLabel.setText(RefactoringBundle.message("moveInstanceMethod.select.an.instance.parameter")); + separator.setText(RefactoringBundle.message("moveInstanceMethod.select.an.instance.parameter")); final JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myList); mainPanel.add(scrollPane, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0,0,0,0), 0,0)); @@ -83,7 +84,7 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase { mainPanel.add(parametersPanel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(0,0,0,0), 0,0)); } - jLabel.setLabelFor(myList); + separator.setLabelFor(myList); validateTextFields(myList.getSelectedIndex()); return mainPanel; } @@ -109,10 +110,10 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase { myThisClassesMap = MoveInstanceMembersUtil.getThisClassesToMembers(myMethod); myOldClassParameterNameFields = new HashMap(); if (myThisClassesMap.size() == 0) return null; - JPanel panel = new JPanel(new VerticalFlowLayout()); + JPanel panel = new JPanel(new VerticalFlowLayout(VerticalFlowLayout.TOP, 0, 0, true, true)); for (PsiClass aClass : myThisClassesMap.keySet()) { final String text = RefactoringBundle.message("move.method.this.parameter.label", aClass.getName()); - panel.add(new JLabel(text)); + panel.add(new TitledSeparatorWithMnemonic(text, null)); String suggestedName = MoveInstanceMethodHandler.suggestParameterNameForThisClass(aClass); final EditorTextField field = new EditorTextField(suggestedName, getProject(), StdFileTypes.JAVA); @@ -120,6 +121,7 @@ public class MoveInstanceMethodDialog extends MoveInstanceMethodDialogBase { myOldClassParameterNameFields.put(aClass, field); panel.add(field); } + panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0)); return panel; } diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java index 68db74515b6f..2619b710d9d5 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java @@ -195,10 +195,8 @@ public class MoveMembersDialog extends RefactoringDialog implements MoveMembersO table.getSelectionModel().addSelectionInterval(0, 0); } JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(table); - Border titledBorder = IdeBorderFactory.createTitledBorderBoldWithIndent( - RefactoringBundle.message("move.members.members.to.be.moved.border.title")); - Border emptyBorder = BorderFactory.createEmptyBorder(0, 5, 5, 5); - Border border = BorderFactory.createCompoundBorder(titledBorder, emptyBorder); + Border border = IdeBorderFactory.createTitledBorderSimpleWithoutIndent( + RefactoringBundle.message("move.members.members.to.be.moved.border.title")); scrollPane.setBorder(border); scrollPane.setBackground(UIUtil.getPanelBackground()); panel.add(scrollPane, BorderLayout.CENTER); diff --git a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java index 89857dea18c3..43fbb3b11f5e 100644 --- a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java @@ -80,7 +80,6 @@ public class TurnRefsToSuperDialog extends RefactoringDialog { protected JComponent createNorthPanel() { JPanel panel = new JPanel(); - panel.setBorder(IdeBorderFactory.createRoundedBorder()); panel.setLayout(new GridBagLayout()); GridBagConstraints gbConstraints = new GridBagConstraints(); diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/TypeCookDialog.java b/java/java-impl/src/com/intellij/refactoring/typeCook/TypeCookDialog.java index 4d2167c03234..91387299d8af 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeCook/TypeCookDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/typeCook/TypeCookDialog.java @@ -86,8 +86,6 @@ public class TypeCookDialog extends RefactoringDialog { JPanel optionsPanel = new JPanel(new GridBagLayout()); GridBagConstraints gbConstraints = new GridBagConstraints(); - optionsPanel.setBorder(IdeBorderFactory.createRoundedBorder()); - if (myCbDropCasts.isEnabled()) { myCbDropCasts.setSelected(JavaRefactoringSettings.getInstance().TYPE_COOK_DROP_CASTS); } diff --git a/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionPanel.java b/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionPanel.java index 966cc99f5383..df40773fd09a 100644 --- a/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionPanel.java +++ b/java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionPanel.java @@ -26,12 +26,14 @@ package com.intellij.refactoring.ui; import com.intellij.openapi.util.SystemInfo; import com.intellij.refactoring.util.classMembers.MemberInfo; +import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TableUtil; import com.intellij.ui.TitledBorderWithMnemonic; import javax.swing.*; import javax.swing.border.Border; +import javax.swing.border.TitledBorder; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -47,9 +49,7 @@ public class MemberSelectionPanel extends JPanel { */ public MemberSelectionPanel(String title, List memberInfo, String abstractColumnHeader) { super(); - TitledBorderWithMnemonic titledBorder = new TitledBorderWithMnemonic(appendTitledBorderMnemonic(title)); - Border emptyBorder = BorderFactory.createEmptyBorder(0, 5, 5, 5); - Border border = BorderFactory.createCompoundBorder(titledBorder, emptyBorder); + Border border = IdeBorderFactory.createTitledBorderSimpleWithoutIndent(title); setBorder(border); setLayout(new BorderLayout()); diff --git a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueForm.form b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueForm.form index e185665d4071..66d6a9aa9630 100644 --- a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueForm.form +++ b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueForm.form @@ -1,8 +1,9 @@ - + + - + @@ -10,37 +11,23 @@ - - - - - - - - - - - - - - - + + - - + @@ -48,7 +35,6 @@ - @@ -60,14 +46,12 @@ - - @@ -76,16 +60,15 @@ - - + + - - + @@ -93,7 +76,6 @@ - @@ -103,21 +85,18 @@ - - - @@ -128,17 +107,15 @@ - - + + - - - + @@ -146,17 +123,16 @@ - - + - + + - - + @@ -164,7 +140,6 @@ - @@ -176,12 +151,16 @@ - + + + + + diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.form b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.form index fa7f1e76a6a6..72826313202f 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.form +++ b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.form @@ -1,6 +1,6 @@
- + @@ -24,23 +24,18 @@ - + - - - - - - - - - + - + + + + diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java index ee100e72655d..cb757f80140b 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/editor/CodeFoldingConfigurable.java @@ -61,7 +61,7 @@ public class CodeFoldingConfigurable extends CompositeConfigurable - + - + @@ -18,7 +18,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -169,9 +169,7 @@ - - - + @@ -208,9 +206,7 @@ - - - + @@ -248,9 +244,7 @@ - - - + @@ -323,9 +317,7 @@ - - - + @@ -374,7 +366,7 @@ - + @@ -402,9 +394,7 @@ - - - + @@ -413,7 +403,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.form b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.form index dce6a3e53cef..fb111ef4f941 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.form +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.form @@ -22,7 +22,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditTemplateDialog.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditTemplateDialog.java index 151f0fec9eab..765af5c70b11 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditTemplateDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditTemplateDialog.java @@ -125,7 +125,7 @@ public class EditTemplateDialog extends DialogWrapper { gbConstraints.gridx = 0; JPanel panel1 = new JPanel(); - panel1.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent( + panel1.setBorder(IdeBorderFactory.createTitledBorderSimpleWithoutIndent( CodeInsightBundle.message("dialog.edit.template.template.text.title"))); panel1.setPreferredSize(new Dimension(500, 160)); panel1.setMinimumSize(new Dimension(500, 160)); @@ -231,7 +231,7 @@ public class EditTemplateDialog extends DialogWrapper { private JPanel createTemplateOptionsPanel() { JPanel panel = new JPanel(); - panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(CodeInsightBundle.message("dialog.edit.template.options.title"))); + panel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(CodeInsightBundle.message("dialog.edit.template.options.title"))); panel.setLayout(new GridBagLayout()); GridBagConstraints gbConstraints = new GridBagConstraints(); gbConstraints.fill = GridBagConstraints.BOTH; @@ -282,7 +282,7 @@ public class EditTemplateDialog extends DialogWrapper { }; JPanel panel = new JPanel(); - panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(CodeInsightBundle.message("dialog.edit.template.context.title"))); + panel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(CodeInsightBundle.message("dialog.edit.template.context.title"))); panel.setLayout(new GridBagLayout()); GridBagConstraints gbConstraints = new GridBagConstraints(); gbConstraints.fill = GridBagConstraints.BOTH; 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 40d312d397c4..046592d49f48 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionProfileChooserForm.form +++ b/platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionProfileChooserForm.form @@ -11,9 +11,12 @@ - + + + + diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java index 54cb664a704e..7c2a11e8236e 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindDialog.java @@ -401,7 +401,7 @@ class FindDialog extends DialogWrapper { private JComponent createFilterPanel() { JPanel filterPanel = new JPanel(); filterPanel.setLayout(new BorderLayout()); - filterPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.filter.file.name.group"))); + filterPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.filter.file.name.group"))); myFileFilter = new ComboBox(100); initCombobox(myFileFilter); @@ -577,7 +577,7 @@ class FindDialog extends DialogWrapper { private JPanel createFindOptionsPanel() { JPanel findOptionsPanel = new JPanel(); - findOptionsPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.options.group"))); + findOptionsPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.options.group"))); findOptionsPanel.setLayout(new BoxLayout(findOptionsPanel, BoxLayout.Y_AXIS)); myCbCaseSensitive = createCheckbox(FindBundle.message("find.options.case.sensitive")); @@ -697,7 +697,7 @@ class FindDialog extends DialogWrapper { private JPanel createDirectionPanel() { JPanel directionPanel = new JPanel(); - directionPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.direction.group"))); + directionPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.direction.group"))); directionPanel.setLayout(new BoxLayout(directionPanel, BoxLayout.Y_AXIS)); myRbForward = new JRadioButton(FindBundle.message("find.direction.forward.radio"), true); @@ -714,7 +714,7 @@ class FindDialog extends DialogWrapper { private JComponent createGlobalScopePanel() { JPanel scopePanel = new JPanel(); scopePanel.setLayout(new GridBagLayout()); - scopePanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.scope.group"))); + scopePanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.scope.group"))); GridBagConstraints gbConstraints = new GridBagConstraints(); gbConstraints.fill = GridBagConstraints.HORIZONTAL; gbConstraints.gridx = 0; @@ -881,7 +881,7 @@ class FindDialog extends DialogWrapper { private JPanel createScopePanel() { JPanel scopePanel = new JPanel(); - scopePanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.scope.group"))); + scopePanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.scope.group"))); scopePanel.setLayout(new BoxLayout(scopePanel, BoxLayout.Y_AXIS)); myRbGlobal = new JRadioButton(FindBundle.message("find.scope.global.radio"), true); @@ -905,7 +905,7 @@ class FindDialog extends DialogWrapper { private JPanel createOriginPanel() { JPanel originPanel = new JPanel(); - originPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(FindBundle.message("find.origin.group"))); + originPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(FindBundle.message("find.origin.group"))); originPanel.setLayout(new BoxLayout(originPanel, BoxLayout.Y_AXIS)); myRbFromCursor = new JRadioButton(FindBundle.message("find.origin.from.cursor.radio"), true); diff --git a/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java b/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java index 9157445b735c..3f1a7c9c1c54 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/configurable/FilterDialog.java @@ -127,7 +127,7 @@ class FilterDialog extends DialogWrapper { new GridBagConstraints(1, 0, 1, 1, 1, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 5, 0), 0, 0)); JPanel patternsPanel = new JPanel(new GridBagLayout()); - Border border = IdeBorderFactory.createTitledBorderBoldWithIndent(IdeBundle.message("group.todo.filter.patterns")); + Border border = IdeBorderFactory.createTitledBorderSimpleWithIndent(IdeBundle.message("group.todo.filter.patterns")); patternsPanel.setBorder(border); myTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION); JScrollPane scrollPane = ScrollPaneFactory.createScrollPane(myTable); diff --git a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePanel.form b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePanel.form index 6b9924e708db..cc4cfbdf055d 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePanel.form +++ b/platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypePanel.form @@ -27,7 +27,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstactExtractMethodDialog.form b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstactExtractMethodDialog.form index 9443cb957d4c..896702860dc5 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstactExtractMethodDialog.form +++ b/platform/lang-impl/src/com/intellij/refactoring/extractMethod/AbstactExtractMethodDialog.form @@ -26,9 +26,6 @@ - - - @@ -46,10 +43,10 @@ + + + - - - @@ -59,7 +56,7 @@ - + @@ -75,9 +72,6 @@ - - - @@ -89,7 +83,7 @@ - + @@ -101,9 +95,6 @@ - - - diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java b/platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java index 26fd16dc5d8b..72b76251ab68 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/DocCommentPanel.java @@ -40,7 +40,7 @@ public class DocCommentPanel extends JPanel { public DocCommentPanel(String title) { setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); - myBorder = IdeBorderFactory.createTitledBorderBoldWithIndent(title); + myBorder = IdeBorderFactory.createTitledBorderSimpleWithIndent(title); this.setBorder(myBorder); myRbJavaDocAsIs = new JRadioButton(); 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 00f6d49e6adf..56d826fc3634 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 @@ -15,7 +15,7 @@ - + diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form index fa65b626601e..18691d57f234 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form @@ -39,7 +39,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -222,7 +222,7 @@ - + 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 a8052abc0fbe..8d21eac5c362 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,9 +1,9 @@ - + - + diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java index a3f05b2e3b65..f6a4f8a05cc3 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java @@ -76,20 +76,20 @@ public class KeyboardShortcutDialog extends DialogWrapper { myFirstStrokePanel = new StrokePanel(KeyMapBundle.message("first.stroke.panel.title")); panel.add( myFirstStrokePanel, - new GridBagConstraints(0,0,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,5,0),0,0) + new GridBagConstraints(0,0,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,0,0),0,0) ); // Second stroke panel panel.add( myEnableSecondKeystroke, - new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.WEST,GridBagConstraints.NONE,new Insets(0,0,5,0),0,0) + new GridBagConstraints(0,1,1,1,0,0,GridBagConstraints.WEST,GridBagConstraints.NONE,new Insets(0,0,0,0),0,0) ); mySecondStrokePanel = new StrokePanel(KeyMapBundle.message("second.stroke.panel.title")); panel.add( mySecondStrokePanel, - new GridBagConstraints(0,2,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,5,0),0,0) + new GridBagConstraints(0,2,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,20,0,0),0,0) ); // Shortcut preview @@ -104,7 +104,7 @@ public class KeyboardShortcutDialog extends DialogWrapper { previewPanel.add(myKeystrokePreview); panel.add( previewPanel, - new GridBagConstraints(0,3,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,5,0),0,0) + new GridBagConstraints(0,3,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,0,0),0,0) ); // Conflicts @@ -248,7 +248,7 @@ public class KeyboardShortcutDialog extends DialogWrapper { setLayout(new BorderLayout()); setBorder( BorderFactory.createCompoundBorder( - IdeBorderFactory.createTitledBorderBoldWithIndent(borderText), + IdeBorderFactory.createTitledBorderSimpleWithIndent(borderText), BorderFactory.createEmptyBorder(5,5,5,5) ) ); 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 fd6e19de7d0e..a772b758867f 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,15 +227,15 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable { private JPanel createShortcutsPanel() { JPanel panel = new JPanel(new GridBagLayout()); - 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); + + JComponent separator = SeparatorFactory.createSeparator(KeyMapBundle.message("shortcuts.keymap.label"), myShortcutsList); + panel.add(separator, new GridBagConstraints(1,0,1,1,0,0,GridBagConstraints.WEST,GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 8), 0, 0)); + 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)); @@ -465,7 +465,7 @@ 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); + panel.add(SeparatorFactory.createSeparator(KeyMapBundle.message("action.description.ide.border.factory.title"), null), BorderLayout.NORTH); myDescription = new JEditorPane(UIUtil.HTML_MIME, ""); myDescription.setEditable(false); panel.add(ScrollPaneFactory.createScrollPane(myDescription), BorderLayout.CENTER); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java index 076db5ba39e4..40abeaa82220 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java @@ -124,11 +124,11 @@ class MouseShortcutDialog extends DialogWrapper{ // Single/Double click JPanel clickCountPanel=new JPanel(new GridBagLayout()); - clickCountPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent( + clickCountPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent( KeyMapBundle.message("mouse.shortcut.dialog.click.count.border"))); panel.add( clickCountPanel, - new GridBagConstraints(0,0,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,4,0),0,0) + new GridBagConstraints(0,0,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,0,0,0),0,0) ); clickCountPanel.add( myRbSingleClick, @@ -154,7 +154,7 @@ class MouseShortcutDialog extends DialogWrapper{ clickPadPanel, new GridBagConstraints(0,1,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.BOTH,new Insets(0,0,4,0),0,0) ); - clickPadPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent( + clickPadPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent( KeyMapBundle.message("mouse.shortcut.dialog.click.pad.border"))); myClickPad.setPreferredSize(new Dimension(260,60)); clickPadPanel.add(myClickPad,BorderLayout.CENTER); @@ -162,7 +162,7 @@ class MouseShortcutDialog extends DialogWrapper{ // Shortcut preview JPanel previewPanel=new JPanel(new GridBagLayout()); - previewPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent( + previewPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent( KeyMapBundle.message("mouse.shortcut.dialog.shortcut.preview.border"))); panel.add( previewPanel, @@ -176,7 +176,7 @@ class MouseShortcutDialog extends DialogWrapper{ // Conflicts panel JPanel conflictsPanel=new JPanel(new GridBagLayout()); - conflictsPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent( + conflictsPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent( KeyMapBundle.message("mouse.shortcut.dialog.conflicts.border"))); panel.add( conflictsPanel, 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 e497bcbdcdfa..4d2ea82244b7 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 @@ -140,10 +140,10 @@ + + + - - - diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index f017d140b2b1..baac625f58f7 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -343,7 +343,7 @@ checkbox.collapse.method.bodies=Method bodies checkbox.collapse.javadoc.comments=Documentation comments checkbox.collapse.title.imports=Imports checkbox.collapse.file.header=File header -label.collapse.by.default=Collapse by default: +label.collapse.by.default=Collapse by default checkbox.show.code.folding.outline=Show code folding outline group.tab.appearance=Tab Appearance editbox.tab.limit=Tab limit: diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties index 188ce0f0f396..70a1ac472f95 100644 --- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties +++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties @@ -418,7 +418,7 @@ intention.intercept.ejb.method.or.class.class.text=Add interceptor for EJB class intention.intercept.ejb.method.or.class.method.text=Add interceptor for business method ''{0}'' intention.edit.interceptor.binding.family=Interceptor Bindings intention.edit.interceptor.binding.text=Edit Interceptor ''{0}'' bindings -powered.by=Powered by: +powered.by=Powered by powered.by.plugin=''{0}'' plugin. error.cannot.convert.default.message=Invalid value: ''{0}'' error.cannot.resolve.default.message=Cannot resolve symbol ''{0}'' diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties index 97dabee46214..a5b1e67e1751 100644 --- a/platform/platform-resources-en/src/messages/IdeBundle.properties +++ b/platform/platform-resources-en/src/messages/IdeBundle.properties @@ -518,9 +518,9 @@ progress.connecting.to.plugin.manager=Connecting to {0} label.plugin.vendor.email=E-mail: label.plugin.vendor.name=Name: label.plugin.vendor.home.page=Home page: -editbox.plugin.description=Description: -editbox.plugin.change.notes=Change notes: -label.plugin.home.page=Plugin home page: +editbox.plugin.description=Description +editbox.plugin.change.notes=Change notes +label.plugin.home.page=Plugin home page action.move.module.to.this.group=To this group action.move.module.outside.any.group=Outside any group message.move.modules.to.group=Move {0} to the group {1} @@ -595,12 +595,12 @@ title.edit.todo.pattern=Edit Pattern title.todo=TODO title.add.todo.pattern=Add Pattern button.edit=&Edit... -label.todo.filters=Filters: +label.todo.filters=Filters button.add.d=A&dd... title.add.todo.filter=Add Filter button.edit.t=Edi&t... button.remove.m=Re&move -label.todo.patterns=Patterns: +label.todo.patterns=Patterns text.todo.no.patterns=No patterns configured text.todo.no.filters=No filters configured node.todo.group={0} ({1} {1,choice,1#item|2#items} in {2} {2,choice,1#file|2#files}) @@ -933,7 +933,7 @@ scope.banner.text=Scope ''{0}'' prompt.please.select.module.jdk=Please select {0} to be set for this module scopes.save.dialog.title.shared=Save as shared scope scopes.save.dialog.title.local=Save as local scope -plugin.version.label=Version: +plugin.version.label=Version plugin.size.label=Size: plugin.status.available=Available detach.library.from.module=Detach library ''{0}'' from module ''{1}''?\nNo file on disk will be hurt. diff --git a/platform/platform-resources-en/src/messages/KeyMapBundle.properties b/platform/platform-resources-en/src/messages/KeyMapBundle.properties index aa008059038a..c1db7dac3a08 100644 --- a/platform/platform-resources-en/src/messages/KeyMapBundle.properties +++ b/platform/platform-resources-en/src/messages/KeyMapBundle.properties @@ -31,14 +31,14 @@ first.stroke.panel.title=First Stroke second.stroke.panel.title=Second Stroke shortcut.preview.ide.border.factory.title=Shortcut Preview conflicts.ide.border.factory.title=Conflicts -action.description.ide.border.factory.title=Action Description: +action.description.ide.border.factory.title=Action Description keymaps.border.factory.title=Keymaps quick.lists.ide.border.factory.title=Quick lists no.conflict.info.message=No conflicts assigned.to.info.message=Assigned to {0} keymap.display.name=Keymap based.on.keymap.label=Based on keymap: {0} -shortcuts.keymap.label=Shortc&uts: +shortcuts.keymap.label=Shortc&uts shortcuts.keymap.no.shortcuts=No shortcuts add.keymap.label=A&dd remove.keymap.label=Remo&ve diff --git a/platform/platform-resources-en/src/messages/RefactoringBundle.properties b/platform/platform-resources-en/src/messages/RefactoringBundle.properties index 752cd85b197f..df144b679416 100644 --- a/platform/platform-resources-en/src/messages/RefactoringBundle.properties +++ b/platform/platform-resources-en/src/messages/RefactoringBundle.properties @@ -46,7 +46,6 @@ changeSignature.propagate.parameters.title=Propa&gate Parameters... changeSignature.propagate.exceptions.title=Propagate E&xceptions... changeSignature.parameter.caller.chooser=Select Methods To Propagate New Parameters changeSignature.exception.caller.chooser=Select Methods To Propagate New Exceptions -name.prompt=&Name: changeSignature.return.type.prompt=Return &type changeSignature.name.prompt=&Name signature.preview.border.title=Signature Preview @@ -71,7 +70,7 @@ visibility.private=Pri&vate visibility.package.local=Pac&kage local visibility.border.title=Visibility visibility.combo.title=&Visibility -moveInstanceMethod.select.an.instance.parameter=Select an &instance parameter: +moveInstanceMethod.select.an.instance.parameter=Select an &instance parameter destination.package=&Destination package: choose.destination.package=Choose Destination Package interface.name.prompt=&Interface name: diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueLinkConfigurationDialog.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueLinkConfigurationDialog.form index e7c30e8e14b3..689f211230b7 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueLinkConfigurationDialog.form +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/IssueLinkConfigurationDialog.form @@ -1,6 +1,6 @@ - + @@ -8,48 +8,14 @@ - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -59,7 +25,7 @@ - + @@ -105,6 +71,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.form index 4e1309fb05f3..00b6744566c5 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.form +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsBackgroundOperationsConfigurationPanel.form @@ -3,7 +3,7 @@ - + @@ -11,173 +11,158 @@ - + - + - + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - + - + - + - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - - + - + + + + + + - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
- - - - - 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 5d3ba37ea07d..4527a9c9cac6 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,32 +1,14 @@
- + - + - - - - - - - - - - - - - - - - - - - + @@ -137,6 +119,14 @@ + + + + + + + + diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.form index 26d37e13bd5d..23a142880a30 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.form +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.form @@ -61,7 +61,7 @@ - + @@ -69,6 +69,23 @@ + + + + + + + + + + + + + + + + + @@ -117,19 +134,6 @@ - - - - - - - - - - - - - diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form index c7ffb0046c7a..472c922f0db2 100644 --- a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form +++ b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form @@ -87,7 +87,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -127,7 +127,7 @@ - +