From f8b5be2ea9afef41eed04bc89f84b49408c960ff Mon Sep 17 00:00:00 2001 From: Harrison Date: Fri, 10 Aug 2018 09:31:57 +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 --- .../fr/design/data/datapane/ChoosePane.java | 2 +- .../chart/axis/CustomChartStyleAxisPane.java | 4 +- .../active/action/SetLegendStyleAction.java | 4 +- .../mainframe/chart/gui/ChangeConfigPane.java | 2 +- .../XYScatterPlotReportDataContentPane.java | 4 +- .../chart/gui/other/TimeSwitchPane.java | 18 ++-- .../gui/style/ChartAxisLineStylePane.java | 2 +- .../chart/gui/style/ChartBeautyPane.java | 4 +- .../chart/gui/style/ChartFillStylePane.java | 6 +- .../chart/gui/style/DateAxisValuePane.java | 18 ++-- .../chart/gui/style/axis/ChartValuePane.java | 6 +- .../gui/style/legend/ChartLegendPane.java | 4 +- .../gui/style/series/CustomSeriesPane.java | 4 +- .../gui/style/series/MeterSeriesPane.java | 6 +- .../module/ChartEmptyDataStyleAction.java | 2 +- .../module/ChartEmptyDataStylePane.java | 4 +- .../fr/design/module/ChartHyperlinkGroup.java | 10 +- .../design/module/ChartPreFillStylePane.java | 8 +- .../module/ChartPreStyleManagerPane.java | 4 +- .../fr/design/module/ChartPreStylePane.java | 4 +- .../fr/design/module/FormHyperlinkGroup.java | 8 +- .../axis/radar/RadarTableContentPane.java | 4 +- .../background/VanChartAlertValuePane.java | 2 +- .../style/VanChartWordCloudSeriesPane.java | 2 +- .../beans/actions/FormDeleteAction.java | 6 +- .../beans/actions/MoveDownAction.java | 6 +- .../beans/actions/MoveToBottomAction.java | 5 +- .../beans/actions/MoveToTopAction.java | 5 +- .../designer/beans/actions/MoveUpAction.java | 5 +- .../design/designer/creator/XChartEditor.java | 4 +- .../designer/creator/XCheckBoxGroup.java | 2 +- .../designer/creator/XComboCheckBox.java | 6 +- .../design/designer/creator/XDateEditor.java | 22 ++-- .../design/designer/creator/XElementCase.java | 2 +- .../design/designer/creator/XFieldEditor.java | 2 +- .../designer/creator/XIframeEditor.java | 26 +++-- .../fr/design/designer/creator/XLabel.java | 4 +- .../designer/creator/XLayoutContainer.java | 8 +- .../designer/creator/XMultiFileUploader.java | 2 +- .../designer/creator/XNumberEditor.java | 4 +- .../design/designer/creator/XTreeEditor.java | 2 +- .../creator/XWAbsoluteBodyLayout.java | 2 +- .../designer/creator/XWAbsoluteLayout.java | 4 +- .../designer/creator/XWParameterLayout.java | 6 +- .../designer/creator/XWidgetCreator.java | 8 +- .../creator/cardlayout/XCardAddButton.java | 4 +- .../creator/cardlayout/XCardSwitchButton.java | 10 +- .../creator/cardlayout/XWCardLayout.java | 16 +-- .../designer/properties/BoundsGroupModel.java | 26 +++-- .../properties/CardLayoutConstraints.java | 17 ++- .../properties/EventPropertyTable.java | 2 +- .../FRAbsoluteLayoutPropertiesGroupModel.java | 2 +- .../properties/FRBorderLayoutConstraints.java | 38 ++++--- .../FRFitLayoutPropertiesGroupModel.java | 6 +- .../FRTabFitLayoutPropertiesGroupModel.java | 12 +-- .../FormWidgetAuthorityEditPane.java | 4 +- .../properties/HVLayoutConstraints.java | 4 +- .../HorizontalLayoutConstraints.java | 11 +- .../HorizontalLayoutPropertiesGroupModel.java | 4 +- .../properties/HorizontalSplitProperties.java | 4 +- .../properties/MultiSelectionBoundsModel.java | 20 ++-- .../properties/VerticalLayoutConstraints.java | 11 +- .../items/FRAbsoluteConstraintsItems.java | 6 +- .../mobile/BodyAppRelayoutTable.java | 2 +- .../mobile/BodyMobilePropertyUI.java | 2 +- .../mobile/ChartEditorPropertyUI.java | 2 +- .../mobile/ElementCasePropertyTable.java | 12 +-- .../mobile/ElementCasePropertyUI.java | 2 +- .../mobile/MultiFileUploaderPropertyUI.java | 2 +- .../mobile/ParaMobilePropertyUI.java | 2 +- .../form/mobile/FormMobileAttrPane.java | 2 +- .../FormMobileTemplateSettingsPane.java | 14 +-- .../design/form/mobile/MobileToolBarPane.java | 4 +- .../fr/design/gui/core/FormWidgetOption.java | 18 ++-- .../fr/design/gui/xpane/LayoutBorderPane.java | 2 +- .../gui/xpane/LayoutBorderPreviewPane.java | 6 +- .../xtable/ReportAppPropertyGroupModel.java | 4 +- .../mainframe/EditingMouseListener.java | 4 +- .../com/fr/design/mainframe/FormArea.java | 6 +- .../mainframe/FormCreatorDropTarget.java | 6 +- .../com/fr/design/mainframe/FormDesigner.java | 2 +- .../fr/design/mainframe/FormDesignerUI.java | 5 +- .../fr/design/mainframe/FormEditToolBar.java | 6 +- .../design/mainframe/FormParaWidgetPane.java | 2 +- .../design/mainframe/FormSelectionUtils.java | 8 +- .../design/mainframe/FormSettingToolBar.java | 4 +- .../mainframe/FormWidgetDetailPane.java | 12 +-- .../java/com/fr/design/mainframe/JForm.java | 2 +- .../mainframe/WLayoutSelectionPane.java | 50 +++++---- .../design/mainframe/WidgetPropertyPane.java | 4 +- .../EmbeddedFormExportExportAction.java | 15 ++- .../actions/FormMobileAttrAction.java | 2 +- .../mainframe/actions/NewFormAction.java | 4 +- .../widget/accessibles/ColorPalette.java | 4 +- .../editors/ElementCaseToolBarPane.java | 14 +-- .../widget/editors/PaddingMarginPane.java | 8 +- .../widget/ui/FormWidgetCardPane.java | 2 +- .../widget/wrappers/EventHandlerWrapper.java | 4 +- .../parameter/RootDesignDefinePane.java | 10 +- .../widget/ui/designer/ButtonDefinePane.java | 2 +- .../ui/designer/CheckBoxDefinePane.java | 4 +- .../ui/designer/ComboBoxDefinePane.java | 4 +- .../ui/designer/ComboCheckBoxDefinePane.java | 4 +- .../ui/designer/DateEditorDefinePane.java | 8 +- .../designer/DirectWriteEditorDefinePane.java | 4 +- .../ui/designer/FreeButtonDefinePane.java | 2 +- .../ui/designer/IframeEditorDefinePane.java | 4 +- .../widget/ui/designer/LabelDefinePane.java | 8 +- .../ui/designer/MultiFileEditorPane.java | 4 +- .../ui/designer/NumberEditorDefinePane.java | 4 +- .../ui/designer/ParameterTreeComboBox.java | 2 +- .../widget/ui/designer/RadioDefinePane.java | 4 +- .../designer/TextFieldEditorDefinePane.java | 4 +- .../ui/designer/TreeEditorDefinePane.java | 6 +- .../designer/btn/ButtonGroupDefinePane.java | 2 +- .../designer/component/PaddingBoundPane.java | 12 +-- .../component/TabFitLayoutBackgroundPane.java | 2 +- .../layout/ElementEditorDefinePane.java | 2 +- .../layout/FRAbsoluteLayoutDefinePane.java | 2 +- .../layout/FRFitLayoutDefinePane.java | 8 +- .../layout/WCardMainLayoutDefinePane.java | 6 +- .../layout/WCardTagLayoutDefinePane.java | 2 +- .../layout/WTabFitLayoutDefinePane.java | 8 +- .../designer/mobile/BodyMobileDefinePane.java | 4 +- .../mobile/ChartEditorDefinePane.java | 6 +- .../mobile/ElementCaseDefinePane.java | 14 +-- .../mobile/MultiFileUploaderDefinePane.java | 8 +- .../designer/mobile/ParaMobileDefinePane.java | 2 +- .../fr/design/actions/cell/BorderAction.java | 4 +- .../design/actions/cell/NewPresentAction.java | 4 +- .../actions/cell/UIToolbarBorderButton.java | 54 +++++----- .../actions/columnrow/FootColumnAction.java | 4 +- .../actions/columnrow/FootRowAction.java | 4 +- .../actions/columnrow/HeadColumnAction.java | 4 +- .../actions/columnrow/HeadRowAction.java | 4 +- .../fr/design/actions/edit/DeleteAction.java | 7 +- .../actions/edit/clear/ClearAllAction.java | 4 +- .../edit/clear/ClearContentsAction.java | 4 +- .../edit/clear/ClearFormatsAction.java | 4 +- .../order/BringFloatElementForwardAction.java | 9 +- .../order/BringFloatElementToFrontAction.java | 10 +- .../order/SendFloatElementToBackAction.java | 10 +- .../file/export/AbstractExportAction.java | 14 ++- .../actions/file/export/PDFExportAction.java | 4 +- .../file/newReport/NewPolyReportAction.java | 4 +- .../file/newReport/NewWorkBookAction.java | 4 +- .../file/newReport/NewWorkBookXAction.java | 2 +- .../actions/insert/cell/BiasCellAction.java | 4 +- .../actions/insert/cell/ChartCellAction.java | 4 +- .../insert/cell/FormulaCellAction.java | 4 +- .../insert/cell/GeneralCellAction.java | 4 +- .../actions/insert/cell/ImageCellAction.java | 4 +- .../insert/cell/RichTextCellAction.java | 4 +- .../insert/cell/SubReportCellAction.java | 4 +- .../actions/insert/flot/ChartFloatAction.java | 4 +- .../insert/flot/FormulaFloatAction.java | 4 +- .../actions/insert/flot/ImageFloatAction.java | 4 +- .../insert/flot/TextBoxFloatAction.java | 4 +- .../report/ReportMobileAttrAction.java | 2 +- .../report/ReportPrintSettingAction.java | 2 +- .../server/ServerConfigManagerAction.java | 4 +- .../actions/server/StyleListAction.java | 4 +- .../actions/server/StyleManagerPane.java | 7 +- .../actions/server/WidgetManagerAction.java | 4 +- .../utils/DeprecatedActionManager.java | 12 +-- .../design/cell/editor/RichTextToolBar.java | 28 ++--- .../cell/smartaction/SmartJTablePane.java | 4 +- .../fr/design/condition/HyperlinkPane.java | 4 +- .../fr/design/condition/NewRealValuePane.java | 6 +- .../com/fr/design/condition/PaddingPane.java | 6 +- .../com/fr/design/condition/PagePane.java | 6 +- .../condition/PresentHighlightPane.java | 7 +- .../design/condition/WidgetHighlightPane.java | 38 +++---- .../design/dscolumn/DSColumnAdvancedPane.java | 2 +- .../fr/design/dscolumn/DSColumnBasicPane.java | 6 +- .../dscolumn/SelectedDataColumnPane.java | 2 +- .../dscolumn/SpecifiedGroupAttrPane.java | 22 ++-- .../fr/design/expand/ConditionParentPane.java | 4 +- .../java/com/fr/design/expand/ParentPane.java | 4 +- .../design/headerfooter/EditFooterPane.java | 4 +- .../design/headerfooter/EditHeaderPane.java | 4 +- .../headerfooter/HFAttributesEditDialog.java | 14 +-- .../fr/design/headerfooter/HFComponent.java | 12 +-- .../fr/design/headerfooter/HFContainer.java | 4 +- .../headerfooter/HeaderFooterEditPane.java | 85 +++++++-------- .../design/headerfooter/HeaderFooterPane.java | 12 +-- .../design/javascript/ListenerEditPane.java | 38 +++---- .../mainframe/AuthorityEditToolBarPane.java | 4 +- .../mainframe/CellElementPropertyPane.java | 6 +- .../fr/design/mainframe/ElementCasePane.java | 4 +- .../ElementCasePaneAuthorityEditPane.java | 34 +++--- .../mainframe/ElementCasePaneDelegate.java | 5 +- .../design/mainframe/FormatBrushAction.java | 6 +- .../mainframe/ReportComponentComposite.java | 5 +- .../fr/design/mainframe/ReportFloatPane.java | 2 +- .../mainframe/alphafine/AlphaFineHelper.java | 2 +- .../alphafine/component/AlphaFineDialog.java | 2 +- .../com/fr/design/mainframe/app/CptApp.java | 2 +- .../fr/design/mainframe/bbs/BBSGuestPane.java | 4 +- .../mainframe/cell/CellElementEditPane.java | 12 +-- .../cell/settingpane/CellExpandAttrPane.java | 26 ++--- .../cell/settingpane/CellOtherSetPane.java | 100 +++++++++--------- .../cell/settingpane/CellPresentPane.java | 4 +- .../parameter/ParameterDefinitePane.java | 4 +- .../com/fr/design/present/BarCodePane.java | 6 +- .../com/fr/design/present/PresentPane.java | 5 +- .../com/fr/design/present/StyleArrayPane.java | 2 +- .../com/fr/design/report/ExcelExportPane.java | 24 ++--- .../com/fr/design/report/LayerReportPane.java | 8 +- .../com/fr/design/report/PDFExportPane.java | 4 +- .../com/fr/design/report/PageSetupPane.java | 28 ++--- .../fr/design/report/ReportColumnsPane.java | 22 ++-- .../com/fr/design/report/ReportStylePane.java | 8 +- .../com/fr/design/report/RichTextPane.java | 4 +- .../com/fr/design/report/SelectImagePane.java | 5 +- .../com/fr/design/report/SubReportPane.java | 8 +- .../com/fr/design/report/WordExportPane.java | 4 +- .../fr/design/report/WriteShortCutsPane.java | 20 ++-- .../freeze/RepeatAndFreezeSettingPane.java | 6 +- .../report/mobile/AppFitBrowserPane.java | 6 +- .../report/mobile/MobileToolBarPane.java | 6 +- .../report/mobile/ReportMobileAttrPane.java | 2 +- .../ReportMobileTemplateSettingsPane.java | 12 +-- .../report/share/ConfusionManagerPane.java | 2 +- .../report/share/ConfusionTableDataPane.java | 30 +++--- .../fr/design/report/share/ShareButton.java | 8 +- .../fr/design/webattr/DragToolBarPane.java | 42 ++++---- .../EditReportServerParameterPane.java | 15 ++- .../com/fr/design/webattr/EditToolBar.java | 12 +-- .../fr/design/webattr/ErrorTemplatePane.java | 4 +- .../fr/design/webattr/PageToolBarPane.java | 16 +-- .../fr/design/webattr/PageWebSettingPane.java | 38 +++---- .../webattr/ReportSelectToolBarPane.java | 2 +- .../fr/design/webattr/ReportWebAttrPane.java | 12 +-- .../design/webattr/ReportWriteAttrPane.java | 2 +- .../fr/design/webattr/ServerPrinterPane.java | 8 +- .../com/fr/design/webattr/SettingToolBar.java | 4 +- .../fr/design/webattr/ToolBarDragPane.java | 16 +-- .../com/fr/design/webattr/ToolBarPane.java | 4 +- .../fr/design/webattr/ViewToolBarPane.java | 4 +- .../com/fr/design/webattr/WebCssPane.java | 2 +- .../java/com/fr/design/webattr/WebJsPane.java | 10 +- .../com/fr/design/webattr/WebSettingPane.java | 11 +- .../fr/design/webattr/WidgetManagerPane.java | 10 +- .../fr/design/webattr/WriteToolBarPane.java | 16 +-- .../design/webattr/WriteWebSettingPane.java | 14 +-- .../printsettings/NativePrintSettingPane.java | 28 ++--- .../NoClientPrintSettingPane.java | 8 +- .../printsettings/PrintSettingPane.java | 2 +- .../printsettings/ReportPrintSettingPane.java | 8 +- .../com/fr/design/widget/WidgetEventPane.java | 2 +- .../ui/BasicWidgetPropertySettingPane.java | 8 +- .../widget/ui/DateEditorDefinePane.java | 4 +- .../widget/ui/IframeEditorDefinePane.java | 5 +- .../widget/ui/ListEditorDefinePane.java | 4 +- .../design/widget/ui/MultiFileEditorPane.java | 6 +- .../widget/ui/ParameterTreeComboBox.java | 4 +- .../fr/design/widget/ui/RadioDefinePane.java | 4 +- .../ui/mobile/MultiFileEditorMobilePane.java | 8 +- .../fr/design/write/submit/DefaultSubmit.java | 4 +- .../submit/SmartInsertDBManipulationPane.java | 18 ++-- .../java/com/fr/poly/PolyComponetsBar.java | 4 +- .../fr/poly/actions/DeleteBlockAction.java | 4 +- .../java/com/fr/poly/creator/ECBlockPane.java | 5 +- .../com/fr/poly/group/PolyBoundsGroup.java | 18 ++-- .../fr/poly/hanlder/BlockForbiddenWindow.java | 4 +- .../com/fr/quickeditor/CellQuickEditor.java | 4 +- .../cellquick/CellDSColumnEditor.java | 10 +- .../src/main/java/com/fr/start/Designer.java | 2 +- .../main/java/com/fr/start/SplashContext.java | 2 +- 270 files changed, 1077 insertions(+), 1168 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java index 16863dc91..9a9dccd45 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java @@ -248,7 +248,7 @@ public class ChoosePane extends BasicBeanPane implements Refresha @Override protected com.fr.data.impl.Connection doInBackground() { schemaBox.setRefreshingModel(true); - schemaBox.addItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Loading") + "..."); + schemaBox.addItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Loading") + "..."); schemaBox.setSelectedItem(null); schemaBox.setRefreshingModel(false); return getConnection(); diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java index f3e26baef..595cecd3c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java @@ -14,6 +14,6 @@ public class CustomChartStyleAxisPane extends TernaryChartStyleAxisPane { } protected String getSecondValueAxisName() { - return com.fr.design.i18n.Toolkit.i18nText("Second_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Axis"); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetLegendStyleAction.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetLegendStyleAction.java index e88772db5..abc137bd8 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetLegendStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetLegendStyleAction.java @@ -19,7 +19,7 @@ public class SetLegendStyleAction extends ChartComponentAction { public SetLegendStyleAction(ChartComponent chartComponent) { super(chartComponent); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Set_Legend_Sytle")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Set_Legend_Sytle")); } public void actionPerformed(ActionEvent e) { @@ -29,4 +29,4 @@ public class SetLegendStyleAction extends ChartComponentAction { public void showLegendStylePane() { DesignModuleFactory.getChartPropertyPane().getChartEditPane().gotoPane(PaneTitleConstants.CHART_STYLE_TITLE, PaneTitleConstants.CHART_STYLE_LEGNED_TITLE); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java index 8f374889c..f31e4fda0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java @@ -107,7 +107,7 @@ public class ChangeConfigPane extends BasicBeanPane { double[] rowSize = {p, p, p}; timeInterval = new UISpinner(MIN_TIME, MAX_TIME, 1, 0); colorSelectBox4carousel = new ColorSelectBoxWithOutTransparent(WIDTH); - switchStyleGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Show"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hide")}); + switchStyleGroup = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hide")}); Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Arrow_Style")), switchStyleGroup, null}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java index 59ae03bad..1fa65aa25 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java @@ -31,7 +31,7 @@ public class XYScatterPlotReportDataContentPane extends AbstractReportDataConten protected String[] columnNames() { return new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Series_Name"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"), com.fr.design.i18n.Toolkit.i18nText("Chart_Scatter") + "x", com.fr.design.i18n.Toolkit.i18nText("Chart_Scatter") + "y" }; @@ -88,4 +88,4 @@ public class XYScatterPlotReportDataContentPane extends AbstractReportDataConten list.add(seriesEntry); } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java index 2cc21f753..365081aef 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java @@ -44,14 +44,14 @@ public class TimeSwitchPane extends JPanel implements UIObserver { private static final String YEAR = com.fr.design.i18n.Toolkit.i18nText("Year"); private static final String MONTH =com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"); private static final String DAY =com.fr.design.i18n.Toolkit.i18nText("Sun"); - private static final String HOUR = com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"); - private static final String MINUTE = com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"); - private static final String SECOND = com.fr.design.i18n.Toolkit.i18nText("Sche-Second"); + private static final String HOUR = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"); + private static final String MINUTE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"); + private static final String SECOND = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second"); private static String[] TYPES = new String[]{ com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"), - com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"), - com.fr.design.i18n.Toolkit.i18nText("Sche-Second") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second") }; private static Map VALUES = new HashMap(); @@ -69,9 +69,9 @@ public class TimeSwitchPane extends JPanel implements UIObserver { INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year")); INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month")); INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sun")); - INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Hour")); - INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Minute")); - INTS.put(ChartConstants.SECOND_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Second")); + INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour")); + INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute")); + INTS.put(ChartConstants.SECOND_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second")); } private UIButton addButton; @@ -340,4 +340,4 @@ public class TimeSwitchPane extends JPanel implements UIObserver { } } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java index 90c2ac043..5d5637ae8 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java @@ -58,7 +58,7 @@ public class ChartAxisLineStylePane extends BasicPane{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")),axisLineColor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),null}, new Component[]{null, mainTickPosition}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("SecondGraduationLine")),null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")),null}, new Component[]{null,secondTickPosition} } ; JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Style"},components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java index 381fe56dd..6a67a6662 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java @@ -18,7 +18,7 @@ public class ChartBeautyPane extends BasicBeanPane{ public ChartBeautyPane() { String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"), - com.fr.design.i18n.Toolkit.i18nText("TopDownShade"),com.fr.design.i18n.Toolkit.i18nText("Transparent") //新加的两种风格，注意兼容处理 + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Top_Down_Shade"),com.fr.design.i18n.Toolkit.i18nText("Transparent") //新加的两种风格，注意兼容处理 }; styleBox = new UIComboBox(nameArray); @@ -71,4 +71,4 @@ public class ChartBeautyPane extends BasicBeanPane{ protected String title4PopupWindow() { return ""; } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java index 2192d1a1a..0a3bb9eae 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java @@ -55,8 +55,8 @@ public class ChartFillStylePane extends BasicBeanPane{ JPanel buttonPane = new JPanel(); buttonPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - buttonPane.add(accButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Acc_Set"))); - buttonPane.add(gradientButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradient-Color"))); + buttonPane.add(accButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Acc_Set"))); + buttonPane.add(gradientButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Color"))); customPane.add(buttonPane, BorderLayout.NORTH); changeColorSetPane = new JPanel(cardLayout = new CardLayout()); @@ -228,4 +228,4 @@ public class ChartFillStylePane extends BasicBeanPane{ return condition; } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java index bbd0fe521..06c5b2f42 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java @@ -49,8 +49,8 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ private static String[] TYPES = new String[]{ com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"), - com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"), - com.fr.design.i18n.Toolkit.i18nText("Sche-Second") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second") }; private static Map VALUES = new HashMap(); @@ -58,9 +58,9 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Year"), ChartConstants.YEAR_TYPE); VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), ChartConstants.MONTH_TYPE); VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sun"), ChartConstants.DAY_TYPE); - VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), ChartConstants.HOUR_TYPE); - VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"), ChartConstants.MINUTE_TYPE); - VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sche-Second"), ChartConstants.SECOND_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour"), ChartConstants.HOUR_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute"), ChartConstants.MINUTE_TYPE); + VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second"), ChartConstants.SECOND_TYPE); } private static Map INTS = new HashMap(); @@ -68,9 +68,9 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year")); INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month")); INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sun")); - INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Hour")); - INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Minute")); - INTS.put(ChartConstants.SECOND_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Second")); + INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ScheHour")); + INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Minute")); + INTS.put(ChartConstants.SECOND_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sche_Second")); } // 最大最小值 @@ -362,4 +362,4 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ } return toDate; } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java index 77d229c67..740f1fc7d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java @@ -176,8 +176,8 @@ public class ChartValuePane extends ChartAxisUsePane{ // 返回对数相关界面. 百分比 没有此界面. protected JPanel addLogarithmicPane2ValuePane() { JPanel labelLogPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); - labelLogPane.add(logBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Logarithmic")+":")); - labelLogPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Log_Base"))); + labelLogPane.add(logBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Logarithmic")+":")); + labelLogPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Log_Base"))); logBaseField = new UITextField(4); logBaseField.setText("10"); @@ -226,7 +226,7 @@ public class ChartValuePane extends ChartAxisUsePane{ * @return 返回标题. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_F_Radar_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radar_Axis"); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java index ab7efa200..8885fcb87 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java @@ -57,7 +57,7 @@ public class ChartLegendPane extends BasicScrollPane{ borderPane = new ChartBorderPane(); String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Top"), com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Bottom"), - com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left"), com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right"), com.fr.design.i18n.Toolkit.i18nText("Right_Top")}; + com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Left"), com.fr.design.i18n.Toolkit.i18nText("StyleAlignment-Right"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Right_Top")}; Integer[] valueArray = {Constants.TOP, Constants.BOTTOM, Constants.LEFT, Constants.RIGHT, Constants.RIGHT_TOP}; Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartLegend/layout_top.png"), BaseUtils.readIcon("/com/fr/design/images/chart/ChartLegend/layout_bottom.png"), @@ -151,4 +151,4 @@ public class ChartLegendPane extends BasicScrollPane{ checkBoxUse(); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java index 2d859f547..a1d6687f6 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomSeriesPane.java @@ -46,7 +46,7 @@ public class CustomSeriesPane extends AbstractPlotSeriesPane { Component[][] components = new Component[][]{ new Component[]{stylePane}, new Component[]{new JSeparator()}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Series_Use_Default"))}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Use_Default"))}, new Component[]{defaultSeriesStyle}, new Component[]{new JSeparator()}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Add_Series_Setting"), SwingConstants.LEFT)}, @@ -108,4 +108,4 @@ public class CustomSeriesPane extends AbstractPlotSeriesPane { } } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java index 84fa6751b..ce89dfd24 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java @@ -43,7 +43,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { protected JPanel getContentInPlotType() { unit = new UITextField(); angleMax = new UINumberDragPane(0, 360); - String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Ge"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Unit_Hundred"), + String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Ge"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Unit_Hundred"), com.fr.design.i18n.Toolkit.i18nText("Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten_Thousand")}; order = new UIComboBox(orderUnit); colorPickerPane = createColorPickerPane(); @@ -73,7 +73,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { double[] columnSize = {p, f}; double[] rowSize = {p}; Component[][] tmpComponent = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Pointer-A-Tick-Order") + ":", SwingUtilities.LEFT), order} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pointer_A_Tick_Order") + ":", SwingUtilities.LEFT), order} }; JPanel orderPane = TableLayoutHelper.createTableLayoutPane(tmpComponent, rowSize, columnSize); Component[][] components = new Component[][]{ @@ -143,4 +143,4 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { } } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java index c2474606f..2ed319249 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java @@ -21,7 +21,7 @@ public class ChartEmptyDataStyleAction extends UpdateAction { public ChartEmptyDataStyleAction() { this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/EmptyChart.png")); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Empty_Data")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Empty_Data")); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java index 310455339..61f02f59b 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java @@ -83,7 +83,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { } }); - UILabel promptContent = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tip_Content")); + UILabel promptContent = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tip_Content")); JPanel northPane = GUICoreUtils.createFlowPane(new Component[]{promptContent, emptyData}, FlowLayout.LEFT, TEN, 0); northPane.setBorder(BorderFactory.createEmptyBorder(0, FIVE, 0, 0)); return northPane; @@ -210,7 +210,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Empty_Data"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Empty_Data"); } public void populateBean() { diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java b/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java index b306ae6a1..583a669ef 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartHyperlinkGroup.java @@ -32,11 +32,11 @@ public class ChartHyperlinkGroup extends BaseHyperlinkGroup { FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); NameableCreator[] realted4CharthyperUse = { - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Float_chart"), ChartHyperPoplink.class, ChartHyperPoplinkPane.ChartNoRename.class), - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Cell"), ChartHyperRelateCellLink.class, ChartHyperRelateCellLinkPane.ChartNoRename.class), - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Float"), ChartHyperRelateFloatLink.class, ChartHyperRelateFloatLinkPane.ChartNoRename.class), - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink-Form_link"), formHyperlink.getClass(), FormHyperlinkPane.class)}; + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float_Chart"), ChartHyperPoplink.class, ChartHyperPoplinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cell"), ChartHyperRelateCellLink.class, ChartHyperRelateCellLinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float"), ChartHyperRelateFloatLink.class, ChartHyperRelateFloatLinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyperlink_Form_Link"), formHyperlink.getClass(), FormHyperlinkPane.class)}; return (NameableCreator[]) ArrayUtils.addAll(super.getHyperlinkCreators(), realted4CharthyperUse); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java index a6353d36c..7f70df78b 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java @@ -53,8 +53,8 @@ public class ChartPreFillStylePane extends BasicBeanPane { JPanel buttonPane = new JPanel(); buttonPane.setLayout(new FlowLayout(FlowLayout.LEFT)); - buttonPane.add(accButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Acc_Set"))); - buttonPane.add(gradientButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradient-Color"))); + buttonPane.add(accButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Acc_Set"))); + buttonPane.add(gradientButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Color"))); customPane.add(buttonPane, BorderLayout.NORTH); changeColorSetPane = new JPanel(cardLayout = new CardLayout()); @@ -105,7 +105,7 @@ public class ChartPreFillStylePane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ServerM-Predefined_Styles"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ServerM_Predefined_Styles"); } public void populateBean(ChartColorMatching condition) { @@ -162,4 +162,4 @@ public class ChartPreFillStylePane extends BasicBeanPane { return chartColorMatching; } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java index e48936472..accdd576a 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleManagerPane.java @@ -34,7 +34,7 @@ public class ChartPreStyleManagerPane extends JListControlPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart-PreStyle"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PreStyle"); } public void populateBean() { @@ -70,4 +70,4 @@ public class ChartPreStyleManagerPane extends JListControlPane { } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java index 907311a3b..00a0d05b6 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStylePane.java @@ -103,7 +103,7 @@ public class ChartPreStylePane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("ServerM-Predefined_Styles"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ServerM_Predefined_Styles"); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java b/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java index 53b2402fd..473d55a40 100644 --- a/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java +++ b/designer-chart/src/main/java/com/fr/design/module/FormHyperlinkGroup.java @@ -28,10 +28,10 @@ public class FormHyperlinkGroup extends BaseHyperlinkGroup { public NameableCreator[] getHyperlinkCreators() { FormHyperlinkProvider formHyperlink = StableFactory.getMarkedInstanceObjectFromClass(FormHyperlinkProvider.XML_TAG, FormHyperlinkProvider.class); NameableCreator[] realted4CharthyperUse = { - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Float_chart"), ChartHyperPoplink.class, ChartHyperPoplinkPane.ChartNoRename.class), - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Cell"), ChartHyperRelateCellLink.class, ChartHyperRelateCellLinkPane.ChartNoRename.class), - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink-Form_link"), formHyperlink.getClass(), FormHyperlinkPane.class)}; + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Float_Chart"), ChartHyperPoplink.class, ChartHyperPoplinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cell"), ChartHyperRelateCellLink.class, ChartHyperRelateCellLinkPane.ChartNoRename.class), + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyperlink_Form_Link"), formHyperlink.getClass(), FormHyperlinkPane.class)}; return (NameableCreator[]) ArrayUtils.addAll(super.getHyperlinkCreators(), realted4CharthyperUse); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java index 97ca27469..fa7725853 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/radar/RadarTableContentPane.java @@ -54,8 +54,8 @@ public class RadarTableContentPane extends AbstractTableDataContentPane { Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Category") + ":", SwingConstants.RIGHT), categoryNameComboBox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Min_Value") + ":", SwingConstants.RIGHT), minValueComboBox}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Max_Value") + ":", SwingConstants.RIGHT), maxValueComboBox} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Value") + ":", SwingConstants.RIGHT), minValueComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Max_Value") + ":", SwingConstants.RIGHT), maxValueComboBox} }; return TableLayoutHelper.createTableLayoutPane(components, row, col); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java index 335332a70..58d122ff1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java @@ -118,7 +118,7 @@ public class VanChartAlertValuePane extends BasicBeanPane { Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertTextPosition}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),alertText}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")),fontName}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font")),fontName}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size")),fontSize}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),fontColor}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java index 9fa5b6499..0af05be11 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java @@ -96,7 +96,7 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane fontNameComboBox = new UIComboBox(Utils.getAvailableFontFamilyNames4Report()); defineFontSize = new UIButtonGroup(new String[]{AUTO_FONT_SIZE, CUSTOM_FONT_SIZE}); Component[][] northComps = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")), fontNameComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font")), fontNameComboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom")), defineFontSize } }; JPanel northPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(northComps,northR,northC); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java index 8b9bcb83e..7492f8cc8 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java @@ -10,9 +10,7 @@ import javax.swing.*; import com.fr.base.BaseUtils; import com.fr.design.designer.beans.actions.behavior.ComponentEnable; -import com.fr.design.designer.creator.XCreator; import com.fr.design.mainframe.FormDesigner; -import com.fr.design.mainframe.FormSelection; /** * @author richer @@ -23,7 +21,7 @@ public class FormDeleteAction extends FormWidgetEditAction { public FormDeleteAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("M_Edit-Delete")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete")); this.setMnemonic('D'); // Richie:删除菜单图标 this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/delete.png")); @@ -60,4 +58,4 @@ public class FormDeleteAction extends FormWidgetEditAction { return false; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveDownAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveDownAction.java index 047a18216..4663d3759 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveDownAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveDownAction.java @@ -10,8 +10,6 @@ import com.fr.design.mainframe.FormSelection; import javax.swing.*; -import java.awt.*; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -25,7 +23,7 @@ public class MoveDownAction extends FormWidgetEditAction { public MoveDownAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_Down")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Down")); this.setMnemonic('B'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/down.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER)); @@ -49,4 +47,4 @@ public class MoveDownAction extends FormWidgetEditAction { designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToBottomAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToBottomAction.java index 1f9141ca6..a5f76ee83 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToBottomAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToBottomAction.java @@ -10,7 +10,6 @@ import com.fr.design.mainframe.FormSelection; import javax.swing.*; -import java.awt.*; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; @@ -25,7 +24,7 @@ public class MoveToBottomAction extends FormWidgetEditAction { public MoveToBottomAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_To_Bottom")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_To_Bottom")); this.setMnemonic('K'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_bottom.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER + InputEvent.SHIFT_MASK)); @@ -55,4 +54,4 @@ public class MoveToBottomAction extends FormWidgetEditAction { designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToTopAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToTopAction.java index d3a0c09bf..05d42322c 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToTopAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveToTopAction.java @@ -10,7 +10,6 @@ import com.fr.design.mainframe.FormSelection; import javax.swing.*; -import java.awt.*; import java.awt.event.InputEvent; import java.awt.event.KeyEvent; @@ -25,7 +24,7 @@ public class MoveToTopAction extends FormWidgetEditAction { public MoveToTopAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_To_Top")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_To_Top")); this.setMnemonic('T'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_top.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER + InputEvent.SHIFT_MASK)); @@ -54,4 +53,4 @@ public class MoveToTopAction extends FormWidgetEditAction { designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveUpAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveUpAction.java index 0821f2324..81eae97f0 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveUpAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/MoveUpAction.java @@ -10,7 +10,6 @@ import com.fr.design.mainframe.FormSelection; import javax.swing.*; -import java.awt.*; import java.awt.event.KeyEvent; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -24,7 +23,7 @@ public class MoveUpAction extends FormWidgetEditAction { public MoveUpAction(FormDesigner t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Move_Up")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Up")); this.setMnemonic('F'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/up.png")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER)); @@ -49,4 +48,4 @@ public class MoveUpAction extends FormWidgetEditAction { designer.getEditListenerTable().fireCreatorModified(creator, DesignerEvent.CREATOR_SELECTED); return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java index 86777b91f..9dc8c5f0a 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java @@ -100,7 +100,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator { return new CRPropertyDescriptor[] { new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")), new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -332,4 +332,4 @@ public class XChartEditor extends XBorderStyleWidgetCreator { public boolean isSupportShared() { return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java index 54cdf6d30..ae47f6425 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java @@ -51,7 +51,7 @@ public class XCheckBoxGroup extends XFieldEditor { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Choose_Type_All")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Return-String")).setEditorClass(InChangeBooleanEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")).setEditorClass(InChangeBooleanEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }; if (((CheckBoxGroup) this.toData()).isReturnString()) { crp = (CRPropertyDescriptor[]) ArrayUtils.addAll(crp, new CRPropertyDescriptor[] { diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java b/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java index 0e30258c9..31efcd46a 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java @@ -32,13 +32,13 @@ public class XComboCheckBox extends XComboBox { com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnString", this.data.getClass()).setEditorClass( - InChangeBooleanEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Return-String")) + InChangeBooleanEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") } : new CRPropertyDescriptor[] { new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Return-String")).setEditorClass(InChangeBooleanEditor.class) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")).setEditorClass(InChangeBooleanEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")) @@ -52,4 +52,4 @@ public class XComboCheckBox extends XComboBox { protected String getIconName() { return "combo_check_16.png"; } -} \ No newline at end of file +} 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 9f8d794ee..9450b3e24 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 @@ -3,14 +3,6 @@ */ package com.fr.design.designer.creator; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.beans.IntrospectionException; -import java.util.Date; - -import javax.swing.JComponent; - import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; @@ -21,11 +13,17 @@ import com.fr.design.mainframe.widget.renderer.DateCellRenderer; import com.fr.form.ui.DateEditor; import com.fr.form.ui.WidgetValue; import com.fr.general.DateUtils; - import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; import com.fr.stable.core.PropertyChangeAdapter; +import javax.swing.JComponent; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.beans.IntrospectionException; +import java.util.Date; + /** * @author richer * @since 6.5.3 @@ -65,16 +63,16 @@ public class XDateEditor extends XDirectWriteEditor { 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, + com.fr.design.i18n.Toolkit.i18nText("FR-Design_Form_Start_Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(DateRangeEditor.class), new CRPropertyDescriptor("endDate", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_End-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_End_Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(DateRangeEditor.class), new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("returnDate", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Return-Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Return_Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java index 547eb02ce..af7a9ec10 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java @@ -81,7 +81,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme new CRPropertyDescriptor("widgetName", this.data.getClass()) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Name")), new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XFieldEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XFieldEditor.java index 3286358eb..8ef52455a 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XFieldEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XFieldEditor.java @@ -44,7 +44,7 @@ public abstract class XFieldEditor extends XWidgetCreator { 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")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced"); return !((FieldEditor) toData()).isAllowBlank() ? new CRPropertyDescriptor[]{allowBlank, blankErrorMsg, fontSize} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XIframeEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XIframeEditor.java index 06c56f70d..803871b9e 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XIframeEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XIframeEditor.java @@ -3,24 +3,22 @@ */ package com.fr.design.designer.creator; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.JComponent; -import javax.swing.JPanel; - -import com.fr.stable.core.PropertyChangeAdapter; +import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.itextfield.UITextField; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.widget.editors.ParameterEditor; import com.fr.design.mainframe.widget.renderer.ParameterRenderer; import com.fr.form.ui.IframeEditor; -import com.fr.design.form.util.XCreatorConstants; - import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; +import com.fr.stable.core.PropertyChangeAdapter; + +import javax.swing.JComponent; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.beans.IntrospectionException; /** * @author richer @@ -44,10 +42,10 @@ public class XIframeEditor extends XWidgetCreator { } }), new CRPropertyDescriptor("overflowx", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Preference-Horizontal_Scroll_Bar_Visible")).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Horizontal_Scroll_Bar_Visible")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("overflowy", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("Preference-Vertical_Scroll_Bar_Visible")).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Vertical_Scroll_Bar_Visible")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("parameters", this.data.getClass()) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Parameters")).setEditorClass(ParameterEditor.class) @@ -98,4 +96,4 @@ public class XIframeEditor extends XWidgetCreator { protected String getIconName() { return "iframe_16.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java b/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java index ccc8ce752..5c3795fd7 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java @@ -72,13 +72,13 @@ public class XLabel extends XWidgetCreator { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment-Wrap_Text")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("verticalCenter", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_PageSetup-Vertically")).putKeyValue( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Page_Setup_Vertically")).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("textalign", this.data.getClass()).setI18NName( 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")) + new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font")) .setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue( XCreatorConstants.PROPERTY_CATEGORY, "Advanced")}); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java b/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java index abf21f87a..b45a1a469 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java @@ -63,7 +63,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") @@ -75,7 +75,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme } }), new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout-Padding")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), }; } @@ -87,7 +87,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme * @throws IntrospectionException */ public CRPropertyDescriptor createWidgetNameDescriptor() throws IntrospectionException { - return new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")); + return new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")); } /** @@ -98,7 +98,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme */ public CRPropertyDescriptor createMarginDescriptor() throws IntrospectionException { return new CRPropertyDescriptor("margin", this.data.getClass()).setEditorClass(PaddingMarginEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout-Padding")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding_Duplicate")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java b/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java index b487c169d..c24cab9ab 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XMultiFileUploader.java @@ -37,7 +37,7 @@ public class XMultiFileUploader extends XFieldEditor { super.supportedDescriptor(), new CRPropertyDescriptor[]{ new CRPropertyDescriptor("singleFile", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("SINGLE_FILE_UPLOAD")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Single_File_Upload")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("accept", this.data.getClass()) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_File_Allow_Upload_Files")) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java index 19934f03b..1d6711414 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java @@ -62,11 +62,11 @@ public class XNumberEditor extends XWrapperedFieldEditor { .setEditorClass(InChangeBooleanEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), new CRPropertyDescriptor("minValue", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Min_Value")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Value")) .setEditorClass(SpinnerMinNumberEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), new CRPropertyDescriptor("maxValue", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Max_Value")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Max_Value")) .setEditorClass(SpinnerMaxNumberEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), new CRPropertyDescriptor("waterMark", this.data.getClass()) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java index 4149215e4..8dbbfa1e8 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeEditor.java @@ -48,7 +48,7 @@ public class XTreeEditor extends XWidgetCreator { 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")) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Verify_Message")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"), } : new CRPropertyDescriptor[]{ diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java index a3cc426cb..2699f0573 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java @@ -71,7 +71,7 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")), new CRPropertyDescriptor("borderStyle", this.data.getClass()).setEditorClass( WLayoutBorderStyleEditor.class).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Style")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java index 4b20fe5b9..da3ae8c52 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java @@ -446,7 +446,7 @@ public class XWAbsoluteLayout extends XLayoutContainer { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Widget_Name")) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form-Widget_Name")) }; } @@ -589,4 +589,4 @@ public class XWAbsoluteLayout extends XLayoutContainer { public boolean isSupportShared() { return true; } -} \ 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 cb6a078f3..667d6af3f 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 @@ -58,18 +58,18 @@ public class XWParameterLayout extends XWAbsoluteLayout { */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{ - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("FR-Designer_Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")), new CRPropertyDescriptor("background", this.data.getClass()).setEditorClass(BackgroundEditor.class) .setRendererClass(BackgroundRenderer.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Background")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("delayDisplayContent", this.data.getClass()).setEditorClass(BooleanEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DisplayNothingBeforeQuery")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("position", this.data.getClass()).setEditorClass(WidgetDisplayPosition.class) .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")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Use_Params_Template")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), }; diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java index 99ae2f721..166ff45af 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java @@ -39,7 +39,7 @@ public abstract class XWidgetCreator extends XCreator { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")), - new CRPropertyDescriptor("enabled", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Enabled")) + new CRPropertyDescriptor("enabled", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Enabled")) .setPropertyChangeListener(new PropertyChangeAdapter() { @Override @@ -48,7 +48,7 @@ public abstract class XWidgetCreator extends XCreator { } }), new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -56,7 +56,7 @@ public abstract class XWidgetCreator extends XCreator { } }), new CRPropertyDescriptor("labelName", this.data.getClass(), "getLabelName", "setLabelName") - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }; @@ -178,4 +178,4 @@ public abstract class XWidgetCreator extends XCreator { } } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardAddButton.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardAddButton.java index b3277945d..a25ca0504 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardAddButton.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardAddButton.java @@ -180,7 +180,7 @@ public class XCardAddButton extends XButton { //新增时去tabFitLayout名字中最大的Index+1，防止重名 private String getTabTitleName(WCardTagLayout layout){ int size = layout.getWidgetCount(); - String prefix = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Title"); + String prefix = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title"); String newTextName = prefix + size; for (int i = 0; i < size; i++) { @@ -199,4 +199,4 @@ public class XCardAddButton extends XButton { public XLayoutContainer getTopLayout() { return this.getBackupParent().getTopLayout(); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java index 29f96dea6..72d0669c8 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java @@ -220,8 +220,8 @@ public class XCardSwitchButton extends XButton { //删除card，同时修改其他switchbutton和tabfit的index private void deleteCard(XCardSwitchButton button, int index){ String titleName = button.getContentLabel().getText(); - int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ConfirmDialog_Content") + "“" + titleName + "”", - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ConfirmDialog_Title"), JOptionPane.YES_NO_OPTION); + int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ConfirmDialog_Title"), JOptionPane.YES_NO_OPTION); if (value != JOptionPane.OK_OPTION) { return; } @@ -362,8 +362,8 @@ public class XCardSwitchButton extends XButton { //删除tab布局 private void deleteTabLayout(SelectionModel selectionModel, FormDesigner designer){ String titleName = this.getContentLabel().getText(); - int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ConfirmDialog_Content") + "“" + titleName + "”", - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ConfirmDialog_Title"),JOptionPane.YES_NO_OPTION); + int value = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Confirm_Dialog_Content") + "“" + titleName + "”", + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ConfirmDialog_Title"),JOptionPane.YES_NO_OPTION); if (value != JOptionPane.OK_OPTION) { return; } @@ -498,4 +498,4 @@ public class XCardSwitchButton extends XButton { } } } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java index fee05c039..304ee91f0 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardLayout.java @@ -212,7 +212,7 @@ public class XWCardLayout extends XLayoutContainer { //第一个tab private XCardSwitchButton initFirstButton(String widgetName, XWCardTagLayout xTag) { CardSwitchButton firstBtn = new CardSwitchButton(widgetName); - firstBtn.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Title") + 0); + firstBtn.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title") + 0); xTag.setCurrentCard(firstBtn); XCardSwitchButton xFirstBtn = new XCardSwitchButton(firstBtn, new Dimension(CardSwitchButton.DEF_WIDTH, -1), this, xTag); xFirstBtn.setBackupParent(xTag); @@ -328,8 +328,8 @@ public class XWCardLayout extends XLayoutContainer { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("carousel", this.data.getClass()) .setEditorClass(BooleanEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_setCarousel")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel") + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Carousel")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Tab_Carousel") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -339,8 +339,8 @@ public class XWCardLayout extends XLayoutContainer { }), new CRPropertyDescriptor("carouselInterval", this.data.getClass()) .setEditorClass(DoubleEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_carouselInterval")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel") + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Carousel_Interval")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Tab_Carousel") }; } @@ -348,8 +348,8 @@ public class XWCardLayout extends XLayoutContainer { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("carousel", this.data.getClass()) .setEditorClass(BooleanEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_setCarousel")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Tab_carousel") + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Carousel")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Tab_Carousel") .setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { @@ -363,7 +363,7 @@ public class XWCardLayout extends XLayoutContainer { public CRPropertyDescriptor[] getDefaultDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName( - Toolkit.i18nText("FR-Designer_Form-Widget_Name")).setPropertyChangeListener(new PropertyChangeAdapter() { + Toolkit.i18nText("Fine-Design_Form-Widget_Name")).setPropertyChangeListener(new PropertyChangeAdapter() { @Override public void propertyChange() { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java index df54fd031..60d586b2c 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java @@ -1,20 +1,18 @@ package com.fr.design.designer.properties; -import java.awt.Rectangle; - -import javax.swing.*; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - - -import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; -import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XWAbsoluteLayout; +import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; +import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import com.fr.form.ui.container.WAbsoluteLayout; +import javax.swing.JOptionPane; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import java.awt.Rectangle; + /** * 绝对布局时候的属性组 */ @@ -63,9 +61,9 @@ public class BoundsGroupModel implements ConstraintsGroupModel { case 1: return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Y_Coordinate"); case 2: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Width"); default: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Height"); } } else { switch (row) { @@ -107,7 +105,7 @@ public class BoundsGroupModel implements ConstraintsGroupModel { break; case 3: if(v < MINHEIGHT){ - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Min_Height") + "21"); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Height") + "21"); v = component.getHeight(); } if (bounds.height == v){ @@ -136,4 +134,4 @@ public class BoundsGroupModel implements ConstraintsGroupModel { //这里不需要为自定义按钮屏蔽大小属性 return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutConstraints.java index 0359cd902..bef7c05fd 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/CardLayoutConstraints.java @@ -1,17 +1,16 @@ package com.fr.design.designer.properties; -import java.awt.Component; - -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.creator.XWidgetCreator; import com.fr.design.designer.creator.cardlayout.XWCardLayout; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WCardLayout; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import java.awt.Component; + public class CardLayoutConstraints implements ConstraintsGroupModel { @@ -31,7 +30,7 @@ public class CardLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout_Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Constraints"); } @Override @@ -52,7 +51,7 @@ public class CardLayoutConstraints implements ConstraintsGroupModel { @Override public Object getValue(int row, int column) { if (column == 0) { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout-Index"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Index"); } else { return layout.getWidgetIndex(widget) + 1; } @@ -83,4 +82,4 @@ public class CardLayoutConstraints implements ConstraintsGroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java b/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java index 2d2616587..46b802fe1 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/EventPropertyTable.java @@ -47,7 +47,7 @@ public class EventPropertyTable extends UIListControlPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Set_Callback_Function"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Callback_Function"); } @Override protected EmailPane initEmaiPane() { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java index 2aec61be2..53f5a7e94 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java @@ -38,7 +38,7 @@ public class FRAbsoluteLayoutPropertiesGroupModel implements GroupModel { */ @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormWidget_Area_Scaling"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Area_Scaling"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java index cb8c3e918..10fb7508a 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java @@ -1,27 +1,25 @@ package com.fr.design.designer.properties; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Container; -import java.lang.reflect.Method; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - - -import com.fr.stable.StringUtils; -import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; -import com.fr.design.mainframe.widget.editors.PropertyCellEditor; -import com.fr.design.mainframe.widget.editors.StringEditor; import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.creator.XWBorderLayout; import com.fr.design.designer.creator.XWidgetCreator; +import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; +import com.fr.design.mainframe.widget.editors.PropertyCellEditor; +import com.fr.design.mainframe.widget.editors.StringEditor; import com.fr.form.ui.FreeButton; import com.fr.form.ui.Widget; import com.fr.form.ui.container.WBorderLayout; +import com.fr.stable.StringUtils; + +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.lang.reflect.Method; +import java.util.logging.Level; +import java.util.logging.Logger; public class FRBorderLayoutConstraints implements ConstraintsGroupModel { @@ -47,7 +45,7 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Layout_Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Constraints_Duplicate"); } @Override @@ -128,9 +126,9 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { private String getSizeDisplayName() { Object obj = layout.getConstraints(widget); if (BorderLayout.NORTH.equals(obj) || BorderLayout.SOUTH.equals(obj)) { - return com.fr.design.i18n.Toolkit.i18nText("Tree-Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Height"); } else if (BorderLayout.WEST.equals(obj) || BorderLayout.EAST.equals(obj)) { - return com.fr.design.i18n.Toolkit.i18nText("Tree-Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"); } else { return StringUtils.EMPTY; } @@ -210,4 +208,4 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel { } return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java index 0713e1376..9d60be9dd 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutPropertiesGroupModel.java @@ -59,7 +59,7 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { */ @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout"); } @Override @@ -113,9 +113,9 @@ public class FRFitLayoutPropertiesGroupModel implements GroupModel { case 0: 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"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Scale"); default: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Component_Interval"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Interval"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRTabFitLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRTabFitLayoutPropertiesGroupModel.java index a0d445423..8111c15d6 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRTabFitLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRTabFitLayoutPropertiesGroupModel.java @@ -3,10 +3,6 @@ */ package com.fr.design.designer.properties; -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - import com.fr.design.designer.creator.cardlayout.XWCardLayout; import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout; import com.fr.design.designer.creator.cardlayout.XWTabFitLayout; @@ -19,6 +15,10 @@ import com.fr.form.ui.container.cardlayout.WCardTagLayout; import com.fr.form.ui.container.cardlayout.WCardTitleLayout; import com.fr.form.ui.container.cardlayout.WTabFitLayout; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; + /** * tab布局tabFit属性表 @@ -51,7 +51,7 @@ public class FRTabFitLayoutPropertiesGroupModel extends FRFitLayoutPropertiesGro */ @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Current_tab"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Current_Tab"); } @Override @@ -79,7 +79,7 @@ public class FRTabFitLayoutPropertiesGroupModel extends FRFitLayoutPropertiesGro if (column == PROPERTY_NAME_COLUMN) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Component_Interval"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Interval"); default : return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Tab_Layout_Title"); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java b/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java index 7b5c928f3..a078ca905 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java @@ -32,8 +32,8 @@ import com.fr.general.ComparatorUtils; public class FormWidgetAuthorityEditPane extends AuthorityEditPane { private FormDesigner designer; private Widget[] widgets = null; - private UICheckBox widgetVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Visible")); - private UICheckBox widgetAvailable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Enabled")); + private UICheckBox widgetVisible = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Visible")); + private UICheckBox widgetAvailable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Enabled")); private ItemListener visibleItemListener = new ItemListener() { public void itemStateChanged(ItemEvent e) { String selectedRoles = ReportAndFSManagePane.getInstance().getRoleTree().getSelectedRoleName(); diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/HVLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/HVLayoutConstraints.java index bef5811c7..b6eb65e1f 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/HVLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/HVLayoutConstraints.java @@ -33,7 +33,7 @@ public abstract class HVLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Layout_Constraints"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Constraints_Duplicate"); } @Override @@ -62,4 +62,4 @@ public abstract class HVLayoutConstraints implements ConstraintsGroupModel { } return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutConstraints.java index b9be5326e..feaf0c0bf 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutConstraints.java @@ -3,13 +3,12 @@ */ package com.fr.design.designer.properties; -import java.awt.Component; - - import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWHorizontalBoxLayout; import com.fr.form.ui.container.WHorizontalBoxLayout; +import java.awt.Component; + /** * @author richer * @since 6.5.3 @@ -28,9 +27,9 @@ public class HorizontalLayoutConstraints extends HVLayoutConstraints{ if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("Layout-Index"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Layout_Index"); default: - return com.fr.design.i18n.Toolkit.i18nText("Tree-Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"); } } else { switch (row) { @@ -60,4 +59,4 @@ public class HorizontalLayoutConstraints extends HVLayoutConstraints{ } return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java index c2a20d6c8..f6ffe962e 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalLayoutPropertiesGroupModel.java @@ -37,7 +37,7 @@ public class HorizontalLayoutPropertiesGroupModel implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Layout-HBox"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Horizontal_Box"); } @Override @@ -124,4 +124,4 @@ public class HorizontalLayoutPropertiesGroupModel implements GroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalSplitProperties.java b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalSplitProperties.java index 9666f348d..8526c1905 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalSplitProperties.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/HorizontalSplitProperties.java @@ -10,6 +10,6 @@ public class HorizontalSplitProperties extends VerticalSplitProperties { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Horizontal-Split_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Horizontal_Split_Layout"); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java index b9ae47ebf..193fca4dc 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java @@ -1,17 +1,15 @@ package com.fr.design.designer.properties; -import java.awt.Rectangle; - -import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableCellRenderer; - - +import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormSelection; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; -import com.fr.design.designer.beans.ConstraintsGroupModel; + +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellEditor; +import javax.swing.table.TableCellRenderer; +import java.awt.Rectangle; /** * 多个组件时候的属性组 @@ -58,9 +56,9 @@ public class MultiSelectionBoundsModel implements ConstraintsGroupModel { case 1: return com.fr.design.i18n.Toolkit.i18nText("Y-Coordinate"); case 2: - return com.fr.design.i18n.Toolkit.i18nText("Tree-Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"); default: - return com.fr.design.i18n.Toolkit.i18nText("Tree-Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Height"); } } else { Rectangle rec = designer.getSelectionModel().getSelection().getSelctionBounds(); @@ -118,4 +116,4 @@ public class MultiSelectionBoundsModel implements ConstraintsGroupModel { return false; } } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalLayoutConstraints.java index 15e26438a..771fbbecb 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalLayoutConstraints.java @@ -3,13 +3,12 @@ */ package com.fr.design.designer.properties; -import java.awt.Component; - - import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWVerticalBoxLayout; import com.fr.form.ui.container.WVerticalBoxLayout; +import java.awt.Component; + /** * @author richer * @since 6.5.3 @@ -28,9 +27,9 @@ public class VerticalLayoutConstraints extends HVLayoutConstraints { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("Layout-Index"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Layout_Index"); default: - return com.fr.design.i18n.Toolkit.i18nText("Tree-Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Height"); } } else { switch (row) { @@ -60,4 +59,4 @@ public class VerticalLayoutConstraints extends HVLayoutConstraints { } return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRAbsoluteConstraintsItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRAbsoluteConstraintsItems.java index 9a4ebd529..19a6454b4 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/FRAbsoluteConstraintsItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/FRAbsoluteConstraintsItems.java @@ -9,11 +9,11 @@ import com.fr.form.ui.container.WAbsoluteLayout; public class FRAbsoluteConstraintsItems implements ItemProvider{ public static final Item[] ITEMS = new Item[] { - new Item(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Scaling_Mode_Fit"), WAbsoluteLayout.STATE_FIT), - new Item(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Scaling_Mode_Fixed"), WAbsoluteLayout.STATE_FIXED) + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fit"), WAbsoluteLayout.STATE_FIT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode_Fixed"), WAbsoluteLayout.STATE_FIXED) }; public Item[] getItems() { return ITEMS; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java index 7e1b8feab..3cfc0db69 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java @@ -53,7 +53,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable { FRContext.getLogger().error(e.getMessage()); } - groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Properties_Mobile"), xCreator, propertyTableEditor, designer))); + groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Properties_Mobile"), xCreator, propertyTableEditor, designer))); setModel(new BeanTableModel()); this.repaint(); diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java index f591c639b..5175b30dc 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java @@ -36,6 +36,6 @@ public class BodyMobilePropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ChartEditorPropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ChartEditorPropertyUI.java index ed1a6ebc2..e773fb038 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ChartEditorPropertyUI.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ChartEditorPropertyUI.java @@ -31,6 +31,6 @@ public class ChartEditorPropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java index 0038bc147..3f30ae2fd 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java @@ -49,16 +49,16 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ CRPropertyDescriptor[] propertyTableEditor = { new CRPropertyDescriptor("horziontalAttr", this.xCreator.toData().getClass()).setEditorClass(MobileFitEditor.class) .setRendererClass(MobileFitRender.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Horizontal")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit")), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Horizontal")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")), new CRPropertyDescriptor("verticalAttr", this.xCreator.toData().getClass()).setEditorClass(MobileFitEditor.class) .setRendererClass(MobileFitRender.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Vertical")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit")), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Vertical")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")), new CRPropertyDescriptor("heightRestrict", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-EC_heightrestrict")) .setRendererClass(BooleanRender.class) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")) }; List defaultList = new ArrayList<>(); @@ -96,7 +96,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{ } - groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit"), xCreator, propertyTableEditor, designer))); + groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit"), xCreator, propertyTableEditor, designer))); TableModel model = new BeanTableModel(); setModel(model); diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java index fa6cff395..c4b3bf33c 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyUI.java @@ -31,6 +31,6 @@ public class ElementCasePropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MultiFileUploaderPropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MultiFileUploaderPropertyUI.java index f81f8e127..f05a8e478 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MultiFileUploaderPropertyUI.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/MultiFileUploaderPropertyUI.java @@ -31,6 +31,6 @@ public class MultiFileUploaderPropertyUI extends AbstractWidgetPropertyUIProvide @Override public String tableTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ParaMobilePropertyUI.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ParaMobilePropertyUI.java index 119ea6952..11a69e502 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ParaMobilePropertyUI.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/ParaMobilePropertyUI.java @@ -31,6 +31,6 @@ public class ParaMobilePropertyUI extends AbstractWidgetPropertyUIProvider { @Override public String tableTitle() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileAttrPane.java b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileAttrPane.java index 384a080b0..297e85469 100644 --- a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileAttrPane.java +++ b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileAttrPane.java @@ -63,6 +63,6 @@ public class FormMobileAttrPane extends BasicBeanPane{ @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr"); } } diff --git a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java index a0f843f79..21f6d3b09 100644 --- a/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java +++ b/designer-form/src/main/java/com/fr/design/form/mobile/FormMobileTemplateSettingsPane.java @@ -41,7 +41,7 @@ public class FormMobileTemplateSettingsPane extends BasicBeanPane { UILabel uiLabel = new UILabel("html5"); uiLabel.setBorder(BorderFactory.createEmptyBorder(5, 15, 10, 15)); - this.refreshCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Refresh")); + this.refreshCheckPane = new MobileRadioCheckPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Refresh")); toobarsPane.add(uiLabel, BorderLayout.WEST); toobarsPane.add(refreshCheckPane, BorderLayout.EAST); @@ -58,7 +58,7 @@ public class MobileToolBarPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-ToolBar"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_ToolBar"); } } diff --git a/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java b/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java index 94a21d192..4bb0c2d28 100644 --- a/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java +++ b/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java @@ -1,7 +1,5 @@ package com.fr.design.gui.core; -import javax.swing.Icon; - import com.fr.base.BaseUtils; import com.fr.design.i18n.Toolkit; import com.fr.form.ui.ElementCaseEditor; @@ -14,6 +12,8 @@ import com.fr.form.ui.container.WHorizontalBoxLayout; import com.fr.form.ui.container.WParameterLayout; import com.fr.form.ui.container.WVerticalBoxLayout; +import javax.swing.Icon; + /** * Author : Shockway @@ -74,28 +74,28 @@ public class FormWidgetOption extends WidgetOption { return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER}; } - public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/layout_absolute_new.png"), + public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Absolute"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/layout_absolute_new.png"), WAbsoluteLayout.class); - public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_BorderLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), + public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Report_Border_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"), WBorderLayout.class); - public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16.png"), + public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Tab"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16.png"), WCardLayout.class); - public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Layout-HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), + public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"), WHorizontalBoxLayout.class); - public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), + public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Vertical_Box_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); - public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Para-Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), + public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Parameter_Body"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter.png"), WParameterLayout.class); - public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/report_16.png"), + public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Report"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/report_16.png"), ElementCaseEditor.class); } diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java index 1263c3793..a70431700 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java @@ -463,7 +463,7 @@ public class LayoutBorderPane extends BasicPane { BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),}; Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); - hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormStyleAlignment_Left") + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Left") , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")}); JPanel hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); hPaneContainer.add(hAlignmentPane); diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java index 89a3c9adb..3d649f3b9 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPreviewPane.java @@ -160,12 +160,12 @@ public class LayoutBorderPreviewPane extends JPanel{ private void drawTabBack(Graphics2D g2d, Graphics g, WidgetTitle title, FontMetrics fm, int startX1, int startY){ Dimension d = getSize(); - String paintText = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Title")+TAB_ZERO; + String paintText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title")+TAB_ZERO; Background rightBack = ColorBackground.getInstance(XCardSwitchButton.CHOOSED_GRAL); Shape right = new Double(this.getWidth()/2, 0, this.getWidth()/2, this.getHeight()); rightBack.paint(g, right); - String rightLabel = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Title")+TAB_ONE; + String rightLabel = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title")+TAB_ONE; GraphHelper.drawString(g2d, rightLabel, (d.width/2 - fm.stringWidth(paintText)) / 2+d.width/2, startY); Background background = title.getBackground(); if (background != null) { @@ -181,4 +181,4 @@ public class LayoutBorderPreviewPane extends JPanel{ } } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java b/designer-form/src/main/java/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java index 9d80e2119..9022f05d1 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java @@ -35,7 +35,7 @@ public class ReportAppPropertyGroupModel extends PropertyGroupModel { if (state > MAX_HEIGHT) { //弹窗提示 JOptionPane.showMessageDialog(null, - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Mobile_Warning"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.PLAIN_MESSAGE); return false; @@ -56,4 +56,4 @@ public class ReportAppPropertyGroupModel extends PropertyGroupModel { private Object dealCreatorData() { return creator.getPropertyDescriptorCreator().toData(); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java b/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java index 11fb8a13e..3c03ba38d 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/EditingMouseListener.java @@ -105,7 +105,7 @@ public class EditingMouseListener extends MouseInputAdapter { this.designer = designer; stateModel = designer.getStateModel(); selectionModel = designer.getSelectionModel(); - UIButton promptButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Forbid_Drag_into_Adapt_Pane"), BaseUtils.readIcon(IconPathConstants.FORBID_ICON_PATH)); + UIButton promptButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Forbid_Drag_Into_Adapt_Pane"), BaseUtils.readIcon(IconPathConstants.FORBID_ICON_PATH)); this.promptWindow.add(promptButton); } @@ -662,4 +662,4 @@ public class EditingMouseListener extends MouseInputAdapter { } currentEditor.getEditorTarget().setBounds(bounds); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java index 75f1f253e..762b412f1 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormArea.java @@ -7,8 +7,6 @@ import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWBorderLayout; import com.fr.design.designer.creator.XWFitLayout; -import com.fr.design.event.TargetModifiedEvent; -import com.fr.design.event.TargetModifiedListener; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UIBasicSpinner; @@ -156,7 +154,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent { slidePane = JFormSliderPane.getInstance(); slidePane.setPreferredSize(new Dimension(200, 20)); - JPanel resizePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{ tipsPane, new UILabel(), widthPane, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel")), new UILabel("x"), heightPane, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel")), new UILabel(), slidePane }}, rowSize, columnSize, RESIZE_PANE_GAP); + JPanel resizePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{ tipsPane, new UILabel(), widthPane, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel")), new UILabel("x"), heightPane, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel")), new UILabel(), slidePane }}, rowSize, columnSize, RESIZE_PANE_GAP); this.add(FormRulerLayout.BOTTOM, resizePane); setWidgetsConfig(); // 先初始话滑块及对应事件，然后获取分辨率调整容器的显示大小 @@ -834,4 +832,4 @@ public class FormArea extends JComponent implements ScrollRulerComponent { } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java b/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java index 6c9504e78..0e8e77ed7 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java @@ -184,10 +184,10 @@ public class FormCreatorDropTarget extends DropTarget { private void promptUser(int x, int y, XLayoutContainer container) { if (!addingModel.getXCreator().canEnterIntoParaPane() && container.acceptType(XWParameterLayout.class)) { - promptButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Forbid_Drag_into_Para_Pane")); + promptButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Forbid_Drag_Into_Para_Pane")); promptWidgetForbidEnter(x, y, container); } else if (!addingModel.getXCreator().canEnterIntoAdaptPane() && container.acceptType(XWFitLayout.class)) { - promptButton.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Forbid_Drag_into_Adapt_Pane")); + promptButton.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Forbid_Drag_Into_Adapt_Pane")); promptWidgetForbidEnter(x, y, container); } else { cancelPromptWidgetForbidEnter(); @@ -258,4 +258,4 @@ public class FormCreatorDropTarget extends DropTarget { //针对在表单中拖入一个控件直接ctrl+s无反应 designer.requestFocus(); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java index 7e81735a4..617bfb4bc 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java @@ -69,7 +69,7 @@ import java.util.List; */ public class FormDesigner extends TargetComponent
implements TreeSelectionListener, InvocationHandler, BaseFormDesigner, ParaDefinitePane { protected static final ArrayList NAME_ARRAY_LIST = new ArrayList( - Arrays.asList(new String[]{com.fr.design.i18n.Toolkit.i18nText("M_Edit-Cut"), com.fr.design.i18n.Toolkit.i18nText("M_Edit-Copy"), com.fr.design.i18n.Toolkit.i18nText("M_Edit-Delete")}) + Arrays.asList(new String[]{com.fr.design.i18n.Toolkit.i18nText("M_Edit-Cut"), com.fr.design.i18n.Toolkit.i18nText("M_Edit-Copy"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete")}) ); //底层容器的默认大小 protected static final Dimension LARGE_PREFERRED_SIZE = new Dimension(WBorderLayout.DEFAULT_WIDTH, WBorderLayout.DEFAULT_HEIGHT); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java index 64caf8365..9ddee0b5c 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesignerUI.java @@ -1,6 +1,5 @@ package com.fr.design.mainframe; -import com.fr.base.BaseUtils; import com.fr.base.GraphHelper; import com.fr.base.ScreenResolution; import com.fr.base.Utils; @@ -169,7 +168,7 @@ public class FormDesignerUI extends ComponentUI { x1 = x2 = bounds.x - designer.getArea().getHorizontalValue() + (k == 3 ? 0 : bounds.width); text = Utils.objectToString(x1 + designer.getArea().getHorizontalValue()); } - text += com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel"); + text += com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel"); g2d.setColor(XCreatorConstants.RESIZE_BOX_BORDER_COLOR); GraphHelper.drawString(g2d, text, x1 + 3, y1 + 10); GraphHelper.drawLine(g2d, x1, y1, x2, y2); @@ -431,4 +430,4 @@ public class FormDesignerUI extends ComponentUI { ComponentUtils.resetBuffer(dbcomponents); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java index cdb55d6aa..0b0491392 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java @@ -321,8 +321,8 @@ public class FormEditToolBar extends BasicPane { public void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel north = FRGUIPaneFactory.createBorderLayout_S_Pane(); - icon = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Show_Icon")); - text = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Show_Text")); + icon = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Icon")); + text = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Show_Text")); north.add(icon, BorderLayout.NORTH); north.add(text, BorderLayout.CENTER); @@ -359,7 +359,7 @@ public class FormEditToolBar extends BasicPane { private JPanel getCustomPane() { JPanel customPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); - button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_User_Defined_Event")); + button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_User_Defined_Event")); customPane.add(button); customPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit") + "JS", null)); button.addActionListener(l); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java index e5711c1d4..ce30acd48 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java @@ -203,7 +203,7 @@ public class FormParaWidgetPane extends JPanel { layoutPane.add(new ToolBarButton(option)); } layoutPane.add(new ToolBarButton(FormWidgetOption.ELEMENTCASE)); - add(createNormalCombinationPane(layoutPane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Layout_Block_Blank"))); + add(createNormalCombinationPane(layoutPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Block_Blank"))); jSeparatorLayout = createJSeparator(); add(jSeparatorLayout); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java b/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java index 517be698b..9a6a5d546 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java @@ -105,7 +105,7 @@ public class FormSelectionUtils { x + creator.getX() - rec.x + copiedCreator.getWidth() / 2, y + creator.getY() - rec.y + copiedCreator.getHeight() / 2); if (!adapter.accept(copiedCreator, point.x, point.y)) { - designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Too_Large_To_Paste")); + designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Too_Large_To_Paste")); return; } resetTabSub2RealSize(copiedCreator); @@ -185,12 +185,12 @@ public class FormSelectionUtils { XCreator copiedXCreator = XCreatorUtils.createXCreator(copied, creator.getSize()); if (adapter.getClass().equals(FRTabFitLayoutAdapter.class)) { if (!adapter.accept(copiedXCreator, x - tabContainerRect.x, y - tabContainerRect.y)) { - designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Too_Small_To_Paste")); + designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Too_Small_To_Paste")); return; } } else { if (!adapter.accept(copiedXCreator, x, y)) { - designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Too_Small_To_Paste")); + designer.showMessageDialog(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Too_Small_To_Paste")); return; } } @@ -308,4 +308,4 @@ public class FormSelectionUtils { } } } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormSettingToolBar.java b/designer-form/src/main/java/com/fr/design/mainframe/FormSettingToolBar.java index a8bfa05ea..e3a5db6cd 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormSettingToolBar.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormSettingToolBar.java @@ -29,10 +29,10 @@ public class FormSettingToolBar extends JPanel { this.add(new UILabel(name)); this.toolBarPane = toolBarPane; setButton = GUICoreUtils.createTransparentButton(setIcon, setIcon, setIcon); - setButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit_Button_ToolBar")); + setButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Edit_Button_ToolBar")); setButton.setAction(new SetAction()); delButton = GUICoreUtils.createTransparentButton(delIcon, delIcon, delIcon); - delButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove_Button_ToolBar")); + delButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Remove_Button_ToolBar")); delButton.setAction(new DelAction()); this.add(setButton); this.add(delButton); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java index ca9bc315b..ee71e9d96 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -141,7 +141,7 @@ public class FormWidgetDetailPane extends FormDockView{ // menutPanel.setPreferredSize(new Dimension(240, 48)); menutPanelNorthPane = new JPanel(new BorderLayout()); - menutPanelNorthPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LocalWidget"), + menutPanelNorthPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Local_Widget"), SwingConstants.HORIZONTAL), BorderLayout.WEST); menutPanelNorthPane.add(initEditButtonPane(), BorderLayout.EAST); menutPanelNorthPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 5, 0)); @@ -174,7 +174,7 @@ public class FormWidgetDetailPane extends FormDockView{ */ private JPanel initResetButtonPane() { resetPanel = new JPanel(); - resetButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Reset")); + resetButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Reset")); resetPanel.setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2)); resetButton.setBackground(Color.white); resetButton.setForeground(new Color(0x333334)); @@ -187,7 +187,7 @@ public class FormWidgetDetailPane extends FormDockView{ } }); - deleteButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Remove_Item")); + deleteButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Remove_Item")); deleteButton.setBackground(Color.white); deleteButton.setForeground(new Color(0xeb1d1f)); deleteButton.addActionListener(new ActionListener() { @@ -294,7 +294,7 @@ public class FormWidgetDetailPane extends FormDockView{ UIButton downloadButton = new UIButton(); downloadButton.setIcon(BaseUtils.readIcon("/com/fr/design/form/images/download icon.png")); downloadButton.set4ToolbarButton(); - downloadButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Download_Template")); + downloadButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Download_Template")); downloadButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -325,7 +325,7 @@ public class FormWidgetDetailPane extends FormDockView{ private UIButton createInstallButton() { return createToolButton( BaseUtils.readIcon("/com/fr/design/form/images/install icon.png"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Install_Template"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Install_Template"), new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -348,7 +348,7 @@ public class FormWidgetDetailPane extends FormDockView{ private UIButton createDeleteButton() { return createToolButton( BaseUtils.readIcon("/com/fr/design/form/images/delete icon.png"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Delete_Template"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delete_Template"), new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java index 960f5cf6f..36bd3f32f 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java @@ -693,7 +693,7 @@ public class JForm extends JTemplate implements BaseJForm { * @return 菜单 */ public UIMenuItem[] createMenuItem4Preview() { - UIMenuItem form = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("M-Form_Preview"), UIConstants.RUN_SMALL_ICON); + UIMenuItem form = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Form_Preview"), UIConstants.RUN_SMALL_ICON); form.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java index 5a5124f60..0189dbceb 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java @@ -1,38 +1,36 @@ package com.fr.design.mainframe; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; -import java.awt.Font; -import java.awt.Graphics; -import java.awt.GridLayout; -import java.awt.Image; -import java.awt.Insets; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; - -import javax.swing.BorderFactory; -import javax.swing.JFrame; -import com.fr.design.gui.ilable.*; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JToolTip; - import com.fr.base.BaseUtils; -import com.fr.design.layout.TableLayoutHelper; - -import com.fr.stable.Constants; import com.fr.base.GraphHelper; +import com.fr.design.dialog.BasicDialog; +import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itooltip.MultiLineToolTip; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; -import com.fr.design.dialog.BasicDialog; -import com.fr.design.dialog.BasicPane; +import com.fr.design.layout.TableLayoutHelper; import com.fr.form.ui.container.WAbsoluteLayout; import com.fr.form.ui.container.WBorderLayout; import com.fr.form.ui.container.WCardLayout; import com.fr.form.ui.container.WGridLayout; import com.fr.form.ui.container.WLayout; +import com.fr.stable.Constants; + +import javax.swing.BorderFactory; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JToolTip; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.GridLayout; +import java.awt.Image; +import java.awt.Insets; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; public class WLayoutSelectionPane extends BasicPane { @@ -47,7 +45,7 @@ public class WLayoutSelectionPane extends BasicPane { Component[][] coms = { {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("BorderLayout")), new BorderLayoutPane()}, - {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("GridLayout")), new GridLayoutPane()}, + {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Grid_Layout")), new GridLayoutPane()}, {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("CardLayout")), new CardLayoutPane()}, {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Form-NullLayout")), new AbsoluteLayoutPane()}}; double p = TableLayout.PREFERRED; @@ -115,7 +113,7 @@ public class WLayoutSelectionPane extends BasicPane { @Override protected String title4PopupWindow() { - return "GridLayout"; + return "Fine-Design_Form_Grid_Layout"; } } @@ -249,4 +247,4 @@ public class WLayoutSelectionPane extends BasicPane { f.setSize(300, 200); f.setVisible(true); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java index ef3a5d018..1951926f3 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java @@ -218,13 +218,13 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope private void initTabPane() { final String[] tabTitles = new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Properties"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Properties"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event"), 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(formWidgetCardPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Properties")); center.add(eventTable, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event")); center.add(wsp, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal")); this.add(center, BorderLayout.CENTER); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java b/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java index 300b762f0..7ddb8ae8d 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/actions/EmbeddedFormExportExportAction.java @@ -19,7 +19,6 @@ import com.fr.form.main.Form; import com.fr.form.main.FormEmbeddedTableDataExporter; import com.fr.log.FineLoggerFactory; -import com.fr.log.FineLoggerFactory; import com.fr.stable.ArrayUtils; import com.fr.stable.project.ProjectConstants; @@ -86,10 +85,10 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ FineLoggerFactory.getLogger().error("Error In Make New File"); } fileChooserPane = null; - FRContext.getLogger().info("\"" + file.getName() + "\"" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Prepare_Export") + "!"); + FRContext.getLogger().info("\"" + file.getName() + "\"" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Prepare_Export") + "!"); (progressbar = new FRProgressBar(createExportWork(file, tpl, parameterMap), designerFrame, - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Exporting"), "", 0, 100)).start(); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exporting"), "", 0, 100)).start(); } private boolean isOk(int saveValue){ @@ -115,7 +114,7 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ } protected ChooseFileFilter getChooseFileFilter() { - return new ChooseFileFilter(new String[]{"frm"}, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form_EmbeddedTD")); + return new ChooseFileFilter(new String[]{"frm"}, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EmbeddedTD")); } private SwingWorker createExportWork(FILE file, final Form tpl, final Map parameterMap) { @@ -135,13 +134,13 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ fileOutputStream.close(); this.setProgress(100); - FRContext.getLogger().info("\"" + fileGetName + "\"" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Finish_Export") + "!"); + FRContext.getLogger().info("\"" + fileGetName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finish_Export") + "!"); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Exported_successfully") + "\n" + fileGetName); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exported_Successfully") + "\n" + fileGetName); } catch (Exception exp) { this.setProgress(100); FineLoggerFactory.getLogger().error(exp.getMessage(), exp); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export_failed") + "\n" + filePath); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Failed") + "\n" + filePath); } return null; } @@ -153,4 +152,4 @@ public class EmbeddedFormExportExportAction extends JTemplateAction{ return exportWorker; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/actions/FormMobileAttrAction.java b/designer-form/src/main/java/com/fr/design/mainframe/actions/FormMobileAttrAction.java index 7a68a04a5..255793e04 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/actions/FormMobileAttrAction.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/actions/FormMobileAttrAction.java @@ -82,7 +82,7 @@ public class FormMobileAttrAction extends JTemplateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Attr"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/actions/NewFormAction.java b/designer-form/src/main/java/com/fr/design/mainframe/actions/NewFormAction.java index 13cd907d8..9c9f7fec4 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/actions/NewFormAction.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/actions/NewFormAction.java @@ -44,7 +44,7 @@ public class NewFormAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M-New_FormBook"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_FormBook"); } @Override @@ -52,4 +52,4 @@ public class NewFormAction extends UpdateAction { return KeyStroke.getKeyStroke(KeyEvent.VK_F, DEFAULT_MODIFIER); } }; -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java index f1123a140..de9bbd953 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java @@ -23,7 +23,7 @@ public class ColorPalette extends JPopupMenu { private Border BLACK_BORDER = BorderFactory.createLineBorder(new Color(127, 157, 185)); private Object[] colors = new Object[]{new Object[]{com.fr.design.i18n.Toolkit.i18nText("Black"), new Color(0, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Crimson"), new Color(128, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Red"), new Color(255, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Pink"), new Color(255, 0, 255)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown"), new Color(153, 51, 0)}, - new Object[]{com.fr.design.i18n.Toolkit.i18nText("Orange"), new Color(255, 102, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Light_Orange"), new Color(255, 153, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Golden"), new Color(255, 204, 0)}, + new Object[]{com.fr.design.i18n.Toolkit.i18nText("Orange"), new Color(255, 102, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Light_Orange"), new Color(255, 153, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Golden"), new Color(255, 204, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown_Orange"), new Color(255, 204, 153)}, new Object[]{"", new Color(51, 51, 0)}, new Object[]{"", new Color(128, 128, 0)}, new Object[]{"", new Color(153, 204, 0)}, new Object[]{"", new Color(255, 255, 0)}, new Object[]{"", new Color(255, 255, 153)}, new Object[]{"", new Color(0, 51, 0)}, new Object[]{"", new Color(0, 128, 0)}, new Object[]{"", new Color(51, 153, 102)}, new Object[]{"", new Color(172, 168, 153)}, new Object[]{"", new Color(204, 255, 204)}, new Object[]{"", new Color(0, 51, 102)}, @@ -130,4 +130,4 @@ public class ColorPalette extends JPopupMenu { } } } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java index a8e901b0b..4288d47ca 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ElementCaseToolBarPane.java @@ -39,7 +39,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane private int row = 6; private DefaultTableModel toolbarButtonTableModel; private JTable layoutTable; - private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Use_ToolBar") + ":"); // 是否使用工具栏 + private UICheckBox isUseToolBarCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_ToolBar") + ":"); // 是否使用工具栏 private FormToolBarPane northToolBar; private FormToolBarPane southToolBar; @@ -50,7 +50,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane toolbarButtonTableModel = new TableModel(row ,COLUMN); this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel north = FRGUIPaneFactory.createBorderLayout_S_Pane(); - UIButton defaultButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Restore_Default")); + UIButton defaultButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Restore_Default")); // 恢复默认按钮 defaultButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -98,7 +98,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane northToolBar.validate(); northToolBar.repaint(); } else { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChooseOneButton")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Choose_One_Button")); } } }); @@ -123,7 +123,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane southToolBar.validate(); southToolBar.repaint(); } else { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChooseOneButton")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Choose_One_Button")); } } }); @@ -144,13 +144,13 @@ public class ElementCaseToolBarPane extends BasicBeanPane southToolBar.setBackground(Color.lightGray); JPanel movePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel northContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - FormSettingToolBar top = new FormSettingToolBar(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ToolBar_Top"), northToolBar); + FormSettingToolBar top = new FormSettingToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ToolBar_Top"), northToolBar); northContentPane.add(top, BorderLayout.EAST); northContentPane.add(northToolBar, BorderLayout.CENTER); northContentPane.setBackground(Color.lightGray); JPanel southContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - FormSettingToolBar bottom = new FormSettingToolBar(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ToolBar_Bottom"), southToolBar); + FormSettingToolBar bottom = new FormSettingToolBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ToolBar_Bottom"), southToolBar); southContentPane.add(bottom, BorderLayout.EAST); southContentPane.add(southToolBar, BorderLayout.CENTER); southContentPane.setBackground(Color.lightGray); @@ -171,7 +171,7 @@ public class ElementCaseToolBarPane extends BasicBeanPane layoutTable.setColumnSelectionAllowed(false); layoutTable.setRowSelectionAllowed(false); layoutTable.setBackground(Color.WHITE); - int columnWidth = Integer.parseInt(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_LayoutTable_Column_Width")); + int columnWidth = Integer.parseInt(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Layout_Table_Column_Width")); for (int i = 0; i < layoutTable.getColumnModel().getColumnCount(); i++) { layoutTable.getColumnModel().getColumn(i).setPreferredWidth(columnWidth); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java index ca75fa994..4e71ca9e7 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java @@ -40,7 +40,7 @@ public class PaddingMarginPane extends BasicPane { topPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Top") + " "), BorderLayout.WEST); topSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); topPane.add(topSpinner, BorderLayout.CENTER); - UILabel topLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); + UILabel topLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel") + " "); topPane.add(topLabel, BorderLayout.EAST); contentPane.add(topPane); @@ -48,7 +48,7 @@ public class PaddingMarginPane extends BasicPane { leftPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Left") + " "), BorderLayout.WEST); leftSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); leftPane.add(leftSpinner, BorderLayout.CENTER); - UILabel leftLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); + UILabel leftLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel") + " "); leftPane.add(leftLabel, BorderLayout.EAST); contentPane.add(leftPane); @@ -56,7 +56,7 @@ public class PaddingMarginPane extends BasicPane { bottomPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Bottom") + " "), BorderLayout.WEST); bottomSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); bottomPane.add(bottomSpinner, BorderLayout.CENTER); - UILabel bottomLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); + UILabel bottomLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel") + " "); bottomPane.add(bottomLabel, BorderLayout.EAST); contentPane.add(bottomPane); @@ -64,7 +64,7 @@ public class PaddingMarginPane extends BasicPane { rightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Right") + " "), BorderLayout.WEST); rightSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); rightPane.add(rightSpinner, BorderLayout.CENTER); - UILabel rightLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); + UILabel rightLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Indent_Pixel") + " "); rightPane.add(rightLabel, BorderLayout.EAST); contentPane.add(rightPane); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java index b1b149c2f..3651501d4 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java @@ -216,7 +216,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { UITextField widgetNameField = widgetPropertyPane.getWidgetNameField(); if (designer.getTarget().isNameExist(widgetNameField.getText()) && !ComparatorUtils.equals(widgetNameField.getText(), widget.getWidgetName())) { widgetNameField.setText(widget.getWidgetName()); - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form_Widget_Rename_Failure"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Joption_News"), JOptionPane.ERROR_MESSAGE, BaseUtils.readIcon("com/fr/design/form/images/joption_failure.png")); + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Rename_Failure"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Joption_News"), JOptionPane.ERROR_MESSAGE, BaseUtils.readIcon("com/fr/design/form/images/joption_failure.png")); return; } widgetPropertyPane.update(widget); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/EventHandlerWrapper.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/EventHandlerWrapper.java index 6c666dfb2..0dcda3139 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/EventHandlerWrapper.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/EventHandlerWrapper.java @@ -12,7 +12,7 @@ public class EventHandlerWrapper implements Encoder { return null; } else { NameWithListeners handler = (NameWithListeners) v; - return com.fr.design.i18n.Toolkit.i18nText("Page_Total") + handler.getCountOfListeners4ThisName() + com.fr.design.i18n.Toolkit.i18nText("Ge") + handler.getName() + com.fr.design.i18n.Toolkit.i18nText("Event"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Page_Total") + handler.getCountOfListeners4ThisName() + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Ge") + handler.getName() + com.fr.design.i18n.Toolkit.i18nText("Event"); } } -} \ No newline at end of file +} 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 235393cef..75087c0d9 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 @@ -61,7 +61,7 @@ public class RootDesignDefinePane extends AbstractDataModify { 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); + UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Size"), 280, 20, layoutPane); this.add(layoutExpandablePane, BorderLayout.CENTER); } @@ -85,15 +85,15 @@ public class RootDesignDefinePane extends AbstractDataModify { public JPanel createAdvancePane() { JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); labelNameTextField = new UITextField(); - displayReport = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DisplayNothingBeforeQuery")); - useParamsTemplate = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Use_Params_Template")); + displayReport = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query")); + useParamsTemplate = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Use_Params_Template")); background = new AccessibleBackgroundEditor(); Icon[] hAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),}; Integer[] hAlignment = new Integer[]{FormConstants.LEFTPOSITION, FormConstants.CENTERPOSITION, FormConstants.RIGHTPOSITION}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); - hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormStyleAlignment_Left") + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Left") , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")}); double f = TableLayout.FILL; double p = TableLayout.PREFERRED; @@ -101,7 +101,7 @@ public class RootDesignDefinePane extends AbstractDataModify { double[] columnSize = {p, f}; 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("Fine-Design_Form_Label_Name")), labelNameTextField}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background")), background}, new Component[]{displayReport, null}, new Component[]{useParamsTemplate, null}, diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java index a707981ee..8146976a5 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java @@ -46,7 +46,7 @@ public abstract class ButtonDefinePane extends AbstractDataMod backgroundLabel.setVerticalAlignment(SwingConstants.TOP); Component[][] n_components = { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Name")), buttonNameTextField}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")), labelNameTextField}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField}, backgroundCompPane, frFont, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon")), iconPane}, diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java index 96625d759..9c1faec99 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java @@ -40,10 +40,10 @@ public class CheckBoxDefinePane extends AbstractDataModify { double f = TableLayout.FILL; double p = TableLayout.PREFERRED; 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("Fine-Design_Form_Label_Name")), labelNameTextField}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text")), text }, new Component[]{widgetValueLabel, formWidgetValuePane }, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")), fontSizePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane}, }; double[] rowSize = {p, p, p, p, p, p}; double[] columnSize = {p, f}; diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java index 3ac50e85f..8c3722a94 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java @@ -20,7 +20,7 @@ public class ComboBoxDefinePane extends DictEditorDefinePane { } public UICheckBox createRepeatCheckBox(){ - removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_No_Repeat")); + removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_No_Repeat")); removeRepeatCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); return removeRepeatCheckBox; } @@ -54,4 +54,4 @@ public class ComboBoxDefinePane extends DictEditorDefinePane { public DataCreatorUI dataUI() { return null; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java index a8b70c943..e781cc4ca 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java @@ -26,7 +26,7 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane } public UICheckBox createRepeatCheckBox(){ - removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_No_Repeat")); + removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_No_Repeat")); removeRepeatCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); return removeRepeatCheckBox; } @@ -83,4 +83,4 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane return "ComboCheckBox"; } -} \ No newline at end of file +} 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 cc6071cce..1c1dfd4c3 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 @@ -57,9 +57,9 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane(new String[] {com.fr.design.i18n.Toolkit.i18nText("Date") , com.fr.design.i18n.Toolkit.i18nText("String")}); @@ -69,13 +69,13 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane e double f = TableLayout.FILL; double p = TableLayout.PREFERRED; 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("Fine-Design_Form_Label_Name")), labelNameTextField}, new Component[]{widgetValueLabel, formWidgetValuePane }, dicPane, removeRepeatPane, waterMarkComponent, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")), fontSizePane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane} }; double[] rowSize = {p, p, p, p, p, p, p, p}; double[] columnSize = {p, f}; diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java index 1168cb9de..843f402f0 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/FreeButtonDefinePane.java @@ -31,7 +31,7 @@ public class FreeButtonDefinePane extends ButtonDefinePane { public Component[] createFontPane() { JPanel fontLabelPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); - fontLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")); + fontLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font")); fontLabelPanel.add(fontLabel, BorderLayout.CENTER); fontLabel.setVerticalAlignment(SwingConstants.TOP); frFontPane = new FRFontPane(); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/IframeEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/IframeEditorDefinePane.java index 858f64f2b..0be134627 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/IframeEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/IframeEditorDefinePane.java @@ -34,8 +34,8 @@ public class IframeEditorDefinePane extends AbstractDataModify { JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0)); JPanel attr = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); - attr.add(horizontalCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Preference-Horizontal_Scroll_Bar_Visible"))); - attr.add(verticalCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Preference-Vertical_Scroll_Bar_Visible"))); + attr.add(horizontalCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Horizontal_Scroll_Bar_Visible"))); + attr.add(verticalCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Preference_Vertical_Scroll_Bar_Visible"))); contentPane.add(attr); double p = TableLayout.PREFERRED; double f = TableLayout.FILL; diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java index aa8f1a233..e86bcf4f7 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java @@ -44,7 +44,7 @@ public class LabelDefinePane extends AbstractDataModify