Merge pull request #349 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0

* commit '14b3e2f1de5797e8cc5facfa5225627805e7ba94':
  REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
  REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容

designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java

@@ -1,7 +1,6 @@
 package com.fr.design.chart.series.PlotSeries;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.MapHelper;
 import com.fr.base.MapXMLHelper;
 import com.fr.base.Utils;
@@ -22,7 +21,6 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
@@ -30,9 +28,18 @@ import com.fr.stable.StringUtils;
 import com.fr.stable.SvgProvider;
 import com.fr.workspace.WorkContext;
 
-import javax.swing.*;
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
 import javax.swing.event.ListSelectionEvent;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Shape;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
@@ -321,7 +328,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
 
 	private void showRenameWaring(String newName){
 		JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Utils-has_been_existed")
-				+ "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
+				+ "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alert"), JOptionPane.WARNING_MESSAGE);
 	}
 
 	private JMenuItem createRenameItem() {
@@ -486,4 +493,4 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
 		popupMenu.setEnabled(isEnabled);
 		groupExtensionPane.setEnabled(isEnabled);
 	}
-}
+}

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java

@@ -81,7 +81,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
     }
 
     private void initComponents() {
-        isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Utils_Label"));
+        isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Utils_Label"));
         auto = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Auto_Axis_Label_Interval"));
         custom = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Axis_Label_Interval"));
         showWay = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelInterval"),com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Axis_labelWrap")});

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java

@@ -77,7 +77,7 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
 
         axisLineStylePane = new ChartAxisLineStylePane();
         zeroPane = aliagnZero4Second();
-        axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AxisReversed"));
+        axisReversed = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed"));
         unitCombox = new UIComboBox(ChartConstants.UNIT_I18N_VALUES);
         formatPane = new FormatPaneWithOutFont();
         axisLabelPane = new ChartAxisLabelPane();
@@ -415,4 +415,4 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
 	protected boolean isSupportLineStyle(){
 	   return true;
 	}
-}
+}

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java

@@ -116,7 +116,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
                 checkImagePane();
             }
         });
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), borderPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), borderPane);
     }
 
     private void checkAll() {
@@ -196,4 +196,4 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
             }
         }
     }
-}
+}

designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

@@ -107,7 +107,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
 
     @Override
     protected String getAddItemText() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Hyperlink");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Add_Hyperlink");
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java

@@ -62,7 +62,7 @@ public class VanChartConditionListControlPane extends VanChartUIListControlPane
 
     @Override
     public String getAddItemText() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Condition");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Condition");
     }
 
     @Override

designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java

@@ -226,7 +226,7 @@ public class VanChartPlotLegendPane extends BasicPane {
 
     protected JPanel createTitleStylePane(){
         textAttrPane = new ChartTextAttrPane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), textAttrPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), textAttrPane);
     }
 
     protected JPanel createDisplayStrategy(){
@@ -343,4 +343,4 @@ public class VanChartPlotLegendPane extends BasicPane {
 
         checkAllUse();
     }
-}
+}

designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java

@@ -164,7 +164,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
 
     private JPanel createTitleStylePane(){
         textAttrPane = new ChartTextAttrPane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), textAttrPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), textAttrPane);
     }
 
     private JPanel createDisplayStrategy(){
@@ -340,4 +340,4 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
         backgroundPane.update(title);
     }
 
-}
+}

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartBaseAxisPane.java

@@ -251,7 +251,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Label_Position")),position},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AxisReversed")),reversed},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_AxisReversed")),reversed},
         } ;
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
@@ -660,4 +660,4 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     public VanChartAxis updateBean(){
         return null;
     }
-}
+}

designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java

@@ -95,7 +95,7 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane<Chart> {
         double[] rowSize = {p,p,p};
         Component[][] components = new Component[][]{
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"),formatPane),null},
-                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"),textAttrPane),null},
+                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"),textAttrPane),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null},
         };
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java

@@ -164,7 +164,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         initStyleListener();
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(getLabelStyleComponents(plot),row,col);
-        return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);
+        return createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
     }
 
     protected ChartTextAttrPane initTextFontPane () {
@@ -273,4 +273,4 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
         }
     }
 
-}
+}

designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java

@@ -125,7 +125,7 @@ public class VanChartPlotTooltipPane extends BasicPane {
 
         initStyleListener();
 
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel1);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel1);
     }
 
 
@@ -237,4 +237,4 @@ public class VanChartPlotTooltipPane extends BasicPane {
 
         return attrTooltip;
     }
-}
+}

designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java

@@ -107,7 +107,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
             JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rotation_Direction"), rotate);
             panel.add(panel1, BorderLayout.NORTH);
         }
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
     }
 
     private Component[][] getDiffComponentsWithGaugeStyle() {
@@ -260,4 +260,4 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
             colorPickerPane.updateBean(detailStyle.getHotAreaColor());
         }
     }
-}
+}

designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieSeriesPane.java

@@ -63,7 +63,7 @@ public class VanChartMultiPieSeriesPane extends VanChartPieSeriesPane {
 
         };
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
     }
 
     protected void populatePieAttr() {

designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPieSeriesPane.java

@@ -67,7 +67,7 @@ public class VanChartPieSeriesPane extends VanChartAbstractPlotSeriesPane {
 
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
     }
 
     public void populateBean(Plot plot) {
@@ -111,4 +111,4 @@ public class VanChartPieSeriesPane extends VanChartAbstractPlotSeriesPane {
             piePlot4VanChart.setSupportRotation(supportRotation.getSelectedItem());
         }
     }
-}
+}

designer-chart/src/main/java/com/fr/van/chart/treemap/style/VanChartTreeMapSeriesPane.java

@@ -23,7 +23,7 @@ public class VanChartTreeMapSeriesPane extends VanChartMultiPieSeriesPane {
         supportDrill = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Drill"), supportDrill);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), panel);
     }
 
     protected void populatePieAttr() {

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/XElementCase.java

@@ -90,7 +90,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 				}),
 				new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
 						WLayoutBorderStyleEditor.class).setI18NName(
-						com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 						.setPropertyChangeListener(new PropertyChangeAdapter() {
 
 					@Override
@@ -99,7 +99,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 					}
 				}),
 				new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class)
-						.setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Layout_Padding"))
+						.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class)
 						.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-EC_toolbar"))
@@ -357,4 +357,4 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 	public boolean isSupportShared() {
 		return true;
 	}
-}
+}

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

@@ -3,22 +3,20 @@
  */
 package com.fr.design.designer.creator;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.beans.IntrospectionException;
-
-import javax.swing.BorderFactory;
-import javax.swing.border.Border;
-
+import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor;
 import com.fr.form.ui.FieldEditor;
-import com.fr.design.form.util.XCreatorConstants;
 import com.fr.form.ui.TextEditor;
 import com.fr.form.ui.reg.RegExp;
-
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 
+import javax.swing.BorderFactory;
+import javax.swing.border.Border;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.beans.IntrospectionException;
+
 /**
  * @author richer
  * @since 6.5.3
@@ -40,14 +38,14 @@ public abstract class XFieldEditor extends XWidgetCreator {
 
     private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
         CRPropertyDescriptor allowBlank = new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow-Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
                 XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
         CRPropertyDescriptor blankErrorMsg = new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName(
-                com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message"))
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message"))
                 .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
         CRPropertyDescriptor fontSize = new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize")
                 .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size"))
-                .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced");
+                .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced");
         return !((FieldEditor) toData()).isAllowBlank() ?
                 new CRPropertyDescriptor[]{allowBlank, blankErrorMsg, fontSize}
                 : new CRPropertyDescriptor[]{allowBlank, fontSize};
@@ -61,4 +59,4 @@ public abstract class XFieldEditor extends XWidgetCreator {
         }
         return displayRegField;
     }
-}
+}

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

@@ -75,7 +75,7 @@ public class XLabel extends XWidgetCreator {
                                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup-Vertically")).putKeyValue(
                                 XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                         new CRPropertyDescriptor("textalign", this.data.getClass()).setI18NName(
-                                com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alignment-Style")).setEditorClass(ItemCellEditor.class)
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Alignment-Style")).setEditorClass(ItemCellEditor.class)
                                 .setRendererClass(LabelHorizontalAlignmentRenderer.class).putKeyValue(
                                 XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                         new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font"))

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

@@ -66,7 +66,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
                 new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")),
                 new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
                         WLayoutBorderStyleEditor.class).setI18NName(
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
                         .setPropertyChangeListener(new PropertyChangeAdapter() {
 
                     @Override
@@ -570,4 +570,4 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
         return false;
     }
 
-}
+}

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/XNumberEditor.java

@@ -3,13 +3,6 @@
  */
 package com.fr.design.designer.creator;
 
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.beans.IntrospectionException;
-
-import javax.swing.JComponent;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
@@ -20,10 +13,15 @@ import com.fr.design.mainframe.widget.editors.SpinnerMinNumberEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.form.ui.NumberEditor;
 import com.fr.general.FRFont;
-
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 
+import javax.swing.JComponent;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.beans.IntrospectionException;
+
 /**
  * @author richer
  * @since 6.5.3
@@ -50,7 +48,7 @@ public class XNumberEditor extends XWrapperedFieldEditor {
 				,super.supportedDescriptor());
 		CRPropertyDescriptor allowDecimal = new CRPropertyDescriptor("allowDecimals", this.data.getClass())
 				.setEditorClass(InChangeBooleanEditor.class)
-				.setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Decimals"))
+				.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Decimals"))
 				.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
 		CRPropertyDescriptor decimalLength = new CRPropertyDescriptor("maxDecimalLength", this.data.getClass())
 				.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits"))
@@ -60,7 +58,7 @@ public class XNumberEditor extends XWrapperedFieldEditor {
 		return (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,
 				new CRPropertyDescriptor[] {
 						new CRPropertyDescriptor("allowNegative", this.data.getClass())
-								.setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Negative"))
+								.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Negative"))
 								.setEditorClass(InChangeBooleanEditor.class)
 								.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
 						new CRPropertyDescriptor("minValue", this.data.getClass())

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

@@ -3,20 +3,18 @@
  */
 package com.fr.design.designer.creator;
 
-import java.awt.Dimension;
-import java.beans.IntrospectionException;
-
-import javax.swing.JComponent;
-
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.gui.ibutton.UIPasswordField;
 import com.fr.design.mainframe.widget.editors.RegexEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
 import com.fr.form.ui.Password;
-
 import com.fr.stable.ArrayUtils;
 
+import javax.swing.JComponent;
+import java.awt.Dimension;
+import java.beans.IntrospectionException;
+
 /**
  * @author richer
  * @since 6.5.3
@@ -52,10 +50,10 @@ public class XPassword extends XWrapperedFieldEditor {
                 new CRPropertyDescriptor[]{
                         new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
                                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass(
-                                WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")}
+                                WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced")}
                 , super.supportedDescriptor());
         CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName(
-                com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
         CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass())
                 .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule"))
                 .setEditorClass(RegexEditor.RegexEditor4TextArea.class)
@@ -63,7 +61,7 @@ public class XPassword extends XWrapperedFieldEditor {
                 .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
         CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass())
                 .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark"))
-                .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced");
+                .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced");
         boolean displayRegField = true;
         displayRegField = isDisplayRegField(displayRegField);
         return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :

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

@@ -3,27 +3,25 @@
  */
 package com.fr.design.designer.creator;
 
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.beans.IntrospectionException;
-
-import javax.swing.JComponent;
-import javax.swing.SwingConstants;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
+import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.mainframe.widget.editors.RegexEditor;
 import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
 import com.fr.form.ui.TextArea;
-import com.fr.design.form.util.XCreatorConstants;
 import com.fr.general.FRFont;
-
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 
+import javax.swing.JComponent;
+import javax.swing.SwingConstants;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.beans.IntrospectionException;
+
 /**
  * @author richer
  * @since 6.5.3
@@ -40,15 +38,15 @@ public class XTextArea extends XFieldEditor {
                 new CRPropertyDescriptor[]{
                         new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
                                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass(
-                                WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")}, super.supportedDescriptor());
+                                WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced")}, super.supportedDescriptor());
         CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName(
                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class)
                 .putKeyValue("renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
         CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName(
-                com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
         CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
-                "FR-Designer_Advanced");
+                "Fine-Design_Report_Advanced");
         boolean displayRegField = true;
         displayRegField = isDisplayRegField(displayRegField);
         return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :

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

@@ -3,13 +3,6 @@
  */
 package com.fr.design.designer.creator;
 
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.beans.IntrospectionException;
-
-import javax.swing.JComponent;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
@@ -19,10 +12,15 @@ import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
 import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
 import com.fr.form.ui.TextEditor;
 import com.fr.general.FRFont;
-
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 
+import javax.swing.JComponent;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.beans.IntrospectionException;
+
 /**
  * @author richer
  * @since 6.5.3
@@ -43,15 +41,15 @@ public class XTextEditor extends XWrapperedFieldEditor {
     public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
         CRPropertyDescriptor widgetValue = new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
                 com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass(
-                WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced");
+                WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced");
         CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName(
                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue(
                 "renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
         CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName(
-                com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
         CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
-                "FR-Designer_Advanced");
+                "Fine-Design_Report_Advanced");
         CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[]{widgetValue}, super.supportedDescriptor());
         boolean displayRegField = true;
         displayRegField = isDisplayRegField(displayRegField);

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

@@ -45,7 +45,7 @@ public class XTreeEditor extends XWidgetCreator {
                                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass(
                                 TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                         new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
-                                com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class)
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class)
                                 .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
                         new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName(
                                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Verify-Message"))
@@ -59,7 +59,7 @@ public class XTreeEditor extends XWidgetCreator {
                         com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass(
                         TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
                 new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue(
                         XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),};
 
 		crp = this.addWaterMark(crp);

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

@@ -74,7 +74,7 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
                 new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")),
                 new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
                         WLayoutBorderStyleEditor.class).setI18NName(
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
                         .setPropertyChangeListener(new PropertyChangeAdapter() {
 
                             @Override

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/creator/cardlayout/XWCardLayout.java

@@ -373,7 +373,7 @@ public class XWCardLayout extends XLayoutContainer {
                 }),
                 new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass(
                         CardTagWLayoutBorderStyleEditor.class).setI18NName(
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
                         .setPropertyChangeListener(new PropertyChangeAdapter() {
 
                     @Override
@@ -486,4 +486,4 @@ public class XWCardLayout extends XLayoutContainer {
         }
     }
 
-}
+}

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/EventPropertyTable.java

@@ -32,7 +32,7 @@ public class EventPropertyTable extends UIListControlPane {
 
 	@Override
 	public String getAddItemText() {
-		return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Event");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Event");
 	}
 
 	public static class WidgetEventListenerUpdatePane extends ListenerUpdatePane {
@@ -140,4 +140,4 @@ public class EventPropertyTable extends UIListControlPane {
 		}
 		updateWidgetListener(creator);
 	}
-}
+}

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

@@ -42,7 +42,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
      */
     @Override
     public String getGroupName() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout");
     }
 
     @Override
@@ -65,7 +65,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
         if (column == 0) {
             switch (row) {
                 case 0:
-                    return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type");
+                    return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout_Type");
                 default:
                     return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode");
             }

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

@@ -111,7 +111,7 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel {
 		if (column == 0) {
             switch (row) {
                 case 0:
-                    return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type");
+                    return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout_Type");
 				case 1:
 					return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Component_Scale");
 				default:
@@ -204,4 +204,4 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel {
 	public boolean isEditable(int row) {
 		return true;
 	}
-}
+}

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

@@ -81,7 +81,7 @@ public class FRTabFitLayoutPropertiesGroupModel extends FRFitLayoutPropertiesGro
                 case 0:
                     return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Component_Interval");
                 default :
-                    return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Tab_Layout_Title");
+                    return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Tab_Layout_Title");
             }
         } else {
             switch (row) {
@@ -154,4 +154,4 @@ public class FRTabFitLayoutPropertiesGroupModel extends FRFitLayoutPropertiesGro
 		return true;
 	}
 
-}
+}

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

@@ -8,12 +8,10 @@ import java.awt.event.ItemListener;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
-import javax.swing.SwingConstants;
 
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.AuthorityEditPane;
@@ -55,7 +53,7 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane {
     private ItemListener usableItemListener = new ItemListener() {
         public void itemStateChanged(ItemEvent e) {
             String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName();
-            if (ComparatorUtils.equals(selectedRoles, com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Role"))) {
+            if (ComparatorUtils.equals(selectedRoles, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Role"))) {
                 return;
             }
             if (selectedRoles == null) {
@@ -207,4 +205,4 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane {
     }
 
 
-}
+}

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

@@ -13,11 +13,11 @@ import com.fr.form.ui.container.WFitLayout;
 public class FRFitConstraintsItems implements ItemProvider{
 
 	public static final Item[] ITEMS = new Item[] {
-		new Item(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Bidirectional_Adaptive"), WFitLayout.STATE_FULL),
-		new Item(com.fr.design.i18n.Toolkit.i18nText("FR_Designer_Attr_Horizontal_Adaptive"), WFitLayout.STATE_ORIGIN)};
+		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)};
 	
 	public Item[] getItems() {
 		return ITEMS;
 	}
 
-}
+}

designer-form/src/main/java/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java

@@ -2,7 +2,6 @@ package com.fr.design.form.mobile;
 
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
-import com.fr.design.dialog.mobile.MobileRadioCheckPane;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
@@ -13,10 +12,7 @@ import com.fr.form.main.mobile.FormMobileAttr;
 
 
 import javax.swing.*;
-import javax.swing.border.Border;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 /**
  * Created by plough on 2018/1/4.
@@ -82,7 +78,7 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
         adaptivePropertyAutoMatchCheck.registerChangeListener(new UIObserverListener() {
             @Override
             public void doChange() {
-                adaptivePropertyAutoMatchCheck.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Adaptive_Property_Auto_Match"));
+                adaptivePropertyAutoMatchCheck.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive_Property_Auto_Match"));
             }
         });
         adaptivePropertyAutoMatchCheck.setSelected(true);
@@ -116,7 +112,7 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
 
     private JPanel getAdaptivePropertyAutoMatchDescPane() {
 
-        UILabel desc1 = createDescLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Adaptive_Property_Auto_Match_Desc"));
+        UILabel desc1 = createDescLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive_Property_Auto_Match_Desc"));
 
         JPanel panel = new JPanel(FRGUIPaneFactory.createBorderLayout());
         panel.add(desc1, BorderLayout.CENTER);
@@ -158,4 +154,4 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane<FormMobileAttr
         return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Template_Settings");
     }
 
-}
+}

designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java

@@ -478,7 +478,7 @@ public class LayoutBorderPane extends BasicPane {
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), formulaPane},
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Format")), fontSizeTypePane},
                 {new UILabel(""), initFontButtonPane()},
-                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alignment-Style")), hPaneContainer},
+                {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Alignment-Style")), hPaneContainer},
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Background")), titleBackgroundPane},
         }, rowSize, columnSize, 10);
         rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12));
@@ -929,6 +929,6 @@ public class LayoutBorderPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style");
     }
 }

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

@@ -605,7 +605,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         }
         if (this.getTarget().isNameExist(newName)) {
             JOptionPane.showMessageDialog(this, "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Utils-has_been_existed")
-                    + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
+                    + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alert"), JOptionPane.WARNING_MESSAGE);
             return false;
         }
         creator.resetCreatorName(newName);
@@ -614,7 +614,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     }
 
     public void showMessageDialog(String message) {
-        JOptionPane.showMessageDialog(this, message, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(this, message, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alert"), JOptionPane.WARNING_MESSAGE);
         FormSelectionUtils.rebuildSelection(this);
         repaint();
     }

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

@@ -287,7 +287,7 @@ public class FormEditToolBar extends BasicPane {
             if (i < 0 || !(listModel.getElementAt(i) instanceof FormToolBarButton)) {
                 return;
             }
-            int val = JOptionPane.showConfirmDialog(FormEditToolBar.this, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Are_You_Sure_To_Delete_The_Data") + "?", "Message", JOptionPane.YES_NO_OPTION);
+            int val = JOptionPane.showConfirmDialog(FormEditToolBar.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?", "Message", JOptionPane.YES_NO_OPTION);
             if (val != JOptionPane.YES_OPTION) {
                 return;
             }

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

@@ -27,16 +27,16 @@ public class FormWebWidgetConstants {
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Page_Navi_Text"),
             IOUtils.readIcon("/com/fr/web/images/pageNumber.png"), PageNavi.class);
     // 首页
-    public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-First"), IOUtils.readIcon("/com/fr/web/images/first.png"),
+    public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_First"), IOUtils.readIcon("/com/fr/web/images/first.png"),
             First.class);
     // 末页
-    public static final WidgetOption LAST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Last"), IOUtils.readIcon("/com/fr/web/images/last.png"),
+    public static final WidgetOption LAST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_Last"), IOUtils.readIcon("/com/fr/web/images/last.png"),
             Last.class);
     // 前一页
-    public static final WidgetOption PREVIOUS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Previous"),
+    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/mainframe/FormWidgetDetailPane.java

@@ -54,7 +54,7 @@ public class FormWidgetDetailPane extends FormDockView{
     private boolean isEdit;
     private CardLayout card;
 
-    private static final String REPORT_TAB = com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Report");
+    private static final String REPORT_TAB = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_Report");
     private static final String CHART_TAB = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ToolBar_Chart");
 
     public static FormWidgetDetailPane getInstance() {
@@ -80,7 +80,7 @@ public class FormWidgetDetailPane extends FormDockView{
     }
 
     public String getViewTitle() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Widget_Tree_And_Table");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Tree_And_Table");
     }
 
     @Override
@@ -197,12 +197,12 @@ public class FormWidgetDetailPane extends FormDockView{
                     refreshShareMoudule();
                     reuWidgetPanel.remove(deleteButton);
                     elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList();
-                    JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Removed_Successful"));
+                    JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Share_Module_Removed_Successful"));
                     refreshDownPanel(false);
                     replaceButtonPanel(false);
                     refreshComboxData();
                 } else {
-                    JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Removed_Failed"));
+                    JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Share_Module_Removed_Failed"));
                 }
 
             }
@@ -378,12 +378,12 @@ public class FormWidgetDetailPane extends FormDockView{
                     elCaseBindInfoList = ShareLoader.getLoader().getAllBindInfoList();
                     refreshDownPanel(false);
                     refreshComboxData();
-                    JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_OK"));
+                    JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Share_Module_OK"));
                 } else {
-                    JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Error"));
+                    JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Share_Module_Error"));
                 }
             } catch (IOException e) {
-                JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Share_Module_Error"));
+                JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Share_Module_Error"));
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
@@ -401,7 +401,7 @@ public class FormWidgetDetailPane extends FormDockView{
      * 获取报表块组件分类
      */
     public String[] getFormCategories() {
-        return ArrayUtils.addAll(new String[] {com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AllCategories")}, ShareLoader.getLoader().getModuleCategory());
+        return ArrayUtils.addAll(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_AllCategories")}, ShareLoader.getLoader().getModuleCategory());
     }
 
     public void refreshDownPanel(boolean isEdit) {

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

@@ -220,13 +220,13 @@ public class WidgetPropertyPane  extends FormDockView implements BaseWidgetPrope
         final String[] tabTitles = new String[]{
                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Properties"),
                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event"),
-                com.fr.design.i18n.Toolkit.i18nText("FR-Widget_Mobile_Terminal")
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal")
         };
         final CardLayout tabbedPane =  new CardLayout();
         final JPanel center = new JPanel(tabbedPane);
         center.add(formWidgetCardPane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Properties"));
         center.add(eventTable, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event"));
-        center.add(wsp, com.fr.design.i18n.Toolkit.i18nText("FR-Widget_Mobile_Terminal"));
+        center.add(wsp, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal"));
         this.add(center, BorderLayout.CENTER);
 
         tabsHeaderIconPane = new UIHeadGroup(tabTitles) {

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

@@ -1,5 +1,12 @@
 package com.fr.design.parameter;
 
+import com.fr.base.Parameter;
+import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+
+import javax.swing.BorderFactory;
+import javax.swing.SwingConstants;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
@@ -8,14 +15,6 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseListener;
 import java.util.ArrayList;
 
-import javax.swing.BorderFactory;
-import com.fr.design.gui.ilable.UILabel;
-import javax.swing.SwingConstants;
-
-import com.fr.base.Parameter;
-import com.fr.design.beans.BasicBeanPane;
-import com.fr.design.gui.ibutton.UIButton;
-
 
 /**
  * 参数点击动作条
@@ -48,12 +47,12 @@ public class ParameterToolBarPane extends BasicBeanPane<Parameter[]> {
 				return new Dimension(super.getPreferredSize().width, 18);
 			}
 		};
-		label.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Following_parameters_are_not_generated") + ":");
+		label.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Following_parameters_are_not_generated") + ":");
 		label.setHorizontalAlignment(SwingConstants.LEFT);
 		label.setBorder(BorderFactory.createEmptyBorder(0, LABEL_PADDING_LEFT, 0, 0));
 		this.add(label);
 
-		addAll = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_all"));
+		addAll = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Add_all"));
 		this.add(addAll);
 
 	}
@@ -171,4 +170,4 @@ public class ParameterToolBarPane extends BasicBeanPane<Parameter[]> {
 
 		}
 	}
-}
+}

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

@@ -58,7 +58,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         designerWidth = new UISpinner(1, Integer.MAX_VALUE, 1);
         JPanel advancePane = createAdvancePane();
-        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, advancePane);
+        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, advancePane);
         this.add(advanceExpandablePane, BorderLayout.NORTH);
         JPanel layoutPane = createBoundsPane();
         UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Size"), 280, 20, layoutPane);
@@ -102,10 +102,10 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")), labelNameTextField},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background")), background},
+                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/ButtonDefinePane.java

@@ -42,7 +42,7 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
         labelNameTextField = new UITextField();
         Component[] backgroundCompPane = createBackgroundComp();
         Component[] frFont = createFontPane();
-        UILabel backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"));
+        UILabel backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background"));
         backgroundLabel.setVerticalAlignment(SwingConstants.TOP);
         Component[][] n_components = {
                 {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Name")), buttonNameTextField},
@@ -57,7 +57,7 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
         boundsPane.add(panel);
-        UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, boundsPane);
+        UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, boundsPane);
         this.add(advancedPane);
     }
 
@@ -97,4 +97,4 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
         return btn;
     }
 
-}
+}

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

@@ -52,7 +52,7 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
 		JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
 		boundsPane.add(panel);
-		UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, boundsPane);
+		UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, boundsPane);
 
 		this.add(uiExpandablePane);
 	}

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/FieldEditorDefinePane.java

@@ -37,7 +37,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
     protected void initComponents() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         labelNameTextField = new UITextField();
-        allowBlankCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Null"));
+        allowBlankCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Null"));
         allowBlankCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         fontSizePane = new FontSizeComboPane();
         errorMsgTextField = new UITextField();
@@ -46,7 +46,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         jPanel.add(contentPane, BorderLayout.CENTER);
         contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         if (contentPane != null) {
-            UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, jPanel);
+            UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, jPanel);
             this.add(uiExpandablePane, BorderLayout.NORTH);
         }
         this.addValidatePane();
@@ -151,4 +151,4 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         return null;
     }
 
-}
+}

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

@@ -52,7 +52,7 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
 
 		contentPane.add(panel);
 
-		UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, contentPane);
+		UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, contentPane);
 		this.add(uiExpandablePane, BorderLayout.NORTH);
 
 	}
@@ -81,4 +81,4 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
 		ob.setOverflowy(this.verticalCheck.isSelected());
 		return ob;
 	}
-}
+}

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

@@ -38,7 +38,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
     public void initComponent() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel advancePane = createAdvancePane();
-        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, advancePane);
+        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, advancePane);
         this.add(advanceExpandablePane, BorderLayout.CENTER);
     }
 

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

@@ -33,11 +33,11 @@ public class BorderStyleWidgetDefinePane extends AbstractDataModify<AbstractBord
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style")), borderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")), borderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
         jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         advancePane.add(jPanel, BorderLayout.CENTER);
 
-        UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, advancePane );
+        UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, advancePane );
 
         this.add(layoutExpandablePane, BorderLayout.CENTER);
     }
@@ -68,4 +68,4 @@ public class BorderStyleWidgetDefinePane extends AbstractDataModify<AbstractBord
         return null;
     }
 
-}
+}

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

@@ -63,13 +63,13 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
         watermarkEditor = new AccessibleBodyWatermarkEditor();
         JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(
                 new Component[][]{
-                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style")), borderStyleEditor},
+                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")), borderStyleEditor},
                     new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), watermarkEditor}
                 }, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
         JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         borderPane.add(jPanel, BorderLayout.CENTER);
-        UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, borderPane );
+        UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, borderPane );
         centerPane.add(advancedPane, BorderLayout.NORTH);
         this.add(centerPane, BorderLayout.NORTH);
     }
@@ -78,7 +78,7 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
         initLayoutComboBox();
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type")), layoutCombox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout_Type")), layoutCombox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode")), comboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         jPanel.add(northPane, BorderLayout.NORTH);

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

@@ -68,7 +68,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
     public void initComponent() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel advancePane = createAdvancePane();
-        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, advancePane);
+        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, advancePane);
         this.add(advanceExpandablePane, BorderLayout.NORTH);
         UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout"), 280, 20, createLayoutPane());
         this.add(layoutExpandablePane, BorderLayout.CENTER);
@@ -81,7 +81,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         paddingBound = new PaddingBoundPane();
         JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(
                 new Component[][]{
-                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style")), stylePane},
+                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")), stylePane},
                     new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), watermarkEditor}
                 }, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
         jp2.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
@@ -101,7 +101,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 1}};
         JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type")), layoutComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Layout_Type")), layoutComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         northPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
 
         Component[][] components = new Component[][]{

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

@@ -42,10 +42,10 @@ public class WCardMainLayoutDefinePane extends AbstractDataModify<WCardMainBorde
         accessibleCardTagWLayoutBorderStyleEditor = new AccessibleCardTagWLayoutBorderStyleEditor();
         JPanel accessibleCardlayout = FRGUIPaneFactory.createBorderLayout_S_Pane();
         JPanel stylePane =  TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style")), accessibleCardTagWLayoutBorderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")), accessibleCardTagWLayoutBorderStyleEditor}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
         stylePane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         accessibleCardlayout.add(stylePane, BorderLayout.CENTER);
-        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, accessibleCardlayout);
+        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, accessibleCardlayout);
         final JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         jPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
         setCarousel = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_setCarousel"));

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

@@ -85,7 +85,7 @@ public class WCardTagLayoutDefinePane extends AbstractDataModify<WCardTagLayout>
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tab_Style_Template")), templateStyleEditor},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tab_Display_Position")), displayPositionGroup},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background")), backgroundEditor},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background")), backgroundEditor},
                 new Component[]{fontLabel, frFontPane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation")), textDirectionGroup}
         };
@@ -93,7 +93,7 @@ public class WCardTagLayoutDefinePane extends AbstractDataModify<WCardTagLayout>
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         jPanel.add(panel, BorderLayout.CENTER);
-        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, jPanel);
+        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, jPanel);
         this.add(advanceExpandablePane, BorderLayout.CENTER);
     }
 

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

@@ -51,7 +51,7 @@ public class WTabFitLayoutDefinePane extends AbstractDataModify<WTabFitLayout> {
         advancePane.add(jPanel, BorderLayout.NORTH);
         advancePane.add(paddingBoundPane, BorderLayout.CENTER);
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, advancePane);
+        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, advancePane);
         this.add(advanceExpandablePane, BorderLayout.NORTH);
         initLayoutComponent();
     }

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

@@ -50,7 +50,7 @@ public abstract class WTitleLayoutDefinePane<T extends AbstractBorderStyleWidget
         if(centerPane!=null){
             advancePane.add(centerPane, BorderLayout.CENTER);
         }
-        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, advancePane);
+        UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, advancePane);
 
         this.add(advanceExpandablePane);
 

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-Designer_Zoom_Out_Logic"), SwingConstants.LEFT), zoomOutComboBox},
+                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-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("FR-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")});
         }
 
     }
@@ -178,7 +178,7 @@ public class GlobalStyleMenuDef extends MenuDef {
             }
 
             stylePane.updateGlobalStyle(getEditingComponent());
-            CellElementPropertyPane.getInstance().GoToPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"));
+            CellElementPropertyPane.getInstance().GoToPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style"));
             return true;
         }
 
@@ -191,4 +191,4 @@ public class GlobalStyleMenuDef extends MenuDef {
         }
 
     }
-}
+}

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

@@ -28,7 +28,7 @@ public class BackPane extends ConditionAttrSingleConditionPane<HighlightAction>
 
     public BackPane(final ConditionAttributesPane conditionAttributesPane) {
         super(conditionAttributesPane);
-        backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background") + ":");
+        backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background") + ":");
         this.backgroundPreviewPane = new BackgroundPreviewLabel();
         this.backgroundPreviewPane.setPreferredSize(new Dimension(80, 20));
         UIButton editBackgroundButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"));
@@ -60,7 +60,7 @@ public class BackPane extends ConditionAttrSingleConditionPane<HighlightAction>
 
     @Override
     public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background");
     }
 
 
@@ -72,4 +72,4 @@ public class BackPane extends ConditionAttrSingleConditionPane<HighlightAction>
     public HighlightAction update() {
         return new BackgroundHighlightAction(this.backgroundPreviewPane.getBackgroundObject(), this.backScopeComboBox.getSelectedIndex());
     }
-}
+}

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

@@ -66,7 +66,7 @@ public class ReportFloatPane extends JPanel {
         double[] columnSize = {p, p, p, f};
         double[] rowSize = {p};
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_FloatElement")), emptyLabel, toolBarPane},
+                new Component[]{new UILabel(), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_FloatElement")), emptyLabel, toolBarPane},
         };
         JPanel leftTopPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         leftTopPane.setBorder(BorderFactory.createEmptyBorder(12, 5, 0, 15));

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@@ -99,7 +99,7 @@ public class AlphaFineDialog extends UIDialog {
     private static final String DS_NAME = "dsname=\"";
     private static final String PLUGIN_MARK_SHORT = "k:4 ";
     private static final String PLUGIN_MARK = "k:shop ";
-    private static final String PLACE_HOLDER = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine");
+    private static final String PLACE_HOLDER = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine");
     private static final int MAX_SHOW_SIZE = 12;
 
     private AlphaFineTextField searchTextField;
@@ -653,12 +653,12 @@ public class AlphaFineDialog extends UIDialog {
     }
 
     private void dealWithMoreOrLessResult(int index, MoreModel selectedValue) {
-        if (ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_ShowAll"), selectedValue.getContent())) {
-            selectedValue.setContent(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_ShowLess"));
+        if (ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), selectedValue.getContent())) {
+            selectedValue.setContent(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowLess"));
 
             rebuildShowMoreList(index, selectedValue);
         } else {
-            selectedValue.setContent(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_ShowAll"));
+            selectedValue.setContent(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"));
             rebuildShowMoreList(index, selectedValue);
         }
     }
@@ -835,7 +835,7 @@ public class AlphaFineDialog extends UIDialog {
      * @param selectedValue
      */
     private void rebuildShowMoreList(final int index, final MoreModel selectedValue) {
-        if ((selectedValue).getContent().equals(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_ShowLess"))) {
+        if ((selectedValue).getContent().equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowLess"))) {
             splitLabel.setIcon(new ImageIcon(getClass().getResource(AlphaFineConstants.IMAGE_URL + "bigloading.gif")));
             if (this.searchWorker != null && !this.searchWorker.isDone()) {
                 this.searchWorker.cancel(true);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java

@@ -31,7 +31,7 @@ public class AlphaFinePane extends BasicPane {
         setLayout(new BorderLayout());
         UIButton refreshButton = new UIButton();
         refreshButton.setIcon(IOUtils.readIcon(("/com/fr/design/mainframe/alphafine/images/smallsearch.png")));
-        refreshButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine"));
+        refreshButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine"));
         refreshButton.set4ToolbarButton();
         refreshButton.setRolloverEnabled(false);
         this.add(refreshButton);

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/ActionSearchManager.java

@@ -87,7 +87,7 @@ public class ActionSearchManager implements AlphaFineSearchProvider {
                 lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set")));
                 lessModelList.addAll(result);
             } else {
-                lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_ShowAll"), true, CellType.ACTION));
+                lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.ACTION));
                 lessModelList.addAll(result.subList(0, AlphaFineConstants.SHOW_SIZE));
                 moreModelList.addAll(result.subList(AlphaFineConstants.SHOW_SIZE, result.size()));
             }
@@ -100,4 +100,4 @@ public class ActionSearchManager implements AlphaFineSearchProvider {
     public SearchResult getMoreSearchResult(String searchText) {
         return moreModelList;
     }
-}
+}

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java

@@ -85,7 +85,7 @@ public class DocumentSearchManager implements AlphaFineSearchProvider {
                         lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP")));
                         lessModelList.addAll(searchResult);
                     } else {
-                        lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_ShowAll"), true, CellType.DOCUMENT));
+                        lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.DOCUMENT));
                         lessModelList.addAll(searchResult.subList(0, AlphaFineConstants.SHOW_SIZE));
                         moreModelList.addAll(searchResult.subList(AlphaFineConstants.SHOW_SIZE, searchResult.size()));
                     }
@@ -114,4 +114,4 @@ public class DocumentSearchManager implements AlphaFineSearchProvider {
         return moreModelList;
     }
 
-}
+}

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java

@@ -82,7 +82,7 @@ public class FileSearchManager implements AlphaFineSearchProvider {
             lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates")));
             lessModelList.addAll(filterModelList);
         } else {
-            lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_ShowAll"), true, CellType.FILE));
+            lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.FILE));
             lessModelList.addAll(filterModelList.subList(0, AlphaFineConstants.SHOW_SIZE));
             moreModelList.addAll(filterModelList.subList(AlphaFineConstants.SHOW_SIZE, filterModelList.size()));
 
@@ -173,4 +173,4 @@ public class FileSearchManager implements AlphaFineSearchProvider {
     public void setSearchText(String searchText) {
         this.searchText = searchText;
     }
-}
+}

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/PluginSearchManager.java

@@ -131,7 +131,7 @@ public class PluginSearchManager implements AlphaFineSearchProvider {
                         lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Addon")));
                         lessModelList.addAll(searchResult);
                     } else {
-                        lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Addon"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_ShowAll"), true, CellType.PLUGIN));
+                        lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Addon"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.PLUGIN));
                         lessModelList.addAll(searchResult.subList(0, AlphaFineConstants.SHOW_SIZE));
                         moreModelList.addAll(searchResult.subList(AlphaFineConstants.SHOW_SIZE, searchResult.size()));
                     }
@@ -156,4 +156,4 @@ public class PluginSearchManager implements AlphaFineSearchProvider {
     public SearchResult getMoreSearchResult(String searchText) {
         return this.moreModelList;
     }
-}
+}

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecentSearchManager.java

@@ -76,7 +76,7 @@ public class RecentSearchManager implements AlphaFineSearchProvider {
         this.modelList = new SearchResult();
         recentModelList = getRecentModelList(searchText);
         if (recentModelList != null && recentModelList.size() > 0) {
-            modelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Latest")));
+            modelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Latest")));
             if (recentModelList.size() > AlphaFineConstants.LATEST_SHOW_SIZE) {
                 modelList.addAll(recentModelList.subList(0, AlphaFineConstants.LATEST_SHOW_SIZE));
             } else {

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/RecommendSearchManager.java

@@ -81,7 +81,7 @@ public class RecommendSearchManager implements AlphaFineSearchProvider {
                 }
             }
             if (recommendModelList.size() > 0) {
-                modelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Recommend"), false));
+                modelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Recommend"), false));
                 modelList.addAll(recommendModelList);
             }
         }
@@ -100,7 +100,7 @@ public class RecommendSearchManager implements AlphaFineSearchProvider {
 
     private SearchResult getNoConnectList() {
         SearchResult result = new SearchResult();
-        result.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Recommend")));
+        result.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Recommend")));
         result.add(AlphaFineHelper.NO_CONNECTION_MODEL);
         return result;
     }

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/cell/settingpane/CellExpandAttrPane.java

@@ -74,7 +74,7 @@ public class CellExpandAttrPane extends AbstractCellAttrPane {
         basicPane = new JPanel();
         seniorPane = new JPanel();
         basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 223, 24, basicPane());
-        seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 223, 24, seniorPane());
+        seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 223, 24, seniorPane());
         layoutPane.add(basicPane, BorderLayout.NORTH);
         layoutPane.add(seniorPane, BorderLayout.CENTER);
         return layoutPane;
@@ -241,4 +241,4 @@ public class CellExpandAttrPane extends AbstractCellAttrPane {
     }
 
 
-}
+}

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

@@ -87,7 +87,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
      */
     public JPanel createContentPane() {
         JPanel downPane = new JPanel(new BorderLayout());
-        downPane.add(new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Auto_Adjust_Size"), HEAD_WDITH, HEAD_HEIGTH, seniorPane()), BorderLayout.NORTH);
+        downPane.add(new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Auto_Adjust_Size"), HEAD_WDITH, HEAD_HEIGTH, seniorPane()), BorderLayout.NORTH);
         downPane.add(new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Pagination"), HEAD_WDITH, HEAD_HEIGTH, pagePane()), BorderLayout.CENTER);
         JPanel contentPane = new JPanel(new BorderLayout(0, 0));
         contentPane.add(new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), HEAD_WDITH, HEAD_HEIGTH, basicPane()), BorderLayout.NORTH);
@@ -99,8 +99,8 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
     private JPanel basicPane() {
         defaultAutoRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Follow_Paper_Settings"));
         noAutoRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Auto_Adjust"));
-        autoHeightRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Auto_Adjust_Height"));
-        autoWidthRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Auto_Adjust_Width"));
+        autoHeightRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Auto_Adjust_Height"));
+        autoWidthRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Auto_Adjust_Width"));
         adjustRadioButtons = new UIRadioButton[]{
                 defaultAutoRadioButton, noAutoRadioButton, autoHeightRadioButton, autoWidthRadioButton
         };
@@ -289,8 +289,8 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
     private void initAllNames() {
         defaultAutoRadioButton.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Follow_Paper_Settings"));
         noAutoRadioButton.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_No_Auto_Adjust"));
-        autoHeightRadioButton.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Auto_Adjust_Height"));
-        autoWidthRadioButton.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Auto_Adjust_Width"));
+        autoHeightRadioButton.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Auto_Adjust_Height"));
+        autoWidthRadioButton.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Auto_Adjust_Width"));
         previewCellContent.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Preview"));
         printAndExportContent.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_CellWrite_Print_Content"));
         printAndExportBackground.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_CellWrite_Print_Background"));

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/parameter/ParameterDefinitePane.java

@@ -479,7 +479,7 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
     public MenuDef[] menus4Target() {
         MenuDef tplMenu = new MenuDef(KeySetUtils.TEMPLATE.getMenuKeySetName(),KeySetUtils.TEMPLATE.getMnemonic());
         if (!DesignerMode.isAuthorityEditing()) {
-            tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("FR-Utils_WorkBook")));
+            tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_WorkBook")));
             tplMenu.addShortCut(new ReportParameterAction(workBook));
             tplMenu.addShortCut(new NameSeparator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})));
             tplMenu.addShortCut(new AllowAuthorityEditAction(workBook));
@@ -524,4 +524,4 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
     }
 
 
-}
+}

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

