From 14b3e2f1de5797e8cc5facfa5225627805e7ba94 Mon Sep 17 00:00:00 2001 From: Harrison Date: Wed, 8 Aug 2018 17:49:39 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-10025=2010.0=20&=205.0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E5=9B=BD=E9=99=85=E5=8C=96=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/designer/creator/XDateEditor.java | 2 +- .../design/designer/creator/XNameWidget.java | 6 ++-- .../designer/creator/XWParameterLayout.java | 5 ++- .../CardLayoutPropertiesGroupModel.java | 8 ++--- .../items/FRFitConstraintsItems.java | 2 +- .../mainframe/FormWebWidgetConstants.java | 4 +-- .../parameter/RootDesignDefinePane.java | 2 +- .../ui/designer/DateEditorDefinePane.java | 2 +- .../mobile/ChartEditorDefinePane.java | 4 +-- .../actions/cell/GlobalStyleMenuDef.java | 4 +-- .../com/fr/design/mainframe/app/FormApp.java | 2 +- .../errorinfo/ErrorInfoLogAppender.java | 4 +-- .../freeze/RepeatAndFreezeSettingPane.java | 8 ++--- .../report/share/ConfusionManagerPane.java | 4 +-- .../fr/design/webattr/ReportWebAttrPane.java | 4 +-- .../webattr/ReportWebWidgetConstants.java | 32 +++++++++---------- .../fr/design/webattr/ViewToolBarPane.java | 8 ++--- .../fr/design/webattr/ViewWebSettingPane.java | 8 ++--- .../printsettings/NativePrintSettingPane.java | 4 +-- .../printsettings/PrintSettingPane.java | 4 +-- .../widget/ui/DateEditorDefinePane.java | 2 +- 21 files changed, 59 insertions(+), 60 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java index fe1a33d00d..9f8d794ee8 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java +++ b/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, diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java index 70b4955a77..e11c812a88 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java +++ b/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(); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java index 1e4da367be..cb6a078f3e 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java +++ b/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; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutPropertiesGroupModel.java index e653db126f..f11f86c087 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutPropertiesGroupModel.java +++ b/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; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRFitConstraintsItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRFitConstraintsItems.java index 66cb8d8786..9cfb961df2 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRFitConstraintsItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRFitConstraintsItems.java @@ -14,7 +14,7 @@ public class FRFitConstraintsItems implements ItemProvider{ public static final Item[] ITEMS = new Item[] { new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Bidirectional_Adaptive"), WFitLayout.STATE_FULL), - new Item(com.fr.design.i18n.Toolkit.i18nText("Fine_Design_Form_Attr_Horizontal_Adaptive"), WFitLayout.STATE_ORIGIN)}; + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Attr_Horizontal_Adaptive"), WFitLayout.STATE_ORIGIN)}; public Item[] getItems() { return ITEMS; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java index 9ef9093a0b..fb8ec7dd2a 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWebWidgetConstants.java @@ -36,7 +36,7 @@ public class FormWebWidgetConstants { public static final WidgetOption PREVIOUS = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_Previous"), IOUtils.readIcon("/com/fr/web/images/previous.png"), Previous.class); // 后一页 - public static final WidgetOption NEXT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_ReportServerP-Next"), IOUtils.readIcon("/com/fr/web/images/next.png"), + public static final WidgetOption NEXT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ReportServerP_Next"), IOUtils.readIcon("/com/fr/web/images/next.png"), Next.class); // 导出成Excel 分页导出 @@ -47,7 +47,7 @@ public class FormWebWidgetConstants { IOUtils.readIcon("/com/fr/web/images/excel.png"), ExcelO.class); // 导出 public static final WidgetOption EXPORT = WidgetOptionFactory - .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Export"), IOUtils.readIcon("/com/fr/web/images/export.png"), Export.class); + .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Export"), IOUtils.readIcon("/com/fr/web/images/export.png"), Export.class); public static final WidgetOption CUSTOM_BUTTON = WidgetOptionFactory .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Toolbar_Custom_Button"), CustomToolBarButton.class); diff --git a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java index 5efa4280c7..235393cef9 100644 --- a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java @@ -105,7 +105,7 @@ public class RootDesignDefinePane extends AbstractDataModify { 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)); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java index 8fa6102ed8..cc6071cce6 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java @@ -53,7 +53,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane { @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 { conditionFilterBox.setSelected(true); listFilterBox.setSelected(true); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NativePrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NativePrintSettingPane.java index 589236c5c6..c1ca5757f1 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NativePrintSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/NativePrintSettingPane.java @@ -161,7 +161,7 @@ public class NativePrintSettingPane extends JPanel { JPanel layoutSettingCheckPane = GUICoreUtils.createCheckboxAndDynamicPane(inheritPageLayoutSettingCheck, layoutSettingPane, true); // 页码标签 - UILabel printAreaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Page_Number") + ":"); + UILabel printAreaLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Page_Number") + ":"); JPanel printAreaLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); printAreaLabelPane.add(printAreaLabel, BorderLayout.NORTH); printAreaLabel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0)); @@ -265,7 +265,7 @@ public class NativePrintSettingPane extends JPanel { private JPanel getPrintAreaPane() { allPageRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_All_Pages")); currentPageRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Current_Page")); - customPageRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_HJS-Specified_Pages")); + customPageRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_HJS-Specified_Pages")); ButtonGroup group = new ButtonGroup(); group.add(allPageRadioButton); group.add(currentPageRadioButton); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java index 5f537cd8c4..850b045c17 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/PrintSettingPane.java +++ b/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; diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/DateEditorDefinePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/DateEditorDefinePane.java index 2150f6af43..f1dde98703 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/DateEditorDefinePane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/DateEditorDefinePane.java @@ -57,7 +57,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane