Browse Source

Merge pull request #367 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0

REPORT-10424 10.0 & 5.0版本依据国际化规范调整国际化内容

* commit '0f96d3ff04013e58185eaa15920953bc66fc148d':
  规范国际化文件及国际化定义。
final/10.0
Alex.Sung 6 years ago
parent
commit
ea6a542b67
  1. 4
      designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java
  3. 2
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
  4. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
  5. 4
      designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
  6. 10
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java
  7. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
  8. 10
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java
  9. 18
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java
  10. 4
      designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java
  11. 2
      designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
  12. 2
      designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
  13. 2
      designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
  14. 2
      designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java
  15. 6
      designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java
  16. 2
      designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java
  17. 2
      designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java
  18. 2
      designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java
  19. 4
      designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java
  20. 4
      designer-base/src/main/java/com/fr/design/formula/SortFormulaPane.java
  21. 2
      designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java
  22. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
  23. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java
  24. 4
      designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java
  25. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java
  26. 4
      designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java
  27. 2
      designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java
  28. 6
      designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java
  29. 2
      designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java
  30. 4
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
  31. 2
      designer-base/src/main/java/com/fr/design/gui/itextfield/UISearchTextField.java
  32. 4
      designer-base/src/main/java/com/fr/design/mainframe/DecodeDialog.java
  33. 2
      designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java
  34. 2
      designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java
  35. 2
      designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java
  36. 2
      designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java
  37. 2
      designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java
  38. 2
      designer-base/src/main/java/com/fr/design/present/DictPresentPane.java
  39. 2
      designer-base/src/main/java/com/fr/design/style/AlignmentPane.java
  40. 4
      designer-base/src/main/java/com/fr/design/style/BorderPane.java
  41. 2
      designer-base/src/main/java/com/fr/design/style/FormatBox.java
  42. 2
      designer-base/src/main/java/com/fr/design/style/background/BackgroundPane.java
  43. 2
      designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java
  44. 2
      designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java
  45. 6
      designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java
  46. 4
      designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java
  47. 2
      designer-base/src/main/java/com/fr/design/style/color/ColorUIComboBoxPane.java
  48. 2
      designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java
  49. 2
      designer-base/src/main/java/com/fr/design/style/color/TransparentPane.java
  50. 2
      designer-base/src/main/java/com/fr/design/web/CustomIconPane.java
  51. 2
      designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java
  52. 4
      designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java
  53. 2
      designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java
  54. 2
      designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java
  55. 4
      designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java
  56. 2
      designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java
  57. 2
      designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java
  58. 4
      designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java
  59. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapReportCubeDataPane.java
  60. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapReportDataSinglePane.java
  61. 6
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java
  62. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrCustomPane.java
  63. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java
  64. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java
  65. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelColorPane.java
  66. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/TooltipContentsPane.java
  67. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
  68. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java
  69. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java
  70. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java
  71. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartDesignerOtherPane.java
  72. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/PresentComboBox.java
  73. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java
  74. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
  75. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitleNoFormulaPane.java
  76. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java
  77. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java
  78. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java
  79. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java
  80. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
  81. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java
  82. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java
  83. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java
  84. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java
  85. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java
  86. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java
  87. 2
      designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
  88. 2
      designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java
  89. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java
  90. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java
  91. 6
      designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java
  92. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java
  93. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java
  94. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
  95. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XIframeEditor.java
  96. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XNameWidget.java
  97. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java
  98. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java
  99. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XWBorderLayout.java
  100. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XWParameterLayout.java
  101. Some files were not shown because too many files have changed in this diff Show More

4
designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java

@ -69,7 +69,7 @@ public class FeedBackPane extends BasicPane {
private SwingWorker worker;
private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Send"), true);
private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
private int ifHasBeenWriten = 0;
private UITextArea detailField;
private boolean isSendSuccessful = false;
@ -206,7 +206,7 @@ public class FeedBackPane extends BasicPane {
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel("QQ:", SwingConstants.RIGHT), qq},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("email") + ":", SwingConstants.RIGHT), email},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email") + ":", SwingConstants.RIGHT), email},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Mobile_Number") + ":", SwingConstants.RIGHT), phone}
};
double[] rowSize = {p, p, p};

2
designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java

@ -66,7 +66,7 @@ public class ForumAction extends UpdateAction {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Forum");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Forum");
}
@Override

2
designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@ -233,7 +233,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
private class EditAction extends UpdateAction {
public EditAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
this.setMnemonic('E');
this.setSmallIcon(BaseUtils.readIcon(IconPathConstants.TD_EDIT_ICON_PATH));
}

2
designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

@ -49,7 +49,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
message = new UILabel();
uiLabel = new UILabel();
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
this.add(northPane, BorderLayout.NORTH);

4
designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java

@ -110,7 +110,7 @@ public class JDBCDefPane extends JPanel {
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
JPanel dbtypePane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
dbtypePane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Database") + ":")));
dbtypePane.add(new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database") + ":")));
JPanel dbtypeComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
Component[][] dbtypeComComponents = {{dbtypeComboBox}};
double[] dbtypeRowSize = {p};
@ -118,7 +118,7 @@ public class JDBCDefPane extends JPanel {
dbtypeComPane = TableLayoutHelper.createTableLayoutPane(dbtypeComComponents, dbtypeRowSize, dbtypeColumnSize);
JPanel driverPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
driverPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Driver") + ":"));
driverPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Driver") + ":"));
JPanel urlPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
urlPane.add(new UILabel("URL:"));

10
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java

@ -117,22 +117,22 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
private int getParameterType (Object value) {
String type;
if(value instanceof CursorEditor)
type= com.fr.design.i18n.Toolkit.i18nText("Cursor");
type= com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor");
else if(value instanceof String ){
if(((String) value).length() > 0 && ((String) value).charAt(0) == '=')
type = com.fr.design.i18n.Toolkit.i18nText("Formula");
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula");
else
type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String");
}else if(value instanceof Integer)
type = com.fr.design.i18n.Toolkit.i18nText("Integer");
else if(value instanceof Double)
type = com.fr.design.i18n.Toolkit.i18nText("Double");
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double");
else if(value instanceof Date)
type = com.fr.design.i18n.Toolkit.i18nText("Date");
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
else if(value instanceof Boolean)
type = com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean");
else if(value instanceof BaseFormula)
type = com.fr.design.i18n.Toolkit.i18nText("Formula");
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula");
else
type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String");
return StoreProcedureParameterPane.getInfo4Value(type);

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

@ -91,7 +91,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
Component[][] components = {
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), reportletNamePane},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_The_Class_Must_Implement_The_Interface") + "\"com.fr.data.Tabledata\"")},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Example") + ":\"com.fr.data.impl.ArrayTableData\"")},
{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Example") + ":\"com.fr.data.impl.ArrayTableData\"")},
{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))}
};
JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

10
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java

@ -35,8 +35,8 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
private static String[] TYPE = {
com.fr.design.i18n.Toolkit.i18nText("String"),
com.fr.design.i18n.Toolkit.i18nText("Integer"),
com.fr.design.i18n.Toolkit.i18nText("Double"),
com.fr.design.i18n.Toolkit.i18nText("Date")
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")
};
public EmbeddedTableDataDefinedPane() {
@ -68,8 +68,8 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
tableColumn.setMaxWidth(30);
// 控制按钮
add = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add"));
del = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Delete"));
add = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
del = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"));
JPanel buttonPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
// buttonPane.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
buttonPane.add(add);
@ -213,7 +213,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
private EmbeddedTableData embeddedTableData;
private String[] COLUMN_NAME = {
"",
com.fr.design.i18n.Toolkit.i18nText("ColumnName"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type")
};
private int sum = 0;

18
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java

@ -29,13 +29,13 @@ public class StoreProcedureParameterPane extends BasicPane {
};
private static NameObject[] nameAndValue = new NameObject[]{
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Cursor"), StoreProcedureConstants.CURSOR),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"), StoreProcedureConstants.CURSOR),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Parameter-String"), StoreProcedureConstants.VARCHAR),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Integer"), StoreProcedureConstants.INTEGER),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Double"), StoreProcedureConstants.DECIMAL),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Date"), StoreProcedureConstants.DATE),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"), StoreProcedureConstants.DECIMAL),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), StoreProcedureConstants.DATE),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean"), StoreProcedureConstants.BOOLEAN),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Formula"), StoreProcedureConstants.FORMULA),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"), StoreProcedureConstants.FORMULA),
new NameObject("IN",StoreProcedureConstants.IN),
new NameObject("OUT",StoreProcedureConstants.OUT),
new NameObject("INOUT",StoreProcedureConstants.INOUT)
@ -124,22 +124,22 @@ public class StoreProcedureParameterPane extends BasicPane {
Object value = valueEditPane.update();
String type = "";
if(value instanceof CursorEditor)
type=com.fr.design.i18n.Toolkit.i18nText("Cursor");
type=com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor");
else if(value instanceof String ){
if(((String) value).length() > 0 && ((String) value).charAt(0) == '=')
type = com.fr.design.i18n.Toolkit.i18nText("Formula");
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula");
else
type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String");
}else if(value instanceof Integer)
type = com.fr.design.i18n.Toolkit.i18nText("Integer");
else if(value instanceof Double)
type = com.fr.design.i18n.Toolkit.i18nText("Double");
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double");
else if(value instanceof Date)
type = com.fr.design.i18n.Toolkit.i18nText("Date");
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
else if(value instanceof Boolean)
type = com.fr.design.i18n.Toolkit.i18nText("Parameter-Boolean");
else if(value instanceof BaseFormula)
type = com.fr.design.i18n.Toolkit.i18nText("Formula");
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula");
else
type = com.fr.design.i18n.Toolkit.i18nText("Parameter-String");
int typeVl = getInfo4Value(type);

4
designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java

@ -116,13 +116,13 @@ public class JWizardDialog extends BasicDialog {
next();
}
});
buttonFinish = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Finish"));
buttonFinish = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Finish"));
buttonFinish.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
finish();
}
});
buttonCancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
buttonCancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
buttonCancel.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
cancel();

2
designer-base/src/main/java/com/fr/design/dialog/UIDialog.java

@ -100,7 +100,7 @@ public abstract class UIDialog extends JDialog {
}
private void addCancelButton(JPanel buttonsPane) {
cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
cancelButton.setName(CANCEL_BUTTON);
cancelButton.setMnemonic('C');
buttonsPane.add(cancelButton);

2
designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java

@ -222,7 +222,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
String name = currentEditor.getName();
Object columnIndex = currentEditor.getValue();
//bug86542,这边为啥要new一个公式出来,只保留content,其他属性全不要了?
if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Formula"))) {
if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
columnIndex = ((FormulaEditor) currentEditor).getFormula();
}

2
designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java

@ -207,7 +207,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
Object columnIndex = currentEditor.getValue();
//bug86542,这边为啥要new一个公式出来,只保留content,其他属性全不要了?
//MoMeak:我也想注释了,但是有bug啊。。。
if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Formula"))) {
if (columnIndex == null && ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
columnIndex = ((FormulaEditor) currentEditor).getFormula();
}

2
designer-base/src/main/java/com/fr/design/editor/editor/ColumnNameEditor.java

