From 602dfc2de13ed260779397cc2aa0f66ff3f3793d Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 28 Nov 2016 15:22:50 +0800 Subject: [PATCH 1/7] =?UTF-8?q?REPORT-875=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80=E5=90=8E,=20=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E7=BB=99=E4=B8=AA=E6=8F=90=E7=A4=BA,=20=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E9=87=8D=E5=90=AF,=20=E5=B0=B1=E8=B7=9F=E8=A3=85?= =?UTF-8?q?=E5=AE=8C=E6=8F=92=E4=BB=B6=E4=B8=80=E6=A0=B7.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/file/PreferencePane.java | 75 +++++++++++++++++++ .../src/com/fr/design/dialog/BasicDialog.java | 4 +- .../com/fr/design/locale/designer.properties | 3 +- .../design/locale/designer_en_US.properties | 3 +- .../design/locale/designer_zh_CN.properties | 3 +- .../design/locale/designer_zh_TW.properties | 3 +- 6 files changed, 85 insertions(+), 6 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/file/PreferencePane.java b/designer_base/src/com/fr/design/actions/file/PreferencePane.java index c3944afd13..6de8d60e81 100644 --- a/designer_base/src/com/fr/design/actions/file/PreferencePane.java +++ b/designer_base/src/com/fr/design/actions/file/PreferencePane.java @@ -1,10 +1,13 @@ package com.fr.design.actions.file; import com.fr.base.BaseUtils; +import com.fr.base.FRContext; import com.fr.design.DesignerEnvManager; +import com.fr.design.RestartHelper; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.DialogActionAdapter; +import com.fr.design.dialog.DialogActionListener; import com.fr.design.editor.editor.IntegerEditor; import com.fr.design.gui.frpane.UITabbedPane; import com.fr.design.gui.ibutton.UIButton; @@ -78,6 +81,7 @@ public class PreferencePane extends BasicPane { getLocaledLanguage("Traditional_Chinese_Language", Locale.TRADITIONAL_CHINESE), getLocaledLanguage("Korea_Language",Locale.KOREA), }; + private static int designerEnvLanguageIndex; // 打开设置对话框时，设计器使用的语言 //设置是否支持undo private UICheckBox supportUndoCheckBox; @@ -527,6 +531,7 @@ public class PreferencePane extends BasicPane { this.logLevelComboBox.setSelectedItem(FRLevel.getByLevel(designerEnvManager.getLogLevel())); this.languageComboBox.setSelectedItem(LANGUAGE[designerEnvManager.getLanguage()]); + designerEnvLanguageIndex = designerEnvManager.getLanguage(); this.pageLengthComboBox.setSelectedIndex(designerEnvManager.getPageLengthUnit()); this.reportLengthComboBox.setSelectedIndex(designerEnvManager.getReportLengthUnit()); @@ -621,4 +626,74 @@ public class PreferencePane extends BasicPane { } return l; } + + /** + * 显示窗口 + * + * @param window 窗口 + * @param l 对话框监听器 + * @return 对话框 + */ + @Override + public BasicDialog showWindow(Window window, DialogActionListener l) { + BasicDialog dg; + if (window instanceof Frame) { + dg = new DIALOG((Frame) window); + } else { + dg = new DIALOG((Dialog) window); + } + + if (l != null) { + dg.addDialogActionListener(l); + } + + dg.setBasicDialogSize(BasicDialog.DEFAULT); + GUICoreUtils.centerWindow(dg); + dg.setResizable(false); + return dg; + } + + private class DIALOG extends BasicDialog { + public DIALOG(Frame parent) { + super(parent, PreferencePane.this); + this.setTitle(PreferencePane.this.title4PopupWindow()); + } + + public DIALOG(Dialog parent) { + super(parent, PreferencePane.this); + this.setTitle(PreferencePane.this.title4PopupWindow()); + } + + /** + * 确定操作 + * + */ + @Override + public void doOK() { + super.doOK(); + if (languageComboBox.getSelectedIndex() != designerEnvLanguageIndex) { + int rv = JOptionPane.showOptionDialog( + null, + Inter.getLocText("FR-Designer-Language_Change_Successful"), + Inter.getLocText("FR-Designer-Plugin_Warning"), + JOptionPane.YES_NO_OPTION, + JOptionPane.INFORMATION_MESSAGE, + null, + new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")}, + null + ); + if (rv == JOptionPane.OK_OPTION) { + RestartHelper.restart(); + } + } + } + + /** + * Check valid. + */ + public void checkValid() throws Exception { + PreferencePane.this.checkValid(); + } + + } } \ No newline at end of file diff --git a/designer_base/src/com/fr/design/dialog/BasicDialog.java b/designer_base/src/com/fr/design/dialog/BasicDialog.java index 703b192055..b2246dbc6c 100644 --- a/designer_base/src/com/fr/design/dialog/BasicDialog.java +++ b/designer_base/src/com/fr/design/dialog/BasicDialog.java @@ -39,11 +39,11 @@ public abstract class BasicDialog extends UIDialog { super(parent, pane, isNeedButtonPane); } - protected void setBasicDialogSize(Dimension d) { + public void setBasicDialogSize(Dimension d) { super.setSize(d.width, d.height); } - protected void setBasicDialogSize(int w, int h) { + public void setBasicDialogSize(int w, int h) { super.setSize(w, h); } diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index bcc777385c..27615ac778 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account= FR-Designer-BBSLogin_Connection-Failure= FR-Designer-BBSLogin_Connection-Failure-Tip= @@ -471,3 +471,4 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips= FR-Designer_Reset= FR-Designer_Add_all= +FR-Designer-Language_Change_Successful= diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index d3e02f0072..21bb7d2d8e 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=User name FR-Designer-BBSLogin_Connection-Failure=Connection failure, check your network status FR-Designer-BBSLogin_Connection-Failure-Tip=Tip @@ -470,3 +470,4 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips=Freestyle layout, add control in any position of the layout FR-Designer_Reset=reset FR-Designer_Add_all=Add all +FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 8ee044e6e7..1d92c5219a 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u7528\u6237\u540D FR-Designer-BBSLogin_Connection-Failure=\u7F51\u7EDC\u8FDE\u63A5\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5\u5F53\u524D\u7F51\u7EDC\u72B6\u6001 FR-Designer-BBSLogin_Connection-Failure-Tip=\u63D0\u793A @@ -474,3 +474,4 @@ FR-Designer_Mobile-Refresh=\u5237\u65B0 FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5185\u4EFB\u610F\u4F4D\u7F6E\u6DFB\u52A0\u63A7\u4EF6 FR-Designer_Reset=\u53D6\u6D88\u5220\u9664 FR-Designer_Add_all=\u5168\u90E8\u6DFB\u52A0 +FR-Designer-Language_Change_Successful=\u65B0\u7684\u8BED\u8A00\u8BBE\u7F6E\u5C06\u5728\u91CD\u65B0\u542F\u52A8\u8BBE\u8BA1\u5668\u65F6\u88AB\u542F\u7528 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 551ff97ef5..8844b1cb4b 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u767B\u5165\u5E33\u865F FR-Designer-BBSLogin_Connection-Failure=\u767B\u5165\u9023\u63A5\u5931\u6557\uFF0C\u8ACB\u6AA2\u67E5\u7576\u524D\u7DB2\u8DEF\u72C0\u614B FR-Designer-BBSLogin_Connection-Failure-Tip=\u9023\u7DDA\u5931\u6557\u63D0\u793A @@ -463,3 +463,4 @@ FR-Designer_Mobile-ToolBar=\u5DE5\u5177\u6B04 FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5167\u4EFB\u610F\u4F4D\u7F6E\u65B0\u589E\u63A7\u5236\u9805 FR-Designer_Reset= FR-Designer_Add_all=\u5168\u90E8\u65B0\u589E +FR-Designer-Language_Change_Successful=\u65B0\u7684\u8A9E\u8A00\u8A2D\u5B9A\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u6642\u88AB\u555F\u7528 From fe2996616ec38b0f7b3aec2e2f4099ef1056ad06 Mon Sep 17 00:00:00 2001 From: plough Date: Mon, 28 Nov 2016 16:21:05 +0800 Subject: [PATCH 2/7] =?UTF-8?q?REPORT-875=20=E4=BF=AE=E6=94=B9=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E6=96=87=E4=BB=B6=EF=BC=8C=E5=8A=A0=E5=85=A5?= =?UTF-8?q?FR-Designer-Language=5FChange=5FSuccessful?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/design/locale/designer.properties | 2 +- .../src/com/fr/design/locale/designer_ja_JP.properties | 3 ++- .../src/com/fr/design/locale/designer_ko_KR.properties | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 27615ac778..144903763c 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -471,4 +471,4 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips= FR-Designer_Reset= FR-Designer_Add_all= -FR-Designer-Language_Change_Successful= +FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted\ \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index ca4a6d066d..b06bbf0e30 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u30E6\u30FC\u30B6\u30FC\u540D FR-Designer-BBSLogin_Connection-Failure=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u63A5\u7D9A\u306B\u5931\u6557\u3057\u307E\u3057\u305F\u3002\u73FE\u5728\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u72B6\u614B\u3092\u691C\u67FB\u3057\u3066\u304F\u3060\u3055\u3044 FR-Designer-BBSLogin_Connection-Failure-Tip=\u30D2\u30F3\u30C8 @@ -448,3 +448,4 @@ FR-Designer_Mobile-Refresh= FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u914D\u7F6E\u3067\u3059\u3002\u914D\u7F6E\u5185\u306E\u4EFB\u610F\u306E\u4F4D\u7F6E\u306B\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068 FR-Designer_Add_all=\u3059\u3079\u3066\u8FFD\u52A0 +FR-Designer-Language_Change_Successful= \ No newline at end of file diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index 7c434320cd..ed5ad41bfd 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -1,4 +1,4 @@ -# generated time: 星期四 十一月 24 12:02:51 CST 2016 +# generated time: \u661F\u671F\u56DB \u5341\u4E00\u6708 24 12:02:51 CST 2016 FR-Designer-BBSLogin_Account=\u7528\u6237\u540D FR-Designer-BBSLogin_Connection-Failure=\uB124\uD2B8\uC6CC\uD06C\uB9C1\uD06C\uC2E4\uD328.\uD604\uC7AC\uB124\uD2B8\uC6CC\uD06C\uC0C1\uD0DC\uB97C\uAC80\uC0AC\uD574\uC8FC\uC2ED\uC2DC\uC624. FR-Designer-BBSLogin_Connection-Failure-Tip=\uC54C\uB9BC @@ -444,3 +444,4 @@ FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\uC790\uC720\uC2DD\uB808\uC774\uC544\uC6C3\uC740\uB808\uC774\uC544\uC6C3\uC548\uC5D0\uC11C\uC5B4\uB290\uC704\uCE58\uC5D0\uB3C4\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uB97C\uCD94\uAC00\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4. FR-Designer_Add_all=\uBAA8\uB450\uCD94\uAC00 FR-Designer_Reset= +FR-Designer-Language_Change_Successful= \ No newline at end of file From c0892fd1f7ab3584a05264a6dcb51869c43279f2 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 29 Nov 2016 09:41:32 +0800 Subject: [PATCH 3/7] =?UTF-8?q?REPORT-875=E3=80=82=E5=B0=86setBasicDialogS?= =?UTF-8?q?ize=E6=96=B9=E6=B3=95=E7=9A=84=E8=AE=BF=E9=97=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=94=B9=E5=9B=9Eprotected?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/file/PreferencePane.java | 6 +----- .../src/com/fr/design/dialog/BasicDialog.java | 4 ++-- .../src/com/fr/design/dialog/BasicPane.java | 13 +++++++++++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/file/PreferencePane.java b/designer_base/src/com/fr/design/actions/file/PreferencePane.java index 6de8d60e81..0557eb5875 100644 --- a/designer_base/src/com/fr/design/actions/file/PreferencePane.java +++ b/designer_base/src/com/fr/design/actions/file/PreferencePane.java @@ -646,11 +646,7 @@ public class PreferencePane extends BasicPane { if (l != null) { dg.addDialogActionListener(l); } - - dg.setBasicDialogSize(BasicDialog.DEFAULT); - GUICoreUtils.centerWindow(dg); - dg.setResizable(false); - return dg; + return showWindow(dg); } private class DIALOG extends BasicDialog { diff --git a/designer_base/src/com/fr/design/dialog/BasicDialog.java b/designer_base/src/com/fr/design/dialog/BasicDialog.java index b2246dbc6c..703b192055 100644 --- a/designer_base/src/com/fr/design/dialog/BasicDialog.java +++ b/designer_base/src/com/fr/design/dialog/BasicDialog.java @@ -39,11 +39,11 @@ public abstract class BasicDialog extends UIDialog { super(parent, pane, isNeedButtonPane); } - public void setBasicDialogSize(Dimension d) { + protected void setBasicDialogSize(Dimension d) { super.setSize(d.width, d.height); } - public void setBasicDialogSize(int w, int h) { + protected void setBasicDialogSize(int w, int h) { super.setSize(w, h); } diff --git a/designer_base/src/com/fr/design/dialog/BasicPane.java b/designer_base/src/com/fr/design/dialog/BasicPane.java index 9bc96f6439..eb1b413055 100644 --- a/designer_base/src/com/fr/design/dialog/BasicPane.java +++ b/designer_base/src/com/fr/design/dialog/BasicPane.java @@ -52,6 +52,19 @@ public abstract class BasicPane extends JPanel { return dg; } + /** + * 显示窗口 + * + * @param dg 已添加监听器的对话框实例 + * @return 对话框 + */ + public BasicDialog showWindow(BasicDialog dg) { + dg.setBasicDialogSize(BasicDialog.DEFAULT); + GUICoreUtils.centerWindow(dg); + dg.setResizable(false); + return dg; + } + /** * 显示窗口 * From 894d5bdb18595bcf7e902fa3b433f8651664a557 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 29 Nov 2016 09:51:07 +0800 Subject: [PATCH 4/7] =?UTF-8?q?REPORT-748=20=E6=A8=A1=E6=9D=BF>=E6=A8=A1?= =?UTF-8?q?=E6=9D=BFWeb=E5=B1=9E=E6=80=A7=E7=82=B9=E8=BF=9B=E5=8E=BB?= =?UTF-8?q?=E4=B9=8B=E5=90=8E=E5=BC=B9=E5=87=BA=E7=AA=97=E5=8F=A3=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=8D=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/webattr/ReportWebAttrPane.java | 2 +- designer_base/src/com/fr/design/locale/designer.properties | 3 ++- .../src/com/fr/design/locale/designer_en_US.properties | 1 + .../src/com/fr/design/locale/designer_ja_JP.properties | 3 ++- .../src/com/fr/design/locale/designer_ko_KR.properties | 3 ++- .../src/com/fr/design/locale/designer_zh_CN.properties | 1 + .../src/com/fr/design/locale/designer_zh_TW.properties | 2 +- 7 files changed, 10 insertions(+), 5 deletions(-) diff --git a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java index 6330ee87fd..ed1079f929 100644 --- a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java +++ b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java @@ -58,7 +58,7 @@ public class ReportWebAttrPane extends LoadingBasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("ReportD-Report_Web_Attributes"); + return Inter.getLocText("FR-Designer-Template_Web_Attributes"); } public void populate(ReportWebAttr reportWebAttr) { diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 144903763c..751e14b11b 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -471,4 +471,5 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips= FR-Designer_Reset= FR-Designer_Add_all= -FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted\ \ No newline at end of file +FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted +FR-Designer-Template_Web_Attributes=Web Attributes diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index 21bb7d2d8e..da00526cfc 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -471,3 +471,4 @@ FR-Designer_WLayout-Absolute-ToolTips=Freestyle layout, add control in any posit FR-Designer_Reset=reset FR-Designer_Add_all=Add all FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted +FR-Designer-Template_Web_Attributes=Web Attributes diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index b06bbf0e30..255abf73ce 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -448,4 +448,5 @@ FR-Designer_Mobile-Refresh= FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u914D\u7F6E\u3067\u3059\u3002\u914D\u7F6E\u5185\u306E\u4EFB\u610F\u306E\u4F4D\u7F6E\u306B\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068 FR-Designer_Add_all=\u3059\u3079\u3066\u8FFD\u52A0 -FR-Designer-Language_Change_Successful= \ No newline at end of file +FR-Designer-Language_Change_Successful= +FR-Designer-Template_Web_Attributes= diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index ed5ad41bfd..5ea4a3ab6b 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -444,4 +444,5 @@ FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\uC790\uC720\uC2DD\uB808\uC774\uC544\uC6C3\uC740\uB808\uC774\uC544\uC6C3\uC548\uC5D0\uC11C\uC5B4\uB290\uC704\uCE58\uC5D0\uB3C4\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uB97C\uCD94\uAC00\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4. FR-Designer_Add_all=\uBAA8\uB450\uCD94\uAC00 FR-Designer_Reset= -FR-Designer-Language_Change_Successful= \ No newline at end of file +FR-Designer-Language_Change_Successful= +FR-Designer-Template_Web_Attributes= diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 1d92c5219a..6e837afbed 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -475,3 +475,4 @@ FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF FR-Designer_Reset=\u53D6\u6D88\u5220\u9664 FR-Designer_Add_all=\u5168\u90E8\u6DFB\u52A0 FR-Designer-Language_Change_Successful=\u65B0\u7684\u8BED\u8A00\u8BBE\u7F6E\u5C06\u5728\u91CD\u65B0\u542F\u52A8\u8BBE\u8BA1\u5668\u65F6\u88AB\u542F\u7528 +FR-Designer-Template_Web_Attributes=\u6A21\u677FWeb\u5C5E\u6027 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 8844b1cb4b..7b81457f0e 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -461,6 +461,6 @@ FR-Designer_Attr_Bidirectional_Adaptive= FR-Designer_Mobile-Refresh=\u5237\u65B0 FR-Designer_Mobile-ToolBar=\u5DE5\u5177\u6B04 FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5167\u4EFB\u610F\u4F4D\u7F6E\u65B0\u589E\u63A7\u5236\u9805 -FR-Designer_Reset= FR-Designer_Add_all=\u5168\u90E8\u65B0\u589E FR-Designer-Language_Change_Successful=\u65B0\u7684\u8A9E\u8A00\u8A2D\u5B9A\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u6642\u88AB\u555F\u7528 +FR-Designer-Template_Web_Attributes=\u5831\u8868Web\u5C6C\u6027 From 72337a2dbe322ee988223b32e5cd527ee6776b70 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 29 Nov 2016 11:52:28 +0800 Subject: [PATCH 5/7] =?UTF-8?q?REPORT-875=20=E4=BF=AE=E6=94=B9=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=9A=84=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=8B=B7=E8=B4=9D=E8=BF=87=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=E9=87=8D=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/file/PreferencePane.java | 80 +++++-------------- 1 file changed, 19 insertions(+), 61 deletions(-) diff --git a/designer_base/src/com/fr/design/actions/file/PreferencePane.java b/designer_base/src/com/fr/design/actions/file/PreferencePane.java index 0557eb5875..4aadbf4d23 100644 --- a/designer_base/src/com/fr/design/actions/file/PreferencePane.java +++ b/designer_base/src/com/fr/design/actions/file/PreferencePane.java @@ -627,69 +627,27 @@ public class PreferencePane extends BasicPane { return l; } - /** - * 显示窗口 - * - * @param window 窗口 - * @param l 对话框监听器 - * @return 对话框 - */ @Override - public BasicDialog showWindow(Window window, DialogActionListener l) { - BasicDialog dg; - if (window instanceof Frame) { - dg = new DIALOG((Frame) window); - } else { - dg = new DIALOG((Dialog) window); - } - - if (l != null) { - dg.addDialogActionListener(l); - } - return showWindow(dg); - } - - private class DIALOG extends BasicDialog { - public DIALOG(Frame parent) { - super(parent, PreferencePane.this); - this.setTitle(PreferencePane.this.title4PopupWindow()); - } - - public DIALOG(Dialog parent) { - super(parent, PreferencePane.this); - this.setTitle(PreferencePane.this.title4PopupWindow()); - } - - /** - * 确定操作 - * - */ - @Override - public void doOK() { - super.doOK(); - if (languageComboBox.getSelectedIndex() != designerEnvLanguageIndex) { - int rv = JOptionPane.showOptionDialog( - null, - Inter.getLocText("FR-Designer-Language_Change_Successful"), - Inter.getLocText("FR-Designer-Plugin_Warning"), - JOptionPane.YES_NO_OPTION, - JOptionPane.INFORMATION_MESSAGE, - null, - new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")}, - null - ); - if (rv == JOptionPane.OK_OPTION) { - RestartHelper.restart(); + public BasicDialog showWindow(Window window) { + return showWindow(window, new DialogActionAdapter() { + @Override + public void doOk() { + if (languageComboBox.getSelectedIndex() != designerEnvLanguageIndex) { + int rv = JOptionPane.showOptionDialog( + null, + Inter.getLocText("FR-Designer-Language_Change_Successful"), + Inter.getLocText("FR-Designer-Plugin_Warning"), + JOptionPane.YES_NO_OPTION, + JOptionPane.INFORMATION_MESSAGE, + null, + new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")}, + null + ); + if (rv == JOptionPane.OK_OPTION) { + RestartHelper.restart(); + } } } - } - - /** - * Check valid. - */ - public void checkValid() throws Exception { - PreferencePane.this.checkValid(); - } - + }); } } \ No newline at end of file From 01f2ddcbe3d43cb42f647adf7348034d11704bfc Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 29 Nov 2016 12:07:41 +0800 Subject: [PATCH 6/7] =?UTF-8?q?REPORT-748=20=E4=BF=AE=E6=94=B9=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E7=9A=84key=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/webattr/ReportWebAttrPane.java | 2 +- .../src/com/fr/design/actions/file/PreferencePane.java | 2 +- designer_base/src/com/fr/design/locale/designer.properties | 4 ++-- .../src/com/fr/design/locale/designer_en_US.properties | 4 ++-- .../src/com/fr/design/locale/designer_ja_JP.properties | 4 ++-- .../src/com/fr/design/locale/designer_ko_KR.properties | 4 ++-- .../src/com/fr/design/locale/designer_zh_CN.properties | 4 ++-- .../src/com/fr/design/locale/designer_zh_TW.properties | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java index ed1079f929..d3454ed89d 100644 --- a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java +++ b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java @@ -58,7 +58,7 @@ public class ReportWebAttrPane extends LoadingBasicPane { @Override protected String title4PopupWindow() { - return Inter.getLocText("FR-Designer-Template_Web_Attributes"); + return Inter.getLocText("FR-Designer_Template_Web_Attributes"); } public void populate(ReportWebAttr reportWebAttr) { diff --git a/designer_base/src/com/fr/design/actions/file/PreferencePane.java b/designer_base/src/com/fr/design/actions/file/PreferencePane.java index 4aadbf4d23..30628c3f14 100644 --- a/designer_base/src/com/fr/design/actions/file/PreferencePane.java +++ b/designer_base/src/com/fr/design/actions/file/PreferencePane.java @@ -635,7 +635,7 @@ public class PreferencePane extends BasicPane { if (languageComboBox.getSelectedIndex() != designerEnvLanguageIndex) { int rv = JOptionPane.showOptionDialog( null, - Inter.getLocText("FR-Designer-Language_Change_Successful"), + Inter.getLocText("FR-Designer_Language_Change_Successful"), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.YES_NO_OPTION, JOptionPane.INFORMATION_MESSAGE, diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 751e14b11b..c191e5e63c 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -471,5 +471,5 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips= FR-Designer_Reset= FR-Designer_Add_all= -FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted -FR-Designer-Template_Web_Attributes=Web Attributes +FR-Designer_Language_Change_Successful=New language setting will be enabled when designer is restarted +FR-Designer_Template_Web_Attributes=Web Attributes diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index da00526cfc..3cd4673299 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -470,5 +470,5 @@ FR-Designer_Mobile-ToolBar=toolbar FR-Designer_WLayout-Absolute-ToolTips=Freestyle layout, add control in any position of the layout FR-Designer_Reset=reset FR-Designer_Add_all=Add all -FR-Designer-Language_Change_Successful=New language setting will be enabled when designer is restarted -FR-Designer-Template_Web_Attributes=Web Attributes +FR-Designer_Language_Change_Successful=New language setting will be enabled when designer is restarted +FR-Designer_Template_Web_Attributes=Web Attributes diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index 255abf73ce..180eec99ea 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -448,5 +448,5 @@ FR-Designer_Mobile-Refresh= FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u914D\u7F6E\u3067\u3059\u3002\u914D\u7F6E\u5185\u306E\u4EFB\u610F\u306E\u4F4D\u7F6E\u306B\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u3092\u8FFD\u52A0\u3059\u308B\u3053\u3068 FR-Designer_Add_all=\u3059\u3079\u3066\u8FFD\u52A0 -FR-Designer-Language_Change_Successful= -FR-Designer-Template_Web_Attributes= +FR-Designer_Language_Change_Successful= +FR-Designer_Template_Web_Attributes= diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index 5ea4a3ab6b..2d029ec720 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -444,5 +444,5 @@ FR-Designer_Mobile-ToolBar= FR-Designer_WLayout-Absolute-ToolTips=\uC790\uC720\uC2DD\uB808\uC774\uC544\uC6C3\uC740\uB808\uC774\uC544\uC6C3\uC548\uC5D0\uC11C\uC5B4\uB290\uC704\uCE58\uC5D0\uB3C4\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uB97C\uCD94\uAC00\uD560\uC218\uC788\uC2B5\uB2C8\uB2E4. FR-Designer_Add_all=\uBAA8\uB450\uCD94\uAC00 FR-Designer_Reset= -FR-Designer-Language_Change_Successful= -FR-Designer-Template_Web_Attributes= +FR-Designer_Language_Change_Successful= +FR-Designer_Template_Web_Attributes= diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 6e837afbed..b1b0fa697d 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -474,5 +474,5 @@ FR-Designer_Mobile-Refresh=\u5237\u65B0 FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5185\u4EFB\u610F\u4F4D\u7F6E\u6DFB\u52A0\u63A7\u4EF6 FR-Designer_Reset=\u53D6\u6D88\u5220\u9664 FR-Designer_Add_all=\u5168\u90E8\u6DFB\u52A0 -FR-Designer-Language_Change_Successful=\u65B0\u7684\u8BED\u8A00\u8BBE\u7F6E\u5C06\u5728\u91CD\u65B0\u542F\u52A8\u8BBE\u8BA1\u5668\u65F6\u88AB\u542F\u7528 -FR-Designer-Template_Web_Attributes=\u6A21\u677FWeb\u5C5E\u6027 +FR-Designer_Language_Change_Successful=\u65B0\u7684\u8BED\u8A00\u8BBE\u7F6E\u5C06\u5728\u91CD\u65B0\u542F\u52A8\u8BBE\u8BA1\u5668\u65F6\u88AB\u542F\u7528 +FR-Designer_Template_Web_Attributes=\u6A21\u677FWeb\u5C5E\u6027 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 7b81457f0e..1c4e13a3b5 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -462,5 +462,5 @@ FR-Designer_Mobile-Refresh=\u5237\u65B0 FR-Designer_Mobile-ToolBar=\u5DE5\u5177\u6B04 FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF\u4EE5\u5728\u5E03\u5C40\u5167\u4EFB\u610F\u4F4D\u7F6E\u65B0\u589E\u63A7\u5236\u9805 FR-Designer_Add_all=\u5168\u90E8\u65B0\u589E -FR-Designer-Language_Change_Successful=\u65B0\u7684\u8A9E\u8A00\u8A2D\u5B9A\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u6642\u88AB\u555F\u7528 -FR-Designer-Template_Web_Attributes=\u5831\u8868Web\u5C6C\u6027 +FR-Designer_Language_Change_Successful=\u65B0\u7684\u8A9E\u8A00\u8A2D\u5B9A\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u6642\u88AB\u555F\u7528 +FR-Designer_Template_Web_Attributes=\u5831\u8868Web\u5C6C\u6027 From 2f92f8ef0a6457bf41d8561ed3bdad050604ef9e Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 29 Nov 2016 15:16:16 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9ReportWebAttrPane?= =?UTF-8?q?=E4=B8=AD=E7=94=A8=E5=88=B0=E7=9A=84=E9=83=A8=E5=88=86=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96key=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/webattr/ReportWebAttrPane.java | 16 ++++++++-------- .../src/com/fr/design/locale/designer.properties | 8 ++++++++ .../fr/design/locale/designer_en_US.properties | 8 ++++++++ .../fr/design/locale/designer_ja_JP.properties | 8 ++++++++ .../fr/design/locale/designer_ko_KR.properties | 8 ++++++++ .../fr/design/locale/designer_zh_CN.properties | 8 ++++++++ .../fr/design/locale/designer_zh_TW.properties | 8 ++++++++ 7 files changed, 56 insertions(+), 8 deletions(-) diff --git a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java index d3454ed89d..a4e877c564 100644 --- a/designer/src/com/fr/design/webattr/ReportWebAttrPane.java +++ b/designer/src/com/fr/design/webattr/ReportWebAttrPane.java @@ -44,16 +44,16 @@ public class ReportWebAttrPane extends LoadingBasicPane { //Tabbed Pane tabbedPane = new UITabbedPane(); defaultPane.add(tabbedPane, BorderLayout.CENTER); - tabbedPane.addTab(Inter.getLocText("ReportServerP-Basic"), commonPane = new CommonPane()); - tabbedPane.addTab(Inter.getLocText("ReportServerP-Printers(Server)"), serverPrintPane = new ReportServerPrinterPane()); + tabbedPane.addTab(Inter.getLocText("FR-Designer_Basic"), commonPane = new CommonPane()); + tabbedPane.addTab(Inter.getLocText("FR-Designer_Printers(Server)"), serverPrintPane = new ReportServerPrinterPane()); - tabbedPane.add(Inter.getLocText("WEB-Pagination_Setting"), pageWeb = new PageWebSettingPane()); - tabbedPane.add(Inter.getLocText("WEB-Write_Setting"), writeWeb = new WriteWebSettingPane()); - tabbedPane.add(Inter.getLocText("M-Data_Analysis_Settings"), viewWeb = new ViewWebSettingPane()); + tabbedPane.add(Inter.getLocText("FR-Designer_Pagination_Setting"), pageWeb = new PageWebSettingPane()); + tabbedPane.add(Inter.getLocText("FR-Designer_Write_Setting"), writeWeb = new WriteWebSettingPane()); + tabbedPane.add(Inter.getLocText("FR-Designer_Data_Analysis_Settings"), viewWeb = new ViewWebSettingPane()); - tabbedPane.addTab(Inter.getLocText("ReportServerP-Browser_Background"), backgroundPane = new BackgroundPane4Browser()); - tabbedPane.addTab(Inter.getLocText("ReportServerP-Import_Css"), cssPane = new WebCssPane()); - tabbedPane.addTab(Inter.getLocText("ReportServerP-Import_JavaScript"), jsPane = new WebJsPane()); + tabbedPane.addTab(Inter.getLocText("FR-Designer_Browser_Background"), backgroundPane = new BackgroundPane4Browser()); + tabbedPane.addTab(Inter.getLocText("FR-Designer_Import_Css"), cssPane = new WebCssPane()); + tabbedPane.addTab(Inter.getLocText("FR-Designer_Import_JavaScript"), jsPane = new WebJsPane()); } @Override diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index c191e5e63c..34e998867c 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -473,3 +473,11 @@ FR-Designer_Reset= FR-Designer_Add_all= FR-Designer_Language_Change_Successful=New language setting will be enabled when designer is restarted FR-Designer_Template_Web_Attributes=Web Attributes +FR-Designer_Basic=Basic +FR-Designer_Printers(Server)=Printer(Server) +FR-Designer_Pagination_Setting=Pagination Setting +FR-Designer_Write_Setting=Write Setting +FR-Designer_Data_Analysis_Settings=Data Analysis Settings +FR-Designer_Browser_Background=Browser Background +FR-Designer_Import_Css=Import Css +FR-Designer_Import_JavaScript=Import JavaScript diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index 3cd4673299..91b97a86c1 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -472,3 +472,11 @@ FR-Designer_Reset=reset FR-Designer_Add_all=Add all FR-Designer_Language_Change_Successful=New language setting will be enabled when designer is restarted FR-Designer_Template_Web_Attributes=Web Attributes +FR-Designer_Basic=Basic +FR-Designer_Printers(Server)=Printer(Server) +FR-Designer_Pagination_Setting=Page Break Preview +FR-Designer_Write_Setting=Filling Settings +FR-Designer_Data_Analysis_Settings=Data Analysis Settings +FR-Designer_Browser_Background=Browser Background +FR-Designer_Import_Css=Reference Css +FR-Designer_Import_JavaScript=Reference JavaScript diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index 180eec99ea..e4e36a2958 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -450,3 +450,11 @@ FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u914D\u7F6E\u3067\u3059 FR-Designer_Add_all=\u3059\u3079\u3066\u8FFD\u52A0 FR-Designer_Language_Change_Successful= FR-Designer_Template_Web_Attributes= +FR-Designer_Basic=\u57FA\u672C +FR-Designer_Printers(Server)=\u30D7\u30EA\u30F3\u30BF\u30FC(\u30B5\u30FC\u30D0) +FR-Designer_Pagination_Setting=\u30DA\u30FC\u30B8\u5225\u30D7\u30EC\u30D3\u30E5\u30FC\u8A2D\u5B9A +FR-Designer_Write_Setting=\u5831\u544A\u30DA\u30FC\u30B8\u8A2D\u5B9A +FR-Designer_Data_Analysis_Settings=\u30C7\u30FC\u30BF\u5206\u6790\u8A2D\u5B9A +FR-Designer_Browser_Background=\u30D6\u30E9\u30A6\u30B6\u80CC\u666F +FR-Designer_Import_Css=Css\u5F15\u7528 +FR-Designer_Import_JavaScript=JavaScript\u5F15\u7528 diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index 2d029ec720..8877b8a9fe 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -446,3 +446,11 @@ FR-Designer_Add_all=\uBAA8\uB450\uCD94\uAC00 FR-Designer_Reset= FR-Designer_Language_Change_Successful= FR-Designer_Template_Web_Attributes= +FR-Designer_Basic=\uAE30\uBCF8 +FR-Designer_Printers(Server)=\uD504\uB9B0\uD130(\uC11C\uBC84) +FR-Designer_Pagination_Setting=\uD398\uC774\uC9C0\uB098\uB204\uAE30\uBBF8\uB9AC\uBCF4\uAE30\uC124\uC815 +FR-Designer_Write_Setting=\uC6F9\uD398\uC774\uC9C0\uC124\uC815\uAE30\uC785 +FR-Designer_Data_Analysis_Settings=\uB370\uC774\uD130\uBD84\uC11D\uC124\uC815 +FR-Designer_Browser_Background=\uC6F9\uBE0C\uB77C\uC6B0\uC800\uBC30\uACBD +FR-Designer_Import_Css=Css\uC778\uC6A9 +FR-Designer_Import_JavaScript=JavaScript\uC778\uC6A9 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index b1b0fa697d..a849a9b480 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -476,3 +476,11 @@ FR-Designer_Reset=\u53D6\u6D88\u5220\u9664 FR-Designer_Add_all=\u5168\u90E8\u6DFB\u52A0 FR-Designer_Language_Change_Successful=\u65B0\u7684\u8BED\u8A00\u8BBE\u7F6E\u5C06\u5728\u91CD\u65B0\u542F\u52A8\u8BBE\u8BA1\u5668\u65F6\u88AB\u542F\u7528 FR-Designer_Template_Web_Attributes=\u6A21\u677FWeb\u5C5E\u6027 +FR-Designer_Basic=\u57FA\u672C +FR-Designer_Printers(Server)=\u6253\u5370\u673A(\u670D\u52A1\u5668) +FR-Designer_Pagination_Setting=\u5206\u9875\u9884\u89C8\u8BBE\u7F6E +FR-Designer_Write_Setting=\u586B\u62A5\u9875\u9762\u8BBE\u7F6E +FR-Designer_Data_Analysis_Settings=\u6570\u636E\u5206\u6790\u8BBE\u7F6E +FR-Designer_Browser_Background=\u6D4F\u89C8\u5668\u80CC\u666F +FR-Designer_Import_Css=\u5F15\u7528Css +FR-Designer_Import_JavaScript=\u5F15\u7528JavaScript diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 1c4e13a3b5..2e05b1790b 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -464,3 +464,11 @@ FR-Designer_WLayout-Absolute-ToolTips=\u81EA\u7531\u5F0F\u5E03\u5C40\uFF0C\u53EF FR-Designer_Add_all=\u5168\u90E8\u65B0\u589E FR-Designer_Language_Change_Successful=\u65B0\u7684\u8A9E\u8A00\u8A2D\u5B9A\u5C07\u5728\u91CD\u65B0\u555F\u52D5\u8A2D\u8A08\u5668\u6642\u88AB\u555F\u7528 FR-Designer_Template_Web_Attributes=\u5831\u8868Web\u5C6C\u6027 +FR-Designer_Basic=\u57FA\u672C +FR-Designer_Printers(Server)=\u5370\u8868\u6A5F(\u4F3A\u670D\u5668) +FR-Designer_Pagination_Setting=\u5206\u9801\u9810\u89BD\u8A2D\u5B9A +FR-Designer_Write_Setting=\u586B\u5831\u9801\u9762\u8A2D\u5B9A +FR-Designer_Data_Analysis_Settings=\u8CC7\u6599\u5206\u6790\u8A2D\u5B9A +FR-Designer_Browser_Background=\u700F\u89BD\u5668\u80CC\u666F +FR-Designer_Import_Css=\u5F15\u7528Css +FR-Designer_Import_JavaScript=\u5F15\u7528JavaScript