REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容

designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java

@@ -62,7 +62,7 @@ public class XDateEditor extends XDirectWriteEditor {
         return (CRPropertyDescriptor[]) ArrayUtils.addAll(tempt,
                 new CRPropertyDescriptor[]{
                         new CRPropertyDescriptor("formatText", this.data.getClass()).setI18NName(
-                                com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Format")).setEditorClass(formatClass()).setRendererClass(
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Format")).setEditorClass(formatClass()).setRendererClass(
                                 DateCellRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                         new CRPropertyDescriptor("startDate", this.data.getClass()).setI18NName(
                                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Start-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,

designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java

@@ -36,7 +36,7 @@ public class XNameWidget extends XWidgetCreator {
 		super.paintComponent(g);
 		if (editor == null) {
 			Graphics2D g2d = (Graphics2D) g.create();
-			BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), com.fr.design.i18n.Toolkit.i18nText("FR-Engine_NameWidget-Invalid"), Style.getInstance()
+			BaseUtils.drawStringStyleInRotation(g2d, this.getWidth(), this.getHeight(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_NameWidget-Invalid"), Style.getInstance()
 					.deriveHorizontalAlignment(SwingConstants.CENTER).deriveVerticalAlignment(SwingConstants.CENTER)
 					.deriveFRFont(FRFont.getInstance().applyForeground(Color.RED)), ScreenResolution
 					.getScreenResolution());
@@ -51,7 +51,7 @@ public class XNameWidget extends XWidgetCreator {
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
 		return new CRPropertyDescriptor[] {
 				new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")),
-				new CRPropertyDescriptor("name", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_NameWidget-Name")).setEditorClass(
+				new CRPropertyDescriptor("name", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_NameWidget-Name")).setEditorClass(
 						NameWidgetComboboxEditor.class).setPropertyChangeListener(new PropertyChangeAdapter() {
 
 					@Override
@@ -144,4 +144,4 @@ public class XNameWidget extends XWidgetCreator {
 		return creator.shouldScaleCreator();
 	}
 	
-}
+}

designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java

@@ -25,7 +25,6 @@ import com.fr.stable.ArrayUtils;
 
 import java.awt.*;
 import java.beans.IntrospectionException;
-import java.beans.PropertyDescriptor;
 
 /**
  * 表单参数界面container
@@ -67,7 +66,7 @@ public class XWParameterLayout extends XWAbsoluteLayout {
                         .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DisplayNothingBeforeQuery"))
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                 new CRPropertyDescriptor("position", this.data.getClass()).setEditorClass(WidgetDisplayPosition.class)
-                        .setRendererClass(WidgetDisplayPositionRender.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WidgetDisplyPosition"))
+                        .setRendererClass(WidgetDisplayPositionRender.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Display_Position"))
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                 new CRPropertyDescriptor("useParamsTemplate", this.data.getClass()).setEditorClass(BooleanEditor.class)
                         .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Use_Params_Template"))
@@ -252,4 +251,4 @@ public class XWParameterLayout extends XWAbsoluteLayout {
         return false;
     }
 
-}
+}

designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutPropertiesGroupModel.java

@@ -32,7 +32,7 @@ public class CardLayoutPropertiesGroupModel implements GroupModel {
 
     @Override
     public String getGroupName() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Tab_Layout_Widget_Size");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_Tab_Layout_Widget_Size");
     }
 
     @Override
@@ -69,9 +69,9 @@ public class CardLayoutPropertiesGroupModel implements GroupModel {
         if (column == 0) {
             switch (row) {
                 case 0:
-                    return com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Tab_Layout_Width");
+                    return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Tab_Layout_Width");
                 default:
-                	return com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Tab_Layout_Height");
+                	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_Tab_Layout_Height");
                 
                 	
             }
@@ -122,4 +122,4 @@ public class CardLayoutPropertiesGroupModel implements GroupModel {
     public boolean isEditable(int row) {
         return false;
     }
-}
+}

designer-form/src/main/java/com/fr/design/designer/properties/items/FRFitConstraintsItems.java

@@ -14,7 +14,7 @@ public class FRFitConstraintsItems implements ItemProvider{
 
 	public static final Item[] ITEMS = new Item[] {
 		new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Bidirectional_Adaptive"), WFitLayout.STATE_FULL),
-		new Item(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Form_Attr_Horizontal_Adaptive"), WFitLayout.STATE_ORIGIN)};
+		new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Horizontal_Adaptive"), WFitLayout.STATE_ORIGIN)};
 	
 	public Item[] getItems() {
 		return ITEMS;

designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java

@@ -36,7 +36,7 @@ public class FormWebWidgetConstants {
     public static final WidgetOption PREVIOUS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_Previous"),
             IOUtils.readIcon("/com/fr/web/images/previous.png"), Previous.class);
     // 后一页
-    public static final WidgetOption NEXT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Next"), IOUtils.readIcon("/com/fr/web/images/next.png"),
+    public static final WidgetOption NEXT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_Next"), IOUtils.readIcon("/com/fr/web/images/next.png"),
             Next.class);
 
     // 导出成Excel 分页导出
@@ -47,7 +47,7 @@ public class FormWebWidgetConstants {
             IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class);
     // 导出
     public static final WidgetOption EXPORT = WidgetOptionFactory
-            .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export"), IOUtils.readIcon("/com/fr/web/images/export.png"), Export.class);
+            .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Export"), IOUtils.readIcon("/com/fr/web/images/export.png"), Export.class);
 
     public static final WidgetOption CUSTOM_BUTTON = WidgetOptionFactory
             .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Toolbar_Custom_Button"), CustomToolBarButton.class);

designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java

@@ -105,7 +105,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background")), background},
                 new Component[]{displayReport, null},
                 new Component[]{useParamsTemplate, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WidgetDisplyPosition")), hAlignmentPane}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Display_Position")), hAlignmentPane}
         };
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L1, 0));

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

@@ -53,7 +53,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
     @Override
     protected JPanel setFirstContentPane() {
         waterMarkDictPane = new WaterMarkDictPane();
-        UILabel formatLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Format"));
+        UILabel formatLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Format"));
         formatLabel.setVerticalAlignment(SwingConstants.TOP);
         UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value"));
         widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@@ -101,8 +101,8 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
         allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Full_Screen"));
 
         Component[][] components = new Component[][]{
-                new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Zoom_In_Logic"), SwingConstants.LEFT), new UILabel(ChartMobileFitAttrState.PROPORTION.description())},
+                new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Design_Form_Zoom_In_Logic"), SwingConstants.LEFT), new UILabel(ChartMobileFitAttrState.PROPORTION.description())},
-                new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Zoom_Out_Logic"), SwingConstants.LEFT), zoomOutComboBox},
+                new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Design_Form_Zoom_Out_Logic"), SwingConstants.LEFT), zoomOutComboBox},
                 new Component[] {tipLabel, null},
                 new Component[] {allowFullCheckBox}
         };

designer-realize/src/main/java/com/fr/design/actions/cell/GlobalStyleMenuDef.java

@@ -81,7 +81,7 @@ public class GlobalStyleMenuDef extends MenuDef {
             createdMenu.add(useMenuItem);
         }
         createdMenu.addSeparator();
-        createdMenu.add(new CustomStyleAction(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Custom")));
+        createdMenu.add(new CustomStyleAction(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Custom")));
     }
 
     /**
@@ -137,7 +137,7 @@ public class GlobalStyleMenuDef extends MenuDef {
          * @param e 事件
          */
         public void actionPerformed(ActionEvent e) {
-            CellElementPropertyPane.getInstance().GoToPane(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style"), com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Custom")});
+            CellElementPropertyPane.getInstance().GoToPane(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Custom")});
         }
 
     }

designer-realize/src/main/java/com/fr/design/mainframe/app/FormApp.java

@@ -44,7 +44,7 @@ class FormApp extends AbstractAppProvider {
         if (XMLEncryptUtils.isCptEncoded() &&
             !XMLEncryptUtils.checkVaild(DesignerEnvManager.getEnvManager().getEncryptionKey())) {
             if (!new DecodeDialog(file).isPwdRight()) {
-                FineLoggerFactory.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ECP_error_pwd"));
+                FineLoggerFactory.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ECP_Error_Password"));
                 return new Form();
             }
         }

designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java

@@ -78,7 +78,7 @@ public class ErrorInfoLogAppender extends AppenderSkeleton {
     }
 
     private String readLogID(String log) {
-        String errorCode = com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ErrorCode-Prefix");
+        String errorCode = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ErrorCode_Prefix");
         // 报错信息国际化不规范, 有些是中文分号, 有些是英文
         String[] matchs = log.split(errorCode + ".*?[:,：]");
         if (matchs.length <= 1) {
@@ -140,4 +140,4 @@ public class ErrorInfoLogAppender extends AppenderSkeleton {
 
         return StringUtils.EMPTY;
     }
-}
+}

designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java

@@ -126,7 +126,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
      * @date 2014-11-14-下午1:32:08
      */
     protected String getPageFrozenTitle() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Page-Frozen");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Page-Frozen");
     }
 
     /**
@@ -142,7 +142,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         JPanel pagecon = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1);
         pagecon.setBorder(BorderFactory.createEmptyBorder(0, 20, 0, 0));
         pagePanel.add(pagecon, BorderLayout.CENTER);
-        UILabel warningx = new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Please_Set_Repeat_First") + ")");
+        UILabel warningx = new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Please_Set_Repeat_First") + ")");
         warningx.setForeground(Color.red);
         pageLabelPanel.add(warningx);
 
@@ -201,7 +201,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
 
     public RepeatAndFreezeSettingPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        JPanel outrepeatPanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Repeat"));
+        JPanel outrepeatPanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Repeat"));
         JPanel cenrepeatPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         outrepeatPanel.add(cenrepeatPanel);
         JPanel outfreezePanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Frozen"));
@@ -223,7 +223,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         // 重复打印标题的起始行
         JPanel labelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         labelPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Select_the_repeated_row_and_column") + ":"));
-        UILabel warning = new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("FR-Engine_FreezeWarning1") + ")");
+        UILabel warning = new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_FreezeWarning") + ")");
         warning.setForeground(Color.red);
         labelPanel.add(warning);
         cenrepeatPanel.add(labelPanel, BorderLayout.NORTH);

designer-realize/src/main/java/com/fr/design/report/share/ConfusionManagerPane.java

@@ -32,7 +32,7 @@ public class ConfusionManagerPane extends JListControlPane {
 	 * 
 	 */
 	public NameableCreator[] createNameableCreators() {
-		NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_DS-TableData"),
+		NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_DS-TableData"),
 				"/com/fr/design/images/data/dock/serverdatatable.png", ConfusionInfo.class,
 				ConfusionTableDataPane.class);
 
@@ -80,4 +80,4 @@ public class ConfusionManagerPane extends JListControlPane {
 		return new ShortCut4JControlPane[] { moveUpItemShortCut(), moveDownItemShortCut(), sortItemShortCut() };
 	}
 
-}
+}

designer-realize/src/main/java/com/fr/design/webattr/ReportWebAttrPane.java

@@ -47,7 +47,7 @@ public class ReportWebAttrPane extends LoadingBasicPane {
         tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Printers(Server)"), serverPrintPane = new ReportServerPrinterPane());
         
         tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Pagination_Setting"), pageWeb = new PageWebSettingPane());
-        tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Write_Setting"), writeWeb = new WriteWebSettingPane());
+        tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Setting"), writeWeb = new WriteWebSettingPane());
         tabbedPane.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data_Analysis_Settings"), viewWeb = new ViewWebSettingPane());
         
         tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Browser_Background"), backgroundPane = new BackgroundPane4Browser());
@@ -90,4 +90,4 @@ public class ReportWebAttrPane extends LoadingBasicPane {
     	this.commonPane.update(reportWebAttr);
         return reportWebAttr;
     }
-}
+}

designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java

@@ -70,11 +70,11 @@ public class ReportWebWidgetConstants {
             BaseUtils.readIcon("/com/fr/web/images/flashPrint.png"), FlashPrint.class);
 
     // appletprint
-    public static final WidgetOption APPLETPRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Applet_Print"),
+    public static final WidgetOption APPLETPRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Applet_Print"),
             BaseUtils.readIcon("/com/fr/web/images/appletPrint.png"), AppletPrint.class);
 
     // PDF导出
-    public static final WidgetOption PDF = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-PDF"), BaseUtils.readIcon("/com/fr/web/images/pdf.png"),
+    public static final WidgetOption PDF = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_PDF"), BaseUtils.readIcon("/com/fr/web/images/pdf.png"),
             PDF.class);
 
     // 客户端PDF打印
@@ -83,7 +83,7 @@ public class ReportWebWidgetConstants {
 
 
     // 邮件发送
-    public static final WidgetOption EMAIL = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Email"), BaseUtils.readIcon("/com/fr/web/images/email.png"), Email.class);
+    public static final WidgetOption EMAIL = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Email"), BaseUtils.readIcon("/com/fr/web/images/email.png"), Email.class);
     public static final WidgetOption PRINTPREVIEW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PrintP-Print_Preview"),
             BaseUtils.readIcon("/com/fr/web/images/preview.png"), PrintPreview.class);
 
@@ -104,7 +104,7 @@ public class ReportWebWidgetConstants {
     public static final WidgetOption PAGESETUP = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Page_Setup"), BaseUtils.readIcon("/com/fr/web/images/pageSetup.png"), PageSetup.class);
     // 导出
     public static final WidgetOption EXPORT = WidgetOptionFactory
-            .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export"), BaseUtils.readIcon("/com/fr/web/images/export.png"), Export.class);
+            .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Export"), BaseUtils.readIcon("/com/fr/web/images/export.png"), Export.class);
 
     // 当前页/总页数
     public static final WidgetOption PAGENAVI = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Page_Navi_Text"),
@@ -119,13 +119,13 @@ public class ReportWebWidgetConstants {
     public static final WidgetOption PREVIOUS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_Previous"),
             BaseUtils.readIcon("/com/fr/web/images/previous.png"), Previous.class);
     // 后一页
-    public static final WidgetOption NEXT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Next"), BaseUtils.readIcon("/com/fr/web/images/next.png"),
+    public static final WidgetOption NEXT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_Next"), BaseUtils.readIcon("/com/fr/web/images/next.png"),
             Next.class);
-    public static final WidgetOption SCALE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Enlarge_Or_Reduce"), BaseUtils.readIcon("/com/fr/web/images/scale.png"),
+    public static final WidgetOption SCALE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Enlarge_Or_Reduce"), BaseUtils.readIcon("/com/fr/web/images/scale.png"),
             Scale.class);
 
-    public static final WidgetOption NEW_PRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Print"), BaseUtils.readIcon("/com/fr/web/images/print.png"), NewPrint.class);
+    public static final WidgetOption NEW_PRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Print"), BaseUtils.readIcon("/com/fr/web/images/print.png"), NewPrint.class);
-    public static final WidgetOption PRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Print_Compatible"), BaseUtils.readIcon("/com/fr/web/images/print.png"), Print.class);
+    public static final WidgetOption PRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Print_Compatible"), BaseUtils.readIcon("/com/fr/web/images/print.png"), Print.class);
     public static final WidgetOption APPENDCOLUMNROW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Record"),
             BaseUtils.readIcon("/com/fr/web/images/appendRow.png"), AppendColumnRow.class);
     public static final WidgetOption DELETECOLUMNROW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Record"),
