Merge pull request #1075 in BA/design from ~VITO/design:release/9.0 to release/9.0

* commit 'bb2bdbdce09f3f32f8c4b1118ab4fa8433bb9b62':
  REPORT-3262 设计器适配9.0

designer/src/com/fr/start/ReportSplashPane.java

@@ -8,9 +8,11 @@ import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
 import com.fr.design.mainframe.bbs.BBSConstants;
 import com.fr.general.GeneralContext;
-import com.fr.general.Inter;
 import com.fr.general.ModuleContext;
-import com.fr.stable.*;
+import com.fr.stable.Constants;
+import com.fr.stable.CoreGraphHelper;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
 import com.fr.stable.module.ModuleAdapter;
 import com.fr.stable.module.ModuleListener;
 
@@ -117,13 +119,6 @@ public class ReportSplashPane extends SplashPane{
         //加载模块信息
         double y = MODULE_INFO_Y + height + leading + ascent;
         GraphHelper.drawString(splashG2d, showText, MODULE_INFO_X, y);
-        
-        //每次随机感谢一位论坛用户
-        if (shouldShowThanks()) {
-            splashG2d.setPaint(THANK_COLOR);
-            String content = Inter.getLocText("FR-Designer_Thanks-To") + GUEST;
-            GraphHelper.drawString(splashG2d, content, THANK_INFO_X, y);
-        }
     }
 
     // 是否显示鸣谢文字

designer_base/src/com/fr/design/actions/help/AboutPane.java

@@ -82,9 +82,6 @@ public class AboutPane extends JPanel {
         
         contentPane.add(actionLabel);
         contentPane.add(emailLabel);
-        if (shouldShowThanks()) {
-            addThankPane(contentPane);
-        }
     }
 
     // 是否显示服务电话和 qq

designer_base/src/com/fr/design/locale/designer.properties

@@ -1457,7 +1457,7 @@ Ratio=Ratio
 DBCP_TEST_ON_BORROW=TestOnBorrow
 FR-Designer_layerIndex=
 WEB-Write_Setting=Write Setting
-M-New_WorkBook=New WorkBook
+M-New_WorkBook=New General Report
 FR-Designer-Plugin_Has_Been_Actived=Plugin is now active
 Datasource-Maximum_Number_of_Preview_Rows=Maximum Number of Preview Rows
 ExpandD-Cell_Expand_Attributes=Attribute to Insert Cell to Display Data

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -1460,7 +1460,7 @@ Ratio=Ratio
 DBCP_TEST_ON_BORROW=Test before Getting Connections
 FR-Designer_layerIndex=
 WEB-Write_Setting=Filling Settings
-M-New_WorkBook=New WorkBook
+M-New_WorkBook=New General Report
 FR-Designer-Plugin_Has_Been_Actived=Plugin is now active, restart the designer and sever to enable it and the sever need to be manually restarted
 Datasource-Maximum_Number_of_Preview_Rows=Maximum Number of Preview Rows
 ExpandD-Cell_Expand_Attributes=Extension Attributes

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -1357,7 +1357,7 @@ RWA-NotChange_Unmodified=\u306E\u6539\u6B63\u3092\u66F4\u65B0\u3057\u306A\u3044
 User_Information=\u30E6\u30FC\u30B6\u30FC\u60C5\u5831
 Custom_styles_lost=\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u30B9\u30BF\u30A4\u30EB\u306F\u5931\u308F\u308C\u307E\u3057\u305F
 PageSetup-Margin=\u4F59\u767D
-M-New_FormBook=\u8868\u3092\u65B0\u898F\u4F5C\u6210
+M-New_FormBook=
 Widget-TreeNode=\u30C4\u30EA\u30FC\u30CE\u30FC\u30C9\u30DC\u30BF\u30F3
 Form-Url=\u30A2\u30C9\u30EC\u30B9
 Utils-Beyond_the_left_side_of_Border=\u5DE6\u30DC\u30FC\u30C0\u30FC\u8D85\u3048
@@ -1458,7 +1458,6 @@ Ratio=\u6BD4\u7387
 DBCP_TEST_ON_BORROW=\u63A5\u7D9A\u524D\u691C\u67FB\u3092\u53D6\u5F97
 FR-Designer_layerIndex=
 WEB-Write_Setting=\u5831\u544A\u30DA\u30FC\u30B8\u8A2D\u5B9A
-M-New_WorkBook=\u30D6\u30C3\u30AF\u3092\u65B0\u898F\u4F5C\u6210
 FR-Designer-Plugin_Has_Been_Actived=\u30D7\u30E9\u30B0\u30A4\u30F3\u306F\u3059\u3067\u306B\u8D77\u52D5\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u30C7\u30B6\u30A4\u30CA\u30FC\u3068\u30B5\u30FC
 Datasource-Maximum_Number_of_Preview_Rows=\u30D7\u30EC\u30D3\u30E5\u30FC\u884C\u6570\u6700\u5927\u5024
 ExpandD-Cell_Expand_Attributes=\u62E1\u5F35\u5C5E\u6027