@ -23,7 +23,7 @@ public class ColumnNameEditor extends ColumnIndexEditor {
}
public ColumnNameEditor(String[] columnNames) {
this(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"));
this(columnNames, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"));
}
public ColumnNameEditor(final String[] columnNames, String name) {

6
designer-base/src/main/java/com/fr/design/editor/editor/CursorEditor.java

@ -12,10 +12,10 @@ public class CursorEditor extends Editor<CursorEditor> {
public CursorEditor(){
this.setLayout(FRGUIPaneFactory.createCenterFlowLayout());
label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Cursor"));
label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"));
this.add(label);
this.setPreferredSize(new Dimension(10,20));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Cursor"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"));
this.setEnabled(false);
}
@ -36,7 +36,7 @@ public class CursorEditor extends Editor<CursorEditor> {
@Override
public void setValue(CursorEditor value) {
label.setText(com.fr.design.i18n.Toolkit.i18nText("Cursor"));
label.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"));
}
}

2
designer-base/src/main/java/com/fr/design/editor/editor/OldColumnIndexEditor.java

@ -52,7 +52,7 @@ public class OldColumnIndexEditor extends Editor {
protected void initComponents() {
indexCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Column_Index"));
nameCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ColumnName"));
nameCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"));
indexCheckBox.addActionListener(actionListener);
nameCheckBox.addActionListener(actionListener);
javax.swing.ButtonGroup buttonGroup = new javax.swing.ButtonGroup();

2
designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java

@ -176,7 +176,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
if (nodeFile.isLocked()) {
if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FileLocked_Undeleted"),
com.fr.design.i18n.Toolkit.i18nText("Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) {
refreshDockingView();
}
break;

2
designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java

@ -138,7 +138,7 @@ public class FunctionManagerPane extends BasicPane {
}).setVisible(true);
}
});
UIButton editorButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
UIButton editorButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
editorButton.setPreferredSize(new Dimension(editorButton.getPreferredSize().width, classNameTextField.getPreferredSize().height));
reportletNamePane.add(editorButton);
editorButton.addActionListener(createEditorButtonActionListener());

4
designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java

@ -81,7 +81,7 @@ public class JavaEditorPane extends BasicPane {
JPanel toolbarPane = new JPanel(new FlowLayout(FlowLayout.LEFT));
UIButton saveButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save"));
saveButton.setAction(new SaveAction());
UIButton compileButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Compile"));
UIButton compileButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile"));
compileButton.setAction(new CompilerAction());
toolbarPane.add(saveButton);
toolbarPane.add(compileButton);
@ -168,7 +168,7 @@ public class JavaEditorPane extends BasicPane {
private class CompilerAction extends AbstractAction {
public CompilerAction() {
super(com.fr.design.i18n.Toolkit.i18nText("Compile"));
super(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile"));
}
public void actionPerformed(ActionEvent e) {
new SwingWorker<JavaCompileInfo, Void>() {

4
designer-base/src/main/java/com/fr/design/formula/SortFormulaPane.java

@ -38,7 +38,7 @@ public abstract class SortFormulaPane extends JPanel {
sortFormulaTextField = new UITextField(16);
//Lance:添加一公式编辑器按钮
sortFormulaTextFieldButton = new UIButton("...");
sortFormulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Formula") + "...");
sortFormulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula") + "...");
sortFormulaTextFieldButton.setPreferredSize(new Dimension(25, sortFormulaTextFieldButton.getPreferredSize().height));
sortFormulaTextFieldButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
@ -48,7 +48,7 @@ public abstract class SortFormulaPane extends JPanel {
this.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(InsetText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("Select_sort_order") + ":"),
sortOrderComboBox, new UILabel(InsetText),
new UILabel(com.fr.design.i18n.Toolkit.i18nText("Formula") + ":="), sortFormulaTextField, //selectButton,
new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula") + ":="), sortFormulaTextField, //selectButton,
sortFormulaTextFieldButton}, FlowLayout.LEFT));
}

2
designer-base/src/main/java/com/fr/design/gui/columnrow/ColumnRowVerticalPane.java

@ -25,7 +25,7 @@ public class ColumnRowVerticalPane extends ColumnRowPane {
this.add(pane, BorderLayout.NORTH);
JPanel colPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column") + ":"));
colPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column") + ":"));
pane.add(colPane);
initColSpinner();

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

@ -55,7 +55,7 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
});
addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add"));
addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Modify"));
removeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Remove"));
moveUpButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Move_Up"));

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

@ -91,7 +91,7 @@ public class ImgChoosePane extends BasicPane {
}
});
clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Clear"));
clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear"));
clearButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
previewPane.setImage(null);

4
designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java

@ -108,10 +108,10 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]);
} catch (Exception e) {
valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name"))}, 1);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1);
textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Column_Name")), formulaEditor}, 1);
}
}

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

