From 0223d79b55fa335105cbb1066df5d0d85dc0b73d Mon Sep 17 00:00:00 2001 From: "alex.sung" Date: Mon, 13 Aug 2018 11:53:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=96=87=E4=BB=B6=E5=8F=8A=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/help/TutorialAction.java | 2 +- .../actions/help/alphafine/AlphaFineConfigPane.java | 2 +- .../design/actions/server/ProcedureListAction.java | 2 +- .../com/fr/design/condition/LiteConditionPane.java | 2 +- .../com/fr/design/data/BasicTableDataTreePane.java | 2 +- .../data/datapane/TableDataCreatorProducer.java | 2 +- .../fr/design/data/datapane/TableDataSourceOP.java | 2 +- .../fr/design/data/datapane/connect/JDBCDefPane.java | 2 +- .../tabledatapane/ProcedureManagerPane.java | 2 +- .../com/fr/design/file/SaveSomeTemplatePane.java | 2 +- .../fr/design/gui/controlpane/JListControlPane.java | 2 +- .../fr/design/gui/controlpane/UIListControlPane.java | 2 +- .../com/fr/design/gui/frpane/JTreeAutoBuildPane.java | 4 ++-- .../com/fr/design/gui/frpane/UICorrelationPane.java | 2 +- .../mainframe/DesignerFrameFileDealerPane.java | 2 +- .../backgroundpane/PatternBackgroundQuickPane.java | 2 +- .../design/mainframe/loghandler/LogHandlerBarUI.java | 2 +- .../fr/design/mainframe/toolbar/ToolBarMenuDock.java | 2 +- .../com/fr/design/present/dict/CustomDictPane.java | 2 +- .../background/BackgroundCardSwitchButtonPane.java | 2 +- .../design/style/background/BackgroundFactory.java | 12 ++++++------ .../design/style/background/BackgroundTabPane.java | 2 +- .../style/background/BackgroundUIComboBoxPane.java | 2 +- .../style/background/image/ImageSelectPane.java | 2 +- .../com/fr/design/style/color/ColorSelectDialog.java | 2 +- .../widget/btn/ButtonWithHotkeysDetailPane.java | 2 +- .../design/mainframe/chart/PaneTitleConstants.java | 2 +- .../mainframe/chart/gui/data/CalculateComboBox.java | 4 ++-- .../fr/design/designer/creator/XCheckBoxGroup.java | 2 +- .../com/fr/design/designer/creator/XRadioGroup.java | 2 +- .../design/designer/properties/BoundsGroupModel.java | 2 +- .../properties/FRFormLayoutPropertiesGroupModel.java | 2 +- .../properties/MultiSelectionBoundsModel.java | 2 +- .../designer/properties/items/UnderlineItems.java | 2 +- .../design/form/parameter/RootDesignGroupModel.java | 2 +- .../com/fr/design/gui/xpane/JTreeAutoBuildPane.java | 4 ++-- .../com/fr/design/mainframe/WidgetToolBarPane.java | 2 +- .../fr/design/parameter/RootDesignDefinePane.java | 2 +- .../design/widget/ui/designer/ButtonDefinePane.java | 2 +- .../widget/ui/designer/ButtonGroupDictPane.java | 2 +- .../design/actions/cell/UIToolbarBorderButton.java | 2 +- .../file/export/EmbeddedExportExportAction.java | 2 +- .../design/actions/file/export/WordExportAction.java | 2 +- .../com/fr/design/dscolumn/DSColumnAdvancedPane.java | 4 ++-- .../fr/design/dscolumn/DSColumnConditionsPane.java | 2 +- .../fr/design/dscolumn/ResultSetGroupPopUpPane.java | 6 +++--- .../search/manager/impl/DocumentSearchManager.java | 8 ++++---- .../com/fr/design/widget/ui/ButtonGroupDictPane.java | 2 +- .../main/java/com/fr/poly/group/PolyBoundsGroup.java | 2 +- 49 files changed, 63 insertions(+), 63 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java b/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java index c0e255af7b..91cfb57120 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java @@ -107,7 +107,7 @@ public class TutorialAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java index 707f76a9f1..ff421e3e68 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java @@ -91,7 +91,7 @@ public class AlphaFineConfigPane extends BasicPane { isContainRecommendCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_Recommend")); isContainActionCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Set")); isContainPluginCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Plugin_Addon")); - isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP")); + isContainDocumentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help")); isContainTemplateCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Templates")); isContainFileContentCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Templates_Content")); JPanel searchConfigPane = TableLayoutHelper.createTableLayoutPane(initSearchRangeComponents(), rowSize, columnSize); diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java index 0761568846..9989182d48 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/ProcedureListAction.java @@ -20,7 +20,7 @@ import java.awt.event.ActionEvent; public class ProcedureListAction extends UpdateAction { public ProcedureListAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure") + "(P)" + "..."); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure") + "(P)" + "..."); this.setMnemonic('P'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/data/store_procedure.png")); } diff --git a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java index 9ccfee0f6d..1c6fe24f2b 100644 --- a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java @@ -583,7 +583,7 @@ public abstract class LiteConditionPane extends BasicBeanPa @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Submit_Condition"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition"); } // samuel:移出来，方便调用 diff --git a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java index 5bf3709b6d..86e0666e16 100644 --- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java @@ -138,7 +138,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp } private boolean isProcedureName(String oldName) { - return oldName.length() >= PROCEDURE_NAME_INDEX && ComparatorUtils.equals(type, com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")); + return oldName.length() >= PROCEDURE_NAME_INDEX && ComparatorUtils.equals(type, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure")); } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java index a24169b094..0107bd0b78 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java @@ -56,7 +56,7 @@ public class TableDataCreatorProducer { return true; } }; - TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"), + TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"), "Proc", "/com/fr/design/images/data/store_procedure.png", StoreProcedure.class, ProcedureDataPane.class) { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java index 33a065df13..9c19013901 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataSourceOP.java @@ -112,7 +112,7 @@ public class TableDataSourceOP implements UserObjectOP { } private ExpandMutableTreeNode initStoreProcedureNode(Map storeProcedureMap) { - ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"), STORE_PRECEDURE_DATA), false); + ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"), STORE_PRECEDURE_DATA), false); templateNode.addChildTreeNodes(getNodeArrayFromMap(storeProcedureMap)); return templateNode; } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java index 5db872530a..1f999fa27e 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java @@ -336,7 +336,7 @@ public class JDBCDefPane extends JPanel { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_VALIDATION_QUERY") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Validation_Query") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE}, diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java index 3c306e8df5..ff905a3fd4 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureManagerPane.java @@ -22,7 +22,7 @@ public class ProcedureManagerPane extends LoadingBasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"); } public void populate(ProcedureConfig procedureConfig) { diff --git a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java index d438a7f359..295b63385b 100644 --- a/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/file/SaveSomeTemplatePane.java @@ -1 +1 @@ -package com.fr.design.file; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilist.UIList; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.ProductConstants; import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; /** * Author : daisy * Date: 13-8-9 * Time: 下午3:41 */ public class SaveSomeTemplatePane extends BasicPane { private UICheckBox[] templateCheckBoxes = null; private BasicDialog dialog; private JPanel templatesChoosePane; private UIScrollPane scrollPane; private java.util.List> unSavedTemplate = new ArrayList>(); private boolean isAllSaved = false; //该变量用来判断是在关闭其他模板或是关闭设计器的时候，是否需要判断当前模板有没有保存 private boolean isJudgeCurrentEditingTemplate = true; public SaveSomeTemplatePane(boolean isNeedTojudgeCurrent) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); if (this.dialog == null) { this.dialog = this.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { @Override public void doOk() { for (int i = 0; i < templateCheckBoxes.length; i++) { if (templateCheckBoxes[i].isSelected()) { saveSelectedTemplate(unSavedTemplate.get(i)); } } isAllSaved = true; } public void doCancel() { isAllSaved = false; } }); } UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_The_Source_To_Save")); this.add(tip, BorderLayout.NORTH); templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane); this.add(scrollPane, BorderLayout.CENTER); this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent; } private void initTemplatesChoosePane() { templatesChoosePane.setBorder(BorderFactory.createTitledBorder("")); for (int i = 0; i < unSavedTemplate.size(); i++) { templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName()); templateCheckBoxes[i].setSelected(true); } final UIList templatesList = new UIList(templateCheckBoxes); templatesList.setModel(new UnSeletedTemplateListDataMode()); templatesList.setCellRenderer(new UnSelectedListCellRender()); templatesList.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { super.mousePressed(e); int index = templatesList.getSelectedIndex(); if (index < 0) { return; } UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(index); checkBox.setSelected(!checkBox.isSelected()); templatesList.repaint(); } }); final UICheckBox filenameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Choose_All")); filenameCheckBox.setSelected(true); filenameCheckBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { boolean isSelected = filenameCheckBox.isSelected(); for (int i = 0; i < templatesList.getModel().getSize(); i++) { UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(i); checkBox.setSelected(isSelected); } templatesList.repaint(); } }); templatesChoosePane.add(filenameCheckBox, BorderLayout.NORTH); templatesChoosePane.add(templatesList, BorderLayout.CENTER); } public boolean showSavePane() { populate(); //如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目 if (!unSavedTemplate.isEmpty()) { dialog.setVisible(true); } else { isAllSaved = true; } return isAllSaved; } public void populate() { java.util.List> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList(); JTemplate currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); for (int i = 0; i < opendedTemplate.size(); i++) { if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) { unSavedTemplate.add(opendedTemplate.get(i)); } } templateCheckBoxes = new UICheckBox[unSavedTemplate.size()]; initTemplatesChoosePane(); } private boolean isneedToAdd(JTemplate template, JTemplate currentTemplate) { //所有模板都判断是不是保存 if (isJudgeCurrentEditingTemplate) { return !template.isALLSaved(); } //当前编辑的模板不判断是否已经保存 if (ComparatorUtils.equals(template, currentTemplate)) { return false; } else { return !template.isALLSaved(); } } private void saveSelectedTemplate(JTemplate specifiedTemplate) { if (!specifiedTemplate.isSaved()) { specifiedTemplate.stopEditing(); specifiedTemplate.saveTemplate(); } FineLoggerFactory.getLogger().info( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } public int saveLastOneTemplate() { JTemplate specifiedTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); if (!specifiedTemplate.isALLSaved()) { specifiedTemplate.stopEditing(); int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) { specifiedTemplate.saveTemplate(); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } return returnVal; } return JOptionPane.YES_OPTION; } protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save"); } private class UnSelectedListCellRender extends DefaultListCellRenderer { @Override public Component getListCellRendererComponent(JList list, Object value, int index, final boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); templateCheckBoxes[index] = (UICheckBox) value; templateCheckBoxes[index].setBackground(list.getBackground()); return templateCheckBoxes[index]; } } private class UnSeletedTemplateListDataMode extends AbstractListModel { @Override public int getSize() { return templateCheckBoxes.length; } @Override public UICheckBox getElementAt(int index) { if (index > getSize() - 1 || index < 0) { return null; } return templateCheckBoxes[index]; } } } \ No newline at end of file +package com.fr.design.file; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilist.UIList; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.general.ComparatorUtils; import com.fr.log.FineLoggerFactory; import com.fr.stable.ProductConstants; import javax.swing.*; import java.awt.*; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; /** * Author : daisy * Date: 13-8-9 * Time: 下午3:41 */ public class SaveSomeTemplatePane extends BasicPane { private UICheckBox[] templateCheckBoxes = null; private BasicDialog dialog; private JPanel templatesChoosePane; private UIScrollPane scrollPane; private java.util.List> unSavedTemplate = new ArrayList>(); private boolean isAllSaved = false; //该变量用来判断是在关闭其他模板或是关闭设计器的时候，是否需要判断当前模板有没有保存 private boolean isJudgeCurrentEditingTemplate = true; public SaveSomeTemplatePane(boolean isNeedTojudgeCurrent) { this.setLayout(FRGUIPaneFactory.createBorderLayout()); if (this.dialog == null) { this.dialog = this.showSmallWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() { @Override public void doOk() { for (int i = 0; i < templateCheckBoxes.length; i++) { if (templateCheckBoxes[i].isSelected()) { saveSelectedTemplate(unSavedTemplate.get(i)); } } isAllSaved = true; } public void doCancel() { isAllSaved = false; } }); } UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select_The_Source_To_Save")); this.add(tip, BorderLayout.NORTH); templatesChoosePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); UIScrollPane scrollPane = new UIScrollPane(templatesChoosePane); this.add(scrollPane, BorderLayout.CENTER); this.isJudgeCurrentEditingTemplate = isNeedTojudgeCurrent; } private void initTemplatesChoosePane() { templatesChoosePane.setBorder(BorderFactory.createTitledBorder("")); for (int i = 0; i < unSavedTemplate.size(); i++) { templateCheckBoxes[i] = new UICheckBox(unSavedTemplate.get(i).getEditingFILE().getName()); templateCheckBoxes[i].setSelected(true); } final UIList templatesList = new UIList(templateCheckBoxes); templatesList.setModel(new UnSeletedTemplateListDataMode()); templatesList.setCellRenderer(new UnSelectedListCellRender()); templatesList.addMouseListener(new MouseAdapter() { public void mousePressed(MouseEvent e) { super.mousePressed(e); int index = templatesList.getSelectedIndex(); if (index < 0) { return; } UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(index); checkBox.setSelected(!checkBox.isSelected()); templatesList.repaint(); } }); final UICheckBox filenameCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Choose_All")); filenameCheckBox.setSelected(true); filenameCheckBox.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { boolean isSelected = filenameCheckBox.isSelected(); for (int i = 0; i < templatesList.getModel().getSize(); i++) { UICheckBox checkBox = (UICheckBox) templatesList.getModel().getElementAt(i); checkBox.setSelected(isSelected); } templatesList.repaint(); } }); templatesChoosePane.add(filenameCheckBox, BorderLayout.NORTH); templatesChoosePane.add(templatesList, BorderLayout.CENTER); } public boolean showSavePane() { populate(); //如果有未保存的文件 ，则跳出保存对话框，选择要存储的项目 if (!unSavedTemplate.isEmpty()) { dialog.setVisible(true); } else { isAllSaved = true; } return isAllSaved; } public void populate() { java.util.List> opendedTemplate = HistoryTemplateListPane.getInstance().getHistoryList(); JTemplate currentTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); for (int i = 0; i < opendedTemplate.size(); i++) { if (isneedToAdd(opendedTemplate.get(i), currentTemplate)) { unSavedTemplate.add(opendedTemplate.get(i)); } } templateCheckBoxes = new UICheckBox[unSavedTemplate.size()]; initTemplatesChoosePane(); } private boolean isneedToAdd(JTemplate template, JTemplate currentTemplate) { //所有模板都判断是不是保存 if (isJudgeCurrentEditingTemplate) { return !template.isALLSaved(); } //当前编辑的模板不判断是否已经保存 if (ComparatorUtils.equals(template, currentTemplate)) { return false; } else { return !template.isALLSaved(); } } private void saveSelectedTemplate(JTemplate specifiedTemplate) { if (!specifiedTemplate.isSaved()) { specifiedTemplate.stopEditing(); specifiedTemplate.saveTemplate(); } FineLoggerFactory.getLogger().info( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } public int saveLastOneTemplate() { JTemplate specifiedTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate(); if (!specifiedTemplate.isALLSaved()) { specifiedTemplate.stopEditing(); int returnVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Would_You_Like_To_Save") + " \"" + specifiedTemplate.getEditingFILE() + "\" ?", ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) { specifiedTemplate.saveTemplate(); FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName())); } return returnVal; } return JOptionPane.YES_OPTION; } protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Save"); } private class UnSelectedListCellRender extends DefaultListCellRenderer { @Override public Component getListCellRendererComponent(JList list, Object value, int index, final boolean isSelected, boolean cellHasFocus) { super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus); templateCheckBoxes[index] = (UICheckBox) value; templateCheckBoxes[index].setBackground(list.getBackground()); return templateCheckBoxes[index]; } } private class UnSeletedTemplateListDataMode extends AbstractListModel { @Override public int getSize() { return templateCheckBoxes.length; } @Override public UICheckBox getElementAt(int index) { if (index > getSize() - 1 || index < 0) { return null; } return templateCheckBoxes[index]; } } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java index badb658c9d..6957f05dd0 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java @@ -384,7 +384,7 @@ public abstract class JListControlPane extends JControlPane { if (filterNameableCreator(creator)) { continue; } - boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) || + boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database")); if (isTrue) { this.addShortCut(new LineSeparator()); diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java index 53afbbe706..eac81beb07 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java @@ -467,7 +467,7 @@ public abstract class UIListControlPane extends UIControlPane { if (!whetherAdd(creator.menuName())) { continue; } - boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) || + boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database")); if (isTrue) { this.addShortCut(new LineSeparator()); diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java index 73d66cc867..18ac4e2459 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java @@ -78,9 +78,9 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); Component[][] coms = { - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Actual_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + ":"), valuePane}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value") + ":"), textPane}}; double p = TableLayout.PREFERRED; diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java index e8ea9fdaf5..3a23a478c3 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/UICorrelationPane.java @@ -386,7 +386,7 @@ public class UICorrelationPane extends JPanel implements UIObserver { */ public static void main(String... args) { JFrame jf = new JFrame("test"); - final String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Display_Value")}; + final String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value")}; jf.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); JPanel content = (JPanel) jf.getContentPane(); content.setLayout(new BorderLayout()); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index 3d831754d8..a0d93a868b 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java @@ -459,7 +459,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt } }); - UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cancel")); + UIButton cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")); cancelButton.setPreferredSize(new Dimension(80, 25)); cancelButton.setMinimumSize(new Dimension(80, 25)); cancelButton.setMaximumSize(new Dimension(80, 25)); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java index ba1e856b94..e82146824c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/PatternBackgroundQuickPane.java @@ -213,7 +213,7 @@ public class PatternBackgroundQuickPane extends BackgroundQuickPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background-Pattern"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java index 6c6c6545f8..4eb214358c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/loghandler/LogHandlerBarUI.java @@ -101,7 +101,7 @@ public class LogHandlerBarUI extends ComponentUI implements MouseListener, Focus } g.drawString(com.fr.design.i18n.Toolkit.i18nText("NNormal") + '(' + button.getInfo() + ')', button.getWidth() - 310, y); - g.drawString(com.fr.design.i18n.Toolkit.i18nText("Alert") + '(' + button.getError() + ')', button.getWidth() - 250, y); + g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alert") + '(' + button.getError() + ')', button.getWidth() - 250, y); g.drawString(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Seriously") + '(' + button.getServer() + ')', button.getWidth() - 190, y); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index 9489868d02..0e9997a488 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -506,7 +506,7 @@ public abstract class ToolBarMenuDock { } public MenuDef createCommunityMenuDef() { - MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY"), 'C'); + MenuDef menuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Community"), 'C'); ShortCut[] otherCommunityShortCuts = createCommunityShortCuts(); for (ShortCut shortCut : otherCommunityShortCuts) { menuDef.addShortCut(shortCut); diff --git a/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java b/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java index 9819fa0a08..204395ac12 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java @@ -15,7 +15,7 @@ import com.fr.stable.StringUtils; public class CustomDictPane extends FurtherBasicBeanPane { private static final long serialVersionUID = 1L; - private String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Display_Value")}; // 字典列名key,value + private String[] columnNames = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value")}; // 字典列名key,value private CustomDictCorrelationPane correlationPane; diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java index 7757c6bc60..ed8afc9e4d 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundCardSwitchButtonPane.java @@ -31,7 +31,7 @@ public class BackgroundCardSwitchButtonPane extends BackgroundButtonPane { map.put(ColorBackground.class, BackgroundUIWrapper.create() .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color"))); map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); + .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image"))); map.put(GradientBackground.class, BackgroundUIWrapper.create() .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color"))); diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundFactory.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundFactory.java index c3960daeb6..7f8669d6a8 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundFactory.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundFactory.java @@ -92,32 +92,32 @@ public class BackgroundFactory { private static void registerUniversal(Map, BackgroundUIWrapper> map) { map.put(null, BackgroundUIWrapper.create() - .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Null"))); + .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Null"))); map.put(ColorBackground.class, BackgroundUIWrapper.create() .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color"))); map.put(TextureBackground.class, BackgroundUIWrapper.create() - .setType(TextureBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Texture"))); + .setType(TextureBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture"))); map.put(PatternBackground.class, BackgroundUIWrapper.create() - .setType(PatternBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Pattern"))); + .setType(PatternBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern"))); map.put(GradientBackground.class, BackgroundUIWrapper.create() .setType(GradientBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Gradient_Color"))); } private static void registerImageBackground(Map, BackgroundUIWrapper> map) { map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); + .setType(ImageBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image"))); } private static void registerBrowserImageBackground(Map, BackgroundUIWrapper> map) { map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageBackgroundPane4Browser.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); + .setType(ImageBackgroundPane4Browser.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image"))); } private static void registerButtonBackground(Map, BackgroundUIWrapper> map){ map.put(ColorBackground.class, BackgroundUIWrapper.create() .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color"))); map.put(ImageFileBackground.class, BackgroundUIWrapper.create() - .setType(ImageButtonBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Image"))); + .setType(ImageButtonBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image"))); } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java index f62ee2afdb..08d2a2e6a4 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundTabPane.java @@ -27,7 +27,7 @@ public class BackgroundTabPane extends BackgroundPane { private static void registerTabpaneBackground(Map, BackgroundUIWrapper> map) { map.put(null, BackgroundUIWrapper.create() - .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Background_Null"))); + .setType(NullBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Null"))); map.put(ColorBackground.class, BackgroundUIWrapper.create() .setType(ColorBackgroundPane.class).setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Color"))); map.put(GradientBackground.class, BackgroundUIWrapper.create() diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java index cb85cea46e..1b28aa0ab5 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundUIComboBoxPane.java @@ -28,7 +28,7 @@ import java.awt.event.ItemListener; public class BackgroundUIComboBoxPane extends BasicPane { private static final long serialVersionUID = -3751191424737067321L; - protected static final String none = com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"); + protected static final String none = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None"); protected static final String color = com.fr.design.i18n.Toolkit.i18nText("Colors"); protected static final String image = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Image"); protected static final String gradient = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Gradient_Color"); diff --git a/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java b/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java index dac87c57fa..3cfbf7ab48 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/image/ImageSelectPane.java @@ -77,7 +77,7 @@ public class ImageSelectPane extends BackgroundPane4BoxChange { selectPictureButton.addActionListener(selectPictureActionListener); //布局 - selectFilePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Layout") + ":")); + selectFilePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Layout") + ":")); layoutComboBox = new UIComboBox(layoutTypes); selectFilePane.add(layoutComboBox); diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java index d61f7046eb..4abacdd4b5 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java @@ -93,7 +93,7 @@ public class ColorSelectDialog extends MiddleChartDialog{ this.add(buttonPane, BorderLayout.SOUTH); ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_OK")); - cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button_Cancel")); + cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Cancel")); buttonPane.add(ok); buttonPane.add(cancel); diff --git a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java index 1707b4b9c4..b75aeaa81f 100644 --- a/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java +++ b/designer-base/src/main/java/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java @@ -44,7 +44,7 @@ public abstract class ButtonWithHotkeysDetailPane extends Butt labelPane.add(iconPane); Component[][] n_components = { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Button_Type")), createButtonTypeComboBox()}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Name")), buttonNameTextField = new UITextField()}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")), buttonNameTextField = new UITextField()}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Icon")), iconPane}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Hot_keys")), hotkeysTextField = new UITextField()}, }; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java index 1fa083aff7..7b4e38cbc3 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/PaneTitleConstants.java @@ -15,7 +15,7 @@ public class PaneTitleConstants { public final static String CHART_STYLE_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Background"); public final static String CHART_STYLE_DATA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Chart_Data_Sheet"); public final static String CHART_STYLE_LABEL_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Label"); - public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("AnalysisLine"); + public final static String CHART_STYLE_LINE_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Analysis_Line"); public final static String CHART_STYLE_AREA_AREA_TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_D_Chart_Area"); public final static String CHART_STYLE_AREA_PLOT_TITLE = com.fr.design.i18n.Toolkit.i18nText("ChartF-Plot"); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java index 494d858254..f66b0fb01b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/CalculateComboBox.java @@ -19,7 +19,7 @@ import com.fr.log.FineLoggerFactory; */ public class CalculateComboBox extends UIComboBox{ - public static final String[] CALCULATE_ARRAY = {com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Sum"), + public static final String[] CALCULATE_ARRAY = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Sum"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Average"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Max"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Min"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_Count")}; public static final Class[] CLASS_ARRAY = {NoneFunction.class, SumFunction.class, AverageFunction.class, @@ -31,7 +31,7 @@ public class CalculateComboBox extends UIComboBox{ } public void reset() { - this.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("DataFunction-None")); + this.setSelectedItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None")); } /** diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java index 2f74e37d13..1b94afae0f 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java @@ -45,7 +45,7 @@ public class XCheckBoxGroup extends XFieldEditor { private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException { CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] { - new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Adaptive")) + new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class), new CRPropertyDescriptor("chooseAll", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Choose_Type_All")).putKeyValue( diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java b/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java index f85c984519..7a252c17db 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XRadioGroup.java @@ -52,7 +52,7 @@ public class XRadioGroup extends XFieldEditor { private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException { CRPropertyDescriptor[] crp = new CRPropertyDescriptor[] { - new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Adaptive")) + new CRPropertyDescriptor("adaptive", this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced").setEditorClass(InChangeBooleanEditor.class)}; if (!toData().isAdaptive()) { crp = (CRPropertyDescriptor[]) ArrayUtils.add(crp, new CRPropertyDescriptor("columnsInRow", this.data diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java index 17056e3c4b..735aa9ecf9 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java @@ -34,7 +34,7 @@ public class BoundsGroupModel implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Component_Bounds"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Bounds"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRFormLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRFormLayoutPropertiesGroupModel.java index 10692f7aaa..b4a94de5a7 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRFormLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRFormLayoutPropertiesGroupModel.java @@ -30,7 +30,7 @@ public class FRFormLayoutPropertiesGroupModel implements GroupModel{ @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Component_Bounds"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Bounds"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java index a403e48b3c..3a8996bc12 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java @@ -34,7 +34,7 @@ public class MultiSelectionBoundsModel implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Component_Bounds"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Bounds"); } @Override diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java b/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java index 77278ae5ff..f35f099d8f 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/items/UnderlineItems.java @@ -5,7 +5,7 @@ package com.fr.design.designer.properties.items; public class UnderlineItems implements ItemProvider { private static Item[] VALUE_ITEMS = { - new Item(com.fr.design.i18n.Toolkit.i18nText("DataFunction-None"), ""), + new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Function_None"), ""), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Top"), "overline"), new Item(com.fr.design.i18n.Toolkit.i18nText("Center"), "line-through"), new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_StyleAlignment_Bottom"), "underline")}; diff --git a/designer-form/src/main/java/com/fr/design/form/parameter/RootDesignGroupModel.java b/designer-form/src/main/java/com/fr/design/form/parameter/RootDesignGroupModel.java index a7c0c930ca..6092d2f8c4 100644 --- a/designer-form/src/main/java/com/fr/design/form/parameter/RootDesignGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/form/parameter/RootDesignGroupModel.java @@ -1 +1 @@ -/* * Copyright(c) 2001-2011, FineReport Inc, All Rights Reserved. */ package com.fr.design.form.parameter; import java.awt.Component; import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.creator.XWParameterLayout; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; /** * Created by IntelliJ IDEA. * User : Richer * Version: 6.5.5 * Date : 11-7-5 * Time : 下午2:56 */ public class RootDesignGroupModel implements ConstraintsGroupModel { private DefaultTableCellRenderer renderer; private PropertyCellEditor editor; private XWParameterLayout root; public RootDesignGroupModel(XWParameterLayout root) { this.root = root; renderer = new DefaultTableCellRenderer(); editor = new PropertyCellEditor(new IntegerPropertyEditor()); //初始值为参数面板的初始宽度 if (root.toData().getDesignWidth() == 0){ root.toData().setDesignWidth(root.getWidth()); } } @Override public String getGroupName() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Design_Size"); } @Override public int getRowCount() { return 1; } @Override public TableCellRenderer getRenderer(int row) { return renderer; } @Override public TableCellEditor getEditor(int row) { return editor; } @Override public Object getValue(int row, int column) { if (column == 0) { switch (row) { case 0: return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Desin_Width"); } } else { switch (row) { case 0: return root.toData().getDesignWidth(); } } return null; } @Override public boolean setValue(Object value, int row, int column) { if (column == 1) { int designerWidth = value == null ? 0 : ((Number) value).intValue(); switch (row) { case 0: if(isCompsOutOfDesignerWidth(designerWidth)){ return false; } root.toData().setDesignWidth(designerWidth); return true; default: return true; } } else { return false; } } private boolean isCompsOutOfDesignerWidth(int designerWidth){ for(int i=0; i designerWidth){ return true; } } return false; } /** * 改行是否可编辑 * @param row 行号 * @return 第row行可编辑返回true，否则返回false */ public boolean isEditable(int row) { return true; } } \ No newline at end of file +/* * Copyright(c) 2001-2011, FineReport Inc, All Rights Reserved. */ package com.fr.design.form.parameter; import java.awt.Component; import com.fr.design.designer.beans.ConstraintsGroupModel; import com.fr.design.designer.creator.XWParameterLayout; import com.fr.design.mainframe.widget.editors.IntegerPropertyEditor; import com.fr.design.mainframe.widget.editors.PropertyCellEditor; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; /** * Created by IntelliJ IDEA. * User : Richer * Version: 6.5.5 * Date : 11-7-5 * Time : 下午2:56 */ public class RootDesignGroupModel implements ConstraintsGroupModel { private DefaultTableCellRenderer renderer; private PropertyCellEditor editor; private XWParameterLayout root; public RootDesignGroupModel(XWParameterLayout root) { this.root = root; renderer = new DefaultTableCellRenderer(); editor = new PropertyCellEditor(new IntegerPropertyEditor()); //初始值为参数面板的初始宽度 if (root.toData().getDesignWidth() == 0){ root.toData().setDesignWidth(root.getWidth()); } } @Override public String getGroupName() { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Design_Size"); } @Override public int getRowCount() { return 1; } @Override public TableCellRenderer getRenderer(int row) { return renderer; } @Override public TableCellEditor getEditor(int row) { return editor; } @Override public Object getValue(int row, int column) { if (column == 0) { switch (row) { case 0: return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Desin_Width"); } } else { switch (row) { case 0: return root.toData().getDesignWidth(); } } return null; } @Override public boolean setValue(Object value, int row, int column) { if (column == 1) { int designerWidth = value == null ? 0 : ((Number) value).intValue(); switch (row) { case 0: if(isCompsOutOfDesignerWidth(designerWidth)){ return false; } root.toData().setDesignWidth(designerWidth); return true; default: return true; } } else { return false; } } private boolean isCompsOutOfDesignerWidth(int designerWidth){ for(int i=0; i designerWidth){ return true; } } return false; } /** * 改行是否可编辑 * @param row 行号 * @return 第row行可编辑返回true，否则返回false */ public boolean isEditable(int row) { return true; } } \ No newline at end of file diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java index 7c36577f54..c92db66a6c 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java @@ -73,9 +73,9 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor}); Component[][] coms = { - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Actual_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Actual_Value") + ":"), valuePane}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Display_Value") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Display_Value") + ":"), textPane}}; double p = TableLayout.PREFERRED; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java index f681d73869..df250a0ac7 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetToolBarPane.java @@ -134,7 +134,7 @@ public class WidgetToolBarPane extends BasicPane implements DesignToolbarProvide private void initFormButtons() { if (componentsList4Form.isEmpty()) { // 表单布局 - this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Form-Layout"))); + this.componentsList4Form.add(new TitleLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Form_Layout"))); WidgetOption[] containerWidgetArray = FormWidgetOption.getFormContainerInstance(); for (WidgetOption no : containerWidgetArray) { this.componentsList4Form.add(new ToolBarButton(no)); diff --git a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java index d994d3531c..75a8c61fe5 100644 --- a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java @@ -73,7 +73,7 @@ public class RootDesignDefinePane extends AbstractDataModify { double[] columnSize = {p, f}; int[][] rowCount = {{1, 1}}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Desin_Width")), designerWidth}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Desin_Width")), designerWidth}, }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane(); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java index 290870430c..6d8191c2f9 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonDefinePane.java @@ -45,7 +45,7 @@ public abstract class ButtonDefinePane extends AbstractDataMod UILabel backgroundLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Background")); backgroundLabel.setVerticalAlignment(SwingConstants.TOP); Component[][] n_components = { - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Button-Name")), buttonNameTextField}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Name")), buttonNameTextField}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField}, backgroundCompPane, frFont, diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java index b80edf3e82..500d42a1cd 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ButtonGroupDictPane.java @@ -30,7 +30,7 @@ public class ButtonGroupDictPane extends JPanel { this.setLayout(FRGUIPaneFactory.createBorderLayout()); - adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Adaptive"), true); + adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"), true); adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.columnLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns") + ":"); columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1)); diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java b/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java index ff587291a4..304ec1676f 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java @@ -289,7 +289,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH Constants.LINE_THIN, Color.black, Constants.LINE_NONE, Color.black, Constants.LINE_NONE), new CellBorderStyle(Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_THICK, Color.black, Constants.LINE_NONE, Color.black, Constants.LINE_NONE) }; - private static final String[] BorderStyleTooltips = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_No_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Bottom_Border_Line"), + private static final String[] BorderStyleTooltips = { com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_No_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Left_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Right_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Double_Bottom_BorderLine"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Thick_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_And_Double_Bottom_Border_Line"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Top_And_Thick_Bottom_Border_Line"), diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/export/EmbeddedExportExportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/export/EmbeddedExportExportAction.java index 347c4adc16..b11024bf8e 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/export/EmbeddedExportExportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/EmbeddedExportExportAction.java @@ -34,7 +34,7 @@ public class EmbeddedExportExportAction extends AbstractExportAction { @Override protected ChooseFileFilter getChooseFileFilter() { return new ChooseFileFilter(EnumSet.of(FileExtension.CPTX, FileExtension.CPT), - com.fr.design.i18n.Toolkit.i18nText("Export-Template(embedded_data)")); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Template(Embedded_Data)")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java index c35af5db83..803a680c52 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java @@ -34,7 +34,7 @@ public class WordExportAction extends AbstractExportAction { @Override protected ChooseFileFilter getChooseFileFilter() { - return new ChooseFileFilter(FileExtension.DOC, com.fr.design.i18n.Toolkit.i18nText("Export-Word")); + return new ChooseFileFilter(FileExtension.DOC, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Export_Word")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java index 94eff08acc..d04a3929c2 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java @@ -333,9 +333,9 @@ public class DSColumnAdvancedPane extends BasicPane { bottomFormulaPane = new JFormulaField("-1"); serialTextField = new UITextField(18); JPanel oddPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Result_Serial_Number_Start_From_1") - + " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Odd_Selected_(1,3,5...)")), FlowLayout.LEFT); + + " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Odd_Selected_(1,3,5...)")), FlowLayout.LEFT); JPanel evenPane = GUICoreUtils.createFlowPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Result_Serial_Number_Start_From_1") - + " " + com.fr.design.i18n.Toolkit.i18nText("BindColumn-Even_Selected_(2,4,6...)")), FlowLayout.LEFT); + + " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Even_Selected_(2,4,6...)")), FlowLayout.LEFT); JPanel specifyPane = GUICoreUtils.createFlowPane(new JComponent[]{ serialTextField, new UILabel( com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_DSColumn_Result_Group_Format", "1,2-3,5,8", "$__count__") diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java index 3ff74bca22..4d6a1e62ac 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnConditionsPane.java @@ -50,7 +50,7 @@ public class DSColumnConditionsPane extends BasicPane { // pane.setLayout(new BoxLayout(pane, BoxLayout.X_AXIS)); pane.add(new UILabel(INSET_TEXT)); - reselectExpandCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("BindColumn-Extend_the_conditions_of_fatherCell(Applied_to_the_data_contains_other_data)"), false); + reselectExpandCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Bind_Column_Extend_The_Conditions_of_Father_Cell(Applied_To_The_Data_Contains_Other_Data)"), false); pane.add(reselectExpandCheckBox); reselectExpandCheckBox.setSelected(true); diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPopUpPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPopUpPane.java index 13776c093e..aecb825aa8 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPopUpPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPopUpPane.java @@ -46,7 +46,7 @@ public class ResultSetGroupPopUpPane extends ResultSetGroupPane { this.setLayout(FRGUIPaneFactory.create1ColumnGridLayout()); // 分组 - groupRadioButton = new UIRadioButton(Toolkit.i18nText("BindColumn-Group(Merger_the_Items_Which_Have_The_Same_Value_in_Column)")); + groupRadioButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Report_Bind_Column_Group(Merger_The_Items_Which_Have_The_Same_Value_in_Column)")); groupRadioButton.addActionListener(checkEnabledActionListener); groupComboBox.addItemListener(new ItemListener() { @@ -60,13 +60,13 @@ public class ResultSetGroupPopUpPane extends ResultSetGroupPane { new JComponent[]{new UILabel(InsertText), groupRadioButton, groupComboBox, advancedButton}, FlowLayout.LEFT)); // 列表 - listRadioButton = new UIRadioButton(Toolkit.i18nText("BindColumn-Select(Regardless_of_Having_the_Same_Value,Display_all_Item_in_Column)")); + listRadioButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Report_Bind_Column_Select(Regardless_of_Having_the_Same_Value,Display_All_Item_in_Column)")); listRadioButton.addActionListener(checkEnabledActionListener); this.add(GUICoreUtils.createFlowPane( new JComponent[]{new UILabel(InsertText), listRadioButton}, FlowLayout.LEFT)); // 汇总 - summaryRadioButton = new UIRadioButton(Toolkit.i18nText("BindColumn-Summary(Including_SUM_,_AVERAGE_,_MAX_,_MIN_And_So_On)"), true); + summaryRadioButton = new UIRadioButton(Toolkit.i18nText("Fine-Design_Report_Bind_Column_Summary(Including_SUM_,_AVERAGE_,_MAX_,_MIN_And_So_On)"), true); summaryRadioButton.addActionListener(checkEnabledActionListener); functionComboBox = new FunctionComboBox(GUICoreUtils.getFunctionArray()); this.add(GUICoreUtils.createFlowPane( diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java index 115a303299..59595229a3 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java @@ -54,7 +54,7 @@ public class DocumentSearchManager implements AlphaFineSearchProvider { lessModelList = new SearchResult(); moreModelList = new SearchResult(); if (StringUtils.isBlank(searchText)) { - lessModelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"))); + lessModelList.add(new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"))); return lessModelList; } if (DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().isContainDocument()) { @@ -82,10 +82,10 @@ public class DocumentSearchManager implements AlphaFineSearchProvider { if (searchResult.isEmpty()) { return lessModelList; } else if (searchResult.size() < AlphaFineConstants.SHOW_SIZE + 1) { - lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"))); + lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"))); lessModelList.addAll(searchResult); } else { - lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.DOCUMENT)); + lessModelList.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_ShowAll"), true, CellType.DOCUMENT)); lessModelList.addAll(searchResult.subList(0, AlphaFineConstants.SHOW_SIZE)); moreModelList.addAll(searchResult.subList(AlphaFineConstants.SHOW_SIZE, searchResult.size())); } @@ -104,7 +104,7 @@ public class DocumentSearchManager implements AlphaFineSearchProvider { */ private SearchResult getNoConnectList() { SearchResult result = new SearchResult(); - result.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_COMMUNITY_HELP"))); + result.add(0, new MoreModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Community_Help"))); result.add(AlphaFineHelper.NO_CONNECTION_MODEL); return result; } diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java index d8455b9232..9c908c6c8f 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java @@ -39,7 +39,7 @@ public class ButtonGroupDictPane extends JPanel { public void initComponents() { dictPane = new AccessibleDictionaryEditor(); this.setLayout(FRGUIPaneFactory.createBorderLayout()); - adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Adaptive"), true); + adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"), true); adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); adaptiveCheckbox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { diff --git a/designer-realize/src/main/java/com/fr/poly/group/PolyBoundsGroup.java b/designer-realize/src/main/java/com/fr/poly/group/PolyBoundsGroup.java index cffcf79c98..aadeb01785 100644 --- a/designer-realize/src/main/java/com/fr/poly/group/PolyBoundsGroup.java +++ b/designer-realize/src/main/java/com/fr/poly/group/PolyBoundsGroup.java @@ -31,7 +31,7 @@ public class PolyBoundsGroup implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Component_Bounds"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Component_Bounds"); } @Override From 6a0bfcad0123079c8c1c1e269523e73c2bc79c87 Mon Sep 17 00:00:00 2001 From: Harrison Date: Mon, 13 Aug 2018 14:05:21 +0800 Subject: [PATCH 2/6] =?UTF-8?q?REPORT-10025=2010.0=20&=205.0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=BE=9D=E6=8D=AE=E5=9B=BD=E9=99=85=E5=8C=96=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E8=B0=83=E6=95=B4=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/file/PreferencePane.java | 10 ++++---- .../help/alphafine/AlphaFineConfigPane.java | 2 +- .../design/condition/LiteConditionPane.java | 2 +- .../fr/design/data/datapane/ChoosePane.java | 2 +- .../design/editor/ValueEditorPaneFactory.java | 4 ++-- .../com/fr/design/gui/core/WidgetOption.java | 2 +- .../fr/design/gui/frpane/RegFieldPane.java | 2 +- .../fr/design/gui/style/AlignmentPane.java | 12 +++++----- .../com/fr/design/gui/style/FRFontPane.java | 2 +- .../com/fr/design/gui/style/FormatPane.java | 2 +- .../hyperlink/AbstractHyperNorthPane.java | 4 ++-- .../design/mainframe/AuthorityEditPane.java | 6 ++--- .../widget/accessibles/TemplateStylePane.java | 2 +- .../widget/editors/DataBindingEditor.java | 5 ++-- .../java/com/fr/design/menu/KeySetUtils.java | 4 ++-- .../design/present/dict/DictionaryPane.java | 5 ++-- .../com/fr/design/report/WatermarkPane.java | 4 ++-- .../widget/WidgetBoundsPaneFactory.java | 2 +- .../component/NumberEditorValidatePane.java | 2 +- .../impl/ChartHyperPopAttrPane.java | 2 +- .../chart/DownloadOnlineSourcesHelper.java | 2 +- .../component/VanChartTooltipContentPane.java | 4 ++-- .../designer/style/VanChartTitlePane.java | 2 +- .../design/designer/creator/XDateEditor.java | 2 +- .../fr/design/designer/creator/XLabel.java | 2 +- .../designer/creator/XNumberEditor.java | 2 +- .../fr/design/designer/creator/XPassword.java | 2 +- .../fr/design/designer/creator/XTextArea.java | 2 +- .../design/designer/creator/XTextEditor.java | 2 +- .../designer/creator/XTreeComboBoxEditor.java | 18 +++++++-------- .../creator/XWriteAbleRepeatEditor.java | 2 +- .../designer/properties/BoundsGroupModel.java | 4 ++-- .../ui/designer/CheckBoxDefinePane.java | 2 +- .../ui/designer/ComboBoxDefinePane.java | 2 +- .../ui/designer/ComboCheckBoxDefinePane.java | 2 +- .../ui/designer/DateEditorDefinePane.java | 2 +- .../ui/designer/FieldEditorDefinePane.java | 2 +- .../widget/ui/designer/LabelDefinePane.java | 2 +- .../ui/designer/NumberEditorDefinePane.java | 2 +- .../designer/TextFieldEditorDefinePane.java | 2 +- .../TreeComboBoxEditorDefinePane.java | 4 ++-- .../component/FormWidgetValuePane.java | 2 +- .../FRAbsoluteBodyLayoutDefinePane.java | 2 +- .../layout/FRFitLayoutDefinePane.java | 2 +- .../layout/WCardTagLayoutDefinePane.java | 10 ++++---- .../com/fr/design/condition/FontPane.java | 4 ++-- .../com/fr/design/condition/PaddingPane.java | 2 +- .../java/com/fr/design/condition/WHPane.java | 18 +++++++-------- .../design/condition/WidgetHighlightPane.java | 12 +++++----- .../mainframe/AuthorityEditToolBarPane.java | 4 ++-- .../ElementCasePaneAuthorityEditPane.java | 2 +- .../mainframe/SheetAuthorityEditPane.java | 4 ++-- .../manager/impl/FileSearchManager.java | 6 ++--- .../com/fr/design/present/BarCodePane.java | 2 +- .../com/fr/design/report/UnitFieldPane.java | 23 ++++++++----------- .../java/com/fr/design/widget/WidgetPane.java | 2 +- .../design/widget/ui/CheckBoxDefinePane.java | 3 +-- .../widget/ui/FieldEditorDefinePane.java | 2 +- .../design/widget/ui/WaterMarkDictPane.java | 4 ++-- 59 files changed, 118 insertions(+), 126 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index fef83423a9..775f1affd4 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -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}, diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java index 707f76a9f1..08c577cdcb 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java @@ -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); diff --git a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java index 9ccfee0f6d..764a827f02 100644 --- a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java @@ -492,7 +492,7 @@ public abstract class LiteConditionPane 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)); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java index 9a9dccd455..dc891c1c63 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java @@ -210,7 +210,7 @@ public class ChoosePane extends BasicBeanPane 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); diff --git a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java index 5ff5215984..e8a719abca 100644 --- a/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/editor/ValueEditorPaneFactory.java @@ -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; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java index 949db9e1a7..e3bf61e9dc 100644 --- a/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java +++ b/designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java @@ -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( diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java index 20f28fb087..5d37fb4a96 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java @@ -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); diff --git a/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java b/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java index b8489a66e9..0734a96f55 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/AlignmentPane.java @@ -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) { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java b/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java index 3e622667fd..f1f1c55b1d 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java @@ -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"); } /** diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java b/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java index 8d789914ad..795c6d455a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java @@ -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"); } /** diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java index 48a007d234..cd78c17559 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/AbstractHyperNorthPane.java @@ -57,7 +57,7 @@ public abstract class AbstractHyperNorthPane 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 extends BasicB link.setWidth(Utils.objectToNumber(widthTextFiled.getText(), false).intValue()); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/AuthorityEditPane.java b/designer-base/src/main/java/com/fr/design/mainframe/AuthorityEditPane.java index 37918ab787..794a8cfdd7 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/AuthorityEditPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/AuthorityEditPane.java @@ -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(); -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java index 7405eaf5f2..8effcd10f3 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java @@ -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) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java index 790841dea9..018bc75aeb 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataBindingEditor.java @@ -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 { 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 { public String getIconName() { return "bind_ds_column"; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java index 37d3c9eeda..cb77c54576 100644 --- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java @@ -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 diff --git a/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java b/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java index 341f0b9074..d9f1f17d1f 100644 --- a/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java +++ b/designer-base/src/main/java/com/fr/design/present/dict/DictionaryPane.java @@ -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 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 implements DataCr paneList.add(new FormulaDictPane()); return paneList; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java b/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java index 456f4c7bd4..27a9822c6c 100644 --- a/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java +++ b/designer-base/src/main/java/com/fr/design/report/WatermarkPane.java @@ -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"); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java b/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java index d72a11ab75..20c707d716 100644 --- a/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java +++ b/designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java @@ -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)}, diff --git a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java index ece0da12ab..78accb96b3 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java @@ -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); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java index ce93df3408..b4568fa3f8 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java @@ -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}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java b/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java index 79a1acdd1f..e8311cd2a8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java +++ b/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java @@ -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(); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java index 24e0d8d4a6..af03afbe91 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java @@ -98,7 +98,7 @@ public class VanChartTooltipContentPane extends BasicBeanPane { 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); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java index 9450b3e245..233619a5a7 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XDateEditor.java @@ -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, diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java b/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java index 5c3795fd73..989be4fc81 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XLabel.java @@ -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( diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java index cadc4af752..adb16c44bc 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java @@ -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")) diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java b/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java index 1ff3b86796..33a60cbb0e 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java @@ -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); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java index b19ba0282e..4eb0af9994 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java @@ -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); diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java index 823edc53a3..fb272d2102 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java @@ -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; diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java index 386d13d3db..a18706189b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java @@ -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; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java index aea92af2f4..92bba90571 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XWriteAbleRepeatEditor.java @@ -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"), }); } } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java index 17056e3c4b..5a36e95809 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/BoundsGroupModel.java @@ -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: diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java index 9c1faec99d..339ff9baa8 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java @@ -41,7 +41,7 @@ public class CheckBoxDefinePane extends AbstractDataModify { 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}, }; diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java index 8c3722a94f..900072b7c0 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboBoxDefinePane.java @@ -27,7 +27,7 @@ public class ComboBoxDefinePane extends DictEditorDefinePane { 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){ diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java index d6906258d6..1684ad4d32 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/ComboCheckBoxDefinePane.java @@ -33,7 +33,7 @@ public class ComboCheckBoxDefinePane extends DictEditorDefinePane 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}; } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java index 53bbc1f565..e29e5115c0 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java @@ -74,7 +74,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane 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)); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java index e86bcf4f7b..b983118651 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java @@ -47,7 +47,7 @@ public class LabelDefinePane extends AbstractDataModify