From 2ecf936f69afba1c0a463fdbebc5f949dc1989ba Mon Sep 17 00:00:00 2001 From: "alex.sung" Date: Mon, 13 Aug 2018 18:52:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8F=8A=E5=9B=BD=E9=99=85=E5=8C=96=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/file/PreferencePane.java | 2 +- .../fr/design/actions/help/FeedBackPane.java | 4 +-- .../fr/design/actions/help/ForumAction.java | 2 +- .../data/datapane/TableDataTreePane.java | 2 +- .../connect/DatabaseConnectionPane.java | 2 +- .../data/datapane/connect/JDBCDefPane.java | 4 +-- .../datapane/preview/PreviewTableModel.java | 6 ++-- .../AutoStoreProcedureTableModel.java | 10 +++---- .../tabledatapane/ClassTableDataPane.java | 2 +- .../EmbeddedTableDataDefinedPane.java | 10 +++---- .../StoreProcedureParameterPane.java | 18 +++++------ .../com/fr/design/dialog/JWizardDialog.java | 4 +-- .../java/com/fr/design/dialog/UIDialog.java | 2 +- .../editor/DoubleDeckValueEditorPane.java | 2 +- .../com/fr/design/editor/ValueEditorPane.java | 2 +- .../design/editor/ValueEditorPaneFactory.java | 30 +++++++++---------- .../editor/editor/ColumnNameEditor.java | 2 +- .../fr/design/editor/editor/CursorEditor.java | 6 ++-- .../editor/editor/OldColumnIndexEditor.java | 2 +- .../fr/design/extra/PluginFromStorePane.java | 4 +-- .../fr/design/extra/PluginInstalledPane.java | 8 ++--- .../fr/design/extra/PluginOperateUtils.java | 2 +- .../com/fr/design/extra/PluginUpdatePane.java | 2 +- .../com/fr/design/extra/PluginWebBridge.java | 2 +- .../com/fr/design/extra/WebViewDlgHelper.java | 10 +++---- .../exe/callback/InstallFromDiskCallback.java | 4 +-- .../exe/callback/InstallOnlineCallback.java | 4 +-- .../exe/callback/ModifyStatusCallback.java | 2 +- .../exe/callback/UninstallPluginCallback.java | 4 +-- .../exe/callback/UpdateFromDiskCallback.java | 6 ++-- .../exe/callback/UpdateOnlineCallback.java | 2 +- .../callback/UpdateOnlineCallback.java | 2 +- .../com/fr/design/file/TemplateTreePane.java | 2 +- .../design/formula/FunctionManagerPane.java | 2 +- .../com/fr/design/formula/JavaEditorPane.java | 4 +-- .../fr/design/formula/SortFormulaPane.java | 4 +-- .../gui/columnrow/ColumnRowVerticalPane.java | 2 +- .../gui/frpane/EditingStringListPane.java | 2 +- .../fr/design/gui/frpane/ImgChoosePane.java | 2 +- .../design/gui/frpane/JTreeAutoBuildPane.java | 4 +-- .../gui/frpane/ObjectProperiesPane.java | 2 +- .../com/fr/design/gui/frpane/RegPane.java | 2 +- .../gui/frpane/UICorrelationComboBoxPane.java | 2 +- .../config/LayerDependenceSettingPane.java | 4 +-- .../gui/icombobox/AlignmentComboBox.java | 2 +- .../gui/icombobox/DictionaryConstants.java | 6 ++-- .../fr/design/gui/imenutable/UIMenuTable.java | 2 +- .../itableeditorpane/UITableModelAdapter.java | 4 +-- .../gui/itextfield/UISearchTextField.java | 2 +- .../fr/design/gui/style/AlignmentPane.java | 2 +- .../com/fr/design/gui/style/BorderPane.java | 4 +-- .../com/fr/design/mainframe/DecodeDialog.java | 4 +-- .../fr/design/mainframe/DesktopCardPane.java | 2 +- .../ColorBackgroundQuickPane.java | 2 +- .../PatternBackgroundQuickPane.java | 2 +- .../mainframe/toolbar/ToolBarMenuDock.java | 2 +- .../fr/design/mainframe/toolbar/VcsScene.java | 2 +- .../mainframe/widget/BasicPropertyPane.java | 2 +- .../widget/editors/WidgetValueEditor.java | 2 +- .../widget/wrappers/BackgroundWrapper.java | 2 +- .../java/com/fr/design/menu/KeySetUtils.java | 2 +- .../design/parameter/ParameterInputPane.java | 2 +- .../fr/design/present/DictPresentPane.java | 2 +- .../design/present/dict/DictionaryPane.java | 3 +- .../com/fr/design/style/AlignmentPane.java | 2 +- .../java/com/fr/design/style/BorderPane.java | 4 +-- .../java/com/fr/design/style/FormatBox.java | 2 +- .../style/background/BackgroundPane.java | 2 +- .../background/BackgroundUIComboBoxPane.java | 2 +- .../background/image/ImageSelectPane.java | 2 +- .../impl/PatternBackgroundPane.java | 6 ++-- .../pattern/PatternUIComboBoxPane.java | 4 +-- .../style/color/ColorUIComboBoxPane.java | 2 +- .../style/color/DetailColorSelectPane.java | 2 +- .../design/style/color/TransparentPane.java | 2 +- .../java/com/fr/design/utils/DesignUtils.java | 2 +- .../com/fr/design/web/CustomIconPane.java | 2 +- .../com/fr/design/widget/IconDefinePane.java | 2 +- .../widget/WidgetBoundsPaneFactory.java | 6 ++-- .../fr/design/widget/btn/ButtonConstants.java | 4 +-- .../widget/component/BackgroundCompPane.java | 4 +-- .../widget/component/DateValuePane.java | 2 +- .../fr/design/write/submit/CustomJobPane.java | 4 +-- .../java/com/fr/design/chart/ChartDialog.java | 2 +- .../fr/design/chart/comp/BorderAttriPane.java | 2 +- .../report/GisMapReportDataContentPane.java | 4 +-- .../chart/report/MapReportCubeDataPane.java | 2 +- .../chart/report/MapReportDataSinglePane.java | 2 +- .../ConditionTrendLinePane.java | 6 ++-- .../DataSeriesAttrCustomPane.java | 2 +- .../SeriesCondition/DataSeriesAttrPane.java | 2 +- .../SeriesCondition/LabelBackgroundPane.java | 4 +-- .../SeriesCondition/LabelColorPane.java | 2 +- .../SeriesCondition/TooltipContentsPane.java | 4 +-- .../SeriesCondition/dlp/DataLabelPane.java | 2 +- .../dlp/RangeDataLabelPane.java | 2 +- .../mainframe/chart/PaneTitleConstants.java | 4 +-- .../mainframe/chart/gui/ChangeConfigPane.java | 4 +-- .../chart/gui/ChartDesignerOtherPane.java | 2 +- .../chart/gui/data/PresentComboBox.java | 2 +- .../XYScatterPlotReportDataContentPane.java | 2 +- .../gui/style/ChartAxisLineStylePane.java | 2 +- .../style/ChartAxisTitleNoFormulaPane.java | 2 +- .../chart/gui/style/ChartAxisTitlePane.java | 2 +- .../chart/gui/style/ChartBeautyPane.java | 2 +- .../chart/gui/style/ChartBorderPane.java | 2 +- .../chart/gui/style/ChartFillStylePane.java | 2 +- .../chart/gui/style/DateAxisValuePane.java | 4 +-- .../gui/style/area/DefaultAxisAreaPane.java | 2 +- .../gui/style/area/Plot3DAxisAreaPane.java | 2 +- .../gui/style/area/RadarAxisAreaPane.java | 2 +- .../style/datalabel/ChartDataLabelPane.java | 4 +-- .../gui/style/series/Pie2DSeriesPane.java | 2 +- .../gui/style/series/StockSeriesPane.java | 4 +-- .../module/ChartEmptyDataStylePane.java | 2 +- .../design/module/ChartPreFillStylePane.java | 2 +- .../component/VanChartFillStylePane.java | 2 +- .../component/VanChartUIListControlPane.java | 2 +- .../VanChartConditionListControlPane.java | 6 ++-- .../style/axis/VanChartTimeAxisPane.java | 4 +-- .../type/VanChartMapSourceChoosePane.java | 2 +- .../design/designer/creator/XChartEditor.java | 4 +-- .../designer/creator/XCheckBoxGroup.java | 2 +- .../fr/design/designer/creator/XComboBox.java | 2 +- .../design/designer/creator/XElementCase.java | 2 +- .../designer/creator/XIframeEditor.java | 2 +- .../design/designer/creator/XNameWidget.java | 2 +- .../design/designer/creator/XRadioGroup.java | 2 +- .../design/designer/creator/XTreeEditor.java | 4 +-- .../designer/creator/XWAbsoluteLayout.java | 2 +- .../designer/creator/XWBorderLayout.java | 2 +- .../designer/creator/XWParameterLayout.java | 2 +- .../designer/creator/XWidgetCreator.java | 2 +- .../cardlayout/XWCardMainBorderLayout.java | 2 +- .../FRBorderLayoutPropertiesGroupModel.java | 2 +- .../HorizontalLayoutPropertiesGroupModel.java | 2 +- .../items/HorizontalAlignmentItems.java | 2 +- .../items/LabelHorizontalAlignmentItems.java | 2 +- .../properties/items/UnderlineItems.java | 2 +- .../items/WidgetDisplayPositionItems.java | 2 +- .../gui/xpane/FormHyperlinkGroupPane.java | 4 +-- .../design/gui/xpane/JTreeAutoBuildPane.java | 12 ++++---- .../fr/design/mainframe/FormEditToolBar.java | 4 +-- .../mainframe/WLayoutSelectionPane.java | 4 +-- .../widget/accessibles/ColorPalette.java | 6 ++-- .../widget/editors/AdjustModeEditor.java | 2 +- .../widget/editors/ButtonTypeEditor.java | 2 +- .../ui/BasicSetVisiblePropertyPane.java | 2 +- .../ui/FormBasicWidgetPropertyPane.java | 4 +-- .../widget/ui/FormWidgetCardPane.java | 6 ++-- .../widget/wrappers/EventHandlerWrapper.java | 2 +- .../ui/designer/DateEditorDefinePane.java | 2 +- .../ui/designer/DictEditorDefinePane.java | 2 +- .../ui/designer/IframeEditorDefinePane.java | 2 +- .../designer/TextFieldEditorDefinePane.java | 2 +- .../ui/designer/TreeEditorDefinePane.java | 2 +- .../designer/btn/ButtonGroupDefinePane.java | 2 +- .../component/FormWidgetValuePane.java | 2 +- .../component/WidgetAbsoluteBoundPane.java | 8 ++--- .../designer/component/WidgetBoundPane.java | 4 +-- .../component/WidgetCardTagBoundPane.java | 2 +- .../fr/design/actions/cell/StyleAction.java | 2 +- .../actions/cell/UIToolbarBorderButton.java | 2 +- .../actions/cell/style/AlignmentAction.java | 2 +- .../style/ReportFontForegroundAction.java | 2 +- .../cell/style/StyleBackgroundAction.java | 2 +- .../columnrow/DSColumnBasicAction.java | 2 +- .../actions/columnrow/DeleteColumnAction.java | 2 +- .../actions/columnrow/InsertColumnAction.java | 2 +- .../com/fr/design/condition/BackPane.java | 2 +- .../design/condition/BorderHighlightPane.java | 2 +- .../com/fr/design/condition/FontPane.java | 2 +- .../fr/design/condition/HyperlinkPane.java | 2 +- .../condition/PresentHighlightPane.java | 2 +- .../design/condition/WidgetHighlightPane.java | 10 +++---- .../design/dscolumn/DSColumnAdvancedPane.java | 4 +-- .../fr/design/dscolumn/DSColumnBasicPane.java | 2 +- .../com/fr/design/dscolumn/DSColumnPane.java | 2 +- .../dscolumn/ResultSetGroupDockingPane.java | 2 +- .../design/dscolumn/ResultSetGroupPane.java | 2 +- .../dscolumn/ResultSetGroupPopUpPane.java | 2 +- .../dscolumn/SelectedDataColumnPane.java | 4 +-- .../dscolumn/SpecifiedGroupAttrPane.java | 6 ++-- .../fr/design/expand/ExpandFatherPane.java | 2 +- .../java/com/fr/design/expand/ParentPane.java | 12 ++++---- .../headerfooter/HFAttributesEditDialog.java | 6 ++-- .../fr/design/headerfooter/HFComponent.java | 4 +-- .../headerfooter/HeaderFooterEditPane.java | 2 +- .../ElementCasePaneAuthorityEditPane.java | 10 +++---- .../fr/design/mainframe/SheetNameTabPane.java | 4 +-- .../cell/settingpane/CellExpandAttrPane.java | 2 +- .../cell/settingpane/CellOtherSetPane.java | 6 ++-- .../cell/settingpane/style/StylePane.java | 2 +- .../fr/design/mainframe/form/FormTabPane.java | 2 +- .../com/fr/design/present/BarCodePane.java | 2 +- .../design/present/ColumnRowTableModel.java | 2 +- .../present/ConditionAttributesGroupPane.java | 4 +-- .../fr/design/present/CurrencyLinePane.java | 4 +-- .../com/fr/design/report/LayerReportPane.java | 2 +- .../com/fr/design/report/PageSetupPane.java | 4 +-- .../com/fr/design/report/RowColumnPane.java | 2 +- .../com/fr/design/report/SelectImagePane.java | 2 +- .../com/fr/design/report/SubReportPane.java | 2 +- .../com/fr/design/report/WordExportPane.java | 2 +- .../design/report/freeze/FreezePagePane.java | 6 ++-- .../report/freeze/FreezeWriteColPane.java | 4 +-- .../design/report/freeze/RepeatColPane.java | 2 +- .../java/com/fr/design/style/StylePane.java | 8 ++--- .../com/fr/design/webattr/CommonPane.java | 2 +- .../com/fr/design/webattr/EditToolBar.java | 4 +-- .../java/com/fr/design/webattr/EventPane.java | 6 ++-- .../fr/design/webattr/PageToolBarPane.java | 2 +- .../fr/design/webattr/ReportWebAttrPane.java | 2 +- .../fr/design/webattr/ServerPrinterPane.java | 2 +- .../fr/design/webattr/ViewToolBarPane.java | 2 +- .../fr/design/webattr/WriteToolBarPane.java | 2 +- .../printsettings/PageMarginSettingPane.java | 2 +- .../fr/design/widget/CellWidgetCardPane.java | 2 +- .../com/fr/design/widget/WidgetEventPane.java | 2 +- .../design/widget/ui/ButtonGroupDictPane.java | 2 +- .../design/widget/ui/ComboBoxDefinePane.java | 2 +- .../widget/ui/ComboCheckBoxDefinePane.java | 2 +- .../widget/ui/DateEditorDefinePane.java | 2 +- .../widget/ui/IframeEditorDefinePane.java | 4 +-- .../widget/ui/ListEditorDefinePane.java | 2 +- .../widget/ui/TextFieldEditorDefinePane.java | 3 +- .../widget/ui/btn/ButtonSytleDefinedPane.java | 2 +- .../com/fr/poly/PolyBlockProperTable.java | 2 +- .../java/com/fr/poly/group/PolyNameGroup.java | 2 +- .../com/fr/quickeditor/CellQuickEditor.java | 2 +- .../cellquick/CellDSColumnEditor.java | 10 +++---- .../cellquick/CellFormulaQuickEditor.java | 2 +- .../floatquick/FloatImageQuickEditor.java | 2 +- .../fr/start/module/DesignerActivator.java | 2 +- 234 files changed, 373 insertions(+), 377 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index fef83423a..384d6743d 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -646,7 +646,7 @@ public class PreferencePane extends BasicPane { int rv = JOptionPane.showOptionDialog( null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Language_Change_Successful"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"), JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, null, diff --git a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java index d2d16fc86..ebf6b7cdc 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java @@ -69,7 +69,7 @@ public class FeedBackPane extends BasicPane { private SwingWorker worker; private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Send"), true); private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); - private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); + private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")); private int ifHasBeenWriten = 0; private UITextArea detailField; private boolean isSendSuccessful = false; @@ -206,7 +206,7 @@ public class FeedBackPane extends BasicPane { double p = TableLayout.PREFERRED; Component[][] components = new Component[][]{ new Component[]{new UILabel("QQ:", SwingConstants.RIGHT), qq}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("email") + ":", SwingConstants.RIGHT), email}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email") + ":", SwingConstants.RIGHT), email}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Mobile_Number") + ":", SwingConstants.RIGHT), phone} }; double[] rowSize = {p, p, p}; diff --git a/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java b/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java index 621e05578..65ce1924c 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java @@ -66,7 +66,7 @@ public class ForumAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Forum"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Forum"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index 74ef5b992..a5982cafe 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java @@ -233,7 +233,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { private class EditAction extends UpdateAction { public EditAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); this.setMnemonic('E'); this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_EDIT_ICON_PATH)); } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java index 00b5eecf3..74cebeb5a 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java @@ -49,7 +49,7 @@ public abstract class DatabaseConnectionPane 0 && ((String) value).charAt(0) == '=') - type = com.fr.design.i18n.Toolkit.i18nText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"); else type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); }else if(value instanceof Integer) type = com.fr.design.i18n.Toolkit.i18nText("Integer"); else if(value instanceof Double) - type = com.fr.design.i18n.Toolkit.i18nText("Double"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"); else if(value instanceof Date) - type = com.fr.design.i18n.Toolkit.i18nText("Date"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"); else if(value instanceof Boolean) type = com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean"); else if(value instanceof BaseFormula) - type = com.fr.design.i18n.Toolkit.i18nText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"); else type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); return StoreProcedureParameterPane.getInfo4Value(type); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java index 738fbec72..9100c230d 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java @@ -91,7 +91,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { Component[][] components = { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), reportletNamePane}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_The_Class_Must_Implement_The_Interface") + "\"com.fr.data.Tabledata\"")}, - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Example") + ":\"com.fr.data.impl.ArrayTableData\"")}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Example") + ":\"com.fr.data.impl.ArrayTableData\"")}, {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))} }; JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java index 0a94d80ff..16682c415 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java @@ -35,8 +35,8 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{ private static String[] TYPE = { com.fr.design.i18n.Toolkit.i18nText("String"), com.fr.design.i18n.Toolkit.i18nText("Integer"), - com.fr.design.i18n.Toolkit.i18nText("Double"), - com.fr.design.i18n.Toolkit.i18nText("Date") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date") }; public EmbeddedTableDataDefinedPane() { @@ -68,8 +68,8 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{ tableColumn.setMaxWidth(30); // 控制按钮 - add = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add")); - del = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Delete")); + add = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); + del = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete")); JPanel buttonPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); // buttonPane.setLayout(FRGUIPaneFactory.createLabelFlowLayout()); buttonPane.add(add); @@ -213,7 +213,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{ private EmbeddedTableData embeddedTableData; private String[] COLUMN_NAME = { "", - com.fr.design.i18n.Toolkit.i18nText("ColumnName"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type") }; private int sum = 0; diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java index 3d26c99cb..06fe4187c 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java @@ -29,13 +29,13 @@ public class StoreProcedureParameterPane extends BasicPane { }; private static NameObject[] nameAndValue = new NameObject[]{ - new NameObject(com.fr.design.i18n.Toolkit.i18nText("Cursor"), StoreProcedureConstants.CURSOR), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"), StoreProcedureConstants.CURSOR), new NameObject(com.fr.design.i18n.Toolkit.i18nText("Parameter-String"), StoreProcedureConstants.VARCHAR), new NameObject(com.fr.design.i18n.Toolkit.i18nText("Integer"), StoreProcedureConstants.INTEGER), - new NameObject(com.fr.design.i18n.Toolkit.i18nText("Double"), StoreProcedureConstants.DECIMAL), - new NameObject(com.fr.design.i18n.Toolkit.i18nText("Date"), StoreProcedureConstants.DATE), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"), StoreProcedureConstants.DECIMAL), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), StoreProcedureConstants.DATE), new NameObject(com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean"), StoreProcedureConstants.BOOLEAN), - new NameObject(com.fr.design.i18n.Toolkit.i18nText("Formula"), StoreProcedureConstants.FORMULA), + new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"), StoreProcedureConstants.FORMULA), new NameObject("IN",StoreProcedureConstants.IN), new NameObject("OUT",StoreProcedureConstants.OUT), new NameObject("INOUT",StoreProcedureConstants.INOUT) @@ -124,22 +124,22 @@ public class StoreProcedureParameterPane extends BasicPane { Object value = valueEditPane.update(); String type = ""; if(value instanceof CursorEditor) - type=com.fr.design.i18n.Toolkit.i18nText("Cursor"); + type=com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"); else if(value instanceof String ){ if(((String) value).length() > 0 && ((String) value).charAt(0) == '=') - type = com.fr.design.i18n.Toolkit.i18nText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"); else type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); }else if(value instanceof Integer) type = com.fr.design.i18n.Toolkit.i18nText("Integer"); else if(value instanceof Double) - type = com.fr.design.i18n.Toolkit.i18nText("Double"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"); else if(value instanceof Date) - type = com.fr.design.i18n.Toolkit.i18nText("Date"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"); else if(value instanceof Boolean) type = com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean"); else if(value instanceof BaseFormula) - type = com.fr.design.i18n.Toolkit.i18nText("Formula"); + type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"); else type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String"); int typeVl = getInfo4Value(type); diff --git a/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java b/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java index 0326540ab..8d6302662 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java @@ -116,13 +116,13 @@ public class JWizardDialog extends BasicDialog { next(); } }); - buttonFinish = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Finish")); + buttonFinish = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Finish")); buttonFinish.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { finish(); } }); - buttonCancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); + buttonCancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")); buttonCancel.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { cancel(); diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java index c70470588..bfba65b94 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java @@ -100,7 +100,7 @@ public abstract class UIDialog extends JDialog { } private void addCancelButton(JPanel buttonsPane) { - cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); + cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")); cancelButton.setName(CANCEL_BUTTON); cancelButton.setMnemonic('C'); buttonsPane.add(cancelButton); diff --git a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java index aced9191c..3f45f0aaf 100644 --- a/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java @@ -222,7 +222,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver, String name = currentEditor.getName(); Object columnIndex = currentEditor.getValue(); //bug86542,这边为啥要new一个公式出来，只保留content,其他属性全不要了? - if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Formula"))) { + if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) { columnIndex = ((FormulaEditor) currentEditor).getFormula(); } diff --git a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java index e77194741..e304d96a8 100644 --- a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java @@ -207,7 +207,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName Object columnIndex = currentEditor.getValue(); //bug86542,这边为啥要new一个公式出来，只保留content,其他属性全不要了? //MoMeak：我也想注释了，但是有bug啊。。。 - if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Formula"))) { + if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) { columnIndex = ((FormulaEditor) currentEditor).getFormula(); } diff --git a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java index 5ff521598..faa795f0c 100644 --- a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java @@ -232,7 +232,7 @@ public class ValueEditorPaneFactory { new TextEditor(), new SpinnerIntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor }; @@ -249,7 +249,7 @@ public class ValueEditorPaneFactory { new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor, new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget")) @@ -267,11 +267,11 @@ public class ValueEditorPaneFactory { new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), - new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")) + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")) }; } @@ -286,11 +286,11 @@ public class ValueEditorPaneFactory { new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), - new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")), + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")), new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Group")) }; } @@ -302,7 +302,7 @@ public class ValueEditorPaneFactory { */ public static Editor[] cellGroupEditor() { return new Editor[]{ - new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")), + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")), new ColumnRowGroupEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell_Group")) }; } @@ -331,7 +331,7 @@ public class ValueEditorPaneFactory { public static Editor[] dateEditors(String popupName, String textEditorValue) { return new Editor[]{ new NoneEditor(textEditorValue, StringUtils.isEmpty(popupName) ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer_None") : popupName), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")) }; } @@ -348,11 +348,11 @@ public class ValueEditorPaneFactory { new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), - new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell")), + new ColumnRowEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell")), new ColumnSelectedEditor(), //23328 allEditors中删除控件选项 // new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("Widget")) @@ -369,7 +369,7 @@ public class ValueEditorPaneFactory { new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), }; } @@ -385,7 +385,7 @@ public class ValueEditorPaneFactory { new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor, new ParameterEditor(), @@ -415,7 +415,7 @@ public class ValueEditorPaneFactory { public static Editor[] dateEditors() { FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); return new Editor[]{ - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), formulaEditor, new ParameterEditor(), }; @@ -434,7 +434,7 @@ public class ValueEditorPaneFactory { new TextEditor(), new IntegerEditor(), new DoubleEditor(), - new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")), + new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")), new BooleanEditor(), formulaEditor }; @@ -451,7 +451,7 @@ public class ValueEditorPaneFactory { list.add(new TextEditor()); list.add(new IntegerEditor()); list.add(new DoubleEditor()); - list.add(new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"))); + list.add(new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"))); list.add(new BooleanEditor()); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Parameter-Formula")); diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java index 3cd7dddb2..f4d2a132c 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java @@ -23,7 +23,7 @@ public class ColumnNameEditor extends ColumnIndexEditor { } public ColumnNameEditor(String[] columnNames) { - this(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")); + this(columnNames, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")); } public ColumnNameEditor(final String[] columnNames, String name) { diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java index 461d657f1..3b658d0ce 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java @@ -12,10 +12,10 @@ public class CursorEditor extends Editor { public CursorEditor(){ this.setLayout(FRGUIPaneFactory.createCenterFlowLayout()); - label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Cursor")); + label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor")); this.add(label); this.setPreferredSize(new Dimension(10,20)); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Cursor")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor")); this.setEnabled(false); } @@ -36,7 +36,7 @@ public class CursorEditor extends Editor { @Override public void setValue(CursorEditor value) { - label.setText(com.fr.design.i18n.Toolkit.i18nText("Cursor")); + label.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor")); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java b/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java index 842d83c5f..b2cb6dc21 100644 --- a/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java +++ b/designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java @@ -52,7 +52,7 @@ public class OldColumnIndexEditor extends Editor { protected void initComponents() { indexCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Column_Index")); - nameCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ColumnName")); + nameCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")); indexCheckBox.addActionListener(actionListener); nameCheckBox.addActionListener(actionListener); javax.swing.ButtonGroup buttonGroup = new javax.swing.ButtonGroup(); diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java b/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java index dd6e4ef18..0f71927b9 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java @@ -179,12 +179,12 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane() { diff --git a/designer-base/src/main/java/com/fr/design/formula/SortFormulaPane.java b/designer-base/src/main/java/com/fr/design/formula/SortFormulaPane.java index 5348c12b4..222aa90fe 100644 --- a/designer-base/src/main/java/com/fr/design/formula/SortFormulaPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/SortFormulaPane.java @@ -38,7 +38,7 @@ public abstract class SortFormulaPane extends JPanel { sortFormulaTextField = new UITextField(16); //Lance:添加一公式编辑器按钮 sortFormulaTextFieldButton = new UIButton("..."); - sortFormulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Formula") + "..."); + sortFormulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula") + "..."); sortFormulaTextFieldButton.setPreferredSize(new Dimension(25, sortFormulaTextFieldButton.getPreferredSize().height)); sortFormulaTextFieldButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { @@ -48,7 +48,7 @@ public abstract class SortFormulaPane extends JPanel { this.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(InsetText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_sort_order") + ":"), sortOrderComboBox, new UILabel(InsetText), - new UILabel(com.fr.design.i18n.Toolkit.i18nText("Formula") + ":="), sortFormulaTextField, //selectButton, + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula") + ":="), sortFormulaTextField, //selectButton, sortFormulaTextFieldButton}, FlowLayout.LEFT)); } diff --git a/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java b/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java index 8c2c28853..10f7680d9 100644 --- a/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java @@ -25,7 +25,7 @@ public class ColumnRowVerticalPane extends ColumnRowPane { this.add(pane, BorderLayout.NORTH); JPanel colPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column") + ":")); + colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column") + ":")); pane.add(colPane); initColSpinner(); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java index 345cdc857..0f8ba6dac 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java @@ -55,7 +55,7 @@ public abstract class EditingStringListPane extends BasicBeanPane> }); - addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add")); + addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Modify")); removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Remove")); moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up")); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java index c6f0e5836..9a531c60d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java @@ -91,7 +91,7 @@ public class ImgChoosePane extends BasicPane { } }); - clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Clear")); + clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear")); clearButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { previewPane.setImage(null); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java index 18ac4e245..46cdae35b 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java @@ -108,10 +108,10 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]); } catch (Exception e) { - valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); + valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"))}, 1); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); - textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); + textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")), formulaEditor}, 1); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java index b57ed131e..fc62de080 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java @@ -29,7 +29,7 @@ public class ObjectProperiesPane extends BasicBeanPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); JPanel buttonPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Property")); + this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Property")); buttonPane.add(this.addButton, BorderLayout.WEST); this.add(buttonPane, BorderLayout.NORTH); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java index 117790476..760cedbf1 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java @@ -494,7 +494,7 @@ public class RegPane extends BasicPane { } else if (value instanceof LengthReg){ this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Length")); } else if (value instanceof MailReg){ - this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email")); } else if (value instanceof PhoneReg){ this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Phone")); } else if (value instanceof MobileReg) { diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java index 9d62d9ed6..d1c2a087a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationComboBoxPane.java @@ -380,7 +380,7 @@ public class UICorrelationComboBoxPane extends JPanel implements UIObserver { UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Hyperlink_Reportlet"), new ReportletHyperlink(), ReportletHyperlinkPane.class); - UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"), + UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"), new EmailJavaScript(), EmailPane.class); UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java index c3b543792..2c0612e02 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java @@ -69,8 +69,8 @@ public class LayerDependenceSettingPane extends JPanel implements ItemListener { tableDataDictPane.tableDataNameComboBox.addItemListener(this); //初始化按钮对象 - addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("add")); - delButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Delete")); + addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add")); + delButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete")); //初始化Table对象,并添加renderer和editor model = new LayerDepenceTableModel(); dependenceTable = new JTable(); diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java index 39bc21440..cd135a1db 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java @@ -47,7 +47,7 @@ public class AlignmentComboBox extends UIComboBox { public static String getAlignDescription(int alignment) { if (alignment == Constants.CENTER) {//0 - return com.fr.design.i18n.Toolkit.i18nText("Center"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"); } else if (alignment == Constants.TOP) {//1 return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"); } else if (alignment == Constants.LEFT) {//2 diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java index d6d6ba9e7..ea994849c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java @@ -20,13 +20,13 @@ public class DictionaryConstants { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Required"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Length"), - com.fr.design.i18n.Toolkit.i18nText("Float"), - com.fr.design.i18n.Toolkit.i18nText("Email"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Float"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"), com.fr.design.i18n.Toolkit.i18nText("Phone"), com.fr.design.i18n.Toolkit.i18nText("MobilePhone"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_IDCard"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_PostCode"), - com.fr.design.i18n.Toolkit.i18nText("Custom")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")}; public final static int REG_NONE = 0; public final static int REG_REQUIRED = 1; diff --git a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java index 9aef9aa84..9555c282d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java +++ b/designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java @@ -214,7 +214,7 @@ public class UIMenuTable extends JTable { UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Reportlet"), new ReportletHyperlink(), ReportletHyperlinkPane.class); - UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Email"), + UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"), new EmailJavaScript(), EmailPane.class); UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java index bd621517d..273fbdcb6 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java @@ -220,12 +220,12 @@ public abstract class UITableModelAdapter extends AbstractTabl private Component component = null; public DeleteAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Delete")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); } public DeleteAction(Component component){ - this.setName(com.fr.design.i18n.Toolkit.i18nText("Delete")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); this.component = component; } diff --git a/designer-base/src/main/java/com/fr/design/gui/itextfield/UISearchTextField.java b/designer-base/src/main/java/com/fr/design/gui/itextfield/UISearchTextField.java index d2f4451c8..02facbb76 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itextfield/UISearchTextField.java +++ b/designer-base/src/main/java/com/fr/design/gui/itextfield/UISearchTextField.java @@ -63,7 +63,7 @@ public class UISearchTextField extends UITextField { private void initTextField() { iconLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); iconLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Search")); - clearLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Clear")); + clearLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear")); clearLabel.setOpaque(false); iconSize = iconLabel.getPreferredSize(); infoSize = infoLabel.getPreferredSize(); diff --git a/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java b/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java index b8489a66e..1e9b03e8a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java @@ -198,7 +198,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO JPanel jp1 = new JPanel(new BorderLayout()); basicPane = new JPanel(); seniorPane = new JPanel(); - basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 290, 24, basicPane()); + basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), 290, 24, basicPane()); seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), 290, 24, seniorPane()); jp1.add(basicPane, BorderLayout.NORTH); diff --git a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java index 2d92523e7..f0ab75642 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java @@ -95,7 +95,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse this.add(borderPanel, BorderLayout.NORTH); backgroundPane = new BackgroundPane(); - backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"), 280, 24, backgroundPane); + backgroundPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), 280, 24, backgroundPane); this.add(backgroundPanel, BorderLayout.CENTER); initAllNames(); outerToggleButton.addChangeListener(outerToggleButtonChangeListener); @@ -148,7 +148,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DecodeDialog.java b/designer-base/src/main/java/com/fr/design/mainframe/DecodeDialog.java index 1b28ae8c4..f76ed4711 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DecodeDialog.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DecodeDialog.java @@ -46,7 +46,7 @@ public class DecodeDialog { hintsLabel.setForeground(Color.RED); hintsLabel.setVisible(false); - confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Confirm")); + confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm")); confirmButton.setBounds(180, 90, 60, 25); confirmButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -63,7 +63,7 @@ public class DecodeDialog { } }); - UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); + UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")); cancelButton.setBounds(250, 90, 60, 25); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java index 39ccb956b..26dff260a 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java @@ -42,7 +42,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Desktop"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Desktop"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java index 93999b3ea..8309a802d 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java @@ -84,7 +84,7 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane { * @return 同上 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java index e82146824..afd3bd62e 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java @@ -58,7 +58,7 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane { Component[][] components = new Component[][]{ new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Foreground"), UILabel.LEFT), foregroundColorPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"), UILabel.LEFT), backgroundColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), UILabel.LEFT), backgroundColorPane}, }; double[] rowSize = {p, p, p}; double[] columnSize = {p, f}; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 0e9997a48..e45ec62a1 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -334,7 +334,7 @@ public abstract class ToolBarMenuDock { insertMenu(menuDef, MenuHandler.FILE); return menuDef; } - MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"), 'F'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"), 'F'); ShortCut[] scs = new ShortCut[0]; if (!DesignerMode.isAuthorityEditing()) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/VcsScene.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/VcsScene.java index 34fed3a86..9093bcfbd 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/VcsScene.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/VcsScene.java @@ -18,7 +18,7 @@ import com.fr.stable.ArrayUtils; public class VcsScene { public static MenuDef createFileMenuDef(ToolBarMenuDockPlus plus) { - MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"), 'F'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"), 'F'); ShortCut[] scs = new ShortCut[0]; if (!ArrayUtils.isEmpty(scs)) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java index 9f74ecbf6..d675aceb2 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/BasicPropertyPane.java @@ -56,7 +56,7 @@ public class BasicPropertyPane extends BasicPane { } } }; - widgetName.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")); + widgetName.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic")); double f = TableLayout.FILL; double p = TableLayout.PREFERRED; double[] rowSize = {p}; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java index 30307a4b2..4f5c7f28f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java @@ -47,7 +47,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor { case DataControl.TYPE_BOOLEAN: return new BooleanEditor(false); case DataControl.TYPE_DATE: - return new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Date")); + return new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")); case DataControl.TYPE_TABLEDATA: return onlyServer ? new ServerDataTableEditor() : new DataTableEditor(); default: diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java index 3b03de1f5..f6c8011e3 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java @@ -25,7 +25,7 @@ public class BackgroundWrapper implements Encoder, Decoder { @Override public String encode(Object v) { if (v instanceof ColorBackground) { - return com.fr.design.i18n.Toolkit.i18nText("Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color"); } else if (v instanceof TextureBackground) { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture"); } else if (v instanceof PatternBackground) { diff --git a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java index 37d3c9eed..5647b22d2 100644 --- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java @@ -691,7 +691,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java b/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java index 75d47f70b..f0f880369 100644 --- a/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java +++ b/designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java @@ -120,7 +120,7 @@ public class ParameterInputPane extends BasicPane { } else if (pv instanceof Float) { editors[0] = new FloatEditor(); } else if (pv instanceof Date) { - editors[0] = new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Date")); + editors[0] = new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")); } else if (pv instanceof Boolean) { editors[0] = new BooleanEditor(); } else if (pv instanceof BaseFormula) { diff --git a/designer-base/src/main/java/com/fr/design/present/DictPresentPane.java b/designer-base/src/main/java/com/fr/design/present/DictPresentPane.java index ed7585675..17733fb1b 100644 --- a/designer-base/src/main/java/com/fr/design/present/DictPresentPane.java +++ b/designer-base/src/main/java/com/fr/design/present/DictPresentPane.java @@ -24,7 +24,7 @@ public class DictPresentPane extends FurtherBasicBeanPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java b/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java index 341f0b907..a933dff24 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java @@ -7,7 +7,6 @@ import com.fr.design.constants.LayoutConstants; import com.fr.design.data.DataCreatorUI; import com.fr.design.gui.frpane.UIComboBoxPane; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; @@ -44,7 +43,7 @@ public class DictionaryPane extends UIComboBoxPane implements DataCr @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java b/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java index 62c7b7e99..06622d7ca 100644 --- a/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java +++ b/designer-base/src/main/java/com/fr/design/style/AlignmentPane.java @@ -45,7 +45,7 @@ public class AlignmentPane extends BasicPane { private UIRadioButton rightToLeftRB; // private UIComboBox imageComboBox; private static final String[] IMAGE = { - com.fr.design.i18n.Toolkit.i18nText("Default"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Extend") }; private UIBasicSpinner leftIndentSpinner; diff --git a/designer-base/src/main/java/com/fr/design/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/style/BorderPane.java index 8be6e4cf9..4ec840e63 100644 --- a/designer-base/src/main/java/com/fr/design/style/BorderPane.java +++ b/designer-base/src/main/java/com/fr/design/style/BorderPane.java @@ -157,7 +157,7 @@ public class BorderPane extends BasicPane { rightTopPane.add(first, BorderLayout.NORTH); JPanel second = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color") + ":")); + second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + ":")); second.add(this.currentLineColorPane); rightTopPane.add(second, BorderLayout.CENTER); @@ -216,7 +216,7 @@ public class BorderPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Border"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"); } // p:populate Style diff --git a/designer-base/src/main/java/com/fr/design/style/FormatBox.java b/designer-base/src/main/java/com/fr/design/style/FormatBox.java index 3f322a418..1bec10289 100644 --- a/designer-base/src/main/java/com/fr/design/style/FormatBox.java +++ b/designer-base/src/main/java/com/fr/design/style/FormatBox.java @@ -61,7 +61,7 @@ public class FormatBox extends BasicPane { typeBox.addItem(FormatField.getInstance().getName(FormatContents.TIME)); typeBox.addItem(FormatField.getInstance().getName(FormatContents.TEXT)); - pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Format") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Format") + ":")); formatBox = new UIComboBox(); // kunsnat: 大小: 这个有的格式的大小需要很宽! formatBox.setPreferredSize(new Dimension(150, 20)); diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java index 15a37c4ae..66fa06c9e 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java @@ -85,7 +85,7 @@ public class BackgroundPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Background"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"); } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java index 1b28aa0ab..c8f801f22 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java @@ -29,7 +29,7 @@ public class BackgroundUIComboBoxPane extends BasicPane { private static final long serialVersionUID = -3751191424737067321L; protected static final String none = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None"); - protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Colors"); + protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Colors"); protected static final String image = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image"); protected static final String gradient = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color"); diff --git a/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java b/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java index 3cfbf7ab4..7b5395226 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java @@ -32,7 +32,7 @@ import java.io.File; */ public class ImageSelectPane extends BackgroundPane4BoxChange { private static final long serialVersionUID = -3938766570998917557L; - private static String layoutCenter = com.fr.design.i18n.Toolkit.i18nText("Default"); + private static String layoutCenter = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"); private static String layoutTitled = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Titled"); private String suffix = PictureCollection.DEFAULT_SUFFIX; diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java index c39932034..ffb4e1eb0 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java @@ -63,7 +63,7 @@ public class PatternBackgroundPane extends BPane { protected void setChildrenOfContentPane(JPanel contentPane) { // colors - JPanel colorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Colors")); + JPanel colorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Colors")); contentPane.add(colorPane); foregroundColorPane = new ColorSelectBox(80); @@ -72,12 +72,12 @@ public class PatternBackgroundPane extends BPane { backgroundColorPane.setSelectObject(Color.black); colorPane.add(Box.createHorizontalStrut(2)); - colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Foreground") + colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground") + ":", foregroundColorPane)); colorPane.add(Box.createHorizontalStrut(8)); - colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Background") + colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background") + ":", backgroundColorPane)); } diff --git a/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java b/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java index 503f7d364..3fe70120f 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java @@ -31,9 +31,9 @@ public class PatternUIComboBoxPane extends BackgroundPane4BoxChange { this.add(pane, BorderLayout.NORTH); pane.add(patternBox = new PatternSelectBox(80)); - pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Foreground") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground") + ":")); pane.add(foreColor = new ColorSelectBox(80)); - pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background") + ":")); + pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background") + ":")); pane.add(backColor = new ColorSelectBox(80)); } diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorUIComboBoxPane.java b/designer-base/src/main/java/com/fr/design/style/color/ColorUIComboBoxPane.java index 6aca12ffc..b2dafe6fa 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorUIComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorUIComboBoxPane.java @@ -53,7 +53,7 @@ public class ColorUIComboBoxPane extends BackgroundPane4BoxChange { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java index 88e241341..5232ab3af 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java @@ -36,7 +36,7 @@ public class DetailColorSelectPane extends BasicPane { this.setBorder(BorderFactory.createEmptyBorder(4, 4, 0, 4)); this.setLayout(FRGUIPaneFactory.createBorderLayout()); - JPanel titledefaultPane=FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Color")); + JPanel titledefaultPane=FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")); JPanel defaultPane =FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); this.add(titledefaultPane, BorderLayout.WEST); titledefaultPane.add(defaultPane); diff --git a/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java b/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java index 5e63ac72d..d80f37449 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java @@ -41,7 +41,7 @@ public abstract class TransparentPane extends BasicPane { initCenterPaneChildren(centerPane); - UIButton customButton = new CustomButton(com.fr.design.i18n.Toolkit.i18nText("Custom") + UIButton customButton = new CustomButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom") + "..."); this.add(customButton, BorderLayout.SOUTH); customButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java index d0d0b859d..240176eef 100644 --- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java @@ -227,7 +227,7 @@ public class DesignUtils { //先初始化的设计器locale, 后初始化lookandfeel.如果顺序改了, 这边也要调整. Locale designerLocale = GeneralContext.getLocale(); - String file = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"); + String file = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File"); char displayChar = file.charAt(0); if (!guiFRFont.canDisplay(displayChar)) { //如果不能用默认的语言显示字体, 比如想在英文系统里用中文设计器 diff --git a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java index 5427d54d2..6e674da63 100644 --- a/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java +++ b/designer-base/src/main/java/com/fr/design/web/CustomIconPane.java @@ -183,7 +183,7 @@ public class CustomIconPane extends BasicPane { } private void initEditButton(JPanel buttonPane) { - editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); + editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); editButton.setPreferredSize(new Dimension(80, 25)); editButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java b/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java index 02367a341..bca66e426 100644 --- a/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java @@ -29,7 +29,7 @@ public class IconDefinePane extends BasicPane { labelPane.setLayout(new /**/ FlowLayout(FlowLayout.LEFT, 20, 0)); showIconImageLable = new UILabel(); showIconImageLable.setPreferredSize(new Dimension(20, 20)); - editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); + editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); JPanel iconButtonPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); labelPane.add(showIconImageLable); iconPane.add(labelPane, BorderLayout.WEST); diff --git a/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java b/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java index d72a11ab7..4e8aeec01 100644 --- a/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java @@ -34,7 +34,7 @@ public class WidgetBoundsPaneFactory { final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); boundsPane.add(panel); - return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane); + return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 280, 24, boundsPane); } public static JPanel createRightPane(Component com1, Component com2){ double f = TableLayout.FILL; @@ -70,7 +70,7 @@ public class WidgetBoundsPaneFactory { centerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); boundsPane.add(northPanel, BorderLayout.NORTH); boundsPane.add(centerPanel, BorderLayout.CENTER); - return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 230, 24, boundsPane); + return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 230, 24, boundsPane); } @@ -87,6 +87,6 @@ public class WidgetBoundsPaneFactory { final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L6); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); boundsPane.add(panel); - return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"), 280, 24, boundsPane); + return new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"), 280, 24, boundsPane); } } diff --git a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java index eb0c1d4b1..9be9a8fba 100644 --- a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java +++ b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java @@ -28,8 +28,8 @@ public class ButtonConstants { }; public static final String[] TYPES4BUTTON = { - com.fr.design.i18n.Toolkit.i18nText("Common"), - com.fr.design.i18n.Toolkit.i18nText("Custom"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Insert_Row"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Delete_Row"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Type_Parameter_Submit"), diff --git a/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java b/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java index 89bff0cf0..99e642425 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java @@ -34,7 +34,7 @@ public abstract class BackgroundCompPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); UILabel headLabel = createUILable(); initBackgroundEditor(); - String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")}; + String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")}; double f = TableLayout.FILL; final double p = TableLayout.PREFERRED; @@ -68,7 +68,7 @@ public abstract class BackgroundCompPane extends BasicPane { } protected UILabel createUILable(){ - return new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background")); + return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")); } public void update(T e){ diff --git a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java index ddcb98f86..656b42283 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java @@ -22,7 +22,7 @@ public class DateValuePane extends JPanel { private UIButtonGroup widgetValueHead; private Editor[] editor; private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"); - private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date"); + private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"); private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"); diff --git a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java index 145c6e989..095d86777 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java @@ -42,9 +42,9 @@ public abstract class CustomJobPane extends BasicBeanPane { GraphHelper.getLocTextWidth("FR-Designer_Select") + 20, classNameTextField.getPreferredSize().height)); - UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); + UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); editButton.setPreferredSize(new Dimension( - GraphHelper.getLocTextWidth("FR-Designer_Edit") + 20, + GraphHelper.getLocTextWidth("Fine-Design_Basic_Edit") + 20, classNameTextField.getPreferredSize().height)); reportletNamePane.add(browserButton); diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java index 8e13f0e9d..a7dd9f564 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java @@ -56,7 +56,7 @@ public class ChartDialog extends MiddleChartDialog { this.add(buttonPane, BorderLayout.SOUTH); ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); - cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); + cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")); buttonPane.add(ok); buttonPane.add(cancel); diff --git a/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java b/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java index de2d67cb5..59f1e397a 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java @@ -16,7 +16,7 @@ public class BorderAttriPane extends BasicPane { private ColorSelectBox colorSelectBox; public BorderAttriPane() { - this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Color")); + this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")); } public BorderAttriPane(String lineString, String colorSting) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java index 55063796a..ef043c838 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java @@ -84,7 +84,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane { typePane.add(maPane); maPane.add(maButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Move_Average"))); - maPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle") + ":")); + maPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle") + ":")); maPane.add(maSpinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 999, 1))); maSpinner.setEnabled(false); @@ -101,10 +101,10 @@ public class ConditionTrendLinePane extends BasicBeanPane { extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward") + ":")); extendsPane.add(forwardLabel = new UITextField("0", 5)); - extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle"))); + extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle"))); extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Backward") + ":")); extendsPane.add(backwardLabel = new UITextField("0", 5)); - extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle"))); + extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle"))); return extendsPane; } diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrCustomPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrCustomPane.java index 2d421de9e..f5921b94d 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrCustomPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrCustomPane.java @@ -19,7 +19,7 @@ public class DataSeriesAttrCustomPane extends DataSeriesAttrPane { public NameableCreator[] createNameableCreators() { return new NameableCreator[] { - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), CustomAttr.class, DataSeriesCustomConditionPane.class) + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), CustomAttr.class, DataSeriesCustomConditionPane.class) }; } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java index 9167d0b94..7c452f98b 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java @@ -37,7 +37,7 @@ public class DataSeriesAttrPane extends JListControlPane { @Override public NameableCreator[] createNameableCreators() { return new NameableCreator[]{ - new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, DataSeriesConditionPaneFactory.findConfitionPane4DataSeries(plot)) + new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), ConditionAttr.class, DataSeriesConditionPaneFactory.findConfitionPane4DataSeries(plot)) }; } diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java index 961b851f9..858fa605e 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java @@ -32,10 +32,10 @@ public class LabelBackgroundPane extends ConditionAttrSingleConditionPane { Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Arrow_Style")), switchStyleGroup, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), timeInterval, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base-Time_Second"))}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background")),colorSelectBox4carousel, null} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")),colorSelectBox4carousel, null} }; return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); @@ -143,7 +143,7 @@ public class ChangeConfigPane extends BasicBeanPane { private JPanel createButtonBackgroundColorPane(){ colorSelectBox4button = new ColorSelectBoxWithOutTransparent(WIDTH); - return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Background"), colorSelectBox4button, EDIT_AREA_WIDTH); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), colorSelectBox4button, EDIT_AREA_WIDTH); } private JPanel createButtonConfigPane() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDesignerOtherPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDesignerOtherPane.java index 10df74d92..4f109bd55 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDesignerOtherPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDesignerOtherPane.java @@ -37,7 +37,7 @@ public class ChartDesignerOtherPane extends ChartOtherPane { * @return 返回标题. */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Advanced"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"); } private boolean isHaveCondition() { diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/PresentComboBox.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/PresentComboBox.java index a0ead25d1..36da97114 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/PresentComboBox.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/PresentComboBox.java @@ -24,7 +24,7 @@ public class PresentComboBox extends UIComboBox{ private Present present; private String[] ITEMS = { - com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary"), com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"), com.fr.design.i18n.Toolkit.i18nText("Present-No_Present") }; 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 1fa65aa25..816aea72b 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 @@ -25,7 +25,7 @@ public class XYScatterPlotReportDataContentPane extends AbstractReportDataConten public XYScatterPlotReportDataContentPane(ChartDataPane parent) { initEveryPane(); - this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Data_Filter")), "0,4,2,4"); + this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter")), "0,4,2,4"); this.add(filterPane = new ChartDataFilterPane(new XYScatterPlot(), parent), "0,6,2,4"); } 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 0f8945538..778be9a29 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 @@ -55,7 +55,7 @@ public class ChartAxisLineStylePane extends BasicPane{ Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type")),axisLineStyle} , - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")),axisLineColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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("Fine-Design_Chart_Second_Graduation_Line")),null}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitleNoFormulaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitleNoFormulaPane.java index 6160199cb..ce6b9adf3 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitleNoFormulaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitleNoFormulaPane.java @@ -39,7 +39,7 @@ public class ChartAxisTitleNoFormulaPane extends BasicPane { } private void initComponents(){ - isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Axis_Title")); + isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Title")); axisTitleContentPane = new UITextField(); axisTitleAttrPane = new ChartTextAttrPane(); axisTitleAttrPane.populate(FRFont.getInstance("Microsoft YaHei", Font.PLAIN, 9)); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java index db69bf9f5..06bed8a6e 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java @@ -38,7 +38,7 @@ public class ChartAxisTitlePane extends BasicPane{ } private void initComponents(){ - isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Axis_Title")); + isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Title")); axisTitleContentPane = new TinyFormulaPane(); axisTitleAttrPane = new ChartTextAttrPane(); axisTitleAttrPane.populate(FRFont.getInstance("Microsoft YaHei", Font.PLAIN, 9)); 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 aa0fc21d0..9e4fcecfe 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 @@ -16,7 +16,7 @@ public class ChartBeautyPane extends BasicBeanPane{ private UIComboBox styleBox; public ChartBeautyPane() { - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Common"), + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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("Fine-Design_Chart_Top_Down_Shade"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Transparent") //新加的两种风格，注意兼容处理 }; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java index 90f94d95a..8c9cbb0b9 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java @@ -35,7 +35,7 @@ public class ChartBorderPane extends BasicPane{ double[] rowSize = {p, p, p, p}; Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")+":"),currentLineCombo}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")+":"),currentLineColorPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")+":"),currentLineColorPane}, new Component[]{null,isRoundBorder} } ; JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Border"},components,rowSize,columnSize); 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 f99084848..5b1dca34c 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 @@ -135,7 +135,7 @@ public class ChartFillStylePane extends BasicBeanPane{ private String[] getNameObj() { ChartPreStyleConfig config = ChartPreStyleConfig.getInstance(); ArrayList nameArr = new ArrayList(); - nameArr.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT")); + nameArr.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default")); Iterator keys = config.names(); while (keys.hasNext()) { Object key = keys.next(); 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 072508643..59548d18e 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 @@ -96,7 +96,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ // 最小值. minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Min_Value")); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1); Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; minValueField = new ValueEditorPane(editor); @@ -112,7 +112,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ // 最大值 maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Value")); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1); Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; maxValueField = new ValueEditorPane(editor); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java index d646c7f87..00471c19f 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java @@ -74,7 +74,7 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane { gridColorPane = new ColorSelectBox(100); JPanel container = TableLayoutHelper.createTableLayoutPane(new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Color")),gridColorPane},} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")),gridColorPane},} , rowSize, columnSize); Component[][] components = new Component[][]{ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java index e13420324..df60e41d7 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java @@ -28,7 +28,7 @@ public class Plot3DAxisAreaPane extends ChartAxisAreaPane { Component[][] components = new Component[][]{ new Component[]{gridLine,null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Color")),gridColorPane,} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")),gridColorPane,} }; JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java index 9aeb036a1..51c165743 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java @@ -36,7 +36,7 @@ public class RadarAxisAreaPane extends ChartAxisAreaPane { new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Interval_Back") + ":"),horizontalColorPane}, new Component[]{new JSeparator(),null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Main_Grid")),null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Color")),gridColorPane,} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")),gridColorPane,} }; JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java index 6b9010053..c54469870 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java @@ -93,11 +93,11 @@ public class ChartDataLabelPane extends BasicScrollPane{ protected String[] getLabelLocationNameArray() { Plot plot = chart.getPlot(); if(plot instanceof BarPlot){ - return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Outside"), com.fr.design.i18n.Toolkit.i18nText("Center")}; + return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Outside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center")}; }else if(plot instanceof PiePlot){ return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_In_Pie"), com.fr.design.i18n.Toolkit.i18nText("Chart_Out_Pie")}; }else if(plot instanceof RangePlot){ - return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Center")}; + return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center")}; }else if(plot instanceof BubblePlot){ return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Inside"), com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Outside")}; }else{ diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java index 50b485ae8..a004d9623 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java @@ -36,7 +36,7 @@ public class Pie2DSeriesPane extends AbstractPlotSeriesPane { protected void initCom() { stylePane = new ChartBeautyPane(); isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Second_Plot")); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Style")}; Integer[] valueArray = {0, 1}; secondPlotType = new UIButtonGroup(nameArray, valueArray); smallPercent = new UIBasicSpinner(new SpinnerNumberModel(5, 0, 100, 1)); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java index 0eb889e21..fc0dd6d97 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java @@ -51,14 +51,14 @@ public class StockSeriesPane extends AbstractPlotSeriesPane { Component[][] components = new Component[][]{ new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UpBar_Border_Style_And_Color")), null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upLineBox}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Border-Color")), upBorderColor}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Color")), upBorderColor}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upBackColor}, new Component[]{new JSeparator(),null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Down_Bar_Border_Style_And_Color")), null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downLineBox}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Border-Color")), downBorderColor}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Color")), downBorderColor}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downBackColor}, } ; 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 decd3cd23..20613d45e 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 @@ -116,7 +116,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { selectFilePane.setBorder(BorderFactory.createEmptyBorder(TEN, FIVE, 0, THIRTY)); - defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT")); + defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default")); customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Custom")); ButtonGroup buttonGroup = new ButtonGroup(); defaultRadioButton.setSelected(true); 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 7f70df78b..66a103e65 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 @@ -74,7 +74,7 @@ public class ChartPreFillStylePane extends BasicBeanPane { double[] columnSize = {p, p}; double[] rowSize = {p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("ColorMatch")), null}, + new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match")), null}, new Component[]{null, customPane}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java index cdce6c840..e395f26e9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java @@ -24,7 +24,7 @@ public class VanChartFillStylePane extends ChartFillStylePane { double[] columnSize = {f, e}; double[] rowSize = {p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ColorMatch")),styleSelectBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match")),styleSelectBox}, new Component[]{null,customPane}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java index 90e3302c3..db76fe301 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java @@ -181,7 +181,7 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem } private void addCancelButton(JPanel buttonsPane) { - cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); + cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")); buttonsPane.add(cancelButton); cancelButton.addActionListener(new ActionListener() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java index 617ce56a2..914d973a9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java @@ -30,14 +30,14 @@ public class VanChartConditionListControlPane extends VanChartUIListControlPane public void populate(Nameable[] nameableArray, Class showPane) { initComponentPane(); this.setBorder(null); - NameObjectCreator[] creators = new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, showPane)}; + NameObjectCreator[] creators = new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), ConditionAttr.class, showPane)}; refreshNameableCreator(creators); super.populate(nameableArray); } @Override public NameableCreator[] createNameableCreators() { - return new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, ChartTypeInterfaceManager.getInstance().getPlotConditionPane((Plot) plot).getClass())}; + return new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), ConditionAttr.class, ChartTypeInterfaceManager.getInstance().getPlotConditionPane((Plot) plot).getClass())}; } @@ -67,7 +67,7 @@ public class VanChartConditionListControlPane extends VanChartUIListControlPane @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java index ce6273251..927593ef6 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java @@ -201,7 +201,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { // 最小值. minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Min_Value")); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1); Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; minValueField = new ValueEditorPane(editor); @@ -216,7 +216,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { // 最大值 maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Max_Value")); Date tmp = null; - DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1); + DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1); Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; maxValueField = new ValueEditorPane(editor); diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java index b85e1854e..1758622a9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapSourceChoosePane.java @@ -152,7 +152,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver { panel.add(createMapSourcesPane(), BorderLayout.NORTH); panel.add(createGISLayerPane(), BorderLayout.CENTER); - JPanel BasePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), panel); + JPanel BasePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), panel); Component[][] comps = new Component[][]{ new Component[]{BasePane}, 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 9dc8c5f0a..2d3f3dac4 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 @@ -12,7 +12,6 @@ import com.fr.design.designer.beans.AdapterBus; import com.fr.design.designer.beans.ComponentAdapter; import com.fr.design.designer.beans.models.SelectionModel; import com.fr.design.designer.properties.mobile.ChartEditorPropertyUI; -import com.fr.design.designer.properties.mobile.ElementCasePropertyUI; import com.fr.design.fun.WidgetPropertyUIProvider; import com.fr.design.gui.chart.BaseChartPropertyPane; import com.fr.design.gui.chart.MiddleChartComponent; @@ -26,7 +25,6 @@ import com.fr.form.ui.Widget; import com.fr.design.form.util.XCreatorConstants; import com.fr.stable.Constants; -import com.fr.stable.GraphDrawHelper; import com.fr.stable.core.PropertyChangeAdapter; /** @@ -98,7 +96,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator { */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")), new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { 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 1b94afae0..e745af1b1 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 @@ -37,7 +37,7 @@ public class XCheckBoxGroup extends XFieldEditor { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor()); CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor()); return properties; diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java b/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java index 3368dd137..cc291eb58 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XComboBox.java @@ -41,7 +41,7 @@ public class XComboBox extends XCustomWriteAbleRepeatEditor { return (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), - new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class) + new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(DictionaryRenderer.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") }, super.supportedDescriptor()); } 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 fcece5001..f2bf95aec 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 @@ -79,7 +79,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetName", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Name")), + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")), new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Visible")).setPropertyChangeListener(new PropertyChangeAdapter() { 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 803871b9e..472eda716 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 @@ -33,7 +33,7 @@ public class XIframeEditor extends XWidgetCreator { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { - new CRPropertyDescriptor("src", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Url")) + new CRPropertyDescriptor("src", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Form_Url")) .setPropertyChangeListener(new PropertyChangeAdapter() { @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java index e11c812a8..b886ad6c4 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java @@ -50,7 +50,7 @@ public class XNameWidget extends XWidgetCreator { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")), + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")), new CRPropertyDescriptor("name", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_NameWidget-Name")).setEditorClass( NameWidgetComboboxEditor.class).setPropertyChangeListener(new PropertyChangeAdapter() { diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java b/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java index 7a252c17d..2b54ef073 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java @@ -44,7 +44,7 @@ public class XRadioGroup extends XFieldEditor { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass( DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor()); CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor()); return properties; 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 fed7d7079..54a450fc2 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 @@ -42,7 +42,7 @@ public class XTreeEditor extends XWidgetCreator { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class) @@ -56,7 +56,7 @@ public class XTreeEditor extends XWidgetCreator { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("model", this.data.getClass(), "getNodeOrDict", "setNodeOrDict").setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")).setEditorClass(TreeModelEditor.class).setRendererClass( TreeModelRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( 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 da3ae8c52..b219530f7 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 @@ -486,7 +486,7 @@ public class XWAbsoluteLayout extends XLayoutContainer { g2d.setColor(Color.WHITE); //画编辑文字 g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5); + g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"), x + w / 2 - 2, y + h / 2 + 5); g.setColor(XCreatorConstants.FORM_BORDER_COLOR); GraphHelper.draw(g, new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2, getHeight() - BORDER_WIDTH * 2), Constants.LINE_MEDIUM); paintExtro(g); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWBorderLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWBorderLayout.java index 9aa0598b4..a7b74d0fd 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWBorderLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWBorderLayout.java @@ -73,7 +73,7 @@ public class XWBorderLayout extends XLayoutContainer { */ public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return new CRPropertyDescriptor[] { - new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")) + new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")) }; } 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 667d6af3f..bdd7e7e41 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 @@ -60,7 +60,7 @@ public class XWParameterLayout extends XWAbsoluteLayout { CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{ 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")) + .setRendererClass(BackgroundRenderer.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("delayDisplayContent", this.data.getClass()).setEditorClass(BooleanEditor.class) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query")) 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 56c1dead1..9118a4594 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 @@ -38,7 +38,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("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")), new CRPropertyDescriptor("enabled", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Enabled")) .setPropertyChangeListener(new PropertyChangeAdapter() { diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java index fd7cdbab2..9c4fbab08 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java @@ -390,7 +390,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout { g2d.setColor(Color.WHITE); //画编辑文字 g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"), x + w / 2 - 2, y + h / 2 + 5); + g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"), x + w / 2 - 2, y + h / 2 + 5); g.setColor(XCreatorConstants.FORM_BORDER_COLOR); GraphHelper.draw(g, new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2, getHeight() - BORDER_WIDTH * 2), Constants.LINE_MEDIUM); paintExtro(g); diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java index e45a632b3..0de7ba670 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutPropertiesGroupModel.java @@ -53,7 +53,7 @@ public class FRBorderLayoutPropertiesGroupModel implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("BorderLayout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Border_Layout"); } @Override 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 8ac065a12..14665dd3d 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 @@ -78,7 +78,7 @@ public class HorizontalLayoutPropertiesGroupModel implements GroupModel { case 1: return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vgap"); default: - return com.fr.design.i18n.Toolkit.i18nText("Alignment"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alignment"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/HorizontalAlignmentItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/HorizontalAlignmentItems.java index b00bb15df..742ffdb97 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/HorizontalAlignmentItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/HorizontalAlignmentItems.java @@ -9,7 +9,7 @@ public class HorizontalAlignmentItems implements ItemProvider { private static Item[] VALUE_ITEMS = { new Item(com.fr.design.i18n.Toolkit.i18nText("Left"), FlowLayout.LEFT), new Item(com.fr.design.i18n.Toolkit.i18nText("Right"), FlowLayout.RIGHT), - new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), FlowLayout.CENTER) + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), FlowLayout.CENTER) }; @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/LabelHorizontalAlignmentItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/LabelHorizontalAlignmentItems.java index b52bfee8d..55a1baab7 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/LabelHorizontalAlignmentItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/LabelHorizontalAlignmentItems.java @@ -9,7 +9,7 @@ public class LabelHorizontalAlignmentItems implements ItemProvider { private static Item[] VALUE_ITEMS = { new Item(com.fr.design.i18n.Toolkit.i18nText("Left"), SwingConstants.LEFT), new Item(com.fr.design.i18n.Toolkit.i18nText("Right"), SwingConstants.RIGHT), - new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), SwingConstants.CENTER) + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), SwingConstants.CENTER) }; @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java index f35f099d8..9f3aff857 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java @@ -7,7 +7,7 @@ public class UnderlineItems implements ItemProvider { private static Item[] VALUE_ITEMS = { new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None"), ""), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), "overline"), - new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), "line-through"), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), "line-through"), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), "underline")}; @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java index 845ebbd50..5c835e85e 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/WidgetDisplayPositionItems.java @@ -13,7 +13,7 @@ public class WidgetDisplayPositionItems implements ItemProvider{ //这里为了和web端一致，只好设置成012了 private static Item[] VALUE_ITEMS = { new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"), FormConstants.LEFTPOSITION), - new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), FormConstants.CENTERPOSITION), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), FormConstants.CENTERPOSITION), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right"), FormConstants.RIGHTPOSITION) }; diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java index 70dddbd53..8e1a5abc9 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/FormHyperlinkGroupPane.java @@ -33,8 +33,8 @@ public class FormHyperlinkGroupPane extends HyperlinkGroupPane { public NameableCreator[] createNameableCreators() { NameableCreator[] creators = super.createNameableCreators(); for (int i = 0; i < creators.length; i++) { - if (ComparatorUtils.equals(creators[i].menuName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"))) { - creators[i] = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email"), EmailJavaScript.class, FormEmailPane.class); + if (ComparatorUtils.equals(creators[i].menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"))) { + creators[i] = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"), EmailJavaScript.class, FormEmailPane.class); break; } } diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java index c92db66a6..1b58d0a9b 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java @@ -68,10 +68,10 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab this.add(selectTreeDataPanel, BorderLayout.NORTH); - valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); + valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Columns"))}); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); - textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor}); + textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Columns")), formulaEditor}); Component[][] coms = { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + ":"), valuePane}, @@ -98,15 +98,15 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab List namelist = tableDataWrappe.calculateColumnNameList(); String[] columnNames = new String[namelist.size()]; namelist.toArray(columnNames); - valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); + valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"))}, 1); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); - textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); + textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")), formulaEditor}, 1); } catch (Exception e) { - valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); + valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"))}, 1); FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); - textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); + textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")), formulaEditor}, 1); } } 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 9718a6d8d..275730d8f 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 @@ -149,7 +149,7 @@ public class FormEditToolBar extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"); } public void populate(FormToolBar ftoolbar) { @@ -361,7 +361,7 @@ public class FormEditToolBar extends BasicPane { 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)); + customPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit") + "JS", null)); button.addActionListener(l); return customPane; } 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 71f3a97de..e54dd0968 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 @@ -43,10 +43,10 @@ public class WLayoutSelectionPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); Component[][] coms = { - {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("BorderLayout")), new + {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Border_Layout")), new BorderLayoutPane()}, {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("Fine-Design_Form_Card_Layout")), new CardLayoutPane()}, {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Null_Layout")), new AbsoluteLayoutPane()}}; double p = TableLayout.PREFERRED; double f = TableLayout.FILL; 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 d357f3411..31aba0ea5 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 @@ -21,8 +21,8 @@ import com.fr.design.layout.FRGUIPaneFactory; 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("Fine-Design_Form_Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown"), new Color(153, 51, 0)}, + private Object[] colors = new Object[]{new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Black"), new Color(0, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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("Fine-Design_Form_Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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("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("Fine-Design_Form_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)}, @@ -69,7 +69,7 @@ public class ColorPalette extends JPopupMenu { bottom_bar.setLayout(new /**/GridLayout(1, 1)); bottom_bar.setBorderPainted(false); bottom_bar.setFloatable(false); - btnCustom = getBtn(com.fr.design.i18n.Toolkit.i18nText("Custom") + "..."); + btnCustom = getBtn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom") + "..."); bottom_bar.add(btnCustom); return bottom_bar; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java index 3de67f691..58db81473 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java @@ -18,7 +18,7 @@ import com.fr.design.gui.icombobox.DictionaryComboBox; */ public class AdjustModeEditor extends AbstractPropertyEditor { public static final String[] AjustRowTypes = new String[] { - com.fr.design.i18n.Toolkit.i18nText("No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Row_Height"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Column_Width"), com.fr.design.i18n.Toolkit.i18nText("Default")}; + com.fr.design.i18n.Toolkit.i18nText("No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Row_Height"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Column_Width"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default")}; private UIComboBox combobox; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ButtonTypeEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ButtonTypeEditor.java index 8f739f8c1..9d9dae729 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ButtonTypeEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/ButtonTypeEditor.java @@ -7,7 +7,7 @@ import com.fr.stable.StringUtils; public class ButtonTypeEditor extends ComboEditor { public ButtonTypeEditor() { - super(new Item[] { new Item(com.fr.design.i18n.Toolkit.i18nText("Default"), false), new Item(com.fr.design.i18n.Toolkit.i18nText("Custom"), true), }); + super(new Item[] { new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"), false), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"), true), }); } @Override diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java index b7fbade3f..5b359c9ac 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java @@ -27,7 +27,7 @@ public class BasicSetVisiblePropertyPane extends FormBasicPropertyPane { pane2.add(otherOtherConfig); } visibleCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Visible"), true); - visibleCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")); + visibleCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic")); visibleCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); pane2.add(visibleCheckBox); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java index 5755e1959..138434d30 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormBasicWidgetPropertyPane.java @@ -16,8 +16,8 @@ public class FormBasicWidgetPropertyPane extends BasicSetVisiblePropertyPane { } public UICheckBox createOtherConfig() { - enableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Enabled"), true); - enableCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")); + enableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Enabled"), true); + enableCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic")); enableCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); return enableCheckBox; 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 3651501d4..65e2f6659 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 @@ -152,7 +152,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { widgetPropertyPane = WidgetBasicPropertyPaneFactory.createBasicPropertyPane(innerCreator); - UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 280, 20, widgetPropertyPane); + UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic"), 280, 20, widgetPropertyPane); jPanel.add(uiExpandablePane, BorderLayout.NORTH); @@ -212,7 +212,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { public void updateCreator() { currentEditorDefinePane.setGlobalName(getGlobalName()); Widget widget = currentEditorDefinePane.updateBean(); - if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")) && widgetPropertyPane != null) { + if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic")) && widgetPropertyPane != null) { UITextField widgetNameField = widgetPropertyPane.getWidgetNameField(); if (designer.getTarget().isNameExist(widgetNameField.getText()) && !ComparatorUtils.equals(widgetNameField.getText(), widget.getWidgetName())) { widgetNameField.setText(widget.getWidgetName()); @@ -229,7 +229,7 @@ public class FormWidgetCardPane extends AbstractAttrNoScrollPane { } public void updateWidgetBound() { - if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size"))) { + if (widgetBoundPane != null && ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size"))) { widgetBoundPane.update(); designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_RESIZED); } 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 0dcda3139..571ab9887 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("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"); + 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("Fine-Design_Report_Event"); } } } 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 53bbc1f56..543f8db79 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 @@ -62,7 +62,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane(new String[] {com.fr.design.i18n.Toolkit.i18nText("Date") , com.fr.design.i18n.Toolkit.i18nText("String")}); + returnTypeComboBox = new UIButtonGroup<>(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date") , com.fr.design.i18n.Toolkit.i18nText("String")}); JPanel formatHead = createFormatHead(); startDv = new DateValuePane(); endDv = new DateValuePane(); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DictEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DictEditorDefinePane.java index 46183d955..f76e377b1 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DictEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DictEditorDefinePane.java @@ -23,7 +23,7 @@ public abstract class DictEditorDefinePane { Component[][] coms = { { horizontalCheck, null }, { verticalCheck, null }, - { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Url") + ":"), srcTextField = new UITextField() }, + { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Form_Url") + ":"), srcTextField = new UITextField() }, { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Parameter") + ":"), parameterViewPane = new ReportletParameterViewPane() } }; int[][] rowCount = {{1, 1},{1, 1},{1, 1}, {1, 1}}; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(coms, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, 5); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java index 570c0d1f3..00caec3b8 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java @@ -43,7 +43,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane public void phoneRegChangeAction(RegPane.PhoneRegEvent e) { if (StringUtils.isNotEmpty(e.getPhoneRegString()) && StringUtils.isEmpty(waterMarkDictPane.getText())) { - waterMarkDictPane.setText(com.fr.design.i18n.Toolkit.i18nText("Example") + ":" + e.getPhoneRegString()); + waterMarkDictPane.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Example") + ":" + e.getPhoneRegString()); regPane.addRegChangeListener(rl); } } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java index 30422ecc5..3c7158f82 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/TreeEditorDefinePane.java @@ -71,7 +71,7 @@ public class TreeEditorDefinePane extends CustomWritableRepeatEditorPane extends Field Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField}, new Component[]{widgetValueLabel, formWidgetValuePane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")), dictionaryEditor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")), dictionaryEditor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font")), fontSizePane}, new Component[]{buttonGroupDictPane, null} }; diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java index aedf4d65d..36b7df8dd 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java @@ -77,7 +77,7 @@ public class FormWidgetValuePane extends JPanel { case DataControl.TYPE_BOOLEAN: return new BooleanEditor(false); case DataControl.TYPE_DATE: - return new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Date")); + return new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")); case DataControl.TYPE_TABLEDATA: return onlyServer ? new ServerDataTableEditor() : new DataTableEditor(); default: diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java index c9bafe07a..51811d763 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java @@ -30,10 +30,10 @@ public class WidgetAbsoluteBoundPane extends WidgetBoundPane { y = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); width = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); height = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); - x.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size")); - y.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size")); - width.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size")); - height.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size")); + x.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size")); + y.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size")); + width.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size")); + height.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size")); this.add(WidgetBoundsPaneFactory.createAbsoluteBoundsPane(x, y, width, height)); } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java index b498428c4..26861e7ec 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java @@ -58,8 +58,8 @@ public class WidgetBoundPane extends BasicPane { public void initBoundPane() { width = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); height = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); - width.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size")); - height.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size")); + width.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size")); + height.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size")); if (creator.acceptType(XWCardLayout.class)) { width.setEnabled(false); height.setEnabled(false); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetCardTagBoundPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetCardTagBoundPane.java index a590c76d9..97bc5aaa3 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetCardTagBoundPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetCardTagBoundPane.java @@ -29,7 +29,7 @@ public class WidgetCardTagBoundPane extends WidgetBoundPane { @Override public void initBoundPane() { cardTagWidth = new UIBoundSpinner(0, Integer.MAX_VALUE, 1); - cardTagWidth.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Coords_And_Size")); + cardTagWidth.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Coords_And_Size")); this.add(WidgetBoundsPaneFactory.createCardTagBoundPane(cardTagWidth)); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/StyleAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/StyleAction.java index b0d5ed055..2271baa87 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/StyleAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/StyleAction.java @@ -27,7 +27,7 @@ public class StyleAction extends UpdateAction { * @param e 事件 */ public void actionPerformed(ActionEvent e) { - CellElementPropertyPane.getInstance().GoToPane(new String[] { com.fr.design.i18n.Toolkit.i18nText("Style"), com.fr.design.i18n.Toolkit.i18nText("Custom") }); + CellElementPropertyPane.getInstance().GoToPane(new String[] { com.fr.design.i18n.Toolkit.i18nText("Style"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom") }); } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java b/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java index 304ec1676..8a93bb227 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java @@ -220,7 +220,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Border"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"); } } diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java index 617957056..df56afc58 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java @@ -107,7 +107,7 @@ public class AlignmentAction extends ButtonGroupAction implements StyleActionInt UIButtonGroup group = super.createToolBarComponent(); if (group != null) { group.setForToolBarButtonGroup(true); - group.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"), com.fr.design.i18n.Toolkit.i18nText("Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right")}); + group.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right")}); } for (int i = 0; i < 3; i++) { group.getButton(i).setRoundBorder(true, UIConstants.ARC); diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java index 8b3e21347..adc5409ef 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java @@ -25,7 +25,7 @@ public class ReportFontForegroundAction extends AbstractStyleAction implements C public ReportFontForegroundAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Foreground")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground")); } public void stateChanged(ChangeEvent evt) { diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java index 3725f8df3..4ce5d2f70 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java @@ -25,7 +25,7 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change public StyleBackgroundAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Background")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")); } public void stateChanged(ChangeEvent evt) { diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnBasicAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnBasicAction.java index 306bd2405..ddd10ad55 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnBasicAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnBasicAction.java @@ -20,7 +20,7 @@ public class DSColumnBasicAction extends CellSelectionAction { public DSColumnBasicAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Basic")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Basic")); // this.setMnemonic('B'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif")); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteColumnAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteColumnAction.java index 39a790046..c08a62253 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteColumnAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteColumnAction.java @@ -51,7 +51,7 @@ public class DeleteColumnAction extends CellSelectionAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Column"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertColumnAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertColumnAction.java index 4db7ab942..c093fde0e 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertColumnAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertColumnAction.java @@ -38,7 +38,7 @@ public class InsertColumnAction extends CellSelectionAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Column"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/condition/BackPane.java b/designer-realize/src/main/java/com/fr/design/condition/BackPane.java index 8ee6bedcd..5187c1f32 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/BackPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/BackPane.java @@ -31,7 +31,7 @@ public class BackPane extends ConditionAttrSingleConditionPane backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background") + ":"); this.backgroundPreviewPane = new BackgroundPreviewLabel(); this.backgroundPreviewPane.setPreferredSize(new Dimension(80, 20)); - UIButton editBackgroundButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); + UIButton editBackgroundButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); editBackgroundButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { final BackgroundPane backgroundPane = new BackgroundPane(); diff --git a/designer-realize/src/main/java/com/fr/design/condition/BorderHighlightPane.java b/designer-realize/src/main/java/com/fr/design/condition/BorderHighlightPane.java index ca82a1af3..d61761366 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/BorderHighlightPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/BorderHighlightPane.java @@ -26,7 +26,7 @@ public class BorderHighlightPane extends ConditionAttrSingleConditionPane frFontPreviewPane = new FRFontPreviewArea(); frFontPreviewPane.setBorder(BorderFactory.createTitledBorder("")); frFontPreviewPane.setPreferredSize(new Dimension(80, 20)); - UIButton editFRFontButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Edit")); + UIButton editFRFontButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); editFRFontButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { final FRFontPane frFontPane = new FRFontPane(); diff --git a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java index 271612952..643ad7890 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java @@ -33,7 +33,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane { } public void setSelctedByName(String id) { - jcb.setSelectedIndex(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Custom"),id)? 0 : 1); + jcb.setSelectedIndex(ComparatorUtils.equals(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"),id)? 0 : 1); } public Style updateStyle(Style style) { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/form/FormTabPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/form/FormTabPane.java index fba76bf76..f158b3936 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/form/FormTabPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/form/FormTabPane.java @@ -61,7 +61,7 @@ public class FormTabPane extends JComponent implements MouseListener, MouseMotio super.paintComponent(g); Graphics2D g2d = (Graphics2D) g; calculateECWidth(); - paintFormTab(g2d, 0, com.fr.design.i18n.Toolkit.i18nText("Form"), POLY_SHEET_ICON); + paintFormTab(g2d, 0, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form"), POLY_SHEET_ICON); paintECTab(g2d, formTabWidth, elementCase.getElementCaseContainerName(), WORK_SHEET_ICON); } diff --git a/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java b/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java index 84191307e..a569ba906 100644 --- a/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java +++ b/designer-realize/src/main/java/com/fr/design/present/BarCodePane.java @@ -250,7 +250,7 @@ public class BarCodePane extends FurtherBasicBeanPane { } this.barCodePreviewPane.setObject(BarCodeUtils.getBarcodeImpl(this.updateBean().getBarcode(), getTestText())); } catch (Exception exp) { - this.barCodePreviewPane.setObject(com.fr.design.i18n.Toolkit.i18nText("Error") + ": " + exp.getMessage()); + this.barCodePreviewPane.setObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error") + ": " + exp.getMessage()); } } diff --git a/designer-realize/src/main/java/com/fr/design/present/ColumnRowTableModel.java b/designer-realize/src/main/java/com/fr/design/present/ColumnRowTableModel.java index 81cf90624..a44d99756 100644 --- a/designer-realize/src/main/java/com/fr/design/present/ColumnRowTableModel.java +++ b/designer-realize/src/main/java/com/fr/design/present/ColumnRowTableModel.java @@ -9,7 +9,7 @@ import com.fr.stable.ColumnRow; public class ColumnRowTableModel extends AbstractTableModel { - private String[] columnNames = new String[] { com.fr.design.i18n.Toolkit.i18nText("Column"), com.fr.design.i18n.Toolkit.i18nText("Row") }; + private String[] columnNames = new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"), com.fr.design.i18n.Toolkit.i18nText("Row") }; private java.util.List columnRowList = new ArrayList(); public ColumnRowTableModel() { diff --git a/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java b/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java index 4004d2b6f..5a75f35e6 100644 --- a/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java +++ b/designer-realize/src/main/java/com/fr/design/present/ConditionAttributesGroupPane.java @@ -44,7 +44,7 @@ public class ConditionAttributesGroupPane extends UIListControlPane { @Override public NameableCreator[] createNameableCreators() { - return new NameableCreator[] { new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), DefaultHighlight.class, HighLightConditionAttributesPane.class) }; + return new NameableCreator[] { new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), DefaultHighlight.class, HighLightConditionAttributesPane.class) }; } @Override @@ -68,7 +68,7 @@ public class ConditionAttributesGroupPane extends UIListControlPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java b/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java index 05d26b6ed..6a98189d9 100644 --- a/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java +++ b/designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java @@ -100,10 +100,10 @@ public class CurrencyLinePane extends FurtherBasicBeanPane int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Data"), UILabel.LEFT), textField}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data"), UILabel.LEFT), textField}, new Component[]{borderPane, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_IntPart"), UILabel.LEFT), groupPane(intPartSpinner)}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DeciPart"), UILabel.LEFT), groupPane(deciPartSpinner)} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Deci_Part"), UILabel.LEFT), groupPane(deciPartSpinner)} }; diff --git a/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java b/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java index 6ff3a6d11..0cfab6119 100644 --- a/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java @@ -78,7 +78,7 @@ public class LayerReportPane extends BasicBeanPane { } }); - JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Attention")); + JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Attention")); FRExplainLabel label = new FRExplainLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Layer_Report_Warnning_Info")); label.setPreferredSize(new Dimension(label.getPreferredSize().width, LABEL_HEIGHT)); infoPane.add(label); diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index c0f98ec62..89b8e84c4 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -202,7 +202,7 @@ public class PageSetupPane extends BasicPane { predefinedRadioButton.addActionListener(previewListener); - customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Custom") + ":"); + customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom") + ":"); customRadioButton.setMnemonic('C'); customRadioButton.addActionListener(previewListener); @@ -282,7 +282,7 @@ public class PageSetupPane extends BasicPane { marginLeftTextPane.add(marginTopUnitFieldPane); JPanel marginLeftUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); marginLeftPane.add(marginLeftUnitPane); - marginLeftUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Bottom") + ":")); + marginLeftUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom") + ":")); marginBottomUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginLeftUnitPane.add(marginBottomUnitFieldPane); diff --git a/designer-realize/src/main/java/com/fr/design/report/RowColumnPane.java b/designer-realize/src/main/java/com/fr/design/report/RowColumnPane.java index 94267695e..776673018 100644 --- a/designer-realize/src/main/java/com/fr/design/report/RowColumnPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/RowColumnPane.java @@ -27,7 +27,7 @@ public class RowColumnPane extends BasicPane { JPanel topPane =FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(topPane, BorderLayout.NORTH); - titleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Delete")); + titleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete")); topPane.add(titleLabel, BorderLayout.WEST); JPanel separatorPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); separatorPane.add(new JSeparator()); diff --git a/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java b/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java index 263fc6ea1..ce11a13c4 100644 --- a/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java +++ b/designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java @@ -83,7 +83,7 @@ public class SelectImagePane extends BasicPane { selectFilePane.add(layoutPane, BorderLayout.CENTER); //布局 - defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Default")); + defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default")); tiledRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Titled")); extendRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Extend")); adjustRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Image_Adjust")); diff --git a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java index 1958aacb5..bb8dc173f 100644 --- a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java @@ -89,7 +89,7 @@ public class SubReportPane extends BasicPane { centerPane.add(description, BorderLayout.SOUTH); description.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Report_Description")); description.setEditable(false); - description.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Attention"), null)); + description.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Attention"), null)); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java b/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java index 18035e188..8913edbbd 100644 --- a/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java @@ -35,7 +35,7 @@ public class WordExportPane extends BasicPane { checkBoxPane.add(isExportAsTable); southPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); - JPanel innerAlertBorderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Attention")); + JPanel innerAlertBorderPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Attention")); JPanel alertPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); MultilineLabel wordLineLabel = new MultilineLabel(); diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java index 671db918a..3ad31a8f0 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java @@ -13,7 +13,7 @@ public class FreezePagePane extends FreezeAndRepeatPane { public FreezePagePane(boolean isNumber) { this.isNumber = isNumber; start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" 1" : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" A", SwingConstants.CENTER); - end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Column"), SwingConstants.CENTER); + end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"), SwingConstants.CENTER); super.initComponent(); } @@ -27,7 +27,7 @@ public class FreezePagePane extends FreezeAndRepeatPane { if (isNumber) { ((UILabel) end).setText(String.valueOf(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Row")); } else { - ((UILabel) end).setText(StableUtils.convertIntToABC(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Column")); + ((UILabel) end).setText(StableUtils.convertIntToABC(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column")); } } @@ -42,6 +42,6 @@ public class FreezePagePane extends FreezeAndRepeatPane { @Override public String getLabeshow() { - return isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Row_To") : com.fr.design.i18n.Toolkit.i18nText("ColumnTo"); + return isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Row_To") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_To"); } } diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java index 58735c4dc..e5da5213d 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java @@ -13,7 +13,7 @@ public class FreezeWriteColPane extends FreezeAndRepeatPane { start = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + " A", SwingConstants.CENTER); end = new ColSpinner(1,Integer.MAX_VALUE,1,1); super.initComponent(); - this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column"))); + this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"))); } @@ -36,6 +36,6 @@ public class FreezeWriteColPane extends FreezeAndRepeatPane { @Override public String getLabeshow() { - return com.fr.design.i18n.Toolkit.i18nText("ColumnTo"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_To"); } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatColPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatColPane.java index 6030e025f..100b306d8 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatColPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatColPane.java @@ -32,7 +32,7 @@ public class RepeatColPane extends FreezeAndRepeatPane { @Override public String getLabeshow() { - return StringUtils.BLANK + com.fr.design.i18n.Toolkit.i18nText("ColumnTo") + StringUtils.BLANK; + return StringUtils.BLANK + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_To") + StringUtils.BLANK; } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/style/StylePane.java b/designer-realize/src/main/java/com/fr/design/style/StylePane.java index 1ddf0c130..f0b670e4e 100644 --- a/designer-realize/src/main/java/com/fr/design/style/StylePane.java +++ b/designer-realize/src/main/java/com/fr/design/style/StylePane.java @@ -80,11 +80,11 @@ public class StylePane extends BasicBeanPane