@ -29,7 +29,7 @@ public class ObjectProperiesPane extends BasicBeanPane<ListMap> {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel buttonPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Property"));
this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Property"));
buttonPane.add(this.addButton, BorderLayout.WEST);
this.add(buttonPane, BorderLayout.NORTH);

4
designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java

@ -69,8 +69,8 @@ public class LayerDependenceSettingPane extends JPanel implements ItemListener {
tableDataDictPane.tableDataNameComboBox.addItemListener(this);
//初始化按钮对象
addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("add"));
delButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Delete"));
addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
delButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"));
//初始化Table对象,并添加renderer和editor
model = new LayerDepenceTableModel();
dependenceTable = new JTable();

2
designer-base/src/main/java/com/fr/design/gui/icombobox/AlignmentComboBox.java

@ -47,7 +47,7 @@ public class AlignmentComboBox extends UIComboBox {
public static String getAlignDescription(int alignment) {
if (alignment == Constants.CENTER) {//0
return com.fr.design.i18n.Toolkit.i18nText("Center");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center");
} else if (alignment == Constants.TOP) {//1
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top");
} else if (alignment == Constants.LEFT) {//2

6
designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java

@ -20,13 +20,13 @@ public class DictionaryConstants {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Required"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Length"),
com.fr.design.i18n.Toolkit.i18nText("Float"),
com.fr.design.i18n.Toolkit.i18nText("Email"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Float"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"),
com.fr.design.i18n.Toolkit.i18nText("Phone"),
com.fr.design.i18n.Toolkit.i18nText("MobilePhone"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_IDCard"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_PostCode"),
com.fr.design.i18n.Toolkit.i18nText("Custom")};
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")};
public final static int REG_NONE = 0;
public final static int REG_REQUIRED = 1;

2
designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java

@ -214,7 +214,7 @@ public class UIMenuTable extends JTable {
UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Reportlet"),
new ReportletHyperlink(), ReportletHyperlinkPane.class);
UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Email"),
UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"),
new EmailJavaScript(), EmailPane.class);
UIMenuNameableCreator web = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"),

4
designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java

@ -220,12 +220,12 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
private Component component = null;
public DeleteAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Delete"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
}
public DeleteAction(Component component){
this.setName(com.fr.design.i18n.Toolkit.i18nText("Delete"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
this.component = component;
}

2
designer-base/src/main/java/com/fr/design/gui/itextfield/UISearchTextField.java

@ -63,7 +63,7 @@ public class UISearchTextField extends UITextField {
private void initTextField() {
iconLabel.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
iconLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Search"));
clearLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Clear"));
clearLabel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Clear"));
clearLabel.setOpaque(false);
iconSize = iconLabel.getPreferredSize();
infoSize = infoLabel.getPreferredSize();

4
designer-base/src/main/java/com/fr/design/mainframe/DecodeDialog.java

@ -46,7 +46,7 @@ public class DecodeDialog {
hintsLabel.setForeground(Color.RED);
hintsLabel.setVisible(false);
confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Confirm"));
confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"));
confirmButton.setBounds(180, 90, 60, 25);
confirmButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@ -63,7 +63,7 @@ public class DecodeDialog {
}
});
UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
cancelButton.setBounds(250, 90, 60, 25);
cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {

2
designer-base/src/main/java/com/fr/design/mainframe/DesktopCardPane.java

@ -42,7 +42,7 @@ public class DesktopCardPane extends BasicPane implements TargetModifiedListener
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Desktop");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Desktop");
}
@Override

2
designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ColorBackgroundQuickPane.java

@ -84,7 +84,7 @@ public class ColorBackgroundQuickPane extends BackgroundQuickPane {
* @return 同上
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Color");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color");
}
@Override

2
designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java

@ -47,7 +47,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor {
case DataControl.TYPE_BOOLEAN:
return new BooleanEditor(false);
case DataControl.TYPE_DATE:
return new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Date"));
return new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"));
case DataControl.TYPE_TABLEDATA:
return onlyServer ? new ServerDataTableEditor() : new DataTableEditor();
default:

2
designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java

@ -25,7 +25,7 @@ public class BackgroundWrapper implements Encoder, Decoder {
@Override
public String encode(Object v) {
if (v instanceof ColorBackground) {
return com.fr.design.i18n.Toolkit.i18nText("Color");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color");
} else if (v instanceof TextureBackground) {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
} else if (v instanceof PatternBackground) {

2
designer-base/src/main/java/com/fr/design/parameter/ParameterInputPane.java

@ -120,7 +120,7 @@ public class ParameterInputPane extends BasicPane {
} else if (pv instanceof Float) {
editors[0] = new FloatEditor();
} else if (pv instanceof Date) {
editors[0] = new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Date"));
editors[0] = new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"));
} else if (pv instanceof Boolean) {
editors[0] = new BooleanEditor();
} else if (pv instanceof BaseFormula) {

2
designer-base/src/main/java/com/fr/design/present/DictPresentPane.java

@ -24,7 +24,7 @@ public class DictPresentPane extends FurtherBasicBeanPane<DictPresent> {
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary");
}
@Override

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

@ -45,7 +45,7 @@ public class AlignmentPane extends BasicPane {
private UIRadioButton rightToLeftRB;
// private UIComboBox imageComboBox;
private static final String[] IMAGE = {
com.fr.design.i18n.Toolkit.i18nText("Default"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Extend")
};
private UIBasicSpinner leftIndentSpinner;

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

@ -157,7 +157,7 @@ public class BorderPane extends BasicPane {
rightTopPane.add(first, BorderLayout.NORTH);
JPanel second = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color") + ":"));
second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color") + ":"));
second.add(this.currentLineColorPane);
rightTopPane.add(second, BorderLayout.CENTER);
@ -216,7 +216,7 @@ public class BorderPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Border");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border");
}
// p:populate Style

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

@ -61,7 +61,7 @@ public class FormatBox extends BasicPane {
typeBox.addItem(FormatField.getInstance().getName(FormatContents.TIME));
typeBox.addItem(FormatField.getInstance().getName(FormatContents.TEXT));
pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Format") + ":"));
pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Format") + ":"));
formatBox = new UIComboBox();
// kunsnat: 大小: 这个有的格式的大小需要很宽!
formatBox.setPreferredSize(new Dimension(150, 20));

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

@ -85,7 +85,7 @@ public class BackgroundPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Background");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background");
}

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

@ -29,7 +29,7 @@ public class BackgroundUIComboBoxPane extends BasicPane {
private static final long serialVersionUID = -3751191424737067321L;
protected static final String none = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None");
protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Colors");
protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Colors");
protected static final String image = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image");
protected static final String gradient = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color");

2
designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java

@ -32,7 +32,7 @@ import java.io.File;
*/
public class ImageSelectPane extends BackgroundPane4BoxChange {
private static final long serialVersionUID = -3938766570998917557L;
private static String layoutCenter = com.fr.design.i18n.Toolkit.i18nText("Default");
private static String layoutCenter = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default");
private static String layoutTitled = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Titled");
private String suffix = PictureCollection.DEFAULT_SUFFIX;

6
designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java

@ -63,7 +63,7 @@ public class PatternBackgroundPane extends BPane {
protected void setChildrenOfContentPane(JPanel contentPane) {
// colors
JPanel colorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Colors"));
JPanel colorPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Colors"));
contentPane.add(colorPane);
foregroundColorPane = new ColorSelectBox(80);
@ -72,12 +72,12 @@ public class PatternBackgroundPane extends BPane {
backgroundColorPane.setSelectObject(Color.black);
colorPane.add(Box.createHorizontalStrut(2));
colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Foreground")
colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground")
+ ":", foregroundColorPane));
colorPane.add(Box.createHorizontalStrut(8));
colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Background")
colorPane.add(this.createLabelColorPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")
+ ":", backgroundColorPane));
}

4
designer-base/src/main/java/com/fr/design/style/background/pattern/PatternUIComboBoxPane.java

@ -31,9 +31,9 @@ public class PatternUIComboBoxPane extends BackgroundPane4BoxChange {
this.add(pane, BorderLayout.NORTH);
pane.add(patternBox = new PatternSelectBox(80));
pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Foreground") + ":"));
pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Foreground") + ":"));
pane.add(foreColor = new ColorSelectBox(80));
pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background") + ":"));
pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background") + ":"));
pane.add(backColor = new ColorSelectBox(80));
}

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

@ -53,7 +53,7 @@ public class ColorUIComboBoxPane extends BackgroundPane4BoxChange {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Color");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color");
}
}

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

@ -36,7 +36,7 @@ public class DetailColorSelectPane extends BasicPane {
this.setBorder(BorderFactory.createEmptyBorder(4, 4, 0, 4));
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel titledefaultPane=FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Color"));
JPanel titledefaultPane=FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color"));
JPanel defaultPane =FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
this.add(titledefaultPane, BorderLayout.WEST);
titledefaultPane.add(defaultPane);

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

@ -41,7 +41,7 @@ public abstract class TransparentPane extends BasicPane {
initCenterPaneChildren(centerPane);
UIButton customButton = new CustomButton(com.fr.design.i18n.Toolkit.i18nText("Custom")
UIButton customButton = new CustomButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")
+ "...");
this.add(customButton, BorderLayout.SOUTH);
customButton.setCursor(new Cursor(Cursor.HAND_CURSOR));

2
designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@ -183,7 +183,7 @@ public class CustomIconPane extends BasicPane {
}
private void initEditButton(JPanel buttonPane) {
editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
editButton.setPreferredSize(new Dimension(80, 25));
editButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {

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

@ -29,7 +29,7 @@ public class IconDefinePane extends BasicPane {
labelPane.setLayout(new /**/ FlowLayout(FlowLayout.LEFT, 20, 0));
showIconImageLable = new UILabel();
showIconImageLable.setPreferredSize(new Dimension(20, 20));
editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
editIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
JPanel iconButtonPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
labelPane.add(showIconImageLable);
iconPane.add(labelPane, BorderLayout.WEST);

4
designer-base/src/main/java/com/fr/design/widget/btn/ButtonConstants.java

@ -28,8 +28,8 @@ public class ButtonConstants {
};
public static final String[] TYPES4BUTTON = {
com.fr.design.i18n.Toolkit.i18nText("Common"),
com.fr.design.i18n.Toolkit.i18nText("Custom"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Insert_Row"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Delete_Row"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Type_Parameter_Submit"),

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

@ -34,7 +34,7 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
UILabel headLabel = createUILable();
initBackgroundEditor();
String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DEFAULT"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")};
String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")};
double f = TableLayout.FILL;
final double p = TableLayout.PREFERRED;

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

@ -22,7 +22,7 @@ public class DateValuePane extends JPanel {
private UIButtonGroup widgetValueHead;
private Editor[] editor;
private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None");
private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date");
private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date");
private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula");

4
designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java

@ -42,9 +42,9 @@ public abstract class CustomJobPane extends BasicBeanPane {
GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 20,
classNameTextField.getPreferredSize().height));
UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
editButton.setPreferredSize(new Dimension(
GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")) + 20,
GraphHelper.getLocTextWidth("Fine-Design_Basic_Edit") + 20,
classNameTextField.getPreferredSize().height));
reportletNamePane.add(browserButton);

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

@ -56,7 +56,7 @@ public class ChartDialog extends MiddleChartDialog {
this.add(buttonPane, BorderLayout.SOUTH);
ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
buttonPane.add(ok);
buttonPane.add(cancel);

2
designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java

@ -16,7 +16,7 @@ public class BorderAttriPane extends BasicPane {
private ColorSelectBox colorSelectBox;
public BorderAttriPane() {
this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Color"));
this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color"));
}
public BorderAttriPane(String lineString, String colorSting) {

4
designer-chart/src/main/java/com/fr/design/chart/report/GisMapReportDataContentPane.java

@ -84,7 +84,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
this.add(northPane, BorderLayout.NORTH);
String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"), com.fr.design.i18n.Toolkit.i18nText("Area_Value")};
String[] columnNames = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Title"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Value")};
seriesPane = new UICorrelationPane(columnNames) {
public UITableEditor createUITableEditor() {
return new InnerTableEditor();
@ -115,7 +115,7 @@ public class GisMapReportDataContentPane extends FurtherBasicBeanPane<GisMapRepo
* @return 标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Cell");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell");
}
@Override

2
designer-chart/src/main/java/com/fr/design/chart/report/MapReportCubeDataPane.java

@ -45,7 +45,7 @@ public class MapReportCubeDataPane extends FurtherBasicBeanPane<MapMoreLayerRepo
* @return 返回标题.
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Cell");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell");
}
@Override

2
designer-chart/src/main/java/com/fr/design/chart/report/MapReportDataSinglePane.java

@ -84,7 +84,7 @@ public class MapReportDataSinglePane extends FurtherBasicBeanPane<MapSingleLayer
* 界面弹出标题.
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Cell");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cell");
}
@Override

6
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java

@ -78,7 +78,7 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
typePane.add(maPane);
maPane.add(maButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Chart_Move_Average")));
maPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle") + ":"));
maPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle") + ":"));
maPane.add(maSpinner = new UIBasicSpinner(new SpinnerNumberModel(2, 1, 999, 1)));
maSpinner.setEnabled(false);
@ -101,10 +101,10 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward") + ":"));
extendsPane.add(forwardLabel = new UITextField("0", 5));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle")));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle")));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Backward") + ":"));
extendsPane.add(backwardLabel = new UITextField("0", 5));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("cycle")));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cycle")));
return extendsPane;
}

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

@ -19,7 +19,7 @@ public class DataSeriesAttrCustomPane extends DataSeriesAttrPane {
public NameableCreator[] createNameableCreators() {
return new NameableCreator[] {
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), CustomAttr.class, DataSeriesCustomConditionPane.class)
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), CustomAttr.class, DataSeriesCustomConditionPane.class)
};
}
}

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

@ -37,7 +37,7 @@ public class DataSeriesAttrPane extends JListControlPane {
@Override
public NameableCreator[] createNameableCreators() {
return new NameableCreator[]{
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, DataSeriesConditionPaneFactory.findConfitionPane4DataSeries(plot))
new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), ConditionAttr.class, DataSeriesConditionPaneFactory.findConfitionPane4DataSeries(plot))
};
}

4
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBackgroundPane.java

@ -32,10 +32,10 @@ public class LabelBackgroundPane extends ConditionAttrSingleConditionPane<DataSe
public LabelBackgroundPane(final ConditionAttributesPane conditionAttributesPane) {
super(conditionAttributesPane, true);
backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background"));
backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"));
this.backgroundPreviewPane = new BackgroundPreviewLabel();
this.backgroundPreviewPane.setPreferredSize(new Dimension(80, 20));
UIButton editBackgroundButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Edit"));
UIButton editBackgroundButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
MouseAdapter mouseListener = new MouseAdapter() {
public void mousePressed(MouseEvent evt) {
final BackgroundPane backgroundPane = new BackgroundPane();

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

@ -41,7 +41,7 @@ public class LabelColorPane extends ConditionAttrSingleConditionPane<DataSeriesC
*/
@Override
public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("Color");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color");
}
@Override

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

@ -62,7 +62,7 @@ public class TooltipContentsPane extends BasicPane{
valuePane.add(showValueCB);
UIButton valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Format"));
UIButton valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Format"));
valuePane.add(valueFormatButton);
valueFormatButton.addActionListener(listener);
@ -84,7 +84,7 @@ public class TooltipContentsPane extends BasicPane{
percentValuePane.add(showPercent);
UIButton valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Format"));
UIButton valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Format"));
percentValuePane.add(valueFormatButton);
valueFormatButton.addActionListener(percentListener);

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

@ -116,7 +116,7 @@ public class DataLabelPane extends TooltipContentsPane {
leftButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Left"));
rigtButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Right"));
topButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"));
centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Center"));
centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"));
ButtonGroup bg = new ButtonGroup();
bg.add(bottomButton);

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

@ -22,7 +22,7 @@ public class RangeDataLabelPane extends DataLabelPane {
protected JPanel createJPanel4Position() {
topButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"));
bottomButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"));
centerButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Center"));
centerButton = new JRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"));
ButtonGroup bg = new ButtonGroup();
bg.add(topButton);

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

@ -4,7 +4,7 @@ package com.fr.design.mainframe.chart;
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_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("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_OTHER_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Animation_Special");
@ -12,7 +12,7 @@ public class PaneTitleConstants {
public final static String CHART_STYLE_LEGNED_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Legend");
public final static String CHART_STYLE_SERIES_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Series");
public final static String CHART_STYLE_AXIS_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Axis");
public final static String CHART_STYLE_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Background");
public final static String CHART_STYLE_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background");
public final static String CHART_STYLE_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart_Data_Sheet");
public final static String CHART_STYLE_LABEL_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Label");
public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Analysis_Line");

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java

@ -112,7 +112,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Arrow_Style")), switchStyleGroup, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), timeInterval, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base-Time_Second"))},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background")),colorSelectBox4carousel, null}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background")),colorSelectBox4carousel, null}
};
return TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
@ -143,7 +143,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
private JPanel createButtonBackgroundColorPane(){
colorSelectBox4button = new ColorSelectBoxWithOutTransparent(WIDTH);
return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Background"), colorSelectBox4button, EDIT_AREA_WIDTH);
return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"), colorSelectBox4button, EDIT_AREA_WIDTH);
}
private JPanel createButtonConfigPane() {

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

@ -37,7 +37,7 @@ public class ChartDesignerOtherPane extends ChartOtherPane {
* @return 返回标题.
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Advanced");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced");
}
private boolean isHaveCondition() {

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/PresentComboBox.java

@ -24,7 +24,7 @@ public class PresentComboBox extends UIComboBox{
private Present present;
private String[] ITEMS = {
com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary"),
com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"),
com.fr.design.i18n.Toolkit.i18nText("Present-No_Present")
};

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/XYScatterPlotReportDataContentPane.java

@ -25,7 +25,7 @@ public class XYScatterPlotReportDataContentPane extends AbstractReportDataConten
public XYScatterPlotReportDataContentPane(ChartDataPane parent) {
initEveryPane();
this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Data_Filter")), "0,4,2,4");
this.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Filter")), "0,4,2,4");
this.add(filterPane = new ChartDataFilterPane(new XYScatterPlot(), parent), "0,6,2,4");
}

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

@ -55,7 +55,7 @@ public class ChartAxisLineStylePane extends BasicPane{
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type")),axisLineStyle} ,
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")),axisLineColor},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")),axisLineColor},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),null},
new Component[]{null, mainTickPosition},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")),null},

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

