REPORT-3894 [9.0一轮回归]颜色对话框名称不显示

7 years ago · 26fe747286
8 changed files with 13 additions and 6 deletions
--- a/designer_base/src/com/fr/design/locale/designer.properties
+++ b/designer_base/src/com/fr/design/locale/designer.properties
@ -2126,4 +2126,5 @@ FS-Designer_DS_Filter_Even_Tip=Even_Tip
 FS-Designer_DS_Filter_Specify_Tip=Specify_Tip
 FR-Designer_Mobile-Height-Percent=Max Percent
 FR-Designer_Mobile-Height-Limit=Height Limit
-FR-Designer-AlphaFine_NO_Result=no search result
+FR-Designer-AlphaFine_NO_Result=no search result
+FR-Designer_Select_Color=Select Color
--- a/designer_base/src/com/fr/design/locale/designer_en_US.properties
+++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties
@ -2122,4 +2122,5 @@ FR-Designer_Barcode_Size=Barcode_Size
 FS-Designer_DS_Filter_Odd_Tip=Odd_Tip
 FS-Designer_DS_Filter_Even_Tip=Even_Tip 
 FS-Designer_DS_Filter_Specify_Tip=Specify_Tip
-FR-Designer-AlphaFine_NO_Result=no search result
+FR-Designer-AlphaFine_NO_Result=no search result
+FR-Designer_Select_Color=Select Color
--- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties
@ -2121,3 +2121,4 @@ FS-Designer_DS_Filter_Even_Tip=
 FS-Designer_DS_Filter_Specify_Tip=
 FR-Designer_Mobile-Height-Percent=
 FR-Designer_Mobile-Height-Limit=
+FR-Designer_Select_Color=
--- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
+++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties
@ -2121,4 +2121,5 @@ FS-Designer_DS_Filter_Odd_Tip=
 FS-Designer_DS_Filter_Even_Tip=
 FS-Designer_DS_Filter_Specify_Tip=
 FR-Designer_Mobile-Height-Percent=
-FR-Designer_Mobile-Height-Limit=
+FR-Designer_Mobile-Height-Limit=
+FR-Designer_Select_Color=
--- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties
@ -2133,4 +2133,5 @@ FR-Designer_Barcode_Size=\u6761\u5F62\u7801\u5927\u5C0F
 FS-Designer_DS_Filter_Odd_Tip=\u63D0\u793A\uFF1A\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u9009\u62E9\u4E86\u5947\u6570\u96C6(1,3,5...)
 FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u9009\u62E9\u4E86\u5076\u6570\u96C6(2,4,6...)
 FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u4E3A1,2-3,5,8\uFF0C\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u5185\u503C\u53C2\u6570$_count_\u8868\u793A\u603B\u4E2A\u6570
-FR-Designer-AlphaFine_NO_Result=\u65E0\u641C\u7D22\u7ED3\u679C
+FR-Designer-AlphaFine_NO_Result=\u65E0\u641C\u7D22\u7ED3\u679C
+FR-Designer_Select_Color=\u9009\u62E9\u989C\u8272
--- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
+++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties
@ -2126,3 +2126,4 @@ FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB
 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
 FR-Designer-AlphaFine_NO_Result=\u7121\u641C\u7D22\u7D50\u679C
+FR-Designer_Select_Color=
--- a/designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java
+++ b/designer_base/src/com/fr/design/style/color/ColorSelectDetailPane.java
@ -56,7 +56,7 @@ public class ColorSelectDetailPane extends BasicPane {

    @Override
    protected String title4PopupWindow() {
-        return null;
+        return Inter.getLocText("FR-Designer_Select_Color");
    }

    protected void initComponents() {
--- a/designer_base/src/com/fr/design/style/color/ColorSelectDialog.java
+++ b/designer_base/src/com/fr/design/style/color/ColorSelectDialog.java
@ -112,7 +112,8 @@ public class ColorSelectDialog extends MiddleChartDialog{
 				doCancel();
 			}
 		});
-    	
+
+		this.setTitle(pane.title4PopupWindow());
    	GUICoreUtils.setWindowCenter(getOwner(), this);
    }