@@ -1982,7 +1981,6 @@ FR-Base_UnSignIn=\ \u672A\u30ED\u30B0\u30A4\u30F3
 Every=\u6BCE
 CellWrite-Preview_Cell_Content=\u30BB\u30EB\u5185\u5BB9
 FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
-FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
 FR-Designer_Permissions=\u6A29\u9650
 FR-Designer_Form_Button=\u30DC\u30BF\u30F3
 FR-Designer_WF_Name=\u540D
@@ -2005,8 +2003,6 @@ FR-Designer_Data_Filter=\u30C7\u30FC\u30BF\u30D5\u30A3\u30EB\u30BF
 FR-Designer_Can_not_use_FormatBursh=\u9023\u7D9A\u3057\u306A\u3044\u8907\u6570\u9818\u57DF\u3067\u306F\u66F8\u5F0F\u30B3\u30D4\u30FC\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093
 Default=\u65E2\u5B9A
 FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9
-
-FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\u30C9
 FR-Designer_Cell_Element=\u30BB\u30EB\u8981\u7D20
 FR-Designer_Cell_Attributes=\u30BB\u30EB\u5C5E\u6027
 FR-Designer_Float_Element=\u30D5\u30ED\u30FC\u30C8\u8981\u7D20

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -1357,7 +1357,7 @@ RWA-NotChange_Unmodified=\uC218\uC815\uD558\uC9C0\uC54A\uC73C\uBA74\uC5C5\uB370\
 User_Information=\uC0AC\uC6A9\uC790\uC815\uBCF4
 Custom_styles_lost=\uC0AC\uC6A9\uC790\uC815\uC758\uC591\uC2DD\uC774\uC5C6\uC2B5\uB2C8\uB2E4.
 PageSetup-Margin=\uD398\uC774\uC9C0\uC5EC\uBC31
-M-New_FormBook=\uC0C8\uD3FC
+M-New_FormBook=
 Widget-TreeNode=\uD2B8\uB9AC\uB178\uB4DC\uD0A4
 Form-Url=\uC8FC\uC18C
 Utils-Beyond_the_left_side_of_Border=\uC67C\uCABD\uC5EC\uBC31\uBC97\uC5B4\uB0A8
@@ -1458,7 +1458,7 @@ Ratio=\uBE44\uC728
 DBCP_TEST_ON_BORROW=\uB9C1\uD06C\uD68D\uB4DD\uC804\uAC80\uC0AC\uC9C4\uD589
 FR-Designer_layerIndex=
 WEB-Write_Setting=\uC6F9\uD398\uC774\uC9C0\uC124\uC815\uAE30\uC785
-M-New_WorkBook=\uC0C8\uC6CC\uD06C\uBD81
+M-New_WorkBook=
 FR-Designer-Plugin_Has_Been_Actived=\uD50C\uB7EC\uADF8\uC778\uC774\uAD6C\uB3D9\uB418\uC5C8\uC2B5\uB2C8\uB2E4.\uC124\uACC4\uAE30\uBC0F\uC11C\uBC84\uB97C\uC7AC\uBD80\uD305\uD558\uB824\uBA74\uC11C\uBC84\uB97C\uC218\uB3D9\uC7AC\uBD80\uD305\uD574\uC57C\uD569\uB2C8\uB2E4.
 Datasource-Maximum_Number_of_Preview_Rows=\uCD5C\uB300\uBBF8\uB9AC\uBCF4\uAE30\uD589\uC218
 ExpandD-Cell_Expand_Attributes=\uD655\uC7A5\uC18D\uC131
@@ -1982,7 +1982,6 @@ FR-Base_UnSignIn=\uC544\uC9C1 \uB4F1\uB85D
 Every=\uAC01
 CellWrite-Preview_Cell_Content=\uC140\uB0B4\uC6A9\uBBF8\uB9AC\uBCF4\uAE30
 FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9
-FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9
 FR-Designer_Permissions=
 FR-Designer_Form_Button=
 FR-Designer_WF_Name=
@@ -1995,7 +1994,6 @@ FR-Designer_Parameter=\uB9E4\uAC1C\uBCC0\uC218
 FR-Designer-Plugin_Plugin=\uD50C\uB7EC\uADF8\uC778
 FR-Designer_Background=\uBC30\uACBD
 Template=\uD15C\uD50C\uB9BF
-FR-Designer_Double=\uC18C\uC218
 FR-Designer_Original_Marked_Filed=\uCD08\uAE30\uD0DC\uADF8\uD544\uB4DC
 FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\uC120\uD0DD\uD55C\uB370\uC774\uD130\uC138\uD2B8\uC758\uD0DC\uADF8\uD544\uB4DC\uAE38\uC774\uC5D0\uB530\uB77C\uD2B8\uB9AC\uC0DD\uC131
 FR-Designer_Tree_Data_Field=\uD2B8\uB9AC\uB370\uC774\uD130\uD544\uB4DC
