Browse Source

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

* commit 'f3c6eed55d8f52b5dd92b8d7bcc2ff263435fa9d':
  REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
final/10.0
Harrison 6 years ago
parent
commit
3c2bb8176c
  1. 8
      designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java
  3. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
  4. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java
  5. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java
  6. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureTableModel.java
  7. 2
      designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java
  8. 2
      designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java
  9. 2
      designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java
  10. 11
      designer-base/src/main/java/com/fr/design/gui/date/UIDayLabel.java
  11. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPaneTest.java
  12. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java
  13. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/TemplateParameterPane.java
  14. 6
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java
  15. 4
      designer-base/src/main/java/com/fr/design/gui/itextfield/UISearchTextField.java
  16. 4
      designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
  17. 2
      designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java
  18. 2
      designer-base/src/main/java/com/fr/design/style/AlignmentPane.java
  19. 2
      designer-base/src/main/java/com/fr/design/style/BorderPane.java
  20. 2
      designer-base/src/main/java/com/fr/design/style/FormatBox.java
  21. 2
      designer-base/src/main/java/com/fr/design/style/FormatPane.java
  22. 19
      designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java
  23. 2
      designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java
  24. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java
  25. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java
  26. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java
  27. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XCheckBox.java
  28. 14
      designer-form/src/main/java/com/fr/design/designer/creator/XRadio.java
  29. 2
      designer-form/src/main/java/com/fr/design/designer/properties/items/HorizontalAlignmentItems.java
  30. 2
      designer-form/src/main/java/com/fr/design/designer/properties/items/LabelHorizontalAlignmentItems.java
  31. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
  32. 2
      designer-realize/src/main/java/com/fr/design/actions/cell/StyleAction.java
  33. 2
      designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteRowAction.java
  34. 2
      designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java
  35. 2
      designer-realize/src/main/java/com/fr/design/actions/edit/clear/ClearWidgetAction.java
  36. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  37. 4
      designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java
  38. 4
      designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java
  39. 2
      designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java
  40. 2
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java
  41. 2
      designer-realize/src/main/java/com/fr/design/present/ColumnRowTableModel.java
  42. 2
      designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
  43. 4
      designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java
  44. 2
      designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java
  45. 2
      designer-realize/src/main/java/com/fr/design/style/StylePane.java
  46. 2
      designer-realize/src/main/java/com/fr/design/webattr/EditReportServerParameterPane.java
  47. 32
      designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
  48. 4
      designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
  49. 2
      designer-realize/src/main/java/com/fr/design/webattr/printsettings/PageMarginSettingPane.java
  50. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/DateEditorDefinePane.java
  51. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefaultButtonStylePane.java

8
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 int TEL_MAX_LENGTH = 11;
private static final String ALLOWED_INTEGER_TYPE = "0123456789"; private static final String ALLOWED_INTEGER_TYPE = "0123456789";
private SwingWorker worker; 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 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 UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
private int ifHasBeenWriten = 0; private int ifHasBeenWriten = 0;
@ -219,7 +219,7 @@ public class FeedBackPane extends BasicPane {
JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEFT, GAP, 0)); JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEFT, GAP, 0));
controlPane.add(buttonsPane, BorderLayout.EAST); 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.add(sendButton);
buttonsPane.setBorder(SEND_BORDER); buttonsPane.setBorder(SEND_BORDER);
sendButton.addActionListener(new ActionListener() { sendButton.addActionListener(new ActionListener() {
@ -235,7 +235,7 @@ public class FeedBackPane extends BasicPane {
private void doWithSendPane() { private void doWithSendPane() {
Object[] options = new Object[]{ok, cancle}; 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]); JOptionPane.INFORMATION_MESSAGE, JOptionPane.OK_CANCEL_OPTION, null, options, options[0]);
ok.setEnabled(false); ok.setEnabled(false);
ok.addActionListener(new ActionListener() { ok.addActionListener(new ActionListener() {
@ -246,7 +246,7 @@ public class FeedBackPane extends BasicPane {
feedbackDialog.dispose(); feedbackDialog.dispose();
} else { } else {
ok.setEnabled(false); 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); setWorker(send);
worker.execute(); worker.execute();
} }

2
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("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(); Properties properties = System.getProperties();
Object[] keys = new Object[properties.size()]; Object[] keys = new Object[properties.size()];

2
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java

@ -44,7 +44,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
classNameTextField = new UITextField(36); classNameTextField = new UITextField(36);
reportletNamePane.add(classNameTextField); 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.setPreferredSize(new Dimension(
browserButton.getPreferredSize().width, browserButton.getPreferredSize().width,
classNameTextField.getPreferredSize().height)); classNameTextField.getPreferredSize().height));

2
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 UIButton del;
private static String[] TYPE = { 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_Integer"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")

2
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); switchCache.setSelectedIndex(MAX_IN_MEMORY);
this.add(new UILabel(" ")); this.add(new UILabel(" "));
this.add(numberSpinner); 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.validate();
this.repaint(); this.repaint();
} }

2
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<StoreProcedureParameter> { public class StoreProcedureTableModel extends UITableModelAdapter<StoreProcedureParameter> {
public StoreProcedureTableModel() { 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()) { if (shouldResponseDoubleClickAction()) {
table.addMouseListener(new MouseAdapter() { table.addMouseListener(new MouseAdapter() {

2
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(); JPanel rowPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
pane.add(rowPane); 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(); initRowSpinner();
rowPane.add(rowSpinner); rowPane.add(rowSpinner);

2
designer-base/src/main/java/com/fr/design/gui/date/CalendarNumberField.java

@ -30,7 +30,7 @@ public class CalendarNumberField extends UINumberField {
setValue(getIntValue()); 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) { public void setValue(int value) {

2
designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java

@ -45,7 +45,7 @@ import java.util.Calendar;
import java.util.Date; import java.util.Date;
public class UICalendarPanel extends JPanel { 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 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 WEEKDAY_COUNT = 7;
private static final int TOTAL_DAYS_COUNT = 42; private static final int TOTAL_DAYS_COUNT = 42;

11
designer-base/src/main/java/com/fr/design/gui/date/UIDayLabel.java

@ -1,11 +1,12 @@
package com.fr.design.gui.date; 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.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import com.fr.design.gui.ilable.UILabel;
public class UIDayLabel extends UILabel { public class UIDayLabel extends UILabel {
@ -27,13 +28,13 @@ public class UIDayLabel extends UILabel {
public UIDayLabel(Date date, boolean isSmallLabel) { public UIDayLabel(Date date, boolean isSmallLabel) {
setHorizontalAlignment(UILabel.CENTER); 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; this.date = date;
setPreferredSize(new Dimension(30, 18)); setPreferredSize(new Dimension(30, 18));
if (isSmallLabel) { if (isSmallLabel) {
setText(dayFormat.format(date)); setText(dayFormat.format(date));
} else { } 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()));
} }
} }

2
designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPaneTest.java

@ -31,7 +31,7 @@ public class LoadingBasicPaneTest {
@Override @Override
protected String title4PopupWindow() { 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); BasicDialog dlg = lb.showWindow(null);

2
designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java

@ -133,7 +133,7 @@ public class ObjectProperiesPane extends BasicBeanPane<ListMap> {
this.nameField = new UITextField(6); this.nameField = new UITextField(6);
this.add(this.nameField); 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.valueEditorPane = ValueEditorPaneFactory.createExtendedValueEditorPane();
this.add(this.valueEditorPane); this.add(this.valueEditorPane);
} }

2
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(); JPanel defaultPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
northPane.add(defaultPane, BorderLayout.CENTER); northPane.add(defaultPane, BorderLayout.CENTER);
UILabel nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":"); 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); nameTextField = new UITextField(12);
valuePane = ValueEditorPaneFactory.createBasicValueEditorPane(); valuePane = ValueEditorPaneFactory.createBasicValueEditorPane();

6
designer-base/src/main/java/com/fr/design/gui/itableeditorpane/ParameterTableModel.java

@ -35,7 +35,7 @@ public class ParameterTableModel extends UITableModelAdapter<ParameterProvider>
} }
public ParameterTableModel(int paraUseType) { 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.setColumnClass(new Class[] { ParameterEditor.class, ParameterValueEditor.class });
this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(paraUseType)); this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(paraUseType));
this.setDefaultEditor(ParameterEditor.class, new ParameterEditor()); this.setDefaultEditor(ParameterEditor.class, new ParameterEditor());
@ -43,7 +43,7 @@ public class ParameterTableModel extends UITableModelAdapter<ParameterProvider>
} }
public ParameterTableModel(int paraUseType, Component component) { 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.setColumnClass(new Class[] { ParameterEditor.class, ParameterValueEditor.class });
this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(paraUseType)); this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(paraUseType));
this.setDefaultEditor(ParameterEditor.class, new ParameterEditor()); this.setDefaultEditor(ParameterEditor.class, new ParameterEditor());
@ -52,7 +52,7 @@ public class ParameterTableModel extends UITableModelAdapter<ParameterProvider>
} }
public ParameterTableModel(ValueEditorPane valueEditorPane, ValueEditorPane valueRenderPane, Component component) { 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.setColumnClass(new Class[] { ParameterEditor.class, ParameterValueEditor.class });
this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(valueEditorPane)); this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor(valueEditorPane));
this.setDefaultEditor(ParameterEditor.class, new ParameterEditor()); this.setDefaultEditor(ParameterEditor.class, new ParameterEditor());

4
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 iconLabel = new UILabel(UIConstants.BLACK_SEARCH_ICON);
private UILabel clearLabel = new UILabel(UIConstants.CLEAR_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 iconSize;
private Dimension infoSize; private Dimension infoSize;
@ -62,7 +62,7 @@ public class UISearchTextField extends UITextField {
private void initTextField() { private void initTextField() {
iconLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); 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.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear"));
clearLabel.setOpaque(false); clearLabel.setOpaque(false);
iconSize = iconLabel.getPreferredSize(); iconSize = iconLabel.getPreferredSize();

4
designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java

@ -72,7 +72,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
} }
}); });
OneListTableModel<String> model = new OneListTableModel<String>(com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript"), this) { OneListTableModel<String> model = new OneListTableModel<String>(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"), this) {
public UITableEditAction[] createAction() { public UITableEditAction[] createAction() {
return new UITableEditAction[]{getAddAction(), new DeleteAction(this.component), new MoveUpAction(), new MoveDownAction()}; return new UITableEditAction[]{getAddAction(), new DeleteAction(this.component), new MoveUpAction(), new MoveDownAction()};
@ -84,7 +84,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
} }
}; };
importedJsPane = new UITableEditorPane<String>(model); importedJsPane = new UITableEditorPane<String>(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)); importedJsPane.setPreferredSize(new Dimension(265, 150));
jsPane = new JSContentPane(defaultArgs); jsPane = new JSContentPane(defaultArgs);
jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript"))); jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript")));

2
designer-base/src/main/java/com/fr/design/javascript/ProcessParameterTableModel.java

@ -30,7 +30,7 @@ public class ProcessParameterTableModel extends UITableModelAdapter<ParameterPro
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public ProcessParameterTableModel() { public ProcessParameterTableModel() {
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[] { JLabel.class, ParameterValueEditor.class }); this.setColumnClass(new Class[] { JLabel.class, ParameterValueEditor.class });
this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor()); this.setDefaultEditor(ParameterValueEditor.class, new ParameterValueEditor());
this.setDefaultRenderer(ParameterValueEditor.class, new ParameterValueRenderer()); this.setDefaultRenderer(ParameterValueEditor.class, new ParameterValueRenderer());

2
designer-base/src/main/java/com/fr/design/style/AlignmentPane.java

@ -253,7 +253,7 @@ public class AlignmentPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Style"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style");
} }
/** /**

2
designer-base/src/main/java/com/fr/design/style/BorderPane.java

@ -150,7 +150,7 @@ public class BorderPane extends BasicPane {
JPanel rightTopPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel rightTopPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
northPane.add(rightTopPane, BorderLayout.NORTH); northPane.add(rightTopPane, BorderLayout.NORTH);
JPanel first = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel first = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Style") + ":")); first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style") + ":"));
first.add(this.currentLineCombo); first.add(this.currentLineCombo);
rightTopPane.add(first, BorderLayout.NORTH); rightTopPane.add(first, BorderLayout.NORTH);

2
designer-base/src/main/java/com/fr/design/style/FormatBox.java

@ -172,7 +172,7 @@ public class FormatBox extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Style"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style");
} }
private void refreshLabelText() { private void refreshLabelText() {

2
designer-base/src/main/java/com/fr/design/style/FormatPane.java

@ -170,7 +170,7 @@ public class FormatPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Style"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style");
} }
/** /**

19
designer-base/src/main/java/com/fr/design/style/background/gradient/GradientFromToPixPane.java

@ -1,19 +1,18 @@
package com.fr.design.style.background.gradient; package com.fr.design.style.background.gradient;
import java.awt.BorderLayout; import com.fr.base.Utils;
import com.fr.base.background.GradientBackground;
import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UIBasicSpinner;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import javax.swing.JFormattedTextField; import javax.swing.JFormattedTextField;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JSpinner; import javax.swing.JSpinner;
import javax.swing.SpinnerNumberModel; import javax.swing.SpinnerNumberModel;
import java.awt.BorderLayout;
import com.fr.base.Utils;
import com.fr.base.background.GradientBackground;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.gui.ispinner.UIBasicSpinner;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.dialog.BasicPane;
/** /**
@ -38,7 +37,7 @@ public class GradientFromToPixPane extends BasicPane {
startField.setHorizontalAlignment(UITextField.LEFT); startField.setHorizontalAlignment(UITextField.LEFT);
startField.setColumns(3); startField.setColumns(3);
secondFloorPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("To") + " ")); secondFloorPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_To") + " "));
endPixSpinner = new UIBasicSpinner(new SpinnerNumberModel(1, 1, 9999, 1)); endPixSpinner = new UIBasicSpinner(new SpinnerNumberModel(1, 1, 9999, 1));
secondFloorPane.add(endPixSpinner); secondFloorPane.add(endPixSpinner);

2
designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java

@ -41,7 +41,7 @@ public class CheckBoxDictPane extends JPanel {
}; };
returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1); returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
returnTypeComboBox = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Array"), com.fr.design.i18n.Toolkit.i18nText("String")}); returnTypeComboBox = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Array"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_String")});
returnTypeComboBox.addActionListener(new ActionListener() { returnTypeComboBox.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java

@ -71,7 +71,7 @@ public class TooltipContentsPane extends BasicPane{
} }
protected String getValueString() { protected String getValueString() {
return com.fr.design.i18n.Toolkit.i18nText("Value"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Value");
} }
protected Component[] createComponents4PercentValue() { protected Component[] createComponents4PercentValue() {

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java

@ -5,7 +5,7 @@ package com.fr.design.mainframe.chart;
public class PaneTitleConstants { public class PaneTitleConstants {
public final static String CHART_TYPE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type"); public final static String CHART_TYPE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type");
public final static String CHART_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data"); public final static String CHART_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data");
public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Style"); public final static String CHART_STYLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style");
public final static String CHART_OTHER_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Special"); public final static String CHART_OTHER_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Special");
public final static String CHART_STYLE_TITLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title"); public final static String CHART_STYLE_TITLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title");

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java

@ -91,7 +91,7 @@ public class ChartLabelFontPane extends BasicScrollPane<Chart> {
} }
private class ContentPane extends JPanel { 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")); private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units"));
public ContentPane() { public ContentPane() {

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

@ -29,7 +29,7 @@ public class XCheckBox extends XWidgetCreator {
@Override @Override
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { 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") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
.setPropertyChangeListener(new PropertyChangeAdapter() { .setPropertyChangeListener(new PropertyChangeAdapter() {

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

@ -3,17 +3,15 @@
*/ */
package com.fr.design.designer.creator; 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.design.mainframe.widget.editors.WidgetValueEditor;
import com.fr.form.ui.Radio; import com.fr.form.ui.Radio;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import javax.swing.JComponent;
import javax.swing.JRadioButton;
import java.awt.Dimension;
import java.beans.IntrospectionException;
/** /**
* @author richer * @author richer
* @since 6.5.3 * @since 6.5.3
@ -32,7 +30,7 @@ public class XRadio extends XWidgetCreator {
@Override @Override
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { 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( new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)}); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)});
} }

2
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 = { 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("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) new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), FlowLayout.CENTER)
}; };

2
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 = { 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("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) new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), SwingConstants.CENTER)
}; };

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

@ -62,7 +62,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
UILabel endDateLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_FS_End_Date")); UILabel endDateLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_FS_End_Date"));
endDateLabel.setVerticalAlignment(SwingConstants.TOP); endDateLabel.setVerticalAlignment(SwingConstants.TOP);
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
returnTypeComboBox = new UIButtonGroup<>(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(); JPanel formatHead = createFormatHead();
startDv = new DateValuePane(); startDv = new DateValuePane();
endDv = new DateValuePane(); endDv = new DateValuePane();

2
designer-realize/src/main/java/com/fr/design/actions/cell/StyleAction.java

@ -27,7 +27,7 @@ public class StyleAction extends UpdateAction {
* @param e 事件 * @param e 事件
*/ */
public void actionPerformed(ActionEvent 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") });
} }
} }

