Browse Source

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

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

* commit '77073f89c6c0539c90c45167198675f52e96a8bb':
  提交国际化
  规范国际化文件及国际化定义。
final/10.0
Alex.Sung 6 years ago
parent
commit
8c1f2a48f7
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java
  2. 2
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java
  3. 6
      designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
  4. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
  5. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java
  6. 2
      designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java
  7. 2
      designer-base/src/main/java/com/fr/design/style/AlignmentPane.java
  8. 4
      designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
  9. 8
      designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java
  10. 2
      designer-chart/src/main/java/com/fr/design/chart/report/GisMapDataPane.java
  11. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapSinglePane.java
  12. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapTableCubeDataPane.java
  13. 2
      designer-chart/src/main/java/com/fr/design/mainframe/MiddleChartPropertyPane.java
  14. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java
  15. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java
  16. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java
  17. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitleNoFormulaPane.java
  18. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisTitlePane.java
  19. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java
  20. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
  21. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartDataLabelPane.java
  22. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java
  23. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java
  24. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePane.java
  25. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/title/ChartTitlePaneNoFormula.java
  26. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java
  27. 2
      designer-form/src/main/java/com/fr/design/designer/beans/actions/ConnectionAction.java
  28. 2
      designer-form/src/main/java/com/fr/design/designer/beans/painters/AbstractPainter.java
  29. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java
  30. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java
  31. 2
      designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java
  32. 10
      designer-form/src/main/java/com/fr/design/designer/properties/items/FRBorderConstraintsItems.java
  33. 4
      designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java
  34. 2
      designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java
  35. 2
      designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java
  36. 8
      designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java
  37. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java
  38. 2
      designer-realize/src/main/java/com/fr/design/actions/cell/CellExpandAttrAction.java
  39. 4
      designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java
  40. 2
      designer-realize/src/main/java/com/fr/design/actions/columnrow/CancelColumnAction.java
  41. 2
      designer-realize/src/main/java/com/fr/design/actions/columnrow/CancelRowAction.java
  42. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/AbstractExcelExportAction.java
  43. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/CSVExportAction.java
  44. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/PageToSheetExcelExportAction.java
  45. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/SVGExportAction.java
  46. 2
      designer-realize/src/main/java/com/fr/design/actions/file/export/TextExportAction.java
  47. 2
      designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java
  48. 8
      designer-realize/src/main/java/com/fr/design/condition/PagePane.java
  49. 20
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  50. 4
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnBasicPane.java
  51. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java
  52. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java
  53. 4
      designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupDockingPane.java
  54. 4
      designer-realize/src/main/java/com/fr/design/dscolumn/SpecifiedGroupAttrPane.java
  55. 2
      designer-realize/src/main/java/com/fr/design/expand/ExpandDirectionPane.java
  56. 2
      designer-realize/src/main/java/com/fr/design/mainframe/CellElementPropertyPane.java
  57. 4
      designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java
  58. 2
      designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java
  59. 8
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java
  60. 2
      designer-realize/src/main/java/com/fr/design/present/BarCodePane.java
  61. 2
      designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java
  62. 4
      designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java
  63. 4
      designer-realize/src/main/java/com/fr/design/report/RowColumnPane.java
  64. 2
      designer-realize/src/main/java/com/fr/design/report/SubReportPane.java
  65. 2
      designer-realize/src/main/java/com/fr/design/report/WordExportPane.java
  66. 2
      designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java
  67. 4
      designer-realize/src/main/java/com/fr/design/webattr/EventPane.java
  68. 2
      designer-realize/src/main/java/com/fr/design/webattr/SettingToolBar.java
  69. 4
      designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java
  70. 2
      designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
  71. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java
  72. 4
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java
  73. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java
  74. 2
      designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java
  75. 12
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
  76. 2
      designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java

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

@ -113,7 +113,7 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
* @return 提示 * @return 提示
*/ */
public String createTooltip() { public String createTooltip() {
return b ? com.fr.design.i18n.Toolkit.i18nText("Connect_SQL_Cannot_Null") : null; return b ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") : null;
} }
public String getPrefix() { public String getPrefix() {

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

@ -100,7 +100,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
} }
private ExpandMutableTreeNode initTemplateDataNode(Map<String, TableDataWrapper> templateDataMap) { private ExpandMutableTreeNode initTemplateDataNode(Map<String, TableDataWrapper> templateDataMap) {
ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("DS-TableData"), TEMPLATE_TABLE_DATA), true); ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_DS_TableData"), TEMPLATE_TABLE_DATA), true);
templateNode.addChildTreeNodes(getNodeArrayFromMap(templateDataMap)); templateNode.addChildTreeNodes(getNodeArrayFromMap(templateDataMap));
return templateNode; return templateNode;
} }

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

@ -57,7 +57,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
// 按钮. // 按钮.
JPanel testPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); JPanel testPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
northPane.add(testPane, BorderLayout.NORTH); northPane.add(testPane, BorderLayout.NORTH);
UIButton testButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection")); UIButton testButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"));
testPane.add(testButton); testPane.add(testButton);
testButton.addActionListener(testConnectionActionListener); testButton.addActionListener(testConnectionActionListener);
testPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 3, 4)); testPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 3, 4));
@ -163,11 +163,11 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
private void initDialogPane() { private void initDialogPane() {
message.setText(com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection") + "..."); message.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection") + "...");
message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0));
okButton.setEnabled(false); okButton.setEnabled(false);
dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(DatabaseConnectionPane.this), com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection"), true); dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(DatabaseConnectionPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"), true);
dialog.setSize(new Dimension(268, 118)); dialog.setSize(new Dimension(268, 118));
okButton.setEnabled(false); okButton.setEnabled(false);
JPanel jp = new JPanel(); JPanel jp = new JPanel();

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

@ -274,7 +274,7 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + "."); throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
} catch (Exception e) { } catch (Exception e) {
// JOptionPane.showMessageDialog(DBTableDataPane.this, // JOptionPane.showMessageDialog(DBTableDataPane.this,
// com.fr.design.i18n.Toolkit.i18nText("Connect_SQL_Cannot_Null") + "."); // com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connect_SQL_Cannot_Null") + ".");
} }
} }

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

@ -179,7 +179,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Selection")); chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Selection"));
chooseFile.addActionListener(chooseFileListener); chooseFile.addActionListener(chooseFileListener);
testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Test_Connection")); testConnection = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"));
testConnection.setEnabled(false); testConnection.setEnabled(false);
testConnection.addActionListener(testConnectionListener);// 测试连接按钮 testConnection.addActionListener(testConnectionListener);// 测试连接按钮

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

@ -46,7 +46,7 @@ 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("Song_TypeFace"),0,12);
private static final Font FONT_BLACK = new Font(com.fr.design.i18n.Toolkit.i18nText("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;

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

@ -184,7 +184,7 @@ public class AlignmentPane extends BasicPane {
private JPanel getAlignment() { private JPanel getAlignment() {
//algnment. //algnment.
JPanel aligmentPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style")); JPanel aligmentPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style"));
JPanel horAlignmentPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); JPanel horAlignmentPane = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
// aligmentPane.add(horAlignmentPane); // aligmentPane.add(horAlignmentPane);
horAlignmentComboBox = new AlignmentComboBox(CoreConstants.HORIZONTAL_ALIGNMENT_ARRAY); horAlignmentComboBox = new AlignmentComboBox(CoreConstants.HORIZONTAL_ALIGNMENT_ARRAY);

4
designer-base/src/main/java/com/fr/env/RemoteEnvPane.java vendored

@ -250,7 +250,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
testPanel.setPreferredSize(new Dimension(437, 20)); testPanel.setPreferredSize(new Dimension(437, 20));
UIButton testConnectionButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Test_Connection")); UIButton testConnectionButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Test_Connection"));
testConnectionButton.setToolTipText(Toolkit.i18nText("Datasource-Test_Connection")); testConnectionButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"));
testConnectionButton.addActionListener(new ActionListener() { testConnectionButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent ev) { public void actionPerformed(ActionEvent ev) {
@ -587,7 +587,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0));
okButton.setEnabled(false); okButton.setEnabled(false);
dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Toolkit.i18nText("Datasource-Test_Connection"), true); dialog = new JDialog((Dialog) SwingUtilities.getWindowAncestor(RemoteEnvPane.this), Toolkit.i18nText("Fine-Design_Basic_Datasource_Test_Connection"), true);
dialog.setSize(new Dimension(268, 118)); dialog.setSize(new Dimension(268, 118));
okButton.setEnabled(false); okButton.setEnabled(false);

8
designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java

@ -37,8 +37,8 @@ public class ChartEmailPane extends EmailPane{
{new UILabel(), tipsPane1}, {new UILabel(), tipsPane1},
createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()),
createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()),
createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_BCC"), bccEditor = new UITextField()),
createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_Mail_Subject"), titleEditor = new UITextField()),
{mainTextLabel, scrollPane}, {mainTextLabel, scrollPane},
{new UILabel(), showTplContent}, {new UILabel(), showTplContent},
{new UILabel(), tipsPane2}},rSizes, columnSize, 6); {new UILabel(), tipsPane2}},rSizes, columnSize, 6);
@ -48,8 +48,8 @@ public class ChartEmailPane extends EmailPane{
{new UILabel(), tipsPane1}, {new UILabel(), tipsPane1},
createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()),
createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()),
createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_BCC"), bccEditor = new UITextField()),
createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_Mail_Subject"), titleEditor = new UITextField()),
{mainTextLabel, scrollPane}, {mainTextLabel, scrollPane},
{new UILabel(), tipsPane2}},rSizes, columnSize, 8); {new UILabel(), tipsPane2}},rSizes, columnSize, 8);
} }

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

@ -130,7 +130,7 @@ public class GisMapDataPane extends DataContentsPane{
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Data_Setting"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting");
} }
}, BorderLayout.CENTER); }, BorderLayout.CENTER);

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

@ -57,7 +57,7 @@ public class MapSinglePane extends FurtherBasicBeanPane<TopDefinitionProvider> {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Data_Setting"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting");
} }
}, BorderLayout.CENTER); }, BorderLayout.CENTER);
} }

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

@ -77,7 +77,7 @@ public class MapTableCubeDataPane extends FurtherBasicBeanPane<MapMoreLayerTable
* @return 返回标题. * @return 返回标题.
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("DS-TableData"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_DS_TableData");
} }
@Override @Override

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

@ -118,7 +118,7 @@ public abstract class MiddleChartPropertyPane extends BaseChartPropertyPane{
* 返回View的标题. * 返回View的标题.
*/ */
public String getViewTitle() { public String getViewTitle() {
return com.fr.design.i18n.Toolkit.i18nText("CellElement-Property_Table"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cell_Element_Property_Table");
} }
/** /**

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

@ -6,7 +6,7 @@ public class PaneTitleConstants {
public final static String CHART_TYPE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Type"); public final static String CHART_TYPE_TITLE = com.fr.design.i18n.Toolkit.i18nText("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("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("Style");
public final static String CHART_OTHER_TITLE = com.fr.design.i18n.Toolkit.i18nText("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("Title"); public final static String CHART_STYLE_TITLE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Title");
public final static String CHART_STYLE_LEGNED_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Legend"); public final static String CHART_STYLE_LEGNED_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Legend");
@ -14,10 +14,10 @@ public class PaneTitleConstants {
public final static String CHART_STYLE_AXIS_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Axis"); 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("Background");
public final static String CHART_STYLE_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart_Data_Sheet"); 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("Data-Label"); 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("AnalysisLine"); public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("AnalysisLine");
public final static String CHART_STYLE_AREA_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("D-ChartArea"); public final static String CHART_STYLE_AREA_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_D_Chart_Area");
public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Plot"); public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Plot");
public final static String CHART_OTHER_TITLE_CHANGE = com.fr.design.i18n.Toolkit.i18nText("Chart-Switch"); public final static String CHART_OTHER_TITLE_CHANGE = com.fr.design.i18n.Toolkit.i18nText("Chart-Switch");

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java

@ -19,9 +19,9 @@ import com.fr.log.FineLoggerFactory;
*/ */
public class CalculateComboBox extends UIComboBox{ public class CalculateComboBox extends UIComboBox{
public static final String[] CALCULATE_ARRAY = {com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"), com.fr.design.i18n.Toolkit.i18nText("DataFunction-Sum"), public static final String[] CALCULATE_ARRAY = {com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Sum"),
com.fr.design.i18n.Toolkit.i18nText("DataFunction-Average"), com.fr.design.i18n.Toolkit.i18nText("DataFunction-Max"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Average"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Max"),
com.fr.design.i18n.Toolkit.i18nText("DataFunction-Min"), com.fr.design.i18n.Toolkit.i18nText("DataFunction-Count")}; com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Min"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Count")};
public static final Class[] CLASS_ARRAY = {NoneFunction.class, SumFunction.class, AverageFunction.class, public static final Class[] CLASS_ARRAY = {NoneFunction.class, SumFunction.class, AverageFunction.class,
MaxFunction.class, MinFunction.class, CountFunction.class}; MaxFunction.class, MinFunction.class, CountFunction.class};

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

@ -35,7 +35,7 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa
@Override @Override
protected String[] columnNames() { protected String[] columnNames() {
return new String[]{ return new String[]{
com.fr.design.i18n.Toolkit.i18nText("Bubble-Series_Name"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Series_Name"),
com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"),
com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size")

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

@ -57,7 +57,7 @@ public class ChartAxisTitleNoFormulaPane extends BasicPane {
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{null,axisTitleContentPane}, new Component[]{null,axisTitleContentPane},
new Component[]{null,axisTitleAttrPane}, new Component[]{null,axisTitleAttrPane},
new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style"))}, new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style"))},
new Component[]{null,titleAlignmentPane,}, new Component[]{null,titleAlignmentPane,},
}; };
titlePane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); titlePane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

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

@ -56,7 +56,7 @@ public class ChartAxisTitlePane extends BasicPane{
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{null,axisTitleContentPane}, new Component[]{null,axisTitleContentPane},
new Component[]{null,axisTitleAttrPane}, new Component[]{null,axisTitleAttrPane},
new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style"))}, new Component[]{null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style"))},
new Component[]{null,titleAlignmentPane,}, new Component[]{null,titleAlignmentPane,},
}; };
titlePane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); titlePane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);

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

@ -28,7 +28,7 @@ public class ChartBorderPane extends BasicPane{
private void initComponents() { private void initComponents() {
currentLineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART); currentLineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
currentLineColorPane = new ColorSelectBox(100); currentLineColorPane = new ColorSelectBox(100);
isRoundBorder = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Border-Style-Radius")); isRoundBorder = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Style_Radius"));
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] columnSize = { p,f }; double[] columnSize = { p,f };

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

@ -358,7 +358,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
String tmp = DateUtils.getDate2LStr(toDate); String tmp = DateUtils.getDate2LStr(toDate);
toDate = DateUtils.DATETIMEFORMAT2.parse(tmp); toDate = DateUtils.DATETIMEFORMAT2.parse(tmp);
} catch (ParseException e) { } catch (ParseException e) {
FineLoggerFactory.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Cannot_Get_Date")); FineLoggerFactory.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Cannot_Get_Date"));
} }
return toDate; return toDate;
} }

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

@ -93,7 +93,7 @@ public class ChartDataLabelPane extends BasicScrollPane<Chart>{
protected String[] getLabelLocationNameArray() { protected String[] getLabelLocationNameArray() {
Plot plot = chart.getPlot(); Plot plot = chart.getPlot();
if(plot instanceof BarPlot){ if(plot instanceof BarPlot){
return new String[] {com.fr.design.i18n.Toolkit.i18nText("BarInside"), com.fr.design.i18n.Toolkit.i18nText("BarOutSide"), 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("Center")};
}else if(plot instanceof PiePlot){ }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")}; 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){ }else if(plot instanceof RangePlot){

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

@ -52,7 +52,7 @@ public class BubbleSeriesPane extends AbstractPlotSeriesPane{
protected void initCom(){ protected void initCom(){
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Bubble", "Chart_Area"}), String[] nameArray = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Bubble", "Chart_Area"}),
com.fr.design.i18n.Toolkit.i18nText("Bubble-Width")}; com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Width")};
Integer[] valueArray = {BubblePlot.BUBBLE_AREA, BubblePlot.BUBBLE_WIDTH}; Integer[] valueArray = {BubblePlot.BUBBLE_AREA, BubblePlot.BUBBLE_WIDTH};
bubbleMean = new UIButtonGroup<Integer>(nameArray, valueArray); bubbleMean = new UIButtonGroup<Integer>(nameArray, valueArray);
zoomTime = new UITextField(); zoomTime = new UITextField();

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

@ -56,7 +56,7 @@ public class StockSeriesPane extends AbstractPlotSeriesPane {
new Component[]{new JSeparator(),null}, new Component[]{new JSeparator(),null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("DownBarBorderStyleAndColor")), 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("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("Border-Color")), downBorderColor},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), downBackColor}, 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/mainframe/chart/gui/style/title/ChartTitlePane.java

@ -110,7 +110,7 @@ public class ChartTitlePane extends BasicScrollPane<Chart> {
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{null,titleContent,null}, new Component[]{null,titleContent,null},
new Component[]{null,textAttrPane,null}, new Component[]{null,textAttrPane,null},
new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style") + ":"),alignmentPane} , new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style") + ":"),alignmentPane} ,
} ; } ;
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);

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

@ -110,7 +110,7 @@ public class ChartTitlePaneNoFormula extends BasicScrollPane<Chart> {
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{null,titleContent,null}, new Component[]{null,titleContent,null},
new Component[]{null,textAttrPane,null}, new Component[]{null,textAttrPane,null},
new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Alignment-Style") + ":"),alignmentPane} , new Component[]{null,new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alignment_Style") + ":"),alignmentPane} ,
} ; } ;
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);

2
designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java

@ -150,7 +150,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{null,null}, new Component[]{null,null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Constraints"), SwingConstants.LEFT),alignmentPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Constraints"), SwingConstants.LEFT),alignmentPane},
new Component[]{null,customFloatPositionButton} new Component[]{null,customFloatPositionButton}
}; };

2
designer-form/src/main/java/com/fr/design/designer/beans/actions/ConnectionAction.java

@ -16,7 +16,7 @@ public class ConnectionAction extends UpdateAction implements ToggleButtonUpdate
public ConnectionAction(FormDesigner fd) { public ConnectionAction(FormDesigner fd) {
this.fd = fd; this.fd = fd;
this.setName(com.fr.design.i18n.Toolkit.i18nText("Connectionline")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Connecti_Online"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/toolbarbtn/connector.png")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/toolbarbtn/connector.png"));
} }

2
designer-form/src/main/java/com/fr/design/designer/beans/painters/AbstractPainter.java

@ -82,7 +82,7 @@ public abstract class AbstractPainter implements HoverPainter {
g2d.setStroke(XCreatorConstants.STROKE); g2d.setStroke(XCreatorConstants.STROKE);
g2d.setColor(bColor); g2d.setColor(bColor);
if (!accept) { if (!accept) {
g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Cannot-Add_To_This_Area") + "!", x + width / 3, y + height / 2); g2d.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Cannot_Add_To_This_Area") + "!", x + width / 3, y + height / 2);
} else if (drawBackground) { } else if (drawBackground) {
g2d.fillRect(x, y, width, height); g2d.fillRect(x, y, width, height);
} else { } else {

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

@ -64,7 +64,7 @@ public class XCheckBoxGroup extends XFieldEditor {
} }
if (!((CheckBoxGroup) this.toData()).isAdaptive()) { if (!((CheckBoxGroup) this.toData()).isAdaptive()) {
crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data
.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns")).putKeyValue( .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); XCreatorConstants.PROPERTY_CATEGORY, "Advanced"));
} }
return crp; return crp;

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

@ -56,7 +56,7 @@ public class XRadioGroup extends XFieldEditor {
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)}; .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)};
if (!toData().isAdaptive()) { if (!toData().isAdaptive()) {
crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data
.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns")).putKeyValue( .getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced")); XCreatorConstants.PROPERTY_CATEGORY, "Advanced"));
} }
return crp; return crp;

2
designer-form/src/main/java/com/fr/design/designer/properties/FRBorderLayoutConstraints.java

@ -82,7 +82,7 @@ public class FRBorderLayoutConstraints implements ConstraintsGroupModel {
if (column == 0) { if (column == 0) {
switch (row) { switch (row) {
case 0: case 0:
return com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Constraints"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Constraints");
case 1: case 1:
return com.fr.design.i18n.Toolkit.i18nText("Title"); return com.fr.design.i18n.Toolkit.i18nText("Title");
default: default:

10
designer-form/src/main/java/com/fr/design/designer/properties/items/FRBorderConstraintsItems.java

@ -10,7 +10,7 @@ public class FRBorderConstraintsItems implements ItemProvider {
public FRBorderConstraintsItems(String[] directions) { public FRBorderConstraintsItems(String[] directions) {
Item[] item = createItems(directions); Item[] item = createItems(directions);
VALUE_ITEMS = (Item[]) ArrayUtils.add(item, new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-Center"), VALUE_ITEMS = (Item[]) ArrayUtils.add(item, new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_Center"),
WBorderLayout.CENTER)); WBorderLayout.CENTER));
} }
@ -23,13 +23,13 @@ public class FRBorderConstraintsItems implements ItemProvider {
Item[] items = new Item[directions.length]; Item[] items = new Item[directions.length];
for (int i = 0; i < directions.length; i++) { for (int i = 0; i < directions.length; i++) {
if (WBorderLayout.NORTH == directions[i]) { if (WBorderLayout.NORTH == directions[i]) {
items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-North"), WBorderLayout.NORTH); items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_North"), WBorderLayout.NORTH);
} else if (WBorderLayout.SOUTH == directions[i]) { } else if (WBorderLayout.SOUTH == directions[i]) {
items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-South"), WBorderLayout.SOUTH); items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_South"), WBorderLayout.SOUTH);
} else if (WBorderLayout.WEST == directions[i]) { } else if (WBorderLayout.WEST == directions[i]) {
items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-West"), WBorderLayout.WEST); items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_West"), WBorderLayout.WEST);
} else if (WBorderLayout.EAST == directions[i]) { } else if (WBorderLayout.EAST == directions[i]) {
items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-East"), WBorderLayout.EAST); items[i] = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_East"), WBorderLayout.EAST);
} }
} }
return items; return items;

4
designer-form/src/main/java/com/fr/design/form/javascript/FormEmailPane.java

@ -25,8 +25,8 @@ public class FormEmailPane extends EmailPane{
{new UILabel(), tipsPane1}, {new UILabel(), tipsPane1},
createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()),
createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-CC_to"), ccEditor = new UITextField()),
createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-BCC"), bccEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_BCC"), bccEditor = new UITextField()),
createLinePane(com.fr.design.i18n.Toolkit.i18nText("EmailPane-mailSubject"), titleEditor = new UITextField()), createLinePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Email_Pane_Mail_Subject"), titleEditor = new UITextField()),
{mainTextLabel, scrollPane}, {mainTextLabel, scrollPane},
{new UILabel(), tipsPane2}},rowSize, columnSize, 7); {new UILabel(), tipsPane2}},rowSize, columnSize, 7);
} }

2
designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java

@ -146,7 +146,7 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide
if (wo != null && wo.length > 0) { if (wo != null && wo.length > 0) {
this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Chart"))); this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Chart")));
UIButton chartButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/chart.png")); UIButton chartButton = new UIButton(BaseUtils.readIcon("com/fr/design/images/toolbarbtn/chart.png"));
chartButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Click-Me")); chartButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Click_Me"));
chartButton.addMouseListener(new MouseAdapter() { chartButton.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {

2
designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java

@ -24,7 +24,7 @@ public class ColorPalette extends JPopupMenu {
private Object[] colors = new Object[]{new Object[]{com.fr.design.i18n.Toolkit.i18nText("Black"), new Color(0, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Crimson"), new Color(128, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Red"), new Color(255, 0, 0)}, private Object[] colors = new Object[]{new Object[]{com.fr.design.i18n.Toolkit.i18nText("Black"), new Color(0, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Crimson"), new Color(128, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Red"), new Color(255, 0, 0)},
new Object[]{com.fr.design.i18n.Toolkit.i18nText("Pink"), new Color(255, 0, 255)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown"), new Color(153, 51, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Pink"), new Color(255, 0, 255)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown"), new Color(153, 51, 0)},
new Object[]{com.fr.design.i18n.Toolkit.i18nText("Orange"), new Color(255, 102, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Light_Orange"), new Color(255, 153, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Golden"), new Color(255, 204, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Orange"), new Color(255, 102, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Light_Orange"), new Color(255, 153, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Golden"), new Color(255, 204, 0)},
new Object[]{com.fr.design.i18n.Toolkit.i18nText("Brown_Orange"), new Color(255, 204, 153)}, new Object[]{"", new Color(51, 51, 0)}, new Object[]{"", new Color(128, 128, 0)}, new Object[]{"", new Color(153, 204, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Brown_Orange"), new Color(255, 204, 153)}, new Object[]{"", new Color(51, 51, 0)}, new Object[]{"", new Color(128, 128, 0)}, new Object[]{"", new Color(153, 204, 0)},
new Object[]{"", new Color(255, 255, 0)}, new Object[]{"", new Color(255, 255, 153)}, new Object[]{"", new Color(0, 51, 0)}, new Object[]{"", new Color(0, 128, 0)}, new Object[]{"", new Color(255, 255, 0)}, new Object[]{"", new Color(255, 255, 153)}, new Object[]{"", new Color(0, 51, 0)}, new Object[]{"", new Color(0, 128, 0)},
new Object[]{"", new Color(51, 153, 102)}, new Object[]{"", new Color(172, 168, 153)}, new Object[]{"", new Color(204, 255, 204)}, new Object[]{"", new Color(0, 51, 102)}, new Object[]{"", new Color(51, 153, 102)}, new Object[]{"", new Color(172, 168, 153)}, new Object[]{"", new Color(204, 255, 204)}, new Object[]{"", new Color(0, 51, 102)},
new Object[]{"", new Color(0, 128, 128)}, new Object[]{"", new Color(51, 204, 204)}, new Object[]{"", new Color(0, 255, 255)}, new Object[]{"", new Color(204, 255, 255)}, new Object[]{"", new Color(0, 128, 128)}, new Object[]{"", new Color(51, 204, 204)}, new Object[]{"", new Color(0, 255, 255)}, new Object[]{"", new Color(204, 255, 255)},

8
designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java

@ -16,10 +16,10 @@ import com.fr.stable.StringUtils;
public class BorderLayoutDirectionEditor extends AbstractPropertyEditor { public class BorderLayoutDirectionEditor extends AbstractPropertyEditor {
public static final Item[] ITEMS = new Item[] { public static final Item[] ITEMS = new Item[] {
new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-North"), WBorderLayout.NORTH), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_North"), WBorderLayout.NORTH),
new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-South"), WBorderLayout.SOUTH), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_South"), WBorderLayout.SOUTH),
new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-West"), WBorderLayout.WEST), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_West"), WBorderLayout.WEST),
new Item(com.fr.design.i18n.Toolkit.i18nText("BorderLayout-East"), WBorderLayout.EAST) }; new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_BorderLayout_East"), WBorderLayout.EAST) };
private ComboCheckBox comboBox; private ComboCheckBox comboBox;

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

@ -32,7 +32,7 @@ public class ButtonGroupDictPane extends JPanel {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Adaptive"), true); adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Adaptive"), true);
adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns") + ":"); this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns") + ":");
columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1)); columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{adaptiveCheckbox, columnLabel, columnSpinner}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7); JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{adaptiveCheckbox, columnLabel, columnSpinner}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);

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

@ -18,7 +18,7 @@ public class CellExpandAttrAction extends CellAttributeTableAction{
@Override @Override
public String getID() { public String getID() {
return com.fr.design.i18n.Toolkit.i18nText("ExpandD-Expand_Attribute"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Expand_Attribute");
} }
} }

4
designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java

@ -290,10 +290,10 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
new CellBorderStyle(Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black, new CellBorderStyle(Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black,
Constants.LINE_THICK, Color.black, Constants.LINE_NONE, Color.black, Constants.LINE_NONE) }; Constants.LINE_THICK, Color.black, Constants.LINE_NONE, Color.black, Constants.LINE_NONE) };
private static final String[] BorderStyleTooltips = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_No_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Bottom_Border_Line"), private static final String[] BorderStyleTooltips = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_No_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Bottom_Border_Line"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Right_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Double_Bottom_BorderLine"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Right_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Double_Bottom_BorderLine"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Thick_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Thick_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_Bottom_Border_Line"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_And_Double_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_And_Thick_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_And_Double_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_And_Thick_Bottom_Border_Line"),
com.fr.design.i18n.Toolkit.i18nText("All_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Out_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Out_Thick_Border_Line") }; com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_All_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Out_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Out_Thick_Border_Line") };
@Override @Override
public void hidePopupMenu() { public void hidePopupMenu() {

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

@ -11,7 +11,7 @@ public class CancelColumnAction extends CellSelectionAction{
public CancelColumnAction(ElementCasePane t) { public CancelColumnAction(ElementCasePane t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Cancel_Repeat_Attributes")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Repeat_Attributes"));
} }
@Override @Override

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

@ -12,7 +12,7 @@ public class CancelRowAction extends CellSelectionAction {
public CancelRowAction(ElementCasePane t) { public CancelRowAction(ElementCasePane t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Cancel_Repeat_Attributes")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Repeat_Attributes"));
} }
@Override @Override

2
designer-realize/src/main/java/com/fr/design/actions/file/export/AbstractExcelExportAction.java

@ -26,7 +26,7 @@ public abstract class AbstractExcelExportAction extends AbstractExportAction {
if (hasLayerReport(tpl)) { if (hasLayerReport(tpl)) {
return new ChooseFileFilter(new String[]{"zip"}, "ZIP"); return new ChooseFileFilter(new String[]{"zip"}, "ZIP");
} else { } else {
return new ChooseFileFilter(new String[]{"xls", "xlsx"}, com.fr.design.i18n.Toolkit.i18nText("Export-Excel")); return new ChooseFileFilter(new String[]{"xls", "xlsx"}, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel"));
} }
} }

2
designer-realize/src/main/java/com/fr/design/actions/file/export/CSVExportAction.java

@ -41,7 +41,7 @@ public class CSVExportAction extends AbstractExportAction {
@Override @Override
protected ChooseFileFilter getChooseFileFilter() { protected ChooseFileFilter getChooseFileFilter() {
return new ChooseFileFilter(FileExtension.CSV, com.fr.design.i18n.Toolkit.i18nText("Export-CSV")); return new ChooseFileFilter(FileExtension.CSV, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_CSV"));
} }
@Override @Override

2
designer-realize/src/main/java/com/fr/design/actions/file/export/PageToSheetExcelExportAction.java

@ -30,7 +30,7 @@ public class PageToSheetExcelExportAction extends AbstractExcelExportAction {
@Override @Override
protected ChooseFileFilter getChooseFileFilter() { protected ChooseFileFilter getChooseFileFilter() {
return new ChooseFileFilter(FileExtension.XLS, com.fr.design.i18n.Toolkit.i18nText("Export-Excel")); return new ChooseFileFilter(FileExtension.XLS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Excel"));
} }
@Override @Override

2
designer-realize/src/main/java/com/fr/design/actions/file/export/SVGExportAction.java

@ -35,7 +35,7 @@ public class SVGExportAction extends AbstractExportAction {
@Override @Override
protected ChooseFileFilter getChooseFileFilter() { protected ChooseFileFilter getChooseFileFilter() {
return new ChooseFileFilter(FileExtension.SVG, com.fr.design.i18n.Toolkit.i18nText("Export-SVG")); return new ChooseFileFilter(FileExtension.SVG, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_SVG"));
} }
@Override @Override

2
designer-realize/src/main/java/com/fr/design/actions/file/export/TextExportAction.java

@ -34,7 +34,7 @@ public class TextExportAction extends AbstractExportAction {
@Override @Override
protected ChooseFileFilter getChooseFileFilter() { protected ChooseFileFilter getChooseFileFilter() {
return new ChooseFileFilter(FileExtension.TXT, com.fr.design.i18n.Toolkit.i18nText("Export-Text")); return new ChooseFileFilter(FileExtension.TXT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Text"));
} }
@Override @Override

2
designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java

@ -100,7 +100,7 @@ public class DeprecatedActionManager {
formulaAction.setMnemonic('F'); formulaAction.setMnemonic('F');
NewPresentAction barcodeAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("M_Insert-Barcode"), BarcodePresent.class.getName()); NewPresentAction barcodeAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("M_Insert-Barcode"), BarcodePresent.class.getName());
barcodeAction.setMnemonic('B'); barcodeAction.setMnemonic('B');
NewPresentAction currencyLineAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Currency_Line"), CurrencyLinePresent.class.getName()); NewPresentAction currencyLineAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Currency_Line"), CurrencyLinePresent.class.getName());
currencyLineAction.setMnemonic('L'); currencyLineAction.setMnemonic('L');
NewPresentAction nonePresentAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Present-No_Present"), "NOPRESENT"); NewPresentAction nonePresentAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Present-No_Present"), "NOPRESENT");
nonePresentAction.setMnemonic('N'); nonePresentAction.setMnemonic('N');

8
designer-realize/src/main/java/com/fr/design/condition/PagePane.java

@ -21,10 +21,10 @@ public class PagePane extends ConditionAttrSingleConditionPane<HighlightAction>
this.add(pageLabel); this.add(pageLabel);
this.pageComboBox = new UIComboBox(new String[] { this.pageComboBox = new UIComboBox(new String[] {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_No_Pagination"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_No_Pagination"),
com.fr.design.i18n.Toolkit.i18nText("CellWrite-Page_After_Row"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cell_Write_Page_After_Row"),
com.fr.design.i18n.Toolkit.i18nText("CellWrite-Page_Before_Row"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cell_Write_Page_Before_Row"),
com.fr.design.i18n.Toolkit.i18nText("CellWrite-Page_After_Column"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cell_Write_Page_After_Column"),
com.fr.design.i18n.Toolkit.i18nText("CellWrite-Page_Before_Column") }); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cell_Write_Page_Before_Column") });
this.add(this.pageComboBox); this.add(this.pageComboBox);
this.pageComboBox.setSelectedIndex(0); this.pageComboBox.setSelectedIndex(0);
} }

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

@ -58,11 +58,11 @@ public class DSColumnAdvancedPane extends BasicPane {
if (setting > DSColumnPane.SETTING_DSRELATED) { if (setting > DSColumnPane.SETTING_DSRELATED) {
selectCountPane = new SelectCountPane(); selectCountPane = new SelectCountPane();
selectCountPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Results_Filter"), null)); selectCountPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Results_Filter"), null));
} }
valuePane = new ValuePane(); valuePane = new ValuePane();
valuePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Custom_Data_Appearance"), null)); valuePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Custom_Data_Appearance"), null));
JPanel extendablePane = null; JPanel extendablePane = null;
@ -70,10 +70,10 @@ public class DSColumnAdvancedPane extends BasicPane {
// extendableDirectionPane // extendableDirectionPane
JPanel extendableDirectionPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel extendableDirectionPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
extendableDirectionPane.add(horizontalExtendableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Horizontal_Extendable"))); extendableDirectionPane.add(horizontalExtendableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Horizontal_Extendable")));
extendableDirectionPane.add(verticalExtendableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Vertical_Extendable"))); extendableDirectionPane.add(verticalExtendableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Vertical_Extendable")));
extendablePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Expandable")); extendablePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Expandable"));
extendablePane.setLayout(new BorderLayout()); extendablePane.setLayout(new BorderLayout());
extendablePane.add(extendableDirectionPane, BorderLayout.CENTER); extendablePane.add(extendableDirectionPane, BorderLayout.CENTER);
} }
@ -81,7 +81,7 @@ public class DSColumnAdvancedPane extends BasicPane {
JPanel multiNumPane = null; JPanel multiNumPane = null;
if (setting > DSColumnPane.SETTING_DSRELATED) { if (setting > DSColumnPane.SETTING_DSRELATED) {
multiNumPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill_Blank_Data")); multiNumPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill_Blank_Data"));
useMultiplyNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Column_Multiple")); useMultiplyNumCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Multiple"));
multiNumPane.add(useMultiplyNumCheckBox); multiNumPane.add(useMultiplyNumCheckBox);
multiNumPane.add(new UILabel(InsetText)); multiNumPane.add(new UILabel(InsetText));
@ -295,8 +295,8 @@ public class DSColumnAdvancedPane extends BasicPane {
selectCountComboBox = new UIComboBox(new String[]{ selectCountComboBox = new UIComboBox(new String[]{
com.fr.design.i18n.Toolkit.i18nText("Undefined"), com.fr.design.i18n.Toolkit.i18nText("Undefined"),
com.fr.design.i18n.Toolkit.i18nText("BindColumn-Top_N"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Top_N"),
com.fr.design.i18n.Toolkit.i18nText("BindColumn-Bottom_N"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Bottom_N"),
com.fr.design.i18n.Toolkit.i18nText("Odd"), com.fr.design.i18n.Toolkit.i18nText("Odd"),
com.fr.design.i18n.Toolkit.i18nText("Even"), com.fr.design.i18n.Toolkit.i18nText("Even"),
com.fr.design.i18n.Toolkit.i18nText("Specify"),}); com.fr.design.i18n.Toolkit.i18nText("Specify"),});
@ -332,9 +332,9 @@ public class DSColumnAdvancedPane extends BasicPane {
topFormulaPane = new JFormulaField("-1"); topFormulaPane = new JFormulaField("-1");
bottomFormulaPane = new JFormulaField("-1"); bottomFormulaPane = new JFormulaField("-1");
serialTextField = new UITextField(18); serialTextField = new UITextField(18);
JPanel oddPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Result_Serial_Number_Start_From_1") JPanel oddPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Result_Serial_Number_Start_From_1")
+ " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Odd_Selected_(1,3,5...)")), FlowLayout.LEFT); + " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Odd_Selected_(1,3,5...)")), FlowLayout.LEFT);
JPanel evenPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Result_Serial_Number_Start_From_1") JPanel evenPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Result_Serial_Number_Start_From_1")
+ " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT); + " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT);
JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{ JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{
serialTextField, new UILabel( serialTextField, new UILabel(

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

@ -73,11 +73,11 @@ public class DSColumnBasicPane extends BasicPane {
} }
resultSetGroupPane = new ResultSetGroupPopUpPane(setting > DSColumnPane.SETTING_DSRELATED); resultSetGroupPane = new ResultSetGroupPopUpPane(setting > DSColumnPane.SETTING_DSRELATED);
resultSetGroupPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Data_Setting"), null)); resultSetGroupPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting"), null));
if (setting > DSColumnPane.SETTING_DSRELATED) { if (setting > DSColumnPane.SETTING_DSRELATED) {
expandDirectionPane = new ExpandDirectionPane(); expandDirectionPane = new ExpandDirectionPane();
expandDirectionPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Expand_Direction"), null)); expandDirectionPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Expand_Direction"), null));
} }
double[] rowSize = {TableLayout.PREFERRED, TableLayout.PREFERRED, double[] rowSize = {TableLayout.PREFERRED, TableLayout.PREFERRED,

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

@ -56,7 +56,7 @@ public class DSColumnConditionsPane extends BasicPane {
JPanel reSelectPane = GUICoreUtils.createFlowPane(pane, FlowLayout.LEFT); JPanel reSelectPane = GUICoreUtils.createFlowPane(pane, FlowLayout.LEFT);
this.add(reSelectPane, BorderLayout.NORTH); this.add(reSelectPane, BorderLayout.NORTH);
reSelectPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("BindColumn-The_Conditions_of_FatherCell"), null)); reSelectPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_The_Conditions_Of_Father_Cell"), null));
} }
} }

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

