fanruan
/
design
6
1
Fork 1
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

绝对位置替换为相对位置，第一批

persist/11.0-arabic
obo 8 months ago
parent
2431b21b67
commit
f411676687
41 changed files with 127 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  2. 4
      designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
  3. 4
      designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java
  4. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java
  5. 8
      designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java
  6. 8
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
  7. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
  8. 2
      designer-base/src/main/java/com/fr/design/dialog/AbstractTemplateServerSettingPane.java
  9. 4
      designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
  10. 2
      designer-base/src/main/java/com/fr/design/editor/editor/ColumnSelectedEditor.java
  11. 27
      designer-base/src/main/java/com/fr/design/file/MultiTemplateTabMenuFactory.java
  12. 26
      designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
  13. 4
      designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java
  14. 2
      designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java
  15. 2
      designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java
  16. 4
      designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
  17. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java
  18. 4
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
  19. 8
      designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java
  20. 2
      designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java
  21. 4
      designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java
  22. 6
      designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
  23. 2
      designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
  24. 2
      designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java
  25. 6
      designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
  26. 4
      designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java
  27. 2
      designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java
  28. 37
      designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
  29. 5
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
  30. 2
      designer-base/src/main/java/com/fr/file/FILEChooserPane.java
  31. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ColSelectedWithSummaryMethodEditor.java
  32. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java
  33. 2
      designer-form/src/main/java/com/fr/design/mainframe/FormToolBarPane.java
  34. 4
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  35. 2
      designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java
  36. 2
      designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java
  37. 2
      designer-realize/src/main/java/com/fr/design/report/freeze/FreezeAndRepeatPane.java
  38. 2
      designer-realize/src/main/java/com/fr/design/share/ui/generate/PriceExpectPane.java
  39. 2
      designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java
  40. 2
      designer-realize/src/main/java/com/fr/design/webattr/PageWebSettingPane.java
  41. 2
      designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java

14
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
Unescape View File

@ -444,9 +444,9 @@ public class PreferencePane extends BasicPane {
//gc面板
gcControlPane = createGcControlPane();
JPanel enableVcsPanel = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
JPanel enableVcsPanel = new JPanel(FRGUIPaneFactory.createLeadingZeroLayout());
enableVcsPanel.add(remindVcsLabel);
JPanel intervalPanel = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
JPanel intervalPanel = new JPanel(FRGUIPaneFactory.createLeadingZeroLayout());
final UILabel everyLabel = new UILabel(i18nText("Fine-Design_Vcs_Every"));
final UILabel delayLabel = new UILabel(i18nText("Fine-Design_Vcs_Delay"));
intervalPanel.add(useIntervalCheckBox);
@ -512,7 +512,7 @@ public class PreferencePane extends BasicPane {
};
private JPanel createAutoCleanPane() {
JPanel autoCleanPane = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
JPanel autoCleanPane = new JPanel(FRGUIPaneFactory.createLeadingZeroLayout());
useVcsAutoCleanScheduleCheckBox = new UICheckBox();
autoCleanIntervalComboBox = new UIComboBox(INTERVAL);
autoCleanIntervalComboBox.setSelectedIndex(DEFAULT_INDEX);
@ -560,7 +560,7 @@ public class PreferencePane extends BasicPane {
}
private JPanel createSaveIntervalPane() {
JPanel saveIntervalPane = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
JPanel saveIntervalPane = new JPanel(FRGUIPaneFactory.createLeadingZeroLayout());
useVcsAutoSaveScheduleCheckBox = new UICheckBox();
autoSaveIntervalEditor = new UIPositiveIntEditor(60);
saveIntervalPane.add(useVcsAutoSaveScheduleCheckBox);
@ -662,7 +662,7 @@ public class PreferencePane extends BasicPane {
}
});
JPanel keyStrokePane = new JPanel(new BorderLayout());
keyStrokePane.add(new UILabel(createLabelColonName("Fine-Design_Basic_Support_Auto_Complete_Shortcut")), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
keyStrokePane.add(new UILabel(createLabelColonName("Fine-Design_Basic_Support_Auto_Complete_Shortcut")), BorderLayout.LINE_START);
shortCutLabel = new UILabel();
keyStrokePane.add(shortCutLabel, BorderLayout.CENTER);
keyStrokePane.setBorder(new EmptyBorder(0, 10,0,0));
@ -911,7 +911,7 @@ public class PreferencePane extends BasicPane {
i18nText("Fine-Design_Basic_Preference_Caching_Template_Tip"), MEMORY_TIP_LABEL_MAX_WIDTH);
memoryTipLabel.setBorder(BorderFactory.createEmptyBorder(0, CACHING_GAP, 0, 0));
cachingTemplateSpinner = new UISpinner(0, CACHING_MAX, 1, CACHING_DEFAULT);
JPanel memorySpace = new JPanel(FRGUIPaneFactory.createLeftZeroLayout());
JPanel memorySpace = new JPanel(FRGUIPaneFactory.createLeadingZeroLayout());
memorySpace.add(memoryLabel);
memorySpace.add(cachingTemplateSpinner);
memorySpace.add(memoryTipLabel);
@ -1494,7 +1494,7 @@ public class PreferencePane extends BasicPane {
* 创建带冒号的label名，适配RTL
*/
private String createLabelColonName(String i18nKey) {
return BidiUtils.rtl() ? ":" + i18nText(i18nKey) : i18nText(i18nKey) + ":";
return BidiUtils.reverseConcatenateStrings(i18nText(i18nKey) + ":");
}
}

4
designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
Unescape View File

@ -441,7 +441,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
conditionsTree.addTreeSelectionListener(treeSelectionListener);
JPanel buttonPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1);
previewPane.add(GUICoreUtils.createBorderPane(buttonPane, BorderLayout.NORTH), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
previewPane.add(GUICoreUtils.createBorderPane(buttonPane, BorderLayout.NORTH), BorderLayout.LINE_END);
initButtonPane(buttonPane);
// peter:必须要检查Enabled.
@ -496,7 +496,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
conditonTypePane.setBorder(new ModLineBorder(ModLineBorder.BOTTOM));
UILabel conditionTypeLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Type"), ":"));
conditonTypePane.add(conditionTypeLabel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
conditonTypePane.add(conditionTypeLabel, BorderLayout.LINE_START);
conditionTypeLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, DOWN_PADDING, 0));
JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);

