Merging in latest from upstream (ST/design:refs/heads/release/9.0)

* commit '9dcfab76c966dd5623754cb794be97eb161bfc0a':
  REPORT-5692 [9.0三轮回归] 查询按钮改名字后，不会立即在设计器改变名字
  REPORT-5591 设计器https远程连接
  REPORT-5666 【9.0三轮回归】按钮控件，属性面板设置了控件大小无法保存，如图

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

@@ -2147,3 +2147,4 @@ FR-Designer_Print_Background=
 FR-Designer_Sheet_Label_Page_Display_Position=
 FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
+FR-Designer_Env_Des_Https=If HTTPS is enabled or the HTTPS configuration (certificate path, HTTPS key) is modified, you must restart the designer to take effect.

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

@@ -2146,3 +2146,4 @@ FR-Designer_Print_Background=
 FR-Designer_Sheet_Label_Page_Display_Position=
 FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
+FR-Designer_Env_Des_Https=If HTTPS is enabled or the HTTPS configuration (certificate path, HTTPS key) is modified, you must restart the designer to take effect.

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

@@ -2147,3 +2147,4 @@ FR-Designer_Sheet_Label_Page_Display_Position=Sheet\u30E9\u30D9\u30EB\u30DA\u30F
 FR-Designer_Provide_Choose_All=\u5168\u9078\u629E\u53EF\u80FD
 FR-Designer_Decimal_Places=\u5C0F\u6570\u67A0\u6570:
 FR-Base-Load_Resource_File=\u8A2D\u5B9A\u30D5\u30A1\u30A4\u30EB\u30ED\u30FC\u30C9
+FR-Designer_Env_Des_Https=

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

@@ -2147,3 +2147,4 @@ FR-Designer_Decimal_Places=\uC18C\uC218\uC218\uB7C9:
 FR-Base-Load_Resource_File=\uB85C\uB529\uAD6C\uC131\uD30C\uC77C
 FR-Designer_Export_Background=
 FR-Designer_Print_Background=
+FR-Designer_Env_Des_Https=

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

@@ -2147,3 +2147,4 @@ FR-Designer_Print_Background=
 FR-Designer_Sheet_Label_Page_Display_Position=
 FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
+FR-Designer_Env_Des_Https=\u82E5\u542F\u7528https\u6216\u4FEE\u6539https\u914D\u7F6E\uFF08\u8BC1\u4E66\u8DEF\u5F84\u3001https\u79D8\u94A5\uFF09\uFF0C\u5FC5\u987B\u91CD\u542F\u8BBE\u8BA1\u5668\u624D\u80FD\u751F\u6548\u3002

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

@@ -2146,3 +2146,4 @@ FR-Designer_Print_Background=
 FR-Designer_Sheet_Label_Page_Display_Position=
 FR-Designer_Provide_Choose_All=
 FR-Designer_Decimal_Places=
+FR-Designer_Env_Des_Https=\u82E5\u555F\u7528https\u6216\u4FEE\u6539https\u914D\u7F6E\uFF08\u8B49\u66F8\u8DEF\u5F91\u3001https\u7955\u9470\uFF09\uFF0C\u5FC5\u9808\u91CD\u555F\u8A2D\u8A08\u5668\u624D\u80FD\u751F\u6548\u3002

designer_base/src/com/fr/env/EnvListPane.java

@@ -377,6 +377,7 @@ public class EnvListPane extends JListControlPane {
             previewTextArea.setText(Inter.getLocText("Env-Des2"));
             try {
                 previewTextArea.getDocument().insertString(previewTextArea.getText().length(), Inter.getLocText("Env_Des"), this.getRedSytleAttribute());
+                previewTextArea.getDocument().insertString(previewTextArea.getText().length(), "\n" + Inter.getLocText("FR-Designer_Env_Des_Https"), this.getRedSytleAttribute());
             } catch (BadLocationException e) {
                 FRContext.getLogger().error(e.getMessage(), e);
             }

designer_form/src/com/fr/design/designer/creator/XButton.java

@@ -289,4 +289,21 @@ public class XButton extends XWidgetCreator {
     protected String getIconName() {
         return "button_16.png";
     }
+
+	/**
+	 * data属性改变触发其他操作
+	 *
+	 */
+	public void firePropertyChange(){
+		FreeButton button = (FreeButton) data;
+		setButtonText(button.getText());
+		checkButonType();
+		if (button.getFont() != null) {
+			contentLabel.setFont(button.getFont().applyResolutionNP(
+					ScreenResolution.getScreenResolution()));
+			contentLabel.setForeground(button.getFont().getForeground());
+		}
+
+	}
+
 }

designer_form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java

@@ -91,6 +91,7 @@ public class WidgetBoundPane extends BasicPane {
         if (bounds.height != h) {
             limitHeight(wabs, h, bounds, rec);
         }
+        creator.setBounds(bounds);
     }