REPORT-3163 合作开发9.0设计器=>面板标题国际化

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

@@ -2001,8 +2001,11 @@ FR-Designer_AlphaFine_Latest=Latest
 FR-Designer_AlphaFine_ShowLess=show less
 FR-Designer_Alphafine=AlphaFine
 FR-Designer-Alphafine_No_Remind=
-<<<<<<< HEAD
 FR-Designer_AlphaFine_NoResult=no results
 FR-Designer_ConnectionFailed=connection failed
 FR-Designer_NoResult=No results
 FR-Designer-AlphaFine_SetShortcuts=
+FR-Designer_Cell_Element=Cell Element
+FR-Designer_Cell_Attributes=Cell Attributes
+FR-Designer_Float_Element=Float Element
+FR-Designer_Widget_Library=Widget Library

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

@@ -1998,7 +1998,6 @@ FR-Designer_AlphaFine_ShowAll=Show all
 FR-Designer_AlphaFine_Latest=Recent
 FR-Designer_AlphaFine_ShowLess=Show less
 FR-Designer_Alphafine=AlphaFine
-<<<<<<< HEAD
 FR-Designer-Alphafine_No_Remind=don't remind
 FR-Designer_AlphaFine_NoResult=No results
 FR-Designer_ConnectionFailed=Connection failed
@@ -2006,3 +2005,7 @@ FR-Designer_AlphaFine_EnableAlphaFine=Enable AlphaFine
 FR-Designer_AlphaFine_EnableInternet=Internet
 FR-Designer_NoResult=No results
 FR-Designer-AlphaFine_SetShortcuts=please press two key to set shortcut
+FR-Designer_Cell_Element=Cell Element
+FR-Designer_Cell_Attributes=Cell Attributes
+FR-Designer_Float_Element=Float Element
+FR-Designer_Widget_Library=Widget Library

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

@@ -1981,4 +1981,8 @@ FR-Designer_Edit_String_To_Formula=\u30AD\u30E3\u30E9\u30AF\u30BF\u30FC\u6587\u5
 FR-Base_UnSignIn=\  \u672A\u30ED\u30B0\u30A4\u30F3
 Every=\u6BCF
 CellWrite-Preview_Cell_Content=\u30BB\u30EB\u306E\u5185\u5BB9\u3092\u30D7\u30EC\u30D3\u30E5\u30FC\u3059\u308B
-FormulaD-Data_Fields=\u30C7\u30FC\u30BF\u30D5\u30A3\u30FC\u30EB\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
+FR-Designer_Widget_Library=

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

@@ -446,7 +446,6 @@ FR-Designer_WLayout-Absolute-ToolTips=\uC790\uC720\uC2DD\uB808\uC774\uC544\uC6C3
 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
@@ -1982,4 +1981,8 @@ FR-Designer_Edit_String_To_Formula=\uBB38\uC790\uC5F4\uC744\uC218\uC2DD\uC73C\uB
 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_Cell_Element=\uC140\uC694\uC18C
+FR-Designer_Cell_Attributes=\uC140\uC18D\uC131
+FR-Designer_Float_Element=\uD638\uBC84\uC694\uC18C
+FR-Designer_Widget_Library=

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

@@ -2003,3 +2003,7 @@ FR-Designer_AlphaFine_NoResult=\u6682\u65E0\u76F8\u5173\u5185\u5BB9
 FR-Designer_ConnectionFailed=\u94FE\u63A5\u5931\u8D25
 FR-Designer_NoResult=\u6682\u4E0D\u652F\u6301\u663E\u793A
 FR-Designer-AlphaFine_SetShortcuts=\u8BF7\u76F4\u63A5\u5728\u952E\u76D8\u4E0A\u6309\u4E24\u4E2A\u7EC4\u5408\u952E
+FR-Designer_Cell_Element=\u5355\u5143\u683C\u5143\u7D20
+FR-Designer_Cell_Attributes=\u5355\u5143\u683C\u5C5E\u6027
+FR-Designer_Float_Element=\u60AC\u6D6E\u5143\u7D20
+FR-Designer_Widget_Library=\u7EC4\u4EF6\u5E93

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

@@ -2004,3 +2004,7 @@ FR-Designer_AlphaFine_NoResult=\u66AB\u7121\u76F8\u95DC\u5167\u5BB9
 FR-Designer_ConnectionFailed=\u93C8\u63A5\u5931\u6557
 FR-Designer_NoResult=\u66AB\u4E0D\u652F\u6301\u986F\u793A
 FR-Designer-AlphaFine_SetShortcuts=\u8ACB\u76F4\u63A5\u5728\u9375\u76E4\u4E0A\u6309\u5169\u500B\u7D44\u5408\u9375
+FR-Designer_Cell_Element=\u5132\u5B58\u683C\u5143\u7D20
+FR-Designer_Cell_Attributes=\u5132\u5B58\u683C\u5C6C\u6027
+FR-Designer_Float_Element=\u61F8\u6D6E\u5143\u7D20
+FR-Designer_Widget_Library=\u7D44\u4EF6\u5EAB

designer_base/src/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -9,6 +9,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.VerticalFlowLayout;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.FRFont;
+import com.fr.general.Inter;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -56,19 +57,19 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         propertyItemList = new ArrayList<>();
 
         // 单元格元素
-        PropertyItem cellElement = new PropertyItem("cellElement", "/com/fr/design/images/buttonicon/add.png");
+        PropertyItem cellElement = new PropertyItem("cellElement", Inter.getLocText("FR-Designer_Cell_Element"), "/com/fr/design/images/buttonicon/add.png");
         // 单元格属性
-        PropertyItem cellAttr = new PropertyItem("cellAttr", "com/fr/design/images/toolbarbtn/close.png");
+        PropertyItem cellAttr = new PropertyItem("cellAttr", Inter.getLocText("FR-Designer_Cell_Attributes"), "com/fr/design/images/toolbarbtn/close.png");
         // 悬浮元素
-        PropertyItem floatElement = new PropertyItem("floatElement", "com/fr/design/images/toolbarbtn/close.png");
+        PropertyItem floatElement = new PropertyItem("floatElement", Inter.getLocText("FR-Designer_Float_Element"), "com/fr/design/images/toolbarbtn/close.png");
         // 控件设置
-        PropertyItem widgetSettings = new PropertyItem("widgetSettings", "com/fr/design/images/toolbarbtn/close.png");
+        PropertyItem widgetSettings = new PropertyItem("widgetSettings", Inter.getLocText("FR-Designer-Widget_Settings"), "com/fr/design/images/toolbarbtn/close.png");
         // 条件属性
-        PropertyItem conditionAttr = new PropertyItem("conditionAttr", "com/fr/design/images/toolbarbtn/close.png");
+        PropertyItem conditionAttr = new PropertyItem("conditionAttr", Inter.getLocText("FR-Designer_Condition_Attributes"), "com/fr/design/images/toolbarbtn/close.png");
         // 超级链接
-        PropertyItem hyperlink = new PropertyItem("hyperlink", "com/fr/design/images/toolbarbtn/close.png");
+        PropertyItem hyperlink = new PropertyItem("hyperlink", Inter.getLocText("FR-Designer_Hyperlink"), "com/fr/design/images/toolbarbtn/close.png");
         // 组件库
-        PropertyItem widgetLib = new PropertyItem("widgetLib", "com/fr/design/images/toolbarbtn/close.png");
+        PropertyItem widgetLib = new PropertyItem("widgetLib", Inter.getLocText("FR-Designer_Widget_Library"), "com/fr/design/images/toolbarbtn/close.png");
         propertyItemList.add(cellElement);
         propertyItemList.add(cellAttr);
         propertyItemList.add(floatElement);
@@ -220,7 +221,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     class PropertyItem {
         //        private UIButton button;
         private UIButton button;
-        private String name;
+        private String name;  // 用于 card 切换
+        private String title;  // 用于显示
         private JComponent propertyPanel;
         private JComponent contentPane;
         private FixedPopupPane popupPane;  // 左侧固定弹出框
@@ -231,8 +233,9 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         private boolean isPoppedOut = false;  // 是否弹出
         private Dimension fixedSize;
 
-        public PropertyItem(String name, String btnUrl) {
+        public PropertyItem(String name, String title, String btnUrl) {
             this.name = name;
+            this.title = title;
             initButton(btnUrl);
             initPropertyPanel();
         }
@@ -327,6 +330,10 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
             return name;
         }
 
+        public String getTitle() {
+            return title;
+        }
+
         public JComponent getPropertyPanel() {
             return propertyPanel;
         }
@@ -411,7 +418,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
     // 弹出属性面板的工具条
     private class PopupToolPane extends JPanel {
         private int model = UIConstants.MODEL_NORMAL;
-        private String title = "单元格元素";
+        private String title;
         private JComponent contentPane;
         private PropertyItem propertyItem;
         private String buttonType;
@@ -435,6 +442,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         public PopupToolPane(PropertyItem propertyItem, String buttonType) {
             super();
             this.propertyItem = propertyItem;
+            this.title = propertyItem.getTitle();
             this.contentPane = propertyItem.getContentPane();
             setLayout(new BorderLayout());
             UILabel label = new UILabel(title);