Browse Source

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

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

* commit '1e2ea5b62a096a2c51b2ea6e0a65f7c75c240a79':
  规范国际化文件及国际化定义。
final/10.0
Alex.Sung 6 years ago
parent
commit
1f36d11298
  1. 2
      designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java
  2. 2
      designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java
  3. 4
      designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
  4. 2
      designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewLabel.java
  5. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/AutoStoreProcedureTableModel.java
  6. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java
  7. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MultiTDTableDataPane.java
  8. 4
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/StoreProcedureParameterPane.java
  9. 2
      designer-base/src/main/java/com/fr/design/dialog/JWizardDialog.java
  10. 2
      designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java
  11. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java
  12. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/ImgChoosePane.java
  13. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/ImgChooseWrapper.java
  14. 4
      designer-base/src/main/java/com/fr/design/gui/frpane/ObjectProperiesPane.java
  15. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/UITabbedPane.java
  16. 2
      designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTable.java
  17. 2
      designer-base/src/main/java/com/fr/design/gui/imenutable/UIMenuTableUI.java
  18. 2
      designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java
  19. 2
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
  20. 2
      designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java
  21. 2
      designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java
  22. 8
      designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
  23. 2
      designer-base/src/main/java/com/fr/design/present/FormulaPresentPane.java
  24. 2
      designer-base/src/main/java/com/fr/design/present/NonePresentPane.java
  25. 2
      designer-base/src/main/java/com/fr/design/style/BorderPane.java
  26. 2
      designer-base/src/main/java/com/fr/design/style/FRFontPane.java
  27. 2
      designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java
  28. 2
      designer-base/src/main/java/com/fr/design/style/color/DetailColorSelectPane.java
  29. 2
      designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java
  30. 2
      designer-base/src/main/java/com/fr/env/RemoteSignInPane.java
  31. 2
      designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java
  32. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/PresentComboBox.java
  33. 2
      designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java
  34. 2
      designer-form/src/main/java/com/fr/design/designer/properties/items/HorizontalAlignmentItems.java
  35. 2
      designer-form/src/main/java/com/fr/design/designer/properties/items/LabelHorizontalAlignmentItems.java
  36. 4
      designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/ColorPalette.java
  37. 4
      designer-realize/src/main/java/com/fr/design/actions/utils/DeprecatedActionManager.java
  38. 2
      designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java
  39. 2
      designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java
  40. 10
      designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java
  41. 6
      designer-realize/src/main/java/com/fr/design/present/BarCodePane.java
  42. 2
      designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java
  43. 2
      designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java
  44. 4
      designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
  45. 2
      designer-realize/src/main/java/com/fr/design/report/ReportExportAttrPane.java
  46. 2
      designer-realize/src/main/java/com/fr/design/report/SelectImagePane.java
  47. 2
      designer-realize/src/main/java/com/fr/design/report/WordExportPane.java
  48. 2
      designer-realize/src/main/java/com/fr/design/style/StylePane.java
  49. 2
      designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java
  50. 8
      designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java
  51. 2
      designer-realize/src/main/java/com/fr/design/webattr/printsettings/PageMarginSettingPane.java
  52. 2
      designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java
  53. 2
      designer-realize/src/main/java/com/fr/poly/group/PolyNameGroup.java

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

@ -25,7 +25,7 @@ public class SystemInfoPane extends JPanel {
return false;
}
};
tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Property"));
tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"));
tableModel.addColumn(com.fr.design.i18n.Toolkit.i18nText("Value"));
Properties properties = System.getProperties();

2
designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java