@@ -8,10 +8,8 @@ import com.fr.design.actions.utils.ReportActionUtils;
 import com.fr.design.gui.controlpane.UIListControlPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.ElementCasePane;
-import com.fr.design.mainframe.JTemplate;
 import com.fr.general.NameObject;
 import com.fr.design.condition.HighLightConditionAttributesPane;
-import com.fr.design.gui.controlpane.JListControlPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.NameableCreator;
 
@@ -75,7 +73,7 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
 
 	@Override
 	public String getAddItemText() {
-		return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Condition");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Condition");
 	}
 
 	public void populate(ElementCasePane ePane) {
@@ -131,4 +129,4 @@ public class ConditionAttributesGroupPane extends UIListControlPane {
 
 		return new HighlightGroup(res_array);
 	}
-}
+}

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

@@ -38,7 +38,7 @@ public class StyleArrayPane extends JListControlPane {
 	 * @return 样式设置组件
 	 */
 	public NameableCreator[] createNameableCreators() {
-		return new NameableCreator[] { new AbstractNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Style_Name"), Style.class, StylePane.class) {
+		return new NameableCreator[] { new AbstractNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style_Name"), Style.class, StylePane.class) {
 			public NameObject createNameable(UnrepeatedNameHelper helper) {
 				// 返回参数设置面板.
 				return new NameObject(helper.createUnrepeatedName("H"), Style.getInstance());
@@ -103,4 +103,4 @@ public class StyleArrayPane extends JListControlPane {
 	}
 	
 
-}
+}

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"));
@@ -213,7 +213,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
 
         //自适应插件
         if (shouldShowTip()) {
-            JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attention"));
+            JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Attention"));
             BoxCenterAligmentPane actionLabel = getURLActionLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Fit-Tip"));
             infoPane.add(actionLabel, BorderLayout.SOUTH);
             this.add(infoPane, BorderLayout.SOUTH);
@@ -222,8 +222,8 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         // 重复打印部分
         // 重复打印标题的起始行
         JPanel labelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
-        labelPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Select_the_repeated_row_and_column") + ":"));
-        UILabel warning = new UILabel("(" + com.fr.design.i18n.Toolkit.i18nText("FR-Engine_FreezeWarning1") + ")");
+        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("Fine-Design_Report_Engine_FreezeWarning") + ")");
         warning.setForeground(Color.red);
         labelPanel.add(warning);
         cenrepeatPanel.add(labelPanel, BorderLayout.NORTH);
@@ -392,7 +392,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
      * @date 2014-11-14-下午2:30:58
      */
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Repeat-Freeze");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Repeat-Freeze");
     }
 
     public void populate(ReportPageAttrProvider attribute) {
@@ -596,4 +596,4 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         }
     }
 