4
designer-base/src/main/java/com/fr/design/data/datapane/VerticalChoosePane.java
Unescape View File

@ -42,8 +42,8 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean {
rs.add(tableNameComboBox, BorderLayout.CENTER);
rs.add(GUICoreUtils.createFlowPane(new Component[]{new RefreshLabel(this), previewLabel}, FlowLayout.LEFT, LayoutConstants.HGAP_LARGE), BorderLayout.EAST);
rs.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, -RIGHTBORDER));
UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database"), BidiUtils.rtl() ? UILabel.RIGHT : UILabel.LEFT);
UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"), BidiUtils.rtl() ? UILabel.RIGHT : UILabel.LEFT);
UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database"), UILabel.LEADING);
UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"), UILabel.LEADING);
UILabel l3 = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Select_Table"), MAX_WIDTH, UILabel.LEFT);
if (labelSize > 0) {
Dimension pSize = new Dimension(labelSize, 20);

2
designer-base/src/main/java/com/fr/design/data/datapane/connect/AdvancePane.java
Unescape View File

@ -54,7 +54,7 @@ public class AdvancePane extends BasicPane {
}
private UILabel createUILabel(String i18nKey) {
return new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText(i18nKey), ":"), BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT);
return new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText(i18nKey), ":"), SwingConstants.TRAILING);
}
public void populate(JDBCDatabaseConnection jdbcDatabase) {

8
designer-base/src/main/java/com/fr/design/data/datapane/connect/JNDIDefPane.java
Unescape View File

@ -100,10 +100,10 @@ public class JNDIDefPane extends JPanel {
double p = TableLayout.PREFERRED;
double[] rowSize = { p, p, p, p };
double[] columnSize = { f, f };
Component[][] comps = { { new UILabel(BidiUtils.reverseConcatenateStrings("INITIAL_CONTEXT_FACTORY", ":"), BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT), JNDIFactoryComboBox },
{ new UILabel(BidiUtils.reverseConcatenateStrings("PROVIDER_URL", ":"), BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT), PROVIDER_URL_TF },
{ new UILabel(BidiUtils.reverseConcatenateStrings("SECURITY_PRINCIPAL", ":"), BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT), SECURITY_PRINCIPAL_TF },
{ new UILabel(BidiUtils.reverseConcatenateStrings("SECURITY_CREDENTIALS", ":"), BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT), SECURITY_CREDENTIALS_TF } };
Component[][] comps = { { new UILabel(BidiUtils.reverseConcatenateStrings("INITIAL_CONTEXT_FACTORY", ":"), SwingConstants.TRAILING), JNDIFactoryComboBox },
{ new UILabel(BidiUtils.reverseConcatenateStrings("PROVIDER_URL", ":"), SwingConstants.TRAILING), PROVIDER_URL_TF },
{ new UILabel(BidiUtils.reverseConcatenateStrings("SECURITY_PRINCIPAL", ":"), SwingConstants.TRAILING), SECURITY_PRINCIPAL_TF },
{ new UILabel(BidiUtils.reverseConcatenateStrings("SECURITY_CREDENTIALS", ":"), SwingConstants.TRAILING), SECURITY_CREDENTIALS_TF } };
centerPane.add(TableLayoutHelper.createCommonTableLayoutPane(comps, rowSize, columnSize, 2));
// ActionLabel

8
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
Unescape View File

@ -143,7 +143,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
fileTypeComboBox = new UIComboBox(item);
fileTypeComboBox.setPreferredSize(new Dimension(100, 20));
type.add(fileTypeComboBox);
northPanel.add(type, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
northPanel.add(type, BorderLayout.LINE_START);
// 最上面的pane，文件选择
JPanel centerPanel = new JPanel();
@ -173,7 +173,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
this.add(northPanel, BorderLayout.NORTH);
this.add(centerPanel, BorderLayout.CENTER);
this.add(southPanel, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
this.add(southPanel, BorderLayout.LINE_END);
BidiUtils.applyOrientationByLocale(this);
}
@ -209,9 +209,9 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
buttonPanel.add(chooseFile);
buttonPanel.add(testConnection);
filePath = FRGUIPaneFactory.createBorderLayout_S_Pane();
filePath.add(textPanel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
filePath.add(textPanel, BorderLayout.LINE_START);
filePath.add(textFieldPanel, BorderLayout.CENTER);
filePath.add(buttonPanel, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
filePath.add(buttonPanel, BorderLayout.LINE_END);
centerPanel.add(filePath, BorderLayout.NORTH);
// 中间的pane，提示信息

4
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
Unescape View File

@ -285,9 +285,9 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
private void initUI() {
String tmp = name;
this.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT));
this.setLayout(new FlowLayout(FlowLayout.LEADING));
JPanel leftPanel = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT));
JPanel leftPanel = new JPanel(new FlowLayout(FlowLayout.LEADING));
leftPanel.setPreferredSize(new Dimension(190, BAR_HEIGHT));
chekbox = new UICheckBox();
UILabel tabledataName = new UILabel(tmp);

2
designer-base/src/main/java/com/fr/design/dialog/AbstractTemplateServerSettingPane.java
Unescape View File

@ -40,7 +40,7 @@ public abstract class AbstractTemplateServerSettingPane extends BasicPane {
UILabel belowSetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Blow_Set"));
belowSetLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20));
buttonPane = GUICoreUtils.createFlowPane(new Component[] {
belowSetLabel, chooseComboBox}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0);
belowSetLabel, chooseComboBox}, FlowLayout.LEADING, 0, 0);
buttonPane.setBorder(BorderFactory.createEmptyBorder(10, 20, 0, 20));
this.setLayout(new BorderLayout());

