From 91cab721be7a2ea958a406402876626593d52d8d Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 7 Aug 2024 17:01:47 +0800 Subject: [PATCH] =?UTF-8?q?FRGUIPaneFactory=E6=96=B9=E6=B3=95=E5=90=8D?= =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=B8=80=E4=B8=8B=EF=BC=8C=E4=B8=8D=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=96=B9=E6=B3=95=EF=BC=8C=E6=B3=A8=E9=87=8A=E5=86=99?= =?UTF-8?q?=E6=98=8E=E6=94=AF=E6=8C=81RTL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../editor/editor/ColumnSelectedEditor.java | 2 +- .../fr/design/layout/FRGUIPaneFactory.java | 22 ++----------------- .../java/com/fr/file/FILEChooserPane.java | 2 +- .../ColSelectedWithSummaryMethodEditor.java | 2 +- .../SeriesCondition/DataLabelStylePane.java | 2 +- .../fr/design/mainframe/FormToolBarPane.java | 2 +- .../design/dscolumn/DSColumnAdvancedPane.java | 4 ++-- .../headerfooter/HeaderFooterEditPane.java | 3 +-- .../com/fr/design/report/UnitFieldPane.java | 2 +- .../report/freeze/FreezeAndRepeatPane.java | 2 +- .../share/ui/generate/PriceExpectPane.java | 2 +- .../fr/design/webattr/PageToolBarPane.java | 2 +- .../fr/design/webattr/PageWebSettingPane.java | 2 +- .../com/fr/design/webattr/ToolBarPane.java | 2 +- 14 files changed, 16 insertions(+), 35 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java index 038a22227e..5260ce1752 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java @@ -30,7 +30,7 @@ public class ColumnSelectedEditor extends Editor implements Prep public ColumnSelectedEditor() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Column")); - this.setLayout(FRGUIPaneFactory.createLeadingZeroLayout()); + this.setLayout(FRGUIPaneFactory.createLeftZeroLayout()); tableDataComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource()); columnNames = new String[0]; tableDataComboBox.addItemListener(new ItemListener() { diff --git a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java index b647c23e3c..4c40fb5e28 100644 --- a/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java @@ -32,39 +32,21 @@ public class FRGUIPaneFactory { public static final int HEIGHT_PARA = 25; public static final int HEIGHT_OFFSET = 50; - /** - * 创建一个靠左的水平间隙为2的流式布局 - * - * @return FlowLayout对象 - */ - public static LayoutManager createBoxFlowLayout() { // createBoxFlowLayout 图表用到的比较多 - return new FlowLayout(FlowLayout.LEFT, 2, 0); - } - /** * 创建一个靠左的水平间隙为2的流式布局,支持RTL * * @return FlowLayout对象 */ - public static LayoutManager createBoxLeadingLayout() { // createBoxFlowLayout 图表用到的比较多 + public static LayoutManager createBoxFlowLayout() { // createBoxFlowLayout 图表用到的比较多 return new FlowLayout(FlowLayout.LEADING, 2, 0); } - /** - * 创建一个靠左的布局 - * - * @return FlowLayout对象 - */ - public static LayoutManager createLeftZeroLayout() { - return new FlowLayout(FlowLayout.LEFT, 0, 0); - } - /** * 创建一个靠左的布局,支持RTL * * @return FlowLayout对象 */ - public static LayoutManager createLeadingZeroLayout() { + public static LayoutManager createLeftZeroLayout() { return new FlowLayout(FlowLayout.LEADING, 0, 0); } diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java index 0aab3dd2a5..72e9014024 100644 --- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java +++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java @@ -1421,7 +1421,7 @@ public class FILEChooserPane extends BasicPane { private String topPath; public LocationButtonPane() { - this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); + this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); leftArrowButton = new BasicArrowButton(BasicArrowButton.WEST) { @Override diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java index ac46568f97..be12d6214a 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java @@ -28,7 +28,7 @@ public class ColSelectedWithSummaryMethodEditor extends Editor { */ public void initComponent() { this.addMouseListener(listener); - this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); + this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); this.setTransferHandler(new ToolBarHandler(TransferHandler.COPY)); this.setBorder(BorderFactory.createTitledBorder("")); } diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java index af9fd4f158..fd96bfc5d1 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java @@ -395,7 +395,7 @@ public class DSColumnAdvancedPane extends BasicPane { public JFormulaField(String defaultValue) { this.defaultValue = defaultValue; - this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); + this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); UILabel bottomLabel = new UILabel("="); bottomLabel.setFont(new Font("Dialog", Font.BOLD, 12)); this.add(bottomLabel); @@ -466,7 +466,7 @@ public class DSColumnAdvancedPane extends BasicPane { private JFormulaField formulaField; public ValuePane() { - this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); + this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); this.add(new UILabel(BidiUtils.reverseConcatenateStrings(InsetText, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value"), ":"))); this.add(Box.createHorizontalStrut(2)); diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java index aef3106e79..e712ba1da0 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java @@ -46,7 +46,6 @@ import javax.swing.JViewport; import javax.swing.Scrollable; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; -import javax.swing.border.TitledBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.BorderLayout; @@ -615,7 +614,7 @@ public class HeaderFooterEditPane extends JPanel { private UILabel unitLabel; public AdjustHeightPane() { - this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); + this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); valueSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0); this.add(valueSpinner); diff --git a/designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java b/designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java index 13c6490a89..6af6852d47 100644 --- a/designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java @@ -64,7 +64,7 @@ public class UnitFieldPane extends JPanel { } public UnitFieldPane(int unitType) { - this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); + this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); this.unitType = unitType; diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java index 8876a0beef..a946b63b16 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java @@ -45,7 +45,7 @@ public abstract class FreezeAndRepeatPane extends BasicBeanPane { } }); } - this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); + this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); this.add(start); connectionLabel = new UILabel(getLabeshow()); this.add(connectionLabel); diff --git a/designer-realize/src/main/java/com/fr/design/share/ui/generate/PriceExpectPane.java b/designer-realize/src/main/java/com/fr/design/share/ui/generate/PriceExpectPane.java index 5d26b75dde..7371c8e53e 100644 --- a/designer-realize/src/main/java/com/fr/design/share/ui/generate/PriceExpectPane.java +++ b/designer-realize/src/main/java/com/fr/design/share/ui/generate/PriceExpectPane.java @@ -32,7 +32,7 @@ public class PriceExpectPane extends JPanel { ButtonGroup radioGroup = new ButtonGroup(); radioGroup.add(freeRadio); radioGroup.add(chargeRadio); - this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); + this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); this.add(freeRadio); this.add(chargeRadio); final JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane(); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java index c634d6a15a..cbc8d36d40 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java @@ -74,7 +74,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane { leftRadioButton.setSelected(true); buttonGroup.add(centerRadioButton); buttonGroup.add(leftRadioButton); - JPanel buttonPane = new JPanel(FRGUIPaneFactory.createBoxLeadingLayout()); + JPanel buttonPane = new JPanel(FRGUIPaneFactory.createBoxFlowLayout()); buttonPane.add(centerRadioButton); buttonPane.add(leftRadioButton); isShowAsImageBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Is_Paint_Page")); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java index 399675225c..8a22b6f07e 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java @@ -61,7 +61,7 @@ public class PageWebSettingPane extends WebSettingPane { leftRadioButton.setSelected(true); buttonGroup.add(centerRadioButton); buttonGroup.add(leftRadioButton); - JPanel buttonpane = new JPanel(FRGUIPaneFactory.createBoxLeadingLayout()); + JPanel buttonpane = new JPanel(FRGUIPaneFactory.createBoxFlowLayout()); buttonpane.add(centerRadioButton); buttonpane.add(leftRadioButton); isShowAsImageBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Is_Paint_Page")); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java index 932c45de26..3896125221 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java @@ -55,7 +55,7 @@ public class ToolBarPane extends BasicBeanPane { */ public void initComponent() { this.addMouseListener(listener); - this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); + this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); this.setTransferHandler(new ToolBarHandler(TransferHandler.COPY)); this.setBorder(BorderFactory.createTitledBorder("")); }