From f3c6eed55d8f52b5dd92b8d7bcc2ff263435fa9d Mon Sep 17 00:00:00 2001 From: Harrison Date: Wed, 15 Aug 2018 10:16:45 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-10025=2010.0=20&=205.0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E5=9B=BD=E9=99=85=E5=8C=96=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/help/FeedBackPane.java | 8 ++--- .../design/actions/help/SystemInfoPane.java | 2 +- .../tabledatapane/ClassTableDataPane.java | 2 +- .../EmbeddedTableDataDefinedPane.java | 2 +- .../tabledatapane/MaxMemRowCountPanel.java | 2 +- .../StoreProcedureTableModel.java | 2 +- .../gui/columnrow/ColumnRowVerticalPane.java | 2 +- .../design/gui/date/CalendarNumberField.java | 2 +- .../fr/design/gui/date/UICalendarPanel.java | 2 +- .../com/fr/design/gui/date/UIDayLabel.java | 11 ++++--- .../gui/frpane/LoadingBasicPaneTest.java | 2 +- .../gui/frpane/ObjectProperiesPane.java | 2 +- .../gui/frpane/TemplateParameterPane.java | 2 +- .../itableeditorpane/ParameterTableModel.java | 6 ++-- .../gui/itextfield/UISearchTextField.java | 4 +-- .../design/javascript/JavaScriptImplPane.java | 4 +-- .../ProcessParameterTableModel.java | 2 +- .../com/fr/design/style/AlignmentPane.java | 2 +- .../java/com/fr/design/style/BorderPane.java | 2 +- .../java/com/fr/design/style/FormatBox.java | 2 +- .../java/com/fr/design/style/FormatPane.java | 2 +- .../gradient/GradientFromToPixPane.java | 19 ++++++----- .../widget/component/CheckBoxDictPane.java | 2 +- .../SeriesCondition/TooltipContentsPane.java | 2 +- .../mainframe/chart/PaneTitleConstants.java | 2 +- .../style/datalabel/ChartLabelFontPane.java | 2 +- .../fr/design/designer/creator/XCheckBox.java | 2 +- .../fr/design/designer/creator/XRadio.java | 14 ++++---- .../items/HorizontalAlignmentItems.java | 2 +- .../items/LabelHorizontalAlignmentItems.java | 2 +- .../ui/designer/DateEditorDefinePane.java | 2 +- .../fr/design/actions/cell/StyleAction.java | 2 +- .../actions/columnrow/DeleteRowAction.java | 2 +- .../actions/columnrow/InsertRowAction.java | 2 +- .../actions/edit/clear/ClearWidgetAction.java | 2 +- .../design/dscolumn/DSColumnAdvancedPane.java | 2 +- .../dscolumn/SelectedDataColumnPane.java | 4 +-- .../headerfooter/HFAttributesEditDialog.java | 4 +-- .../fr/design/headerfooter/HFComponent.java | 2 +- .../cell/settingpane/style/StylePane.java | 2 +- .../design/present/ColumnRowTableModel.java | 2 +- .../com/fr/design/report/PageSetupPane.java | 2 +- .../design/report/freeze/FreezePagePane.java | 4 +-- .../report/freeze/FreezeWriteRowPane.java | 2 +- .../java/com/fr/design/style/StylePane.java | 2 +- .../EditReportServerParameterPane.java | 2 +- .../com/fr/design/webattr/WebCssPane.java | 32 +++++++++---------- .../java/com/fr/design/webattr/WebJsPane.java | 4 +-- .../printsettings/PageMarginSettingPane.java | 2 +- .../widget/ui/DateEditorDefinePane.java | 2 +- .../widget/ui/btn/DefaultButtonStylePane.java | 2 +- 51 files changed, 94 insertions(+), 98 deletions(-) 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 ebf6b7cdc..3047f6470 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 @@ -67,7 +67,7 @@ public class FeedBackPane extends BasicPane { private static final int TEL_MAX_LENGTH = 11; private static final String ALLOWED_INTEGER_TYPE = "0123456789"; private SwingWorker worker; - private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Send"), true); + private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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("Fine-Design_Basic_Cancel")); private int ifHasBeenWriten = 0; @@ -219,7 +219,7 @@ public class FeedBackPane extends BasicPane { JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEFT, GAP, 0)); controlPane.add(buttonsPane, BorderLayout.EAST); - sendButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Send")); + sendButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Send")); buttonsPane.add(sendButton); buttonsPane.setBorder(SEND_BORDER); sendButton.addActionListener(new ActionListener() { @@ -235,7 +235,7 @@ public class FeedBackPane extends BasicPane { private void doWithSendPane() { Object[] options = new Object[]{ok, cancle}; - send = new JOptionPane(com.fr.design.i18n.Toolkit.i18nText("sending"), + send = new JOptionPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sending"), JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null, options, options[0]); ok.setEnabled(false); ok.addActionListener(new ActionListener() { @@ -246,7 +246,7 @@ public class FeedBackPane extends BasicPane { feedbackDialog.dispose(); } else { ok.setEnabled(false); - send.setMessage(com.fr.design.i18n.Toolkit.i18nText("sending")); + send.setMessage(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sending")); setWorker(send); worker.execute(); } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java b/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java index 5170a33a6..7fe26054f 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java @@ -26,7 +26,7 @@ public class SystemInfoPane extends JPanel { } }; tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property")); - tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Value")); + tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value")); Properties properties = System.getProperties(); Object[] keys = new Object[properties.size()]; 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 8901f4b94..7cd8dec3e 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 @@ -44,7 +44,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { classNameTextField = new UITextField(36); reportletNamePane.add(classNameTextField); - UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Select")); + UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")); browserButton.setPreferredSize(new Dimension( browserButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); 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 1b340d2f4..18938a96c 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 @@ -33,7 +33,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{ private UIButton del; private static String[] TYPE = { - com.fr.design.i18n.Toolkit.i18nText("String"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_String"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date") diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java index 340b8971f..4863a2796 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java @@ -73,7 +73,7 @@ public class MaxMemRowCountPanel extends UIToolbar { switchCache.setSelectedIndex(MAX_IN_MEMORY); this.add(new UILabel(" ")); this.add(numberSpinner); - this.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Row"))); + this.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"))); this.validate(); this.repaint(); } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java index 60ac80a72..845010cd5 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java @@ -17,7 +17,7 @@ import java.util.List; public class StoreProcedureTableModel extends UITableModelAdapter { public StoreProcedureTableModel() { - super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"), com.fr.design.i18n.Toolkit.i18nText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value") }); if (shouldResponseDoubleClickAction()) { table.addMouseListener(new MouseAdapter() { 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 10f7680d9..a269359b7 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 @@ -34,7 +34,7 @@ public class ColumnRowVerticalPane extends ColumnRowPane { JPanel rowPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); pane.add(rowPane); - rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Row") + ":")); + rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row") + ":")); initRowSpinner(); rowPane.add(rowSpinner); diff --git a/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java b/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java index b7e989ad3..5a3fb62b5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java @@ -30,7 +30,7 @@ public class CalendarNumberField extends UINumberField { setValue(getIntValue()); } }); - this.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Song_TypeFace"),0,12)); + this.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Song_TypeFace"),0,12)); } public void setValue(int value) { diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java index 5fb0de895..c97b671de 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java @@ -45,7 +45,7 @@ import java.util.Calendar; import java.util.Date; public class UICalendarPanel extends JPanel { - private static final Font FONT_SONG = new Font(com.fr.design.i18n.Toolkit.i18nText("Song_TypeFace"),0,12); + private static final Font FONT_SONG = new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Song_TypeFace"),0,12); private static final Font FONT_BLACK = new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Black_Font"),0,12); private static final int WEEKDAY_COUNT = 7; private static final int TOTAL_DAYS_COUNT = 42; diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UIDayLabel.java b/designer-base/src/main/java/com/fr/design/gui/date/UIDayLabel.java index 8d38c9e4e..0ba64b3f6 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UIDayLabel.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UIDayLabel.java @@ -1,11 +1,12 @@ package com.fr.design.gui.date; -import java.awt.*; +import com.fr.design.gui.ilable.UILabel; + +import java.awt.Dimension; +import java.awt.Font; import java.text.SimpleDateFormat; import java.util.Date; -import com.fr.design.gui.ilable.UILabel; - public class UIDayLabel extends UILabel { @@ -27,13 +28,13 @@ public class UIDayLabel extends UILabel { public UIDayLabel(Date date, boolean isSmallLabel) { setHorizontalAlignment(UILabel.CENTER); - setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Song_TypeFace"), 0, 12)); + setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Song_TypeFace"), 0, 12)); this.date = date; setPreferredSize(new Dimension(30, 18)); if (isSmallLabel) { setText(dayFormat.format(date)); } else { - setText(com.fr.design.i18n.Toolkit.i18nText("Today")+":" + dateFormat.format(new Date())); + setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Today")+":" + dateFormat.format(new Date())); } } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPaneTest.java b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPaneTest.java index a37936053..372a37be8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPaneTest.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPaneTest.java @@ -31,7 +31,7 @@ public class LoadingBasicPaneTest { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Test") ; + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Test") ; } }; BasicDialog dlg = lb.showWindow(null); 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 72be101c8..e946ad4f9 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 @@ -133,7 +133,7 @@ public class ObjectProperiesPane extends BasicBeanPane { this.nameField = new UITextField(6); this.add(this.nameField); - this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value")+ ":")); + this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value")+ ":")); this.valueEditorPane = ValueEditorPaneFactory.createExtendedValueEditorPane(); this.add(this.valueEditorPane); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/TemplateParameterPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/TemplateParameterPane.java index 56f32ff78..6702319b7 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/TemplateParameterPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/TemplateParameterPane.java @@ -39,7 +39,7 @@ public class TemplateParameterPane extends BasicPane { JPanel defaultPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); northPane.add(defaultPane, BorderLayout.CENTER); UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"); - UILabel valueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value") + ":"); + UILabel valueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value") + ":"); nameTextField = new UITextField(12); valuePane = ValueEditorPaneFactory.createBasicValueEditorPane(); diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java index 33e6b8e7b..1b1471d40 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java @@ -35,7 +35,7 @@ public class ParameterTableModel extends UITableModelAdapter } public ParameterTableModel(int paraUseType) { - super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value") }); this.setColumnClass(new Class[] { ParameterEditor.class, ParameterValueEditor.class }); this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(paraUseType)); this.setDefaultEditor(ParameterEditor.class, new ParameterEditor()); @@ -43,7 +43,7 @@ public class ParameterTableModel extends UITableModelAdapter } public ParameterTableModel(int paraUseType, Component component) { - super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value") }); this.setColumnClass(new Class[] { ParameterEditor.class, ParameterValueEditor.class }); this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(paraUseType)); this.setDefaultEditor(ParameterEditor.class, new ParameterEditor()); @@ -52,7 +52,7 @@ public class ParameterTableModel extends UITableModelAdapter } public ParameterTableModel(ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane, Component component) { - super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Value") }); + super(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value") }); this.setColumnClass(new Class[] { ParameterEditor.class, ParameterValueEditor.class }); this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(valueEditorPane)); this.setDefaultEditor(ParameterEditor.class, new ParameterEditor()); 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 02facbb76..b3cc839a3 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 @@ -27,7 +27,7 @@ public class UISearchTextField extends UITextField { private UILabel iconLabel = new UILabel(UIConstants.BLACK_SEARCH_ICON); private UILabel clearLabel = new UILabel(UIConstants.CLEAR_ICON); - private UILabel infoLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Search")); + private UILabel infoLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Search")); private Dimension iconSize; private Dimension infoSize; @@ -62,7 +62,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")); + iconLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Search")); clearLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear")); clearLabel.setOpaque(false); iconSize = iconLabel.getPreferredSize(); diff --git a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java index a6adff143..bfa36b74e 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java @@ -72,7 +72,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { } }); - OneListTableModel model = new OneListTableModel(com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript"), this) { + OneListTableModel model = new OneListTableModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"), this) { public UITableEditAction[] createAction() { return new UITableEditAction[]{getAddAction(), new DeleteAction(this.component), new MoveUpAction(), new MoveDownAction()}; @@ -84,7 +84,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane { } }; importedJsPane = new UITableEditorPane(model); - importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript"))); + importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"))); importedJsPane.setPreferredSize(new Dimension(265, 150)); jsPane = new JSContentPane(defaultArgs); jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript"))); diff --git a/designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java b/designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java index 15fafa443..5f2e359b3 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java +++ b/designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java @@ -30,7 +30,7 @@ public class ProcessParameterTableModel extends UITableModelAdapter { } private class ContentPane extends JPanel { - private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value")); + private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value")); private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units")); public ContentPane() { diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java index 408560277..2399496ce 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java @@ -29,7 +29,7 @@ public class XCheckBox extends XWidgetCreator { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { - new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Text")) + new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .setPropertyChangeListener(new PropertyChangeAdapter() { diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XRadio.java b/designer-form/src/main/java/com/fr/design/designer/creator/XRadio.java index 5b7d2129e..3e122d070 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XRadio.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XRadio.java @@ -3,17 +3,15 @@ */ package com.fr.design.designer.creator; -import java.awt.Dimension; -import java.beans.IntrospectionException; - -import javax.swing.JComponent; -import javax.swing.JRadioButton; - import com.fr.design.mainframe.widget.editors.WidgetValueEditor; import com.fr.form.ui.Radio; - import com.fr.stable.ArrayUtils; +import javax.swing.JComponent; +import javax.swing.JRadioButton; +import java.awt.Dimension; +import java.beans.IntrospectionException; + /** * @author richer * @since 6.5.3 @@ -32,7 +30,7 @@ public class XRadio extends XWidgetCreator { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { - new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Text")), + new CRPropertyDescriptor("text", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text")), new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)}); } 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 e0fcfcf94..7c223ae2e 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 @@ -8,7 +8,7 @@ public class HorizontalAlignmentItems implements ItemProvider { private static Item[] VALUE_ITEMS = { new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left"), FlowLayout.LEFT), - new Item(com.fr.design.i18n.Toolkit.i18nText("Right"), FlowLayout.RIGHT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right"), FlowLayout.RIGHT), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), FlowLayout.CENTER) }; 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 398a9494f..b360aae6f 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 @@ -8,7 +8,7 @@ public class LabelHorizontalAlignmentItems implements ItemProvider { private static Item[] VALUE_ITEMS = { new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left"), SwingConstants.LEFT), - new Item(com.fr.design.i18n.Toolkit.i18nText("Right"), SwingConstants.RIGHT), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right"), SwingConstants.RIGHT), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), SwingConstants.CENTER) }; 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 9e434fb03..e43e567f4 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("Fine-Design_Basic_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("Fine-Design_Basic_String")}); JPanel formatHead = createFormatHead(); startDv = new DateValuePane(); endDv = new DateValuePane(); 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 2271baa87..1f77f9b93 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("Fine-Design_Basic_Custom") }); + CellElementPropertyPane.getInstance().GoToPane(new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_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/columnrow/DeleteRowAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteRowAction.java index 3593925d0..b7e348542 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteRowAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteRowAction.java @@ -52,7 +52,7 @@ public class DeleteRowAction extends CellSelectionAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Row"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java index c58719995..edd4dd98e 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java @@ -37,7 +37,7 @@ public class InsertRowAction extends CellSelectionAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Row"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/edit/clear/ClearWidgetAction.java b/designer-realize/src/main/java/com/fr/design/actions/edit/clear/ClearWidgetAction.java index 99ea5ac08..85cfdce1b 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/edit/clear/ClearWidgetAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/edit/clear/ClearWidgetAction.java @@ -12,7 +12,7 @@ public class ClearWidgetAction extends ClearAction { public ClearWidgetAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Widget")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget")); this.setMnemonic('W'); } diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java index 839cca012..7f86dd2ee 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java @@ -490,7 +490,7 @@ public class DSColumnAdvancedPane extends BasicPane { public ValuePane() { this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); - this.add(new UILabel(InsetText + com.fr.design.i18n.Toolkit.i18nText("Value") + ":")); + this.add(new UILabel(InsetText + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value") + ":")); this.add(Box.createHorizontalStrut(2)); this.add((formulaField = new JFormulaField("$$$"))); } diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java index 9d3a8a570..f94b4a74e 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java @@ -153,7 +153,7 @@ public class SelectedDataColumnPane extends BasicPane { }; columnNameComboBox.setEditable(true); double p = TableLayout.PREFERRED; - UILabel dsLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("TableData") + ":"); + UILabel dsLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_TableData") + ":"); UILabel dcLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Data_Column") + ":"); if (showParameterButton) { dsLabel.setPreferredSize(new Dimension(200, 25)); @@ -193,7 +193,7 @@ public class SelectedDataColumnPane extends BasicPane { columnNameComboBox.setEditable(true); double f = TableLayout.FILL; double p = TableLayout.PREFERRED; - UILabel dsLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("TableData")); + UILabel dsLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_TableData")); UILabel dpLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Dynamic_Parameter")); UILabel dcLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Data_Column")); dsLabel.setPreferredSize(new Dimension(60, 20)); diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java index f6937ac2f..152f8fd28 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java @@ -114,7 +114,7 @@ public class HFAttributesEditDialog extends BasicPane { formulaPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); formulaContentField = new UITextField(); - formulaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value") + ":")); + formulaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value") + ":")); formulaPane.add(Box.createHorizontalStrut(2)); UILabel label = new UILabel("="); label.setFont(new Font("Dialog", Font.BOLD, 12)); @@ -227,7 +227,7 @@ public class HFAttributesEditDialog extends BasicPane { * Add text pane. */ private void addTextPaneToTab() { - this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Text"), this.textPane); + this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text"), this.textPane); } /** diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java index b0219c360..77c806877 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java @@ -257,7 +257,7 @@ public class HFComponent extends UILabel implements MoveActionListener { */ public static String getHFELementText(HFElement hfElement) { if (hfElement.getClass().equals(TextHFElement.class)) { - return com.fr.design.i18n.Toolkit.i18nText("Text"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text"); } else if (hfElement.getClass().equals(FormulaHFElement.class)) { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"); } else if (hfElement.getClass().equals(PageNumberHFElement.class)) { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java index e4ff29e93..2fdf1e5a6 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java @@ -18,7 +18,7 @@ public class StylePane extends UIComboBoxPane