@ -111,7 +111,7 @@ public class DSColumnPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("ExpandD-Data_Column"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Data_Column");
} }
/** /**

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

@ -46,7 +46,7 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
} }
public void initComponents() { public void initComponents() {
goBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("BindColumn-Group"), com.fr.design.i18n.Toolkit.i18nText("BindColumn-Select"), com.fr.design.i18n.Toolkit.i18nText("BindColumn-Summary")}); goBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Group"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Select"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Summary")});
initCardPane(); initCardPane();
contentPane = layoutPane(); contentPane = layoutPane();
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
@ -56,7 +56,7 @@ public class ResultSetGroupDockingPane extends ResultSetGroupPane {
private JPanel layoutPane() { private JPanel layoutPane() {
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
UILabel dataSetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Data_Setting")); UILabel dataSetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Setting"));
dataSetLabel.setPreferredSize(new Dimension(60, 20)); dataSetLabel.setPreferredSize(new Dimension(60, 20));
Component[][] components = new Component[][] Component[][] components = new Component[][]
{ {

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

@ -310,7 +310,7 @@ public class SpecifiedGroupAttrPane extends BasicPane {
private JPanel southPane; private JPanel southPane;
public FormulaGroupPane() { public FormulaGroupPane() {
this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("D-Dispaly_Divide_Result_Set_into_Groups"))); this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_D_Dispaly_Divide_Result_Set_into_Groups")));
this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); this.setLayout(FRGUIPaneFactory.createM_BorderLayout());
JPanel contentPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); JPanel contentPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1);
this.add(contentPane, BorderLayout.NORTH); this.add(contentPane, BorderLayout.NORTH);
@ -320,7 +320,7 @@ public class SpecifiedGroupAttrPane extends BasicPane {
contentPane.add(northPane); contentPane.add(northPane);
modeComboBox = new UIComboBox(displayModeNames); modeComboBox = new UIComboBox(displayModeNames);
northPane.add(GUICoreUtils.createFlowPane(new JComponent[] { new UILabel(InsertText), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Modes") + ": "), northPane.add(GUICoreUtils.createFlowPane(new JComponent[] { new UILabel(InsertText), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Display_Modes") + ": "),
modeComboBox }, FlowLayout.LEFT), BorderLayout.WEST); modeComboBox }, FlowLayout.LEFT), BorderLayout.WEST);
UILabel label = new UILabel("="); UILabel label = new UILabel("=");

2
designer-realize/src/main/java/com/fr/design/expand/ExpandDirectionPane.java

@ -39,7 +39,7 @@ public class ExpandDirectionPane extends JPanel {
this.add(innerthis); this.add(innerthis);
t2bRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom")); t2bRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom"));
l2rRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right")); l2rRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right"));
noneRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Not_Expand")); noneRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Not_Expand"));
ButtonGroup bg = new ButtonGroup(); ButtonGroup bg = new ButtonGroup();
bg.add(t2bRadioButton); bg.add(t2bRadioButton);
bg.add(l2rRadioButton); bg.add(l2rRadioButton);

2
designer-realize/src/main/java/com/fr/design/mainframe/CellElementPropertyPane.java

@ -100,7 +100,7 @@ public class CellElementPropertyPane extends DockingView {
cellElementEditPane = new CellElementEditPane(); cellElementEditPane = new CellElementEditPane();
cellElementEditPane.addTitleChangeListner(titleListener); cellElementEditPane.addTitleChangeListner(titleListener);
titlePane = new JPanel(new BorderLayout()); titlePane = new JPanel(new BorderLayout());
title = new UILabel(this.getViewTitle() + '-' + com.fr.design.i18n.Toolkit.i18nText("ExpandD-Expand_Attribute")) { title = new UILabel(this.getViewTitle() + '-' + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Expand_Attribute")) {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override

4
designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java

@ -863,10 +863,10 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
} }
int count = reportComposite.getEditingWorkBook().getReportCount(); int count = reportComposite.getEditingWorkBook().getReportCount();
if (count <= 1) { if (count <= 1) {
JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(reportComposite), com.fr.design.i18n.Toolkit.i18nText("At_least_one_visual_worksheet") + "!"); JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(reportComposite), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_At_Least_One_Visual_Worksheet") + "!");
return; return;
} }
int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(reportComposite), com.fr.design.i18n.Toolkit.i18nText("Des-Remove_WorkSheet"), ProductConstants.APP_NAME, int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(reportComposite), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Des_Remove_Work_Sheet"), ProductConstants.APP_NAME,
JOptionPane.OK_CANCEL_OPTION); JOptionPane.OK_CANCEL_OPTION);
if (returnValue == JOptionPane.OK_OPTION) { if (returnValue == JOptionPane.OK_OPTION) {
if (DesignerContext.getFormatState() != DesignerContext.FORMAT_STATE_NULL) { if (DesignerContext.getFormatState() != DesignerContext.FORMAT_STATE_NULL) {

2
designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java

@ -47,7 +47,7 @@ class CptApp extends AbstractWorkBookApp {
if (XMLEncryptUtils.isCptEncoded() && if (XMLEncryptUtils.isCptEncoded() &&
!XMLEncryptUtils.checkVaild(DesignerEnvManager.getEnvManager().getEncryptionKey())) { !XMLEncryptUtils.checkVaild(DesignerEnvManager.getEnvManager().getEncryptionKey())) {
if (!new DecodeDialog(file).isPwdRight()) { if (!new DecodeDialog(file).isPwdRight()) {
FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("ECP-error_pwd")); FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ECP_Error_Pwd"));
return new WorkBook(); return new WorkBook();
} }
} }

8
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellExpandAttrPane.java

@ -43,7 +43,7 @@ public class CellExpandAttrPane extends AbstractCellAttrPane {
* @return * @return
*/ */
public JPanel createContentPane() { public JPanel createContentPane() {
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("ExpandD-Not_Expand"), com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right")}; String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Not_Expand"), com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom"), com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right")};
Icon[][] iconArray = { Icon[][] iconArray = {
{BaseUtils.readIcon("/com/fr/design/images/expand/none16x16.png"), BaseUtils.readIcon("/com/fr/design/images/expand/none16x16_selected@1x.png")}, {BaseUtils.readIcon("/com/fr/design/images/expand/none16x16.png"), BaseUtils.readIcon("/com/fr/design/images/expand/none16x16_selected@1x.png")},
{BaseUtils.readIcon("/com/fr/design/images/expand/vertical.png"), BaseUtils.readIcon("/com/fr/design/images/expand/vertical_selected@1x.png")}, {BaseUtils.readIcon("/com/fr/design/images/expand/vertical.png"), BaseUtils.readIcon("/com/fr/design/images/expand/vertical_selected@1x.png")},
@ -54,8 +54,8 @@ public class CellExpandAttrPane extends AbstractCellAttrPane {
expandDirectionButton.setAllToolTips(nameArray); expandDirectionButton.setAllToolTips(nameArray);
leftFatherPane = new ExpandLeftFatherPane(); leftFatherPane = new ExpandLeftFatherPane();
rightFatherPane = new ExpandUpFatherPane(); rightFatherPane = new ExpandUpFatherPane();
horizontalExpandableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Horizontal_Extendable")); horizontalExpandableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Horizontal_Extendable"));
verticalExpandableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Vertical_Extendable")); verticalExpandableCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Vertical_Extendable"));
sortAfterExpand = new SortExpandAttrPane(); sortAfterExpand = new SortExpandAttrPane();
initAllNames(); initAllNames();
return layoutPane(); return layoutPane();
@ -237,7 +237,7 @@ public class CellExpandAttrPane extends AbstractCellAttrPane {
* @return * @return
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("ExpandD-Expand_Attribute"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Expand_Attribute");
} }

