Browse Source

REPORT-80251 英文设计器国际化显示问题

【问题原因】1、部分功能模块的label显示文字未做自动换行设置。2、开始界面右键弹出框宽度被固定,未考虑不同语言的适配问题。
【改动思路】1、更改label为自动换行。2、局部微调UI(横排组件变竖排,已与产品沟通无问题)。3、根据当前语言环境确定右键弹出框宽度。
【Review建议】
release/11.0
levy 2 years ago
parent
commit
6181f58a03
  1. 6
      designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java
  2. 10
      designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
  3. 2
      designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
  4. 2
      designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
  5. 2
      designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
  6. 2
      designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
  7. 2
      designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties

6
designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java

@ -94,7 +94,7 @@ public class FeedbackToolboxDialog extends JDialog {
private JPanel createInfoPane() { private JPanel createInfoPane() {
JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 10, 10); JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 10, 10);
UILabel title = new UILabel(); UILabel title = new UILabel();
title.setText(Toolkit.i18nText("Fine-Design_Basic_Carton_Record_Lag_Time") + ": "); title.setText(" " + Toolkit.i18nText("Fine-Design_Basic_Carton_Record_Lag_Time") + ": ");
//判断一下当天是否有卡顿日志记录,如果有将日期设置为当天,如果没有设置为空 //判断一下当天是否有卡顿日志记录,如果有将日期设置为当天,如果没有设置为空
boolean cartonExists = SwitchForSwingChecker.isCartonExists(); boolean cartonExists = SwitchForSwingChecker.isCartonExists();
if (cartonExists) { if (cartonExists) {
@ -343,8 +343,8 @@ public class FeedbackToolboxDialog extends JDialog {
/** /**
* 导出卡顿日志到本地或远程服务器WEB-INF下 * 导出卡顿日志到本地或远程服务器WEB-INF下
* *
* @param sourceFile 导出的卡顿日志所在文件夹 * @param sourceFile 导出的卡顿日志所在文件夹
* @param path 文件需要导出到的路径 * @param path 文件需要导出到的路径
* @param sourceFilePath 导出的卡顿日志所在文件夹的路径 * @param sourceFilePath 导出的卡顿日志所在文件夹的路径
*/ */
private void exportCartonLog(File sourceFile, String path, String sourceFilePath) { private void exportCartonLog(File sourceFile, String path, String sourceFilePath) {

10
designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@ -201,8 +201,8 @@ public class MutilTempalteTabPane extends JComponent {
} }
} }
//根据当前i18n语言环境,动态调整popupMenu的宽度 //根据当前i18n语言环境,动态调整popupMenu的宽度
menu.setPreferredSize(new Dimension((int)DesignSizeI18nManager.getInstance(). menu.setPreferredSize(new Dimension((int) DesignSizeI18nManager.getInstance().
i18nDimension("com.fr.design.file.MultiTemplateTabPane.popUpMenu").getWidth(),height)); i18nDimension("com.fr.design.file.MultiTemplateTabPane.popUpMenu").getWidth(), height));
GUICoreUtils.showPopupMenu(menu, MutilTempalteTabPane.getInstance(), e.getX(), MutilTempalteTabPane.getInstance().getY() - 1 + MutilTempalteTabPane.getInstance().getHeight()); GUICoreUtils.showPopupMenu(menu, MutilTempalteTabPane.getInstance(), e.getX(), MutilTempalteTabPane.getInstance().getY() - 1 + MutilTempalteTabPane.getInstance().getHeight());
} }
} }
@ -339,7 +339,7 @@ public class MutilTempalteTabPane extends JComponent {
} }
} }
private void closeTemplate(JTemplate<?, ?>[] templates, JTemplate<?, ?> currentTemplate) { private void closeTemplate(JTemplate<?, ?>[] templates, JTemplate<?, ?> currentTemplate) {
for (int i = 0; i < templates.length; i++) { for (int i = 0; i < templates.length; i++) {
if (option.shouldClose(tplIndex, i)) { if (option.shouldClose(tplIndex, i)) {
JTemplate<?, ?> jTemplate = templates[i]; JTemplate<?, ?> jTemplate = templates[i];
@ -940,7 +940,7 @@ public class MutilTempalteTabPane extends JComponent {
/** /**
* 后台关闭当前编辑模板 * 后台关闭当前编辑模板
*/ */
public void closeCurrentTpl(){ public void closeCurrentTpl() {
JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate(); JTemplate jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
this.setIsCloseCurrent(true); this.setIsCloseCurrent(true);
this.closeFormat(jTemplate); this.closeFormat(jTemplate);
@ -1164,7 +1164,7 @@ public class MutilTempalteTabPane extends JComponent {
boolean completed = WorkerManager.getInstance().isCompleted(template.getTarget().getTemplateID()); boolean completed = WorkerManager.getInstance().isCompleted(template.getTarget().getTemplateID());
if (!completed) { if (!completed) {
FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
Toolkit.i18nText("Fine-Design_Close_Template_Tip", template.getEditingFILE().getName())); Toolkit.i18nText("Fine-Design_Close_Template_Tip", template.getEditingFILE().getName()));
return; return;
} }
} }

2
designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties

@ -22,4 +22,4 @@ com.fr.design.sort.expand.header.pane=95*10
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600 com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65 com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65

2
designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties

@ -21,4 +21,4 @@ com.fr.design.sort.expand.header.pane=95*10
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600 com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65

2
designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@ -21,4 +21,4 @@ com.fr.design.sort.expand.header.pane=95*10
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600 com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65 com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65

2
designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties

@ -23,4 +23,4 @@ com.fr.design.sort.expand.header.pane=108*10
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600 com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65

2
designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties

@ -21,4 +21,4 @@ com.fr.design.sort.expand.header.pane=108*10
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369 com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600 com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65 com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65

Loading…
Cancel
Save