Browse Source

Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)

* commit '4060b26396d6d0fa7152bf552dac8b23ec135a03':
  规范国际化
  规范国际化
final/10.0
Wim.Zhai 6 years ago
parent
commit
3636b3a607
  1. 2
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  2. 6
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
  3. 2
      designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java
  4. 6
      designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTableModel.java
  5. 8
      designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java
  6. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
  7. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DecoratedTableDataPane.java
  8. 4
      designer-base/src/main/java/com/fr/design/editor/DoubleDeckValueEditorPane.java
  9. 4
      designer-base/src/main/java/com/fr/design/editor/ValueEditorPane.java
  10. 2
      designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java
  11. 2
      designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java
  12. 4
      designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java
  13. 2
      designer-base/src/main/java/com/fr/design/extra/PluginUpdatePane.java
  14. 2
      designer-base/src/main/java/com/fr/design/extra/PluginUtils.java
  15. 2
      designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
  16. 2
      designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
  17. 2
      designer-base/src/main/java/com/fr/design/formula/TinyFormulaPane.java
  18. 4
      designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java
  19. 4
      designer-base/src/main/java/com/fr/design/gui/frpane/HyperlinkGroupPane.java
  20. 6
      designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java
  21. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/ListenerUpdatePane.java
  22. 8
      designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java
  23. 4
      designer-base/src/main/java/com/fr/design/gui/frpane/TreeSettingPane.java
  24. 8
      designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDataControlPane.java
  25. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/tree/layer/config/LayerDependenceSettingPane.java
  26. 5
      designer-base/src/main/java/com/fr/design/gui/itable/AbstractPropertyTable.java
  27. 16
      designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java
  28. 2
      designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java
  29. 2
      designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java
  30. 2
      designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/TipWindow.java
  31. 2
      designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java
  32. 2
      designer-base/src/main/java/com/fr/design/javascript/EmailPane.java
  33. 4
      designer-base/src/main/java/com/fr/design/javascript/JavaScriptImplPane.java
  34. 2
      designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java
  35. 4
      designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
  36. 2
      designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java
  37. 6
      designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java
  38. 2
      designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
  39. 6
      designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
  40. 2
      designer-base/src/main/java/com/fr/design/present/dict/DatabaseDictPane.java
  41. 4
      designer-base/src/main/java/com/fr/design/present/dict/FormulaDictPane.java
  42. 2
      designer-base/src/main/java/com/fr/design/present/dict/TableDataDictPane.java
  43. 2
      designer-base/src/main/java/com/fr/design/style/background/impl/ImageBackgroundPane.java
  44. 2
      designer-base/src/main/java/com/fr/design/style/background/impl/ImageButtonBackgroundPane.java
  45. 2
      designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java
  46. 3
      designer-base/src/main/java/com/fr/design/style/color/CustomChooserPanel.java
  47. 2
      designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java
  48. 6
      designer-base/src/main/java/com/fr/design/web/CustomIconPane.java
  49. 2
      designer-base/src/main/java/com/fr/design/widget/IconDefinePane.java
  50. 6
      designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java
  51. 8
      designer-base/src/main/java/com/fr/design/widget/component/BackgroundCompPane.java
  52. 2
      designer-base/src/main/java/com/fr/design/widget/component/CheckBoxDictPane.java
  53. 2
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
  54. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
  55. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
  56. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartDesignerInteractivePane.java
  57. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java
  58. 2
      designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
  59. 2
      designer-chart/src/main/java/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java
  60. 2
      designer-form/src/main/java/com/fr/design/designer/beans/actions/ChangeNameAction.java
  61. 16
      designer-form/src/main/java/com/fr/design/designer/creator/XButton.java
  62. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java
  63. 6
      designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java
  64. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XCustomWriteAbleRepeatEditor.java
  65. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XDirectWriteEditor.java
  66. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java
  67. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java
  68. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java
  69. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java
  70. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java
  71. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java
  72. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java
  73. 6
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java
  74. 2
      designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java
  75. 2
      designer-form/src/main/java/com/fr/design/designer/properties/FRFormLayoutPropertiesGroupModel.java
  76. 2
      designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java
  77. 4
      designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java
  78. 2
      designer-form/src/main/java/com/fr/design/form/parameter/RootDesignGroupModel.java
  79. 2
      designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java
  80. 2
      designer-form/src/main/java/com/fr/design/mainframe/FormHierarchyTreePane.java
  81. 4
      designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java
  82. 2
      designer-form/src/main/java/com/fr/design/mainframe/WidgetHelpDialog.java
  83. 6
      designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
  84. 2
      designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ElementCaseToolBarWrapper.java
  85. 2
      designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/FormulaWrapper.java
  86. 2
      designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java
  87. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java
  88. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java
  89. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/CustomWritableRepeatEditorPane.java
  90. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/DirectWriteEditorDefinePane.java
  91. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/WriteUnableRepeatEditorPane.java
  92. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java
  93. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java
  94. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java
  95. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java
  96. 4
      designer-realize/src/main/java/com/fr/design/cell/editor/RichTextToolBar.java
  97. 4
      designer-realize/src/main/java/com/fr/design/condition/BorderHighlightPane.java
  98. 4
      designer-realize/src/main/java/com/fr/design/condition/ForeGroundPane.java
  99. 2
      designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java
  100. 8
      designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java
  101. Some files were not shown because too many files have changed in this diff Show More

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

@ -130,7 +130,7 @@ public class PreferencePane extends BasicPane {
JPanel generalPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); JPanel generalPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_General"), generalPane); jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_General"), generalPane);
JPanel advancePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); JPanel advancePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), advancePane); jtabPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), advancePane);
contentPane.add(jtabPane, BorderLayout.NORTH); contentPane.add(jtabPane, BorderLayout.NORTH);

6
designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java

@ -88,9 +88,9 @@ public class AlphaFineConfigPane extends BasicPane {
double[] columnSize = {COLUMN_GAP, COLUMN_GAP, COLUMN_GAP}; double[] columnSize = {COLUMN_GAP, COLUMN_GAP, COLUMN_GAP};
JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Range")); JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Search_Range"));
isContainRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Recommend")); isContainRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Recommend"));
isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set")); isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"));
isContainPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Addon")); isContainPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Plugin_Addon"));
isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP")); isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"));
isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates")); isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates"));
isContainFileContentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Templates_Content")); isContainFileContentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Templates_Content"));
@ -162,7 +162,7 @@ public class AlphaFineConfigPane extends BasicPane {
} }
private void createOpenPane(JPanel contentPane) { private void createOpenPane(JPanel contentPane) {
JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_AlphaFine_Enable")); JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable"));
isEnabledCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_AlphaFine")); isEnabledCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Enable_AlphaFine"));
northPane.add(isEnabledCheckbox); northPane.add(isEnabledCheckbox);
contentPane.add(northPane); contentPane.add(northPane);

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

@ -564,7 +564,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
addControlPane.add(Box.createHorizontalStrut(STRUT_ONE)); addControlPane.add(Box.createHorizontalStrut(STRUT_ONE));
addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add"), BaseUtils.readIcon("com/fr/base/images/cell/control/add.png")); addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"), BaseUtils.readIcon("com/fr/base/images/cell/control/add.png"));
addButton.setMnemonic('A'); addButton.setMnemonic('A');
addControlPane.add(addButton); addControlPane.add(addButton);
addButton.addActionListener(actionListener2); addButton.addActionListener(actionListener2);

6
designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTableModel.java

@ -100,7 +100,7 @@ public class PreviewTableModel extends AbstractTableModel {
} catch (TableDataException e) { } catch (TableDataException e) {
FRContext.getLogger().error(e.getMessage(), e); FRContext.getLogger().error(e.getMessage(), e);
DesignUtils.errorMessage(e.getMessage()); DesignUtils.errorMessage(e.getMessage());
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Error"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error");
} }
} }
@ -149,7 +149,7 @@ public class PreviewTableModel extends AbstractTableModel {
} }
public String getColumnName(int column) { public String getColumnName(int column) {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Error"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error");
} }
public int getColumnCount() { public int getColumnCount() {
@ -201,7 +201,7 @@ public class PreviewTableModel extends AbstractTableModel {
} else if (o instanceof Integer) { } else if (o instanceof Integer) {
s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer"); s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Integer");
} else if (o instanceof Double || o instanceof Float) { } else if (o instanceof Double || o instanceof Float) {
s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Double"); s = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Double");
} else if (o instanceof java.sql.Date || o instanceof java.util.Date) { } else if (o instanceof java.sql.Date || o instanceof java.util.Date) {
s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"); s = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date");
} else if (o instanceof Number) { } else if (o instanceof Number) {

8
designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java

@ -265,7 +265,7 @@ public class PreviewTablePane extends BasicPane {
*/ */
public static EmbeddedTableData previewTableData(TableData tableData, final int keyIndex, final int valueIndex) { public static EmbeddedTableData previewTableData(TableData tableData, final int keyIndex, final int valueIndex) {
PreviewTablePane previewTablePane = new PreviewTablePane(); PreviewTablePane previewTablePane = new PreviewTablePane();
previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data"))); previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data")));
try { try {
previewTablePane.populate(tableData); previewTablePane.populate(tableData);
previewTablePane.resetPreviewTableColumnColor(); previewTablePane.resetPreviewTableColumnColor();
@ -301,7 +301,7 @@ public class PreviewTablePane extends BasicPane {
return; return;
} }
FineLoggerFactory.getLogger().error(exp.getMessage(), exp); FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), columnErrMessage, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Error"), JOptionPane.ERROR_MESSAGE); JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), columnErrMessage, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), JOptionPane.ERROR_MESSAGE);
} }
private void populate(TableData tableData) throws Exception { private void populate(TableData tableData) throws Exception {
@ -420,7 +420,7 @@ public class PreviewTablePane extends BasicPane {
public static void previewStoreData(final ProcedureDataModel storeProcedureDataModel, final int keyIndex, final int valueIndex) { public static void previewStoreData(final ProcedureDataModel storeProcedureDataModel, final int keyIndex, final int valueIndex) {
final PreviewTablePane previewTablePane = new PreviewTablePane(); final PreviewTablePane previewTablePane = new PreviewTablePane();
previewTablePane.storeProcedureDataModel = storeProcedureDataModel; previewTablePane.storeProcedureDataModel = storeProcedureDataModel;
previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data"))); previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data")));
try { try {
previewTablePane.populateStoreDataSQL(); previewTablePane.populateStoreDataSQL();
@ -451,7 +451,7 @@ public class PreviewTablePane extends BasicPane {
for (int i = 0; i < tableSize; i++) { for (int i = 0; i < tableSize; i++) {
PreviewTablePane previewTablePane = new PreviewTablePane(); PreviewTablePane previewTablePane = new PreviewTablePane();
previewTablePane.storeProcedureDataModel = storeProcedureDataModels[i]; previewTablePane.storeProcedureDataModel = storeProcedureDataModels[i];
previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Data"))); previewTablePane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Data")));
try { try {
previewTablePane.populateStoreDataSQL(); previewTablePane.populateStoreDataSQL();
} catch (Exception e) { } catch (Exception e) {

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

@ -120,7 +120,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
public class AddParaAction extends UITableEditAction { public class AddParaAction extends UITableEditAction {
public AddParaAction() { public AddParaAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
} }

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

@ -27,7 +27,7 @@ public class DecoratedTableDataPane extends AbstractTableDataPane<DecoratedTable
while (serverTableDataNameIterator.hasNext()) { while (serverTableDataNameIterator.hasNext()) {
tableDataNameList.add((String)serverTableDataNameIterator.next()); tableDataNameList.add((String)serverTableDataNameIterator.next());
} }
availableTableDataNameList = new CheckBoxList(tableDataNameList.toArray(new String[0]), CheckBoxList.SelectedState.NONE,com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Field_Name")); availableTableDataNameList = new CheckBoxList(tableDataNameList.toArray(new String[0]), CheckBoxList.SelectedState.NONE,com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Chart_Field_Name"));
this.add(availableTableDataNameList, BorderLayout.WEST); this.add(availableTableDataNameList, BorderLayout.WEST);
availableTableDataNameList.addCheckBoxListSelectionChangeListener(this); availableTableDataNameList.addCheckBoxListSelectionChangeListener(this);

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

@ -238,7 +238,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
Object columnIndex = currentEditor.getValue(); Object columnIndex = currentEditor.getValue();
Object columnName = StringUtils.EMPTY; Object columnName = StringUtils.EMPTY;
if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString()); columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
} }
@ -254,7 +254,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
Object columnIndex = currentEditor.getValue(); Object columnIndex = currentEditor.getValue();
Object columnName = StringUtils.EMPTY; Object columnName = StringUtils.EMPTY;
if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString()); columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
} }

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

@ -219,7 +219,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
Object columnIndex = currentEditor.getValue(); Object columnIndex = currentEditor.getValue();
Object columnName = StringUtils.EMPTY; Object columnName = StringUtils.EMPTY;
if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString()); columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
} }
@ -235,7 +235,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
Object columnIndex = currentEditor.getValue(); Object columnIndex = currentEditor.getValue();
Object columnName = StringUtils.EMPTY; Object columnName = StringUtils.EMPTY;
if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"))) { if (ComparatorUtils.equals(name, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"))) {
columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString()); columnIndex = BaseFormula.createFormulaBuilder().build(columnIndex == null ? "" : columnIndex.toString());
} }

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

@ -498,7 +498,7 @@ public class ValueEditorPaneFactory {
JPanel paneRight = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel paneRight = FRGUIPaneFactory.createBorderLayout_S_Pane();
pane.add(paneRight); pane.add(paneRight);
paneRight.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value") + ":"), BorderLayout.NORTH); paneRight.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value") + ":"), BorderLayout.NORTH);
paneRight.add(valueDictPane, BorderLayout.CENTER); paneRight.add(valueDictPane, BorderLayout.CENTER);

2
designer-base/src/main/java/com/fr/design/extra/PluginAbstractLoadingViewPane.java

@ -98,7 +98,7 @@ public abstract class PluginAbstractLoadingViewPane<V, T> extends PluginAbstract
@Override @Override
public String textForInstallButton() { public String textForInstallButton() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install");
} }

4
designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java

@ -59,7 +59,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
@Override @Override
public String textForInstallButton() { public String textForInstallButton() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install");
} }
@ -107,7 +107,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
@Override @Override
public String textForInstallButton() { public String textForInstallButton() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install");
} }

2
designer-base/src/main/java/com/fr/design/extra/PluginUpdatePane.java

@ -136,7 +136,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
*/ */
public void loadOnSuccess(List<PluginView> plugins) { public void loadOnSuccess(List<PluginView> plugins) {
controlPane.loadPlugins(plugins); controlPane.loadPlugins(plugins);
tabbedPane.setTitleAt(1, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update") + "(" + plugins.size() + ")"); tabbedPane.setTitleAt(1, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update") + "(" + plugins.size() + ")");
} }
/** /**

2
designer-base/src/main/java/com/fr/design/extra/PluginUtils.java

@ -104,7 +104,7 @@ public class PluginUtils {
writer.flush(); writer.flush();
writer.close(); writer.close();
} else { } else {
throw new com.fr.plugin.PluginVerifyException(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Connect_Server_Error")); throw new com.fr.plugin.PluginVerifyException(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Connect_Server_Error"));
} }
} }

2
designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java

@ -249,7 +249,7 @@ public class WebViewDlgHelper {
UITabbedPane tabbedPane = new UITabbedPane(); UITabbedPane tabbedPane = new UITabbedPane();
PluginInstalledPane installedPane = new PluginInstalledPane(); PluginInstalledPane installedPane = new PluginInstalledPane();
tabbedPane.addTab(installedPane.tabTitle(), installedPane); tabbedPane.addTab(installedPane.tabTitle(), installedPane);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Update"), new PluginUpdatePane(tabbedPane)); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update"), new PluginUpdatePane(tabbedPane));
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_All_Plugins"), new PluginFromStorePane(tabbedPane)); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_All_Plugins"), new PluginFromStorePane(tabbedPane));
return tabbedPane; return tabbedPane;
} }

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

@ -695,7 +695,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) { if (DesignerMode.isAuthorityEditing() && !openedTemplate.get(selectedIndex).isJWorkBook()) {
DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex)); DesignerContext.getDesignerFrame().addAndActivateJTemplate(openedTemplate.get(tempSelectedIndex));
JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported") JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Authority_Edited_Cannot_Be_Supported")
+ "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert"), JOptionPane.WARNING_MESSAGE); + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert"), JOptionPane.WARNING_MESSAGE);
this.repaint(); this.repaint();
return; return;
} }

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

@ -39,7 +39,7 @@ public class TinyFormulaPane extends BasicBeanPane<String> implements UIObserver
// 添加一公式编辑器按钮 // 添加一公式编辑器按钮
formulaTextFieldButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png")); formulaTextFieldButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));
formulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula") + "..."); formulaTextFieldButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula") + "...");
formulaTextFieldButton.setPreferredSize(new Dimension(24, 20)); formulaTextFieldButton.setPreferredSize(new Dimension(24, 20));
formulaTextFieldButton.setOpaque(false); formulaTextFieldButton.setOpaque(false);
formulaTextFieldButton.setCursor(new Cursor(Cursor.HAND_CURSOR)); formulaTextFieldButton.setCursor(new Cursor(Cursor.HAND_CURSOR));

4
designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java

@ -130,7 +130,7 @@ public abstract class WidgetOption implements Serializable {
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16.png"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16.png"),
DateEditor.class); DateEditor.class);
public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Form-View_Tree"), public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree"),
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16.png"), TreeEditor.class); BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16.png"), TreeEditor.class);
public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree-ComboBox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree.png"), public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree-ComboBox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree.png"),
@ -192,7 +192,7 @@ public abstract class WidgetOption implements Serializable {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"),
BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16.png"), Password.class); BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16.png"), Password.class);
public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"), public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),
IframeEditor.class); IframeEditor.class);
} }

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

@ -82,12 +82,12 @@ public abstract class HyperlinkGroupPane extends UIListControlPane {
*/ */
@Override @Override
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink");
} }
@Override @Override
protected String getAddItemText() { protected String getAddItemText() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add_Hyperlink"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add_Hyperlink");
} }
public void populate(NameJavaScriptGroup hyperlinkArray) { public void populate(NameJavaScriptGroup hyperlinkArray) {

6
designer-base/src/main/java/com/fr/design/gui/frpane/JTreeControlPane.java

@ -59,7 +59,7 @@ public class JTreeControlPane extends ControlPane {
JPanel northPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); JPanel northPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Root")); DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Root"));
defaultTreeModel = new DefaultTreeModel(rootNode); defaultTreeModel = new DefaultTreeModel(rootNode);
DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + 1, new TreeNodeAttr())); DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation") + 1, new TreeNodeAttr()));
tree = new JTree(defaultTreeModel); tree = new JTree(defaultTreeModel);
tree.setRootVisible(false); tree.setRootVisible(false);
((DefaultMutableTreeNode) defaultTreeModel.getRoot()).getLastLeaf().add(firstLayer); ((DefaultMutableTreeNode) defaultTreeModel.getRoot()).getLastLeaf().add(firstLayer);
@ -134,7 +134,7 @@ public class JTreeControlPane extends ControlPane {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
DefaultMutableTreeNode node4add = new DefaultMutableTreeNode( DefaultMutableTreeNode node4add = new DefaultMutableTreeNode(
new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + (i + 1), treeNodeAttr[i])); new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation") + (i + 1), treeNodeAttr[i]));
node4root.add(node4add); node4root.add(node4add);
node4root = node4add; node4root = node4add;
} }
@ -193,7 +193,7 @@ public class JTreeControlPane extends ControlPane {
public AddTreeNodeAction(NameableCreator[] creators) { public AddTreeNodeAction(NameableCreator[] creators) {
this.creator = creators[0]; this.creator = creators[0];
this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
this.setMnemonic('A'); this.setMnemonic('A');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
} }

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

@ -29,7 +29,7 @@ public abstract class ListenerUpdatePane extends BasicBeanPane<Listener> {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event");
} }
@Override @Override

