d0814

designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java

@@ -196,7 +196,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
             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
             );

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

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());
 

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

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() {

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操作

designer-realize/src/main/java/com/fr/design/condition/PresentHighlightPane.java

@@ -33,7 +33,7 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane<Highl
 
     public PresentHighlightPane(final ConditionAttributesPane conditionAttributesPane) {
         super(conditionAttributesPane);
-        this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present") + ":"));
+        this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present") + ":"));
 
         String[] typeArray = {PresentConstants.NORMAL, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Other_Present")};
         presentComboBox = new UIComboBox(typeArray);
@@ -87,7 +87,7 @@ public class PresentHighlightPane extends ConditionAttrSingleConditionPane<Highl
 
     @Override
     public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present");
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellPresentPane.java

@@ -43,7 +43,7 @@ public class CellPresentPane extends AbstractCellAttrPane {
     @Override
     public String getIconPath() {
 //		return "com/fr/design/images/data/source/dataDictionary.png";
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Present");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present");
     }
 
     @Override
@@ -111,7 +111,7 @@ public class CellPresentPane extends AbstractCellAttrPane {
      * @return 标题
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Present");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Present");
     }
 
     public void setSelectedByIds(int level, String... id) {

designer-realize/src/main/java/com/fr/design/present/PresentPane.java

@@ -33,7 +33,7 @@ public class PresentPane extends UIComboBoxPane<Present> {
 
 	@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) {