@@ -2005,7 +2003,6 @@ FR-Product_Demo=\uC81C\uD488\uC2DC\uC5F0
 FR-Designer_Data_Filter=\uB370\uC774\uD130\uC120\uBCC4
 Default=\uAE30\uBCF8
 FR-Base-Load_Resource_File=\uB85C\uB529\uAD6C\uC131\uD30C\uC77C
-FormulaD-Data_Fields=\uB370\uC774\uD130\uD56D\uBAA9
 FR-Designer_Cell_Element=\uC140\uC694\uC18C
 FR-Designer_Cell_Attributes=\uC140\uC18D\uC131
 FR-Designer_Float_Element=\uD638\uBC84\uC694\uC18C

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -1358,7 +1358,7 @@ RWA-NotChange_Unmodified=\u672A\u4FEE\u6539\u4E0D\u66F4\u65B0
 User_Information=\u7528\u6237\u4FE1\u606F
 Custom_styles_lost=\u81EA\u5B9A\u4E49\u6837\u5F0F\u5DF2\u4E22\u5931
 PageSetup-Margin=\u9875\u8FB9\u8DDD
-M-New_FormBook=\u65B0\u5EFA\u8868\u5355
+M-New_FormBook=\u65B0\u5EFA\u51B3\u7B56\u62A5\u8868
 Widget-TreeNode=\u6811\u8282\u70B9\u6309\u94AE
 Form-Url=\u5730\u5740
 Utils-Beyond_the_left_side_of_Border=\u8D85\u51FA\u5DE6\u8FB9\u754C
@@ -1459,7 +1459,7 @@ Ratio=\u6BD4\u7387
 DBCP_TEST_ON_BORROW=\u83B7\u53D6\u8FDE\u63A5\u524D\u68C0\u9A8C
 FR-Designer_layerIndex=\u4F9D\u8D56\u7684\u5C42\u6570
 WEB-Write_Setting=\u586B\u62A5\u9875\u9762\u8BBE\u7F6E
-M-New_WorkBook=\u65B0\u5EFA\u5DE5\u4F5C\u7C3F
+M-New_WorkBook=\u65B0\u5EFA\u666E\u901A\u62A5\u8868
 Datasource-Maximum_Number_of_Preview_Rows=\u6700\u5927\u7684\u9884\u89C8\u884C\u6570
 ExpandD-Cell_Expand_Attributes=\u6269\u5C55\u5C5E\u6027
 Select_the_repeated_row_and_column=\u9009\u62E9\u9700\u8981\u91CD\u590D\u7684\u884C\u5217

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -1359,7 +1359,6 @@ RWA-NotChange_Unmodified=\u4E0D\u6539\u8B8A\u6642\u4E0D\u66F4\u65B0
 User_Information=\u7528\u6236\u8A0A\u606F
 Custom_styles_lost=\u81EA\u5B9A\u7FA9\u6A23\u5F0F\u5DF2\u4E1F\u5931
 PageSetup-Margin=\u9801\u908A\u8DDD
-M-New_FormBook=\u5EFA\u7ACB\u65B0\u5831\u8868
 Widget-TreeNode=\u6A39\u7BC0\u9EDE\u6309\u9215
 Form-Url=\u5730\u5740
 Utils-Beyond_the_left_side_of_Border=\u8D85\u51FA\u5DE6\u908A\u754C
@@ -1460,7 +1459,7 @@ Ratio=\u6BD4\u7387
 DBCP_TEST_ON_BORROW=\u7372\u53D6\u9023\u63A5\u524D\u6AA2\u9A57
 FR-Designer_layerIndex=\u4F9D\u8CF4\u7684\u5C64\u6578
 WEB-Write_Setting=\u586B\u5831\u9762\u9762\u8A2D\u5B9A
-M-New_WorkBook=\u65B0\u589E\u5DE5\u4F5C\u7C3F
+M-New_WorkBook=\u65B0\u589E\u666E\u901A\u5831\u8868
 FR-Designer-Plugin_Has_Been_Actived=Plugin is now active
 Datasource-Maximum_Number_of_Preview_Rows=\u6700\u5927\u7684\u9810\u89BD\u5217\u6578
 ExpandD-Cell_Expand_Attributes=\u64F4\u5C55\u5C6C\u6027
@@ -2125,3 +2124,4 @@ FR-Designer_Barcode_Size=
 FS-Designer_DS_Filter_Odd_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u9078\u64C7\u4E86\u5947\u6578\u96C6(1,3,5...)
 FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u9078\u64C7\u4E86\u5076\u6578\u96C6(2,4,6...)
 FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u70BA1,2-3,5,8\uFF0C\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u5185\u7F6E\u53C3\u6578$_count_\u8868\u793A\u7E02\u500B\u6578
+M-New_FormBook=\u65B0\u589E\u6C7A\u7B56\u5831\u8868