8
designer-base/src/main/java/com/fr/design/gui/frpane/RegPane.java

@ -76,7 +76,7 @@ public class RegPane extends BasicPane {
regComboBox.setRenderer(listCellRender); regComboBox.setRenderer(listCellRender);
JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")), regComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule")), regComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
jPanel.add(contentPane, BorderLayout.NORTH); jPanel.add(contentPane, BorderLayout.NORTH);
@ -119,7 +119,7 @@ public class RegPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule");
} }
private int getRegTypeIndex(RegExp regex) { private int getRegTypeIndex(RegExp regex) {
@ -330,7 +330,7 @@ public class RegPane extends BasicPane {
private static final String REG_PATTERN = "0123456789-*# "; private static final String REG_PATTERN = "0123456789-*# ";
private UIComboBox dataTypeComboBox; private UIComboBox dataTypeComboBox;
private final String[] dataType = {EMB_REG1, EMB_REG2, EMB_REG3, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")}; private final String[] dataType = {EMB_REG1, EMB_REG2, EMB_REG3, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")};
DefaultComboBoxModel DefaultComboBoxModel= new DefaultComboBoxModel(dataType); DefaultComboBoxModel DefaultComboBoxModel= new DefaultComboBoxModel(dataType);
public RegPhonePane() { public RegPhonePane() {
this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0)); this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
@ -504,7 +504,7 @@ public class RegPane extends BasicPane {
} else if (value instanceof PostCardReg){ } else if (value instanceof PostCardReg){
this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Post_Code")); this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Post_Code"));
} else if (value instanceof CustomReg){ } else if (value instanceof CustomReg){
this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")); this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"));
} }
return this; return this;
} }

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

@ -99,7 +99,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Create_Tree"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Create_Tree");
} }
@Override @Override
@ -108,7 +108,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
} }
NameableCreator treeNode = new NameObjectCreator( NameableCreator treeNode = new NameObjectCreator(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation"),
"/com/fr/design/images/data/source/jdbcTableData.png", "/com/fr/design/images/data/source/jdbcTableData.png",
TreeNodeAttr.class); TreeNodeAttr.class);

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

@ -50,7 +50,7 @@ public class LayerDataControlPane extends ControlPane {
DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Root")); DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Root"));
defaultTreeModel = new DefaultTreeModel(rootNode); defaultTreeModel = new DefaultTreeModel(rootNode);
tree = new JTree(defaultTreeModel); tree = new JTree(defaultTreeModel);
DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + 1, new LayerConfig(1))); DefaultMutableTreeNode firstLayer = new DefaultMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation") + 1, new LayerConfig(1)));
tree.setRootVisible(false); tree.setRootVisible(false);
((DefaultMutableTreeNode) defaultTreeModel.getRoot()).getLastLeaf().add(firstLayer); ((DefaultMutableTreeNode) defaultTreeModel.getRoot()).getLastLeaf().add(firstLayer);
tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
@ -143,7 +143,7 @@ public class LayerDataControlPane extends ControlPane {
public AddTreeNodeAction() { public AddTreeNodeAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
this.setMnemonic('A'); this.setMnemonic('A');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
} }
@ -157,7 +157,7 @@ public class LayerDataControlPane extends ControlPane {
do { do {
nodeCount++; nodeCount++;
} while ((innerNode = innerNode.getNextNode()) != null); } while ((innerNode = innerNode.getNextNode()) != null);
NameObject nameable = new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + nodeCount, new LayerConfig(nodeCount)); NameObject nameable = new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation") + nodeCount, new LayerConfig(nodeCount));
node.getLastLeaf().add(new DefaultMutableTreeNode(nameable)); node.getLastLeaf().add(new DefaultMutableTreeNode(nameable));
defaultTreeModel.reload(); defaultTreeModel.reload();
@ -208,7 +208,7 @@ public class LayerDataControlPane extends ControlPane {
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
DefaultMutableTreeNode node4add = new DefaultMutableTreeNode( DefaultMutableTreeNode node4add = new DefaultMutableTreeNode(
new NameObject(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Gradation") + (i + 1), layerConfigs[i].clone())); new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradation") + (i + 1), layerConfigs[i].clone()));
node4root.add(node4add); node4root.add(node4add);
node4root = node4add; node4root = node4add;
} }

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

@ -394,7 +394,7 @@ public class LayerDependenceSettingPane extends JPanel implements ItemListener {
if (column == 0) { if (column == 0) {
name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Layer_Index"); name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Layer_Index");
} else { } else {
name = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_filedChosen"); name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Filed_Chosen");
} }
return name; return name;
} }

5
designer-base/src/main/java/com/fr/design/gui/itable/AbstractPropertyTable.java

@ -15,7 +15,6 @@ import javax.swing.table.DefaultTableModel;
import javax.swing.table.JTableHeader; import javax.swing.table.JTableHeader;
import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer; import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableModel;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
@ -255,9 +254,9 @@ public abstract class AbstractPropertyTable extends JTable {
@Override @Override
public String getColumnName(int column) { public String getColumnName(int column) {
if (column == 0) { if (column == 0) {
return com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Property"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Property");
} else { } else {
return com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Property_Value"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Property_Value");
} }
} }

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

@ -181,8 +181,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
} }
private void initAllNames() { private void initAllNames() {
hAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Horizontal")); hAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal"));
vAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Vertical")); vAlignmentPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical"));
imageLayoutComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Layout")); imageLayoutComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image_Layout"));
textComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style")); textComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style"));
textRotationComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation")); textRotationComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation"));
@ -199,7 +199,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
basicPane = new JPanel(); basicPane = new JPanel();
seniorPane = new JPanel(); seniorPane = new JPanel();
basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 290, 24, basicPane()); basicPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic"), 290, 24, basicPane());
seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 290, 24, seniorPane()); seniorPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), 290, 24, seniorPane());
jp1.add(basicPane, BorderLayout.NORTH); jp1.add(basicPane, BorderLayout.NORTH);
jp1.add(seniorPane, BorderLayout.CENTER); jp1.add(seniorPane, BorderLayout.CENTER);
@ -212,9 +212,9 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
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("FR-Designer-StyleAlignment_Pane_Horizontal") + " ", SwingConstants.LEFT), hPaneContainer}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal") + " ", SwingConstants.LEFT), hPaneContainer},
new Component[]{null, null}, new Component[]{null, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Vertical") + " ", SwingConstants.RIGHT), vPaneContainer}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical") + " ", SwingConstants.RIGHT), vPaneContainer},
new Component[]{null, null} new Component[]{null, null}
}; };
double[] rowSize = {p, p, p, p, p, p}; double[] rowSize = {p, p, p, p, p, p};
@ -269,7 +269,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{null, null, null}, new Component[]{null, null, null},
new Component[]{indentationPane, creatSpinnerPane(leftIndentSpinner), creatSpinnerPane(rightIndentSpinner)}, new Component[]{indentationPane, creatSpinnerPane(leftIndentSpinner), creatSpinnerPane(rightIndentSpinner)},
new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Left")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Right")), SwingConstants.CENTER)}, new Component[]{null, new UILabel((com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left")), SwingConstants.CENTER), new UILabel((com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Right")), SwingConstants.CENTER)},
new Component[]{null, null, null}, new Component[]{null, null, null},
new Component[]{null, null, null}, new Component[]{null, null, null},
new Component[]{partSpacingPane, creatSpinnerPane(spaceBeforeSpinner), creatSpinnerPane(spaceAfterSpinner)}, new Component[]{partSpacingPane, creatSpinnerPane(spaceBeforeSpinner), creatSpinnerPane(spaceAfterSpinner)},
@ -358,11 +358,11 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
return style; return style;
} }
if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Horizontal"))) { if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Horizontal"))) {
Integer h = this.hAlignmentPane.getSelectedItem(); Integer h = this.hAlignmentPane.getSelectedItem();
style = style.deriveHorizontalAlignment(h == null ? -1 : h); style = style.deriveHorizontalAlignment(h == null ? -1 : h);
} }
if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Pane_Vertical"))) { if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Pane_Vertical"))) {
Integer vAlign = this.vAlignmentPane.getSelectedItem(); Integer vAlign = this.vAlignmentPane.getSelectedItem();
if (vAlign != null) { if (vAlign != null) {
style = style.deriveVerticalAlignment(vAlign); style = style.deriveVerticalAlignment(vAlign);

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

@ -91,7 +91,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
double[] columnSize = {p, f}; double[] columnSize = {p, f};
int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}; int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM); panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_SMALL, LayoutConstants.VGAP_MEDIUM);
borderPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Border"), 280, 24, panel); borderPanel = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border"), 280, 24, panel);
this.add(borderPanel, BorderLayout.NORTH); this.add(borderPanel, BorderLayout.NORTH);
backgroundPane = new BackgroundPane(); backgroundPane = new BackgroundPane();

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

