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

Applying new border.

Browse Source
This commit is contained in:
Evgeny Zakrevsky
2011-07-07 21:29:46 +04:00
parent da49fff560
commit 25fcada166
11 changed files with 68 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form
+3
View File
@@ -8,6 +8,9 @@
</constraints>
<properties/>
<border type="etched" title-resource-bundle="messages/CompilerBundle" title-key="javac.options.group.title"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory"/>
</clientProperties>
<children>
<component id="8538e" class="javax.swing.JCheckBox" binding="myCbDeprecation">
<constraints>
java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java
+1 -1
View File
@@ -110,7 +110,7 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable
final JPanel processorTablePanel = new JPanel(new BorderLayout());
myProcessorsModel = new ProcessorTableModel();
processorTablePanel.setBorder(new TitledBorder("Annotation Processors"));
processorTablePanel.setBorder(IdeBorderFactory.createTitledBorder("Annotation Processors"));
myProcessorTable = new Table(myProcessorsModel);
myProcessorTable.getEmptyText().setText("No processors configured");
java/java-impl/src/com/intellij/application/options/CodeStyleImportForm.form
+4 -4
View File
@@ -7,7 +7,7 @@
<properties/>
<border type="none"/>
<children>
<grid id="67fc8" binding="myGeneralPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="67fc8" binding="myGeneralPanel" layout-manager="BorderLayout" hgap="-1" vgap="-1">
<constraints>
<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"/>
<gridbag weightx="0.0" weighty="0.0"/>
@@ -16,7 +16,7 @@
<border type="none"/>
<children/>
</grid>
<grid id="90fcc" binding="myJSPPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="90fcc" binding="myJSPPanel" layout-manager="BorderLayout" hgap="-1" vgap="-1">
<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"/>
<gridbag weightx="0.0" weighty="0.0"/>
@@ -25,7 +25,7 @@
<border type="none"/>
<children/>
</grid>
<grid id="27541" binding="myPackagesPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="27541" binding="myPackagesPanel" layout-manager="BorderLayout" hgap="-1" vgap="-1">
<constraints>
<grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
@@ -34,7 +34,7 @@
<border type="none"/>
<children/>
</grid>
<grid id="ff1de" binding="myImportsLayoutPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
<grid id="ff1de" binding="myImportsLayoutPanel" layout-manager="BorderLayout" hgap="-1" vgap="-1">
<constraints>
<grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
<gridbag weightx="0.0" weighty="0.0"/>
java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class CodeStyleImportsPanel extends JPanel {
public void actionPerformed(ActionEvent e) {
boolean isComma = myJspImportCommaSeparated.isSelected();
labelPanel.removeAll();
labelPanel.add(isComma ? commaSeparatedLabel : oneImportPerDirectiveLabel, BorderLayout.CENTER);
labelPanel.add(isComma ? commaSeparatedLabel : oneImportPerDirectiveLabel, BorderLayout.NORTH);
labelPanel.repaint();
labelPanel.revalidate();
}
platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java
+2 -5
View File
@@ -27,10 +27,7 @@ import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.ui.ShadowAction;
import com.intellij.openapi.util.IconLoader;
import com.intellij.ui.ColorChooser;
import com.intellij.ui.ScrollPaneFactory;
import com.intellij.ui.SpeedSearchBase;
import com.intellij.ui.TableSpeedSearch;
import com.intellij.ui.*;
import com.intellij.ui.table.JBTable;
import org.jetbrains.annotations.Nullable;
@@ -90,7 +87,7 @@ public class RegistryUi implements Disposable {
myDescriptionLabel = new JTextArea(3, 50);
myDescriptionLabel.setEditable(false);
final JScrollPane label = ScrollPaneFactory.createScrollPane(myDescriptionLabel);
label.setBorder(new TitledBorder("Description"));
label.setBorder(IdeBorderFactory.createTitledBorder("Description"));
myContent.add(ScrollPaneFactory.createScrollPane(myTable), BorderLayout.CENTER);
myContent.add(label, BorderLayout.SOUTH);
platform/platform-api/src/com/intellij/ui/border/IdeaTitledBorder.java
+3 -3
View File
@@ -14,17 +14,17 @@ import java.awt.*;
public class IdeaTitledBorder extends TitledBorder {
// Space between the border and the component's edge
static protected final int EDGE_SPACING = 0;
static protected final int EDGE_SPACING = 2;
// Space between the border and text
static protected final int TEXT_SPACING = 0;
static protected final int TEXT_SPACING = 2;
// Horizontal inset of text that is left or right justified
static protected final int TEXT_INSET_H = -15;
public IdeaTitledBorder(String title) {
super(BorderFactory.createCompoundBorder(
BorderFactory.createEmptyBorder(0, 15, 0, 0),
BorderFactory.createEmptyBorder(0, 20, 0, 0),
BorderFactory.createMatteBorder(1, 0, 0, 0, UIUtil.getBorderColor())),
title + " ");
}
platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java
+3 -2
View File
@@ -23,6 +23,7 @@ import com.intellij.openapi.options.SearchableConfigurable;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.ui.DocumentAdapter;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.SeparatorWithText;
import com.intellij.ui.components.panels.VerticalBox;
import com.intellij.util.ui.AwtVisitor;
@@ -121,7 +122,7 @@ public class QuickAccessConfigurable extends JPanel implements SearchableConfigu
kbConfig.add(modifiers);
kbConfig.add(hold);
kbConfig.setBorder(new TitledBorder("Keyboard Configuration"));
kbConfig.setBorder(IdeBorderFactory.createTitledBorder("Keyboard Configuration"));
box.add(kbConfig);
@@ -178,7 +179,7 @@ public class QuickAccessConfigurable extends JPanel implements SearchableConfigu
hasConflicts |= printConflict(c, KeyEvent.VK_ENTER, QuickAccessSettings.SWITCH_APPLY);
if (hasConflicts) {
myConflicts.setBorder(new TitledBorder("Conflicts"));
myConflicts.setBorder(IdeBorderFactory.createTitledBorder("Conflicts"));
c.gridx = 0;
c.gridy++;
c.gridwidth = 2;
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.form
+3
View File
@@ -6,6 +6,9 @@
<xy x="20" y="20" width="493" height="143"/>
</constraints>
<properties/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory"/>
</clientProperties>
<border type="none" title="Language"/>
<children>
<component id="be722" class="javax.swing.JLabel">
plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ConfigUI.java
+3 -2
View File
@@ -15,6 +15,7 @@
*/
package org.intellij.plugins.xpathView.ui;
import com.intellij.ui.IdeBorderFactory;
import org.intellij.plugins.xpathView.Config;
import com.intellij.ui.ColorPanel;
@@ -73,7 +74,7 @@ public class ConfigUI extends JPanel {
showInMainMenu.setToolTipText("Uncheck to remove XPath-related actions from the Main-Menubar");
JPanel settings = new JPanel(new BorderLayout());
settings.setBorder(new TitledBorder(new EtchedBorder(EtchedBorder.LOWERED), "Settings"));
settings.setBorder(IdeBorderFactory.createTitledBorder("Settings"));
c.add(c = new JPanel(new BorderLayout()), BorderLayout.NORTH);
c.add(settings, BorderLayout.NORTH);
@@ -91,7 +92,7 @@ public class ConfigUI extends JPanel {
settings.add(/*settings = */new JPanel(new BorderLayout()), BorderLayout.SOUTH);
JPanel colors = new JPanel(new GridBagLayout());
colors.setBorder(new TitledBorder(new EtchedBorder(EtchedBorder.LOWERED), "Colors"));
colors.setBorder(IdeBorderFactory.createTitledBorder("Colors"));
c.add(c = new JPanel(new BorderLayout()), BorderLayout.SOUTH);
c.add(colors, BorderLayout.NORTH);
xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.form
+2 -2
View File
@@ -11,13 +11,13 @@
<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>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="etched" title="XML"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory"/>
</clientProperties>
<border type="etched" title="XML"/>
<children>
<component id="5cbfc" class="javax.swing.JCheckBox" binding="myShowAutoImportPopups" default-binding="true">
<constraints>
xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.form
+43 -43
View File
@@ -1,57 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.javaee.HtmlLanguageLevelForm">
<grid id="27dc6" binding="myContentPanel" layout-manager="GridLayoutManager" row-count="3" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="27dc6" binding="myContentPanel" 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="676" height="112"/>
<xy x="20" y="20" width="676" height="115"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="c47be" class="javax.swing.JLabel">
<grid id="adc9b" 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="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 value="Default HTML language level:"/>
</properties>
</component>
<hspacer id="87948">
<constraints>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="1" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
</hspacer>
<component id="aad8c" class="javax.swing.JRadioButton" binding="myHtml4RadioButton">
<constraints>
<grid row="0" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="HTML 4 (&quot;http://www.w3.org/1999/xhtml&quot;)"/>
</properties>
</component>
<component id="bb372" class="javax.swing.JRadioButton" binding="myHtml5RadioButton">
<constraints>
<grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="HTML 5"/>
</properties>
</component>
<component id="192c4" class="javax.swing.JRadioButton" binding="myOtherRadioButton" default-binding="true">
<constraints>
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Other doctype:"/>
</properties>
</component>
<grid id="88e81" binding="myOtherDoctypeWrapper" layout-manager="BorderLayout" hgap="1" vgap="1">
<constraints>
<grid row="2" column="2" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<grid row="0" 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"/>
<children/>
<border type="none" title="Default HTML language level:"/>
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory"/>
</clientProperties>
<children>
<component id="aad8c" class="javax.swing.JRadioButton" binding="myHtml4RadioButton">
<constraints>
<grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="HTML 4 (&quot;http://www.w3.org/1999/xhtml&quot;)"/>
</properties>
</component>
<component id="bb372" class="javax.swing.JRadioButton" binding="myHtml5RadioButton">
<constraints>
<grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="HTML 5"/>
</properties>
</component>
<component id="192c4" class="javax.swing.JRadioButton" binding="myOtherRadioButton" default-binding="true">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Other doctype:"/>
</properties>
</component>
<grid id="88e81" binding="myOtherDoctypeWrapper" layout-manager="BorderLayout" hgap="1" vgap="1">
<constraints>
<grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
<children/>
</grid>
</children>
</grid>
</children>
</grid>