Browse Source

Pull request #8461: KERNEL-10650:改动引用的国际化key

Merge in DESIGN/design from ~FLY.LI/design:feature/x to feature/x

* commit 'bc2fa8a0962c4c7ea179bc702996f7d611c9c0df':
  KERNEL-10650:改动引用的国际化key
feature/x
Fly.Li 3 years ago
parent
commit
aae04f2820
  1. 2
      designer-form/src/main/java/com/fr/design/actions/FormECParallelCalAction.java
  2. 8
      designer-form/src/main/java/com/fr/design/widget/ui/designer/FormECParallelCalSettingPane.java

2
designer-form/src/main/java/com/fr/design/actions/FormECParallelCalAction.java

@ -29,7 +29,7 @@ public class FormECParallelCalAction extends JTemplateAction<JForm> {
@Override
public String getMenuName() {
return Toolkit.i18nText("Fine-Designer_Parallel_Setting");
return Toolkit.i18nText("Fine-Design_Form_Calculate_Setting");
}
@Override

8
designer-form/src/main/java/com/fr/design/widget/ui/designer/FormECParallelCalSettingPane.java

@ -41,7 +41,7 @@ public class FormECParallelCalSettingPane extends BasicBeanPane<FormECParallelCa
}
private void initPane(){
JPanel calSettingOutPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Designer_Form_Block_Parallel_Calculate"));
JPanel calSettingOutPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Form_Block_Calculate_Setting"));
calSettingOutPane.setPreferredSize(new Dimension(550,110));
calSettingOutPane.add(getCalSettingPane());
this.add(calSettingOutPane);
@ -50,18 +50,18 @@ public class FormECParallelCalSettingPane extends BasicBeanPane<FormECParallelCa
private JPanel getCalSettingPane() {
JPanel calSettingPane = new JPanel();
calSettingPane.setLayout(new BorderLayout());
UILabel belowSetLabel = new UILabel(Toolkit.i18nText("Fine-Designer_Setting_Mode"));
UILabel belowSetLabel = new UILabel(Toolkit.i18nText("Fine-Design_Setting_Mode"));
belowSetLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20));
JPanel parallelSettingScopePane = GUICoreUtils.createFlowPane(new Component[] {
belowSetLabel, getParallelSettingScope()}, FlowLayout.LEFT, 0, 0);
calSettingPane.add(parallelSettingScopePane, BorderLayout.NORTH);
calSettingPane.add(getSwitchPane(Toolkit.i18nText("Fine-Designer_Enable_Form_Block_Parallel_Calculate")), BorderLayout.CENTER);
calSettingPane.add(getSwitchPane(Toolkit.i18nText("Fine-Design_Enable_Form_Block_Parallel_Calculate")), BorderLayout.CENTER);
return calSettingPane;
}
@Override
protected String title4PopupWindow() {
return Toolkit.i18nText("Fine-Designer_Form_Block_Parallel_Calculate");
return Toolkit.i18nText("Fine-Design_Form_Calculate_Setting");
}
private UIComboBox getParallelSettingScope() {

Loading…
Cancel
Save