-}
+}

designer-realize/src/main/java/com/fr/design/report/mobile/AppFitPreviewPane.java

@@ -4,7 +4,6 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.general.IOUtils;
 
 
 import javax.swing.*;
@@ -69,6 +68,6 @@ public class AppFitPreviewPane extends BasicPane{
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Preview");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Plugin_Preview");
     }
 }

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/EditToolBar.java

@@ -314,7 +314,7 @@ public class EditToolBar extends BasicPane {
 			if (i < 0 || !(listModel.getElementAt(i) instanceof ToolBarButton)) {
 				return;
 			}
-			int val = JOptionPane.showConfirmDialog(EditToolBar.this, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Are_You_Sure_To_Delete_The_Data") + "?", "Message", JOptionPane.YES_NO_OPTION);
+			int val = JOptionPane.showConfirmDialog(EditToolBar.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?", "Message", JOptionPane.YES_NO_OPTION);
 			if (val != JOptionPane.YES_OPTION) {
 				return;
 			}

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

@@ -62,28 +62,28 @@ public class ReportWebWidgetConstants {
     }
 
     // 提交按钮
-    public static final WidgetOption SUBMIT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Utils-Submit"), BaseUtils.readIcon("/com/fr/web/images/save.png"),
+    public static final WidgetOption SUBMIT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Utils_Submit"), BaseUtils.readIcon("/com/fr/web/images/save.png"),
             Submit.class);
 
     // flash打印按钮
-    public static final WidgetOption FLASHPRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Utils-Print[Client]"),
+    public static final WidgetOption FLASHPRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Utils_Print[Client]"),
             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打印
-    public static final WidgetOption PDFPRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Utils-Print[Client]"),
+    public static final WidgetOption PDFPRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Utils_Print[Client]"),
             BaseUtils.readIcon("/com/fr/web/images/pdfPrint.png"), PDFPrint.class);
 
 
     // 邮件发送
-    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,28 +104,28 @@ 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"),
             BaseUtils.readIcon("/com/fr/web/images/pageNumber.png"), PageNavi.class);
     // 首页
-    public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-First"), BaseUtils.readIcon("/com/fr/web/images/first.png"),
+    public static final WidgetOption FIRST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_First"), BaseUtils.readIcon("/com/fr/web/images/first.png"),
             First.class);
     // 末页
-    public static final WidgetOption LAST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Last"), BaseUtils.readIcon("/com/fr/web/images/last.png"),
+    public static final WidgetOption LAST = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_Last"), BaseUtils.readIcon("/com/fr/web/images/last.png"),
             Last.class);
     // 前一页
-    public static final WidgetOption PREVIOUS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Previous"),
+    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 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 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("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,33 +143,33 @@ 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("FR-Engine_SetPrinterOffset"), BaseUtils.readIcon("/com/fr/web/images/pianyi.png"), SetPrinterOffset.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);
 
     public static final WidgetOption CUSTOM_BUTTON = WidgetOptionFactory
             .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Form-Button"}), CustomToolBarButton.class);
 
     // 输出离线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/ReportWriteAttrPane.java

@@ -53,7 +53,7 @@ public class ReportWriteAttrPane extends LoadingBasicPane {
 		}
 		writeShortCutsPane = new WriteShortCutsPane();
 
-		tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Utils_Submit"), submiterListPane);
+		tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Submit"), submiterListPane);
 		tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Verify-Data_Verify"), verifierListPane);
 		tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Writer-ShortCuts_Setting"), writeShortCutsPane);
 	}