@ -108,7 +108,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
frFontPane = new FRFontPane(); frFontPane = new FRFontPane();
UILabel font = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont"), SwingConstants.LEFT); UILabel font = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font"), SwingConstants.LEFT);
JPanel fontPane = new JPanel(new BorderLayout()); JPanel fontPane = new JPanel(new BorderLayout());
fontPane.add(font, BorderLayout.NORTH); fontPane.add(font, BorderLayout.NORTH);

2
designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/TipWindow.java

@ -253,7 +253,7 @@ class TipWindow extends JWindow implements ActionListener {
} }
else { else {
panel.setOpaque(false); panel.setOpaque(false);
JLabel label = new JLabel(FocusableTip.getString("FocusHotkey")); JLabel label = new JLabel(FocusableTip.getString("Fine-Design_Basic_Focus_Hotkey"));
Color fg = UIManager.getColor("Label.disabledForeground"); Color fg = UIManager.getColor("Label.disabledForeground");
Font font = textArea.getFont(); Font font = textArea.getFont();
font = font.deriveFont(font.getSize2D() - 1.0f); font = font.deriveFont(font.getSize2D() - 1.0f);

2
designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java

@ -52,7 +52,7 @@ public abstract class AbstractHyperNorthPane<T extends Hyperlink> extends BasicB
targetFrameComboBox.setPreferredSize(new Dimension(100, 20)); targetFrameComboBox.setPreferredSize(new Dimension(100, 20));
final JPanel newWindowConfPane = new JPanel(); final JPanel newWindowConfPane = new JPanel();
newWindowConfPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Height") + ": ")); newWindowConfPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height") + ": "));
heightTextFiled = new UINumberField(); heightTextFiled = new UINumberField();
heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE)); heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE));
heightTextFiled.setPreferredSize(new Dimension(40, 20)); heightTextFiled.setPreferredSize(new Dimension(40, 20));

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