@ -39,7 +39,7 @@ public class ChartAxisTitleNoFormulaPane extends BasicPane {
}
private void initComponents(){
isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Axis_Title"));
isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Title"));
axisTitleContentPane = new UITextField();
axisTitleAttrPane = new ChartTextAttrPane();
axisTitleAttrPane.populate(FRFont.getInstance("Microsoft YaHei", Font.PLAIN, 9));

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

@ -38,7 +38,7 @@ public class ChartAxisTitlePane extends BasicPane{
}
private void initComponents(){
isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Axis_Title"));
isAxisTitleVisable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Title"));
axisTitleContentPane = new TinyFormulaPane();
axisTitleAttrPane = new ChartTextAttrPane();
axisTitleAttrPane.populate(FRFont.getInstance("Microsoft YaHei", Font.PLAIN, 9));

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

@ -16,7 +16,7 @@ public class ChartBeautyPane extends BasicBeanPane<Integer>{
private UIComboBox styleBox;
public ChartBeautyPane() {
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Common"),
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Top_Down_Shade"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Transparent") //新加的两种风格,注意兼容处理
};

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

@ -35,7 +35,7 @@ public class ChartBorderPane extends BasicPane{
double[] rowSize = {p, p, p, p};
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")+":"),currentLineCombo},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")+":"),currentLineColorPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")+":"),currentLineColorPane},
new Component[]{null,isRoundBorder}
} ;
JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Border"},components,rowSize,columnSize);

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

