Merge pull request #555 in BA/design from ~PLOUGH/design:dev to dev

* commit '2f92f8ef0a6457bf41d8561ed3bdad050604ef9e':
  修改ReportWebAttrPane中用到的部分国际化key值
  REPORT-748 修改国际化的key值
  REPORT-875 修改显示对话框的方式，去掉拷贝过来的重复代码
  REPORT-748 模板>模板Web属性点进去之后弹出窗口名称不同
  REPORT-875。将setBasicDialogSize方法的访问权限改回protected
  REPORT-875 修改国际化文件，加入FR-Designer-Language_Change_Successful
  REPORT-875 设计器切换语言后, 应该给个提示, 是否重启, 就跟装完插件一样.

designer/src/com/fr/design/webattr/ReportWebAttrPane.java

@@ -44,21 +44,21 @@ 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("FR-Designer_Basic"), commonPane = new CommonPane());
-        tabbedPane.addTab(Inter.getLocText("ReportServerP-Printers(Server)"), serverPrintPane = new ReportServerPrinterPane());
+        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("FR-Designer_Pagination_Setting"), pageWeb = new PageWebSettingPane());
-        tabbedPane.add(Inter.getLocText("WEB-Write_Setting"), writeWeb = new WriteWebSettingPane());
+        tabbedPane.add(Inter.getLocText("FR-Designer_Write_Setting"), writeWeb = new WriteWebSettingPane());
-        tabbedPane.add(Inter.getLocText("M-Data_Analysis_Settings"), viewWeb = new ViewWebSettingPane());
+        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("FR-Designer_Browser_Background"), backgroundPane = new BackgroundPane4Browser());
-        tabbedPane.addTab(Inter.getLocText("ReportServerP-Import_Css"), cssPane = new WebCssPane());
+        tabbedPane.addTab(Inter.getLocText("FR-Designer_Import_Css"), cssPane = new WebCssPane());
-        tabbedPane.addTab(Inter.getLocText("ReportServerP-Import_JavaScript"), jsPane = new WebJsPane());
+        tabbedPane.addTab(Inter.getLocText("FR-Designer_Import_JavaScript"), jsPane = new WebJsPane());
     }
     
     @Override
     protected String title4PopupWindow() {
-    	return Inter.getLocText("ReportD-Report_Web_Attributes");
+    	return Inter.getLocText("FR-Designer_Template_Web_Attributes");
     }
         
     public void populate(ReportWebAttr reportWebAttr) {

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,28 @@ public class PreferencePane extends BasicPane {
         }
         return l;
     }
+
+    @Override
+    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();
+                    }
+                }
+            }
+        });
+    }
 }

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;
+    }
+
     /**
      * 显示窗口
      *

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,13 @@ 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_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

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,13 @@ 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_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

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,13 @@ 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_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

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,13 @@ 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_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

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,13 @@ 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_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

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 
@@ -461,5 +461,14 @@ 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
+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