From 2f564fbd7c75acba19b2d13b618add5f94d15d06 Mon Sep 17 00:00:00 2001 From: obo Date: Wed, 7 Aug 2024 17:49:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=9B=E5=BB=BA=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E9=87=8D=E6=9E=84=E8=BF=98=E5=8E=9F-designer-realize?= =?UTF-8?q?=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/dscolumn/SelectedDataColumnPane.java | 4 ++-- .../design/headerfooter/HeaderFooterEditPane.java | 6 +++--- .../java/com/fr/design/report/ImageExportPane.java | 9 ++++----- .../java/com/fr/design/report/PageSetupPane.java | 12 ++++++------ .../com/fr/design/report/ReportColumnsPane.java | 4 ++-- .../java/com/fr/design/report/SubReportPane.java | 2 +- .../report/freeze/RepeatAndFreezeSettingPane.java | 2 +- .../java/com/fr/design/webattr/CommonPane.java | 5 ++--- .../java/com/fr/design/webattr/EditToolBar.java | 2 +- .../com/fr/design/webattr/ErrorTemplatePane.java | 11 +++++------ .../com/fr/design/webattr/PageToolBarPane.java | 7 +++---- .../com/fr/design/webattr/PageWebSettingPane.java | 11 ++++------- .../com/fr/design/webattr/ServerPrinterPane.java | 2 +- .../com/fr/design/webattr/ToolBarDragPane.java | 1 - .../com/fr/design/webattr/ViewToolBarPane.java | 3 +-- .../com/fr/design/webattr/ViewWebSettingPane.java | 3 +-- .../java/com/fr/design/webattr/WebCssPane.java | 2 +- .../java/com/fr/design/webattr/WebSettingPane.java | 13 ++----------- .../com/fr/design/webattr/WriteToolBarPane.java | 4 ++-- .../com/fr/design/webattr/WriteWebSettingPane.java | 5 ++--- .../AbstractNativePrintSettingPane.java | 14 +++++++------- .../printsettings/NoClientPrintSettingPane.java | 2 +- .../design/write/submit/SubmitVisitorListPane.java | 2 +- 23 files changed, 53 insertions(+), 73 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java index 80550a421e..cbf6a82627 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java @@ -155,8 +155,8 @@ public class SelectedDataColumnPane extends BasicPane { }; columnNameComboBox.setEditable(true); double p = TableLayout.PREFERRED; - UILabel dsLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_TableData"), ":")); - UILabel dcLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Data_Column"), ":")); + UILabel dsLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_TableData") + ":"); + UILabel dcLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Data_Column") + ":"); if (showParameterButton) { dsLabel.setPreferredSize(new Dimension(200, 25)); dcLabel.setPreferredSize(new Dimension(200, 25)); 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 e712ba1da0..e1bd5a811b 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 @@ -131,9 +131,9 @@ public class HeaderFooterEditPane extends JPanel { centerHFContainer.setContentChangeListener(contentChangeListener); rightHFContainer.setContentChangeListener(contentChangeListener); - controlContentPane.add(createContainerSection(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Left_Section"), ":"), leftHFContainer)); - controlContentPane.add(createContainerSection(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Center_Section"), ":"), centerHFContainer)); - controlContentPane.add(createContainerSection(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Right_Section"), ":"), rightHFContainer)); + controlContentPane.add(createContainerSection(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Left_Section") + ":", leftHFContainer)); + controlContentPane.add(createContainerSection(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Center_Section") + ":", centerHFContainer)); + controlContentPane.add(createContainerSection(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Right_Section") + ":", rightHFContainer)); //set current HFContainer setCurrentHFContainer(leftHFContainer); diff --git a/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java b/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java index bbaa4de806..ba4eccb63a 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java @@ -1,7 +1,6 @@ package com.fr.design.report; import com.fr.base.extension.FileExtension; -import com.fr.base.i18n.BidiUtils; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; import com.fr.design.i18n.Toolkit; @@ -67,10 +66,10 @@ public class ImageExportPane extends AbstractExportPane { JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JComponent[][] comps = { - {new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Image_Export_Resolution"), ":")), this.globalResolutionBtnS, this.globalResolutionBtnM, this.globalResolutionBtnL}, - {new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Format") , ":")), this.globalFormatJpg, null, this.globalFormatPng}, - {new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Image_Export_Rendering_Quality") , ":")), this.globalRenderQuality, null, this.globalRenderSpeed}, - {new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Image_Export_Typesetting") , ":")), this.templateThumbnail, null, this.templatePaging} + {new UILabel(Toolkit.i18nText("Fine-Design_Image_Export_Resolution") + ":"), this.globalResolutionBtnS, this.globalResolutionBtnM, this.globalResolutionBtnL}, + {new UILabel(Toolkit.i18nText("Fine-Design_Report_Format") + ":"), this.globalFormatJpg, null, this.globalFormatPng}, + {new UILabel(Toolkit.i18nText("Fine-Design_Image_Export_Rendering_Quality") + ":"), this.globalRenderQuality, null, this.globalRenderSpeed}, + {new UILabel(Toolkit.i18nText("Fine-Design_Image_Export_Typesetting") + ":"), this.templateThumbnail, null, this.templatePaging} }; centerPane.add( TableLayoutHelper.createCommonTableLayoutPane( 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 e2e4e5608b..f658f69cb3 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 @@ -282,12 +282,12 @@ public class PageSetupPane extends BasicPane { JPanel marginLeftTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); marginLeftPane.add(marginLeftTextPane); - marginLeftTextPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_Duplicate"), ":"))); + marginLeftTextPane.add(new UILabel(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(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom"), ":"))); + marginLeftUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom") + ":")); marginBottomUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginLeftUnitPane.add(marginBottomUnitFieldPane); @@ -298,13 +298,13 @@ public class PageSetupPane extends BasicPane { // peter:这个一个垂直的上下的字符panel. JPanel marginRightTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); marginRightPane.add(marginRightTextPane); - marginRightTextPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left"), ":"))); + marginRightTextPane.add(new UILabel(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(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right"), ":"))); + marginRightUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right") + ":")); marginRightUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginRightUnitPane.add(marginRightUnitFieldPane); @@ -324,7 +324,7 @@ public class PageSetupPane extends BasicPane { // header height. JPanel headerHeightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); hfHeightPane.add(headerHeightPane); - headerHeightPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Header"), ":"))); + headerHeightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Header") + ":")); headerUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); headerHeightPane.add(headerUnitFieldPane); @@ -332,7 +332,7 @@ public class PageSetupPane extends BasicPane { // footer height. JPanel footerHeightPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); hfHeightPane.add(footerHeightPane); - footerHeightPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Footer"), ":"))); + footerHeightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Footer") + ":")); footerUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); footerHeightPane.add(footerUnitFieldPane); diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java b/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java index bd27e62f6f..388eaad230 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java @@ -311,12 +311,12 @@ public class ReportColumnsPane extends BasicPane{ rowPane.setBorder(explainBorder); rowPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5,13)); rowPane.setPreferredSize(new Dimension(500,80)); - rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Data"), ":"))); + rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Data") + ":")); repeatColDataTextField = new UITextField(); repeatColDataTextField.setPreferredSize(new Dimension(107,24)); rowPane.add(repeatColDataTextField); rowPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": A2:D5 "))); - copyLabel = new UILabel(BidiUtils.reverseConcatenateStrings(REPORT_COLUMN_RAPEAT[rowOrColumn] + ":")); + copyLabel = new UILabel(REPORT_COLUMN_RAPEAT[rowOrColumn] + ":"); rowPane.add(copyLabel); copyTitleTextField = new UITextField(); diff --git a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java index 653c526422..d6e3008dd3 100644 --- a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java @@ -46,7 +46,7 @@ public class SubReportPane extends BasicPane { JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); // northPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Report_Path"),null)); - northPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Location"), ":")), BorderLayout.LINE_START); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Location") + ":"), BorderLayout.LINE_START); northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER); pathTextField.setEditable(false); UIButton browseButton = new UIButton("..."); diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java index 148cfbe768..d36b916a16 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java @@ -210,7 +210,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane { protected JPanel initWriteFrozenPane() { JPanel writePanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); // 填报冻结 - UILabel writeLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Frozen"), ":")); + UILabel writeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Frozen") + ":"); JPanel writeLabelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); writeLabelPanel.add(writeLabel); writePanel.add(writeLabelPanel, BorderLayout.NORTH); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/CommonPane.java b/designer-realize/src/main/java/com/fr/design/webattr/CommonPane.java index d281eadf68..b05c52d811 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/CommonPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/CommonPane.java @@ -8,7 +8,6 @@ import java.awt.BorderLayout; import javax.swing.BorderFactory; import javax.swing.JComponent; -import com.fr.base.i18n.BidiUtils; import com.fr.design.gui.ilable.UILabel; import javax.swing.JPanel; @@ -42,8 +41,8 @@ public class CommonPane extends JPanel { this.cacheValidateTimeEditor = new LongEditor(); JComponent[][] comps = { - {new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title"), ":")), this.titleTextField, null}, - {new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cache_Validate_Time"), ":")), this.cacheValidateTimeEditor, new UILabel("milliseconds")} + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title") + ":"), this.titleTextField, null}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cache_Validate_Time") + ":"), this.cacheValidateTimeEditor, new UILabel("milliseconds")} }; this.add( diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java index 5a8f588bcb..6dcf5f07f1 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java @@ -420,7 +420,7 @@ public class EditToolBar extends BasicPane { double rowSize[] = {p, p}; double columnSize[] = {p, p}; - Component[][] coms = new Component[][]{{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Printer_Alias"), ":")), nameField}, {new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Icon"), ":")), iconPane}}; + Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Printer_Alias") + ":"), nameField}, {new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Icon"), ":")), iconPane}}; JPanel nameIconPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java b/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java index ecdc078692..96de36008f 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java @@ -1,6 +1,5 @@ package com.fr.design.webattr; -import com.fr.base.i18n.BidiUtils; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; @@ -33,12 +32,12 @@ public class ErrorTemplatePane extends BasicBeanPane { reportletNamePane.add(this.templateField); Component[][] components = { - {new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Path"), ":")), reportletNamePane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Path") + ":"), reportletNamePane}, - {new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Parameters"), ":")), null}, - {new UILabel(BidiUtils.reverseConcatenateStrings("message", ":")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message"))}, - {new UILabel(BidiUtils.reverseConcatenateStrings("charset", ":")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Charset"))}, - {new UILabel(BidiUtils.reverseConcatenateStrings("exception", ":")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exception_Stack_Trace"))} + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Parameters") + ":"), null}, + {new UILabel("message" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message"))}, + {new UILabel("charset" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Charset"))}, + {new UILabel("exception" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exception_Stack_Trace"))} }; JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); 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 cbc8d36d40..633a3c83c0 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 @@ -1,7 +1,6 @@ package com.fr.design.webattr; import com.fr.base.ConfigManager; -import com.fr.base.i18n.BidiUtils; import com.fr.config.Configuration; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; @@ -117,9 +116,9 @@ public class PageToolBarPane extends AbstractEditToolBarPane { double[] columnSize = {p, p, p, p}; double[] rowSize = {p, p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), UILabel.TRAILING), buttonPane, null, null}, - new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_PageSetup_Page"), ":"), UILabel.TRAILING), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox}, - new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Paging_Settings"), ":"), UILabel.TRAILING), isPageFixedRowBox, linesPerPagePane, null}, + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Show_Location") + ":", UILabel.TRAILING), buttonPane, null, null}, + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_PageSetup_Page") + ":", UILabel.TRAILING), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox}, + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Paging_Settings") + ":", UILabel.TRAILING), isPageFixedRowBox, linesPerPagePane, null}, new Component[]{null, tipLabel, null, null}, new Component[]{isUseToolBarCheckBox, editToolBarButtonPanel, null, null} }; 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 8a22b6f07e..35b34071fb 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 @@ -102,7 +102,7 @@ public class PageWebSettingPane extends WebSettingPane { } }); - UILabel linesPerPageLabel = new UILabel(BidiUtils.reverseConcatenateStrings(Toolkit.i18nText("Fine-Design_Report_Rows_Per_Page"), "：")); + UILabel linesPerPageLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_Rows_Per_Page") + "："); Component[][] rowCountTextFieldComponents = {{linesPerPageLabel,pageFixedRowCountTextField}}; JPanel linesPerPagePane = TableLayoutHelper.createTableLayoutPane(rowCountTextFieldComponents, new double[]{p}, new double[]{p,p}); UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Report_Page_Fixed_Row_Tip")); @@ -111,9 +111,9 @@ public class PageWebSettingPane extends WebSettingPane { double[] columnSize = {p, p, p, p}; double[] rowSize = {p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{createBidiUILabel("Fine-Design_Report_Show_Location"), buttonpane, null, null}, - new Component[]{createBidiUILabel("Fine-Design_Report_PageSetup_Page"), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox}, - new Component[]{createBidiUILabel("Fine-Design_Report_Paging_Settings"), isPageFixedRowBox, linesPerPagePane, null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location") + ":", UILabel.TRAILING), buttonpane, null, null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Page") + ":", UILabel.TRAILING), isShowAsImageBox, isAutoScaleBox, isTDHeavyBox}, + new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Report_Paging_Settings") + ":", UILabel.TRAILING), isPageFixedRowBox, linesPerPagePane, null}, new Component[]{null, tipLabel, null, null} }; @@ -121,9 +121,6 @@ public class PageWebSettingPane extends WebSettingPane { return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); } - private UILabel createBidiUILabel(String i18nKey) { - return new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText(i18nKey), ":"), UILabel.TRAILING); - } @Override protected void checkEnabled(boolean isSelected) { diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java index 126b39445d..e10318418b 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java @@ -323,7 +323,7 @@ public class ServerPrinterPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(20, 5, 0, 0)); JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - centerPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Printer"), ":")), BorderLayout.WEST); + centerPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Printer") + ":"), BorderLayout.WEST); DefaultComboBoxModel printerComboModel = new DefaultComboBoxModel(); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java index 42c6e42d24..d3ca289ab3 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java @@ -31,7 +31,6 @@ import javax.swing.table.TableModel; import java.awt.BorderLayout; import java.awt.Color; import java.awt.Component; -import java.awt.ComponentOrientation; import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java index d8a66b0dab..47427c2f4b 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java @@ -1,7 +1,6 @@ package com.fr.design.webattr; import com.fr.base.ConfigManager; -import com.fr.base.i18n.BidiUtils; import com.fr.config.Configuration; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; @@ -33,7 +32,7 @@ public class ViewToolBarPane extends AbstractEditToolBarPane { private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar")); private UIButton editToolBarButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); - private UILabel showListenersLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Editing_Listeners"), ":")); + private UILabel showListenersLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Editing_Listeners") + ":"); private UICheckBox sortCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Sort_Sort")); private UICheckBox conditonFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Selection_Filter")); private UICheckBox listFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_List_Filter")); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ViewWebSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ViewWebSettingPane.java index 398275ea54..a8055c647e 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ViewWebSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ViewWebSettingPane.java @@ -1,6 +1,5 @@ package com.fr.design.webattr; -import com.fr.base.i18n.BidiUtils; import com.fr.design.ExtraDesignClassManager; import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.icheckbox.UICheckBox; @@ -35,7 +34,7 @@ public class ViewWebSettingPane extends WebSettingPane { sortCheckBox.setSelected(true); conditionFilterBox.setSelected(true); listFilterBox.setSelected(true); - return GUICoreUtils.createFlowPane(new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ViewPreview"), ":")), + return GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ViewPreview") + ":"), sortCheckBox, conditionFilterBox, listFilterBox}, FlowLayout.LEADING, 6); } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java index 793c0dd1c2..40c579f80f 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java @@ -45,7 +45,7 @@ public class WebCssPane extends BasicPane { chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Selection")); chooseFile.setPreferredSize(new Dimension(75, 23)); chooseFile.addActionListener(chooseFileListener); - northPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File"), ":")), FlowLayout.LEFT); + northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File") + ":"), FlowLayout.LEFT); northPane.add(localText, FlowLayout.CENTER); northPane.add(chooseFile, FlowLayout.RIGHT); outnorth.add(northPane,BorderLayout.NORTH); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java index b3779d5a63..56fa029a9b 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java @@ -1,8 +1,5 @@ package com.fr.design.webattr; -import com.fine.swing.ui.layout.Column; -import com.fine.swing.ui.layout.Layouts; -import com.fr.base.i18n.BidiUtils; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.icombobox.UIComboBox; @@ -25,12 +22,6 @@ import java.awt.event.ItemListener; import java.util.ArrayList; import java.util.List; -import static com.fine.swing.ui.layout.Layouts.cell; -import static com.fine.swing.ui.layout.Layouts.column; -import static com.fine.swing.ui.layout.Layouts.fix; -import static com.fine.swing.ui.layout.Layouts.flex; -import static com.fine.swing.ui.layout.Layouts.row; - public abstract class WebSettingPane extends BasicBeanPane { private static final String[] CHOOSEITEM = new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_I_Want_To_Set_Single"), @@ -50,12 +41,12 @@ public abstract class WebSettingPane extends BasicBeanPane JPanel buttonPane = new JPanel(new FlowLayout(FlowLayout.LEADING, 0, 6)); choseComboBox = new UIComboBox(CHOOSEITEM); choseComboBox.addItemListener(itemListener); - buttonPane.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Blow_Set"), ":"))); + buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Blow_Set") + ":")); buttonPane.add(choseComboBox); dragToolBarPane = new ToolBarDragPane(); dragToolBarPane.setDefaultToolBar(getDefaultToolBarManager(), getToolBarInstance()); JPanel eventpanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - eventpanel.add(new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Set"), ":")), BorderLayout.NORTH); + eventpanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Set") + ":"), BorderLayout.NORTH); eventPane = new EventPane(getEventNames()); eventpanel.add(eventPane, BorderLayout.CENTER); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java index ac61638b7e..f84d5dc6a3 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java @@ -46,10 +46,10 @@ public class WriteToolBarPane extends AbstractEditToolBarPane { private UILabel sheetShowLocationLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sheet_Label_Page_Display_Position")); private UIRadioButton centerRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Center_Display")); private UIRadioButton leftRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Display")); - private UILabel rptShowLocationLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), UILabel.LEADING); + private UILabel rptShowLocationLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location") + ":", UILabel.LEADING); private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar")); private UIButton editToolBarButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); - private UILabel showListenersLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Editing_Listeners"), ":")); + private UILabel showListenersLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Editing_Listeners") + ":"); private UICheckBox unloadCheck; private UICheckBox showWidgets; private UICheckBox isAutoStash;//自动暂存 diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java index 9a23d2ba26..13fe37de87 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java @@ -1,7 +1,6 @@ package com.fr.design.webattr; import com.fr.base.BaseUtils; -import com.fr.base.i18n.BidiUtils; import com.fr.design.ExtraDesignClassManager; import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.ibutton.UIColorButton; @@ -43,7 +42,7 @@ public class WriteWebSettingPane extends WebSettingPane { @Override protected JPanel createOtherSetPane() { - colorBox = new UICheckBox(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background_Of_Current_Row"), ":")); + colorBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background_Of_Current_Row") + ":"); colorBox.setSelected(true); colorButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png")); colorBox.addActionListener(new ActionListener() { @@ -65,7 +64,7 @@ public class WriteWebSettingPane extends WebSettingPane { JPanel sheetPane = GUICoreUtils.createFlowPane(new Component[]{sheetShowLocationLabel, topRadioButton, bottomRadioButton}, FlowLayout.LEADING); //Sean: 报表显示位置since 706 - rptShowLocationLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location"), ":"), UILabel.LEADING); + rptShowLocationLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Location") + ":", UILabel.LEADING); centerRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Center_Display")); leftRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Display")); ButtonGroup rptShowButtonGroup = new ButtonGroup(); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java index ddf47770bf..5fffe2e752 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java @@ -191,7 +191,7 @@ public abstract class AbstractNativePrintSettingPane extends JPanel { JPanel layoutSettingCheckPane = GUICoreUtils.createCheckboxAndDynamicPane(inheritPageLayoutSettingCheck, layoutSettingPane, true); // 页码标签 - UILabel printAreaLabel = new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Page_Number"), ":")); + UILabel printAreaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Page_Number") + ":"); JPanel printAreaLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); printAreaLabelPane.add(printAreaLabel, BorderLayout.NORTH); printAreaLabel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); @@ -213,13 +213,13 @@ public abstract class AbstractNativePrintSettingPane extends JPanel { double[] rowSize = {p, p, p, p, p, p, p}; double[] columnSize = {60, p}; Component[][] components = { - {new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Printer"), ":")), printerPane}, - {new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Copy_Number"), ":")), copyPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Printer") + ":"), printerPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Copy_Number") + ":"), copyPane}, {printAreaLabelPane, getPrintAreaPane()}, - {getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paper"), ":")), paperSettingCheckPane}, - {getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout"), ":")), layoutSettingCheckPane}, - {getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Margin"), ":")), pageMarginCheckPane}, - {getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_EnlargeOrReduce"), ":")), scaleCheckPane}, + {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Paper") + ":"), paperSettingCheckPane}, + {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout") + ":"), layoutSettingCheckPane}, + {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Margin") + ":"), pageMarginCheckPane}, + {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_EnlargeOrReduce") + ":"), scaleCheckPane}, }; return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15); } diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java index f06d80d973..89b089208f 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NoClientPrintSettingPane.java @@ -60,7 +60,7 @@ public class NoClientPrintSettingPane extends JPanel { double[] rowSize = {p}; double[] columnSize = {60, p}; Component[][] components = { - {getTopAlignLabelPane(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Margin"), ":")), pageMarginCheckPane} + {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Margin") + ":"), pageMarginCheckPane} }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15); diff --git a/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java b/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java index 19656a3742..3fd7cf9501 100644 --- a/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java +++ b/designer-realize/src/main/java/com/fr/design/write/submit/SubmitVisitorListPane.java @@ -187,7 +187,7 @@ public class SubmitVisitorListPane extends ObjectJControlPane { } csjConfigComboBox = new UIComboBox(configTypes.toArray()); - JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(BidiUtils.reverseConcatenateStrings(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type"), ":")), csjConfigComboBox}, + JPanel typePane = GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":"), csjConfigComboBox}, FlowLayout.LEADING, 10); typePane.setBorder(BidiUtils.applyTitledBorderJustification(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type")))); this.add(typePane, BorderLayout.NORTH);