MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

form's refactor. run configurations forms. refactoring forms.

Browse Source
This commit is contained in:
Evgeny Zakrevsky
2011-07-29 20:44:26 +04:00
parent 8951103dda
commit fecc46e4f9
24 changed files with 104 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form
+13 -33
View File
@@ -3,7 +3,7 @@
<grid id="e5f4d" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="7" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="133" y="39" width="454" height="596"/>
<xy x="133" y="39" width="564" height="646"/>
</constraints>
<properties/>
<border type="none"/>
@@ -81,6 +81,9 @@
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="etched" title-resource-bundle="messages/ExecutionBundle" title-key="applet.configuration.url.border"/>
<children>
<component id="a2b70" class="javax.swing.JLabel" binding="myHtmlFileLabel">
@@ -101,7 +104,7 @@
</component>
</children>
</grid>
<grid id="71bb1" binding="myClassOptions" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="7">
<grid id="71bb1" binding="myClassOptions" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="7">
<margin top="5" left="5" bottom="5" right="5"/>
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
@@ -109,6 +112,9 @@
<properties>
<enabled value="true"/>
</properties>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="etched" title-resource-bundle="messages/ExecutionBundle" title-key="applet.configuration.applet.class.border"/>
<children>
<grid id="9c777" layout-manager="GridLayoutManager" row-count="1" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
@@ -162,10 +168,13 @@
<grid id="32908" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/ExecutionBundle" title-key="applet.configuration.applet.parameters.label"/>
<children>
<grid id="f7d4e" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
@@ -237,35 +246,6 @@
</component>
</children>
</grid>
<grid id="fcccf" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="de175" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ExecutionBundle" key="applet.configuration.applet.parameters.label"/>
</properties>
</component>
<xy id="c0444" layout-manager="XYLayout" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
<maximum-size width="-1" height="1"/>
</grid>
</constraints>
<properties/>
<border type="bevel-raised"/>
<children/>
</xy>
</children>
</grid>
</children>
</grid>
</children>
java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurable.form
+10 -10
View File
@@ -3,7 +3,7 @@
<grid id="715ea" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="64" y="1" width="657" height="391"/>
<xy x="64" y="1" width="657" height="513"/>
</constraints>
<properties/>
<border type="none"/>
@@ -16,8 +16,8 @@
<text resource-bundle="messages/ExecutionBundle" key="remote.configuration.remote.debugging.allows.you.to.connect.idea.to.a.running.jvm.label"/>
</properties>
</component>
<grid id="e37d3" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="5" vgap="8">
<margin top="3" left="5" bottom="5" right="5"/>
<grid id="e37d3" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="3" left="0" bottom="5" right="5"/>
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false">
<minimum-size width="-1" height="170"/>
@@ -25,10 +25,10 @@
</grid>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="etched" title-resource-bundle="messages/ExecutionBundle" title-key="remote.configuration.settings.border"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
</clientProperties>
<children>
<grid id="d0319" binding="mySocketPanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
@@ -56,7 +56,7 @@
</component>
<component id="66348" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ExecutionBundle" key="remote.configuration.host.label"/>
@@ -64,7 +64,7 @@
</component>
<component id="24ab6" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ExecutionBundle" key="remote.configuration.port.label"/>
@@ -126,7 +126,7 @@
</component>
<component id="360fe" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ExecutionBundle" key="remote.configuration.debugger.mode.label"/>
@@ -150,7 +150,7 @@
</component>
<component id="a481c" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ExecutionBundle" key="remote.configuration.transport.label"/>
java/java-impl/src/com/intellij/application/options/editor/JavaAutoImportOptions.form
+5 -5
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.application.options.editor.JavaAutoImportOptions">
<grid id="27dc6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="6" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="27dc6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="445" height="411"/>
@@ -32,7 +32,7 @@
<grid id="2ef17" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="5" bottom="0" right="0"/>
<constraints>
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -62,12 +62,12 @@
<grid id="e67c2" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<grid row="5" column="0" row-span="1" col-span="2" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="5" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<scrollpane class="com.intellij.ui.components.JBScrollPane" id="9c6c">
<scrollpane id="9c6c" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="0" column="0" row-span="3" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
@@ -106,7 +106,7 @@
</grid>
<component id="64f08" class="com.intellij.ui.TitledSeparator">
<constraints>
<grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ApplicationBundle" key="exclude.from.completion.group"/>
java/java-impl/src/com/intellij/refactoring/copy/CopyClassDialog.java
+1 -1
View File
@@ -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;
}
java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationDialog.java
+4 -4
View File
@@ -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);
java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
+1 -1
View File
@@ -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;
java/java-impl/src/com/intellij/refactoring/memberPushDown/PushDownDialog.java
+1 -1
View File
@@ -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;
platform/lang-impl/src/com/intellij/application/options/editor/EditorAppearanceConfigurable.java
+1 -1
View File
@@ -181,7 +181,7 @@ public class EditorAppearanceConfigurable extends CompositeConfigurable<UnnamedC
public JComponent createComponent() {
for (UnnamedConfigurable provider : getConfigurables()) {
myAddonPanel.add(provider.createComponent(), new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0, 0, GridBagConstraints.NORTHWEST,
GridBagConstraints.NONE, new Insets(5,0,7,0), 0,0));
GridBagConstraints.NONE, new Insets(0,0,15,0), 0,0));
}
return myRootPanel;
}
platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.form
+2 -2
View File
@@ -58,7 +58,7 @@
</properties>
</component>
<grid id="6ebf" layout-manager="GridLayoutManager" row-count="1" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="5" bottom="5" right="5"/>
<margin top="0" left="0" bottom="5" right="5"/>
<constraints>
<grid row="7" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="1" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
@@ -101,7 +101,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="none" title="Enter"/>
<children>
platform/lang-impl/src/com/intellij/application/options/editor/EditorSmartKeysConfigurable.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class EditorSmartKeysConfigurable extends CompositeConfigurable<UnnamedCo
public JComponent createComponent() {
for (UnnamedConfigurable provider : getConfigurables()) {
myAddonPanel.add(provider.createComponent(), new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0, 0, GridBagConstraints.NORTHWEST,
GridBagConstraints.NONE, new Insets(3,0,5,0), 0,0));
GridBagConstraints.NONE, new Insets(0,0,15,0), 0,0));
}
return myRootPanel;
}
platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java
+1 -1
View File
@@ -95,7 +95,7 @@ class EditVariableDialog extends DialogWrapper {
protected JComponent createCenterPanel() {
JPanel panel = new JPanel();
panel.setBorder(IdeBorderFactory.createTitledBorderBoldWithIndent(
panel.setBorder(IdeBorderFactory.createTitledBorderSimpleWithoutIndent(
CodeInsightBundle.message("templates.dialog.edit.variables.border.title")));
panel.setLayout(new BorderLayout());
panel.add(createVariablesTable(), BorderLayout.CENTER);
platform/lang-impl/src/com/intellij/diagnostic/logging/LogConfigurationPanel.form
+8 -13
View File
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.diagnostic.logging.LogConfigurationPanel">
<grid id="57687" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="57687" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="25" y="74" width="329" height="175"/>
<xy x="25" y="74" width="392" height="210"/>
</constraints>
<properties/>
<border type="none"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/DiagnosticBundle" title-key="log.monitor.group"/>
<children>
<grid id="93252" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="2" bottom="0" right="2"/>
<constraints>
<grid row="1" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -47,17 +50,9 @@
</component>
</children>
</grid>
<component id="8c826" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/DiagnosticBundle" key="log.monitor.group"/>
</properties>
</component>
<grid id="faa06" binding="myScrollPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form
+18 -8
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.execution.impl.ConfigurationSettingsEditorWrapper">
<grid id="27dc6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<grid id="27dc6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="5" left="8" bottom="5" right="5"/>
<constraints>
<xy x="124" y="274" width="276" height="150"/>
</constraints>
@@ -19,28 +19,38 @@
</grid>
<vspacer id="48f8f">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
<grid id="d489d" binding="myStepsPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="8" fill="2" indent="0" use-parent-layout="false">
<minimum-size width="200" height="-1"/>
</grid>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="etched" title-resource-bundle="messages/ExecutionBundle" title-key="before.launch.panel.title"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
</clientProperties>
<children/>
</grid>
<component id="c7b94" class="javax.swing.JCheckBox" binding="myCbStoreProjectConfiguration">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/ExecutionBundle" key="run.configuration.store.place.option"/>
</properties>
</component>
<vspacer id="6092a">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
<minimum-size width="-1" height="30"/>
<preferred-size width="-1" height="30"/>
</grid>
</constraints>
</vspacer>
</children>
</grid>
</form>
platform/lang-impl/src/com/intellij/util/ui/tree/LanguagePerFileConfigurable.form
+2 -2
View File
@@ -6,7 +6,7 @@
<xy x="20" y="20" width="577" height="400"/>
</constraints>
<properties/>
<border type="none" title=""/>
<border type="none"/>
<children>
<component id="e9af6" class="javax.swing.JLabel" binding="myLabel">
<constraints>
@@ -14,7 +14,7 @@
</constraints>
<properties/>
</component>
<scrollpane class="com.intellij.ui.components.JBScrollPane" id="fe0c3" binding="myTreePanel" custom-create="true">
<scrollpane id="fe0c3" class="com.intellij.ui.components.JBScrollPane" binding="myTreePanel" custom-create="true">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
platform/platform-api/src/com/intellij/ui/IdeBorderFactory.java
+3 -3
View File
@@ -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) {
platform/platform-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeEditor.java
+4 -4
View File
@@ -139,16 +139,16 @@ public class CustomFileTypeEditor extends SettingsEditor<AbstractFileType> {
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<AbstractFileType> {
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());
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeyboardShortcutDialog.java
+3 -3
View File
@@ -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);
platform/platform-resources-en/src/messages/DiagnosticBundle.properties
+1 -1
View File
@@ -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
platform/platform-resources-en/src/messages/ExecutionBundle.properties
+1 -1
View File
@@ -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:
plugins/git4idea/src/git4idea/i18n/GitBundle.properties
+2 -2
View File
@@ -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
plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.form
+8 -8
View File
@@ -3,7 +3,7 @@
<grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="439" height="116"/>
<xy x="20" y="20" width="453" height="116"/>
</constraints>
<properties/>
<border type="none"/>
@@ -34,7 +34,7 @@
</component>
<component id="dcccd" class="javax.swing.JRadioButton" binding="myForceMergeRadioButton" default-binding="true">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="git4idea/i18n/GitBundle" key="update.options.type.merge"/>
@@ -43,7 +43,7 @@
</component>
<component id="864a1" class="javax.swing.JRadioButton" binding="myForceRebaseRadioButton" default-binding="true">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="git4idea/i18n/GitBundle" key="update.options.type.rebase"/>
@@ -52,14 +52,14 @@
</component>
<hspacer id="33f38">
<constraints>
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
<minimum-size width="40" height="-1"/>
<grid row="2" column="1" row-span="2" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
<minimum-size width="70" height="-1"/>
</grid>
</constraints>
</hspacer>
<component id="48ad6" class="javax.swing.JRadioButton" binding="myBranchDefaultRadioButton" default-binding="true">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<selected value="true"/>
@@ -87,7 +87,7 @@
</component>
<component id="98593" class="javax.swing.JRadioButton" binding="myStashRadioButton" default-binding="true">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<selected value="true"/>
@@ -97,7 +97,7 @@
</component>
<component id="d7fb3" class="javax.swing.JRadioButton" binding="myShelveRadioButton" default-binding="true">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="2" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="1" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="git4idea/i18n/GitBundle" key="update.options.save.shelve"/>
plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
+4 -1
View File
@@ -3,7 +3,7 @@
<grid id="ece1c" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="5">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="28" y="28" width="660" height="531"/>
<xy x="28" y="28" width="722" height="746"/>
</constraints>
<properties/>
<border type="none"/>
@@ -90,6 +90,9 @@
</grid>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="etched" title-resource-bundle="messages/ExecutionBundle" title-key="junit.configuration.test.border"/>
<children>
<component id="b109" class="com.intellij.openapi.ui.LabeledComponent" binding="myMethod" custom-create="true">
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form
+4 -1
View File
@@ -38,7 +38,10 @@
<grid row="1" column="0" row-span="1" col-span="5" vsize-policy="3" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="etched" title="Search for tests:"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="etched" title="Search for tests"/>
<children>
<component id="3d515" class="com.intellij.openapi.ui.LabeledComponent" binding="methodField">
<constraints>
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form
+6 -6
View File
@@ -2,7 +2,7 @@
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.intellij.lang.xpath.xslt.run.XsltRunSettingsEditor.Editor">
<tabbedpane id="fb52f" binding="myComponent">
<constraints>
<xy x="115" y="24" width="566" height="497"/>
<xy x="115" y="24" width="576" height="497"/>
</constraints>
<properties/>
<border type="none"/>
@@ -22,7 +22,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="none" title="Output"/>
<children>
@@ -126,7 +126,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="etched" title="Input"/>
<children>
@@ -171,11 +171,11 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithoutIndent"/>
</clientProperties>
<border type="none" title="Parameters"/>
<children>
<scrollpane class="com.intellij.ui.components.JBScrollPane" id="fabc7">
<scrollpane id="fabc7" class="com.intellij.ui.components.JBScrollPane">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
@@ -245,7 +245,7 @@
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactoryBoldWithIndent"/>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactorySimpleWithIndent"/>
</clientProperties>
<border type="none" title="Classpath and JDK"/>
<children>