Browse Source

FRGUIPaneFactory方法名还原一下,不新增方法,注释写明支持RTL

persist/11.0-arabic
obo 7 months ago
parent
commit
91cab721be
  1. 2
      designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java
  2. 22
      designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
  3. 2
      designer-base/src/main/java/com/fr/file/FILEChooserPane.java
  4. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java
  5. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java
  6. 2
      designer-form/src/main/java/com/fr/design/mainframe/FormToolBarPane.java
  7. 4
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  8. 3
      designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java
  9. 2
      designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java
  10. 2
      designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java
  11. 2
      designer-realize/src/main/java/com/fr/design/share/ui/generate/PriceExpectPane.java
  12. 2
      designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java
  13. 2
      designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java
  14. 2
      designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java

2
designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java

@ -30,7 +30,7 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> implements Prep
public ColumnSelectedEditor() { public ColumnSelectedEditor() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Column")); 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()); tableDataComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource());
columnNames = new String[0]; columnNames = new String[0];
tableDataComboBox.addItemListener(new ItemListener() { tableDataComboBox.addItemListener(new ItemListener() {

22
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_PARA = 25;
public static final int HEIGHT_OFFSET = 50; public static final int HEIGHT_OFFSET = 50;
/**
* 创建一个靠左的水平间隙为2的流式布局
*
* @return FlowLayout对象
*/
public static LayoutManager createBoxFlowLayout() { // createBoxFlowLayout 图表用到的比较多
return new FlowLayout(FlowLayout.LEFT, 2, 0);
}
/** /**
* 创建一个靠左的水平间隙为2的流式布局,支持RTL * 创建一个靠左的水平间隙为2的流式布局,支持RTL
* *
* @return FlowLayout对象 * @return FlowLayout对象
*/ */
public static LayoutManager createBoxLeadingLayout() { // createBoxFlowLayout 图表用到的比较多 public static LayoutManager createBoxFlowLayout() { // createBoxFlowLayout 图表用到的比较多
return new FlowLayout(FlowLayout.LEADING, 2, 0); return new FlowLayout(FlowLayout.LEADING, 2, 0);
} }
/**
* 创建一个靠左的布局
*
* @return FlowLayout对象
*/
public static LayoutManager createLeftZeroLayout() {
return new FlowLayout(FlowLayout.LEFT, 0, 0);
}
/** /**
* 创建一个靠左的布局,支持RTL * 创建一个靠左的布局,支持RTL
* *
* @return FlowLayout对象 * @return FlowLayout对象
*/ */
public static LayoutManager createLeadingZeroLayout() { public static LayoutManager createLeftZeroLayout() {
return new FlowLayout(FlowLayout.LEADING, 0, 0); return new FlowLayout(FlowLayout.LEADING, 0, 0);
} }

2
designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@ -1421,7 +1421,7 @@ public class FILEChooserPane extends BasicPane {
private String topPath; private String topPath;
public LocationButtonPane() { public LocationButtonPane() {
this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
leftArrowButton = new BasicArrowButton(BasicArrowButton.WEST) { leftArrowButton = new BasicArrowButton(BasicArrowButton.WEST) {
@Override @Override

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java

@ -28,7 +28,7 @@ public class ColSelectedWithSummaryMethodEditor extends Editor<DSColumnWithSumma
public ColSelectedWithSummaryMethodEditor() { public ColSelectedWithSummaryMethodEditor() {
this.setName(Toolkit.i18nText("Fine-Design_Chart_Summary_Field_Value")); this.setName(Toolkit.i18nText("Fine-Design_Chart_Summary_Field_Value"));
this.setLayout(FRGUIPaneFactory.createLeadingZeroLayout()); this.setLayout(FRGUIPaneFactory.createLeftZeroLayout());
if (columnNameComboBox == null) { if (columnNameComboBox == null) {
columnNameComboBox = new UIComboBox(); columnNameComboBox = new UIComboBox();
} }

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java

@ -35,7 +35,7 @@ public class DataLabelStylePane extends BasicPane {
} }
private void initPane(boolean isSurpportFontColor) { private void initPane(boolean isSurpportFontColor) {
this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
this.add(nameBox = new UIComboBox(DesignUtils.getAvailableFontFamilyNames4Report())); this.add(nameBox = new UIComboBox(DesignUtils.getAvailableFontFamilyNames4Report()));
nameBox.setPreferredSize(new Dimension(80, 20)); nameBox.setPreferredSize(new Dimension(80, 20));

2
designer-form/src/main/java/com/fr/design/mainframe/FormToolBarPane.java

@ -53,7 +53,7 @@ public class FormToolBarPane extends BasicBeanPane<ToolBar> {
*/ */
public void initComponent() { public void initComponent() {
this.addMouseListener(listener); this.addMouseListener(listener);
this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
this.setTransferHandler(new ToolBarHandler(TransferHandler.COPY)); this.setTransferHandler(new ToolBarHandler(TransferHandler.COPY));
this.setBorder(BorderFactory.createTitledBorder("")); this.setBorder(BorderFactory.createTitledBorder(""));
} }

4
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java

@ -395,7 +395,7 @@ public class DSColumnAdvancedPane extends BasicPane {
public JFormulaField(String defaultValue) { public JFormulaField(String defaultValue) {
this.defaultValue = defaultValue; this.defaultValue = defaultValue;
this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
UILabel bottomLabel = new UILabel("="); UILabel bottomLabel = new UILabel("=");
bottomLabel.setFont(new Font("Dialog", Font.BOLD, 12)); bottomLabel.setFont(new Font("Dialog", Font.BOLD, 12));
this.add(bottomLabel); this.add(bottomLabel);
@ -466,7 +466,7 @@ public class DSColumnAdvancedPane extends BasicPane {
private JFormulaField formulaField; private JFormulaField formulaField;
public ValuePane() { 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(new UILabel(BidiUtils.reverseConcatenateStrings(InsetText, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value"), ":")));
this.add(Box.createHorizontalStrut(2)); this.add(Box.createHorizontalStrut(2));

3
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.Scrollable;
import javax.swing.SwingConstants; import javax.swing.SwingConstants;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.border.TitledBorder;
import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener; import javax.swing.event.ChangeListener;
import java.awt.BorderLayout; import java.awt.BorderLayout;
@ -615,7 +614,7 @@ public class HeaderFooterEditPane extends JPanel {
private UILabel unitLabel; private UILabel unitLabel;
public AdjustHeightPane() { public AdjustHeightPane() {
this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
valueSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0); valueSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
this.add(valueSpinner); this.add(valueSpinner);

2
designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java

@ -64,7 +64,7 @@ public class UnitFieldPane extends JPanel {
} }
public UnitFieldPane(int unitType) { public UnitFieldPane(int unitType) {
this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
this.unitType = unitType; this.unitType = unitType;

2
designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java

@ -45,7 +45,7 @@ public abstract class FreezeAndRepeatPane extends BasicBeanPane<FT> {
} }
}); });
} }
this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
this.add(start); this.add(start);
connectionLabel = new UILabel(getLabeshow()); connectionLabel = new UILabel(getLabeshow());
this.add(connectionLabel); this.add(connectionLabel);

2
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(); ButtonGroup radioGroup = new ButtonGroup();
radioGroup.add(freeRadio); radioGroup.add(freeRadio);
radioGroup.add(chargeRadio); radioGroup.add(chargeRadio);
this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
this.add(freeRadio); this.add(freeRadio);
this.add(chargeRadio); this.add(chargeRadio);
final JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane(); final JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();

2
designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java

@ -74,7 +74,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
leftRadioButton.setSelected(true); leftRadioButton.setSelected(true);
buttonGroup.add(centerRadioButton); buttonGroup.add(centerRadioButton);
buttonGroup.add(leftRadioButton); buttonGroup.add(leftRadioButton);
JPanel buttonPane = new JPanel(FRGUIPaneFactory.createBoxLeadingLayout()); JPanel buttonPane = new JPanel(FRGUIPaneFactory.createBoxFlowLayout());
buttonPane.add(centerRadioButton); buttonPane.add(centerRadioButton);
buttonPane.add(leftRadioButton); buttonPane.add(leftRadioButton);
isShowAsImageBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Is_Paint_Page")); isShowAsImageBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Is_Paint_Page"));

2
designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java

@ -61,7 +61,7 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
leftRadioButton.setSelected(true); leftRadioButton.setSelected(true);
buttonGroup.add(centerRadioButton); buttonGroup.add(centerRadioButton);
buttonGroup.add(leftRadioButton); buttonGroup.add(leftRadioButton);
JPanel buttonpane = new JPanel(FRGUIPaneFactory.createBoxLeadingLayout()); JPanel buttonpane = new JPanel(FRGUIPaneFactory.createBoxFlowLayout());
buttonpane.add(centerRadioButton); buttonpane.add(centerRadioButton);
buttonpane.add(leftRadioButton); buttonpane.add(leftRadioButton);
isShowAsImageBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Is_Paint_Page")); isShowAsImageBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Is_Paint_Page"));

2
designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java

@ -55,7 +55,7 @@ public class ToolBarPane extends BasicBeanPane<ToolBar> {
*/ */
public void initComponent() { public void initComponent() {
this.addMouseListener(listener); this.addMouseListener(listener);
this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout()); this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
this.setTransferHandler(new ToolBarHandler(TransferHandler.COPY)); this.setTransferHandler(new ToolBarHandler(TransferHandler.COPY));
this.setBorder(BorderFactory.createTitledBorder("")); this.setBorder(BorderFactory.createTitledBorder(""));
} }

Loading…
Cancel
Save