@ -135,7 +135,7 @@ public class ChartFillStylePane extends BasicBeanPane<AttrFillStyle>{
private String[] getNameObj() {
ChartPreStyleConfig config = ChartPreStyleConfig.getInstance();
ArrayList<String> nameArr = new ArrayList<String>();
nameArr.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DEFAULT"));
nameArr.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"));
Iterator keys = config.names();
while (keys.hasNext()) {
Object key = keys.next();

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java

@ -96,7 +96,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
// 最小值.
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Min_Value"));
Date tmp = null;
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1);
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
Editor[] editor = new Editor[]{dateEditor, formulaEditor};
minValueField = new ValueEditorPane(editor);
@ -112,7 +112,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
// 最大值
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Max_Value"));
Date tmp = null;
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), UIDatePicker.STYLE_CN_DATETIME1);
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
Editor[] editor = new Editor[]{dateEditor, formulaEditor};
maxValueField = new ValueEditorPane(editor);

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java

@ -74,7 +74,7 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane {
gridColorPane = new ColorSelectBox(100);
JPanel container = TableLayoutHelper.createTableLayoutPane(new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Color")),gridColorPane},}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")),gridColorPane},}
, rowSize, columnSize);
Component[][] components = new Component[][]{

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/Plot3DAxisAreaPane.java

@ -28,7 +28,7 @@ public class Plot3DAxisAreaPane extends ChartAxisAreaPane {
Component[][] components = new Component[][]{
new Component[]{gridLine,null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Color")),gridColorPane,}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")),gridColorPane,}
};
JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
this.setLayout(new BorderLayout());

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/RadarAxisAreaPane.java

@ -36,7 +36,7 @@ public class RadarAxisAreaPane extends ChartAxisAreaPane {
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Interval_Back") + ":"),horizontalColorPane},
new Component[]{new JSeparator(),null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Main_Grid")),null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Color")),gridColorPane,}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")),gridColorPane,}
};
JPanel panel = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
this.setLayout(new BorderLayout());

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java

@ -93,11 +93,11 @@ public class ChartDataLabelPane extends BasicScrollPane<Chart>{
protected String[] getLabelLocationNameArray() {
Plot plot = chart.getPlot();
if(plot instanceof BarPlot){
return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Outside"), com.fr.design.i18n.Toolkit.i18nText("Center")};
return new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Inside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Outside"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center")};
}else if(plot instanceof PiePlot){
return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_In_Pie"), com.fr.design.i18n.Toolkit.i18nText("Chart_Out_Pie")};
}else if(plot instanceof RangePlot){
return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Center")};
return new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center")};
}else if(plot instanceof BubblePlot){
return new String[] {com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Inside"), com.fr.design.i18n.Toolkit.i18nText("Chart_Bubble_Outside")};
}else{

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java

@ -36,7 +36,7 @@ public class Pie2DSeriesPane extends AbstractPlotSeriesPane {
protected void initCom() {
stylePane = new ChartBeautyPane();
isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Second_Plot"));
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")};
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bar_Style")};
Integer[] valueArray = {0, 1};
secondPlotType = new UIButtonGroup<Integer>(nameArray, valueArray);
smallPercent = new UIBasicSpinner(new SpinnerNumberModel(5, 0, 100, 1));

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java

@ -51,14 +51,14 @@ public class StockSeriesPane extends AbstractPlotSeriesPane {
Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UpBar_Border_Style_And_Color")), null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upLineBox},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Border-Color")), upBorderColor},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Color")), upBorderColor},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upBackColor},
new Component[]{new JSeparator(),null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Down_Bar_Border_Style_And_Color")), null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downLineBox},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Border-Color")), downBorderColor},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Color")), downBorderColor},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downBackColor},
} ;

2
designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java