@ -35,7 +35,7 @@ public abstract class ConditionAttributesPane<T> extends BasicBeanPane<T> {
JPanel propertyChangePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
this.add(propertyChangePane);
propertyChangePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Property") + ":", null));
propertyChangePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property") + ":", null));
// 选择要改变的属性.
JPanel addItemPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();

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

@ -131,13 +131,13 @@ public class JDBCDefPane extends JPanel {
JPanel userPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
userPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_UserName") + ":"));
JPanel userComPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
Component[][] userComComponents = {{userNameTextField, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Password") + ":"), passwordTextField}};
Component[][] userComComponents = {{userNameTextField, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password") + ":"), passwordTextField}};
double[] userRowSize = {p};
double[] userColumnSize = {f, p, f};
userComPane = TableLayoutHelper.createCommonTableLayoutPane(userComComponents, userRowSize, userColumnSize, 4);
JPanel passwordPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
passwordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Password") + ":"));
passwordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password") + ":"));
Component[][] components = {{dbtypePane, dbtypeComPane}, {driverPane, driverComboBox}, {urlPane, urlComPane}, {userPane, userComPane},};

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

@ -17,7 +17,7 @@ public class PreviewLabel extends UIButton {
public PreviewLabel(Previewable previewable) {
super(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png"));
this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Preview"));
this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
this.setCursor(new Cursor(Cursor.HAND_CURSOR));
this.previewable = previewable;
this.addActionListener(new ActionListener() {

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

@ -124,7 +124,7 @@ public class AutoStoreProcedureTableModel extends StoreProcedureTableModel {
else
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_String");
}else if(value instanceof Integer)
type = com.fr.design.i18n.Toolkit.i18nText("Integer");
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer");
else if(value instanceof Double)
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double");
else if(value instanceof Date)

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

@ -34,7 +34,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
private static String[] TYPE = {
com.fr.design.i18n.Toolkit.i18nText("String"),
com.fr.design.i18n.Toolkit.i18nText("Integer"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date")
};

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

@ -140,7 +140,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
private class RefreshAction extends UITableEditAction {
public RefreshAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Refresh"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Refresh"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
}

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

@ -31,7 +31,7 @@ public class StoreProcedureParameterPane extends BasicPane {
private static NameObject[] nameAndValue = new NameObject[]{
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cursor"), StoreProcedureConstants.CURSOR),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_String"), StoreProcedureConstants.VARCHAR),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Integer"), StoreProcedureConstants.INTEGER),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer"), StoreProcedureConstants.INTEGER),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double"), StoreProcedureConstants.DECIMAL),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Date"), StoreProcedureConstants.DATE),
new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Boolean"), StoreProcedureConstants.BOOLEAN),
@ -131,7 +131,7 @@ public class StoreProcedureParameterPane extends BasicPane {
else
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_String");
}else if(value instanceof Integer)
type = com.fr.design.i18n.Toolkit.i18nText("Integer");
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer");
else if(value instanceof Double)
type = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double");
else if(value instanceof Date)

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

@ -103,7 +103,7 @@ public class JWizardDialog extends BasicDialog {
workArea.setLayout(cardLayout);
// Buttons
buttonBack = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Previous"));
buttonBack = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Previous"));
buttonBack.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent evt) {
back();

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

@ -107,7 +107,7 @@ public class TinyFormulaPane extends BasicBeanPane<String> implements UIObserver
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_Formula_Present");
}
@Override

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

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

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

@ -34,7 +34,7 @@ public class ImgChoosePane extends BasicPane {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel previewContainner = new JPanel();
previewContainner.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview")));
previewContainner.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")));
previewPane = new ImagePreviewPane();
previewContainner.add(previewPane);

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

@ -148,7 +148,7 @@ public class ImgChooseWrapper {
imageSizeLabel.setText(StringUtils.EMPTY);
} else {
imageSizeLabel.setText(selectImage.getWidth(null) + "x"
+ selectImage.getHeight(null) + com.fr.design.i18n.Toolkit.i18nText("px"));
+ selectImage.getHeight(null) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Px"));
}
}
}

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

@ -29,7 +29,7 @@ public class ObjectProperiesPane extends BasicBeanPane<ListMap> {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel buttonPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Property"));
this.addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add") + " " +com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Property"));
buttonPane.add(this.addButton, BorderLayout.WEST);
this.add(buttonPane, BorderLayout.NORTH);
@ -124,7 +124,7 @@ public class ObjectProperiesPane extends BasicBeanPane<ListMap> {
this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
UIButton cancel = new UIButton(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Remove"));
cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
cancel.addActionListener(cancleListener);
cancel.setMargin(new Insets(0, 0, 0, 0));
this.add(cancel);

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

@ -113,7 +113,7 @@ public class UITabbedPane extends JTabbedPane{
* @param i tab索引
*/
public void doRemoveTab(int i){
int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Remove")
int re = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(UITabbedPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Sure_To_Delete")+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove")
, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
if (re == JOptionPane.OK_OPTION) {
super.removeTabAt(i);

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

@ -211,7 +211,7 @@ public class UIMenuTable extends JTable {
JPanel content = (JPanel)jf.getContentPane();
content.setLayout(new BorderLayout());
List<UIMenuNameableCreator> data = new ArrayList<UIMenuNameableCreator>();
UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Reportlet"),
UIMenuNameableCreator reportlet = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reportlet"),
new ReportletHyperlink(), ReportletHyperlinkPane.class);
UIMenuNameableCreator email = new UIMenuNameableCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email"),

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

@ -75,7 +75,7 @@ public class UIMenuTableUI extends UITableUI{
public void mousePressed(MouseEvent e) {
if (e.getX() >= table.getWidth() - 20) {
int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (val == JOptionPane.OK_OPTION) {
uiTable.removeLine(table.rowAtPoint(e.getPoint()));
uiTable.fireTargetChanged();

2
designer-base/src/main/java/com/fr/design/gui/itable/UITableUI.java

@ -133,7 +133,7 @@ public class UITableUI extends BasicTableUI {
}
if (!table.isEditing()) {
int val = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?",
com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (val == JOptionPane.OK_OPTION) {
((UITable) table).removeLine(table.rowAtPoint(e.getPoint()));
((UITable) table).fireTargetChanged();

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

@ -252,7 +252,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
component = DesignerContext.getDesignerFrame();
}
int val = JOptionPane.showConfirmDialog(component,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (val != JOptionPane.OK_OPTION) {
return;

2
designer-base/src/main/java/com/fr/design/gui/itree/filetree/ReportletPane.java

@ -96,7 +96,7 @@ public class ReportletPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Reportlet");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Reportlet");
}
/*

2
designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java

@ -54,7 +54,7 @@ public class TemplateStylePane extends BasicPane {
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
westPane.setPreferredSize(new Dimension(100, 500));
centerPane.setPreferredSize(new Dimension(300, 500));
centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"), null));
centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"), null));
centerPane.add(previewPane);
styleList.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent e) {

8
designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java

@ -450,7 +450,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("ReportD-Excel_Export");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export");
}
@Override
@ -569,7 +569,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Report-Write_Attributes");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Report_Write_Attributes");
}
@Override
@ -810,7 +810,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_Formula_Present");
}
@Override
@ -862,7 +862,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("Present-No_Present");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_No_Present");
}
@Override

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

@ -23,7 +23,7 @@ public class FormulaPresentPane extends FurtherBasicBeanPane<FormulaPresent> {
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_Formula_Present");
}
@Override

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

@ -18,7 +18,7 @@ public class NonePresentPane extends FurtherBasicBeanPane<Present> {
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Present-No_Present");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_No_Present");
}
public void reset() {

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

@ -95,7 +95,7 @@ public class BorderPane extends BasicPane {
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"), null));
centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"), null));
JPanel borderAllControlPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
centerPane.add(borderAllControlPane, BorderLayout.NORTH);
borderAllControlPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 4, 0));

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

@ -184,7 +184,7 @@ public class FRFontPane extends BasicPane {
// preview pane.
preview = new FRFontPreviewArea();
preview.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview")));
preview.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")));
rightPane.add(preview, BorderLayout.CENTER);
// Cannot select superscript and subscript in the same time.

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

@ -115,7 +115,7 @@ public class ImageSelectPane extends BackgroundPane4BoxChange {
imageSizeLabel.setText("");
} else {
imageSizeLabel.setText(selectImage.getWidth(null) + "x"
+ selectImage.getHeight(null) + com.fr.design.i18n.Toolkit.i18nText("px"));
+ selectImage.getHeight(null) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Px"));
}
}

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

@ -72,7 +72,7 @@ public class DetailColorSelectPane extends BasicPane {
this.getFont().getStyle(), this.getFont().getSize() + 4));
colorPreviewLabel.setBorder(BorderFactory.createEmptyBorder(0, 2, 2, 2));
colorPreviewPane.add(colorPreviewLabel, BorderLayout.CENTER);
UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Preview"));
UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
colorPreviewPane.setBorder(explainBorder);
this.addChangeListener(colorPreviewLabelChangeListener);

2
designer-base/src/main/java/com/fr/design/utils/gui/GUICoreUtils.java

@ -684,7 +684,7 @@ public abstract class GUICoreUtils{
return false;
}
int returnVal = JOptionPane.showConfirmDialog(ancestorWindow, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Remove"),
int returnVal = JOptionPane.showConfirmDialog(ancestorWindow, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Are_You_Sure_To_Remove_The_Selected_Item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"),
JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.OK_OPTION) {
int minSelectedIndex = nodeList.getMinSelectionIndex();

2
designer-base/src/main/java/com/fr/env/RemoteSignInPane.java vendored

@ -24,7 +24,7 @@ public class RemoteSignInPane extends BasicPane {
userLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_UserName")+":");
userTextField = new UITextField();
passLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Password")+":");
passLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Password")+":");
passwordField = new UIPassWordField();
this.add(userLabel);
this.add(userTextField);

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

@ -55,7 +55,7 @@ public class ChartEmailPane extends EmailPane{
}
centerPane = new JPanel(new BorderLayout());
if (needRenamePane()) {
JPanel namePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Name") + ":", SwingConstants.RIGHT), itemNameTextField},},
JPanel namePane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Name") + ":", SwingConstants.RIGHT), itemNameTextField},},
new double[] {preferred}, columnSize, 6);
centerPane.add(namePane, BorderLayout.NORTH);
}

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

@ -25,8 +25,8 @@ public class PresentComboBox extends UIComboBox{
private String[] ITEMS = {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Dictionary"),
com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"),
com.fr.design.i18n.Toolkit.i18nText("Present-No_Present")
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_Formula_Present"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_No_Present")
};
public PresentComboBox() {

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

@ -46,7 +46,7 @@ public class VerticalSplitProperties implements GroupModel {
if (column == 0) {
switch (row) {
case 0:
return com.fr.design.i18n.Toolkit.i18nText("Ratio");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Ratio");
case 1:
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hgap");
case 2:

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

@ -7,7 +7,7 @@ import java.awt.FlowLayout;
public class HorizontalAlignmentItems implements ItemProvider {
private static Item[] VALUE_ITEMS = {
new Item(com.fr.design.i18n.Toolkit.i18nText("Left"), FlowLayout.LEFT),
new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left"), FlowLayout.LEFT),
new Item(com.fr.design.i18n.Toolkit.i18nText("Right"), FlowLayout.RIGHT),
new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), FlowLayout.CENTER)
};

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

@ -7,7 +7,7 @@ import javax.swing.SwingConstants;
public class LabelHorizontalAlignmentItems implements ItemProvider {
private static Item[] VALUE_ITEMS = {
new Item(com.fr.design.i18n.Toolkit.i18nText("Left"), SwingConstants.LEFT),
new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left"), SwingConstants.LEFT),
new Item(com.fr.design.i18n.Toolkit.i18nText("Right"), SwingConstants.RIGHT),
new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Center"), SwingConstants.CENTER)
};

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

@ -21,8 +21,8 @@ import com.fr.design.layout.FRGUIPaneFactory;
public class ColorPalette extends JPopupMenu {
private Border BLACK_BORDER = BorderFactory.createLineBorder(new Color(127, 157, 185));
private Object[] colors = new Object[]{new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Black"), new Color(0, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Crimson"), new Color(128, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Red"), new Color(255, 0, 0)},
new Object[]{com.fr.design.i18n.Toolkit.i18nText("Pink"), new Color(255, 0, 255)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Brown"), new Color(153, 51, 0)},
private Object[] colors = new Object[]{new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Black"), new Color(0, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Crimson"), new Color(128, 0, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Red"), new Color(255, 0, 0)},
new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Pink"), new Color(255, 0, 255)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Rose_Red"), new Color(255, 153, 204)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Brown"), new Color(153, 51, 0)},
new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Orange"), new Color(255, 102, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Light_Orange"), new Color(255, 153, 0)}, new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Golden"), new Color(255, 204, 0)},
new Object[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Brown_Orange"), new Color(255, 204, 153)}, new Object[]{"", new Color(51, 51, 0)}, new Object[]{"", new Color(128, 128, 0)}, new Object[]{"", new Color(153, 204, 0)},
new Object[]{"", new Color(255, 255, 0)}, new Object[]{"", new Color(255, 255, 153)}, new Object[]{"", new Color(0, 51, 0)}, new Object[]{"", new Color(0, 128, 0)},

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

@ -96,13 +96,13 @@ public class DeprecatedActionManager {
presentMenu.setMnemonic(KeySetUtils.PRESENT.getMnemonic());
NewPresentAction dataDictAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Format_Data_Map"), DictPresent.class.getName());
dataDictAction.setMnemonic('D');
NewPresentAction formulaAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Present-Formula_Present"), FormulaPresent.class.getName());
NewPresentAction formulaAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Present_Formula_Present"), FormulaPresent.class.getName());
formulaAction.setMnemonic('F');
NewPresentAction barcodeAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Insert_Barcode"), BarcodePresent.class.getName());
barcodeAction.setMnemonic('B');
NewPresentAction currencyLineAction = new NewPresentAction(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Currency_Line"), CurrencyLinePresent.class.getName());
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("Fine-Design_Basic_Present_No_Present"), "NOPRESENT");
nonePresentAction.setMnemonic('N');
presentMenu.addShortCut(dataDictAction);
presentMenu.addShortCut(formulaAction);

2
designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java

@ -97,7 +97,7 @@ public class HeaderFooterEditPane extends JPanel {
JPanel hfPreviewContentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.add(hfPreviewContentPane, BorderLayout.CENTER);
hfPreviewContentPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"),null));
hfPreviewContentPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"),null));
hfPreviewPane = new HFPreviewPane();
scrollPreviewPane = new JScrollPane(hfPreviewPane);

2
designer-realize/src/main/java/com/fr/design/headerfooter/ImagePane.java

@ -39,7 +39,7 @@ public class ImagePane extends BasicPane {
// previewPane.setLayout(FRGUIPaneFactory.createBorderLayout());
if (hasPreviewBorder) {
previewPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview")));
previewPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview")));
}
imagePreviewPane = new ImagePreviewPane();

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

@ -834,7 +834,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
@Override
protected String getTemplateReportType() {
return com.fr.design.i18n.Toolkit.i18nText("Report");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report");
}
}
@ -846,13 +846,13 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
@Override
protected String getTemplateReportType() {
return com.fr.design.i18n.Toolkit.i18nText("Poly");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Poly");
}
}
private class RemoveSheetAction extends UpdateAction {
RemoveSheetAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Remove"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
}
@ -908,7 +908,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
private class RenameSheetAction extends UpdateAction {
RenameSheetAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Rename"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Rename"));
this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/rename.png"));
}
@ -918,7 +918,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
return;
}
String newName = JOptionPane.showInputDialog(reportComposite, com.fr.design.i18n.Toolkit.i18nText("Rename") + ":", reportComposite.getEditingWorkBook().getReportName(selectedIndex));
String newName = JOptionPane.showInputDialog(reportComposite, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Rename") + ":", reportComposite.getEditingWorkBook().getReportName(selectedIndex));
if (newName != null) {
// marks:判断是否重名
boolean isExisted = false;

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

@ -167,14 +167,14 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
double[] columnSize = {p, f};
double[] rowSize = {p, p, p};
int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("RCodeVersion"), UILabel.LEFT);
UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_RCode_Version"), UILabel.LEFT);
uiLabel.setPreferredSize(typeSetLabel.getPreferredSize());
RCodeVersionComboBox.setPreferredSize(new Dimension(155,20));
RCodeErrorCorrectComboBox.setPreferredSize(new Dimension(155,20));
RCodesizespinner.setPreferredSize(new Dimension(155,20));
Component[][] components_special = new Component[][]{
new Component[]{uiLabel, RCodeVersionComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("RCodeErrorCorrect"), UILabel.LEFT), RCodeErrorCorrectComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_RCode_Error_Correct"), UILabel.LEFT), RCodeErrorCorrectComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_RCodeDrawPix"), UILabel.LEFT), RCodesizespinner}
};
@ -230,7 +230,7 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
}
private void initErrorCorrectComboBox() {
String[] array = {"L" + com.fr.design.i18n.Toolkit.i18nText("Level") + "7%", "M" + com.fr.design.i18n.Toolkit.i18nText("Level") + "15%", "Q" + com.fr.design.i18n.Toolkit.i18nText("Level") + "25%", "H" + com.fr.design.i18n.Toolkit.i18nText("Level") + "30%"};
String[] array = {"L" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Level") + "7%", "M" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Level") + "15%", "Q" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Level") + "25%", "H" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Level") + "30%"};
initcombobox(this.RCodeErrorCorrectComboBox, array, 1);
}

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

@ -32,7 +32,7 @@ public class ExcelExportPane extends BasicPane {
protected void initComponents() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("Excel" + com.fr.design.i18n.Toolkit.i18nText("ReportD-Excel_Export"));
JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("Excel" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export"));
JPanel northPane=FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
this.add(outnorthPane);
outnorthPane.add(northPane);

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

@ -27,7 +27,7 @@ public class PDFExportPane extends BasicPane {
protected void initComponents() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("PDF" + com.fr.design.i18n.Toolkit.i18nText("ReportD-Excel_Export"));
JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("PDF" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export"));
JPanel northPane=FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
this.add(outnorthPane);
outnorthPane.add(northPane);

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

@ -184,7 +184,7 @@ public class PageSetupPane extends BasicPane {
portraitRadioButton.setSelected(true);
JPanel spp = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Preview"));
JPanel spp = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
showPagePane = new ShowPagePane();
spp.add(showPagePane);
defaultPane.add(spp);
@ -293,7 +293,7 @@ public class PageSetupPane extends BasicPane {
// peter:这个一个垂直的上下的字符panel.
JPanel marginRightTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
marginRightPane.add(marginRightTextPane);
marginRightTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Left") + ":"));
marginRightTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left") + ":"));
marginLeftUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM);
marginRightTextPane.add(marginLeftUnitFieldPane);

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

@ -41,7 +41,7 @@ public class ReportExportAttrPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("ReportD-Excel_Export");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export");
}
public void populate(ReportExportAttr reportExportAttr) {

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

@ -63,7 +63,7 @@ public class SelectImagePane extends BasicPane {
JPanel previewOwnerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
previewContainerPane.add(previewOwnerPane, BorderLayout.CENTER);
previewOwnerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"), null));
previewOwnerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"), null));
previewPane = new ImagePreviewPane();
previewOwnerPane.add(new JScrollPane(previewPane));

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

@ -24,7 +24,7 @@ public class WordExportPane extends BasicPane {
protected void initComponents() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("Word" + com.fr.design.i18n.Toolkit.i18nText("ReportD-Excel_Export"));
JPanel outnorthPane =FRGUIPaneFactory.createTitledBorderPane("Word" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export"));
this.add(outnorthPane);
JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();

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

@ -69,7 +69,7 @@ public class StylePane extends BasicBeanPane<Style> implements ChangeListener {
previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
this.add(previewPane, BorderLayout.NORTH);
previewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Preview"), null));
previewPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"), null));
previewArea = new PreivewArea();
previewPane.add(previewArea, BorderLayout.CENTER);

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

@ -84,7 +84,7 @@ public class ReportWebWidgetConstants {
// 邮件发送
public static final WidgetOption EMAIL = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Email"), BaseUtils.readIcon("/com/fr/web/images/email.png"), Email.class);
public static final WidgetOption PRINTPREVIEW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("PrintP-Print_Preview"),
public static final WidgetOption PRINTPREVIEW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PrintP_Print_Preview"),
BaseUtils.readIcon("/com/fr/web/images/preview.png"), PrintPreview.class);

8
designer-realize/src/main/java/com/fr/design/webattr/ServerPrinterPane.java

@ -71,7 +71,7 @@ public class ServerPrinterPane extends BasicPane {
removeButton = new UIButton(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
removeButton.addActionListener(this.removeActionListener);
removeButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Remove"));//"remove"
removeButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));//"remove"
removeButton.setPreferredSize(preferDimension);
moveUpButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/control/up.png"));
@ -162,7 +162,7 @@ public class ServerPrinterPane extends BasicPane {
}
int returnVal = JOptionPane.showConfirmDialog(ServerPrinterPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Are_You_Sure_To_Delete_The_Selected_Printer")
+ "?", com.fr.design.i18n.Toolkit.i18nText("Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
+ "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.OK_OPTION) {
((DefaultListModel) printerList.getModel()).remove(selectedIndex);
@ -319,7 +319,7 @@ public class ServerPrinterPane extends BasicPane {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(20, 5, 0, 0));
JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
centerPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Printer") + ":"), BorderLayout.WEST);
centerPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Printer") + ":"), BorderLayout.WEST);
DefaultComboBoxModel printerComboModel = new DefaultComboBoxModel();
@ -356,7 +356,7 @@ public class ServerPrinterPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Printer");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Printer");
}
public void populate(String printerName) {

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

@ -47,7 +47,7 @@ public class PageMarginSettingPane extends JPanel {
// peter:这个一个垂直的上下的字符panel.
JPanel marginRightTextPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
marginRightPane.add(marginRightTextPane);
marginRightTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Left") + ":"));
marginRightTextPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Left") + ":"));
marginLeftUnitFieldPane = new UnitFieldPane(Constants.UNIT_MM);
marginRightTextPane.add(marginLeftUnitFieldPane);

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

@ -325,7 +325,7 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
.append(unit).append('(')
.append((int)(doubleValue)).append('/')
.append((int)(totalDoubleValue))
.append(com.fr.design.i18n.Toolkit.i18nText("px"))
.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Px"))
.append(')');
return sb.toString();
}

2
designer-realize/src/main/java/com/fr/poly/group/PolyNameGroup.java

@ -44,7 +44,7 @@ public class PolyNameGroup implements GroupModel {
@Override
public Object getValue(int row, int column) {
if (column == 0) {
return com.fr.design.i18n.Toolkit.i18nText("Poly_Name");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Poly_Name");
} else {
return block.getBlockName();
}

Loading…
Cancel
Save