diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form index f9b21bfc6251..9088d69ecf79 100644 --- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form +++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form @@ -3,7 +3,7 @@ - + @@ -81,6 +81,9 @@ + + + @@ -101,7 +104,7 @@ - + @@ -109,6 +112,9 @@ + + + @@ -162,10 +168,13 @@ - + - + + + + @@ -237,35 +246,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.form b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.form index 0514d8af70ce..eff924e19442 100644 --- a/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.form +++ b/java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.form @@ -3,7 +3,7 @@ - + @@ -16,8 +16,8 @@ - - + + @@ -25,10 +25,10 @@ + + + - - - @@ -56,7 +56,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -150,7 +150,7 @@ - + diff --git a/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form b/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form index ec643029541c..818b36a2668e 100644 --- a/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form +++ b/java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form @@ -1,6 +1,6 @@
- + @@ -32,7 +32,7 @@ - + @@ -62,12 +62,12 @@ - + - + @@ -106,7 +106,7 @@ - + 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 268ca6ff468e..5e1fd796e4f6 100644 --- a/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java @@ -147,7 +147,7 @@ class CopyClassDialog extends DialogWrapper{ gbConstraints.fill = GridBagConstraints.NONE; panel.add(myCbMoveToAnotherSourceFolder, gbConstraints); - panel.setPreferredSize(new Dimension(400, 120)); + panel.setPreferredSize(new Dimension(400, 150)); return panel; } 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 14511442fecd..33e17ec174ac 100644 --- a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java @@ -167,7 +167,7 @@ public class InheritanceToDelegationDialog extends RefactoringDialog { gbc.gridx = 0; - gbc.insets = new Insets(4, 8, 0, 8); + gbc.insets = new Insets(4, 0, 0, 8); myClassCombo = new JComboBox(mySuperClasses); myClassCombo.setRenderer(new ClassCellRenderer(myClassCombo.getRenderer())); gbc.gridwidth = 2; @@ -182,14 +182,14 @@ public class InheritanceToDelegationDialog extends RefactoringDialog { gbc.gridy++; gbc.gridwidth = 1; - gbc.insets = new Insets(4, 8, 4, 0); + gbc.insets = new Insets(4, 0, 4, 0); final JLabel fieldNameLabel = new JLabel(); panel.add(fieldNameLabel, gbc); myFieldNameField = new NameSuggestionsField(myProject); gbc.gridx++; gbc.gridwidth = GridBagConstraints.REMAINDER; - gbc.insets = new Insets(4, 4, 4, 8); + gbc.insets = new Insets(4, 0, 4, 8); gbc.weightx = 1.0; panel.add(myFieldNameField.getComponent(), gbc); fieldNameLabel.setText(RefactoringBundle.message("field.name")); @@ -198,7 +198,7 @@ public class InheritanceToDelegationDialog extends RefactoringDialog { gbc.gridx = 0; gbc.gridy++; gbc.gridwidth = 1; - gbc.insets = new Insets(4, 8, 4, 0); + gbc.insets = new Insets(4, 0, 4, 0); gbc.weightx = 0.0; final JLabel innerClassNameLabel = new JLabel(); panel.add(innerClassNameLabel, gbc); 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 639472e3dbe3..abc477fed6fe 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java @@ -113,7 +113,7 @@ public class PullUpDialog extends RefactoringDialog { panel.setLayout(new GridBagLayout()); GridBagConstraints gbConstraints = new GridBagConstraints(); - gbConstraints.insets = new Insets(4, 5, 4, 8); + gbConstraints.insets = new Insets(4, 0, 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 dd7fa71a4d37..d0ce36fab2d2 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, 5, 10, 8); + gbConstraints.insets = new Insets(4, 0, 10, 8); gbConstraints.weighty = 1; gbConstraints.weightx = 1; gbConstraints.gridy = 0; diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java index 389d377e3879..d7069f06fb7d 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java @@ -181,7 +181,7 @@ public class EditorAppearanceConfigurable extends CompositeConfigurable - + @@ -101,7 +101,7 @@ - + diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java index 2e209a39fc99..6feba37f8ea9 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java @@ -113,7 +113,7 @@ public class EditorSmartKeysConfigurable extends CompositeConfigurable - + - + - + + + + - + @@ -47,17 +50,9 @@ - - - - - - - - - + diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form index 612cc947e4d9..48c7bf5ac70b 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form @@ -1,7 +1,7 @@ - - + + @@ -19,28 +19,38 @@ - + - + + + + + + - - - - + + + + + + + + + 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 5b42fc6a24fc..1bc76a7ee5a0 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 @@ -6,7 +6,7 @@
- + @@ -14,7 +14,7 @@ - + diff --git a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java index 843743e899ad..055ec549b17a 100644 --- a/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java +++ b/platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java @@ -58,15 +58,15 @@ public class IdeBorderFactory { } public static TitledBorder createTitledBorderBoldWithIndent(String title) { - return new IdeaTitledBorder(title, UIUtil.getBorderFont().deriveFont(Font.BOLD), UIUtil.getBorderColor(), 15, 1, new Insets(3,0,10,0)); + return new IdeaTitledBorder(title, UIUtil.getBorderFont().deriveFont(Font.BOLD), UIUtil.getBorderColor(), 18, 1, new Insets(5,0,10,0)); } public static TitledBorder createTitledBorderBoldWithoutIndent(String title) { - return new IdeaTitledBorder(title, UIUtil.getBorderFont().deriveFont(Font.BOLD), UIUtil.getBorderColor(), 0, 1, new Insets(3,0,10,0)); + return new IdeaTitledBorder(title, UIUtil.getBorderFont().deriveFont(Font.BOLD), UIUtil.getBorderColor(), 0, 1, new Insets(5,0,10,0)); } public static TitledBorder createTitledBorderSimpleWithIndent(String title) { - return new IdeaTitledBorder(title, UIUtil.getBorderFont(), UIUtil.getBorderColor(), 12, 1, new Insets(3,0,6,0)); + return new IdeaTitledBorder(title, UIUtil.getBorderFont(), UIUtil.getBorderColor(), 15, 1, new Insets(3,0,6,0)); } public static TitledBorder createTitledBorderSimpleWithoutIndent(String title) { diff --git a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java index 7084681f3e86..7380f18dbb28 100644 --- a/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java +++ b/platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java @@ -139,16 +139,16 @@ public class CustomFileTypeEditor extends SettingsEditor { info.add(myFileTypeDescr, gc); gc.gridx = 0; gc.gridy = 3; - _panel0.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); + _panel0.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 5)); _panel0.add(info, BorderLayout.WEST); fileTypePanel.add(_panel0, BorderLayout.NORTH); JPanel panel1 = new JPanel(); - panel1.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(IdeBundle.message("group.customfiletype.syntax.highlighting"))); + panel1.setBorder(IdeBorderFactory.createTitledBorderSimpleWithoutIndent(IdeBundle.message("group.customfiletype.syntax.highlighting"))); JPanel highlighterPanel = panel1; highlighterPanel.setLayout(new BorderLayout()); JPanel panel2 = new JPanel(); - panel2.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(IdeBundle.message("group.customfiletype.options"))); + panel2.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(IdeBundle.message("group.customfiletype.options"))); JPanel commentsAndNumbersPanel = panel2; commentsAndNumbersPanel.setLayout(new GridBagLayout()); @@ -231,7 +231,7 @@ public class CustomFileTypeEditor extends SettingsEditor { private JPanel createKeywordsPanel(final int index) { JPanel panel = new JPanel(); - panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(IdeBundle.message("listbox.customfiletype.keywords"))); + panel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithoutIndent(IdeBundle.message("listbox.customfiletype.keywords"))); JPanel keywordsPanel = panel; keywordsPanel.setLayout(new BorderLayout()); 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 f6a4f8a05cc3..87fd93b0f3fc 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 @@ -89,7 +89,7 @@ public class KeyboardShortcutDialog extends DialogWrapper { 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,20,0,0),0,0) + new GridBagConstraints(0,2,1,1,1,0,GridBagConstraints.CENTER,GridBagConstraints.HORIZONTAL,new Insets(0,30,0,0),0,0) ); // Shortcut preview @@ -97,7 +97,7 @@ public class KeyboardShortcutDialog extends DialogWrapper { JPanel previewPanel = new JPanel(new BorderLayout()); previewPanel.setBorder( BorderFactory.createCompoundBorder( - IdeBorderFactory.createTitledBorderBoldWithIndent(KeyMapBundle.message("shortcut.preview.ide.border.factory.title")), + IdeBorderFactory.createTitledBorderSimpleWithIndent(KeyMapBundle.message("shortcut.preview.ide.border.factory.title")), BorderFactory.createEmptyBorder(5,5,5,5) ) ); @@ -110,7 +110,7 @@ public class KeyboardShortcutDialog extends DialogWrapper { // Conflicts JPanel conflictsPanel = new JPanel(new BorderLayout()); - conflictsPanel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(KeyMapBundle.message("conflicts.ide.border.factory.title"))); + conflictsPanel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithIndent(KeyMapBundle.message("conflicts.ide.border.factory.title"))); myConflictInfoArea.setEditable(false); myConflictInfoArea.setBackground(panel.getBackground()); myConflictInfoArea.setLineWrap(true); diff --git a/platform/platform-resources-en/src/messages/DiagnosticBundle.properties b/platform/platform-resources-en/src/messages/DiagnosticBundle.properties index f10e8ed03bb2..2c704bddf0db 100644 --- a/platform/platform-resources-en/src/messages/DiagnosticBundle.properties +++ b/platform/platform-resources-en/src/messages/DiagnosticBundle.properties @@ -49,7 +49,7 @@ error.report.title=Error Report log.monitor.no.files=No log files attached log.monitor.remove.button=&Remove log.monitor.add.button=A&dd -log.monitor.group=Log Files To Be Shown In Console: +log.monitor.group=Log Files To Be Shown In Console log.monitor.log.file.column=Log File Entry log.monitor.is.active.column=Is Active log.monitor.is.skipped.column=Skip Content diff --git a/platform/platform-resources-en/src/messages/ExecutionBundle.properties b/platform/platform-resources-en/src/messages/ExecutionBundle.properties index de92e985ae87..5b37f7ee305c 100644 --- a/platform/platform-resources-en/src/messages/ExecutionBundle.properties +++ b/platform/platform-resources-en/src/messages/ExecutionBundle.properties @@ -167,7 +167,7 @@ remote.debug.configuration.display.name=Remote applet.configuration.url.label=&URL applet.configuration.applet.class.border=Applet Class applet.configuration.applet.parameters.label=Applet Parameters -applet.configuration.applet.class.label=Applet &class: +applet.configuration.applet.class.label=Applet &class button.remove=&Remove button.add=&Add applet.configuration.height.label= &Height: diff --git a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties index 575c2eceb333..c02e4930db18 100644 --- a/plugins/git4idea/src/git4idea/i18n/GitBundle.properties +++ b/plugins/git4idea/src/git4idea/i18n/GitBundle.properties @@ -446,7 +446,7 @@ update.locally.modified.revert=Revert Files update.locally.modified.title=Locally modified files are detected update.options.display.name=Git Update Settings update.options.no.commit=No &Commit -update.options.save.before.update=Clean working tree before update +update.options.save.before.update=Clean working tree before update: update.options.save.keep.tooltip=Leave changes on working tree update.options.save.keep=Do &Not Clean update.options.save.shelve.tooltip=Use IDEA Shelve (the files will be restored when update finishes) @@ -459,7 +459,7 @@ update.options.type.merge.tooltip=Use merge update strategy for all git vcs root update.options.type.merge=&Merge update.options.type.rebase.tooltip=Use rebase update strategy for all git vcs roots update.options.type.rebase=&Rebase -update.options.type=Update Type +update.options.type=Update Type: update.rebase.no.change.cancel=Cancel Update update.rebase.no.change.retry=Retry Continue update.rebase.no.change.skip=Skip Commit diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form index 24522e88c103..85eeedba1316 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form +++ b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form @@ -3,7 +3,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -52,14 +52,14 @@ - - + + - + @@ -87,7 +87,7 @@ - + @@ -97,7 +97,7 @@ - + diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form index f081e0dc1669..1c3a3383eb0c 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form +++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form @@ -3,7 +3,7 @@ - + @@ -90,6 +90,9 @@ + + + diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form index 41548148da4d..3e786c4e03c2 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form @@ -38,7 +38,10 @@ - + + + + diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form index c7dba07b7b3f..34be3105acdc 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form @@ -2,7 +2,7 @@
- + @@ -22,7 +22,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -171,11 +171,11 @@ - + - + @@ -245,7 +245,7 @@ - +