@ -116,7 +116,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {
selectFilePane.setBorder(BorderFactory.createEmptyBorder(TEN, FIVE, 0, THIRTY));
defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DEFAULT"));
defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default"));
customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Custom"));
ButtonGroup buttonGroup = new ButtonGroup();
defaultRadioButton.setSelected(true);

2
designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java

@ -74,7 +74,7 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
double[] columnSize = {p, p};
double[] rowSize = {p, p, p};
Component[][] components = new Component[][]{
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("ColorMatch")), null},
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match")), null},
new Component[]{null, customPane},
};

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFillStylePane.java

@ -24,7 +24,7 @@ public class VanChartFillStylePane extends ChartFillStylePane {
double[] columnSize = {f, e};
double[] rowSize = {p, p};
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ColorMatch")),styleSelectBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Color_Match")),styleSelectBox},
new Component[]{null,customPane},
};

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java

@ -181,7 +181,7 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem
}
private void addCancelButton(JPanel buttonsPane) {
cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel"));
buttonsPane.add(cancelButton);
cancelButton.addActionListener(new ActionListener() {

6
designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartConditionListControlPane.java

@ -30,14 +30,14 @@ public class VanChartConditionListControlPane extends VanChartUIListControlPane
public void populate(Nameable[] nameableArray, Class<? extends ConditionAttributesPane> showPane) {
initComponentPane();
this.setBorder(null);
NameObjectCreator[] creators = new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, showPane)};
NameObjectCreator[] creators = new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), ConditionAttr.class, showPane)};
refreshNameableCreator(creators);
super.populate(nameableArray);
}
@Override
public NameableCreator[] createNameableCreators() {
return new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes"), ConditionAttr.class, ChartTypeInterfaceManager.getInstance().getPlotConditionPane((Plot) plot).getClass())};
return new NameObjectCreator[]{new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes"), ConditionAttr.class, ChartTypeInterfaceManager.getInstance().getPlotConditionPane((Plot) plot).getClass())};
}
@ -67,7 +67,7 @@ public class VanChartConditionListControlPane extends VanChartUIListControlPane
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Condition_Attributes");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Condition_Attributes");
}

4
designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java

@ -12,7 +12,6 @@ import com.fr.design.designer.beans.AdapterBus;
import com.fr.design.designer.beans.ComponentAdapter;
import com.fr.design.designer.beans.models.SelectionModel;
import com.fr.design.designer.properties.mobile.ChartEditorPropertyUI;
import com.fr.design.designer.properties.mobile.ElementCasePropertyUI;
import com.fr.design.fun.WidgetPropertyUIProvider;
import com.fr.design.gui.chart.BaseChartPropertyPane;
import com.fr.design.gui.chart.MiddleChartComponent;
@ -26,7 +25,6 @@ import com.fr.form.ui.Widget;
import com.fr.design.form.util.XCreatorConstants;
import com.fr.stable.Constants;
import com.fr.stable.GraphDrawHelper;
import com.fr.stable.core.PropertyChangeAdapter;
/**
@ -98,7 +96,7 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
*/
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
return new CRPropertyDescriptor[] {
new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")),
new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")),
new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Visible")).setPropertyChangeListener(new PropertyChangeAdapter() {

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

@ -37,7 +37,7 @@ public class XCheckBoxGroup extends XFieldEditor {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(
DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor());
CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor());
return properties;

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

@ -79,7 +79,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{
new CRPropertyDescriptor("widgetName", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Name")),
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")),
new CRPropertyDescriptor("visible", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Visible")).setPropertyChangeListener(new PropertyChangeAdapter() {

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

@ -33,7 +33,7 @@ public class XIframeEditor extends XWidgetCreator {
@Override
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] {
new CRPropertyDescriptor("src", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Url"))
new CRPropertyDescriptor("src", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Form_Url"))
.setPropertyChangeListener(new PropertyChangeAdapter() {
@Override

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

@ -50,7 +50,7 @@ public class XNameWidget extends XWidgetCreator {
@Override
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
return new CRPropertyDescriptor[] {
new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name")),
new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name")),
new CRPropertyDescriptor("name", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Engine_NameWidget-Name")).setEditorClass(
NameWidgetComboboxEditor.class).setPropertyChangeListener(new PropertyChangeAdapter() {

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

@ -44,7 +44,7 @@ public class XRadioGroup extends XFieldEditor {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Value")).setEditorClass(WidgetValueEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("dictionary", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("DS-Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary")).setEditorClass(DictionaryEditor.class).setRendererClass(
DictionaryRenderer.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")},super.supportedDescriptor());
CRPropertyDescriptor [] properties = (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,getCRPropertyDescriptor());
return properties;

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

@ -486,7 +486,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
g2d.setColor(Color.WHITE);
//画编辑文字
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"), x + w / 2 - 2, y + h / 2 + 5);
g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"), x + w / 2 - 2, y + h / 2 + 5);
g.setColor(XCreatorConstants.FORM_BORDER_COLOR);
GraphHelper.draw(g, new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2, getHeight() - BORDER_WIDTH * 2), Constants.LINE_MEDIUM);
paintExtro(g);

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

@ -73,7 +73,7 @@ public class XWBorderLayout extends XLayoutContainer {
*/
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
return new CRPropertyDescriptor[] {
new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Form-Widget_Name"))
new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form_Form_Widget_Name"))
};
}

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

@ -60,7 +60,7 @@ public class XWParameterLayout extends XWAbsoluteLayout {
CRPropertyDescriptor[] propertyTableEditor = new CRPropertyDescriptor[]{
new CRPropertyDescriptor("widgetName", this.data.getClass()).setI18NName(Toolkit.i18nText("Fine-Design_Form-Widget_Name")),
new CRPropertyDescriptor("background", this.data.getClass()).setEditorClass(BackgroundEditor.class)
.setRendererClass(BackgroundRenderer.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Background"))
.setRendererClass(BackgroundRenderer.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("delayDisplayContent", this.data.getClass()).setEditorClass(BooleanEditor.class)
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Display_Nothing_Before_Query"))

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save