@@ -143,7 +143,7 @@ public class ReportWebWidgetConstants {
     public static final WidgetOption IMPORTEXCELDATA = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Utils-Import_Excel_Data"),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), ImportExcelData.class);
     //自定义导入excel
-    public static final WidgetOption IMPORTEXCELDATA_CUSTOMIZED = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Utils-Import_Excel_Data_Customized"),
+    public static final WidgetOption IMPORTEXCELDATA_CUSTOMIZED = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Utils_Import_Excel_Data_Customized"),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), CustomizeImportExcelData.class);
     // 打印机偏移设置
     public static final WidgetOption SETPRINTEROFFSET = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_SetPrinterOffset"), BaseUtils.readIcon("/com/fr/web/images/pianyi.png"), SetPrinterOffset.class);
@@ -153,23 +153,23 @@ public class ReportWebWidgetConstants {
 
     // 输出离线html报表
     public static final WidgetOption WRITEOFFLINEHTML = WidgetOptionFactory
-            .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export-Offline-Html"), BaseUtils.readIcon("/com/fr/web/images/writeOffline.png"), WriteOfflineHTML.class);
+            .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Export-Offline-Html"), BaseUtils.readIcon("/com/fr/web/images/writeOffline.png"), WriteOfflineHTML.class);
     // 数据暂存
     public static final WidgetOption WRITESTASH = WidgetOptionFactory
-            .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Write_Stash"), BaseUtils.readIcon("/com/fr/web/images/edit/stash.png"), StashButton.class);
+            .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine-Write_Stash"), BaseUtils.readIcon("/com/fr/web/images/edit/stash.png"), StashButton.class);
     // 数据清空
     public static final WidgetOption WRITESTASHCLEAR = WidgetOptionFactory
-            .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Write_Clear"), BaseUtils.readIcon("/com/fr/web/images/edit/clearstash.png"), ClearStashedButton.class);
+            .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine-Write_Clear"), BaseUtils.readIcon("/com/fr/web/images/edit/clearstash.png"), ClearStashedButton.class);
     //Excel导入
-    public static final WidgetOption IMPORTEXCEL= WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Excel_Import_Repeat"),
+    public static final WidgetOption IMPORTEXCEL= WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Excel_Import_Repeat"),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), ExcelImport.class);
     //Excel导入_覆盖
-    public static final WidgetOption IMPORTEXCEL_COVER= WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Excel_Import_Cover"),
+    public static final WidgetOption IMPORTEXCEL_COVER= WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Excel_Import_Cover"),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), ImExcelCover.class);
     //Excel导入_清空
-    public static final WidgetOption IMPORTEXCEL_CLEAN= WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Excel_Import_Clean"),
+    public static final WidgetOption IMPORTEXCEL_CLEAN= WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Excel_Import_Clean"),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), ImExcelClean.class);
     //Excel导入_增量
-    public static final WidgetOption IMPORTEXCEL_APPEND= WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Excel_Import_Append"),
+    public static final WidgetOption IMPORTEXCEL_APPEND= WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Excel_Import_Append"),
             BaseUtils.readIcon("/com/fr/web/images/excel.png"), ImExcelAppend.class);
 }