4
designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
Unescape View File

@ -95,8 +95,8 @@ public abstract class UIDialog extends JDialog {
private JPanel createControlButtonPane() {
JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
JPanel buttonsPane = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 10, 0));
controlPane.add(buttonsPane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEADING, 10, 0));
controlPane.add(buttonsPane, BorderLayout.LINE_END);
//增加一个自定义按钮, 可以用于eg: 设为全局配置
addCustomButton(buttonsPane);

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

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

27
designer-base/src/main/java/com/fr/design/file/MultiTemplateTabMenuFactory.java
Unescape View File

@ -32,6 +32,7 @@ import java.util.Map;
/**
* 右侧下拉菜单的工厂类
*
* @author Carlson
* @since 11.0
* created on 2023-04-14
@ -54,6 +55,7 @@ public class MultiTemplateTabMenuFactory {
/**
* 返回右侧下拉菜单的工厂类
*
* @return
*/
public static MultiTemplateTabMenuFactory getInstance() {
@ -138,7 +140,7 @@ public class MultiTemplateTabMenuFactory {
button.setPreferredSize(new Dimension(menu.getWidth(), ITEM_SIZE));
button.setOpaque(true);
button.setBackground(UIConstants.NORMAL_BACKGROUND);
button.setHorizontalAlignment(BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT);
button.setHorizontalAlignment(SwingConstants.LEADING);
button.setForeground(UIConstants.FLESH_BLUE);
return button;
}
@ -150,8 +152,8 @@ public class MultiTemplateTabMenuFactory {
return createListDownItem(MultiTemplateTabPane.getInstance().getOpenedJTemplatesByOperator(getCurrentTabOperatorType()));
}
private String getCurrentTabOperatorType(){
JTemplate jTemplate= HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
private String getCurrentTabOperatorType() {
JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
return jTemplate.getTemplateTabOperatorType();
}
@ -197,15 +199,10 @@ public class MultiTemplateTabMenuFactory {
menuItemButtonGroup.templateButton.setForeground(UIConstants.FLESH_BLUE);
}
if (BidiUtils.rtl()) {
jPanel.add(menuItemButtonGroup.iconButton, BorderLayout.EAST);
jPanel.add(menuItemButtonGroup.templateButton, BorderLayout.CENTER);
jPanel.add(menuItemButtonGroup.closeButton, BorderLayout.WEST);
} else {
jPanel.add(menuItemButtonGroup.iconButton, BorderLayout.WEST);
jPanel.add(menuItemButtonGroup.templateButton, BorderLayout.CENTER);
jPanel.add(menuItemButtonGroup.closeButton, BorderLayout.EAST);
}
jPanel.add(menuItemButtonGroup.iconButton, BorderLayout.LINE_START);
jPanel.add(menuItemButtonGroup.templateButton, BorderLayout.CENTER);
jPanel.add(menuItemButtonGroup.closeButton, BorderLayout.LINE_END);
return jPanel;
}
@ -246,7 +243,7 @@ public class MultiTemplateTabMenuFactory {
button.setPreferredSize(new Dimension(menu.getWidth() - ITEM_SIZE * 2, ITEM_SIZE));
button.setOpaque(true);
button.setBackground(UIConstants.NORMAL_BACKGROUND);
button.setHorizontalAlignment(BidiUtils.rtl() ? SwingConstants.RIGHT : SwingConstants.LEFT);
button.setHorizontalAlignment(SwingConstants.LEADING);
return button;
}
@ -344,8 +341,8 @@ public class MultiTemplateTabMenuFactory {
}
/**
* mouse移出item范围
*/
* mouse移出item范围
*/
private void fireMouseExitedEvent() {
iconButton.setBackground(UIConstants.NORMAL_BACKGROUND);
templateButton.setBackground(UIConstants.NORMAL_BACKGROUND);

26
designer-base/src/main/java/com/fr/design/formula/FormulaPane.java
Unescape View File

@ -262,8 +262,8 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
private void initTipsPane() {
// tipsPane
JPanel containerSPane = new JPanel(new BorderLayout(4, 1));
JPanel labelPane = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0), true);
JPanel searchPane = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.LEFT : FlowLayout.RIGHT, 0, 0), true);
JPanel labelPane = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 0), true);
JPanel searchPane = new JPanel(new FlowLayout(FlowLayout.TRAILING, 0, 0), true);
containerSPane.setPreferredSize(new Dimension(892, 23));
this.add(containerSPane, BorderLayout.NORTH);
@ -272,13 +272,13 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below"), ":"));
formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
labelPane.add(formulaLabel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
labelPane.add(formulaLabel, BorderLayout.LINE_START);
keyWordTextField.setPreferredSize(new Dimension(240, 23));
searchPane.add(keyWordTextField, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
searchPane.add(searchButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
searchPane.add(keyWordTextField, BorderLayout.LINE_END);
searchPane.add(searchButton, BorderLayout.LINE_END);
containerSPane.add(labelPane, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
containerSPane.add(searchPane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
containerSPane.add(labelPane, BorderLayout.LINE_START);
containerSPane.add(searchPane, BorderLayout.LINE_END);
initKeyWordTextFieldKeyListener();
tipsList = new JList(listModel);
@ -332,12 +332,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
//靠左流式布局
JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
checkBoxandbuttonPane.add(checkBoxPane, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
checkBoxandbuttonPane.add(checkBoxPane, BorderLayout.LINE_START);
//靠右流式布局
JPanel buttonPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
buttonPane.add(checkValidButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
buttonPane.add(calButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
checkBoxandbuttonPane.add(buttonPane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
buttonPane.add(checkValidButton, BorderLayout.LINE_END);
buttonPane.add(calButton, BorderLayout.LINE_END);
checkBoxandbuttonPane.add(buttonPane, BorderLayout.LINE_END);
if (autoCompletionCheck == null) {
autoCompletionCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_AutoCompletion"));
autoCompletionCheck.setSelected(true);
@ -346,8 +346,8 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
checkBeforeColse = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Before_Closed"));
checkBeforeColse.setSelected(true);
}
checkBoxPane.add(autoCompletionCheck, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
checkBoxPane.add(checkBeforeColse, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
checkBoxPane.add(autoCompletionCheck, BorderLayout.LINE_START);
checkBoxPane.add(checkBeforeColse, BorderLayout.LINE_START);
extendCheckBoxPane(checkBoxPane);
ParameterTableModel model = new ParameterTableModel(0);

4
designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java
Unescape View File

@ -41,8 +41,8 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane {
reserveCheckBox4Write = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Save_Formula"));
reserveCheckBox4Write.setSelected(false);
checkBoxPane.add(reserveCheckBox4Result, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
checkBoxPane.add(reserveCheckBox4Write, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
checkBoxPane.add(reserveCheckBox4Result, BorderLayout.LINE_START);
checkBoxPane.add(reserveCheckBox4Write, BorderLayout.LINE_START);
}
@Override

2
designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java
Unescape View File

@ -364,7 +364,7 @@ public abstract class JListControlPane extends JControlPane implements ListContr
this.textLabel.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 1));
this.iconLabel.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 0));
add(this.textLabel, BorderLayout.CENTER);
add(this.iconLabel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
add(this.iconLabel, BorderLayout.LINE_START);
this.iconLabel.setBackground(Color.WHITE);
//iconLabel和textLabel的背景颜色不会被JList背景颜色覆盖,开发者自定义
this.textLabel.setOpaque(true);

2
designer-base/src/main/java/com/fr/design/gui/controlpane/UIControlPane.java
Unescape View File

@ -176,7 +176,7 @@ public abstract class UIControlPane extends JControlPane {
toolBarPane.add(topToolBar, BorderLayout.NORTH);
JPanel leftTopPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
leftTopPane.add(toolBarPane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
leftTopPane.add(toolBarPane, BorderLayout.LINE_END);
leftTopPane.add(addItemLabel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.CENTER);
return leftTopPane;
}

4
designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
Unescape View File

@ -69,13 +69,13 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
eastPane.add(removeButton);
eastPane.add(moveUpButton);
eastPane.add(moveDownButton);
this.add(GUICoreUtils.createBorderPane(eastPane, BorderLayout.NORTH), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
this.add(GUICoreUtils.createBorderPane(eastPane, BorderLayout.NORTH), BorderLayout.LINE_END);
JPanel centerPane = new JPanel(new BorderLayout(0, 5));
this.add(centerPane, BorderLayout.CENTER);
JPanel northcenterPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
northcenterPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
northcenterPane.add(addButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
northcenterPane.add(addButton, BorderLayout.LINE_END);
centerPane.add(northcenterPane, BorderLayout.NORTH);
centerPane.add(new JScrollPane(jlist), BorderLayout.CENTER);

2
designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java
Unescape View File

@ -31,7 +31,7 @@ public class ObjectProperiesPane extends BasicBeanPane<ListMap> {
JPanel buttonPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"));
buttonPane.add(this.addButton, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
buttonPane.add(this.addButton, BorderLayout.LINE_START);
this.add(buttonPane, BorderLayout.NORTH);
this.addButton.addActionListener(new ActionListener() {

4
designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableEditorPane.java
Unescape View File

@ -59,8 +59,8 @@ public class UITableEditorPane<T> extends BasicPane {
pane.add(scrollPane, BorderLayout.CENTER);
initbuttonPane(action);
JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
controlPane.add(buttonPane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
controlPane.add(l, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
controlPane.add(buttonPane, BorderLayout.LINE_END);
controlPane.add(l, BorderLayout.LINE_START);
pane.add(controlPane, BorderLayout.NORTH);
}

8
designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java
Unescape View File

@ -35,7 +35,7 @@ public class TreeRootPane extends BasicPane {
public TreeRootPane() {
this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
JPanel checkTypePane = BidiUtils.rtl() ? FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
JPanel checkTypePane = BidiUtils.rtl() ? FRGUIPaneFactory.createTrailingFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
checkTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Mutiple_Selection_Or_Not"));
checkTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@ -43,7 +43,7 @@ public class TreeRootPane extends BasicPane {
checkTypePane.add(checkTypeCheckBox);
this.add(checkTypePane);
JPanel loadTypePane = BidiUtils.rtl() ? FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
JPanel loadTypePane = BidiUtils.rtl() ? FRGUIPaneFactory.createTrailingFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
loadTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Load_By_Async"));
loadTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@ -51,14 +51,14 @@ public class TreeRootPane extends BasicPane {
loadTypePane.add(loadTypeCheckBox);
this.add(loadTypePane);
JPanel leafSelectPane = BidiUtils.rtl() ? FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
JPanel leafSelectPane = BidiUtils.rtl() ? FRGUIPaneFactory.createTrailingFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
leafSelectPane.add(layerTypeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Select_Leaf_Only")));
layerTypeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
this.add(leafSelectPane);
JPanel returnFullPathPane = BidiUtils.rtl() ? FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
JPanel returnFullPathPane = BidiUtils.rtl() ? FRGUIPaneFactory.createTrailingFlowInnerContainer_S_Pane() : FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tree_Return_Full_Path")));
returnFullPathCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

2
designer-base/src/main/java/com/fr/design/gui/style/TextFormatPane.java
Unescape View File

@ -140,7 +140,7 @@ public class TextFormatPane extends AbstractBasicStylePane implements GlobalName
protected void initLayout() {
JPanel labeledFormatTypeComboBoxPane = new JPanel(new BorderLayout(20, 0));
labeledFormatTypeComboBoxPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format")), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
labeledFormatTypeComboBoxPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Report_Base_Format")), BorderLayout.LINE_START);
labeledFormatTypeComboBoxPane.add(typeComboBox, BorderLayout.CENTER);
JPanel labeledRoundingCheckboxPane = new JPanel(new BorderLayout(0, 0));

4
designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java
Unescape View File

@ -75,8 +75,8 @@ public abstract class AbstractHyperNorthPane<T extends Hyperlink> extends BasicB
newWindowConfPane.add(widthTextFiled);
JPanel centerPanel = new JPanel(new BorderLayout());
centerPanel.add(targetFramePanel, BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
centerPanel.add(newWindowConfPane, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
centerPanel.add(targetFramePanel, BorderLayout.LINE_START);
centerPanel.add(newWindowConfPane, BorderLayout.LINE_END);
newWindowConfPane.setVisible(false);
centerPane.add(centerPanel);

6
designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java
Unescape View File

@ -149,7 +149,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
// 选择路径按钮
browserButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Select"));
browserButton.setPreferredSize(new Dimension(browserButton.getPreferredSize().width, 20));
reportletNamePane.add(browserButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
reportletNamePane.add(browserButton, BorderLayout.LINE_END);
browserButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent evt) {
@ -275,7 +275,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
*/
@Override
protected JPanel setFootPanel() {
JPanel content = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0));
JPanel content = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 0));
// 参数传递方式下拉框
postComboBox = new UIComboBox(new String[]{"GET", "POST"});
@ -345,7 +345,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
this.setTargetFrameComboBox(targetFrameComboBox);
targetFrameComboBox.setEditable(false);
targetFrameComboBox.setPreferredSize(new Dimension(100, 20));
JPanel targetFramePanel = new JPanel(new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0));
JPanel targetFramePanel = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 0));
targetFramePanel.add(targetFrameComboBox);
Component[] targetComponents = new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Link_Opened_In"), ":")), targetFramePanel};
dialogComponents.add(targetComponents);

2
designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java
Unescape View File

@ -64,7 +64,7 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Parameter"), null));
extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
this.add(GUICoreUtils.createFlowPane(extendParametersCheckBox, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT), BorderLayout.SOUTH);
this.add(GUICoreUtils.createFlowPane(extendParametersCheckBox, FlowLayout.LEADING), BorderLayout.SOUTH);
}
@Override

2
designer-base/src/main/java/com/fr/design/hyperlink/WebHyperlinkPane.java
Unescape View File

@ -46,7 +46,7 @@ public class WebHyperlinkPane extends AbstractHyperLinkPane<WebHyperlink> {
parameterViewPane.setBorder(GUICoreUtils.createTitledBorder(Toolkit.i18nText("Fine-Design_Basic_Parameters"), null));
extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
this.add(GUICoreUtils.createFlowPane(new Component[]{extendParametersCheckBox}, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT), BorderLayout.SOUTH);
this.add(GUICoreUtils.createFlowPane(new Component[]{extendParametersCheckBox}, FlowLayout.LEADING), BorderLayout.SOUTH);
}
@Override

6
designer-base/src/main/java/com/fr/design/hyperlink/popup/ContentSettingPane.java
Unescape View File

@ -89,7 +89,7 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
popupTargetButtons.add(textPopupButton);
JPanel popupButtonsPanel = new JPanel();
popupButtonsPanel.setLayout( new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 10, 0));
popupButtonsPanel.setLayout( new FlowLayout(FlowLayout.LEADING, 10, 0));
popupButtonsPanel.add(templatePopupButton);
popupButtonsPanel.add(textPopupButton);
return MobilePopupUIUtils.createLeftTileRightContentPanel(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Target"), popupButtonsPanel);
@ -120,7 +120,7 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
templateContentPane.add(parameterViewPane, BorderLayout.CENTER);
extendParametersCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Extends_Report_Parameters"));
templateContentPane.add(GUICoreUtils.createFlowPane(extendParametersCheckBox, BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT), BorderLayout.SOUTH);
templateContentPane.add(GUICoreUtils.createFlowPane(extendParametersCheckBox, FlowLayout.LEADING), BorderLayout.SOUTH);
return templateContentPane;
}
@ -134,7 +134,7 @@ public class ContentSettingPane extends AbstractHyperLinkPane<MobilePopupHyperli
// 选择路径按钮
UIButton templateSelectButton = new UIButton(Toolkit.i18nText("FR-Plugin-Designer_Mobile_Popup_Select"));
templateSelectButton.setPreferredSize(new Dimension(templateSelectButton.getPreferredSize().width, 20));
templatePanel.add(templateSelectButton, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
templatePanel.add(templateSelectButton, BorderLayout.LINE_END);
templateSelectButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent evt) {

4
designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java
Unescape View File

@ -18,8 +18,8 @@ public class MobilePopupUIUtils {
jp.setLayout(new BorderLayout(10,0));
UILabel titleLabel = new UILabel(BidiUtils.reverseConcatenateStrings(title, ":"));
titleLabel.setPreferredSize(new Dimension(MobilePopupUIUtils.Left_Title_width, Line_Height));
titleLabel.setHorizontalAlignment(BidiUtils.rtl() ? SwingConstants.LEFT : SwingConstants.RIGHT);
jp.add(titleLabel, BidiUtils.rtl()? BorderLayout.EAST : BorderLayout.WEST);
titleLabel.setHorizontalAlignment(SwingConstants.TRAILING);
jp.add(titleLabel, BorderLayout.LINE_START);
jp.add(contentPanel, BorderLayout.CENTER);
return jp;
}

2
designer-base/src/main/java/com/fr/design/javascript/JSContentPane.java
Unescape View File

@ -131,7 +131,7 @@ public class JSContentPane extends BasicPane {
advancedEditorDialog.requestFocus();
}
});
labelPane.add(advancedEditorLabel, BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
labelPane.add(advancedEditorLabel, BorderLayout.LINE_END);
}
protected UIScrollPane createContentTextAreaPanel(){

37
designer-base/src/main/java/com/fr/design/layout/FRGUIPaneFactory.java
Unescape View File

@ -35,12 +35,21 @@ public class FRGUIPaneFactory {
public static final int HEIGHT_OFFSET = 50;
/**
* 创建一个靠右靠左的水平间隙为2的流式布局
* 创建一个靠左的水平间隙为2的流式布局
*
* @return FlowLayout对象
*/
public static LayoutManager createBoxFlowLayout() { // createBoxFlowLayout 图表用到的比较多
return new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 2, 0);
return new FlowLayout(FlowLayout.LEFT, 2, 0);
}
/**
* 创建一个靠左的水平间隙为2的流式布局,支持RTL
*
* @return FlowLayout对象
*/
public static LayoutManager createBoxLeadingLayout() { // createBoxFlowLayout 图表用到的比较多
return new FlowLayout(FlowLayout.LEADING, 2, 0);
}
/**
@ -49,7 +58,16 @@ public class FRGUIPaneFactory {
* @return FlowLayout对象
*/
public static LayoutManager createLeftZeroLayout() {
return new FlowLayout(BidiUtils.rtl() ? FlowLayout.RIGHT : FlowLayout.LEFT, 0, 0);
return new FlowLayout(FlowLayout.LEFT, 0, 0);
}
/**
* 创建一个靠左的布局,支持RTL
*
* @return FlowLayout对象
*/
public static LayoutManager createLeadingZeroLayout() {
return new FlowLayout(FlowLayout.LEADING, 0, 0);
}
/**
@ -429,7 +447,18 @@ public class FRGUIPaneFactory {
*/
public static JPanel createRightFlowInnerContainer_S_Pane() {
JPanel jp = new JPanel();
jp.setLayout(new FlowLayout(BidiUtils.rtl() ? FlowLayout.LEFT : FlowLayout.RIGHT));
jp.setLayout(new FlowLayout(FlowLayout.RIGHT));
return jp;
}
/**
* 创建一个靠右面板
*
* @return JPanel对象
*/
public static JPanel createTrailingFlowInnerContainer_S_Pane() {
JPanel jp = new JPanel();
jp.setLayout(new FlowLayout(FlowLayout.TRAILING));
return jp;
}

5
designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
Unescape View File

@ -76,6 +76,7 @@ import javax.swing.JPanel;
import javax.swing.UIManager;
import javax.swing.WindowConstants;
import java.awt.BorderLayout;
import java.awt.ComponentOrientation;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Point;
@ -267,7 +268,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
basePane.add(CenterRegionContainerPane.getInstance(), BorderLayout.CENTER);
laoyoutWestPane();
basePane.add(EastRegionContainerPane.getInstance(), BidiUtils.rtl() ? BorderLayout.WEST : BorderLayout.EAST);
basePane.add(EastRegionContainerPane.getInstance(), BorderLayout.LINE_END);
basePane.setBounds(0, 0, contentWidth, contentHeight);
// 数值越小。越在底层
@ -479,7 +480,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
protected void laoyoutWestPane() {
basePane.add(WestRegionContainerPane.getInstance(), BidiUtils.rtl() ? BorderLayout.EAST : BorderLayout.WEST);
basePane.add(WestRegionContainerPane.getInstance(), BorderLayout.LINE_START);
}
// 调整windows大小

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

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

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

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

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

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

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

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

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

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

2
designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java
Unescape View File

@ -615,7 +615,7 @@ public class HeaderFooterEditPane extends JPanel {
private UILabel unitLabel;
public AdjustHeightPane() {
this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout());
valueSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
this.add(valueSpinner);

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

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

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

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

2
designer-realize/src/main/java/com/fr/design/share/ui/generate/PriceExpectPane.java
Unescape View File

@ -32,7 +32,7 @@ public class PriceExpectPane extends JPanel {
ButtonGroup radioGroup = new ButtonGroup();
radioGroup.add(freeRadio);
radioGroup.add(chargeRadio);
this.setLayout(FRGUIPaneFactory.createBoxFlowLayout());
this.setLayout(FRGUIPaneFactory.createBoxLeadingLayout());
this.add(freeRadio);
this.add(chargeRadio);
final JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();

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

@ -74,7 +74,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
leftRadioButton.setSelected(true);
buttonGroup.add(centerRadioButton);
buttonGroup.add(leftRadioButton);
JPanel buttonPane = new JPanel(FRGUIPaneFactory.createBoxFlowLayout());
JPanel buttonPane = new JPanel(FRGUIPaneFactory.createBoxLeadingLayout());
buttonPane.add(centerRadioButton);
buttonPane.add(leftRadioButton);
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
Unescape View File

@ -61,7 +61,7 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
leftRadioButton.setSelected(true);
buttonGroup.add(centerRadioButton);
buttonGroup.add(leftRadioButton);
JPanel buttonpane = new JPanel(FRGUIPaneFactory.createBoxFlowLayout());
JPanel buttonpane = new JPanel(FRGUIPaneFactory.createBoxLeadingLayout());
buttonpane.add(centerRadioButton);
buttonpane.add(leftRadioButton);
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
Unescape View File

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

Write Preview
Loading…
Cancel
Save