From 2f42710132cd329f426c048250def14cfdb6b2a5 Mon Sep 17 00:00:00 2001 From: Jinbokai Date: Fri, 10 Aug 2018 11:22:37 +0800 Subject: [PATCH] =?UTF-8?q?designer-realize=E4=B8=ADi18nTextArray()?= =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BAi18nText()=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jinbokai --- .../actions/cell/CleanAuthorityAction.java | 3 +- .../columnrow/ResetColumnHideAction.java | 3 +- .../actions/columnrow/ResetRowHideAction.java | 3 +- .../edit/EditFloatElementNameAction.java | 6 +- .../fr/design/condition/HyperlinkPane.java | 12 +- .../condition/PresentHighlightPane.java | 3 +- .../design/condition/WidgetHighlightPane.java | 3 +- .../dscolumn/SpecifiedGroupAttrPane.java | 456 +++++++++--------- .../design/javascript/ListenerEditPane.java | 3 +- .../mainframe/AuthorityEditToolBarPane.java | 11 +- .../mainframe/AuthoritySheetEditedPane.java | 3 +- .../mainframe/AuthorityToolBarPane.java | 18 +- .../fr/design/mainframe/ElementCasePane.java | 3 +- .../fr/design/mainframe/ReportComponent.java | 3 +- .../mainframe/cell/CellElementEditPane.java | 3 +- .../mainframe/cell/QuickEditorRegion.java | 3 +- .../settingpane/style/CustomStylePane.java | 3 +- .../style/PredefinedStylePane.java | 3 +- .../form/FormElementCaseDesigner.java | 3 +- .../parameter/ParameterDefinitePane.java | 3 +- .../com/fr/design/present/BarCodePane.java | 3 +- .../com/fr/design/report/ExcelExportPane.java | 9 +- .../com/fr/design/report/LayerReportPane.java | 6 +- .../com/fr/design/report/PDFExportPane.java | 3 +- .../com/fr/design/report/SubReportPane.java | 13 +- .../fr/design/report/VerifierListPane.java | 2 +- .../design/report/freeze/FreezePagePane.java | 3 +- .../report/freeze/FreezeWriteColPane.java | 6 +- .../report/freeze/FreezeWriteRowPane.java | 6 +- .../freeze/RepeatAndFreezeSettingPane.java | 15 +- .../fr/design/webattr/DragToolBarPane.java | 3 +- .../com/fr/design/webattr/EditToolBar.java | 27 +- .../webattr/ReportWebWidgetConstants.java | 3 +- .../fr/design/webattr/ToolBarDragPane.java | 3 +- .../fr/design/webattr/WriteToolBarPane.java | 3 +- .../design/webattr/WriteWebSettingPane.java | 3 +- .../com/fr/design/widget/ValueWidgetPane.java | 3 +- .../java/com/fr/design/widget/WidgetPane.java | 3 +- .../widget/ui/CheckBoxGroupDefinePane.java | 3 +- .../widget/ui/ParameterTreeComboBox.java | 3 +- .../ui/btn/DefineAppendColumnRowPane.java | 3 +- .../ui/btn/DefineDeleteColumnRowPane.java | 3 +- .../submit/SmartInsertDBManipulationPane.java | 6 +- .../com/fr/grid/selection/FloatSelection.java | 8 +- 44 files changed, 382 insertions(+), 306 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java index 19e7b01a6f..79157d7a84 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/CleanAuthorityAction.java @@ -26,7 +26,8 @@ public class CleanAuthorityAction extends ElementCaseAction { public CleanAuthorityAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Clear", "DashBoard-Potence"})); +// this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Clear", "DashBoard-Potence"})); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Clear_DashBoard_Potence")); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java index bc9d401099..a1b0252f32 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetColumnHideAction.java @@ -11,7 +11,8 @@ public class ResetColumnHideAction extends AbstractColumnRowIndexAction { public ResetColumnHideAction(ElementCasePane t, int indexOfColumnOrRow) { super(t, indexOfColumnOrRow); - this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"MConfig-CancelButton", "Hide"})); +// this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"MConfig-CancelButton", "Hide"})); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Hide")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java index 15940ee645..be6b8f92d3 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ResetRowHideAction.java @@ -11,7 +11,8 @@ public class ResetRowHideAction extends AbstractColumnRowIndexAction { public ResetRowHideAction(ElementCasePane t, int indexOfColumnOrRow) { super(t, indexOfColumnOrRow); - this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"MConfig-CancelButton", "Hide"})); +// this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"MConfig-CancelButton", "Hide"})); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Cancel_Hide")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java b/designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java index b00cae32bf..63c91789d0 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/edit/EditFloatElementNameAction.java @@ -18,7 +18,8 @@ public class EditFloatElementNameAction extends FloatSelectionAction { public EditFloatElementNameAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Float_Element_Name"})); +// this.setName(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Float_Element_Name"})); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Float_Element_Name")); } @Override @@ -56,7 +57,8 @@ public class EditFloatElementNameAction extends FloatSelectionAction { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Float_Element_Name"}); +// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Float_Element_Name"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Float_Element_Name"); } public void populate(String name) { diff --git a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java index 7e0717af5b..e669a9d711 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/HyperlinkPane.java @@ -51,14 +51,16 @@ public class HyperlinkPane extends ConditionAttrSingleConditionPane list = new ArrayList(); - for(int i = 0; i < conditionGroups.length; i++) { - list.add(new NameObject(conditionGroups[i].getDisplay(), conditionGroups[i])); - } - - specifiedControlPane.populate(list.toArray(new NameObject[list.size()])); - } - } else if (grouper instanceof FunctionGrouper - && ((FunctionGrouper)grouper).isCustom()) { - this.specifiedComboBox.setSelectedIndex(1); - cardLayout.show(centerCardPane, "Formula"); - formulaGroupPane.populate(grouper); + this.specifiedComboBox.setSelectedIndex(0); + cardLayout.show(centerCardPane, "Condition"); + CustomGrouper customGrouper = (CustomGrouper) grouper; + boolean force = customGrouper.isForce(); + ConditionGroup[] conditionGroups = customGrouper.getConditionGroups(); + boolean more = customGrouper.isMore(); + int other = customGrouper.getOther(); + String odisplay = customGrouper.getOtherdisplay(); + + this.forceCheckBox.setSelected(force); + + this.moreCheckBox.setSelected(more); + + if (other == CustomGrouper.TOGETHER) { + this.otherComboBox.setSelectedIndex(2); + this.otherTextField.setEnabled(true); + } else if (other == CustomGrouper.DISCARD) { + this.otherComboBox.setSelectedIndex(0); + this.otherTextField.setEnabled(false); + } else { + this.otherComboBox.setSelectedIndex(1); + this.otherTextField.setEnabled(false); + } + + if (odisplay != null) { + this.otherTextField.setText(odisplay); + } + + if (conditionGroups != null) { + java.util.List list = new ArrayList(); + for (int i = 0; i < conditionGroups.length; i++) { + list.add(new NameObject(conditionGroups[i].getDisplay(), conditionGroups[i])); + } + + specifiedControlPane.populate(list.toArray(new NameObject[list.size()])); + } + } else if (grouper instanceof FunctionGrouper + && ((FunctionGrouper) grouper).isCustom()) { + this.specifiedComboBox.setSelectedIndex(1); + cardLayout.show(centerCardPane, "Formula"); + formulaGroupPane.populate(grouper); } - + if (otherComboBox.getSelectedIndex() == 2) { otherTextField.setEnabled(true); } else { @@ -223,52 +225,53 @@ public class SpecifiedGroupAttrPane extends BasicPane { } public RecordGrouper update(CellElement cellElement, RecordGrouper recordGrouper) { - if (this.specifiedComboBox.getSelectedIndex() == 0) { - CustomGrouper customGroup = new CustomGrouper(); - + if (this.specifiedComboBox.getSelectedIndex() == 0) { + CustomGrouper customGroup = new CustomGrouper(); + if (forceCheckBox.isSelected()) { - customGroup.setForce(true); + customGroup.setForce(true); } - + if (!moreCheckBox.isSelected()) { - customGroup.setMore(false); + customGroup.setMore(false); } - + if (otherComboBox.getSelectedIndex() == 2) { - customGroup.setOther(CustomGrouper.TOGETHER); + customGroup.setOther(CustomGrouper.TOGETHER); } else if (otherComboBox.getSelectedIndex() == 0) { - customGroup.setOther(CustomGrouper.DISCARD); + customGroup.setOther(CustomGrouper.DISCARD); } else { - customGroup.setOther(CustomGrouper.LEAVE); + customGroup.setOther(CustomGrouper.LEAVE); } - + customGroup.setOdisplay(this.otherTextField.getText()); - + // Nameable[]居然不能强转成NameObject[],一定要这么写... - Nameable[] res = specifiedControlPane.update(); - NameObject[] nameObject_array = new NameObject[res.length]; - java.util.Arrays.asList(res).toArray(nameObject_array); - ConditionGroup[] res_array = new ConditionGroup[res.length]; - for (int i = 0; i < res.length; i ++) { - res_array[i] = (ConditionGroup)nameObject_array[i].getObject(); - res_array[i].setDisplay(nameObject_array[i].getName()); - } - - customGroup.setConditionGroups(res_array); - recordGrouper = customGroup; - } else { - recordGrouper = formulaGroupPane.update(); - } - - return recordGrouper; + Nameable[] res = specifiedControlPane.update(); + NameObject[] nameObject_array = new NameObject[res.length]; + java.util.Arrays.asList(res).toArray(nameObject_array); + ConditionGroup[] res_array = new ConditionGroup[res.length]; + for (int i = 0; i < res.length; i++) { + res_array[i] = (ConditionGroup) nameObject_array[i].getObject(); + res_array[i].setDisplay(nameObject_array[i].getName()); + } + + customGroup.setConditionGroups(res_array); + recordGrouper = customGroup; + } else { + recordGrouper = formulaGroupPane.update(); + } + + return recordGrouper; } - + public static class ConditionGroupDetailsPane extends BasicBeanPane { - private ConditionGroup editing; - - private DSColumnLiteConditionPane liteConditionPane; - public ConditionGroupDetailsPane(String[] displayNames) { - //alex:右侧的组内的条件细节 + private ConditionGroup editing; + + private DSColumnLiteConditionPane liteConditionPane; + + public ConditionGroupDetailsPane(String[] displayNames) { + //alex:右侧的组内的条件细节 this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); @@ -277,53 +280,53 @@ public class SpecifiedGroupAttrPane extends BasicPane { if (displayNames != null) { liteConditionPane.populateColumns(displayNames); } - } - - @Override - protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("SpecifiedG-Specified_Group"); - } + } @Override - public ConditionGroup updateBean() { - editing.setCondition(liteConditionPane.updateBean()); - - return editing; - } + protected String title4PopupWindow() { + return com.fr.design.i18n.Toolkit.i18nText("SpecifiedG-Specified_Group"); + } @Override - public void populateBean(ConditionGroup ob) { - editing = ob; - liteConditionPane.populateBean(ob.getCondition()); - } + public ConditionGroup updateBean() { + editing.setCondition(liteConditionPane.updateBean()); + + return editing; + } + + @Override + public void populateBean(ConditionGroup ob) { + editing = ob; + liteConditionPane.populateBean(ob.getCondition()); + } } - + private class FormulaGroupPane extends JPanel { - private String[] displayModeNames = {com.fr.design.i18n.Toolkit.i18nText("GROUPING_MODE"), com.fr.design.i18n.Toolkit.i18nText("LIST_MODE"), - com.fr.design.i18n.Toolkit.i18nText("CONTINUUM_MODE")}; - - private String InsertText = " "; - - private UIComboBox modeComboBox; - private UITextField valueField; - private JPanel southPane; - - public FormulaGroupPane() { - this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("D-Dispaly_Divide_Result_Set_into_Groups"))); - this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - JPanel contentPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); - this.add(contentPane, BorderLayout.NORTH); - - JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - northPane.setLayout(FRGUIPaneFactory.createBorderLayout()); - contentPane.add(northPane); - modeComboBox = new UIComboBox(displayModeNames); - - northPane.add(GUICoreUtils.createFlowPane(new JComponent[] { new UILabel(InsertText), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Modes") + ": "), - modeComboBox }, FlowLayout.LEFT), BorderLayout.WEST); - - UILabel label = new UILabel("="); + private String[] displayModeNames = {com.fr.design.i18n.Toolkit.i18nText("GROUPING_MODE"), com.fr.design.i18n.Toolkit.i18nText("LIST_MODE"), + com.fr.design.i18n.Toolkit.i18nText("CONTINUUM_MODE")}; + + private String InsertText = " "; + + private UIComboBox modeComboBox; + private UITextField valueField; + private JPanel southPane; + + public FormulaGroupPane() { + this.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("D-Dispaly_Divide_Result_Set_into_Groups"))); + this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); + JPanel contentPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(1); + this.add(contentPane, BorderLayout.NORTH); + + JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + northPane.setLayout(FRGUIPaneFactory.createBorderLayout()); + contentPane.add(northPane); + modeComboBox = new UIComboBox(displayModeNames); + + northPane.add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(InsertText), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Modes") + ": "), + modeComboBox}, FlowLayout.LEFT), BorderLayout.WEST); + + UILabel label = new UILabel("="); label.setFont(new Font("Dialog", Font.BOLD, 12)); valueField = new UITextField(16); valueField.setText("$$$"); @@ -333,7 +336,7 @@ public class SpecifiedGroupAttrPane extends BasicPane { formulaButton.setPreferredSize(new Dimension(25, valueField.getPreferredSize().height)); formulaButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { - BaseFormula valueFormula = BaseFormula.createFormulaBuilder().build(); + BaseFormula valueFormula = BaseFormula.createFormulaBuilder().build(); String text = valueField.getText(); if (text == null || text.length() <= 0) { valueFormula.setContent("$$$"); @@ -342,60 +345,61 @@ public class SpecifiedGroupAttrPane extends BasicPane { } final UIFormula formulaPane = FormulaFactory.createFormulaPane(); - - formulaPane.populate(valueFormula, new CustomVariableResolver(displayNames == null? new String[0] : displayNames, true)); - formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(FormulaGroupPane.this), new DialogActionAdapter(){ - @Override - public void doOk() { - BaseFormula valueFormula = formulaPane.update(); + + formulaPane.populate(valueFormula, new CustomVariableResolver(displayNames == null ? new String[0] : displayNames, true)); + formulaPane.showLargeWindow(SwingUtilities.getWindowAncestor(FormulaGroupPane.this), new DialogActionAdapter() { + @Override + public void doOk() { + BaseFormula valueFormula = formulaPane.update(); if (valueFormula.getContent().length() <= 1) { valueField.setText("$$$"); } else { valueField.setText(valueFormula.getContent().substring(1)); } - } - }).setVisible(true); + } + }).setVisible(true); } }); - - southPane = GUICoreUtils.createFlowPane(new JComponent[] {new UILabel(InsertText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("I-Message_FunctionGrouper_2")), - new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Value"}) + ": "), label, valueField, formulaButton}, FlowLayout.LEFT); + + southPane = GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(InsertText), //new UILabel(com.fr.design.i18n.Toolkit.i18nText("I-Message_FunctionGrouper_2")), +// new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Value"}) + ": "), label, valueField, formulaButton}, FlowLayout.LEFT); + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Value") + ": "), label, valueField, formulaButton}, FlowLayout.LEFT); contentPane.add(southPane); - } - - // populate - public void populate(RecordGrouper grouper) { - if (grouper instanceof FunctionGrouper) { - int mode = ((FunctionGrouper)grouper).getDivideMode(); - if (mode == FunctionGrouper.GROUPING_MODE) { - this.modeComboBox.setSelectedIndex(0); - } else if (mode == FunctionGrouper.LIST_MODE) { - this.modeComboBox.setSelectedIndex(1); - } else { - this.modeComboBox.setSelectedIndex(2); - } - String formulaContent = ((FunctionGrouper)grouper).getFormulaContent(); - if(formulaContent == null) { - this.valueField.setText("$$$"); - } else { - this.valueField.setText(formulaContent); - } - } - } - - public RecordGrouper update() { - FunctionGrouper grouper = new FunctionGrouper(); - grouper.setCustom(true); - if (this.modeComboBox.getSelectedIndex() == 0) { - grouper.setDivideMode(FunctionGrouper.GROUPING_MODE); - } else if (this.modeComboBox.getSelectedIndex() == 1) { - grouper.setDivideMode(FunctionGrouper.LIST_MODE); - } else if (this.modeComboBox.getSelectedIndex() == 2) { - grouper.setDivideMode(FunctionGrouper.CONTINUUM_MODE); - } - grouper.setFormulaContent(this.valueField.getText()); - - return grouper; - } + } + + // populate + public void populate(RecordGrouper grouper) { + if (grouper instanceof FunctionGrouper) { + int mode = ((FunctionGrouper) grouper).getDivideMode(); + if (mode == FunctionGrouper.GROUPING_MODE) { + this.modeComboBox.setSelectedIndex(0); + } else if (mode == FunctionGrouper.LIST_MODE) { + this.modeComboBox.setSelectedIndex(1); + } else { + this.modeComboBox.setSelectedIndex(2); + } + String formulaContent = ((FunctionGrouper) grouper).getFormulaContent(); + if (formulaContent == null) { + this.valueField.setText("$$$"); + } else { + this.valueField.setText(formulaContent); + } + } + } + + public RecordGrouper update() { + FunctionGrouper grouper = new FunctionGrouper(); + grouper.setCustom(true); + if (this.modeComboBox.getSelectedIndex() == 0) { + grouper.setDivideMode(FunctionGrouper.GROUPING_MODE); + } else if (this.modeComboBox.getSelectedIndex() == 1) { + grouper.setDivideMode(FunctionGrouper.LIST_MODE); + } else if (this.modeComboBox.getSelectedIndex() == 2) { + grouper.setDivideMode(FunctionGrouper.CONTINUUM_MODE); + } + grouper.setFormulaContent(this.valueField.getText()); + + return grouper; + } } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java index 08925ba4be..6b8930cff6 100644 --- a/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java @@ -45,7 +45,8 @@ public class ListenerEditPane extends BasicBeanPane { private static final String JS = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript"); private static final String FORMSUBMIT = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript_Form_Submit"); private static final String DBCOMMIT = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_JavaScript_Commit_to_Database"); - private static final String CUSTOMACTION= com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_JavaScript_Custom", "FR-Designer_RWA_Submit"}); +// private static final String CUSTOMACTION= com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_JavaScript_Custom", "FR-Designer_RWA_Submit"}); + private static final String CUSTOMACTION= com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_JavaScript_Custom_Submit"); private static final String EMAIL = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Email_sentEmail"); private Listener listener; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java index 35c67af1d3..6dbb8fc598 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityEditToolBarPane.java @@ -40,8 +40,8 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane { super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); this.setLayout(new BorderLayout()); this.setBorder(null); - UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_Permissions", - "FR-Designer_Edit"})) { +// UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_Permissions", "FR-Designer_Edit"})) { + UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Permissions_Edit")) { @Override public Dimension getPreferredSize() { return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); @@ -148,12 +148,12 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane { type = new UILabel(); typePane = new JPanel(new BorderLayout()); typePane.add(type, BorderLayout.CENTER); - type.setBorder(BorderFactory.createEmptyBorder(0,LEFT_GAP,0,0)); + type.setBorder(BorderFactory.createEmptyBorder(0, LEFT_GAP, 0, 0)); typePane.setBorder(BorderFactory.createLineBorder(Color.lightGray)); name = new UILabel(); namePane = new JPanel(new BorderLayout()); namePane.add(name, BorderLayout.CENTER); - name.setBorder(BorderFactory.createEmptyBorder(0,LEFT_GAP,0,0)); + name.setBorder(BorderFactory.createEmptyBorder(0, LEFT_GAP, 0, 0)); namePane.setBorder(BorderFactory.createLineBorder(Color.lightGray)); checkPane = new JPanel(); checkPane.setLayout(new BorderLayout()); @@ -208,7 +208,8 @@ public class AuthorityEditToolBarPane extends AuthorityPropertyPane { if (name.getText() == "") { type.setText(""); } else { - type.setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "FR-Designer_Form_Button"})); +// type.setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "FR-Designer_Form_Button"})); + type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Toolbar_Button")); } } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java index b56cf1bcdf..5918adade3 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/AuthoritySheetEditedPane.java @@ -30,7 +30,8 @@ public class AuthoritySheetEditedPane extends AuthorityPropertyPane { super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate()); this.setLayout(new BorderLayout()); this.setBorder(null); - UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})) { +// UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})) { + UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")) { @Override public Dimension getPreferredSize() { return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java index 539a1e45cb..a371fa7cda 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/AuthorityToolBarPane.java @@ -45,7 +45,10 @@ public class AuthorityToolBarPane extends BasicBeanPane extends BasicBeanPane extends BasicBeanPane toolBarButtons = toolBarPane.getToolBarButtons(); - boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Server", "ReportServerP-Toolbar", "Choose_Role"})) - && !WorkContext.getCurrent().isRoot(); +// boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Server", "ReportServerP-Toolbar", "Choose_Role"}))&& !WorkContext.getCurrent().isRoot(); + boolean isnotEnable = ComparatorUtils.equals(title.getText(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Toolbar_Choose_Role"))&& !WorkContext.getCurrent().isRoot(); for (ToolBarButton button : toolBarButtons) { button.setEnabled(!isnotEnable); } @@ -271,14 +275,16 @@ public class AuthorityToolBarPane extends BasicBeanPane extends Tar */ public ShortCut[] shortCuts4Authority() { return new ShortCut[]{ - new NameSeparator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})), +// new NameSeparator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"DashBoard-Potence", "Edit"})), + new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit_DashBoard_Potence")), DesignerMode.isAuthorityEditing() ? new ExitAuthorityEditAction(this) : new AllowAuthorityEditAction(this), }; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java b/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java index ea74cc7b3b..b3fdc37fff 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/ReportComponent.java @@ -68,7 +68,8 @@ public abstract class ReportComponent { * @return */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Style"}); +// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Style"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Style"); } /** diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java index 3f889ff42e..41b1c08c8c 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/style/PredefinedStylePane.java @@ -124,7 +124,8 @@ public class PredefinedStylePane extends FurtherBasicBeanPane impleme * @return 标题 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Predefined", "Style"}); +// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Predefined", "Style"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Predefined_Style"); } /** diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java b/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java index 6578caf00b..76de629618 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCaseDesigner.java @@ -94,7 +94,8 @@ public class FormElementCaseDesigner { } private void initVersionComboBox() { - String[] array = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Auto", "Choose"}), "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"}; +// String[] array = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Auto", "Choose"}), "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"}; + String[] array = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Auto_Choose"), "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"}; initcombobox(this.RCodeVersionComboBox, array, 0); } diff --git a/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java b/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java index a813a2f7fc..7f3cfd562b 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ExcelExportPane.java @@ -53,7 +53,8 @@ public class ExcelExportPane extends BasicPane { northPane.add(passwordPane); passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); passwordPane.add(passwordWritePane); - UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"File", "Password"}) + ":"); +// UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"File", "Password"}) + ":"); + UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_File_Password")); passwordWritePane.add(passwordLabel); passwordField = new UITextField(11); passwordWritePane.add(passwordField); @@ -71,9 +72,11 @@ public class ExcelExportPane extends BasicPane { JPanel protectedWordPane =FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane(); - protectedWord = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Protected", "Password"})); +// protectedWord = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Protected", "Password"})); + protectedWord = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Protected_Password")); wordPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - wordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Sheet", "Password"}) + ":")); +// wordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Sheet", "Password"}) + ":")); + wordPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sheet_Password"))); protectedField = new UITextField(11); wordPane.add(protectedField); protectedWordPane.add(protectedWord); diff --git a/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java b/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java index 60b0a3b4d9..2a0dd6f31e 100644 --- a/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/LayerReportPane.java @@ -49,7 +49,8 @@ public class LayerReportPane extends BasicBeanPane { protected void initComponents() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - JPanel outlayerReportPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Report_Engine", "Attribute"})); +// JPanel outlayerReportPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Report_Engine", "Attribute"})); + JPanel outlayerReportPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute")); JPanel layerReportPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); this.add(outlayerReportPane); outlayerReportPane.add(layerReportPane); @@ -113,7 +114,8 @@ public class LayerReportPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Report_Engine", "Attribute"}); +// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Report_Engine", "Attribute"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Report_Engine_Attribute"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java b/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java index bb1db256bb..bec9c016b9 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PDFExportPane.java @@ -40,7 +40,8 @@ public class PDFExportPane extends BasicPane { northPane.add(passwordPane); passwordWritePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); passwordPane.add(passwordWritePane); - UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"File", "Password"}) + ":"); +// UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"File", "Password"}) + ":"); + UILabel passwordLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_File_Password") + ":"); passwordWritePane.add(passwordLabel); passwordField = new UITextField(11); passwordWritePane.add(passwordField); diff --git a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java index d684f6f84a..f81c857ce9 100644 --- a/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/SubReportPane.java @@ -45,7 +45,8 @@ public class SubReportPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createM_BorderLayout()); JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); // northPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); - northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Sub_Report", "Path"}),null)); +// northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Sub_Report", "Path"}),null)); + northPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Sub_Report_Path"),null)); northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Location") + ":"), BorderLayout.WEST); northPane.add(pathTextField = new UITextField(), BorderLayout.CENTER); pathTextField.setEditable(false); @@ -79,8 +80,9 @@ public class SubReportPane extends BasicPane { centerPane.setLayout(FRGUIPaneFactory.createM_BorderLayout()); centerPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 10, 5)); kvPane = new ReportletParameterViewPane(); - centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Delivery", "Parameter"}),null)); - JPanel kcPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); +// centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Set", "Delivery", "Parameter"}),null)); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Delivery_Parameter"),null)); + JPanel kcPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); kcPane.add(kvPane); extend = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Hyperlink-Extends_Report_Parameters")); kcPane.add(extend, BorderLayout.SOUTH); @@ -94,8 +96,9 @@ public class SubReportPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Insert", "Sub_Report"}); - } +// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Insert", "Sub_Report"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Insert_Sub_Report"); + } public void populate(ElementCase report, CellElement cellElment) { Object cellValue = cellElment.getValue(); diff --git a/designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java b/designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java index 25a025a269..c95823199a 100644 --- a/designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/VerifierListPane.java @@ -1 +1 @@ -package com.fr.design.report; import com.fr.data.Verifier; import com.fr.design.ExtraDesignClassManager; import com.fr.design.fun.VerifyDefineProvider; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ObjectJControlPane; import com.fr.design.mainframe.ElementCasePane; import com.fr.general.NameObject; import com.fr.report.write.ReportWriteAttr; import com.fr.report.write.ValueVerifier; import com.fr.report.write.WClassVerifier; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import java.util.ArrayList; import java.util.Set; /** * 校验列表 */ public class VerifierListPane extends ObjectJControlPane { public VerifierListPane(ElementCasePane ePane) { super(ePane); } /** * 创建选项 * * @return 选项 */ public NameableCreator[] createNameableCreators() { NameableCreator[] creators = new NameableCreator[]{ new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"BuildIn", "Verify"}), "/com/fr/web/images/reportlet.png", ValueVerifier.class, BuildInVerifierPane.class) }; Set set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING); for (VerifyDefineProvider provider : set) { creators = ArrayUtils.add(creators, new NameObjectCreator( provider.nameForVerifier(), provider.iconPath(), provider.classForVerifier(), provider.appearanceForVerifier() ) { }); } creators = ArrayUtils.add(creators, new NameObjectCreator( com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Verify"}), "/com/fr/web/images/reportlet.png", WClassVerifier.class, CustomVerifierPane.class)); return creators; } @Override protected String title4PopupWindow() { return "Verify Collections"; } public void populate(ReportWriteAttr reportWriteAttr) { if (reportWriteAttr == null) { return; } java.util.List nameObjectList = new ArrayList<>(); int verifierCount = reportWriteAttr.getVerifierCount(); for (int i = 0; i < verifierCount; i++) { Verifier verifier = reportWriteAttr.getVerifier(i); nameObjectList.add(new NameObject(verifier.getName(), verifier)); } this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()])); } public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) { // Nameable[]居然不能强转成NameObject[],一定要这么写... Nameable[] res = this.update(); NameObject[] res_array = new NameObject[res.length]; java.util.Arrays.asList(res).toArray(res_array); reportWriteAttr.clearVerifiers(); for (int i = 0; i < res_array.length; i++) { NameObject nameObject = res_array[i]; if (nameObject.getObject() instanceof Verifier) { Verifier verifier = (Verifier) nameObject.getObject(); verifier.setName(nameObject.getName()); reportWriteAttr.addVerifier(verifier); } } } } \ No newline at end of file +package com.fr.design.report; import com.fr.data.Verifier; import com.fr.design.ExtraDesignClassManager; import com.fr.design.fun.VerifyDefineProvider; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.gui.controlpane.ObjectJControlPane; import com.fr.design.mainframe.ElementCasePane; import com.fr.general.NameObject; import com.fr.report.write.ReportWriteAttr; import com.fr.report.write.ValueVerifier; import com.fr.report.write.WClassVerifier; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import java.util.ArrayList; import java.util.Set; /** * 校验列表 */ public class VerifierListPane extends ObjectJControlPane { public VerifierListPane(ElementCasePane ePane) { super(ePane); } /** * 创建选项 * * @return 选项 */ public NameableCreator[] createNameableCreators() { NameableCreator[] creators = new NameableCreator[]{ // new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"BuildIn", "Verify"}), new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BuildIn_Verify"), "/com/fr/web/images/reportlet.png", ValueVerifier.class, BuildInVerifierPane.class) }; Set set = ExtraDesignClassManager.getInstance().getArray(VerifyDefineProvider.MARK_STRING); for (VerifyDefineProvider provider : set) { creators = ArrayUtils.add(creators, new NameObjectCreator( provider.nameForVerifier(), provider.iconPath(), provider.classForVerifier(), provider.appearanceForVerifier() ) { }); } creators = ArrayUtils.add(creators, new NameObjectCreator( // com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Verify"}), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Verify"), "/com/fr/web/images/reportlet.png", WClassVerifier.class, CustomVerifierPane.class)); return creators; } @Override protected String title4PopupWindow() { return "Verify Collections"; } public void populate(ReportWriteAttr reportWriteAttr) { if (reportWriteAttr == null) { return; } java.util.List nameObjectList = new ArrayList<>(); int verifierCount = reportWriteAttr.getVerifierCount(); for (int i = 0; i < verifierCount; i++) { Verifier verifier = reportWriteAttr.getVerifier(i); nameObjectList.add(new NameObject(verifier.getName(), verifier)); } this.populate(nameObjectList.toArray(new NameObject[nameObjectList.size()])); } public void updateReportWriteAttr(ReportWriteAttr reportWriteAttr) { // Nameable[]居然不能强转成NameObject[],一定要这么写... Nameable[] res = this.update(); NameObject[] res_array = new NameObject[res.length]; java.util.Arrays.asList(res).toArray(res_array); reportWriteAttr.clearVerifiers(); for (int i = 0; i < res_array.length; i++) { NameObject nameObject = res_array[i]; if (nameObject.getObject() instanceof Verifier) { Verifier verifier = (Verifier) nameObject.getObject(); verifier.setName(nameObject.getName()); reportWriteAttr.addVerifier(verifier); } } } } \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java index 8902a9820d..b9115c887d 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezePagePane.java @@ -12,7 +12,8 @@ public class FreezePagePane extends FreezeAndRepeatPane { public FreezePagePane(boolean isNumber) { this.isNumber = isNumber; - start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."})+" 1" : com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."})+" A", SwingConstants.CENTER); +// start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."})+" 1" : com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."})+" A", SwingConstants.CENTER); + start = new UILabel(isNumber ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" 1" : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.")+" A", SwingConstants.CENTER); end = new UILabel(isNumber ? " 1"+com.fr.design.i18n.Toolkit.i18nText("Row") : " A"+com.fr.design.i18n.Toolkit.i18nText("Column"), SwingConstants.CENTER); super.initComponent(); } diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java index f41f41e1bd..db635c6a1b 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteColPane.java @@ -10,7 +10,8 @@ public class FreezeWriteColPane extends FreezeAndRepeatPane { public FreezeWriteColPane() { - start = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + " A", SwingConstants.CENTER); +// start = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + " A", SwingConstants.CENTER); + start = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + " A", SwingConstants.CENTER); end = new ColSpinner(1,Integer.MAX_VALUE,1,1); super.initComponent(); this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Column"))); @@ -25,7 +26,8 @@ public class FreezeWriteColPane extends FreezeAndRepeatPane { @Override public void populateBean(FT ob) { - ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + StableUtils.convertIntToABC(ob.getFrom())); +// ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + StableUtils.convertIntToABC(ob.getFrom())); + ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + StableUtils.convertIntToABC(ob.getFrom())); ((ColSpinner)end).setValue((ob.getTo() + 1)); } diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java index fa8e2e680a..b5758b128a 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/FreezeWriteRowPane.java @@ -9,7 +9,8 @@ import com.fr.stable.StableUtils; public class FreezeWriteRowPane extends FreezeAndRepeatPane { public FreezeWriteRowPane() { - start = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + " 1", SwingConstants.CENTER); +// start = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + " 1", SwingConstants.CENTER); + start = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + " 1", SwingConstants.CENTER); end = new RowSpinner(1, Integer.MAX_VALUE, 1,1); super.initComponent(); this.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Row"))); @@ -22,7 +23,8 @@ public class FreezeWriteRowPane extends FreezeAndRepeatPane { @Override public void populateBean(FT ob) { - ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + String.valueOf(ob.getFrom())); +// ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Frozen", "N.O."}) + String.valueOf(ob.getFrom())); + ((UILabel)start).setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Frozen_N.O.") + String.valueOf(ob.getFrom())); ((RowSpinner)end).setValue(ob.getTo() + 1); } diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java index 1ba0fd9307..b389eb6e5d 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java @@ -66,7 +66,8 @@ public class RepeatAndFreezeSettingPane extends BasicPane { JPanel soverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); useRepeatTitleRCheckBox = new UICheckBox(); soverlapRowStartPane.add(useRepeatTitleRCheckBox); - soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Title_Start_Row", "From"}))); +// soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Title_Start_Row", "From"}))); + soverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title_Start_Row_Form"))); repeatTitleRowPane = new RepeatRowPane(); soverlapRowStartPane.add(repeatTitleRowPane); @@ -81,7 +82,8 @@ public class RepeatAndFreezeSettingPane extends BasicPane { JPanel soverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); useRepeatTitleCCheckBox = new UICheckBox(); soverlapColStartPane.add(useRepeatTitleCCheckBox); - soverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Title_Start_Column", "From"}))); +// soverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Title_Start_Column", "From"}))); + soverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Title_Start_Column_Form"))); // 重复打印标题的结束列 repeatTitleColPane = new RepeatColPane(); soverlapColStartPane.add(repeatTitleColPane); @@ -97,7 +99,8 @@ public class RepeatAndFreezeSettingPane extends BasicPane { JPanel foverlapRowStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); useRepeatFinisRCheckBox = new UICheckBox(); foverlapRowStartPane.add(useRepeatFinisRCheckBox); - foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Finis_Start_Row", "From"}))); +// foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Finis_Start_Row", "From"}))); + foverlapRowStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Row_Form"))); repeatFinisRowPane = new RepeatRowPane(); foverlapRowStartPane.add(repeatFinisRowPane); @@ -112,7 +115,8 @@ public class RepeatAndFreezeSettingPane extends BasicPane { JPanel foverlapColStartPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); useRepeatFinisCCheckBox = new UICheckBox(); foverlapColStartPane.add(useRepeatFinisCCheckBox); - foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Finis_Start_Column", "From"}))); +// foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"PageSetup-Finis_Start_Column", "From"}))); + foverlapColStartPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Finis_Start_Column_Form"))); repeatFinisColPane = new RepeatColPane(); foverlapColStartPane.add(repeatFinisColPane); @@ -175,7 +179,8 @@ public class RepeatAndFreezeSettingPane extends BasicPane { private JPanel initWriteFrozenPane() { JPanel writePanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); // 填报冻结 - UILabel writeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Face_Write", "Frozen"}) + ":"); +// UILabel writeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Face_Write", "Frozen"}) + ":"); + UILabel writeLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Face_Write_Frozen") + ":"); JPanel writeLabelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); writeLabelPanel.add(writeLabel); writePanel.add(writeLabelPanel, BorderLayout.NORTH); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java index 19b0ebe0ba..35294c5db4 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java @@ -138,7 +138,8 @@ public class DragToolBarPane extends WidgetToolBarPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Set"}); +// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Set"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Toolbar"); } ListCellRenderer optionRenderer = new DefaultListCellRenderer() { diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java index 247d5b197d..6b8db74507 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java @@ -152,12 +152,15 @@ public class EditToolBar extends BasicPane { this.add(splitPane); list.addListSelectionListener(listSelectionListener); JPanel backgroundPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Background", "Set"})); - defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Default", "Background"})); +// UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Background", "Set"})); + UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background")); +// defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Default", "Background"})); + defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Default_Background")); bgButton.addActionListener(actioner); backgroundPane.add(defaultCheckBox); backgroundPane.add(bgButton); - backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Background", "Set"}))); +// backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Background", "Set"}))); + backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Background"))); this.add(backgroundPane, BorderLayout.SOUTH); } @@ -380,13 +383,15 @@ public class EditToolBar extends BasicPane { double rowSize[] = {p, p}; double columnSize[] = {p, p}; - Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Printer-Alias"}) + ":"), nameField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Icon"}) + ":"), iconPane}}; +// Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Printer-Alias"}) + ":"), nameField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Icon"}) + ":"), iconPane}}; + Component[][] coms = new Component[][]{{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Printer_Alias") + ":"), nameField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Icon") + ":"), iconPane}}; JPanel nameIconPane = TableLayoutHelper.createTableLayoutPane(coms, rowSize, columnSize); north.add(nameIconPane, BorderLayout.SOUTH); - north.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}))); +// north.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}))); + north.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property"))); this.add(north, BorderLayout.NORTH); JPanel none = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); centerPane = FRGUIPaneFactory.createCardLayout_S_Pane(); @@ -442,14 +447,16 @@ public class EditToolBar extends BasicPane { export = exportToolBarProviders[i].updateCenterPane(export); } - export.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}), null)); +// export.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}), null)); + export.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property"), null)); return export; } private JPanel getCpane() { JPanel appendCountPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); count = new UIBasicSpinner(new SpinnerNumberModel(1, 0, Integer.MAX_VALUE, 1)); - UILabel countLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Add", "Row", "Column", "Numbers"}) + ":"); +// UILabel countLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Add", "Row", "Column", "Numbers"}) + ":"); + UILabel countLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Add_Row_Column_Numbers") + ":"); JPanel cpane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); cpane.add(countLabel); cpane.add(count); @@ -460,10 +467,12 @@ public class EditToolBar extends BasicPane { private JPanel getSubmitPane() { isVerify = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Verify-Data_Verify")); - failSubmit = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Verify_Fail", "Still", "Submit"})); +// failSubmit = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Verify_Fail", "Still", "Submit"})); + failSubmit = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Fail_Still_Submit")); isCurSheet = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Only_Submit_Current_Sheet")); JPanel submitPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); - submitPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}), null)); +// submitPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Form-Button", "Property", "Set"}), null)); + submitPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Form_Button_Property"), null)); submitPane.add(isVerify); submitPane.add(failSubmit); submitPane.add(isCurSheet); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java index c1ae8da707..267844582f 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java @@ -149,7 +149,8 @@ public class ReportWebWidgetConstants { public static final WidgetOption SETPRINTEROFFSET = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_SetPrinterOffset"), BaseUtils.readIcon("/com/fr/web/images/pianyi.png"), SetPrinterOffset.class); public static final WidgetOption CUSTOM_BUTTON = WidgetOptionFactory - .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Form-Button"}), CustomToolBarButton.class); +// .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Form-Button"}), CustomToolBarButton.class); + .createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Custom_Form_Button"), CustomToolBarButton.class); // 输出离线html报表 public static final WidgetOption WRITEOFFLINEHTML = WidgetOptionFactory diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java index debadcfab4..fa872b9243 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java @@ -256,7 +256,8 @@ public class ToolBarDragPane extends WidgetToolBarPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Set"}); +// return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ReportServerP-Toolbar", "Set"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Toolbar"); } public void setCheckBoxSelected(boolean b) { diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java index 1a6b3d4542..e9f562a14b 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java @@ -73,7 +73,8 @@ public class WriteToolBarPane extends AbstractEditToolBarPane { rptButtonGroup.add(centerRadioButton); northPane.add(GUICoreUtils.createFlowPane(new Component[]{rptShowLocationLabel, centerRadioButton, leftRadioButton}, FlowLayout.LEFT)); - colorBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Face_Write", "Current", "Edit", "Row", "Background", "Set"}) + ":"); +// colorBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Face_Write", "Current", "Edit", "Row", "Background", "Set"}) + ":"); + colorBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Face_Write_Current_Edit_Row_Background") + ":"); colorBox.setSelected(true); colorBox.addActionListener(colorListener); colorButton = new UIColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png")); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java index 765d526be1..d37d530bbb 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WriteWebSettingPane.java @@ -76,7 +76,8 @@ public class WriteWebSettingPane extends WebSettingPane { unloadCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Unload_Check")); unloadCheck.setSelected(true); - showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Engine_Event_showWidgets"})); +// showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Engine_Event_showWidgets"})); + showWidgets = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event_Show_Widgets")); showWidgets.setSelected(false); isAutoStash = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Auto_Stash")); isAutoStash.setSelected(false); diff --git a/designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java b/designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java index 8006c818a1..8fe72c0952 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ValueWidgetPane.java @@ -27,7 +27,8 @@ public class ValueWidgetPane extends WidgetPane { public JPanel initNorthPane(){ JPanel northPane = super.initNorthPane(); - label = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Value"})+ ":"); +// label = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Widget", "Value"})+ ":"); + label = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Value")+ ":"); label.setVisible(false); widgetValuePane = new JPanel(); widgetValuePane.setLayout(FRGUIPaneFactory.createBorderLayout()); diff --git a/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java b/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java index 01a8ee9d92..7fd3d95e00 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java @@ -81,7 +81,8 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener double[] columnSize = {p, p, f}; double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_Selection", "FR-Designer_Widget"})), emptyLabel, editorTypeComboBox}, +// new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Designer_Selection", "FR-Designer_Widget"})), emptyLabel, editorTypeComboBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Select_Widget")), emptyLabel, editorTypeComboBox}, }; JPanel jPanel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); return jPanel; diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java index fb6f2442d7..8d76a49130 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java @@ -37,7 +37,8 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane