From d0b896a936ffa2bbbd5271299aadf10550b5af2f Mon Sep 17 00:00:00 2001 From: obo Date: Fri, 2 Aug 2024 16:31:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF-=E9=A1=B5=E9=9D=A2=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/report/PageSetupPane.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index 3074bb009a..e2e4e5608b 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -21,6 +21,7 @@ import java.awt.event.ItemListener; import javax.swing.*; +import com.fr.base.i18n.BidiUtils; import com.fr.design.gui.ispinner.ColumnRowSpinner; import com.fr.page.PaperSettingProvider; import com.fr.page.ReportSettingsProvider; @@ -82,6 +83,7 @@ public class PageSetupPane extends BasicPane { otherPane = new OtherPane(); centerTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Page"), pagePane); centerTabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other"), otherPane); + BidiUtils.applyOrientationByLocale(this); } @Override @@ -193,12 +195,12 @@ public class PageSetupPane extends BasicPane { defaultPane.add(paperSizePane); - predefinedRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Predefined") + ":"); + predefinedRadioButton = new UIRadioButton(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Predefined"), ":")); predefinedRadioButton.setMnemonic('P'); predefinedRadioButton.addActionListener(previewListener); - customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom") + ":"); + customRadioButton = new UIRadioButton(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"), ":")); customRadioButton.setMnemonic('C'); customRadioButton.addActionListener(previewListener); @@ -280,12 +282,12 @@ public class PageSetupPane extends BasicPane { JPanel marginLeftTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); marginLeftPane.add(marginLeftTextPane); - marginLeftTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_Duplicate") + ":")); + marginLeftTextPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_Duplicate"), ":"))); marginTopUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginLeftTextPane.add(marginTopUnitFieldPane); JPanel marginLeftUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); marginLeftPane.add(marginLeftUnitPane); - marginLeftUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom") + ":")); + marginLeftUnitPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom"), ":"))); marginBottomUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginLeftUnitPane.add(marginBottomUnitFieldPane); @@ -296,13 +298,13 @@ public class PageSetupPane extends BasicPane { // peter:这个一个垂直的上下的字符panel. JPanel marginRightTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); marginRightPane.add(marginRightTextPane); - marginRightTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left") + ":")); + marginRightTextPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left"), ":"))); marginLeftUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginRightTextPane.add(marginLeftUnitFieldPane); JPanel marginRightUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); marginRightPane.add(marginRightUnitPane); - marginRightUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right") + ":")); + marginRightUnitPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right"), ":"))); marginRightUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginRightUnitPane.add(marginRightUnitFieldPane); @@ -322,7 +324,7 @@ public class PageSetupPane extends BasicPane { // header height. JPanel headerHeightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); hfHeightPane.add(headerHeightPane); - headerHeightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Header") + ":")); + headerHeightPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Header"), ":"))); headerUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); headerHeightPane.add(headerUnitFieldPane); @@ -330,7 +332,7 @@ public class PageSetupPane extends BasicPane { // footer height. JPanel footerHeightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); hfHeightPane.add(footerHeightPane); - footerHeightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Footer") + ":")); + footerHeightPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Footer"), ":"))); footerUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); footerHeightPane.add(footerUnitFieldPane); @@ -928,7 +930,7 @@ public class PageSetupPane extends BasicPane { JPanel firstPaneNumberPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); defaultPane.add(firstPaneNumberPane); - firstPaneNumberPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_First_Page_Number") + ": ")); + firstPaneNumberPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_First_Page_Number"), ": "))); // marks: 这个地方必须为大于零的整数 firstPageNumberSpinner = new UISpinner(1, Integer.MAX_VALUE, 1, 1); firstPaneNumberPane.add(firstPageNumberSpinner);