From 28c5146a0ead10293680b22432583bccb2e504f6 Mon Sep 17 00:00:00 2001 From: plough Date: Thu, 7 Sep 2017 16:06:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-4394=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E6=9D=A1=E4=BB=B6=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E3=80=81=E8=B6=85=E7=BA=A7=E9=93=BE=E6=8E=A5=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/gui/controlpane/UIListControlPane.java | 4 ++++ designer_base/src/com/fr/design/gui/ilist/UINameEdList.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java index 67fa2b324..6cc45922e 100644 --- a/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java @@ -132,6 +132,10 @@ public abstract class UIListControlPane extends UIControlPane { protected void doAfterLostFocus() { UIListControlPane.this.updateControlUpdatePane(); } + @Override + protected void doAfterStopEditing() { + saveSettings(); + } }; nameEdList.setCellRenderer(new UINameableListCellRenderer(this)); return nameEdList; diff --git a/designer_base/src/com/fr/design/gui/ilist/UINameEdList.java b/designer_base/src/com/fr/design/gui/ilist/UINameEdList.java index 823c95d6e..3ab1a58c6 100644 --- a/designer_base/src/com/fr/design/gui/ilist/UINameEdList.java +++ b/designer_base/src/com/fr/design/gui/ilist/UINameEdList.java @@ -312,9 +312,14 @@ public class UINameEdList extends UIList implements CellEditorListener { String name = StringUtils.isBlank(value.toString()) ? oldName : value.toString(); setNameAt(name, editingIndex); removeComp(); + doAfterStopEditing(); } } + protected void doAfterStopEditing() { + // default: do nothing + } + public String[] getAllNames() { int length = this.getModel().getSize(); String[] names = new String[length]; From 97a14e8b3146a994d1b892f3fc20c036dab6b98e Mon Sep 17 00:00:00 2001 From: plough Date: Thu, 7 Sep 2017 17:04:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-4425=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E8=8B=B1=E6=96=87=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E8=8F=9C=E5=8D=95=E6=A0=8F=E6=9C=89community=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/mainframe/toolbar/ToolBarMenuDock.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index d88ba9dc3..a8305a49a 100644 --- a/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer_base/src/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -150,8 +150,10 @@ public abstract class ToolBarMenuDock { // 添加帮助菜单 menuList.add(createHelpMenuDef()); - // 添加社区菜单 - addCommunityMenuDef(menuList); + if (FRContext.getLocale() == Locale.CHINA || FRContext.getLocale() == Locale.TAIWAN) { + // 添加社区菜单 + addCommunityMenuDef(menuList); + } // 添加全部UpdateAction到actionmanager中 addAllUpdateActionsToList(menuList); From 97aa56a31dad39ce6624f0c57487c2ad052217a4 Mon Sep 17 00:00:00 2001 From: plough Date: Thu, 7 Sep 2017 17:30:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-4438=20[9.0=E4=B8=80=E8=BD=AE?= =?UTF-8?q?=E5=9B=9E=E5=BD=92]=E5=9B=BD=E9=99=85=E5=8C=96=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=AD=E7=BC=BA=E5=B0=91key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/locale/designer.properties | 9 +++++++-- .../fr/design/locale/designer_en_US.properties | 15 ++++++++++++--- .../fr/design/locale/designer_ja_JP.properties | 17 +++++++++++++++-- .../fr/design/locale/designer_ko_KR.properties | 14 +++++++++++++- .../fr/design/locale/designer_zh_CN.properties | 6 +++--- .../fr/design/locale/designer_zh_TW.properties | 16 ++++++++++++---- 6 files changed, 62 insertions(+), 15 deletions(-) diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 9828576f5..e3aa19cfe 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -2013,7 +2013,6 @@ FR-Designer_Parameter= FR-Designer-Plugin_Plugin=Plugin FR-Designer_Background=Background Template=Template - FR-Designer_Parent_Marked_Field=Parent Marked Field FR-Designer_Original_Marked_Filed=Original Marked Filed FR-Designer_Build_Tree_Accord_Parent_Marked_Filed=Build Tree according parent's marked filed @@ -2135,4 +2134,10 @@ FR-Designer_Widgetname=Widget Name FR-Designer_Insert_Cell_Element=Insert Cell Element FR-Designer_Add_Condition=Add Condition FR-Designer_Use_Params_Template=use parameter template -FR-Designer_Label_Name=label name \ No newline at end of file +FR-Designer_Label_Name=label name +FR-Designer_Widget_Visible= +FR-Designer_Widget_Enabled= +FR-Designer_Cell_Visible= +FR-Designer_Show= +FR-Designer_Float_Visible= +FR-Designer_Cell_Value= diff --git a/designer_base/src/com/fr/design/locale/designer_en_US.properties b/designer_base/src/com/fr/design/locale/designer_en_US.properties index 8fb61d83b..f2cd12b86 100644 --- a/designer_base/src/com/fr/design/locale/designer_en_US.properties +++ b/designer_base/src/com/fr/design/locale/designer_en_US.properties @@ -1134,7 +1134,6 @@ FRFont-bold=Bold FR-Designer_Set_Submit_Condition=Submit Condition Form-Change_Widget_Name=Change Control Name ReportColumns-Report_Columns=Multi-columns/lines display -FR-Designer_Can_not_use_FormatBursh=Can't use format painter in multiple selections CellElement-Property_Table=Cell Attribute Table Dictionary-Dynamic_SQL=Dynamic SQL FR-Designer_Form-CheckBoxGroup=CheckBoxGroup @@ -2015,7 +2014,6 @@ FR-Designer_Parameter=Parameter FR-Designer-Plugin_Plugin=Plugin FR-Designer_Background=BG Template=Template - FR-Designer_Original_Marked_Filed=Original Tag Field FR-Designer_Build_Tree_Accord_Marked_Filed_Length=Build tree according to tag field's length FR-Designer_Can_not_use_FormatBursh=Can't use format painter in multiple selections @@ -2131,4 +2129,15 @@ FR-Designer_Widgetname=Widget Name FR-Designer_Insert_Cell_Element=Insert Cell Element FR-Designer_Add_Condition=Add Condition FR-Designer_Use_Params_Template=use parameter template -FR-Designer_Label_Name=label name \ No newline at end of file +FR-Designer_Label_Name=label name +FR-Designer_Widget_Visible= +FR-Designer_Widget_Display_Report_Tool= +FR-Designer_Cell_Value= +FR-Designer_Cell_Visible= +FR-Designer_Widget_Formula= +FR-Designer_Show= +FR-Designer_Widget_Position= +FR-Designer_Float_Visible= +FR-Designer_Widget_String= +FR-Designer_Widget_Field= +FR-Designer_Widget_Enabled= diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index e174c736d..7cf2562d0 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties @@ -1132,7 +1132,6 @@ FRFont-bold=\u592A\u5B57 FR-Designer_Set_Submit_Condition=\u63D0\u51FA\u6761\u4EF6\u3092\u8A2D\u5B9A Form-Change_Widget_Name=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u540D\u5909\u66F4 ReportColumns-Report_Columns=\u5E33\u7968\u30B3\u30E9\u30E0 -FR-Designer_Can_not_use_FormatBursh=\u8907\u6570\u9078\u629E\u3057\u305F\u30A8\u30EA\u30A2\u3067\u306F\u66F8\u5F0F\u30D6\u30E9\u30B7\u3092\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\! CellElement-Property_Table=\u30BB\u30EB\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u00B7\u30B7\u30FC\u30C8 Dictionary-Dynamic_SQL=\u52D5\u614BSQL FR-Designer_Form-CheckBoxGroup=\u30D5\u30EC\u30FC\u30E0\u30BB\u30C3\u30C8\u3092\u8907\u6570\u9078\u629E @@ -2127,4 +2126,18 @@ FR-Designer-Basic_Dynamic_Parameter_Injection= FR-Designer_Label=\u30E9\u30D9\u30EBa FR-Designer_Widgetname=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB\u540D FR-Designer_Insert_Cell_Element= -FR-Designer_Add_Condition= \ No newline at end of file +FR-Designer_Add_Condition= +FR-Designer_Widget_Visible= +FR-Designer_Widget_Display_Report_Tool= +FR-Designer_Cell_Value= +FR-Designer_Cell_Visible= +FR-Designer_Widget_Formula= +M-New_WorkBook= +FR-Designer_Show= +FR-Designer-AlphaFine_NO_Result= +FR-Designer_Widget_Position= +FR-Designer_Float_Visible= +FR-Designer_Widget_String= +FR-Designer_Widget_Field= +FR-Designer_Add_Event= +FR-Designer_Widget_Enabled= diff --git a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties index c3b1e48c8..3e4cc2d09 100644 --- a/designer_base/src/com/fr/design/locale/designer_ko_KR.properties +++ b/designer_base/src/com/fr/design/locale/designer_ko_KR.properties @@ -2128,4 +2128,16 @@ FR-Designer-Basic_Dynamic_Parameter_Injection= FR-Designer_Label=\uB808\uC774\uBE14 FR-Designer_Widgetname=\uC18C\uD504\uD2B8\uC6E8\uC5B4\uC81C\uC5B4\uC774\uB984 FR-Designer_Insert_Cell_Element= -FR-Designer_Add_Condition= \ No newline at end of file +FR-Designer_Add_Condition= +FR-Designer_Widget_Visible= +FR-Designer_Widget_Display_Report_Tool= +FR-Designer_Cell_Value= +FR-Designer_Cell_Visible= +FR-Designer_Widget_Formula= +FR-Designer_Show= +FR-Designer-AlphaFine_NO_Result= +FR-Designer_Widget_Position= +FR-Designer_Float_Visible= +FR-Designer_Widget_String= +FR-Designer_Widget_Field= +FR-Designer_Widget_Enabled= diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 3b8e7957a..31a3790e3 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties @@ -2015,7 +2015,6 @@ FR-Designer_Parameter=\u53C2\u6570 FR-Designer-Plugin_Plugin=\u63D2\u4EF6 FR-Designer_Background=\u80CC\u666F Template=\u6A21\u7248 - FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6807\u8BB0\u5B57\u6BB5 FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8D56\u6240\u9009\u6570\u636E\u96C6\u7684\u6807\u8BB0\u5B57\u6BB5\u7684\u957F\u5EA6\u6784\u5EFA\u6811 FR-Designer_Tree_Data_Field=\u6811\u6570\u636E\u5B57\u6BB5 @@ -2025,7 +2024,6 @@ FR-Product_Demo=\u4EA7\u54C1\u6F14\u793A FR-Designer_Data_Filter=\u6570\u636E\u7B5B\u9009 Default=\u9ED8\u8BA4 FR-Base-Load_Resource_File=\u52A0\u8F7D\u914D\u7F6E\u6587\u4EF6 - 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 @@ -2140,4 +2138,6 @@ FR-Designer_Select_Color=\u9009\u62E9\u989C\u8272 FR-Designer-Basic_Dynamic_Parameter_Injection=\u6CE8\u5165 FR-Designer_Label=\u6807\u7B7E FR-Designer_Widgetname=\u63A7\u4EF6\u540D -FR-Designer_Insert_Cell_Element=\u63D2\u5165\u5143\u7D20 \ No newline at end of file +FR-Designer_Insert_Cell_Element=\u63D2\u5165\u5143\u7D20 +FR-Designer-Plugin_Has_Been_Actived= +FR-Designer-Plugin_Has_Been_Disabled= diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 548b39a00..7098ef8d0 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties @@ -1134,7 +1134,6 @@ FRFont-bold=\u7C97\u9AD4 FR-Designer_Set_Submit_Condition=\u8A2D\u5B9A\u63D0\u4EA4\u689D\u4EF6 Form-Change_Widget_Name=\u66F4\u6539\u63A7\u5236\u9805\u540D ReportColumns-Report_Columns=\u5831\u8868\u5206\u6B04 -FR-Designer_Can_not_use_FormatBursh=\u7121\u6CD5\u4F7F\u7528\u8907\u88FD\u683C\u5F0F CellElement-Property_Table=\u5132\u5B58\u683C\u5C6C\u6027\u8868 Dictionary-Dynamic_SQL=\u52D5\u614BSQL FR-Designer_Form-CheckBoxGroup=\u5FA9\u9078\u6846\u7D44 @@ -2014,7 +2013,6 @@ FR-Designer_Parameter=\u53C3\u6578 FR-Designer-Plugin_Plugin=\u63D2\u4EF6 FR-Designer_Background=\u586B\u6EFF\u8272\u5F69 Template=\u7BC4\u672C - FR-Designer_Original_Marked_Filed=\u539F\u59CB\u6A19\u8A18\u6B04\u4F4D FR-Designer_Build_Tree_Accord_Marked_Filed_Length=\u4F9D\u8CF4\u6240\u9078\u8CC7\u6599\u96C6\u7684\u6A19\u8A18\u6B04\u4F4D\u7684\u9577\u5EA6\u69CB\u5EFA\u6A39\u72C0 FR-Designer_Can_not_use_FormatBursh=\u7121\u6CD5\u4F7F\u7528\u8907\u88FD\u683C\u5F0F @@ -2025,7 +2023,6 @@ FR-Product_Demo=\u529F\u80FD\u5C55\u793A FR-Designer_Data_Filter=\u8CC7\u6599\u7BE9\u9078 Default=\u9810\u8A2D FR-Base-Load_Resource_File=\u52A0\u8F09\u914D\u7F6E\u6A94\u6848 - 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 @@ -2132,4 +2129,15 @@ FR-Designer-Basic_Dynamic_Parameter_Injection=\u6CE8\u5165 FR-Designer_Label=\u6A19\u7C3D FR-Designer_Widgetname=\u63A7\u5236\u9805\u540D FR-Designer_Insert_Cell_Element=\u63D2\u5165\u5143\u7D20 -FR-Designer_Add_Condition= \ No newline at end of file +FR-Designer_Add_Condition= +FR-Designer_Widget_Visible= +FR-Designer_Widget_Display_Report_Tool= +FR-Designer_Cell_Value= +FR-Designer_Cell_Visible= +FR-Designer_Widget_Formula= +FR-Designer_Show= +FR-Designer_Widget_Position= +FR-Designer_Float_Visible= +FR-Designer_Widget_String= +FR-Designer_Widget_Field= +FR-Designer_Widget_Enabled=