@ -139,7 +139,7 @@ public class EmailPane extends FurtherBasicBeanPane<EmailJavaScript> {
* @return 标题字串 * @return 标题字串
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email_sentEmail"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Email_Sent_Email");
} }
/** /**

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

@ -87,7 +87,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript"))); importedJsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript")));
importedJsPane.setPreferredSize(new Dimension(265, 150)); importedJsPane.setPreferredSize(new Dimension(265, 150));
jsPane = new JSContentPane(defaultArgs); jsPane = new JSContentPane(defaultArgs);
jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript"))); jsPane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript")));
parameterPane.setPreferredSize(new Dimension(265, 150)); parameterPane.setPreferredSize(new Dimension(265, 150));
JPanel topPane = GUICoreUtils.createBorderLayoutPane( JPanel topPane = GUICoreUtils.createBorderLayoutPane(
@ -125,7 +125,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
* @return 标题. * @return 标题.
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript");
} }
/** /**

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

@ -447,7 +447,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
hintsLabel.setForeground(Color.RED); hintsLabel.setForeground(Color.RED);
hintsLabel.setVisible(false); hintsLabel.setVisible(false);
confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Confirm")); confirmButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm"));
confirmButton.setPreferredSize(new Dimension(80, 25)); confirmButton.setPreferredSize(new Dimension(80, 25));
confirmButton.setMinimumSize(new Dimension(80, 25)); confirmButton.setMinimumSize(new Dimension(80, 25));
confirmButton.setMaximumSize(new Dimension(80, 25)); confirmButton.setMaximumSize(new Dimension(80, 25));

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

@ -114,7 +114,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
"cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, "cellattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT}); new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
// 悬浮元素 // 悬浮元素
PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Float_Element"), PropertyItem floatElement = new PropertyItem(KEY_FLOAT_ELEMENT, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Float_Element"),
"floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, "floatelement", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.POLY_REPORT}); new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.POLY_REPORT});
// 控件设置 // 控件设置
@ -126,7 +126,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
"conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, "conditionattr", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT}); new PropertyMode[]{PropertyMode.REPORT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
// 超级链接 // 超级链接
PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink"), PropertyItem hyperlink = new PropertyItem(KEY_HYPERLINK, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink"),
"hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART}, "hyperlink", new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_PARA, PropertyMode.REPORT_FLOAT, PropertyMode.POLY, PropertyMode.POLY_CHART},
new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT}); new PropertyMode[]{PropertyMode.REPORT, PropertyMode.REPORT_FLOAT, PropertyMode.FORM_REPORT, PropertyMode.POLY_REPORT});
// 组件库 // 组件库

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

@ -57,7 +57,7 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane {
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
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("FR-Designer_Foreground"), UILabel.LEFT), foregroundColorPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Foreground"), UILabel.LEFT), foregroundColorPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"), UILabel.LEFT), backgroundColorPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background"), UILabel.LEFT), backgroundColorPane},
}; };
double[] rowSize = {p, p, p}; double[] rowSize = {p, p, p};

6
designer-base/src/main/java/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@ -60,7 +60,7 @@ public class DesignerLogHandler {
public DesignerLogHandler() { public DesignerLogHandler() {
logHandlerArea = new LogHandlerArea(); logHandlerArea = new LogHandlerArea();
caption = new LogHandlerBar(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Log")); caption = new LogHandlerBar(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log"));
caption.addClearListener(new ActionListener() { caption.addClearListener(new ActionListener() {
@ -153,7 +153,7 @@ public class DesignerLogHandler {
selectAll.setIcon(BaseUtils.readIcon("/com/fr/design/images/log/selectedall.png")); selectAll.setIcon(BaseUtils.readIcon("/com/fr/design/images/log/selectedall.png"));
popup.add(selectAll); popup.add(selectAll);
copy = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Copy")); copy = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy"));
copy.addActionListener(popupListener); copy.addActionListener(popupListener);
copy.setIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png")); copy.setIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
popup.add(copy); popup.add(copy);
@ -263,7 +263,7 @@ public class DesignerLogHandler {
private String appendLocaleMark(String str, int style) { private String appendLocaleMark(String str, int style) {
if (style == ERROR_INT) { if (style == ERROR_INT) {
str = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alert") + ":" + str + "\n"; str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + ":" + str + "\n";
} else if (style == WARN_INT) { } else if (style == WARN_INT) {
str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":" + str + "\n"; str = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + ":" + str + "\n";
} else { } else {

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

@ -496,7 +496,7 @@ public abstract class ToolBarMenuDock {
} }
public MenuDef createHelpMenuDef() { public MenuDef createHelpMenuDef() {
MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Help"), 'H'); MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Help"), 'H');
ShortCut[] otherHelpShortCuts = createHelpShortCuts(); ShortCut[] otherHelpShortCuts = createHelpShortCuts();
for (ShortCut shortCut : otherHelpShortCuts) { for (ShortCut shortCut : otherHelpShortCuts) {
menuDef.addShortCut(shortCut); menuDef.addShortCut(shortCut);

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

@ -64,7 +64,7 @@ public class KeySetUtils {
@Override @Override
public String getMenuName() { public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Close"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Close");
} }
@Override @Override
@ -149,7 +149,7 @@ public class KeySetUtils {
@Override @Override
public String getMenuName() { public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Export"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Export");
} }
@Override @Override
@ -708,7 +708,7 @@ public class KeySetUtils {
@Override @Override
public String getMenuName() { public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Expand"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Expand");
} }
@Override @Override

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

@ -78,7 +78,7 @@ public class DatabaseDictPane extends FurtherBasicBeanPane<DatabaseDictionary> i
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("Fine-Design_Basic_Actual_Value"), UILabel.LEFT), keyColumnPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), UILabel.LEFT), keyColumnPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value"), UILabel.LEFT), valueDictPane} new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value"), UILabel.LEFT), valueDictPane}
}; };
JPanel dbDictPanel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, GAP_HUGER, LayoutConstants.VGAP_LARGE); JPanel dbDictPanel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, GAP_HUGER, LayoutConstants.VGAP_LARGE);
this.setLayout(new BorderLayout(0, 4)); this.setLayout(new BorderLayout(0, 4));

4
designer-base/src/main/java/com/fr/design/present/dict/FormulaDictPane.java

@ -64,7 +64,7 @@ public class FormulaDictPane extends FurtherBasicBeanPane<FormulaDictionary> {
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), UILabel.LEFT), keyFormulaContainer}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), UILabel.LEFT), keyFormulaContainer},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value"), UILabel.LEFT), valueFormulaContainer}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value"), UILabel.LEFT), valueFormulaContainer},
new Component[]{tag, null} new Component[]{tag, null}
}; };
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_LARGE); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_LARGE);
@ -81,7 +81,7 @@ public class FormulaDictPane extends FurtherBasicBeanPane<FormulaDictionary> {
@Override @Override
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula");
} }
@Override @Override

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

@ -109,7 +109,7 @@ public class TableDataDictPane extends FurtherBasicBeanPane<TableDataDictionary>
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Table_Data") + " ", UILabel.LEFT), firstLine}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Table_Data") + " ", UILabel.LEFT), firstLine},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + " ", UILabel.LEFT), keyColumnPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + " ", UILabel.LEFT), keyColumnPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Display_Value") + " ", UILabel.LEFT), valueDictPane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value") + " ", UILabel.LEFT), valueDictPane},
}; };
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, VGAP, LayoutConstants.VGAP_MEDIUM); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, VGAP, LayoutConstants.VGAP_MEDIUM);

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

@ -70,7 +70,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
selectFilePane.setBorder(BorderFactory.createEmptyBorder(8, 2, 4, 0)); selectFilePane.setBorder(BorderFactory.createEmptyBorder(8, 2, 4, 0));
UIButton selectPictureButton = new UIButton( UIButton selectPictureButton = new UIButton(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image_Select")); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Select"));
selectFilePane.add(selectPictureButton, BorderLayout.NORTH); selectFilePane.add(selectPictureButton, BorderLayout.NORTH);
selectPictureButton.setMnemonic('S'); selectPictureButton.setMnemonic('S');
selectPictureButton.addActionListener(selectPictureActionListener); selectPictureButton.addActionListener(selectPictureActionListener);

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

@ -49,7 +49,7 @@ public class ImageButtonBackgroundPane extends ImageBackgroundPane {
} }
private void initButton() { private void initButton() {
chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image_Select")); chooseButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Select"));
chooseButton.addActionListener(selectPictureActionListener); chooseButton.addActionListener(selectPictureActionListener);
clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Clear")); clearButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Clear"));
clearButton.addActionListener(new ActionListener() { clearButton.addActionListener(new ActionListener() {

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

@ -53,7 +53,7 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5)); this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
if (isSupportTransparent) { if (isSupportTransparent) {
UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChartF-Transparency")); UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency"));
this.add(transpanrentButton, BorderLayout.NORTH); this.add(transpanrentButton, BorderLayout.NORTH);
transpanrentButton.addActionListener(new ActionListener() { transpanrentButton.addActionListener(new ActionListener() {

3
designer-base/src/main/java/com/fr/design/style/color/CustomChooserPanel.java

@ -22,7 +22,6 @@ import javax.swing.text.BadLocationException;
import javax.swing.text.Document; import javax.swing.text.Document;
import com.fr.design.gui.ibutton.SpecialUIButton; import com.fr.design.gui.ibutton.SpecialUIButton;
import com.fr.design.gui.ibutton.UIButton;
import com.fr.design.gui.ibutton.UIRadioButton; import com.fr.design.gui.ibutton.UIRadioButton;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.islider.UISlider; import com.fr.design.gui.islider.UISlider;
@ -492,7 +491,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec
* @return The name displayed in the JColorChooser tab. * @return The name displayed in the JColorChooser tab.
*/ */
public String getDisplayName() { public String getDisplayName() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom");
} }
/** /**

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

@ -57,7 +57,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5)); this.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5));
if (isSupportTransparent) { if (isSupportTransparent) {
UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_ChartF-Transparency")); UIButton transpanrentButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ChartF_Transparency"));
this.add(transpanrentButton, BorderLayout.NORTH); this.add(transpanrentButton, BorderLayout.NORTH);
transpanrentButton.addActionListener(new ActionListener() { transpanrentButton.addActionListener(new ActionListener() {

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

@ -68,7 +68,7 @@ public class CustomIconPane extends BasicPane {
private void initComponents() { private void initComponents() {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon"))); centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")));
JPanel noNamePane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); JPanel noNamePane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane();
centerPane.add(noNamePane, BorderLayout.CENTER); centerPane.add(noNamePane, BorderLayout.CENTER);
@ -126,7 +126,7 @@ public class CustomIconPane extends BasicPane {
} }
private void initAddButton(JPanel buttonPane) { private void initAddButton(JPanel buttonPane) {
UIButton addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Add")); UIButton addButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
addButton.setPreferredSize(new Dimension(80, 25)); addButton.setPreferredSize(new Dimension(80, 25));
addButton.addActionListener(new ActionListener() { addButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -422,7 +422,7 @@ public class CustomIconPane extends BasicPane {
showImageLabel.setPreferredSize(new Dimension(20,20)); showImageLabel.setPreferredSize(new Dimension(20,20));
imagePane.add(showImageLabel); imagePane.add(showImageLabel);
imagePane.add(browseButton); imagePane.add(browseButton);
Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name") + ":"), nameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon") + ":"), imagePane}}; Component[][] components = {{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name") + ":"), nameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon") + ":"), imagePane}};
JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); JPanel centerPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
this.add(centerPane, BorderLayout.CENTER); this.add(centerPane, BorderLayout.CENTER);

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

@ -53,7 +53,7 @@ public class IconDefinePane extends BasicPane {
} }
}); });
removeIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Delete")); removeIconButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"));
iconButtonPane.add(removeIconButton); iconButtonPane.add(removeIconButton);
removeIconButton.addActionListener(new ActionListener() { removeIconButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) { public void actionPerformed(ActionEvent arg0) {

6
designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java

@ -43,10 +43,10 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
iconPane = new AccessibleIconEditor(); iconPane = new AccessibleIconEditor();
labelPane.add(iconPane); labelPane.add(iconPane);
Component[][] n_components = { Component[][] n_components = {
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Type")), createButtonTypeComboBox()}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type")), createButtonTypeComboBox()},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Name")), buttonNameTextField = new UITextField()}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Name")), buttonNameTextField = new UITextField()},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Icon")), iconPane}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Icon")), iconPane},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Hotkeys")), hotkeysTextField = new UITextField()}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")), hotkeysTextField = new UITextField()},
}; };
hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ",")); hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ","));
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
@ -56,7 +56,7 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
if(comp != null ) { if(comp != null ) {
advancePane.add(comp,BorderLayout.CENTER); advancePane.add(comp,BorderLayout.CENTER);
} }
UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Advanced"), 280, 20, advancePane); UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Advanced"), 280, 20, advancePane);
this.add(uiExpandablePane); this.add(uiExpandablePane);
} }

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

@ -34,7 +34,7 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
UILabel headLabel = createUILable(); UILabel headLabel = createUILable();
initBackgroundEditor(); initBackgroundEditor();
String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")}; String [] titles = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom")};
double f = TableLayout.FILL; double f = TableLayout.FILL;
final double p = TableLayout.PREFERRED; final double p = TableLayout.PREFERRED;
@ -42,8 +42,8 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
double[] columnSize = {p, f}; double[] columnSize = {p, f};
int[][] rowCount = {{1, 1},{1, 1},{1, 1}}; int[][] rowCount = {{1, 1},{1, 1},{1, 1}};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")), initialBackgroundEditor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial")), initialBackgroundEditor},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Over")), overBackgroundEditor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over")), overBackgroundEditor},
new Component[]{getClickLabel(), clickBackgroundEditor}, new Component[]{getClickLabel(), clickBackgroundEditor},
}; };
panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
@ -64,7 +64,7 @@ public abstract class BackgroundCompPane<T extends Widget> extends BasicPane {
} }
protected UILabel getClickLabel(){ protected UILabel getClickLabel(){
return new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Click")); return new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Click"));
} }
protected UILabel createUILable(){ protected UILabel createUILable(){

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

@ -35,7 +35,7 @@ public class CheckBoxDictPane extends JPanel {
endComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays); endComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays);
endComboBox.setEditable(true); endComboBox.setEditable(true);
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")), delimiterComboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")), delimiterComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")),startComboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")),startComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")),endComboBox} new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")),endComboBox}
}; };

2
designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@ -423,7 +423,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
}; };
bPane.setLayout(FRGUIPaneFactory.createBorderLayout()); bPane.setLayout(FRGUIPaneFactory.createBorderLayout());
final CheckBoxList list = new CheckBoxList(currentColumnNames(), CheckBoxList.SelectedState.ALL, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Chart_Field_Name")) { final CheckBoxList list = new CheckBoxList(currentColumnNames(), CheckBoxList.SelectedState.ALL, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Chart_Field_Name")) {
public String value2Text(Object value) { public String value2Text(Object value) {
if (value instanceof ColumnName) { if (value instanceof ColumnName) {
return ((ColumnName)value).name; return ((ColumnName)value).name;

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

@ -96,7 +96,7 @@ public class DataLabelPane extends TooltipContentsPane {
} }
delimiterBox.setPreferredSize(new Dimension(70, 20)); delimiterBox.setPreferredSize(new Dimension(70, 20));
JPanel boxPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); JPanel boxPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
boxPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter") + ":")); boxPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter") + ":"));
boxPane.add(delimiterBox); boxPane.add(delimiterBox);
return boxPane; return boxPane;
} }

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

@ -73,7 +73,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title") + ":", SwingConstants.RIGHT), titleField}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title") + ":", SwingConstants.RIGHT), titleField},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Width") + ":", SwingConstants.RIGHT), widthField}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Width") + ":", SwingConstants.RIGHT), widthField},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Height") + ":", SwingConstants.RIGHT), heightField}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height") + ":", SwingConstants.RIGHT), heightField},
}; };
widthField.setText(String.valueOf(DEFAULT_V_VALUE)); widthField.setText(String.valueOf(DEFAULT_V_VALUE));

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

@ -35,7 +35,7 @@ public class ChartDesignerInteractivePane extends ChartInteractivePane {
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"), list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Hyperlink_Web_Link"),
new WebHyperlink(), getUseMap(map, WebHyperlink.class))); new WebHyperlink(), getUseMap(map, WebHyperlink.class)));
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "FR-Designer_JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class))); list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, "Fine-Design_Report_JavaScript", new JavaScriptImpl(), getUseMap(map, JavaScriptImpl.class)));
list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive-Chart"), null, null)); list.add(new ChartUIMenuNameableCreator(hyperLinkEditorMap, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Interactive-Chart"), null, null));
return list; return list;

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

@ -141,7 +141,7 @@ public class ChartFillStylePane extends BasicBeanPane<AttrFillStyle>{
Object key = keys.next(); Object key = keys.next();
nameArr.add(Utils.objectToString(key)); nameArr.add(Utils.objectToString(key));
} }
nameArr.add(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom")); nameArr.add(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Custom"));
return nameArr.toArray(new String[nameArr.size()]); return nameArr.toArray(new String[nameArr.size()]);
} }

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

@ -131,7 +131,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {
jp.add(customRadioButton); jp.add(customRadioButton);
selectPictureButton = new UIButton( selectPictureButton = new UIButton(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image_Select")); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Select"));
selectPictureButton.addActionListener(getSelectPictureActionListener()); selectPictureButton.addActionListener(getSelectPictureActionListener());
jp.add(selectPictureButton); jp.add(selectPictureButton);

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

@ -102,7 +102,7 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
* @return 返回标题字符串. * @return 返回标题字符串.
*/ */
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink");
} }
@Override @Override

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

@ -17,7 +17,7 @@ public class ChangeNameAction extends FormUndoableAction {
public ChangeNameAction(FormDesigner t) { public ChangeNameAction(FormDesigner t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Form-Change_Widget_Name")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Change_Widget_Name"));
this.setMnemonic('G'); this.setMnemonic('G');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
} }

16
designer-form/src/main/java/com/fr/design/designer/creator/XButton.java

@ -95,22 +95,22 @@ public class XButton extends XWidgetCreator {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Style")).setEditorClass(
ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Over")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Click")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Click")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont")) new CRPropertyDescriptor("font", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font"))
.setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue( .setEditorClass(FontEditor.class).setRendererClass(FontCellRenderer.class).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon")) new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon"))
.setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue( .setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("hotkeys", this.data.getClass()) new CRPropertyDescriptor("hotkeys", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Hotkeys")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
.setEditorClass(ShortCutTextEditor.class) .setEditorClass(ShortCutTextEditor.class)
@ -181,11 +181,11 @@ public class XButton extends XWidgetCreator {
checkButonType(); checkButonType();
} }
}), }),
new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon")) new CRPropertyDescriptor("iconName", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon"))
.setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue( .setEditorClass(IconEditor.class).setRendererClass(IconCellRenderer.class).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("hotkeys", this.data.getClass()).setI18NName( new CRPropertyDescriptor("hotkeys", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Hotkeys")) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
.setEditorClass(ShortCutTextEditor.class) .setEditorClass(ShortCutTextEditor.class)

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

@ -56,7 +56,7 @@ public class XCheckBoxGroup extends XFieldEditor {
if (((CheckBoxGroup) this.toData()).isReturnString()) { if (((CheckBoxGroup) this.toData()).isReturnString()) {
crp = (CRPropertyDescriptor[]) ArrayUtils.addAll(crp, new CRPropertyDescriptor[] { crp = (CRPropertyDescriptor[]) ArrayUtils.addAll(crp, new CRPropertyDescriptor[] {
new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName( new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName( new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName(

6
designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java

@ -26,16 +26,16 @@ public class XComboCheckBox extends XComboBox {
return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), !((ComboCheckBox) this.toData()) return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), !((ComboCheckBox) this.toData())
.isReturnString() ? new CRPropertyDescriptor[] { .isReturnString() ? new CRPropertyDescriptor[] {
new CRPropertyDescriptor("supportTag", this.data.getClass()).setI18NName( new CRPropertyDescriptor("supportTag", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Form-SupportTag")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Support_Tag")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
"Advanced"), "Advanced"),
new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
"Advanced"), "Advanced"),
new CRPropertyDescriptor("returnString", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("returnString", this.data.getClass()).setEditorClass(
InChangeBooleanEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")) InChangeBooleanEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") } : new CRPropertyDescriptor[] { .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") } : new CRPropertyDescriptor[] {
new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName( new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
"Advanced"), "Advanced"),
new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName( new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")).setEditorClass(InChangeBooleanEditor.class) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")).setEditorClass(InChangeBooleanEditor.class)

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

@ -1 +1 @@
package com.fr.design.designer.creator; import com.fr.design.form.util.XCreatorConstants; import com.fr.form.ui.WriteAbleRepeatEditor; import com.fr.stable.ArrayUtils; import java.awt.*; import java.beans.IntrospectionException; /** * Author : Shockway * Date: 13-9-22 * Time: 上午10:40 */ public abstract class XCustomWriteAbleRepeatEditor extends XWriteAbleRepeatEditor { public XCustomWriteAbleRepeatEditor(WriteAbleRepeatEditor widget, Dimension initSize) { super(widget, initSize); } public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { new CRPropertyDescriptor("customData", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_CustomData")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")}); } } package com.fr.design.designer.creator; import com.fr.design.form.util.XCreatorConstants; import com.fr.form.ui.WriteAbleRepeatEditor; import com.fr.stable.ArrayUtils; import java.awt.*; import java.beans.IntrospectionException; /** * Author : Shockway * Date: 13-9-22 * Time: 上午10:40 */ public abstract class XCustomWriteAbleRepeatEditor extends XWriteAbleRepeatEditor { public XCustomWriteAbleRepeatEditor(WriteAbleRepeatEditor widget, Dimension initSize) { super(widget, initSize); } public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), new CRPropertyDescriptor[] { new CRPropertyDescriptor("customData", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Custom_Data")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")}); } }

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

@ -25,7 +25,7 @@ public abstract class XDirectWriteEditor extends XFieldEditor {
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(), return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),
new CRPropertyDescriptor[] { new CRPropertyDescriptor("directEdit", this.data.getClass()) new CRPropertyDescriptor[] { new CRPropertyDescriptor("directEdit", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_Edit")).putKeyValue( .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit")).putKeyValue(
XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") }); XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") });
} }
} }

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

@ -102,7 +102,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class) new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class)
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-EC_toolbar")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Toolbar"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
}; };
CRPropertyDescriptor[] extraTableEditor = getExtraTableEditor(); CRPropertyDescriptor[] extraTableEditor = getExtraTableEditor();

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

@ -55,7 +55,7 @@ public class XPassword extends XWrapperedFieldEditor {
CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()) CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule"))
.setEditorClass(RegexEditor.RegexEditor4TextArea.class) .setEditorClass(RegexEditor.RegexEditor4TextArea.class)
.putKeyValue("renderer", RegexCellRencerer.class) .putKeyValue("renderer", RegexCellRencerer.class)
.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");

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

@ -40,7 +40,7 @@ public class XTextArea extends XFieldEditor {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass(
WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced")}, super.supportedDescriptor()); WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced")}, super.supportedDescriptor());
CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class) com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class)
.putKeyValue("renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); .putKeyValue("renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");

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

@ -43,7 +43,7 @@ public class XTextEditor extends XWrapperedFieldEditor {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass(
WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced"); WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced");
CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue(
"renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); "renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Verify_Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");

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

@ -52,13 +52,13 @@ public class XTreeComboBoxEditor extends XTreeEditor {
protected CRPropertyDescriptor[] addAllowEdit(CRPropertyDescriptor[] crp) throws IntrospectionException{ protected CRPropertyDescriptor[] addAllowEdit(CRPropertyDescriptor[] crp) throws IntrospectionException{
return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("directEdit", this.data.getClass()) return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("directEdit", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_Edit")).putKeyValue( .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit")).putKeyValue(
XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")); XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"));
} }
protected CRPropertyDescriptor[] addCustomData(CRPropertyDescriptor[] crp) throws IntrospectionException{ protected CRPropertyDescriptor[] addCustomData(CRPropertyDescriptor[] crp) throws IntrospectionException{
return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("customData", this.data.getClass()) return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("customData", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_CustomData")).putKeyValue( .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Custom_Data")).putKeyValue(
XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")); XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"));
} }

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

@ -172,7 +172,7 @@ public abstract class XWidgetCreator extends XCreator {
*/ */
public void ChangeCreatorName(FormDesigner designer, XCreator creator) { public void ChangeCreatorName(FormDesigner designer, XCreator creator) {
String oldName = creator.toData().getWidgetName(); String oldName = creator.toData().getWidgetName();
String value = JOptionPane.showInputDialog(designer, com.fr.design.i18n.Toolkit.i18nText("Form-Change_Widget_Name_Discription"), oldName); String value = JOptionPane.showInputDialog(designer, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Change_Widget_Name_Discription"), oldName);
if (value != null) { if (value != null) {
designer.renameCreator(creator, value); designer.renameCreator(creator, value);
} }

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

@ -26,7 +26,7 @@ public abstract class XWriteAbleRepeatEditor extends XDirectWriteEditor {
return (CRPropertyDescriptor[]) ArrayUtils.addAll( return (CRPropertyDescriptor[]) ArrayUtils.addAll(
super.supportedDescriptor(), super.supportedDescriptor(),
new CRPropertyDescriptor[]{ new CRPropertyDescriptor[]{
new CRPropertyDescriptor("removeRepeat", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-Remove_Repeat")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("removeRepeat", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Remove_Repeat")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
}); });
} }

6
designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java

@ -194,13 +194,13 @@ public class XWTabFitLayout extends XWFitLayout {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title_Style")).setEditorClass( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Title_Style")).setEditorClass(
ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), ButtonTypeEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("initialBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Initial")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Initial")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("overBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Over")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Over")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass( new CRPropertyDescriptor("clickBackground", this.data.getClass()).setEditorClass(
ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Click")).putKeyValue( ImgBackgroundEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Background_Click")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced") XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
}; };
return crPropertyDescriptors[i]; return crPropertyDescriptors[i];

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

@ -34,7 +34,7 @@ public class BoundsGroupModel implements ConstraintsGroupModel {
@Override @Override
public String getGroupName() { public String getGroupName() {
return com.fr.design.i18n.Toolkit.i18nText("Form-Component_Bounds"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Component_Bounds");
} }
@Override @Override

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

@ -30,7 +30,7 @@ public class FRFormLayoutPropertiesGroupModel implements GroupModel{
@Override @Override
public String getGroupName() { public String getGroupName() {
return com.fr.design.i18n.Toolkit.i18nText("Form-Component_Bounds"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Component_Bounds");
} }
@Override @Override

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

@ -34,7 +34,7 @@ public class MultiSelectionBoundsModel implements ConstraintsGroupModel {
@Override @Override
public String getGroupName() { public String getGroupName() {
return com.fr.design.i18n.Toolkit.i18nText("Form-Component_Bounds"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Component_Bounds");
} }
@Override @Override

4
designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java

@ -56,7 +56,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Vertical")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Vertical"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")), .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")),
new CRPropertyDescriptor("heightRestrict", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class) new CRPropertyDescriptor("heightRestrict", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class)
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-EC_heightrestrict")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Heightrestrict"))
.setRendererClass(BooleanRender.class) .setRendererClass(BooleanRender.class)
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit"))
}; };
@ -71,7 +71,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
protected CRPropertyDescriptor[] revealHeightLimit() throws IntrospectionException { protected CRPropertyDescriptor[] revealHeightLimit() throws IntrospectionException {
CRPropertyDescriptor heightLimitProperty = new CRPropertyDescriptor("heightPercent", this.xCreator.toData().getClass()) CRPropertyDescriptor heightLimitProperty = new CRPropertyDescriptor("heightPercent", this.xCreator.toData().getClass())
.setEditorClass(RefinedDoubleEditor.class) .setEditorClass(RefinedDoubleEditor.class)
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Form-EC_heightpercent")) .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Heightpercent"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
ArrayList<CRPropertyDescriptor> defaultList = (ArrayList<CRPropertyDescriptor>) createNonListenerProperties(); ArrayList<CRPropertyDescriptor> defaultList = (ArrayList<CRPropertyDescriptor>) createNonListenerProperties();
defaultList.add(heightLimitProperty); defaultList.add(heightLimitProperty);

2
designer-form/src/main/java/com/fr/design/form/parameter/RootDesignGroupModel.java

@ -1 +1 @@
/* * Copyright(c) 2001-2011, FineReport Inc, All Rights Reserved. */ package com.fr.design.form.parameter; import java.awt.Component; import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.creator.XWParameterLayout; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; /** * Created by IntelliJ IDEA. * User : Richer * Version: 6.5.5 * Date : 11-7-5 * Time : 下午2:56 */ public class RootDesignGroupModel implements ConstraintsGroupModel { private DefaultTableCellRenderer renderer; private PropertyCellEditor editor; private XWParameterLayout root; public RootDesignGroupModel(XWParameterLayout root) { this.root = root; renderer = new DefaultTableCellRenderer(); editor = new PropertyCellEditor(new IntegerPropertyEditor()); //初始值为参数面板的初始宽度 if (root.toData().getDesignWidth() == 0){ root.toData().setDesignWidth(root.getWidth()); } } @Override public String getGroupName() { return com.fr.design.i18n.Toolkit.i18nText("Form-Design_Size"); } @Override public int getRowCount() { return 1; } @Override public TableCellRenderer getRenderer(int row) { return renderer; } @Override public TableCellEditor getEditor(int row) { return editor; } @Override public Object getValue(int row, int column) { if (column == 0) { switch (row) { case 0: return com.fr.design.i18n.Toolkit.i18nText("Form-Desin_Width"); } } else { switch (row) { case 0: return root.toData().getDesignWidth(); } } return null; } @Override public boolean setValue(Object value, int row, int column) { if (column == 1) { int designerWidth = value == null ? 0 : ((Number) value).intValue(); switch (row) { case 0: if(isCompsOutOfDesignerWidth(designerWidth)){ return false; } root.toData().setDesignWidth(designerWidth); return true; default: return true; } } else { return false; } } private boolean isCompsOutOfDesignerWidth(int designerWidth){ for(int i=0; i<root.getComponentCount(); i++){ Component comp = root.getComponent(i); if(comp.getX() + comp.getWidth() > designerWidth){ return true; } } return false; } /** * 改行是否可编辑 * @param row 行号 * @return 第row行可编辑返回true,否则返回false */ public boolean isEditable(int row) { return true; } } /* * Copyright(c) 2001-2011, FineReport Inc, All Rights Reserved. */ package com.fr.design.form.parameter; import java.awt.Component; import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.creator.XWParameterLayout; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; /** * Created by IntelliJ IDEA. * User : Richer * Version: 6.5.5 * Date : 11-7-5 * Time : 下午2:56 */ public class RootDesignGroupModel implements ConstraintsGroupModel { private DefaultTableCellRenderer renderer; private PropertyCellEditor editor; private XWParameterLayout root; public RootDesignGroupModel(XWParameterLayout root) { this.root = root; renderer = new DefaultTableCellRenderer(); editor = new PropertyCellEditor(new IntegerPropertyEditor()); //初始值为参数面板的初始宽度 if (root.toData().getDesignWidth() == 0){ root.toData().setDesignWidth(root.getWidth()); } } @Override public String getGroupName() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Design_Size"); } @Override public int getRowCount() { return 1; } @Override public TableCellRenderer getRenderer(int row) { return renderer; } @Override public TableCellEditor getEditor(int row) { return editor; } @Override public Object getValue(int row, int column) { if (column == 0) { switch (row) { case 0: return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Desin_Width"); } } else { switch (row) { case 0: return root.toData().getDesignWidth(); } } return null; } @Override public boolean setValue(Object value, int row, int column) { if (column == 1) { int designerWidth = value == null ? 0 : ((Number) value).intValue(); switch (row) { case 0: if(isCompsOutOfDesignerWidth(designerWidth)){ return false; } root.toData().setDesignWidth(designerWidth); return true; default: return true; } } else { return false; } } private boolean isCompsOutOfDesignerWidth(int designerWidth){ for(int i=0; i<root.getComponentCount(); i++){ Component comp = root.getComponent(i); if(comp.getX() + comp.getWidth() > designerWidth){ return true; } } return false; } /** * 改行是否可编辑 * @param row 行号 * @return 第row行可编辑返回true,否则返回false */ public boolean isEditable(int row) { return true; } }

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

@ -274,7 +274,7 @@ public class FormEditToolBar extends BasicPane {
public class RemoveAction extends UpdateAction { public class RemoveAction extends UpdateAction {
public RemoveAction() { public RemoveAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Delete")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"));
this.setSmallIcon(IOUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); this.setSmallIcon(IOUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
} }

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

@ -66,7 +66,7 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree
@Override @Override
public String getViewTitle() { public String getViewTitle() {
return com.fr.design.i18n.Toolkit.i18nText("Form-Hierarchy_Tree"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Hierarchy_Tree");
} }
@Override @Override

4
designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java

@ -39,7 +39,7 @@ public class WLayoutSelectionPane extends BasicPane {
private KindPane currentKindPane; private KindPane currentKindPane;
public WLayoutSelectionPane() { public WLayoutSelectionPane() {
this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Form-Please_Select_A_Kind_Of_Form_Container") + ":")); this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Please_Select_A_Kind_Of_Form_Container") + ":"));
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
Component[][] coms = { Component[][] coms = {
@ -47,7 +47,7 @@ public class WLayoutSelectionPane extends BasicPane {
BorderLayoutPane()}, BorderLayoutPane()},
{createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Grid_Layout")), new GridLayoutPane()}, {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Grid_Layout")), new GridLayoutPane()},
{createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("CardLayout")), new CardLayoutPane()}, {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("CardLayout")), new CardLayoutPane()},
{createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Form-NullLayout")), new AbsoluteLayoutPane()}}; {createTypeLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Null_Layout")), new AbsoluteLayoutPane()}};
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double f = TableLayout.FILL; double f = TableLayout.FILL;
double[] rowSize = {p, p, p, p, p}; double[] rowSize = {p, p, p, p, p};

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

@ -52,7 +52,7 @@ public class WidgetHelpDialog extends UIDialog {
contentPane.setLayout(new BorderLayout()); contentPane.setLayout(new BorderLayout());
add(helpArea, BorderLayout.CENTER); add(helpArea, BorderLayout.CENTER);
this.applyClosingAction(); this.applyClosingAction();
this.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Help")); this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Help"));
} }
/** /**

6
designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java

@ -72,7 +72,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope
@Override @Override
public String getViewTitle() { public String getViewTitle() {
return com.fr.design.i18n.Toolkit.i18nText("Form-Widget_Property_Table"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Property_Table");
} }
@Override @Override
@ -219,13 +219,13 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope
private void initTabPane() { private void initTabPane() {
final String[] tabTitles = new String[]{ final String[] tabTitles = new String[]{
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Properties"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Properties"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal")
}; };
final CardLayout tabbedPane = new CardLayout(); final CardLayout tabbedPane = new CardLayout();
final JPanel center = new JPanel(tabbedPane); final JPanel center = new JPanel(tabbedPane);
center.add(formWidgetCardPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Properties")); center.add(formWidgetCardPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Properties"));
center.add(eventTable, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Event")); center.add(eventTable, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event"));
center.add(wsp, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal")); center.add(wsp, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Mobile_Terminal"));
this.add(center, BorderLayout.CENTER); this.add(center, BorderLayout.CENTER);

2
designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/ElementCaseToolBarWrapper.java

@ -29,6 +29,6 @@ public class ElementCaseToolBarWrapper implements Encoder, Decoder {
if (toolBarManager.length != 0) { if (toolBarManager.length != 0) {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open"); return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open");
} }
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Close"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Close");
} }
} }

2
designer-form/src/main/java/com/fr/design/mainframe/widget/wrappers/FormulaWrapper.java

@ -40,6 +40,6 @@ public class FormulaWrapper implements Encoder, Decoder{
if (txt.length() > 0 && txt.charAt(0) == '=') { if (txt.length() > 0 && txt.charAt(0) == '=') {
return; return;
} }
throw new ValidationException(com.fr.design.i18n.Toolkit.i18nText("Formula_Tips")); throw new ValidationException(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Formula_Tips"));
} }
} }

2
designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java

@ -73,7 +73,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
double[] columnSize = {p, f}; double[] columnSize = {p, f};
int[][] rowCount = {{1, 1}}; int[][] rowCount = {{1, 1}};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Desin_Width")), designerWidth}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Desin_Width")), designerWidth},
}; };
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java

@ -49,8 +49,8 @@ public abstract class ButtonDefinePane<T extends Button> extends AbstractDataMod
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
backgroundCompPane, backgroundCompPane,
frFont, frFont,
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Icon")), iconPane}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Icon")), iconPane},
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Hotkeys")), hotkeysTextField} {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")), hotkeysTextField}
}; };
hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ",")); hotkeysTextField.setToolTipText(StableUtils.join(ButtonConstants.HOTKEYS, ","));
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(n_components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);

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

@ -38,7 +38,7 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane<ComboCheckBox>
public JPanel createOtherPane(){ public JPanel createOtherPane(){
supportTagCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Form-SupportTag"), true); supportTagCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Support_Tag"), true);
supportTagCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); supportTagCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
checkBoxDictPane = new CheckBoxDictPane(); checkBoxDictPane = new CheckBoxDictPane();

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

@ -24,7 +24,7 @@ public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRe
public JPanel setValidatePane(){ public JPanel setValidatePane(){
this.customDataCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_CustomData"), false); this.customDataCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Custom_Data"), false);
this.customDataCheckBox.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); this.customDataCheckBox.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
JPanel otherContentPane = super.setValidatePane(); JPanel otherContentPane = super.setValidatePane();
otherContentPane.add(GUICoreUtils.createFlowPane(new JComponent[]{customDataCheckBox}, FlowLayout.LEFT, 0)); otherContentPane.add(GUICoreUtils.createFlowPane(new JComponent[]{customDataCheckBox}, FlowLayout.LEFT, 0));

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

@ -75,7 +75,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
} }
public JPanel setValidatePane(){ public JPanel setValidatePane(){
directWriteCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Form-Allow_Edit"), false); directWriteCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit"), false);
directWriteCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); directWriteCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
JPanel otherContentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); JPanel otherContentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
otherContentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); otherContentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));

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

@ -22,7 +22,7 @@ public abstract class WriteUnableRepeatEditorPane<E extends WriteUnableRepeatEdi
JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0)); contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
JPanel contenter=FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); JPanel contenter=FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Form-Remove_Repeat_Data"), false); removeRepeatCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Remove_Repeat_Data"), false);
contentPane.add(contenter); contentPane.add(contenter);
contenter.add(removeRepeatCheckBox); contenter.add(removeRepeatCheckBox);
JPanel otherContentPane = this.setThirdContentPane(); JPanel otherContentPane = this.setThirdContentPane();

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

@ -44,7 +44,7 @@ public abstract class ButtonGroupDefinePane<T extends ButtonGroup> extends Field
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
new Component[]{widgetValueLabel, formWidgetValuePane}, new Component[]{widgetValueLabel, formWidgetValuePane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")), dictionaryEditor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DS-Dictionary")), dictionaryEditor},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont")), fontSizePane}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FR_Font")), fontSizePane},
new Component[]{buttonGroupDictPane, null} new Component[]{buttonGroupDictPane, null}
}; };
double[] rowSize = {p, p, p, p, p, p, p}; double[] rowSize = {p, p, p, p, p, p, p};

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

@ -62,7 +62,7 @@ public class PaddingBoundPane extends BasicPane{
}; };
Component[][] components2 = new Component[][]{ Component[][] components2 = new Component[][]{
new Component[]{left, right}, new Component[]{left, right},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Left"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Right"), SwingConstants.CENTER)} new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Right"), SwingConstants.CENTER)}
}; };
JPanel northPanel = TableLayoutHelper.createGapTableLayoutPane(components1, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6); JPanel northPanel = TableLayoutHelper.createGapTableLayoutPane(components1, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L6);
northPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, IntervalConstants.INTERVAL_L1, 0)); northPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, IntervalConstants.INTERVAL_L1, 0));

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

@ -36,7 +36,7 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
elementCaseToolBarEditor = new AccessibleElementCaseToolBarEditor(); elementCaseToolBarEditor = new AccessibleElementCaseToolBarEditor();
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{paddingBoundPane, null}, new Component[]{paddingBoundPane, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-EC_toolbar")), elementCaseToolBarEditor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Toolbar")), elementCaseToolBarEditor},
}; };
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0)); panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@ -101,8 +101,8 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Full_Screen")); allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Full_Screen"));
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Design_Form_Zoom_In_Logic"), SwingConstants.LEFT), new UILabel(ChartMobileFitAttrState.PROPORTION.description())}, new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Zoom_In_Logic"), SwingConstants.LEFT), new UILabel(ChartMobileFitAttrState.PROPORTION.description())},
new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Design_Form_Zoom_Out_Logic"), SwingConstants.LEFT), zoomOutComboBox}, new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Zoom_Out_Logic"), SwingConstants.LEFT), zoomOutComboBox},
new Component[] {tipLabel, null}, new Component[] {tipLabel, null},
new Component[] {allowFullCheckBox} new Component[] {allowFullCheckBox}
}; };

4
designer-realize/src/main/java/com/fr/design/cell/editor/RichTextToolBar.java

@ -182,13 +182,13 @@ public class RichTextToolBar extends BasicPane{
} }
private void setToolTips() { private void setToolTips() {
colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Foreground")); colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Foreground"));
italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Italic")); italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Italic"));
bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bold")); bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bold"));
underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Underline")); underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Underline"));
superPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Super_Script")); superPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Super_Script"));
subPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Script")); subPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Script"));
formulaPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Formula")); formulaPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula"));
} }
/** /**

4
designer-realize/src/main/java/com/fr/design/condition/BorderHighlightPane.java

@ -47,14 +47,14 @@ public class BorderHighlightPane extends ConditionAttrSingleConditionPane<Highli
} }
}); });
UILabel borderLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Border") + ":"); UILabel borderLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border") + ":");
this.add(borderLabel); this.add(borderLabel);
this.add(borderButton); this.add(borderButton);
} }
@Override @Override
public String nameForPopupMenuItem() { public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Border"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Border");
} }

4
designer-realize/src/main/java/com/fr/design/condition/ForeGroundPane.java

@ -22,7 +22,7 @@ public class ForeGroundPane extends ConditionAttrSingleConditionPane<HighlightAc
public ForeGroundPane(ConditionAttributesPane conditionAttributesPane) { public ForeGroundPane(ConditionAttributesPane conditionAttributesPane) {
super(conditionAttributesPane); super(conditionAttributesPane);
foregroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Foreground") + ":"); foregroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Foreground") + ":");
this.foregroundColorPane = new ColorSelectBox(80); this.foregroundColorPane = new ColorSelectBox(80);
this.add(foregroundLabel); this.add(foregroundLabel);
this.add(this.foregroundColorPane); this.add(this.foregroundColorPane);
@ -36,7 +36,7 @@ public class ForeGroundPane extends ConditionAttrSingleConditionPane<HighlightAc
@Override @Override
public String nameForPopupMenuItem() { public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Foreground"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Foreground");
} }
@Override @Override

2
designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java

@ -65,7 +65,7 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane<HighlightAct
@Override @Override
public String nameForPopupMenuItem() { public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Hyperlink"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Hyperlink");
} }
@Override @Override

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

@ -74,9 +74,9 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_File"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_List"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_List"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Iframe"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Iframe"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree-ComboBox"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree-ComboBox"),
com.fr.design.i18n.Toolkit.i18nText("Form-View_Tree") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree")
}; };
box = new UIComboBox(editorTypes); box = new UIComboBox(editorTypes);
this.add(box); this.add(box);
@ -120,7 +120,7 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
} else if (value instanceof NumberEditor) { } else if (value instanceof NumberEditor) {
box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Number")); box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Number"));
} else if (value instanceof IframeEditor) { } else if (value instanceof IframeEditor) {
box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Iframe")); box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Iframe"));
} else if (value instanceof FreeButton) { } else if (value instanceof FreeButton) {
box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Button")); box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Button"));
} else if (value instanceof DateEditor) { } else if (value instanceof DateEditor) {
@ -138,7 +138,7 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
} else if (value instanceof TreeComboBoxEditor) { } else if (value instanceof TreeComboBoxEditor) {
box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree-ComboBox")); box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree-ComboBox"));
} else if (value instanceof TreeEditor) { } else if (value instanceof TreeEditor) {
box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Form-View_Tree")); box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree"));
} else if (value instanceof Password) { } else if (value instanceof Password) {
box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Password")); box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Password"));
} else if (value instanceof TextArea) { } else if (value instanceof TextArea) {

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

Loading…
Cancel
Save