@@ -108,4 +108,4 @@ public class ReportWriteAttrPane extends LoadingBasicPane {
 		return -1;
 	}
 
-}
+}

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 conditonFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Selection_Filter"));
-	private UICheckBox listFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-List_Filter"));
+	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("Fine-Design_Report_Engine_Selection_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"));
-        conditionFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Selection_Filter"));
-        listFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-List_Filter"));
+        sortCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Sort_Sort"));
+        conditionFilterBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Selection_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/WriteToolBarPane.java

@@ -84,7 +84,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
 
         showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event_ShowWidgets"));
         showWidgets.setSelected(false);
-        isAutoStash = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Write_Auto_Stash"));
+        isAutoStash = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Auto_Stash"));
         isAutoStash.setSelected(false);
         northPane.add(GUICoreUtils.createFlowPane(new Component[]{unloadCheck, showWidgets, isAutoStash}, FlowLayout.LEFT));
 

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

@@ -78,7 +78,7 @@ public class WriteWebSettingPane extends WebSettingPane<WebWrite> {
 
         showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Engine_Event_showWidgets"}));
         showWidgets.setSelected(false);
-        isAutoStash = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Write_Auto_Stash"));
+        isAutoStash = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Auto_Stash"));
         isAutoStash.setSelected(false);
         JPanel unloadCheckPane = GUICoreUtils.createFlowPane(new Component[]{unloadCheck, showWidgets, isAutoStash}, FlowLayout.LEFT);
         JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);

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

@@ -73,7 +73,7 @@ public class NativePrintSettingPane extends JPanel {
         JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(1, 0, 15);
         UILabel tipDownload = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tip_Native_Print_Need_Client"));
         northPane.add(tipDownload);
-        isShowDialogCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Show_Print_Setting_Window_When_Printing"));
+        isShowDialogCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Show_Print_Setting_Window_When_Printing"));
         isShowDialogCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20));
         UILabel tipCheck = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tip_Use_Default_Settings"));
         JPanel checkPane =  GUICoreUtils.createFlowPane(new Component[] {
@@ -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));
@@ -263,9 +263,9 @@ public class NativePrintSettingPane extends JPanel {
 
     // 页码范围
     private JPanel getPrintAreaPane() {
-        allPageRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_All_Pages"));
+        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/NoClientPrintSettingPane.java

@@ -35,7 +35,7 @@ public class NoClientPrintSettingPane extends JPanel {
     private void initComponents() {
         JPanel printPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
-        setMarginWhenPrintCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Set_Margin_When_Printing"));
+        setMarginWhenPrintCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Set_Margin_When_Printing"));
         setMarginWhenPrintCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20));
         UILabel tipLabel = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tip_Use_Default_Print_Margin"));
         JPanel northPane = GUICoreUtils.createFlowPane(new Component[] {

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 nativePrintRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Native_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("Fine-Design_Report_Engine_Native_Print"));
 
     private NoClientPrintSettingPane noClientPrintSettingPane;
     private NativePrintSettingPane nativePrintSettingPane;

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

@@ -93,13 +93,13 @@ public class CellWidgetCardPane extends BasicPane {
         mobileTabPane.add(mobileCardPane, BorderLayout.CENTER);
         mobileCardLayout = (CardLayout) mobileCardPane.getLayout();
 
-        center.add(basicScrollPane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attribute"));
+        center.add(basicScrollPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Attribute"));
         center.add(eventTabPane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event"));
-        center.add(mobileTabPane, com.fr.design.i18n.Toolkit.i18nText("FR-Widget_Mobile_Terminal"));
+        center.add(mobileTabPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal"));
         initPaneList();
 
 
-        final String[] tabTitles = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attribute"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event"), com.fr.design.i18n.Toolkit.i18nText("FR-Widget_Mobile_Terminal")};
+        final String[] tabTitles = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Attribute"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal")};
         tabsHeaderIconPane = new UIHeadGroup(tabTitles) {
             @Override
             public void tabChanged(int index) {

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

@@ -4,10 +4,8 @@ package com.fr.design.widget;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.controlpane.ObjectUIControlPane;
 import com.fr.design.mainframe.CellWidgetPropertyPane;
-import com.fr.design.present.CellWriteAttrPane;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.design.write.submit.SmartInsertDBManipulationInWidgetEventPane;
 import com.fr.design.gui.controlpane.NameableCreator;
@@ -19,16 +17,9 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.form.event.Listener;
 import com.fr.form.ui.Widget;
 import com.fr.grid.selection.Selection;
-import com.fr.log.FineLoggerFactory;
 
 import com.fr.general.NameObject;
-import com.fr.grid.GridUtils;
 import com.fr.grid.selection.CellSelection;
-import com.fr.privilege.finegrain.WidgetPrivilegeControl;
-import com.fr.report.cell.DefaultTemplateCellElement;
-import com.fr.report.cell.TemplateCellElement;
-import com.fr.report.elementcase.TemplateElementCase;
-import com.fr.report.stable.ReportConstants;
 import com.fr.stable.Nameable;
 
 import javax.swing.*;
@@ -49,7 +40,7 @@ public class WidgetEventPane extends ObjectUIControlPane {
 
     @Override
     public String getAddItemText() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Event");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Event");
     }
 
     /**
@@ -159,4 +150,4 @@ public class WidgetEventPane extends ObjectUIControlPane {
         }
         return res_array;
     }
-}
+}

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

@@ -34,7 +34,7 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
         int[][] rowCount = {{1, 1}};
         JPanel pane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount,  IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
 
-        UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 24, pane);
+        UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 24, pane);
         pane.setBorder(BorderFactory.createEmptyBorder(10, 5, 10, 0));
 
         this.add(uiExpandablePane);
@@ -56,4 +56,4 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
         box.setText(text.getText());
         return box;
     }
-}
+}

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

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

@@ -7,15 +7,15 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.form.ui.FieldEditor;
 
-
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
@@ -36,7 +36,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         jPanel.add(contentPane, BorderLayout.CENTER);
         contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         if (contentPane != null) {
-            UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 24, jPanel);
+            UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 24, jPanel);
             this.add(uiExpandablePane, BorderLayout.NORTH);
         }
         this.addValidatePane();
@@ -98,7 +98,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         validatePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         final UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Error_Tip"));
         initErrorMsgPane();
-        allowBlankCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Allow_Null"));
+        allowBlankCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Null"));
         allowBlankCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         final JPanel errorTipPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{uiLabel, errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
@@ -136,4 +136,4 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
     }
 
 
-}
+}

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

@@ -71,7 +71,7 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
 
         contentPane.add(panel);
 
-        UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 24, contentPane);
+        UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 24, contentPane);
         this.add(uiExpandablePane, BorderLayout.NORTH);
 
     }
@@ -129,4 +129,4 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
         ob.setOverflowy(this.verticalCheck.isSelected());
         return ob;
     }
-}
+}

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

@@ -40,7 +40,7 @@ public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> exte
         JPanel borderPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         borderPanel.add(panel, BorderLayout.CENTER);
         panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
-        UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, borderPanel);
+        UIExpandablePane advancedPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, borderPanel);
         this.add(advancedPane);
 
     }
@@ -59,4 +59,4 @@ public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> exte
     public Class classType() {
         return TreeNodeToggleButton.class;
     }
-}
+}

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@@ -441,12 +441,12 @@ public class CellDSColumnEditor extends CellQuickEditor {
 
         @Override
         public String getIconPath() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced");
         }
 
         @Override
         public String title4PopupWindow() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced");
         }