From 4add75355b913f6daa58455dee108050d4822f9b Mon Sep 17 00:00:00 2001 From: 3dot141 Date: Tue, 7 Aug 2018 17:25:11 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-10025=2010.0=20&=205.0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E5=9B=BD=E9=99=85=E5=8C=96=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/file/SwitchExistEnv.java | 2 +- .../com/fr/design/actions/help/AboutPane.java | 14 ++--- .../help/alphafine/AlphaFineConfigPane.java | 2 +- .../actions/help/alphafine/RemindPane.java | 2 +- .../condition/DSColumnLiteConditionPane.java | 43 ++++++------- .../design/condition/SingleConditionPane.java | 4 +- .../design/data/datapane/EditOrNewLabel.java | 13 ++-- .../data/datapane/TableDataTreePane.java | 2 +- .../tabledatapane/ClassTableDataPane.java | 2 +- .../fr/design/extra/PluginInstalledPane.java | 4 +- .../fr/design/extra/PluginOperateUtils.java | 2 +- .../com/fr/design/extra/PluginWebBridge.java | 2 +- .../com/fr/design/extra/QQLoginWebPane.java | 4 +- .../com/fr/design/extra/WebViewDlgHelper.java | 2 +- .../fr/design/formula/FunctionConstants.java | 2 +- .../gui/controlpane/JListControlPane.java | 14 ++--- .../gui/controlpane/UIListControlPane.java | 14 ++--- .../controlpane/UISimpleListControlPane.java | 2 +- .../gui/iprogressbar/ProgressDialog.java | 2 +- .../itableeditorpane/UITableModelAdapter.java | 19 +++--- .../com/fr/design/gui/style/FRFontPane.java | 11 ++-- .../com/fr/design/gui/style/FormatPane.java | 6 +- .../com/fr/design/mainframe/TemplatePane.java | 2 +- .../ImageBackgroundQuickPane.java | 6 +- .../mainframe/toolbar/ToolBarMenuDock.java | 3 +- .../java/com/fr/design/menu/KeySetUtils.java | 2 +- .../RemoteDesignAuthorityManagerAction.java | 2 +- .../design/remote/ui/AuthorityEditorPane.java | 4 +- .../remote/ui/AuthorityListControlPane.java | 6 +- .../remote/ui/AuthorityManagerPane.java | 2 +- .../design/style/color/ColorSelectPane.java | 4 +- .../style/color/NewColorSelectPane.java | 4 +- .../java/com/fr/design/utils/DesignUtils.java | 2 +- .../write/submit/DBManipulationPane.java | 20 +++--- .../main/java/com/fr/env/RemoteEnvPane.java | 10 +-- .../java/com/fr/file/FILEChooserPane.java | 26 ++++---- .../SeriesCondition/ChartConditionPane.java | 5 +- .../dlp/Bar2DDataLabelPane.java | 4 +- .../impl/ChartHyperPopAttrPane.java | 4 +- .../chart/gui/style/ChartAxisLabelPane.java | 4 +- .../module/ChartEmptyDataStylePane.java | 2 +- .../chart/DownloadOnlineSourcesHelper.java | 6 +- .../format/FormatPaneWithOutFont.java | 2 +- .../background/VanChartAlertValuePane.java | 4 +- .../datasheet/VanChartDataSheetPane.java | 4 +- .../style/StructureNodeStylePane.java | 2 +- .../style/VanChartStructureSeriesPane.java | 2 +- .../layout/FRCardMainBorderLayoutAdapter.java | 4 +- .../fr/design/designer/creator/XPassword.java | 4 +- .../fr/design/designer/creator/XTextArea.java | 4 +- .../design/designer/creator/XTextEditor.java | 4 +- .../creator/cardlayout/TabMoveEndAction.java | 2 +- .../cardlayout/TabMoveFirstAction.java | 2 +- .../creator/cardlayout/TabMoveNextAction.java | 2 +- .../creator/cardlayout/TabMovePrevAction.java | 2 +- ...bsoluteBodyLayoutPropertiesGroupModel.java | 8 +-- .../FRAbsoluteLayoutPropertiesGroupModel.java | 4 +- .../properties/FRFitLayoutConstraints.java | 16 ++--- .../mobile/BodyAppRelayoutTable.java | 6 +- .../fr/design/gui/core/FormWidgetOption.java | 4 +- .../gui/xpane/CardTagLayoutBorderPane.java | 10 +-- .../fr/design/gui/xpane/LayoutBorderPane.java | 62 +++++++++---------- .../com/fr/design/mainframe/CoverPane.java | 4 +- .../com/fr/design/mainframe/FormDesigner.java | 5 +- .../fr/design/mainframe/FormEditToolBar.java | 10 +-- .../design/mainframe/FormParaWidgetPane.java | 6 +- .../mainframe/FormWidgetDetailPane.java | 4 +- .../java/com/fr/design/mainframe/JForm.java | 4 +- .../design/mainframe/WidgetPropertyPane.java | 4 +- .../widget/editors/PaddingMarginPane.java | 29 +++++---- .../parameter/RootDesignDefinePane.java | 6 +- .../ui/designer/CheckBoxDefinePane.java | 4 +- .../ui/designer/DateEditorDefinePane.java | 6 +- .../designer/DirectWriteEditorDefinePane.java | 4 +- .../widget/ui/designer/LabelDefinePane.java | 6 +- .../ui/designer/NumberEditorDefinePane.java | 4 +- .../designer/TextFieldEditorDefinePane.java | 4 +- .../designer/btn/ButtonGroupDefinePane.java | 2 +- .../designer/component/WidgetBoundPane.java | 8 +-- .../component/WidgetCardTagBoundPane.java | 4 +- .../FRAbsoluteBodyLayoutDefinePane.java | 2 +- .../layout/FRAbsoluteLayoutDefinePane.java | 4 +- .../designer/mobile/BodyMobileDefinePane.java | 2 +- .../mobile/ChartEditorDefinePane.java | 4 +- .../mobile/ElementCaseDefinePane.java | 2 +- .../design/actions/cell/EditCellAction.java | 11 ++-- .../cell/style/ReportFontItalicAction.java | 4 +- .../dscolumn/SelectedDataColumnPane.java | 4 +- .../fr/design/headerfooter/HFComponent.java | 44 +++++++------ .../mainframe/CellWidgetPropertyPane.java | 4 +- .../alphafine/component/AlphaFineDialog.java | 4 +- .../alphafine/preview/PluginPreviewPane.java | 2 +- .../design/mainframe/bbs/BBSLoginDialog.java | 26 ++++---- .../fr/design/mainframe/bbs/ExitLabel.java | 4 +- .../design/mainframe/bbs/UserInfoLabel.java | 4 +- .../fr/design/mainframe/bbs/UserInfoPane.java | 4 +- .../cell/settingpane/CellOtherSetPane.java | 4 +- .../mainframe/socketio/DesignerSocketIO.java | 3 +- .../com/fr/design/present/BarCodePane.java | 6 +- .../fr/design/present/CellWriteAttrPane.java | 4 +- .../design/report/ReportBackgroundPane.java | 8 +-- .../fr/design/report/ReportColumnsPane.java | 12 ++-- .../com/fr/design/webattr/EditToolBar.java | 10 +-- .../java/com/fr/design/webattr/EventPane.java | 4 +- .../webattr/ReportSelectToolBarPane.java | 17 +++-- .../fr/design/webattr/ServerPrinterPane.java | 44 +++++++------ .../fr/design/webattr/WriteToolBarPane.java | 4 +- .../design/webattr/WriteWebSettingPane.java | 4 +- .../widget/ui/DateEditorDefinePane.java | 4 +- .../cellquick/CellBiasTextPainterEditor.java | 4 +- .../cellquick/CellImageQuickEditor.java | 4 +- .../cellquick/CellRichTextEditor.java | 4 +- .../cellquick/CellSubReportEditor.java | 4 +- .../start/CollectUserInformationDialog.java | 6 +- 114 files changed, 394 insertions(+), 425 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index cbb21faa0..91655b399 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -111,7 +111,7 @@ public class SwitchExistEnv extends MenuDef { } }); } catch (AuthException exception) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); } } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index 46aa25450..9caa20e43 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -50,8 +50,8 @@ public class AboutPane extends JPanel { getBuildTitle(), GeneralUtils.readFullBuildNO(), new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Build_NO"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Build_NO_OK") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO_OK") }); contentPane.add(buildCopyPane); @@ -62,11 +62,11 @@ public class AboutPane extends JPanel { contentPane.add(boxCenterAlignmentPane); contentPane.add(new BoxCenterAlignmentCopyablePane( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Activation_Key"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Activation_Key"), DesignerEnvManager.getEnvManager().getActivationKey(), new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Activation_Key"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Activation_Key_Copy_OK") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Activation_Key"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Activation_Key_Copy_OK") })); addPhoneAndQQPane(contentPane); @@ -118,7 +118,7 @@ public class AboutPane extends JPanel { } private JPanel getRemarkPane() { - String remark = com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_About_Remark_Info", PRESIDENT_PHONE); + String remark = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_Remark_Info", PRESIDENT_PHONE); UILabel label = new UILabel(); label.setSize(new Dimension(580, 30)); @@ -317,4 +317,4 @@ public class AboutPane extends JPanel { } } } -} \ No newline at end of file +} 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 cdebcf80b..3669064bd 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 @@ -108,7 +108,7 @@ public class AlphaFineConfigPane extends BasicPane { initFieldListener(); northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open") + ":")); northPane.add(shortcutsField); - UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-AlphaFine_SetShortcuts")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_SetShortcuts")); label.setForeground(Color.RED); northPane.add(label); contentPane.add(northPane); diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java index 1213db6c7..7591c2af3 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java @@ -67,7 +67,7 @@ public class RemindPane extends JPanel { } }); - noRemindLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Alphafine_No_Remind")); + noRemindLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alphafine_No_Remind")); noRemindLabel.setFont(MEDIUM_FONT); noRemindLabel.setForeground(Color.WHITE); checkLabel = new UILabel(); diff --git a/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java index e16676d7e..1422202a1 100644 --- a/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java @@ -1,41 +1,38 @@ package com.fr.design.condition; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; - -import javax.swing.DefaultComboBoxModel; - -import com.fr.design.file.HistoryTemplateListPane; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.tree.TreePath; - import com.fr.data.condition.CommonCondition; -import com.fr.design.mainframe.JTemplate; -import com.fr.general.ComparatorUtils; -import com.fr.general.data.Condition; import com.fr.data.condition.JoinCondition; import com.fr.data.core.Compare; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.editor.ValueEditorPane; +import com.fr.design.editor.ValueEditorPaneFactory; +import com.fr.design.editor.editor.ColumnIndexEditor; +import com.fr.design.editor.editor.ColumnNameEditor; +import com.fr.design.editor.editor.Editor; +import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.formula.CustomVariableResolver; import com.fr.design.formula.VariableResolver; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.design.editor.ValueEditorPane; -import com.fr.design.editor.ValueEditorPaneFactory; -import com.fr.design.editor.editor.ColumnIndexEditor; -import com.fr.design.editor.editor.ColumnNameEditor; -import com.fr.design.editor.editor.Editor; - +import com.fr.design.mainframe.JTemplate; +import com.fr.general.ComparatorUtils; +import com.fr.general.data.Condition; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.tree.TreePath; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; + public class DSColumnLiteConditionPane extends LiteConditionPane { /** * @@ -121,7 +118,7 @@ public class DSColumnLiteConditionPane extends LiteConditionPane extends BasicPane { if(cancel == null) { cancel = new UIButton(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); - cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); + cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove")); cancel.addActionListener(cancleListener); cancel.setMargin(new Insets(0, 0, 0, 0)); } @@ -51,4 +51,4 @@ public abstract class SingleConditionPane extends BasicPane { public abstract void populate(T condition); public abstract T update(); -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java b/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java index 220969b3d..705060eaf 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java @@ -1,12 +1,11 @@ package com.fr.design.data.datapane; -import java.awt.Cursor; - -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; - import com.fr.base.BaseUtils; import com.fr.design.data.datapane.FlashLookLabelMouseAdapter.ReleaseAction; +import com.fr.design.gui.ilable.UILabel; + +import javax.swing.JPanel; +import java.awt.Cursor; @@ -16,7 +15,7 @@ public class EditOrNewLabel extends UILabel { public EditOrNewLabel(Editable editable, JPanel editPane) { super(BaseUtils.readIcon("/com/fr/design/images/m_file/edit.png")); - this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Edit")); + this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")); this.setCursor(new Cursor(Cursor.HAND_CURSOR)); this.editable = editable; this.editTablePane = editPane; @@ -31,4 +30,4 @@ public class EditOrNewLabel extends UILabel { public static interface Editable { public void edit(JPanel jPanel); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index 3d5c4d01a..309502e80 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java @@ -84,7 +84,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { ToolTipManager.sharedInstance().registerComponent(dataTree); ToolTipManager.sharedInstance().setDismissDelay(3000); ToolTipManager.sharedInstance().setInitialDelay(0); - addMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + addMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); addMenuDef.setIconPath(IconPathConstants.ADD_POPMENU_ICON_PATH); createAddMenuDef(); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java index 9b33532f8..5d8235b94 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java @@ -63,7 +63,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { dlg.setVisible(true); } }); - UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Edit")); + UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")); editButton.setPreferredSize(new Dimension( editButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java index a7a1650c5..1c774669a 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java @@ -124,7 +124,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane { null, new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer_Later"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Cancel") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel") }, null ); @@ -155,4 +155,4 @@ public class PluginInstalledPane extends PluginAbstractViewPane { protected String title4PopupWindow() { return "Installed"; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java b/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java index 250a1aca0..e2fc12efe 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java @@ -169,7 +169,7 @@ public class PluginOperateUtils { String username = MarketConfig.getInstance().getBbsUsername(); if (StringUtils.isEmpty(username)) { jsCallback.execute(StringUtils.EMPTY); - uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_UnSignIn")); + uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn")); } else { uiLabel.setText(username); String result = username; diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java index daa665f25..189b448a7 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java @@ -556,7 +556,7 @@ public class PluginWebBridge { public void clearUserInfo() { MarketConfig.getInstance().setInShowBBsName(StringUtils.EMPTY); BBSLoginUtils.bbsLogout(); - uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_UnSignIn")); + uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn")); } public void getPackInfo(final JSObject callback){ diff --git a/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java b/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java index dd7e9b915..db7e32e7c 100644 --- a/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java @@ -168,7 +168,7 @@ public class QQLoginWebPane extends JFXPanel { new Scene( HBoxBuilder.create().styleClass("modal-dialog").children( LabelBuilder.create().text(msg).build(), - ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Switch-Account")).defaultButton(true).onAction(new EventHandler() { + ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Switch_Account")).defaultButton(true).onAction(new EventHandler() { @Override public void handle(ActionEvent actionEvent) { // take action and close the dialog. @@ -224,4 +224,4 @@ public class QQLoginWebPane extends JFXPanel { } }); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java index 5cf9258ab..084f3fce2 100644 --- a/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java +++ b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java @@ -81,7 +81,7 @@ public class WebViewDlgHelper { } else { int rv = JOptionPane.showConfirmDialog( null, - com.fr.design.i18n.Toolkit.i18nText("Fine-Plugin_Shop_Need_Install_Version"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install_Version"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE diff --git a/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java b/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java index 60b4cf5df..74f1953fd 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java +++ b/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java @@ -78,7 +78,7 @@ public abstract class FunctionConstants { public static FunctionGroup PLUGIN = new FunctionGroup() { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Base_Formula_Plugin"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Formula_Plugin"); } @Override 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 73fccc9e5..fcf7b6786 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 @@ -9,12 +9,10 @@ import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane; import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane; import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; import com.fr.design.gui.HyperlinkFilterHelper; -import com.fr.design.gui.NameInspector; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilist.JNameEdList; import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.gui.ilist.ModNameActionListener; -import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.menu.LineSeparator; import com.fr.design.menu.MenuDef; @@ -357,7 +355,7 @@ public abstract class JListControlPane extends JControlPane { public AddItemUpdateAction(NameableCreator[] creators) { this.creator = creators[0]; - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); } @@ -375,7 +373,7 @@ public abstract class JListControlPane extends JControlPane { */ protected class AddItemMenuDef extends MenuDef { public AddItemMenuDef(NameableCreator[] creators) { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); this.setIconPath("/com/fr/design/images/control/addPopup.png"); wrapActionListener(creators); @@ -420,7 +418,7 @@ public abstract class JListControlPane extends JControlPane { */ private class RemoveItemAction extends UpdateAction { public RemoveItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/base/images/cell/control/remove.png")); @@ -448,7 +446,7 @@ public abstract class JListControlPane extends JControlPane { */ private class CopyItemAction extends UpdateAction { public CopyItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Copy")); this.setMnemonic('C'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/m_edit/copy.png")); @@ -547,7 +545,7 @@ public abstract class JListControlPane extends JControlPane { private boolean isAtoZ = false; public SortItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort")); this.setMnemonic('S'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/sortAsc.png")); @@ -876,4 +874,4 @@ public abstract class JListControlPane extends JControlPane { protected boolean filterNameableCreator(NameableCreator creator) { return !HyperlinkFilterHelper.whetherAddHyperlink4cell(creator.menuName()); } -} \ No newline at end of file +} 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 6f23a0b5c..69cd6d020 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 @@ -15,7 +15,6 @@ import com.fr.design.gui.HyperlinkFilterHelper; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilist.ListModelElement; -import com.fr.design.gui.ilist.ModNameActionListener; import com.fr.design.gui.ilist.UINameEdList; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; @@ -29,7 +28,6 @@ import com.fr.general.ComparatorUtils; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import com.fr.stable.StringUtils; -import com.fr.stable.core.PropertyChangeAdapter; import javax.swing.*; import javax.swing.event.ListDataEvent; @@ -387,7 +385,7 @@ public abstract class UIListControlPane extends UIControlPane { public AddItemUpdateAction(NameableCreator[] creators) { this.creator = creators[0]; - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); } @@ -443,7 +441,7 @@ public abstract class UIListControlPane extends UIControlPane { protected class AddItemMenuDef extends MenuDef { public AddItemMenuDef(NameableCreator[] creators) { super(true); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); this.setIconPath("/com/fr/design/images/control/addPopup.png"); wrapActionListener(creators); @@ -507,7 +505,7 @@ public abstract class UIListControlPane extends UIControlPane { */ private class RemoveItemAction extends UpdateAction { public RemoveItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/base/images/cell/control/remove.png")); @@ -536,7 +534,7 @@ public abstract class UIListControlPane extends UIControlPane { */ private class CopyItemAction extends UpdateAction { public CopyItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Copy")); this.setMnemonic('C'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/m_edit/copy.png")); @@ -635,7 +633,7 @@ public abstract class UIListControlPane extends UIControlPane { private boolean isAtoZ = false; public SortItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort")); this.setMnemonic('S'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/sortAsc.png")); @@ -1033,4 +1031,4 @@ public abstract class UIListControlPane extends UIControlPane { nameableList.setSelectedIndex(index); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java index 9c1b65b5d..f5da7e2f8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java @@ -292,7 +292,7 @@ public class UISimpleListControlPane extends BasicPane { private boolean isAtoZ = false; public SortItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort")); this.setMnemonic('S'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/sortAsc.png")); diff --git a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java index 05bf613b6..2247fe453 100644 --- a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java +++ b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java @@ -48,7 +48,7 @@ public class ProgressDialog extends UIDialog { progressBar.setOpaque(false); progressBar.setBorder(null); panel.add(progressBar, BorderLayout.CENTER); - text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Loading_Project"), JLabel.CENTER); + text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Project"), JLabel.CENTER); FRFont font = FRFont.getInstance().applySize(14).applyForeground(new ColorUIResource(333334)); text.setFont(font); panel.add(text, BorderLayout.SOUTH); diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java index c101f1207..b73618fd5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java @@ -1,10 +1,8 @@ package com.fr.design.gui.itableeditorpane; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import com.fr.base.BaseUtils; +import com.fr.base.FRContext; +import com.fr.design.mainframe.DesignerContext; import javax.swing.JOptionPane; import javax.swing.JTable; @@ -12,10 +10,11 @@ import javax.swing.ListSelectionModel; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; - -import com.fr.base.BaseUtils; -import com.fr.base.FRContext; -import com.fr.design.mainframe.DesignerContext; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** @@ -200,7 +199,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected abstract class EditAction extends UITableEditAction { public EditAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Edit")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/edit.png")); } 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 3029d31e5..feed40bd3 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 @@ -16,7 +16,6 @@ import com.fr.design.gui.ibutton.UIColorButton; import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; @@ -140,7 +139,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style"))) { frFont = frFont.applyStyle(fontSizeStyleComboBox.getSelectedIndex()); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"))) { frFont = frFont.applySize(Float.parseFloat(fontSizeComboBox.getSelectedItem().toString())); } if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground"))) { @@ -154,7 +153,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Line_Style"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style"))) { frFont = frFont.applyUnderline(this.underlineCombo.getSelectedLineStyle()); } @@ -267,12 +266,12 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse private void initAllNames() { fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style")); fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name")); - fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size")); + fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size")); colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground")); italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_italic")); bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bold")); underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Underline")); - underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Line_Style")); + underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style")); isStrikethroughCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Strikethrough")); isShadowCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow")); superPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Superscript")); @@ -415,4 +414,4 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); } } -} \ No newline at end of file +} 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 b6fd17778..f32adb937 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 @@ -136,7 +136,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"), SwingConstants.LEFT), typePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), typePane}, new Component[]{centerPane, null}, new Component[]{fontPane, frFontPane}, }; @@ -158,7 +158,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs private void iniSampleLable() { Border innterborder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4); Font tmpFont = null; - Border border = BorderFactory.createTitledBorder(innterborder, com.fr.design.i18n.Toolkit.i18nText("FR-Base_StyleFormat_Sample"), TitledBorder.LEFT, 0, tmpFont, UIConstants.LINE_COLOR); + Border border = BorderFactory.createTitledBorder(innterborder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_StyleFormat_Sample"), TitledBorder.LEFT, 0, tmpFont, UIConstants.LINE_COLOR); sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()) { @Override @@ -432,4 +432,4 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs public void setGlobalName(String name) { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java index a3459ad3d..d79daf371 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java @@ -164,7 +164,7 @@ public class TemplatePane extends JPanel implements MouseListener { } setJLabel(selectedName); } catch (AuthException e) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return false; } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java index 7f47fbae8..fcc1f5360 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java @@ -45,7 +45,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { public ImageBackgroundQuickPane(boolean hasImageLayout) { this.setLayout(new BorderLayout(0, 4)); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Default"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Titled"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Adjust")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Titled"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Adjust")}; Byte[] valueArray = {Constants.IMAGE_CENTER, Constants.IMAGE_TILED, Constants.IMAGE_EXTEND, Constants.IMAGE_ADJUST}; imageLayoutPane = new UIButtonGroup(nameArray, valueArray); imageLayoutPane.setSelectedIndex(0); @@ -174,7 +174,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image"); } @Override @@ -182,4 +182,4 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { imageLayoutPane.setSelectedIndex(0); previewPane.setImage(null); } -} \ No newline at end of file +} 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 c5005c953..f75b9c196 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 @@ -3,7 +3,6 @@ */ package com.fr.design.mainframe.toolbar; -import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.base.vcs.DesignerMode; import com.fr.design.DesignState; @@ -564,7 +563,7 @@ public abstract class ToolBarMenuDock { }; UILabel uiLabel = new UILabel(text); uiLabel.setHorizontalAlignment(SwingConstants.CENTER); - uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-All_MSBold"), 0, 14)); + uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_All_MSBold"), 0, 14)); uiLabel.setForeground(new Color(150, 150, 150)); panel.add(uiLabel, BorderLayout.CENTER); return panel; 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 32436be62..15c03e320 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 @@ -536,7 +536,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Report_Background"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Background"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java b/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java index 05775c4de..ceebd0c01 100644 --- a/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java @@ -21,7 +21,7 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction { public RemoteDesignAuthorityManagerAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Authority_Manager")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Authority_Manager")); this.setSmallIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@1x.png")); } diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java index 991aadbd5..cf81ba5d4 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java @@ -31,7 +31,7 @@ public class AuthorityEditorPane extends BasicBeanPane { BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 6, 6), UITitledBorder.createBorderWithTitle( - com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Template_Authority_Config") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Template_Authority_Config") ) ) ); @@ -45,7 +45,7 @@ public class AuthorityEditorPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Configure_Authority"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Configure_Authority"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java index db94bea69..f917e9219 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java @@ -78,7 +78,7 @@ public class AuthorityListControlPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.authorityCreators = new RemoteDesignAuthorityCreator[]{ new RemoteDesignAuthorityCreator( - com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_User"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_User"), BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png"), DesignAuthority.class, AuthorityEditorPane.class) @@ -470,7 +470,7 @@ public class AuthorityListControlPane extends BasicPane { private class AddItemUpdateAction extends UpdateAction { AddItemUpdateAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); } @@ -511,7 +511,7 @@ public class AuthorityListControlPane extends BasicPane { */ private class RemoveItemAction extends UpdateAction { RemoveItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils .readIcon(IconPathConstants.TD_REMOVE_ICON_PATH)); diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java index 8cc139cc3..f84bff5c9 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java @@ -23,7 +23,7 @@ public class AuthorityManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Authority_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Authority_Manager"); } public void populate(DesignAuthority[] authorities) { diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java index d0e7eac2a..a0dd8fb55 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java @@ -80,7 +80,7 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable centerPane.add(Box.createVerticalStrut(1)); - UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_More_Color")); + UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_More_Color")); customButton.addMouseListener(new MouseAdapter() { @Override @@ -198,4 +198,4 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable pane = new ColorSelectDetailPane(Color.WHITE); ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, Color.WHITE, this); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java index 88d4f76f0..dcb6119f3 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java @@ -94,7 +94,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { centerPane.add(Box.createVerticalStrut(1)); // mod by anchore 16/11/16 - UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_More_Color")); + UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_More_Color")); customButton.addMouseListener(new MouseAdapter() { @Override @@ -203,4 +203,4 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java index 497dd07e0..d0d0b859d 100644 --- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java @@ -237,7 +237,7 @@ public class DesignUtils { //比如想在中文或英文系统里用韩文设计器 guiFRFont = getNamedFont("Dialog"); if (!guiFRFont.canDisplay(displayChar)) { - FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("FR-Base_SimSun_Not_Found")); + FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_SimSun_Not_Found")); } } } diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index 7476ca241..48e0e025d 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -134,7 +134,7 @@ public class DBManipulationPane extends BasicBeanPane { northPane.add(typePane, BorderLayout.NORTH); chooseTable = new ChoosePaneSupportFormula(); - chooseTable.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Table"))); + chooseTable.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Table"))); chooseTable.setTableNameComboBoxPopSize(160, 320); northPane.add(chooseTable, BorderLayout.CENTER); @@ -142,7 +142,7 @@ public class DBManipulationPane extends BasicBeanPane { // peter:编辑的TablePane JPanel editTablePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(editTablePane, BorderLayout.CENTER); - editTablePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Value"))); + editTablePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value"))); keyColumnValuesTable = new KeyColumnNameValueTable(); editTablePane.add(new JScrollPane(this.keyColumnValuesTable), BorderLayout.CENTER); @@ -183,11 +183,11 @@ public class DBManipulationPane extends BasicBeanPane { UpdateCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("RWA-NotChange_Unmodified")); UIButton helpButton = new UIButton(HEIP_ICON); - helpButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Help")); + helpButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help")); helpButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - FormatExplanationPane formatExplanation = new FormatExplanationPane(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Help"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RWA-Help"), 12f); + FormatExplanationPane formatExplanation = new FormatExplanationPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RWA-Help"), 12f); BasicDialog dlg = formatExplanation.showMediumWindow(SwingUtilities.getWindowAncestor(DBManipulationPane.this), new DialogActionAdapter(){}); dlg.setVisible(true); @@ -309,7 +309,7 @@ public class DBManipulationPane extends BasicBeanPane { protected void setBorderAndLayout(JPanel jPanel){ jPanel.setLayout(FRGUIPaneFactory.createBorderLayout()); jPanel.setBorder(BorderFactory.createTitledBorder( - new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Submit_Condition"))); + new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition"))); } protected void addComponent(JPanel mainPane,JScrollPane addPane){ @@ -475,7 +475,7 @@ public class DBManipulationPane extends BasicBeanPane { } for (int j = 0; j < keyColumnNameValueList.size(); j++) { if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) { - Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") }; + Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") }; returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_Tips", keyColumnNameValueList.get(j).cn.name), "", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]); @@ -580,7 +580,7 @@ public class DBManipulationPane extends BasicBeanPane { } int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DBManipulationPane.this), - com.fr.design.i18n.Toolkit.i18nText("FR-Base_sure_remove_item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Base_Remove"), JOptionPane.OK_CANCEL_OPTION, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_sure_remove_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.OK_OPTION) { KeyColumnTableModel keyColumnNameValueTableModel = (KeyColumnTableModel)keyColumnValuesTable.getModel(); @@ -944,9 +944,9 @@ public class DBManipulationPane extends BasicBeanPane { } protected abstract static class KeyColumnTableModel extends AbstractTableModel { - public static final String RAW_KEY = com.fr.design.i18n.Toolkit.i18nText("FR-Base_RWA-Key"); - public static final String COLUMN = com.fr.design.i18n.Toolkit.i18nText("FR-Base_Column"); - public static final String VALUE = com.fr.design.i18n.Toolkit.i18nText("FR-Base_Value"); + public static final String RAW_KEY = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_RWA-Key"); + public static final String COLUMN = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Column"); + public static final String VALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value"); public static final String[] COLUMN_NAMES = new String[]{RAW_KEY, COLUMN, VALUE}; diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index 4cf96c2b4..408dc6c5d 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -534,20 +534,20 @@ public class RemoteEnvPane extends BasicBeanPane { try { Boolean result = get(); if (result == null) { - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed")); + message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); } else { if (result) { - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Successful")); + message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Successful")); uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon")); } else { - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); + message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); } } } catch (InterruptedException | ExecutionException e) { FineLoggerFactory.getLogger().error(e, e.getMessage()); - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); + message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); } dialogDownPane.remove(cancelButton); @@ -583,7 +583,7 @@ public class RemoteEnvPane extends BasicBeanPane { } private void initMessageDialog() { - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_Try") + "..."); + message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Try") + "..."); message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); okButton.setEnabled(false); diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java index f69ed1177..e5ae775a8 100644 --- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java +++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java @@ -255,7 +255,7 @@ public class FILEChooserPane extends BasicPane { centerRightPane.add(fileNamePane, BorderLayout.SOUTH); Component[][] outComponents = new Component[][]{ - new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Lookup_range") + ":"), BorderLayout.WEST), locationPane}, + new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_File_Lookup_range") + ":"), BorderLayout.WEST), locationPane}, new Component[]{centerLeftPanel, centerRightPane}}; JPanel contentPane = TableLayoutHelper.createTableLayoutPane(outComponents, new double[]{TableLayout.PREFERRED, TableLayout.FILL}, new double[]{TableLayout.PREFERRED, TableLayout.FILL}); @@ -546,19 +546,19 @@ public class FILEChooserPane extends BasicPane { EnumSet fileExtensions = EnumSet.of(FileExtension.CPT, FileExtension.CPTX, FileExtension.FRM, FileExtension.FRMX, FileExtension.CHT); if (type == JFileChooser.OPEN_DIALOG) { if (WorkContext.getCurrent().isLocal()) { //本地连接 - this.addChooseFILEFilter(new ChooseFileFilter(fileSuffix_local, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(fileSuffix_local, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); } else { - this.addChooseFILEFilter(new ChooseFileFilter(fileExtensions, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(fileExtensions, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); } } // ben:filefilter设置初值为cpt过滤 - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPT, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPTX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPT, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPTX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); // richer:form文件 daniel 改成三个字 - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRMX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRMX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); } else { if (type == JFileChooser.OPEN_DIALOG) { this.addChooseFILEFilter(new ChooseFileFilter(EnumSet.of(FileExtension.XLS, FileExtension.XLSX), com.fr.design.i18n.Toolkit.i18nText("Import-Excel_Source"))); @@ -571,7 +571,7 @@ public class FILEChooserPane extends BasicPane { this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLSX, com.fr.design.i18n.Toolkit.i18nText("Import-Excel2007_Source"))); } if (FileExtension.PNG.matchExtension(suffix)) { - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PNG, com.fr.design.i18n.Toolkit.i18nText("FR-App-Export_png"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PNG, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Export_png"))); } if (type == JFileChooser.SAVE_DIALOG) { this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PDF, com.fr.design.i18n.Toolkit.i18nText("FR-Import-Export_PDF"))); @@ -647,7 +647,7 @@ public class FILEChooserPane extends BasicPane { saveDictionary(); dialogExit(); } else { - JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Template_Report_Not_Exist")); + JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Template_Report_Not_Exist")); return; } } @@ -688,7 +688,7 @@ public class FILEChooserPane extends BasicPane { FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_File_Message"), JOptionPane.WARNING_MESSAGE); return; } if (selectedFile.exists()) { @@ -741,7 +741,7 @@ public class FILEChooserPane extends BasicPane { * dialog的名字 */ private String dialogName() { - return type == JFileChooser.OPEN_DIALOG ? com.fr.design.i18n.Toolkit.i18nText("Utils-Design-File_Open") : com.fr.design.i18n.Toolkit.i18nText("FR-App-Template_Save"); + return type == JFileChooser.OPEN_DIALOG ? com.fr.design.i18n.Toolkit.i18nText("Utils-Design-File_Open") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Template_Save"); } /* @@ -1406,7 +1406,7 @@ public class FILEChooserPane extends BasicPane { FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_File_Message"), JOptionPane.WARNING_MESSAGE); return; } @@ -1448,4 +1448,4 @@ public class FILEChooserPane extends BasicPane { folderButton.addActionListener(createFolderActionListener); return folderButton; } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java index d08478a4b..af44b6331 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java @@ -16,7 +16,6 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; import com.fr.plugin.chart.type.ConditionKeyType; import com.fr.stable.StringUtils; @@ -84,7 +83,7 @@ public class ChartConditionPane extends LiteConditionPane { conditionKeyComboBox.setPreferredSize(new Dimension(175, conditionKeyComboBox.getPreferredSize().height)); conditionOPComboBox.setPreferredSize(new Dimension(80, 20)); Component[][] components = { - {new UILabel(Inter.getLocText("Utils-Available_Columns") + ":"), new UILabel(Inter.getLocText("FR-ConditionB_Operator") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Available_Columns") + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ConditionB_Operator") + ":"), new UILabel()}, {conditionKeyComboBox, conditionOPComboBox, conditionValuePane}}; double p = TableLayout.PREFERRED; @@ -147,4 +146,4 @@ public class ChartConditionPane extends LiteConditionPane { } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java index 6e20d8099..62893fd14 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java @@ -25,7 +25,7 @@ public class Bar2DDataLabelPane extends DataLabelPane { private UIRadioButton outSideButton; protected JPanel createJPanel4Position() { - centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center")); + centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StyleAlignment_Center")); insideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_DataLabelInside")); outSideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_DataLabelOutSide")); @@ -67,4 +67,4 @@ public class Bar2DDataLabelPane extends DataLabelPane { seriesAttrContents.setPosition(Constants.OUTSIDE); } } -} \ No newline at end of file +} 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 2399a9ec8..80f78c273 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 @@ -71,7 +71,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane { double[] rowSize = { p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title") + ":", SwingConstants.RIGHT), titleField}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title") + ":", SwingConstants.RIGHT), titleField}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Width") + ":", SwingConstants.RIGHT), widthField}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Height") + ":", SwingConstants.RIGHT), heightField}, }; @@ -150,4 +150,4 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyperlink"); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java index 92b268d97..00d7ecce8 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java @@ -92,7 +92,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ orientationBar = new NumberDragBar(-NUM90, NUM90); orientationSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, -NUM90, NUM90, 1)); - String[] sampleType = {com.fr.design.i18n.Toolkit.i18nText("FR-App-All_Auto"), com.fr.design.i18n.Toolkit.i18nText("FR-App-All_Custom")}; + String[] sampleType = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_App_All_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_App_All_Custom")}; labelSampleChoose = new UIComboBox(sampleType); customLabelSamleTime = new UITextField(); checkCustomSampleField(); @@ -466,4 +466,4 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ public boolean shouldResponseChangeListener() { return true; } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java index c7dbea42e..310455339 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java @@ -117,7 +117,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { selectFilePane.setBorder(BorderFactory.createEmptyBorder(TEN, FIVE, 0, THIRTY)); defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT")); - customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Custom")); + customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Custom")); ButtonGroup buttonGroup = new ButtonGroup(); defaultRadioButton.setSelected(true); buttonGroup.add(defaultRadioButton); 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 03b51d750..79a1acdd1 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 @@ -79,7 +79,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent { public void installOnline() { - int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Download_Online_Sources"), null, JOptionPane.YES_NO_OPTION); + int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Download_Online_Sources"), null, JOptionPane.YES_NO_OPTION); if (choose == JOptionPane.OK_OPTION) { initDialog(); @@ -174,7 +174,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent { setProgress(0); dialog = new JDialog(); - dialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Dependence_Install_Online")); + dialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Dependence_Install_Online")); JPanel contentPane = new JPanel(new BorderLayout()); contentPane.add(label, BorderLayout.CENTER); @@ -208,7 +208,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent { RestartHelper.restart(); } } else { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Dependence_Install_Failed")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Dependence_Install_Failed")); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java index 23159b40a..7275ad074 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java @@ -32,7 +32,7 @@ public class FormatPaneWithOutFont extends FormatPane { typePane.setBorder(BorderFactory.createEmptyBorder()); return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"), SwingConstants.LEFT), typePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), typePane}, new Component[]{null, centerPane}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java index 4f5dff062..2821564bf 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java @@ -119,7 +119,7 @@ public class VanChartAlertValuePane extends BasicBeanPane { new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertTextPosition}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),alertText}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")),fontName}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size")),fontSize}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size")),fontSize}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),fontColor}, }; @@ -200,4 +200,4 @@ public class VanChartAlertValuePane extends BasicBeanPane { } return chartAlertValue; } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java index 49b69f00f..bb8aa4e4a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java @@ -94,7 +94,7 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane { double[] columnSize = {d, e}; double[] rowSize = {p,p,p}; Component[][] components = new Component[][]{ - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"),formatPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"),formatPane),null}, new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"),textAttrPane),null}, new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null}, }; @@ -185,4 +185,4 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane { } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java index 3f8bdafb0..610c616d9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java @@ -58,7 +58,7 @@ public class StructureNodeStylePane extends BasicBeanPane { new Component[]{null, null}, new Component[]{jPanel, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Width")), nodeBorderWidth}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Color")), nodeBorderColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Color")), nodeBorderColor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), nodeOpacity} }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java index 231ceb7c2..1f53dd071 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java @@ -76,7 +76,7 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane double[] rowSize = {p,p,p,p}; JPanel jPanel = new JPanel(new BorderLayout()); - jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width")+" ", linkWidthType), BorderLayout.NORTH); + jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width")+" ", linkWidthType), BorderLayout.NORTH); linkWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane(" ", linkWidth); jPanel.add(linkWidthPane, BorderLayout.CENTER); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java index 123130fc4..1d529743a 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java @@ -47,13 +47,13 @@ public class FRCardMainBorderLayoutAdapter extends FRBorderLayoutAdapter { if (ComparatorUtils.equals(constraints, BorderLayout.NORTH) || ComparatorUtils.equals(constraints, BorderLayout.SOUTH)) { int containerHeight = container.getHeight(); if (rectangle.height > containerHeight) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Tablayout_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds")); return true; } } else if (ComparatorUtils.equals(constraints, BorderLayout.EAST) || ComparatorUtils.equals(constraints, BorderLayout.WEST)) { int containerWidth = container.getWidth(); if (rectangle.width > containerWidth) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Tablayout_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds")); return true; } } 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 d106c13bb..6a76b0325 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 @@ -51,7 +51,7 @@ public class XPassword extends XWrapperedFieldEditor { CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")} , super.supportedDescriptor()); CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( @@ -70,4 +70,4 @@ public class XPassword extends XWrapperedFieldEditor { (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark}); } -} \ No newline at end of file +} 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 cb21759e2..624b32ece 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 @@ -39,7 +39,7 @@ public class XTextArea extends XFieldEditor { CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")}, super.supportedDescriptor()); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class) @@ -83,4 +83,4 @@ public class XTextArea extends XFieldEditor { protected String getIconName() { return "text_area_16.png"; } -} \ No newline at end of file +} 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 85ae88f29..43a8b87d1 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 @@ -42,7 +42,7 @@ public class XTextEditor extends XWrapperedFieldEditor { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor widgetValue = new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue( @@ -84,4 +84,4 @@ public class XTextEditor extends XWrapperedFieldEditor { return "text_field_16.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java index db2a96f9b..55f303835 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java @@ -13,7 +13,7 @@ public class TabMoveEndAction extends TabMoveAction { public TabMoveEndAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_End")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Tab_End")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/end.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java index f19326722..b98453e0b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java @@ -13,7 +13,7 @@ public class TabMoveFirstAction extends TabMoveAction { public TabMoveFirstAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_First")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Tab_First")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/first.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java index 67f378455..6dfae2ddd 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java @@ -13,7 +13,7 @@ public class TabMoveNextAction extends TabMoveAction { public TabMoveNextAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_Next")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Tab_Next")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/next.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java index 1ddcb9b2c..c36868039 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java @@ -13,7 +13,7 @@ public class TabMovePrevAction extends TabMoveAction { public TabMovePrevAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_Prev")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Tab_Prev")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/prev.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java index e6516a486..2e395eae3 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java @@ -2,22 +2,16 @@ package com.fr.design.designer.properties; import com.fr.design.designer.creator.*; import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout; -import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.FormDesigner; -import com.fr.design.mainframe.FormSelectionUtils; import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.widget.editors.LayoutTypeEditor; -import com.fr.design.utils.gui.LayoutUtils; -import com.fr.form.ui.Widget; import com.fr.form.ui.container.WBodyLayoutType; import com.fr.log.FineLoggerFactory; -import com.fr.general.FRScreen; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.*; -import java.awt.geom.Arc2D; import java.util.Arrays; import java.util.Comparator; @@ -73,7 +67,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr case 0: return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type"); default: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Scaling_Mode"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java index df5e47c61..2aec61be2 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java @@ -38,7 +38,7 @@ public class FRAbsoluteLayoutPropertiesGroupModel implements GroupModel { */ @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Area_Scaling"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormWidget_Area_Scaling"); } @Override @@ -59,7 +59,7 @@ public class FRAbsoluteLayoutPropertiesGroupModel implements GroupModel { @Override public Object getValue(int row, int column) { if (column == 0) { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Scaling_Mode"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode"); } else { return layout.getCompState(); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java index 4235035bd..7e2fd9451 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java @@ -47,7 +47,7 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Size"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Size"); } @Override @@ -70,9 +70,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"); default: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Height"); } } else { switch (row) { @@ -101,9 +101,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { return false; } if(bounds.width == rec.width - margin.getLeft() - margin.getRight()){ - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Bounds")); }else if(v < minWidth){ - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Min_Width") + Integer.toString(minWidth)); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Width") + Integer.toString(minWidth)); v = xCreator.getWidth(); } difference = bounds.width - v; @@ -114,9 +114,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { return false; } if(bounds.height == rec.height - margin.getTop() - margin.getBottom()){ - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Bounds")); }else if(v < minHeight){ - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Min_Height") + Integer.toString(minHeight)); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Height") + Integer.toString(minHeight)); v = xCreator.getHeight(); } difference = bounds.height - v; @@ -158,4 +158,4 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java index d423e17b1..7e1b8feab 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java @@ -1,6 +1,5 @@ package com.fr.design.designer.properties.mobile; -import java.awt.*; import java.awt.event.MouseEvent; import java.beans.IntrospectionException; import java.util.ArrayList; @@ -8,7 +7,6 @@ import java.util.ArrayList; import com.fr.base.FRContext; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.*; -import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.itable.AbstractPropertyTable; import com.fr.design.gui.itable.PropertyGroup; import com.fr.design.gui.xtable.ReportAppPropertyGroupModel; @@ -32,7 +30,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor[] propertyTableEditor = { new CRPropertyDescriptor("appRelayout", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-App_ReLayout")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_App_ReLayout")) }; return propertyTableEditor; } @@ -85,4 +83,4 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable { public void firePropertyEdit() { designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java b/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java index d1d8cfbf0..94a21d192 100644 --- a/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java +++ b/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java @@ -89,7 +89,7 @@ public class FormWidgetOption extends WidgetOption { public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); - public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Layout_Adaptive_Layout"), + public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); @@ -98,4 +98,4 @@ public class FormWidgetOption extends WidgetOption { public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/report_16.png"), ElementCaseEditor.class); -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java index b9abdae75..fd0507c81 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java @@ -45,13 +45,13 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane { double[] columnSize = { p, f}; JPanel rightBottomContentPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{ - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Format")), fontSizeTypePane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Format")), fontSizeTypePane}, {new UILabel(""), initFontButtonPane()}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Background")), this.getTitleBackgroundPane()}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Background")), this.getTitleBackgroundPane()}, }, rowSize, columnSize, 10); rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); this.setTitlePane(new UIScrollPane(rightBottomContentPane)); - this.getTitlePane().setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title"),null)); + this.getTitlePane().setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title"),null)); this.getTitlePane().setVisible(false); return this.getTitlePane(); } @@ -66,7 +66,7 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane { JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); defaultPane.add(centerPane, BorderLayout.CENTER); - centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Preview"), null)); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Preview"), null)); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); centerPane.add(borderPane, BorderLayout.CENTER); @@ -112,4 +112,4 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane { protected void populateTitle(){ return; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java index 0945a2259..5f517c3d4 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java @@ -317,8 +317,8 @@ public class LayoutBorderPane extends BasicPane { Constants.LINE_THICK, //3px }; - public final static String[] BORDER_TYPE = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Standard"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Custom")}; - public final static String[] BORDER_STYLE= new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Common"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Shadow")}; + public final static String[] BORDER_TYPE = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Standard"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Custom")}; + public final static String[] BORDER_STYLE= new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Shadow")}; private final static Dimension BUTTON_SIZE = new Dimension(24, 20); @@ -335,7 +335,7 @@ public class LayoutBorderPane extends BasicPane { JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); defaultPane.add(centerPane, BorderLayout.CENTER); - centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Preview"), null)); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Preview"), null)); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); centerPane.add(borderPane, BorderLayout.CENTER); @@ -381,23 +381,23 @@ public class LayoutBorderPane extends BasicPane { double[] columnSize = { p, MAX_WIDTH}; JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ getBorderTypeComp(), - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Render_Style")), borderStyleCombo}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Line")), currentLineCombo}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Color")), buttonPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Render_Style")), borderStyleCombo}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Line")), currentLineCombo}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Color")), buttonPane}, getBorderCornerSpinnerComp(), - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Body_Background")), backgroundPane}, - {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Alpha"))}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Body_Background")), backgroundPane}, + {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))}, {new UILabel(""),transparencyPane}, }, rowSize, columnSize, 10); rightTopContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); UIScrollPane rightTopPane = new UIScrollPane(rightTopContentPane); - rightTopPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Frame"),null)); + rightTopPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Frame"),null)); rightTopPane.setPreferredSize(rightTopPane.getPreferredSize()); return rightTopPane; } protected JComponent[] getBorderTypeComp(){ - return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Frame_Style")), borderTypeCombo}; + return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Frame_Style")), borderTypeCombo}; } protected JComponent[] getBorderCornerSpinnerComp(){ @@ -438,14 +438,14 @@ public class LayoutBorderPane extends BasicPane { double[] rowSize = {p,p,p}; double[] columnSize = { p, f}; JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Body_Background")), backgroundPane}, - {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Alpha"))}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Body_Background")), backgroundPane}, + {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))}, {new UILabel(""),transparencyPane}, }, rowSize, columnSize, 10); rightTopContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 6)); JPanel bodyRightTopPane =FRGUIPaneFactory.createBorderLayout_S_Pane(); bodyRightTopPane.add(rightTopContentPane,BorderLayout.CENTER); - bodyRightTopPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Frame"),null)); + bodyRightTopPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Frame"),null)); return bodyRightTopPane; } @@ -463,8 +463,8 @@ public class LayoutBorderPane extends BasicPane { BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),}; Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); - hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Left") - , com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Right")}); + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormStyleAlignment_Left") + , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")}); JPanel hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); hPaneContainer.add(hAlignmentPane); @@ -475,15 +475,15 @@ public class LayoutBorderPane extends BasicPane { double[] columnSize = { p, MAX_WIDTH}; JPanel rightBottomContentPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{ - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Content")), formulaPane}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Format")), fontSizeTypePane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), formulaPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Format")), fontSizeTypePane}, {new UILabel(""), initFontButtonPane()}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alignment-Style")), hPaneContainer}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Background")), titleBackgroundPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Background")), titleBackgroundPane}, }, rowSize, columnSize, 10); rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); titlePane =new UIScrollPane(rightBottomContentPane); - titlePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title"),null)); + titlePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title"),null)); titlePane.setVisible(false); return titlePane; } @@ -520,20 +520,20 @@ public class LayoutBorderPane extends BasicPane { } protected void initAllNames() { - fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Family")); - fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size")); - colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Foreground")); - italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Italic")); - bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Bold")); - underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Underline")); - underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Line_Style")); + fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Family")); + fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size")); + colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground")); + italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic")); + bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold")); + underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Underline")); + underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style")); } protected void setToolTips() { - colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Foreground")); - italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Italic")); - bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Bold")); - underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Underline")); + colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground")); + italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic")); + bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold")); + underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Underline")); } @@ -931,4 +931,4 @@ public class LayoutBorderPane extends BasicPane { protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java b/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java index 4b4d94b10..d692eaa5e 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java @@ -42,7 +42,7 @@ public class CoverPane extends JPanel { setBackground(null); setOpaque(false); - editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Edit"), IOUtils.readIcon(IconPathConstants.EDIT_ICON_PATH)) { + editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"), IOUtils.readIcon(IconPathConstants.EDIT_ICON_PATH)) { @Override public Dimension getPreferredSize() { return new Dimension(60, 24); @@ -130,4 +130,4 @@ public class CoverPane extends JPanel { protected Rectangle getPaintBorderBounds(){ return new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2 , getHeight() - BORDER_WIDTH * 2); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java index 56579a1a3..06fcd72ef 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java @@ -1,6 +1,5 @@ package com.fr.design.mainframe; -import com.fr.base.BaseUtils; import com.fr.base.Parameter; import com.fr.base.ScreenResolution; import com.fr.base.vcs.DesignerMode; @@ -358,7 +357,7 @@ public class FormDesigner extends TargetComponent
implements TreeSelection } private void addParaPaneTooltips() { - JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-Please_Drag_ParaPane"), + JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Please_Drag_ParaPane"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); } @@ -1490,4 +1489,4 @@ public class FormDesigner extends TargetComponent implements TreeSelection public int getResolution(){ return this.resolution; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java index 56377a93e..3f90e0569 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java @@ -125,12 +125,12 @@ public class FormEditToolBar extends BasicPane { this.add(splitPane); list.addListSelectionListener(listSelectionListener); JPanel backgroundPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Background_Set")); - defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Default_Background")); + UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Output_Background_Set")); + defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Output_Default_Background")); bgButton.addActionListener(actioner); backgroundPane.add(defaultCheckBox); backgroundPane.add(bgButton); - backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Background_Set"))); + backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Output_Background_Set"))); this.add(backgroundPane, BorderLayout.SOUTH); } @@ -369,8 +369,8 @@ public class FormEditToolBar extends BasicPane { private JPanel getExport() { JPanel export = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); // export.setLayout(new BoxLayout(export, BoxLayout.Y_AXIS)); - excelP = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Excel_Page")); - excelO = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Excel_Simple")); + excelP = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Output_Excel_Page")); + excelO = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Output_Excel_Simple")); export.add(excelP); export.add(Box.createVerticalStrut(2)); export.add(excelO); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java index e3e3492fc..e5711c1d4 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java @@ -214,7 +214,7 @@ public class FormParaWidgetPane extends JPanel { for (int i = 0; i < COMMON_CHAR_NUM; i++) { chartTypePane.add(new ToolBarButton(loadChartOptions()[i])); } - add(createChartCombinationPane(chartTypePane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-ToolBar_Chart"))); + add(createChartCombinationPane(chartTypePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ToolBar_Chart"))); jSeparatorChart = createJSeparator(); add(jSeparatorChart); } @@ -229,7 +229,7 @@ public class FormParaWidgetPane extends JPanel { for (int i = 0; i < num; i++) { widgetPane.add(new ToolBarButton(predifinedwidgeList.get(i))); } - add(createWidgetCombinationPane(widgetPane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-ToolBar_Widget"))); + add(createWidgetCombinationPane(widgetPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ToolBar_Widget"))); add(createJSeparator()); } @@ -443,4 +443,4 @@ public class FormParaWidgetPane extends JPanel { } return chartOptions; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java index e00510fb7..4ec97bc00 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -55,7 +55,7 @@ public class FormWidgetDetailPane extends FormDockView{ private CardLayout card; private static final String REPORT_TAB = com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Report"); - private static final String CHART_TAB = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-ToolBar_Chart"); + private static final String CHART_TAB = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ToolBar_Chart"); public static FormWidgetDetailPane getInstance() { if (HOLDER.singleton == null) { @@ -439,4 +439,4 @@ public class FormWidgetDetailPane extends FormDockView{ } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java index 3165d08c5..960f5cf6f 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java @@ -647,7 +647,7 @@ public class JForm extends JTemplate implements BaseJForm { }; UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Authority_Edit")); uiLabel.setHorizontalAlignment(SwingConstants.CENTER); - uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-All_MSBold"), 0, 14)); + uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_All_MSBold"), 0, 14)); uiLabel.setForeground(new Color(150, 150, 150)); panel.add(uiLabel, BorderLayout.CENTER); return panel; @@ -921,4 +921,4 @@ public class JForm extends JTemplate implements BaseJForm { public String route() { return ViewRequestConstants.FORM_VIEW_PATH; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java index b62725caa..395776697 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java @@ -66,7 +66,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Settings"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Control_Setting"); } @@ -397,4 +397,4 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope public Location preferredLocation() { return Location.WEST_BELOW; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java index e49520e04..ca75fa994 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java @@ -3,15 +3,6 @@ */ package com.fr.design.mainframe.widget.editors; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.GridLayout; -import java.awt.LayoutManager; - -import javax.swing.JPanel; - import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ilable.UILabel; @@ -19,6 +10,14 @@ import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.ui.PaddingMargin; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.LayoutManager; + /** * @author richer @@ -38,7 +37,7 @@ public class PaddingMarginPane extends BasicPane { contentPane = new JPanel(new GridLayout(2, 2, 4, 4)); this.add(contentPane); JPanel topPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - topPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Top") + " "), BorderLayout.WEST); + topPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Top") + " "), BorderLayout.WEST); topSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); topPane.add(topSpinner, BorderLayout.CENTER); UILabel topLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); @@ -46,7 +45,7 @@ public class PaddingMarginPane extends BasicPane { contentPane.add(topPane); JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - leftPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Left") + " "), BorderLayout.WEST); + leftPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Left") + " "), BorderLayout.WEST); leftSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); leftPane.add(leftSpinner, BorderLayout.CENTER); UILabel leftLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); @@ -54,7 +53,7 @@ public class PaddingMarginPane extends BasicPane { contentPane.add(leftPane); JPanel bottomPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - bottomPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Bottom") + " "), BorderLayout.WEST); + bottomPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Bottom") + " "), BorderLayout.WEST); bottomSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); bottomPane.add(bottomSpinner, BorderLayout.CENTER); UILabel bottomLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); @@ -62,7 +61,7 @@ public class PaddingMarginPane extends BasicPane { contentPane.add(bottomPane); JPanel rightPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - rightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Right") + " "), BorderLayout.WEST); + rightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Right") + " "), BorderLayout.WEST); rightSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); rightPane.add(rightSpinner, BorderLayout.CENTER); UILabel rightLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); @@ -103,7 +102,7 @@ public class PaddingMarginPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Base_Margin"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Margin"); } public void populate(PaddingMargin pm) { @@ -124,4 +123,4 @@ public class PaddingMarginPane extends BasicPane { pm.setRight((int) rightSpinner.getValue()); return pm; } -} \ No newline at end of file +} 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 17eda1d2a..65e66af08 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 @@ -93,8 +93,8 @@ public class RootDesignDefinePane extends AbstractDataModify { BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),}; Integer[] hAlignment = new Integer[]{FormConstants.LEFTPOSITION, FormConstants.CENTERPOSITION, FormConstants.RIGHTPOSITION}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); - hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Left") - , com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Right")}); + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormStyleAlignment_Left") + , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")}); double f = TableLayout.FILL; double p = TableLayout.PREFERRED; double[] rowSize = {p, p, p, p, p}; @@ -157,4 +157,4 @@ public class RootDesignDefinePane extends AbstractDataModify { return null; } -} \ No newline at end of file +} 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 ac89c40a0..31ec3da19 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 @@ -34,7 +34,7 @@ public class CheckBoxDefinePane extends AbstractDataModify { text = new UITextField(); fontSizePane = new FontSizeComboPane(); labelNameTextField = new UITextField(); - UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")); + UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); double f = TableLayout.FILL; @@ -79,4 +79,4 @@ public class CheckBoxDefinePane extends AbstractDataModify { box.setLabelName(labelNameTextField.getText()); return box; } -} \ No newline at end of file +} 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 d78defe08..daa7f2234 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 @@ -55,7 +55,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane e @Override protected JPanel setFirstContentPane() { JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")); + UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); Component[] removeRepeatPane = new Component[]{createRepeatCheckBox(), null}; @@ -101,4 +101,4 @@ public abstract class DirectWriteEditorDefinePane e } protected abstract T updateSubDirectWriteEditorBean(); -} \ No newline at end of file +} 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 bd7de6e2d..06fe0a5e0 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 @@ -54,15 +54,15 @@ public class LabelDefinePane extends AbstractDataModify