diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java index aa4195f0b..db4ef89c0 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java @@ -196,7 +196,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { itemNameTextField = new UITextField(); JPanel topPane = GUICoreUtils.createBorderLayoutPane( - GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Name") + ":"), BorderLayout.NORTH, + GUICoreUtils.createNamedPane(itemNameTextField, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"), BorderLayout.NORTH, importedJsPane, BorderLayout.CENTER, parameterPane, BorderLayout.EAST ); diff --git a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java index 6217b0acb..f220b46a0 100644 --- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java @@ -776,7 +776,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java b/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java index be6c2a96b..f9d9658c5 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java @@ -28,7 +28,7 @@ public abstract class TransparentPane extends BasicPane { // richer:能否拖动 if (isSupportTransparent) { - UIButton transparentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Transparent")); + UIButton transparentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency")); transparentButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); transparentButton.addActionListener(new TransparentActionListener()); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java index 1ef4267ce..8045ed8ec 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java @@ -115,7 +115,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator { }), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Name")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java index f6cfc57fc..66093d7d4 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java @@ -144,7 +144,7 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide // 这个条件说明是否加载了图表模块 if (wo != null && wo.length > 0) { - this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Chart"))); + this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ToolBar_Chart"))); UIButton chartButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/chart.png")); chartButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Click_Me")); chartButton.addMouseListener(new MouseAdapter() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java index ad669ca0d..3ea8d984b 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/NewPresentAction.java @@ -26,7 +26,7 @@ public class NewPresentAction extends PresentCheckBoxAction { @Override public boolean executeActionReturnUndoRecordNeeded() { if (!ComparatorUtils.equals(this.itemName, "NOPRESENT")) { - CellElementPropertyPane.getInstance().GoToPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present"), this.itemName); + CellElementPropertyPane.getInstance().GoToPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present"), this.itemName); } else { TemplateCellElement ce = getSelectedCellElement(); // 只有原来ce设置了形态的情况下才有undo操作 diff --git a/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java b/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java index 9c1ef42df..6961b06c1 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java @@ -33,7 +33,7 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present"); } public void setSelectedByName(String radioName) {