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 daf12a07fb47..12735b98a9b3 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 @@ -1,6 +1,6 @@
- + @@ -8,94 +8,103 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + 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 d82443afa5d7..653fd69a270f 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 @@ -18,26 +18,22 @@ + - + - + + + + - - - - - - - - - + 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 e6c321492a41..3d6b03fd3dc3 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.add(SeparatorFactory.createSeparator(InspectionsBundle.message("inspection.description.title"), null), BorderLayout.NORTH); + 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/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form index f72dbd347179..077951573c58 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.form @@ -34,7 +34,7 @@ - + @@ -106,134 +106,154 @@ - + - + - - - - - - - - - - + - - - - + + + + + - - + + + + + - - - + - + + + + + + + + + + + + - - + + - - - - - - - - - - + - - - - - + + + + + - - + + + + + - - - - - + + - + + + + + + + + + + + + + + - + - + - + - + + - + - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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..fea548da54b8 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,13 @@ 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)); + panel.setBorder(IdeBorderFactory.createTitledBorder(KeyMapBundle.message("shortcuts.keymap.label"))); 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)); @@ -465,10 +463,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/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties index 7840279e20f4..188ce0f0f396 100644 --- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties +++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties @@ -214,7 +214,7 @@ intention.create.test.dialog.java=Java lightbulb.tooltip=Click or press {0} dialog.intention.settings.intention.list.title=Intention List dialog.intention.settings.description.panel.title=Description -dialog.intention.settings.description.usage.example.title=
Usage Example:
+dialog.intention.settings.description.usage.example.title=Usage Example intention.settings=Intentions intention.settings.category.text=\
You have selected intention category ''{0}''.
\ 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 231ef2d416de..82111e74bf29 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 @@ -16,7 +16,7 @@ - + diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form index 281938cac458..610a20455a77 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form +++ b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form @@ -1,100 +1,112 @@ - + - + - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + - + + - + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +