fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

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

final/10.0
Harrison 6 years ago
parent
4060b26396
commit
6a0bfcad01
59 changed files with 118 additions and 126 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  2. 2
      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. 2
      designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
  5. 4
      designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java
  6. 2
      designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java
  7. 2
      designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java
  8. 12
      designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java
  9. 2
      designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java
  10. 2
      designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java
  11. 4
      designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java
  12. 6
      designer-base/src/main/java/com/fr/design/mainframe/AuthorityEditPane.java
  13. 2
      designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java
  14. 5
      designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java
  15. 4
      designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
  16. 5
      designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java
  17. 4
      designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
  18. 2
      designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java
  19. 2
      designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
  20. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
  21. 2
      designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java
  22. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
  23. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartTitlePane.java
  24. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java
  25. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java
  26. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java
  27. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java
  28. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java
  29. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java
  30. 18
      designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java
  31. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java
  32. 4
      designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java
  33. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java
  34. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java
  35. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java
  36. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
  37. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java
  38. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java
  39. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java
  40. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java
  41. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/TreeComboBoxEditorDefinePane.java
  42. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java
  43. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
  44. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
  45. 10
      designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java
  46. 4
      designer-realize/src/main/java/com/fr/design/condition/FontPane.java
  47. 2
      designer-realize/src/main/java/com/fr/design/condition/PaddingPane.java
  48. 18
      designer-realize/src/main/java/com/fr/design/condition/WHPane.java
  49. 12
      designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java
  50. 4
      designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java
  51. 2
      designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
  52. 4
      designer-realize/src/main/java/com/fr/design/mainframe/SheetAuthorityEditPane.java
  53. 6
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java
  54. 2
      designer-realize/src/main/java/com/fr/design/present/BarCodePane.java
  55. 23
      designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java
  56. 2
      designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java
  57. 3
      designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxDefinePane.java
  58. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/FieldEditorDefinePane.java
  59. 4
      designer-realize/src/main/java/com/fr/design/widget/ui/WaterMarkDictPane.java

10
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
Unescape View File

@ -375,7 +375,7 @@ public class PreferencePane extends BasicPane {
dlg.setVisible(true);
}
});
UILabel noticeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer"));//sail:提示重启后生效
UILabel noticeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));//sail:提示重启后生效
double p = TableLayout.PREFERRED;
double rowSize[] = {p};
double columnSize[] = {p, p, p};
@ -422,10 +422,10 @@ public class PreferencePane extends BasicPane {
// 长度单位选择
JPanel lengthPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Setting_Ruler_Units"));
advancePane.add(lengthPane);
pageLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_INCH")});
pageLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH")});
pageLengthComboBox.setPreferredSize(new Dimension(80, 20));
pageLengthComboBox.setMinimumSize(new Dimension(80, 20));
reportLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_INCH"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_PT")});
reportLengthComboBox = new UIComboBox(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_MM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_PT_Duplicate")});
reportLengthComboBox.setPreferredSize(new Dimension(80, 20));
reportLengthComboBox.setMinimumSize(new Dimension(80, 20));
UILabel pagelengthLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Page_Setup_Scale_Units") + ":");
@ -447,7 +447,7 @@ public class PreferencePane extends BasicPane {
portEditor = new IntegerEditor();
portEditor.setPreferredSize(new Dimension(80, 20));
portEditor.setMinimumSize(new Dimension(80, 20));
UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer"));
UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));
UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Web_Preview_Port") + ":");
Component[][] portComponents = {
{serverPortLabel, portEditor, notiJlabel},
@ -483,7 +483,7 @@ public class PreferencePane extends BasicPane {
}
});
panel.setPreferredSize(new Dimension(300, 20));
UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer"));
UILabel notiJlabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"));
UILabel serverPortLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preference_JDK_Home") + ":");
Component[][] portComponents = {
{serverPortLabel, panel, notiJlabel},

2
designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
Unescape View File

@ -92,7 +92,7 @@ public class AlphaFineConfigPane extends BasicPane {
isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set"));
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"));
isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates"));
isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_ReportTemplates"));
isContainFileContentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Templates_Content"));
JPanel searchConfigPane = TableLayoutHelper.createTableLayoutPane(initSearchRangeComponents(), rowSize, columnSize);
northPane.add(searchConfigPane);

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

@ -492,7 +492,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
this.add(conditonTypePane, BorderLayout.NORTH);
conditonTypePane.setBorder(new ModLineBorder(ModLineBorder.BOTTOM));
UILabel conditionTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Type") + ":");
UILabel conditionTypeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Type") + ":");
conditonTypePane.add(conditionTypeLabel, BorderLayout.WEST);
conditionTypeLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, DOWN_PADDING, 0));

2
designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
Unescape View File

@ -210,7 +210,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
protected void initComponentsLayout(PreviewLabel previewLabel, int labelSize) {
UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database") + ":");
UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Model") + ":");
UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Table") + ":");
UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table") + ":");
if (labelSize > 0) {
Dimension pSize = new Dimension(labelSize, 25);

4
designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java
Unescape View File

@ -252,7 +252,7 @@ public class ValueEditorPaneFactory {
new DateEditor(true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date")),
new BooleanEditor(),
formulaEditor,
new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget"))
new WidgetNameEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget"))
};
}
@ -504,4 +504,4 @@ public class ValueEditorPaneFactory {
return pane;
}
}
}

2
designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java
Unescape View File

@ -133,7 +133,7 @@ public abstract class WidgetOption implements Serializable {
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);
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("Fine-Design_Report_Tree_ComboBox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree.png"),
TreeComboBoxEditor.class);
public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass(

2
designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java
Unescape View File

@ -73,7 +73,7 @@ public class RegFieldPane extends RegPane {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
initRegErrorMsgField();
UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Error_Tip"));
UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip"));
tipLabel.setPreferredSize(new Dimension(60, 20));
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{tipLabel, regErrorMsgField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM);
this.add(panel);

12
designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java
Unescape View File

@ -55,7 +55,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
private static final int VERGAP = 3;
private static final Dimension SPINNER_DIMENSION = new Dimension(75, 20);
private static final String[] TEXT = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Wrap_Text"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Single_Line"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Single_Line(Adjust_Font)"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Multi_Line(Adjust_Font)")};
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Single_Line(Adjust_Font)"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Multi_Line(Adjust_Font)")};
private static final String[] LAYOUT = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Titled"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Layout_Image_Adjust")};
@ -185,8 +185,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
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"));
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"));
rotationPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation"));
textRotationComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
rotationPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"));
leftIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Left_Indent"));
rightIndentSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Right_Indent"));
spaceBeforeSpinner.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Spacing_Before"));
@ -233,7 +233,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
new Component[]{null, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Alignment_Text_Style") + " ", SwingConstants.LEFT), textComboBox},
new Component[]{null, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation") + " ", SwingConstants.LEFT), textRotationComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation") + " ", SwingConstants.LEFT), textRotationComboBox},
new Component[]{null, rotationBarCC},
new Component[]{null, null},
};
@ -405,7 +405,7 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
private Style updateTextRotation(Style style) {
if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation"))) {
if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation"))) {
if (this.textRotationComboBox.getSelectedIndex() != 0) {
style = style.deriveVerticalText(Style.VERTICALTEXT);
style = style.deriveRotation(0);
@ -462,4 +462,4 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
*/
public void setGlobalName(String name) {
}
}
}

2
designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java
Unescape View File

@ -83,7 +83,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Sytle-FRFont");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sytle_FRFont");
}
/**

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

@ -197,7 +197,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
* @return 标题
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text");
}
/**

4
designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java
Unescape View File

@ -57,7 +57,7 @@ public abstract class AbstractHyperNorthPane<T extends Hyperlink> extends BasicB
heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE));
heightTextFiled.setPreferredSize(new Dimension(40, 20));
newWindowConfPane.add(heightTextFiled);
newWindowConfPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Width") + ": "));
newWindowConfPane.add(new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ": "));
widthTextFiled = new UINumberField();
widthTextFiled.setText(String.valueOf(DEFAULT_V_VALUE));
widthTextFiled.setPreferredSize(new Dimension(40, 20));
@ -142,4 +142,4 @@ public abstract class AbstractHyperNorthPane<T extends Hyperlink> extends BasicB
link.setWidth(Utils.objectToNumber(widthTextFiled.getText(), false).intValue());
}
}
}

6
designer-base/src/main/java/com/fr/design/mainframe/AuthorityEditPane.java
Unescape View File

@ -57,8 +57,8 @@ public abstract class AuthorityEditPane extends JPanel {
double[] columnSize = {p, f};
int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
Component[][] components = new Component[][]{
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Type") + " ", SwingConstants.LEFT), typePane},
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WF_Name") + " ", SwingConstants.LEFT), namePane},
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Type") + " ", SwingConstants.LEFT), typePane},
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WF_Name") + " ", SwingConstants.LEFT), namePane},
new Component[]{checkPane, null},
};
@ -82,4 +82,4 @@ public abstract class AuthorityEditPane extends JPanel {
public abstract JPanel populateCheckPane();
}
}

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

@ -79,7 +79,7 @@ public class TemplateStylePane extends BasicPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tab_Style_Template");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tab_Style_Template");
}
public void populate(TemplateStyle templateStyle) {

5
designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java
Unescape View File

@ -15,7 +15,6 @@ import com.fr.data.TableDataSource;
import com.fr.design.data.datapane.TableDataComboBox;
import com.fr.design.gui.icombobox.UIComboBoxRenderer;
import com.fr.design.gui.icombobox.LazyComboBox;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.editor.editor.Editor;
import com.fr.form.data.DataBinding;
@ -58,7 +57,7 @@ public class DataBindingEditor extends Editor<DataBinding> {
public DataBindingEditor() {
this.initCompontents();
this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Field"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Field"));
}
@ -148,4 +147,4 @@ public class DataBindingEditor extends Editor<DataBinding> {
public String getIconName() {
return "bind_ds_column";
}
}
}

4
designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
Unescape View File

@ -551,7 +551,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark");
}
@Override
@ -725,7 +725,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget-Settings");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Settings_Duplicate");
}
@Override

5
designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java
Unescape View File

@ -7,7 +7,6 @@ import com.fr.design.constants.LayoutConstants;
import com.fr.design.data.DataCreatorUI;
import com.fr.design.gui.frpane.UIComboBoxPane;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
@ -34,7 +33,7 @@ public class DictionaryPane extends UIComboBoxPane<Dictionary> implements DataCr
int[][] rowCount = {{1, 1}, {1, 1}};
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Type_Set"), UILabel.LEFT), jcb},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Set"), UILabel.LEFT), jcb},
new Component[]{null, null}
};
JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_HUGER, LayoutConstants.VGAP_MEDIUM);
@ -78,4 +77,4 @@ public class DictionaryPane extends UIComboBoxPane<Dictionary> implements DataCr
paneList.add(new FormulaDictPane());
return paneList;
}
}
}

4
designer-base/src/main/java/com/fr/design/report/WatermarkPane.java
Unescape View File

@ -168,6 +168,6 @@ public class WatermarkPane extends BasicPane {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark");
}
}
}

2
designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java
Unescape View File

@ -54,7 +54,7 @@ public class WidgetBoundsPaneFactory {
Component[][] northComponents = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Position")), createRightPane(x, y)},
new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_X_Coordinate"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Y_Coordinate"), SwingConstants.CENTER))},
new Component[]{null, createRightPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_X_Coordinate"), SwingConstants.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Y_Coordinate"), SwingConstants.CENTER))},
};
Component[][] centerComponents = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Size")), createRightPane(width, height)},

2
designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
Unescape View File

@ -98,7 +98,7 @@ public class NumberEditorValidatePane extends JPanel {
private void initErrorMsgPane() {
errorMsgTextField = new UITextField();
errorMsgTextFieldPane = TableLayoutHelper.createGapTableLayoutPane(
new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Error_Tip")), errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
new Component[][]{new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip")), errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
}

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

@ -72,7 +72,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
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("FR-Designer_Width") + ":", SwingConstants.RIGHT), widthField},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Designer_Width") + ":", SwingConstants.RIGHT), widthField},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Height") + ":", SwingConstants.RIGHT), heightField},
};

2
designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java
Unescape View File

@ -202,7 +202,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
dialog.dispose();
if (result) {
int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Work_After_Restart_Designer"), null, JOptionPane.YES_NO_OPTION);
int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Work_After_Restart_Designer"), null, JOptionPane.YES_NO_OPTION);
if (choose == JOptionPane.OK_OPTION) {
RestartHelper.restart();

4
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java
Unescape View File

@ -98,7 +98,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
}
protected String getLabelContentTitle () {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text");
}
protected JPanel getLabelContentPane(JPanel contentPane) {
@ -260,4 +260,4 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
attrTooltipContent.getSeriesFormat().setEnable(false);
}
}
}
}

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

@ -131,7 +131,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
useHtml = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Html"));
Component[][] components = new Component[][]{
new Component[]{null ,null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text"), SwingConstants.LEFT), titleContent},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text"), SwingConstants.LEFT), titleContent},
new Component[]{null ,useHtml},
};
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col);

2
designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java
Unescape View File

@ -69,7 +69,7 @@ public class XDateEditor extends XDirectWriteEditor {
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_End_Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
"Advanced").setEditorClass(DateRangeEditor.class),
new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
"Advanced"),
new CRPropertyDescriptor("returnDate", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Return_Date")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,

2
designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java
Unescape View File

@ -69,7 +69,7 @@ public class XLabel extends XWidgetCreator {
}
}),
new CRPropertyDescriptor("wrap", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment-Wrap_Text")).putKeyValue(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Wrap_Text")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("verticalCenter", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Page_Setup_Vertically")).putKeyValue(

2
designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java
Unescape View File

@ -70,7 +70,7 @@ public class XNumberEditor extends XWrapperedFieldEditor {
.setEditorClass(SpinnerMaxNumberEditor.class)
.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"),
new CRPropertyDescriptor("waterMark", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark"))
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
new CRPropertyDescriptor("regErrorMessage", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message"))

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

@ -60,7 +60,7 @@ public class XPassword extends XWrapperedFieldEditor {
.putKeyValue("renderer", RegexCellRencerer.class)
.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate");
CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass())
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark"))
.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark"))
.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Fine-Design_Report_Advanced");
boolean displayRegField = true;
displayRegField = isDisplayRegField(displayRegField);

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

@ -45,7 +45,7 @@ public class XTextArea extends XFieldEditor {
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");
CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
"Fine-Design_Report_Advanced");
boolean displayRegField = true;
displayRegField = isDisplayRegField(displayRegField);

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

@ -48,7 +48,7 @@ public class XTextEditor extends XWrapperedFieldEditor {
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");
CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
"Fine-Design_Report_Advanced");
CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[]{widgetValue}, super.supportedDescriptor());
boolean displayRegField = true;

18
designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java
Unescape View File

@ -3,20 +3,18 @@
*/
package com.fr.design.designer.creator;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.beans.IntrospectionException;
import javax.swing.JComponent;
import com.fr.design.form.util.XCreatorConstants;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.form.ui.TreeComboBoxEditor;
import com.fr.stable.ArrayUtils;
import javax.swing.JComponent;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.beans.IntrospectionException;
/**
* @author richer
* @since 6.5.3
@ -46,7 +44,7 @@ public class XTreeComboBoxEditor extends XTreeEditor {
protected CRPropertyDescriptor[] addWaterMark(CRPropertyDescriptor[] crp) throws IntrospectionException {
return (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")).putKeyValue(
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")).putKeyValue(
XCreatorConstants.PROPERTY_CATEGORY, "Advanced"));
}
@ -110,4 +108,4 @@ public class XTreeComboBoxEditor extends XTreeEditor {
return true;
}
}
}

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

@ -27,7 +27,7 @@ public abstract class XWriteAbleRepeatEditor extends XDirectWriteEditor {
super.supportedDescriptor(),
new CRPropertyDescriptor[]{
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("Fine-Design_Form_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
});
}
}

4
designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java
Unescape View File

@ -57,9 +57,9 @@ public class BoundsGroupModel implements ConstraintsGroupModel {
if (column == 0) {
switch (row) {
case 0:
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_X_Coordinate");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_X_Coordinate");
case 1:
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Y_Coordinate");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Y_Coordinate");
case 2:
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Width");
default:

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java
Unescape View File

@ -41,7 +41,7 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
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("FR-Designer_Text")), text },
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text")), text },
new Component[]{widgetValueLabel, formWidgetValuePane },
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane},
};

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java
Unescape View File

@ -27,7 +27,7 @@ public class ComboBoxDefinePane extends DictEditorDefinePane<ComboBox> {
public Component[] createWaterMarkPane() {
waterMarkField = new UITextField();
return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), waterMarkField};
return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkField};
}
protected void populateSubDictionaryEditorBean(ComboBox ob){

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

@ -33,7 +33,7 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane<ComboCheckBox>
public Component[] createWaterMarkPane() {
waterMarkDictPane = new UITextField();
return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), waterMarkDictPane};
return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkDictPane};
}

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

@ -74,7 +74,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
new Component[]{formatLabel, formatHead},
new Component[]{startDateLabel, startDv},
new Component[]{endDateLabel, endDv},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), waterMarkDictPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkDictPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Date_Selector_Return_Type")), returnTypeComboBox}

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java
Unescape View File

@ -109,7 +109,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
protected void addValidatePane() {
initErrorMsgPane();
validatePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
final UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Error_Tip"));
final UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip"));
JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
final JPanel errorTipPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{uiLabel, errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
errorTipPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java
Unescape View File

@ -47,7 +47,7 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
isPageSetupVertically = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Page_Setup_Vertically"));
isPageSetupVertically.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
isStyleAlignmentWrapText = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment-Wrap_Text"));
isStyleAlignmentWrapText = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Wrap_Text"));
isStyleAlignmentWrapText.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
Icon[] hAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"),
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"),

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java
Unescape View File

@ -46,7 +46,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
new Component[]{widgetValueLabel, formWidgetValuePane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), waterMarkDictPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkDictPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane}
};
double[] rowSize = {p, p, p, p, p, p};

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java
Unescape View File

@ -66,7 +66,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
new Component[]{widgetValueLabel, formWidgetValuePane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark"), SwingConstants.LEFT), waterMarkDictPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark"), SwingConstants.LEFT), waterMarkDictPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size"), SwingConstants.LEFT), fontSizePane}
};
double[] rowSize = {p, p, p, p, p, p};

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/TreeComboBoxEditorDefinePane.java
Unescape View File

@ -19,7 +19,7 @@ public class TreeComboBoxEditorDefinePane extends TreeEditorDefinePane {
public Component[] createWaterMarkPane(){
waterMarkDictPane = new UITextField();
return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), waterMarkDictPane};
return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkDictPane};
}
@Override
@ -44,4 +44,4 @@ public class TreeComboBoxEditorDefinePane extends TreeEditorDefinePane {
public DataCreatorUI dataUI() {
return null;
}
}
}

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java
Unescape View File

@ -48,7 +48,7 @@ public class FormWidgetValuePane extends JPanel {
index = 0;
widgetValueHead.setSelectedIndex(index);
}
if (ComparatorUtils.equals(editor[index].getName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Field"))) {
if (ComparatorUtils.equals(editor[index].getName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Field"))) {
customPane.setPreferredSize(new Dimension(100, 47));
} else {
customPane.setPreferredSize(new Dimension(100, 20));

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
Unescape View File

@ -64,7 +64,7 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(
new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")), borderStyleEditor},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), watermarkEditor}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), watermarkEditor}
}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
Unescape View File

@ -82,7 +82,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane(
new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style")), stylePane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), watermarkEditor}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), watermarkEditor}
}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1);
jp2.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
jPanel.add(paddingBound, BorderLayout.CENTER);

10
designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java
Unescape View File

@ -80,14 +80,14 @@ public class WCardTagLayoutDefinePane extends AbstractDataModify<WCardTagLayout>
return true;
}
};
displayPositionGroup.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tab_Style_Template"));
displayPositionGroup.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tab_Style_Template"));
textDirectionGroup = new UIButtonGroup(WTabTextDirection.getStringArray());
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tab_Style_Template")), templateStyleEditor},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tab_Display_Position")), displayPositionGroup},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tab_Style_Template")), templateStyleEditor},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tab_Display_Position")), displayPositionGroup},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background")), backgroundEditor},
new Component[]{fontLabel, frFontPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_StyleAlignment_Text_Rotation")), textDirectionGroup}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Text_Rotation")), textDirectionGroup}
};
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
@ -128,7 +128,7 @@ public class WCardTagLayoutDefinePane extends AbstractDataModify<WCardTagLayout>
layoutBorderStyle.getTitle().setFrFont(frFontPane.update(frFont));
WCardTagLayout layout = (WCardTagLayout) creator.toData();
boolean isHori = displayPositionGroup.getSelectedIndex() == WTabDisplayPosition.TOP_POSITION.getType() || displayPositionGroup.getSelectedIndex() == WTabDisplayPosition.BOTTOM_POSITION.getType();
if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tab_Style_Template"))) {
if (ComparatorUtils.equals(getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Tab_Style_Template"))) {
layout.setDisplayPosition(WTabDisplayPosition.parse(displayPositionGroup.getSelectedIndex()));
textDirectionGroup.setSelectedIndex(isHori ? WTabTextDirection.TEXT_HORI_DERECTION.getType() : WTabTextDirection.TEXT_VER_DIRECTION.getType());
layout.setHgap(isHori ? WCardTagLayout.DESIGNER_DEFAULT_GAP : 0);

4
designer-realize/src/main/java/com/fr/design/condition/FontPane.java
Unescape View File

@ -29,7 +29,7 @@ public class FontPane extends ConditionAttrSingleConditionPane<HighlightAction>
public FontPane(final ConditionAttributesPane conditionAttributesPane) {
super(conditionAttributesPane);
fontLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Sytle-FRFont") + ":");
fontLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sytle_FRFont") + ":");
frFontPreviewPane = new FRFontPreviewArea();
frFontPreviewPane.setBorder(BorderFactory.createTitledBorder(""));
frFontPreviewPane.setPreferredSize(new Dimension(80, 20));
@ -65,7 +65,7 @@ public class FontPane extends ConditionAttrSingleConditionPane<HighlightAction>
@Override
public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Sytle-FRFont");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sytle_FRFont");
}

2
designer-realize/src/main/java/com/fr/design/condition/PaddingPane.java
Unescape View File

@ -78,7 +78,7 @@ public class PaddingPane extends ConditionAttrSingleConditionPane<HighlightActio
*/
@Override
public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Sytle-Indentation");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sytle_Indentation");
}
@Override

18
designer-realize/src/main/java/com/fr/design/condition/WHPane.java
Unescape View File

@ -48,16 +48,16 @@ public abstract class WHPane extends ConditionAttrSingleConditionPane<HighlightA
double va;
if (unitType == Constants.UNIT_CM) {
va = width.toCMValue4Scale2();
unitLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_CM"));
unitLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"));
} else if (unitType == Constants.UNIT_INCH) {
va = width.toINCHValue4Scale3();
unitLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_INCH"));
unitLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH"));
} else if (unitType == Constants.UNIT_PT) {
va = width.toPTValue4Scale2();
unitLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_PT"));
unitLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_PT_Duplicate"));
} else {
va = width.toMMValue4Scale2();
unitLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_MM"));
unitLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_MM"));
}
// 只保留两位
Float d = new Float(new BigDecimal(va + "").setScale(2, BigDecimal.ROUND_DOWN).floatValue());
@ -69,13 +69,13 @@ public abstract class WHPane extends ConditionAttrSingleConditionPane<HighlightA
protected String getUnitString() {
int unitType = DesignerEnvManager.getEnvManager().getReportLengthUnit();
if (unitType == Constants.UNIT_CM) {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_CM");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM");
} else if (unitType == Constants.UNIT_INCH) {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_INCH");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH");
} else if (unitType == Constants.UNIT_PT) {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_PT");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_PT_Duplicate");
} else {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_MM");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_MM");
}
}
@ -106,4 +106,4 @@ public abstract class WHPane extends ConditionAttrSingleConditionPane<HighlightA
}
protected abstract HighlightAction returnAction(UNIT unit);
}
}

12
designer-realize/src/main/java/com/fr/design/condition/WidgetHighlightPane.java
Unescape View File

@ -57,11 +57,11 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
}
});
UILabel widgetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget") + ":");
UILabel widgetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget") + ":");
this.add(widgetLabel);
String[] editorTypes = new String[] {
"",
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_TextArea"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Number"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Password"),
@ -75,7 +75,7 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
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_Iframe"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tree-ComboBox"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree")
};
box = new UIComboBox(editorTypes);
@ -101,7 +101,7 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
@Override
public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget");
}
@Override
@ -136,7 +136,7 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
} else if (value instanceof ListEditor) {
box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_List"));
} 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("Fine-Design_Report_Tree_ComboBox"));
} else if (value instanceof TreeEditor) {
box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree"));
} else if (value instanceof Password) {
@ -144,7 +144,7 @@ public class WidgetHighlightPane extends ConditionAttrSingleConditionPane<Highli
} else if (value instanceof TextArea) {
box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_TextArea"));
} else if (value instanceof TextEditor) {
box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text"));
box.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text"));
}
}

4
designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java
Unescape View File

@ -169,8 +169,8 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane {
double[] columnSize = {p, f};
int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
Component[][] components = new Component[][]{
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Type") + " ", SwingConstants.LEFT), typePane},
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WF_Name") + " ", SwingConstants.LEFT), namePane},
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Type") + " ", SwingConstants.LEFT), typePane},
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WF_Name") + " ", SwingConstants.LEFT), namePane},
new Component[]{checkPane, null},
};

2
designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
Unescape View File

@ -684,7 +684,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cell"), SwingConstants.LEFT), cellElementVisibleCheckBoxes},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget"), SwingConstants.LEFT), widgetVisible},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget"), SwingConstants.LEFT), widgetVisible},
new Component[]{null, widgetAvailable}
};
double[] rowSize = {p, p, p};

4
designer-realize/src/main/java/com/fr/design/mainframe/SheetAuthorityEditPane.java
Unescape View File

@ -95,8 +95,8 @@ public class SheetAuthorityEditPane extends AuthorityEditPane {
double[] columnSize = {p, f};
int[][] rowCount = {{1, 1}, {1, 1}, {1, 1}};
Component[][] components = new Component[][]{
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Type") + " ", SwingConstants.LEFT), typePane},
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WF_Name") + " ", SwingConstants.LEFT), namePane},
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Type") + " ", SwingConstants.LEFT), typePane},
new Component[]{new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WF_Name") + " ", SwingConstants.LEFT), namePane},
new Component[]{checkPane, null},
};

6
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/FileSearchManager.java
Unescape View File

@ -68,7 +68,7 @@ public class FileSearchManager implements AlphaFineSearchProvider {
this.moreModelList = new SearchResult();
this.searchText = dealWithSearchText(searchText);
if (StringUtils.isBlank(this.searchText) || ComparatorUtils.equals(this.searchText, DS_NAME)) {
lessModelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates")));
lessModelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_ReportTemplates")));
return lessModelList;
}
AlphaFineHelper.checkCancel();
@ -79,10 +79,10 @@ public class FileSearchManager implements AlphaFineSearchProvider {
if (filterModelList.isEmpty()) {
return new SearchResult();
} else if (filterModelList.size() < AlphaFineConstants.SHOW_SIZE + 1) {
lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates")));
lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_ReportTemplates")));
lessModelList.addAll(filterModelList);
} else {
lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.FILE));
lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_ReportTemplates"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.FILE));
lessModelList.addAll(filterModelList.subList(0, AlphaFineConstants.SHOW_SIZE));
moreModelList.addAll(filterModelList.subList(AlphaFineConstants.SHOW_SIZE, filterModelList.size()));

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

@ -76,7 +76,7 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
RCodesizespinner = new UISpinner(1,6,1,2);
RCodeVersionComboBox = new UIComboBox();
RCodeErrorCorrectComboBox = new UIComboBox();
typeSetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Type_Set"), UILabel.LEFT);
typeSetLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Set"), UILabel.LEFT);
initVersionComboBox();
initErrorCorrectComboBox();

23
designer-realize/src/main/java/com/fr/design/report/UnitFieldPane.java
Unescape View File

@ -3,19 +3,10 @@
*/
package com.fr.design.report;
import java.awt.Dimension;
import javax.swing.JFormattedTextField;
import com.fr.common.inputevent.InputEventBaseOnOS;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.SpinnerNumberModel;
import com.fr.design.gui.ispinner.UIBasicSpinner;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.stable.Constants;
import com.fr.stable.OperatingSystem;
import com.fr.stable.unit.CM;
@ -23,6 +14,12 @@ import com.fr.stable.unit.INCH;
import com.fr.stable.unit.MM;
import com.fr.stable.unit.UNIT;
import javax.swing.JFormattedTextField;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import javax.swing.SpinnerNumberModel;
import java.awt.Dimension;
/**
* UnitFieldPane
*/
@ -48,11 +45,11 @@ public class UnitFieldPane extends JPanel {
public void setUnitType(int unitType) {
if (unitType == Constants.UNIT_CM) {
this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_CM"));
this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"));
} else if (unitType == Constants.UNIT_INCH) {
this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_INCH"));
this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH"));
} else {
this.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unit_MM"));
this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_MM"));
}
//ajust the heigt of unitLabel.
@ -107,4 +104,4 @@ public class UnitFieldPane extends JPanel {
valueSpinner.setValue(new Float(value.toMMValue4Scale2()));
}
}
}
}

2
designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java
Unescape View File

@ -130,7 +130,7 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget");
}
public void populate(Widget widget) {

3
designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxDefinePane.java
Unescape View File

@ -1,6 +1,5 @@
package com.fr.design.widget.ui;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.foldablepane.UIExpandablePane;
import com.fr.design.gui.ilable.UILabel;
@ -27,7 +26,7 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Text")), text},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text")), text},
};
double[] rowSize = {p};
double[] columnSize = {p, f};

2
designer-realize/src/main/java/com/fr/design/widget/ui/FieldEditorDefinePane.java
Unescape View File

@ -96,7 +96,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
protected void addValidatePane() {
validatePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
final UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Widget_Error_Tip"));
final UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip"));
initErrorMsgPane();
allowBlankCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Null"));
allowBlankCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

4
designer-realize/src/main/java/com/fr/design/widget/ui/WaterMarkDictPane.java
Unescape View File

@ -24,7 +24,7 @@ public class WaterMarkDictPane extends JPanel {
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")), waterMarkTextField},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkTextField},
};
double[] rowSize = {p};
double[] columnSize = {p, f};
@ -58,4 +58,4 @@ public class WaterMarkDictPane extends JPanel {
return this.waterMarkTextField.getText();
}
}
}

Write Preview
Loading…
Cancel
Save