designer-realize/src/main/java/com/fr/design/webattr/ViewToolBarPane.java

@@ -33,9 +33,9 @@ public class ViewToolBarPane extends AbstractEditToolBarPane {
 	private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Use_ToolBar"));
 	private UIButton editToolBarButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
 	private UILabel showListenersLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Editing_Listeners") + ":");
-	private UICheckBox sortCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Sort_Sort"));
+	private UICheckBox sortCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Sort_Sort"));
-	private UICheckBox conditonFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Selection_Filter"));
+	private UICheckBox conditonFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Selection_Filter"));
-	private UICheckBox listFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-List_Filter"));
+	private UICheckBox listFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_List_Filter"));
 	
 	public ViewToolBarPane() {
 		this.setLayout(FRGUIPaneFactory.createBorderLayout());
@@ -170,4 +170,4 @@ public class ViewToolBarPane extends AbstractEditToolBarPane {
     protected WidgetOption[] getToolBarInstance() {
         return ReportWebWidgetConstants.getViewToolBarInstance();
     }
-}
+}

designer-realize/src/main/java/com/fr/design/webattr/ViewWebSettingPane.java

@@ -27,9 +27,9 @@ public class ViewWebSettingPane extends WebSettingPane<WebView> {
 
     @Override
     protected JPanel createOtherSetPane() {
-        sortCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Sort_Sort"));
+        sortCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Sort_Sort"));
-        conditionFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Selection_Filter"));
+        conditionFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Selection_Filter"));
-        listFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-List_Filter"));
+        listFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_List_Filter"));
 
         sortCheckBox.setSelected(true);
         conditionFilterBox.setSelected(true);
@@ -99,4 +99,4 @@ public class ViewWebSettingPane extends WebSettingPane<WebView> {
         conditionFilterBox.setSelected(true);
         listFilterBox.setSelected(true);
     }
-}
+}

designer-realize/src/main/java/com/fr/design/webattr/printsettings/NativePrintSettingPane.java

@@ -161,7 +161,7 @@ public class NativePrintSettingPane extends JPanel {
         JPanel layoutSettingCheckPane = GUICoreUtils.createCheckboxAndDynamicPane(inheritPageLayoutSettingCheck, layoutSettingPane, true);
 
         // 页码标签
-        UILabel printAreaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Page_Number") + ":");
+        UILabel printAreaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Page_Number") + ":");
         JPanel printAreaLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         printAreaLabelPane.add(printAreaLabel, BorderLayout.NORTH);
         printAreaLabel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
@@ -265,7 +265,7 @@ public class NativePrintSettingPane extends JPanel {
     private JPanel getPrintAreaPane() {
         allPageRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_All_Pages"));
         currentPageRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Current_Page"));
-        customPageRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_HJS-Specified_Pages"));
+        customPageRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_HJS-Specified_Pages"));
         ButtonGroup group = new ButtonGroup();
         group.add(allPageRadioButton);
         group.add(currentPageRadioButton);

designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java

@@ -21,8 +21,8 @@ import java.awt.event.ItemListener;
  * Created by plough on 2018/3/1.
  */
 public class PrintSettingPane extends BasicPane {
-    private UIRadioButton noClientPrintRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_No_Client_Print"));
+    private UIRadioButton noClientPrintRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_No_Client_Print"));
-    private UIRadioButton nativePrintRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Native_Print"));
+    private UIRadioButton nativePrintRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Native_Print"));
 
     private NoClientPrintSettingPane noClientPrintSettingPane;
     private NativePrintSettingPane nativePrintSettingPane;

designer-realize/src/main/java/com/fr/design/widget/ui/DateEditorDefinePane.java

@@ -57,7 +57,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
 
 		double f = TableLayout.FILL;
 		double p = TableLayout.PREFERRED;
-		UILabel formatLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Format"));
+		UILabel formatLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Format"));
 		formatLabel.setVerticalAlignment(SwingConstants.TOP);
 		UILabel startDateLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FS_Start_Date"));
 		startDateLabel.setVerticalAlignment(SwingConstants.TOP);