2
designer-realize/src/main/java/com/fr/design/actions/columnrow/DeleteRowAction.java

@ -52,7 +52,7 @@ public class DeleteRowAction extends CellSelectionAction {
@Override @Override
public String getMenuName() { public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Row"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row");
} }
@Override @Override

2
designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java

@ -37,7 +37,7 @@ public class InsertRowAction extends CellSelectionAction {
@Override @Override
public String getMenuName() { public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Row"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row");
} }
@Override @Override

2
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) { public ClearWidgetAction(ElementCasePane t) {
super(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'); this.setMnemonic('W');
} }

2
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java

@ -490,7 +490,7 @@ public class DSColumnAdvancedPane extends BasicPane {
public ValuePane() { public ValuePane() {
this.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); 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(Box.createHorizontalStrut(2));
this.add((formulaField = new JFormulaField("$$$"))); this.add((formulaField = new JFormulaField("$$$")));
} }

4
designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java

@ -153,7 +153,7 @@ public class SelectedDataColumnPane extends BasicPane {
}; };
columnNameComboBox.setEditable(true); columnNameComboBox.setEditable(true);
double p = TableLayout.PREFERRED; 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") + ":"); UILabel dcLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Data_Column") + ":");
if (showParameterButton) { if (showParameterButton) {
dsLabel.setPreferredSize(new Dimension(200, 25)); dsLabel.setPreferredSize(new Dimension(200, 25));
@ -193,7 +193,7 @@ public class SelectedDataColumnPane extends BasicPane {
columnNameComboBox.setEditable(true); columnNameComboBox.setEditable(true);
double f = TableLayout.FILL; double f = TableLayout.FILL;
double p = TableLayout.PREFERRED; 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 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")); UILabel dcLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Data_Column"));
dsLabel.setPreferredSize(new Dimension(60, 20)); dsLabel.setPreferredSize(new Dimension(60, 20));

4
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(); formulaPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
formulaContentField = new UITextField(); 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)); formulaPane.add(Box.createHorizontalStrut(2));
UILabel label = new UILabel("="); UILabel label = new UILabel("=");
label.setFont(new Font("Dialog", Font.BOLD, 12)); label.setFont(new Font("Dialog", Font.BOLD, 12));
@ -227,7 +227,7 @@ public class HFAttributesEditDialog extends BasicPane {
* Add text pane. * Add text pane.
*/ */
private void addTextPaneToTab() { 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);
} }
/** /**

2
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) { public static String getHFELementText(HFElement hfElement) {
if (hfElement.getClass().equals(TextHFElement.class)) { 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)) { } else if (hfElement.getClass().equals(FormulaHFElement.class)) {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula");
} else if (hfElement.getClass().equals(PageNumberHFElement.class)) { } else if (hfElement.getClass().equals(PageNumberHFElement.class)) {

2
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/StylePane.java

@ -18,7 +18,7 @@ public class StylePane extends UIComboBoxPane<Style> {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Style"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style");
} }
@Override @Override

2
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 { public class ColumnRowTableModel extends AbstractTableModel {
private String[] columnNames = new String[] { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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("Fine-Design_Basic_Row") };
private java.util.List<ColumnRow> columnRowList = new ArrayList<ColumnRow>(); private java.util.List<ColumnRow> columnRowList = new ArrayList<ColumnRow>();
public ColumnRowTableModel() { public ColumnRowTableModel() {

2
designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java

@ -299,7 +299,7 @@ public class PageSetupPane extends BasicPane {
JPanel marginRightUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel marginRightUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
marginRightPane.add(marginRightUnitPane); marginRightPane.add(marginRightUnitPane);
marginRightUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Right") + ":")); marginRightUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right") + ":"));
marginRightUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginRightUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM);
marginRightUnitPane.add(marginRightUnitFieldPane); marginRightUnitPane.add(marginRightUnitFieldPane);

4
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) { public FreezePagePane(boolean isNumber) {
this.isNumber = 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); 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("Fine-Design_Report_Column"), SwingConstants.CENTER); end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"), SwingConstants.CENTER);
super.initComponent(); super.initComponent();
} }
@ -25,7 +25,7 @@ public class FreezePagePane extends FreezeAndRepeatPane {
@Override @Override
public void populateBean(FT ob) { public void populateBean(FT ob) {
if (isNumber) { if (isNumber) {
((UILabel) end).setText(String.valueOf(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Row")); ((UILabel) end).setText(String.valueOf(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Row"));
} else { } else {
((UILabel) end).setText(StableUtils.convertIntToABC(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column")); ((UILabel) end).setText(StableUtils.convertIntToABC(ob.getTo() + 1)+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column"));
} }

2
designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java

@ -12,7 +12,7 @@ public class FreezeWriteRowPane extends FreezeAndRepeatPane {
start = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + " 1", SwingConstants.CENTER); start = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + " 1", SwingConstants.CENTER);
end = new RowSpinner(1, Integer.MAX_VALUE, 1,1); end = new RowSpinner(1, Integer.MAX_VALUE, 1,1);
super.initComponent(); super.initComponent();
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")));
} }
@Override @Override

2
designer-realize/src/main/java/com/fr/design/style/StylePane.java

@ -92,7 +92,7 @@ public class StylePane extends BasicBeanPane<Style> implements ChangeListener {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Style"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style");
} }
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {

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

@ -58,7 +58,7 @@ public class EditReportServerParameterPane extends LoadingBasicPane {
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WEB_Write_Setting"), writePane = new WriteToolBarPane()); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WEB_Write_Setting"), writePane = new WriteToolBarPane());
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Data_Analysis_Settings"), viewPane = new ViewToolBarPane()); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Data_Analysis_Settings"), viewPane = new ViewToolBarPane());
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_Css"), cssPane = new WebCssPane()); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_Css"), cssPane = new WebCssPane());
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript"), jsPane = new WebJsPane()); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript"), jsPane = new WebJsPane());
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Error_Handler_Template"), errorTemplatePane = new ErrorTemplatePane()); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Error_Handler_Template"), errorTemplatePane = new ErrorTemplatePane());
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Print_Setting"), printSettingPane = new PrintSettingPane()); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Print_Setting"), printSettingPane = new PrintSettingPane());
} }

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

@ -1,31 +1,29 @@
package com.fr.design.webattr; package com.fr.design.webattr;
import java.awt.BorderLayout; import com.fr.design.dialog.BasicPane;
import java.awt.Color; import com.fr.design.gui.frpane.EditingStringListPane;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
import javax.swing.BorderFactory;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPanel;
import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.gui.frpane.EditingStringListPane;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.dialog.BasicPane;
import com.fr.file.FILE; import com.fr.file.FILE;
import com.fr.file.FILEChooserPane; import com.fr.file.FILEChooserPane;
import com.fr.file.filter.ChooseFileFilter; import com.fr.file.filter.ChooseFileFilter;
import com.fr.stable.CoreConstants; import com.fr.stable.CoreConstants;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.web.attr.ReportWebAttr; import com.fr.web.attr.ReportWebAttr;
import javax.swing.BorderFactory;
import javax.swing.JPanel;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList;
import java.util.List;
public class WebCssPane extends BasicPane { public class WebCssPane extends BasicPane {
private UITextField localText; private UITextField localText;
UIButton chooseFile; UIButton chooseFile;
@ -40,7 +38,7 @@ public class WebCssPane extends BasicPane {
localText = new UITextField(); localText = new UITextField();
localText.setPreferredSize(new Dimension(450, 20)); localText.setPreferredSize(new Dimension(450, 20));
localText.setEditable(false); localText.setEditable(false);
chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Selection")); chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Selection"));
chooseFile.setPreferredSize(new Dimension(75, 23)); chooseFile.setPreferredSize(new Dimension(75, 23));
chooseFile.addActionListener(chooseFileListener); chooseFile.addActionListener(chooseFileListener);
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File") + ":"), FlowLayout.LEFT); northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File") + ":"), FlowLayout.LEFT);

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

@ -67,7 +67,7 @@ public class WebJsPane extends BasicPane {
urlText.setPreferredSize(new Dimension(450, 20)); urlText.setPreferredSize(new Dimension(450, 20));
urlText.addKeyListener(urlTextListener); urlText.addKeyListener(urlTextListener);
urlText.setEnabled(false); urlText.setEnabled(false);
chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Selection")); chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Selection"));
chooseFile.addActionListener(chooseFileListener); chooseFile.addActionListener(chooseFileListener);
testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Test_URL")); testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Test_URL"));
@ -153,7 +153,7 @@ public class WebJsPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_JavaScript");
} }
private ActionListener chooseFileListener = new ActionListener() { private ActionListener chooseFileListener = new ActionListener() {

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

@ -53,7 +53,7 @@ public class PageMarginSettingPane extends JPanel {
JPanel marginRightUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel marginRightUnitPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
marginRightPane.add(marginRightUnitPane); marginRightPane.add(marginRightUnitPane);
marginRightUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Right") + ":")); marginRightUnitPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Right") + ":"));
marginRightUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM); marginRightUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM);
marginRightUnitPane.add(marginRightUnitFieldPane); marginRightUnitPane.add(marginRightUnitFieldPane);

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

@ -49,7 +49,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
@Override @Override
protected JPanel setSecondContentPane() { protected JPanel setSecondContentPane() {
returnTypeComboBox = new UIButtonGroup<>(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(); JPanel formatHead = createFormatHead();
startDv = new DateValuePane(); startDv = new DateValuePane();

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

@ -30,7 +30,7 @@ public class DefaultButtonStylePane extends BasicPane {
iconPane = new IconDefinePane(); iconPane = new IconDefinePane();
labelPane.add(iconPane); labelPane.add(iconPane);
Component[][] n_components = { Component[][] n_components = {
{ new UILabel(com.fr.design.i18n.Toolkit.i18nText("Text") + ":"), buttonNameTextField = new UITextField(20) }, { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Text") + ":"), buttonNameTextField = new UITextField(20) },
{ new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Icon") + ":"), labelPane } }; { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Icon") + ":"), labelPane } };
JPanel panel = TableLayoutHelper.createTableLayoutPane(n_components, new double[]{-2, -2}, new double[]{-2, -2}); JPanel panel = TableLayoutHelper.createTableLayoutPane(n_components, new double[]{-2, -2}, new double[]{-2, -2});

Loading…
Cancel
Save