2
designer-realize/src/main/java/com/fr/design/present/BarCodePane.java

@ -80,7 +80,7 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
initVersionComboBox(); initVersionComboBox();
initErrorCorrectComboBox(); initErrorCorrectComboBox();
drawingTextCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("BarCodeD-Drawing_Text")); drawingTextCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bar_CodeD_Drawing_Text"));
drawingTextCheckBox.setSelected(true); drawingTextCheckBox.setSelected(true);
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;

2
designer-realize/src/main/java/com/fr/design/present/CurrencyLinePane.java

@ -124,7 +124,7 @@ public class CurrencyLinePane extends FurtherBasicBeanPane<CurrencyLinePresent>
* @return 同上 * @return 同上
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Currency_Line"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Currency_Line");
} }
/** /**

4
designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java

@ -54,7 +54,7 @@ public class LayerReportPane extends BasicBeanPane<LayerReportAttr> {
this.add(outlayerReportPane); this.add(outlayerReportPane);
outlayerReportPane.add(layerReportPane); outlayerReportPane.add(layerReportPane);
JPanel isLayerReportBoxPanle = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel isLayerReportBoxPanle = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
isLayerReportBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Execute_Report_by_Layer_Engine")); isLayerReportBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Execute_Report_by_Layer_Engine"));
isLayerReportBox.setSelected(false); isLayerReportBox.setSelected(false);
isLayerReportBoxPanle.add(isLayerReportBox); isLayerReportBoxPanle.add(isLayerReportBox);
layerReportPane.add(isLayerReportBoxPanle); layerReportPane.add(isLayerReportBoxPanle);
@ -150,7 +150,7 @@ public class LayerReportPane extends BasicBeanPane<LayerReportAttr> {
public void checkValid() throws Exception { public void checkValid() throws Exception {
if (isLayerReportBox.isSelected()) { if (isLayerReportBox.isSelected()) {
if (!ReportUtils.isLayerReportUsable(worksheet)) { if (!ReportUtils.isLayerReportUsable(worksheet)) {
int value = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("After_Changed_Some_Attributes_Are_Different") + "?", int value = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_After_Changed_Some_Attributes_Are_Different") + "?",
ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_OPTION); ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_OPTION);
if (value != JOptionPane.YES_OPTION) { if (value != JOptionPane.YES_OPTION) {
isLayerReportBox.setSelected(false); isLayerReportBox.setSelected(false);

4
designer-realize/src/main/java/com/fr/design/report/RowColumnPane.java

@ -38,9 +38,9 @@ public class RowColumnPane extends BasicPane {
this.add(centerPane, BorderLayout.CENTER); this.add(centerPane, BorderLayout.CENTER);
centerPane.setBorder(BorderFactory.createEmptyBorder(6, 12, 6, 8)); centerPane.setBorder(BorderFactory.createEmptyBorder(6, 12, 6, 8));
entireRowRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("EditRC-Entire_row")); entireRowRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_RC_Entire_Row"));
entireRowRadioButton.setMnemonic('r'); entireRowRadioButton.setMnemonic('r');
entireColRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("EditRC-Entire_column")); entireColRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_RC-Entire_Column"));
entireColRadioButton.setMnemonic('c'); entireColRadioButton.setMnemonic('c');
entireRowRadioButton.setSelected(true); entireRowRadioButton.setSelected(true);

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

@ -52,7 +52,7 @@ public class SubReportPane extends BasicPane {
UIButton browseButton = new UIButton("..."); UIButton browseButton = new UIButton("...");
northPane.add(browseButton, BorderLayout.EAST); northPane.add(browseButton, BorderLayout.EAST);
browseButton.setPreferredSize(new java.awt.Dimension(20, 20)); browseButton.setPreferredSize(new java.awt.Dimension(20, 20));
browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Click_this_button")); browseButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_this_button"));
browseButton.addActionListener(new ActionListener() { browseButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {

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

@ -40,7 +40,7 @@ public class WordExportPane extends BasicPane {
MultilineLabel wordLineLabel = new MultilineLabel(); MultilineLabel wordLineLabel = new MultilineLabel();
wordLineLabel.setPreferredSize(new Dimension(250, 100)); wordLineLabel.setPreferredSize(new Dimension(250, 100));
wordLineLabel.setText(com.fr.design.i18n.Toolkit.i18nText("alert_word")); wordLineLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alert_Word"));
wordLineLabel.setForeground(Color.RED); wordLineLabel.setForeground(Color.RED);
alertPane.add(wordLineLabel); alertPane.add(wordLineLabel);

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

@ -38,7 +38,7 @@ public class ErrorTemplatePane extends BasicBeanPane<String> {
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Template_Parameters") + ":"), null}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Template_Parameters") + ":"), null},
{new UILabel("message" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message"))}, {new UILabel("message" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message"))},
{new UILabel("charset" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Charset"))}, {new UILabel("charset" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Charset"))},
{new UILabel("exception" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Exception_StackTrace"))} {new UILabel("exception" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Exception_Stack_Trace"))}
}; };
JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

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

@ -96,7 +96,7 @@ public class EventPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Event_Set"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Set");
} }
@ -168,7 +168,7 @@ public class EventPane extends BasicPane {
return; return;
} }
int val = JOptionPane.showConfirmDialog(EventPane.this, com.fr.design.i18n.Toolkit.i18nText("Are_You_Sure_To_Delete_The_Data") + "?", "Message", int val = JOptionPane.showConfirmDialog(EventPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Are_You_Sure_To_Delete_The_Data") + "?", "Message",
JOptionPane.YES_NO_OPTION); JOptionPane.YES_NO_OPTION);
if (val != JOptionPane.YES_OPTION) { if (val != JOptionPane.YES_OPTION) {
return; return;

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

@ -31,7 +31,7 @@ public class SettingToolBar extends JPanel {
this.add(new UILabel(name)); this.add(new UILabel(name));
this.toolBarPane = toolBarPane; this.toolBarPane = toolBarPane;
setButton = GUICoreUtils.createTransparentButton(setIcon, setIcon, setIcon); setButton = GUICoreUtils.createTransparentButton(setIcon, setIcon, setIcon);
setButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Edit_Button_ToolBar")); setButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_Button_ToolBar"));
setButton.setAction(new SetAction()); setButton.setAction(new SetAction());
delButton = GUICoreUtils.createTransparentButton(delIcon, delIcon, delIcon); delButton = GUICoreUtils.createTransparentButton(delIcon, delIcon, delIcon);
delButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Remove_Button_ToolBar")); delButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Remove_Button_ToolBar"));

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

@ -43,11 +43,11 @@ public class WebCssPane extends BasicPane {
chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Selection")); chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("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("Disk_File") + ":"), FlowLayout.LEFT); northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File") + ":"), FlowLayout.LEFT);
northPane.add(localText, FlowLayout.CENTER); northPane.add(localText, FlowLayout.CENTER);
northPane.add(chooseFile, FlowLayout.RIGHT); northPane.add(chooseFile, FlowLayout.RIGHT);
outnorth.add(northPane,BorderLayout.NORTH); outnorth.add(northPane,BorderLayout.NORTH);
UILabel infor = new UILabel(com.fr.design.i18n.Toolkit.i18nText("CSS_warning")); UILabel infor = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_CSS_Warning"));
infor.setForeground(new Color(207, 42, 39)); infor.setForeground(new Color(207, 42, 39));
outnorth.add(infor,BorderLayout.CENTER); outnorth.add(infor,BorderLayout.CENTER);
this.add(outnorth, BorderLayout.NORTH); this.add(outnorth, BorderLayout.NORTH);

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

@ -51,7 +51,7 @@ public class WebJsPane extends BasicPane {
this.setLayout(new BorderLayout(0, 20)); this.setLayout(new BorderLayout(0, 20));
this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0));
localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Disk_File") + ":", true); localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File") + ":", true);
urlFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Url_Location")+ ":", false); urlFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Url_Location")+ ":", false);
ButtonGroup bg = new ButtonGroup(); ButtonGroup bg = new ButtonGroup();
bg.add(localFileRadioButton); bg.add(localFileRadioButton);

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

@ -47,7 +47,7 @@ public class ButtonGroupDictPane extends JPanel {
columnLabel.setVisible(!adaptiveCheckbox.isSelected()); columnLabel.setVisible(!adaptiveCheckbox.isSelected());
} }
}); });
this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Button-Group-Display-Columns") + ":"); this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns") + ":");
columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1)); columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1));
double f = TableLayout.FILL; double f = TableLayout.FILL;

4
designer-realize/src/main/java/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java

@ -41,10 +41,10 @@ public class DefineAppendColumnRowPane extends BasicPane {
crEditor = new ColumnRowEditor(); crEditor = new ColumnRowEditor();
jNumberEditor = new UISpinner(0, 100 , 1, 0); jNumberEditor = new UISpinner(0, 100 , 1, 0);
rowCountLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Edit-Row_Count")); rowCountLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_Row_Count"));
JPanel lpane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel lpane = FRGUIPaneFactory.createBorderLayout_S_Pane();
lpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); lpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Append_Delete_Row_Message")); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Append_Delete_Row_Message"));
label.setForeground(new Color(0x8F8F92)); label.setForeground(new Color(0x8F8F92));
lpane.add(label); lpane.add(label);
Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Specify", "Cell"})), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}}; Component[][] components = { { new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Specify", "Cell"})), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}};

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

@ -35,7 +35,7 @@ public class DefineDeleteColumnRowPane extends BasicPane {
double rowSize[] = { p, p}; double rowSize[] = { p, p};
double columnSize[] = { p, f}; double columnSize[] = { p, f};
crEditor = new ColumnRowEditor(); crEditor = new ColumnRowEditor();
UILabel messageLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Append_Delete_Row_Message")); UILabel messageLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Append_Delete_Row_Message"));
messageLabel.setForeground(new Color(0x8F8F92)); messageLabel.setForeground(new Color(0x8F8F92));
Component[][] components = { Component[][] components = {
{ new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Specify", "Cell"})), crEditor }, { new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Specify", "Cell"})), crEditor },

2
designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java

@ -385,7 +385,7 @@ public class CellSelection extends Selection {
TemplateElementCase ec = ePane.getEditingElementCase(); TemplateElementCase ec = ePane.getEditingElementCase();
Iterator cells = ec.intersect(column, row, columnSpan, rowSpan); Iterator cells = ec.intersect(column, row, columnSpan, rowSpan);
if (cells.hasNext()) { // alex:有两个以上的格子在这个区域内 if (cells.hasNext()) { // alex:有两个以上的格子在这个区域内
int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(ePane), com.fr.design.i18n.Toolkit.i18nText("Des-Merger_Cell"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Merge_Cell"), int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(ePane), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Des_Merger_Cell"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Merge_Cell"),
JOptionPane.OK_CANCEL_OPTION); JOptionPane.OK_CANCEL_OPTION);
if (returnValue != JOptionPane.OK_OPTION) { if (returnValue != JOptionPane.OK_OPTION) {
return false; return false;

12
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@ -570,8 +570,8 @@ public class CellDSColumnEditor extends CellQuickEditor {
//可扩展性 //可扩展性
JPanel extendableDirectionPane = FRGUIPaneFactory.createYBoxEmptyBorderPane(); JPanel extendableDirectionPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
extendableDirectionPane.add(heCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Horizontal_Extendable"))); extendableDirectionPane.add(heCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Horizontal_Extendable")));
extendableDirectionPane.add(veCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Vertical_Extendable"))); extendableDirectionPane.add(veCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Vertical_Extendable")));
//补充空白数据 //补充空白数据
JPanel multiNumPane = FRGUIPaneFactory.createYBoxEmptyBorderPane(); JPanel multiNumPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
@ -582,7 +582,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
multiNumSpinner = new UISpinner(1, 10000, 1, 1); multiNumSpinner = new UISpinner(1, 10000, 1, 1);
//数据倍数 //数据倍数
UILabel multipleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column_Multiple")); UILabel multipleLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Multiple"));
multiPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ multiPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
new Component[]{ new Component[]{
multipleLabel, multiNumSpinner multipleLabel, multiNumSpinner
@ -849,12 +849,12 @@ public class CellDSColumnEditor extends CellQuickEditor {
public ResultSetFilterConfigPane() { public ResultSetFilterConfigPane() {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
UILabel filterLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Results_Filter")); UILabel filterLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Results_Filter"));
//结果集筛选下拉框 //结果集筛选下拉框
rsComboBox = new UIComboBox(new String[]{ rsComboBox = new UIComboBox(new String[]{
com.fr.design.i18n.Toolkit.i18nText("Undefined"), com.fr.design.i18n.Toolkit.i18nText("Undefined"),
com.fr.design.i18n.Toolkit.i18nText("BindColumn-Top_N"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Top_N"),
com.fr.design.i18n.Toolkit.i18nText("BindColumn-Bottom_N"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Bottom_N"),
com.fr.design.i18n.Toolkit.i18nText("Odd"), com.fr.design.i18n.Toolkit.i18nText("Odd"),
com.fr.design.i18n.Toolkit.i18nText("Even"), com.fr.design.i18n.Toolkit.i18nText("Even"),
com.fr.design.i18n.Toolkit.i18nText("Specify") com.fr.design.i18n.Toolkit.i18nText("Specify")

2
designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java

@ -157,7 +157,7 @@ public class CollectUserInformationDialog extends UIDialog {
JPanel buttonsPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); JPanel buttonsPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
controlPane.add(buttonsPane, BorderLayout.EAST); controlPane.add(buttonsPane, BorderLayout.EAST);
UIButton finishButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Collect-Use_Designer")); UIButton finishButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Collect_Use_Designer"));
finishButton.setMnemonic('F'); finishButton.setMnemonic('F');
buttonsPane.add(finishButton); buttonsPane.add(finishButton);
finishButton.addActionListener(verifyActionListener); finishButton.addActionListener(verifyActionListener);

Loading…
Cancel
Save