From bd9fd688c60cfb052301152b704ff5ed90c4cf88 Mon Sep 17 00:00:00 2001 From: zack Date: Thu, 17 Apr 2025 09:57:46 +0800 Subject: [PATCH] INO-21891 --- .../connect/ConnectionTableProcedurePane.java | 11 +-- .../icontainer/UIEastResizableContainer.java | 17 ---- .../mainframe/EastRegionContainerPane.java | 4 +- .../report/fit/ReportFitConfigPane.java | 3 +- .../write/submit/DBManipulationPane.java | 2 +- .../fr/design/i18n/dimension_en.properties | 91 ++++++++++--------- .../fr/design/i18n/dimension_ja_JP.properties | 89 +++++++++--------- .../fr/design/i18n/dimension_ko_KR.properties | 89 +++++++++--------- .../fr/design/i18n/dimension_ru.properties | 42 --------- .../fr/design/i18n/dimension_zh.properties | 89 +++++++++--------- .../fr/design/i18n/dimension_zh_TW.properties | 87 ++++++++++-------- .../replace/ui/ITReplaceNorthPanel.java | 3 +- .../com/fr/design/report/ImageExportPane.java | 3 +- .../freeze/RepeatAndFreezeSettingPane.java | 5 +- .../design/sort/common/AbstractSortPane.java | 4 +- .../com/fr/design/webattr/WebCssPane.java | 5 +- .../AbstractNativePrintSettingPane.java | 4 +- 17 files changed, 260 insertions(+), 288 deletions(-) delete mode 100644 designer-base/src/main/resources/com/fr/design/i18n/dimension_ru.properties diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java index 79e75a0b83..29ce692bdb 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java @@ -214,19 +214,12 @@ public class ConnectionTableProcedurePane extends BasicPane { second.add(viewCheckBox); // 根据环境是否为中文设置不同的显示 - if (GeneralContext.isChineseEnv()) { + first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table"), BaseUtils.readIcon("/com/fr/design/images/data/tables.png"), UILabel.LEADING)); second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View"), BaseUtils.readIcon("/com/fr/design/images/data/views.png"), UILabel.LEADING)); - } else { - UILabel ui1 = new UILabel(BaseUtils.readIcon("/com/fr/design/images/data/tables.png"), UILabel.LEADING); - UILabel ui2 = new UILabel(BaseUtils.readIcon("/com/fr/design/images/data/views.png"), UILabel.LEADING); - ui1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table")); - ui2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View")); - first.add(ui1); - second.add(ui2); - } + checkBoxgroupPane.add(first); checkBoxgroupPane.add(second); diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java index bd9dd8ec55..af7bfc9672 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java @@ -359,18 +359,9 @@ public class UIEastResizableContainer extends JPanel { } } - /** - * @author zack - * @since 11.0 - * Created on 2025/04/08 - */ public class ResizeListener extends MouseAdapter implements MouseMotionListener { private Point mouseDownCompCoords; - /** - * 鼠标移动 - * @param e - */ @Override public void mouseMoved(MouseEvent e) { if (e.getX() <= RESIZE_RANGE) { @@ -380,10 +371,6 @@ public class UIEastResizableContainer extends JPanel { } } - /** - * 鼠标点击 - * @param e - */ @Override public void mousePressed(MouseEvent e) { if (e.getX() <= RESIZE_RANGE) { @@ -391,10 +378,6 @@ public class UIEastResizableContainer extends JPanel { } } - /** - * 鼠标拖拽 - * @param e - */ @Override public void mouseDragged(MouseEvent e) { if (mouseDownCompCoords != null && getCursor().equals(westResizeCursor)) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java index 90840c1bd3..26d2f9c061 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java @@ -1424,9 +1424,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { addMouseMotionListener(new MouseMotionListener() { @Override public void mouseDragged(MouseEvent e) { - if (mouseDownCompCoords == null) { - return; - } + if (mouseDownCompCoords == null) return; Rectangle bounds = getBounds(); Point currCoords = e.getLocationOnScreen(); diff --git a/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java b/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java index a4baf471c5..1ca8f2a231 100644 --- a/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java @@ -115,8 +115,9 @@ public class ReportFitConfigPane extends JPanel { previewJPanel = new NewFitPreviewPane(); wrapperPane.add(previewJPanel, BorderLayout.CENTER); int leftIndent = globalConfig ? (int) DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.firstColumn").getWidth() : 0; + int height = (int) DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.topMargin").getHeight(); wrapperPane.setBorder(BorderFactory.createEmptyBorder(0, leftIndent, 0, 0)); - wrapperPane.setPreferredSize(new Dimension(300 + leftIndent, 160)); + wrapperPane.setPreferredSize(new Dimension(300 + leftIndent, height)); return wrapperPane; } diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index fd52155053..370b842513 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -351,7 +351,7 @@ public class DBManipulationPane extends BasicBeanPane { } protected Dimension createControlBtnPanePreferredSize() { - return new Dimension(110, 20); + return DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.write.submit.DBManipulationPane.createControlBtnPanePreferredSize"); } protected String setControlBtnPanePosition() { diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties index 5a0d78c27a..1a9a995d01 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties @@ -1,42 +1,49 @@ -com.fr.design.mainframe.check.CheckButton=305*118 -com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=630*185 -com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=570*31 -com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=630*280 -com.fr.design.report.ReportColumnsPane=800*600 -com.fr.env.RemoteEnvPane.dialog=458*132 -com.fr.design.version.check.dialog=490*95 -com.fr.design.version.detail.label=750*30 -com.fr.design.version.detail.dialog=900*500 -com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36 -com.fr.design.web.pane.text.field=450*20 -com.fr.design.actions.server.dialog=800*630 -com.fr.design.report.fit.templatePane.dialog=800*400 -com.fr.design.report.fit.firstColumn=120*20 -com.fr.design.report.fit.column=160*20 -com.fr.design.lock.LockInfoDialog=500*180 -com.fr.design.mainframe.ForbiddenPane.refreshButton=75*24 -com.fr.start.common.DesignerOpenEmptyPanel.createButton=120*24 -com.fr.design.cell.expand.sort.pane=257*185 -com.fr.design.sort.rule.item=125*20 -com.fr.design.ds.column.sort.pane=250*180 -com.fr.design.sort.expand.header.pane=95*10 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 -com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65 -com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600 -com.fr.design.formula.FormulaPane=900*600 -com.fr.design.formula.FormulaPaneWhenReserveFormula=1200*600 -com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=130*20 -com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=140*20 -com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=100*24 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20 -com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330 -com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20 -com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20 -com.fr.design.report.WordExportPane.outNorthPane=580*110 -com.fr.design.report.ReportColumnsPane.labelButton=60*20 -com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80 -com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24 -com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20 \ No newline at end of file +com.fr.design.mainframe.check.CheckButton=305*118 +com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=630*185 +com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=570*31 +com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=630*280 +com.fr.design.report.ReportColumnsPane=800*600 +com.fr.env.RemoteEnvPane.dialog=458*132 +com.fr.design.version.check.dialog=490*95 +com.fr.design.version.detail.label=750*30 +com.fr.design.version.detail.dialog=900*500 +com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36 +com.fr.design.web.pane.text.field=450*20 +com.fr.design.actions.server.dialog=800*630 +com.fr.design.report.fit.templatePane.dialog=800*400 +com.fr.design.report.fit.firstColumn=120*20 +com.fr.design.report.fit.column=160*20 +com.fr.design.lock.LockInfoDialog=500*180 +com.fr.design.mainframe.ForbiddenPane.refreshButton=75*24 +com.fr.start.common.DesignerOpenEmptyPanel.createButton=120*24 +com.fr.design.cell.expand.sort.pane=257*185 +com.fr.design.sort.rule.item=125*20 +com.fr.design.ds.column.sort.pane=250*180 +com.fr.design.sort.expand.header.pane=95*10 +com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 +com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 +com.fr.design.report.WatermarkSettingPane=720*600 +com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65 +com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600 +com.fr.design.formula.FormulaPane=900*600 +com.fr.design.formula.FormulaPaneWhenReserveFormula=1200*600 +com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=130*20 +com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=140*20 +com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=100*24 +com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20 +com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20 +com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330 +com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20 +com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20 +com.fr.design.report.WordExportPane.outNorthPane=580*110 +com.fr.design.report.ReportColumnsPane.labelButton=60*20 +com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80 +com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24 +com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20 +com.fr.design.report.fit.topMargin=300*180 +com.fr.design.write.submit.DBManipulationPane.createControlBtnPanePreferredSize=110*20 +com.fr.design.report.freeze.RepeatAndFreezeSettingPane.RepeatAndFrozen=600*95 +com.fr.design.actions.replace.ui.ITReplaceNorthPanel.replaceButton=44*161 +com.fr.design.report.ImageExportPane.outNorthPane=580*230 +com.fr.design.sort.common.AbstractSortPane.IntervalUILabel=14*10 +com.fr.design.webattr.printsettings.AbstractNativePrintSettingPane.createGapTableLayoutPane=0*15 \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties index 50f8fdcb2b..8b504a4488 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties @@ -1,41 +1,48 @@ -com.fr.design.mainframe.check.CheckButton=280*118 -com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=610*185 -com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=550*31 -com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=610*280 -com.fr.env.RemoteEnvPane.dialog=458*132 -com.fr.design.version.check.dialog=430*95 -com.fr.design.version.detail.label=650*30 -com.fr.design.version.detail.dialog=800*500 -com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36 -com.fr.design.web.pane.text.field=400*20 -com.fr.design.actions.server.dialog=700*630 -com.fr.design.report.fit.templatePane.dialog=600*400 -com.fr.design.report.fit.firstColumn=170*20 -com.fr.design.report.fit.column=100*20 -com.fr.design.lock.LockInfoDialog=500*180 -com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24 -com.fr.start.common.DesignerOpenEmptyPanel.createButton=70*24 -com.fr.design.cell.expand.sort.pane=257*170 -com.fr.design.sort.rule.item=125*20 -com.fr.design.ds.column.sort.pane=250*165 -com.fr.design.sort.expand.header.pane=95*10 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 -com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 -com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600 -com.fr.design.formula.FormulaPane=900*600 -com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 -com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=100*20 -com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=130*20 -com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=160*24 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20 -com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330 -com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20 -com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20 -com.fr.design.report.WordExportPane.outNorthPane=580*110 -com.fr.design.report.ReportColumnsPane.labelButton=60*20 -com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80 -com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24 -com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20 \ No newline at end of file +com.fr.design.mainframe.check.CheckButton=280*118 +com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=610*185 +com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=550*31 +com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=610*280 +com.fr.env.RemoteEnvPane.dialog=458*132 +com.fr.design.version.check.dialog=430*95 +com.fr.design.version.detail.label=650*30 +com.fr.design.version.detail.dialog=800*500 +com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36 +com.fr.design.web.pane.text.field=400*20 +com.fr.design.actions.server.dialog=700*630 +com.fr.design.report.fit.templatePane.dialog=600*400 +com.fr.design.report.fit.firstColumn=170*20 +com.fr.design.report.fit.column=100*20 +com.fr.design.lock.LockInfoDialog=500*180 +com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24 +com.fr.start.common.DesignerOpenEmptyPanel.createButton=70*24 +com.fr.design.cell.expand.sort.pane=257*170 +com.fr.design.sort.rule.item=125*20 +com.fr.design.ds.column.sort.pane=250*165 +com.fr.design.sort.expand.header.pane=95*10 +com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 +com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 +com.fr.design.report.WatermarkSettingPane=720*600 +com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 +com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600 +com.fr.design.formula.FormulaPane=900*600 +com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 +com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=100*20 +com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=130*20 +com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=160*24 +com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20 +com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20 +com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330 +com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20 +com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20 +com.fr.design.report.WordExportPane.outNorthPane=580*110 +com.fr.design.report.ReportColumnsPane.labelButton=60*20 +com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80 +com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24 +com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20 +com.fr.design.report.fit.topMargin=300*204 +com.fr.design.write.submit.DBManipulationPane.createControlBtnPanePreferredSize=110*20 +com.fr.design.report.freeze.RepeatAndFreezeSettingPane.RepeatAndFrozen=600*100 +com.fr.design.actions.replace.ui.ITReplaceNorthPanel.replaceButton=44*161 +com.fr.design.report.ImageExportPane.outNorthPane=580*230 +com.fr.design.sort.common.AbstractSortPane.IntervalUILabel=14*10 +com.fr.design.webattr.printsettings.AbstractNativePrintSettingPane.createGapTableLayoutPane=0*15 \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties index abf114f5cf..cd95a845f3 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties @@ -1,41 +1,48 @@ -com.fr.design.mainframe.check.CheckButton=230*118 -com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=550*185 -com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=490*35 -com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=550*280 -com.fr.env.RemoteEnvPane.dialog=458*132 -com.fr.design.version.check.dialog=450*95 -com.fr.design.version.detail.label=700*30 -com.fr.design.version.detail.dialog=850*500 -com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36 -com.fr.design.web.pane.text.field=450*20 -com.fr.design.actions.server.dialog=700*630 -com.fr.design.report.fit.templatePane.dialog=600*400 -com.fr.design.report.fit.firstColumn=130*20 -com.fr.design.report.fit.column=100*20 -com.fr.design.lock.LockInfoDialog=500*180 -com.fr.design.mainframe.ForbiddenPane.refreshButton=80*24 -com.fr.start.common.DesignerOpenEmptyPanel.createButton=90*24 -com.fr.design.cell.expand.sort.pane=267*165 -com.fr.design.sort.rule.item=125*20 -com.fr.design.ds.column.sort.pane=250*180 -com.fr.design.sort.expand.header.pane=95*10 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 -com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 -com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600 -com.fr.design.formula.FormulaPane=900*600 -com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 -com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20 -com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20 -com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20 -com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330 -com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20 -com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20 -com.fr.design.report.WordExportPane.outNorthPane=580*110 -com.fr.design.report.ReportColumnsPane.labelButton=60*20 -com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80 -com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24 -com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20 \ No newline at end of file +com.fr.design.mainframe.check.CheckButton=230*118 +com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=550*185 +com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=490*35 +com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=550*280 +com.fr.env.RemoteEnvPane.dialog=458*132 +com.fr.design.version.check.dialog=450*95 +com.fr.design.version.detail.label=700*30 +com.fr.design.version.detail.dialog=850*500 +com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36 +com.fr.design.web.pane.text.field=450*20 +com.fr.design.actions.server.dialog=700*630 +com.fr.design.report.fit.templatePane.dialog=600*400 +com.fr.design.report.fit.firstColumn=130*20 +com.fr.design.report.fit.column=100*20 +com.fr.design.lock.LockInfoDialog=500*180 +com.fr.design.mainframe.ForbiddenPane.refreshButton=80*24 +com.fr.start.common.DesignerOpenEmptyPanel.createButton=90*24 +com.fr.design.cell.expand.sort.pane=267*165 +com.fr.design.sort.rule.item=125*20 +com.fr.design.ds.column.sort.pane=250*180 +com.fr.design.sort.expand.header.pane=95*10 +com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 +com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 +com.fr.design.report.WatermarkSettingPane=720*600 +com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 +com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600 +com.fr.design.formula.FormulaPane=900*600 +com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 +com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20 +com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20 +com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24 +com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20 +com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20 +com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330 +com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20 +com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20 +com.fr.design.report.WordExportPane.outNorthPane=580*110 +com.fr.design.report.ReportColumnsPane.labelButton=60*20 +com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80 +com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24 +com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20 +com.fr.design.report.fit.topMargin=300*204 +com.fr.design.write.submit.DBManipulationPane.createControlBtnPanePreferredSize=110*20 +com.fr.design.report.freeze.RepeatAndFreezeSettingPane.RepeatAndFrozen=600*100 +com.fr.design.actions.replace.ui.ITReplaceNorthPanel.replaceButton=44*161 +com.fr.design.report.ImageExportPane.outNorthPane=580*230 +com.fr.design.sort.common.AbstractSortPane.IntervalUILabel=14*10 +com.fr.design.webattr.printsettings.AbstractNativePrintSettingPane.createGapTableLayoutPane=0*15 \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ru.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ru.properties deleted file mode 100644 index a90a69656b..0000000000 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ru.properties +++ /dev/null @@ -1,42 +0,0 @@ -com.fr.design.mainframe.check.CheckButton=305*118 -com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=630*185 -com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=570*31 -com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=630*280 -com.fr.design.report.ReportColumnsPane=800*600 -com.fr.env.RemoteEnvPane.dialog=458*132 -com.fr.design.version.check.dialog=490*95 -com.fr.design.version.detail.label=750*30 -com.fr.design.version.detail.dialog=900*500 -com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36 -com.fr.design.web.pane.text.field=430*20 -com.fr.design.actions.server.dialog=800*630 -com.fr.design.report.fit.templatePane.dialog=800*400 -com.fr.design.report.fit.firstColumn=120*20 -com.fr.design.report.fit.column=160*20 -com.fr.design.lock.LockInfoDialog=500*180 -com.fr.design.mainframe.ForbiddenPane.refreshButton=75*24 -com.fr.start.common.DesignerOpenEmptyPanel.createButton=120*24 -com.fr.design.cell.expand.sort.pane=257*185 -com.fr.design.sort.rule.item=125*20 -com.fr.design.ds.column.sort.pane=250*180 -com.fr.design.sort.expand.header.pane=95*10 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 -com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65 -com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600 -com.fr.design.formula.FormulaPane=900*600 -com.fr.design.formula.FormulaPaneWhenReserveFormula=1200*600 -com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=130*20 -com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=140*20 -com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=100*24 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=65*20 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=65*20 -com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*430 -com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*25 -com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=89*30 -com.fr.design.report.WordExportPane.outNorthPane=700*120 -com.fr.design.report.ReportColumnsPane.labelButton=80*20 -com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*100 -com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=147*24 -com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=180*20 \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties index 290860552b..cd7948dd24 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties @@ -1,41 +1,48 @@ -# \u9ED8\u8BA4\u4E3A\u7C7B\u7684\u5168\u9650\u5B9A\u540D\uFF08\u53EF\u81EA\u5B9A\u4E49key\uFF09= width * height -com.fr.design.mainframe.check.CheckButton=250*118 -com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=385*185 -com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=325*31 -com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=385*280 -com.fr.env.RemoteEnvPane.dialog=308*132 -com.fr.design.version.check.dialog=230*95 -com.fr.design.version.detail.label=450*30 -com.fr.design.version.detail.dialog=600*500 -com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*20 -com.fr.design.web.pane.text.field=450*20 -com.fr.design.actions.server.dialog=700*630 -com.fr.design.report.fit.templatePane.dialog=600*400 -com.fr.design.report.fit.firstColumn=80*20 -com.fr.design.report.fit.column=100*20 -com.fr.design.lock.LockInfoDialog=400*180 -com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24 -com.fr.start.common.DesignerOpenEmptyPanel.createButton=70*24 -com.fr.design.cell.expand.sort.pane=227*155 -com.fr.design.sort.rule.item=80*20 -com.fr.design.ds.column.sort.pane=220*150 -com.fr.design.sort.expand.header.pane=108*10 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 -com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 -com.fr.design.formula.FormulaPane=900*600 -com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 -com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20 -com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20 -com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20 -com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330 -com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20 -com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20 -com.fr.design.report.WordExportPane.outNorthPane=580*110 -com.fr.design.report.ReportColumnsPane.labelButton=60*20 -com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80 -com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24 -com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20 \ No newline at end of file +# \u9ED8\u8BA4\u4E3A\u7C7B\u7684\u5168\u9650\u5B9A\u540D\uFF08\u53EF\u81EA\u5B9A\u4E49key\uFF09= width * height +com.fr.design.mainframe.check.CheckButton=250*118 +com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=385*185 +com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=325*31 +com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=385*280 +com.fr.env.RemoteEnvPane.dialog=308*132 +com.fr.design.version.check.dialog=230*95 +com.fr.design.version.detail.label=450*30 +com.fr.design.version.detail.dialog=600*500 +com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*20 +com.fr.design.web.pane.text.field=450*20 +com.fr.design.actions.server.dialog=700*630 +com.fr.design.report.fit.templatePane.dialog=600*400 +com.fr.design.report.fit.firstColumn=80*20 +com.fr.design.report.fit.column=100*20 +com.fr.design.lock.LockInfoDialog=400*180 +com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24 +com.fr.start.common.DesignerOpenEmptyPanel.createButton=70*24 +com.fr.design.cell.expand.sort.pane=227*155 +com.fr.design.sort.rule.item=80*20 +com.fr.design.ds.column.sort.pane=220*150 +com.fr.design.sort.expand.header.pane=108*10 +com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 +com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 +com.fr.design.report.WatermarkSettingPane=720*600 +com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 +com.fr.design.formula.FormulaPane=900*600 +com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 +com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20 +com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20 +com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24 +com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20 +com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20 +com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330 +com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20 +com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20 +com.fr.design.report.WordExportPane.outNorthPane=580*110 +com.fr.design.report.ReportColumnsPane.labelButton=60*20 +com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80 +com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24 +com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20 +com.fr.design.report.fit.topMargin=300*204 +com.fr.design.write.submit.DBManipulationPane.createControlBtnPanePreferredSize=110*20 +com.fr.design.report.freeze.RepeatAndFreezeSettingPane.RepeatAndFrozen=600*100 +com.fr.design.actions.replace.ui.ITReplaceNorthPanel.replaceButton=44*161 +com.fr.design.report.ImageExportPane.outNorthPane=580*230 +com.fr.design.sort.common.AbstractSortPane.IntervalUILabel=14*10 +com.fr.design.webattr.printsettings.AbstractNativePrintSettingPane.createGapTableLayoutPane=0*15 \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties index 2c1a4d12d3..bbc2fbdd81 100644 --- a/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties @@ -1,40 +1,47 @@ -com.fr.design.mainframe.check.CheckButton=250*118 -com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=385*185 -com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=325*31 -com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=385*280 -com.fr.env.RemoteEnvPane.dialog=308*132 -com.fr.design.version.check.dialog=230*95 -com.fr.design.version.detail.label=450*30 -com.fr.design.version.detail.dialog=600*500 -com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*20 -com.fr.design.web.pane.text.field=450*20 -com.fr.design.actions.server.dialog=700*630 -com.fr.design.report.fit.templatePane.dialog=600*400 -com.fr.design.report.fit.firstColumn=80*20 -com.fr.design.report.fit.column=100*20 -com.fr.design.lock.LockInfoDialog=400*180 -com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24 -com.fr.start.common.DesignerOpenEmptyPanel.createButton=70*24 -com.fr.design.cell.expand.sort.pane=227*155 -com.fr.design.sort.rule.item=80*20 -com.fr.design.ds.column.sort.pane=220*150 -com.fr.design.sort.expand.header.pane=108*10 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 -com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 -com.fr.design.report.WatermarkSettingPane=720*600 -com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 -com.fr.design.formula.FormulaPane=900*600 -com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 -com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20 -com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20 -com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20 -com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20 -com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330 -com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20 -com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20 -com.fr.design.report.WordExportPane.outNorthPane=580*110 -com.fr.design.report.ReportColumnsPane.labelButton=60*20 -com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80 -com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24 -com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20 \ No newline at end of file +com.fr.design.mainframe.check.CheckButton=250*118 +com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=385*185 +com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=325*31 +com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=385*280 +com.fr.env.RemoteEnvPane.dialog=308*132 +com.fr.design.version.check.dialog=230*95 +com.fr.design.version.detail.label=450*30 +com.fr.design.version.detail.dialog=600*500 +com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*20 +com.fr.design.web.pane.text.field=450*20 +com.fr.design.actions.server.dialog=700*630 +com.fr.design.report.fit.templatePane.dialog=600*400 +com.fr.design.report.fit.firstColumn=80*20 +com.fr.design.report.fit.column=100*20 +com.fr.design.lock.LockInfoDialog=400*180 +com.fr.design.mainframe.ForbiddenPane.refreshButton=68*24 +com.fr.start.common.DesignerOpenEmptyPanel.createButton=70*24 +com.fr.design.cell.expand.sort.pane=227*155 +com.fr.design.sort.rule.item=80*20 +com.fr.design.ds.column.sort.pane=220*150 +com.fr.design.sort.expand.header.pane=108*10 +com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 +com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 +com.fr.design.report.WatermarkSettingPane=720*600 +com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 +com.fr.design.formula.FormulaPane=900*600 +com.fr.design.formula.FormulaPaneWhenReserveFormula=900*600 +com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=75*20 +com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=100*20 +com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=80*24 +com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.confirmButton=60*20 +com.fr.design.mainframe.DesignerFrameFileDealerPanel.MkdirDialog.cancelButton=60*20 +com.fr.design.data.datapane.connect.DBCPAttrPane.northFlowPane=630*330 +com.fr.design.mainframe.ElementCasePaneAuthorityEditPane.newValuePane=154*20 +com.fr.env.detect.ui.EnvDetectorDialog.createHeaderPanel.detectButton=68*20 +com.fr.design.report.WordExportPane.outNorthPane=580*110 +com.fr.design.report.ReportColumnsPane.labelButton=60*20 +com.fr.design.report.ReportColumnsPane.createRowPane.rowPane=500*80 +com.fr.design.report.ReportColumnsPane.createRowPane.repeatColDataTextField=107*24 +com.fr.design.write.submit.DBManipulationPane.addButtons.UpdateCheckBox=100*20 +com.fr.design.report.fit.topMargin=300*204 +com.fr.design.write.submit.DBManipulationPane.createControlBtnPanePreferredSize=110*20 +com.fr.design.report.freeze.RepeatAndFreezeSettingPane.RepeatAndFrozen=600*100 +com.fr.design.actions.replace.ui.ITReplaceNorthPanel.replaceButton=44*161 +com.fr.design.report.ImageExportPane.outNorthPane=580*230 +com.fr.design.sort.common.AbstractSortPane.IntervalUILabel=14*10 +com.fr.design.webattr.printsettings.AbstractNativePrintSettingPane.createGapTableLayoutPane=0*15 \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java index eb4865dc89..8536b04551 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java @@ -10,6 +10,7 @@ import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.general.GeneralUtils; import com.fr.stable.StringUtils; @@ -81,7 +82,7 @@ public class ITReplaceNorthPanel { private int maxItemCount = 5; private static final int LIMIT_WIDTH = 800; private static final int HEIGHT = 161; - private static final int BUTTON_WIDTH = 99; + private static final int BUTTON_WIDTH = (int) DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.actions.replace.ui.ITReplaceNorthPanel.replaceButton").getWidth(); private static final int GAP = 20; private static final int BUTTON_GAP = 10; private static final int MATCH_WIDTH = 800; 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 f89a3b8a8b..b4419b75bf 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 @@ -3,6 +3,7 @@ package com.fr.design.report; import com.fr.base.extension.FileExtension; import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; @@ -53,7 +54,7 @@ public class ImageExportPane extends AbstractExportPane { this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); JPanel globalTitlePane = FRGUIPaneFactory.createTitledBorderPane(GLOBAL_CONF); JPanel outNorthPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Report_Export_Setting")); - outNorthPane.setPreferredSize(new Dimension(580, 260)); + outNorthPane.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.ImageExportPane.outNorthPane")); UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Image_Export_Tips")); tipLabel.setForeground(Color.GRAY); JPanel tipsTitlePane = new JPanel(); 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 81a4a7a88f..be9143be81 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 @@ -8,6 +8,7 @@ import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.ActionLabel; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; @@ -71,8 +72,6 @@ public class RepeatAndFreezeSettingPane extends BasicPane { private UICheckBox useWriteFrozenCCheckBox; private UICheckBox useWriteFrozenRCheckBox; - private static final int REPEAT_AND_FROZEN_WIDTH = 600, REPEAT_AND_FROZEN_HEIGHT = 95; - //标题区域 private static final String REPEAT_AND_FROZEN_HEAD = Toolkit.i18nText("Fine-Design_Report_Repeat_Head"); //结尾区域 @@ -638,7 +637,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane { */ public static void addBorder(JPanel jPanel, String title) { jPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createMatteBorder(1,0,0,0, UIConstants.TITLED_BORDER_COLOR), title)); - jPanel.setPreferredSize(new Dimension(REPEAT_AND_FROZEN_WIDTH,REPEAT_AND_FROZEN_HEIGHT)); + jPanel.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.freeze.RepeatAndFreezeSettingPane.RepeatAndFrozen")); } protected void updateRowPane(ReportPageAttrProvider attribute) { diff --git a/designer-realize/src/main/java/com/fr/design/sort/common/AbstractSortPane.java b/designer-realize/src/main/java/com/fr/design/sort/common/AbstractSortPane.java index 50aeb49084..468dc5778e 100644 --- a/designer-realize/src/main/java/com/fr/design/sort/common/AbstractSortPane.java +++ b/designer-realize/src/main/java/com/fr/design/sort/common/AbstractSortPane.java @@ -1,6 +1,7 @@ package com.fr.design.sort.common; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.sort.header.SortHeaderPane; import com.fr.report.cell.TemplateCellElement; import com.fr.report.core.sort.common.CellSortAttr; @@ -105,7 +106,8 @@ public abstract class AbstractSortPane extends JPanel { } public static UILabel createIntervalUILabel() { - return createIntervalUILabel(new Dimension(PANE_COMPONENT_H_GAP, 20)); + int height = (int) DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.sort.common.AbstractSortPane.IntervalUILabel").getHeight(); + return createIntervalUILabel(new Dimension(PANE_COMPONENT_H_GAP, height)); } public static UILabel createIntervalUILabel(Dimension dimension) { 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 5ad573c661..7dcd3e21b2 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 @@ -36,9 +36,8 @@ public class WebCssPane extends BasicPane { this.setLayout(new BorderLayout(0, 20)); this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); - JPanel outnorth = new JPanel(new BorderLayout(0, 0)); - JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT,0,0)); - + JPanel outnorth = new JPanel(new BorderLayout(0, 5)); + JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT,8,0)); localText = new UITextField(); localText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field")); localText.setEditable(false); 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 0dbe4cf2f8..8591d24125 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 @@ -11,6 +11,7 @@ import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UIBasicSpinner; import com.fr.design.gui.itextfield.UINumberField; import com.fr.design.gui.itextfield.UITextField; +import com.fr.design.i18n.DesignSizeI18nManager; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; @@ -50,6 +51,7 @@ public abstract class AbstractNativePrintSettingPane extends JPanel { private static final int EVEN_INDEX = 1; private static final String CUSTOM_PAPERSIZE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Custom"); private static final PaperSize DEFAULT_PAPERSIZE = PaperSize.PAPERSIZE_A4; + private static final int VERTICAL_GAP = (int) DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.webattr.printsettings.AbstractNativePrintSettingPane.createGapTableLayoutPane").getHeight(); // 公共组件 private UICheckBox showDialogCheck; @@ -221,7 +223,7 @@ public abstract class AbstractNativePrintSettingPane extends JPanel { {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, 30); + return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, VERTICAL_GAP); } private String[] getAllPrinterNames() {