From 368e193b1352312dc9604fe814cffbe2bc2ed3d4 Mon Sep 17 00:00:00 2001 From: kerry Date: Tue, 12 Dec 2017 13:52:47 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-2615=20=E5=A4=9A=E7=A7=8Dtab=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E9=A3=8E=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/locale/designer.properties | 3 ++- .../com/fr/design/locale/designer_en_US.properties | 1 + .../com/fr/design/locale/designer_ja_JP.properties | 3 ++- .../com/fr/design/locale/designer_ko_KR.properties | 3 ++- .../com/fr/design/locale/designer_zh_CN.properties | 3 ++- .../com/fr/design/locale/designer_zh_TW.properties | 3 ++- .../src/com/fr/design/mainframe/FormDesignerUI.java | 11 +++++++---- .../ui/designer/layout/WCardTagLayoutDefinePane.java | 6 +++--- 8 files changed, 21 insertions(+), 12 deletions(-) diff --git a/designer_base/src/com/fr/design/locale/designer.properties b/designer_base/src/com/fr/design/locale/designer.properties index 1475bb2307..32d7aeae90 100644 --- a/designer_base/src/com/fr/design/locale/designer.properties +++ b/designer_base/src/com/fr/design/locale/designer.properties @@ -2159,4 +2159,5 @@ FR-Designer_Tab_Template_Two=Template Two FR-Designer_Tab_Template_Three=Template Three FR-Designer_Tab_Template_Four=Template Four FR-Designer_Tab_Template_Five=Template Five -FR-Designer_Tab_Template_Six=Template Six \ No newline at end of file +FR-Designer_Tab_Template_Six=Template Six +FR-Designer_Tab_Display_Position=Display Position \ No newline at end of file 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 f77802a025..3fb8826af3 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 @@ -2159,3 +2159,4 @@ FR-Designer_Tab_Template_Three=Template Three FR-Designer_Tab_Template_Four=Template Four FR-Designer_Tab_Template_Five=Template Five FR-Designer_Tab_Template_Six=Template Six +FR-Designer_Tab_Display_Position=Display Position \ No newline at end of file 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 0dda67fe6d..7f5462d231 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 @@ -2159,4 +2159,5 @@ FR-Designer_Tab_Template_Two= FR-Designer_Tab_Template_Three= FR-Designer_Tab_Template_Four= FR-Designer_Tab_Template_Five= -FR-Designer_Tab_Template_Six= \ No newline at end of file +FR-Designer_Tab_Template_Six= +FR-Designer_Tab_Display_Position= \ No newline at end of file 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 bff3b417ff..e6d0c9d571 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 @@ -2159,4 +2159,5 @@ FR-Designer_Tab_Template_Two= FR-Designer_Tab_Template_Three= FR-Designer_Tab_Template_Four= FR-Designer_Tab_Template_Five= -FR-Designer_Tab_Template_Six= \ No newline at end of file +FR-Designer_Tab_Template_Six= +FR-Designer_Tab_Display_Position= \ No newline at end of file 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 aea21175ed..7a1252ab6c 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 @@ -2159,4 +2159,5 @@ FR-Designer_Tab_Template_Two=\u6A21\u677F\u4E8C FR-Designer_Tab_Template_Three=\u6A21\u677F\u4E09 FR-Designer_Tab_Template_Four=\u6A21\u677F\u56DB FR-Designer_Tab_Template_Five=\u6A21\u677F\u4E94 -FR-Designer_Tab_Template_Six=\u6A21\u677F\u516D \ No newline at end of file +FR-Designer_Tab_Template_Six=\u6A21\u677F\u516D +FR-Designer_Tab_Display_Position=\u663E\u793A\u4F4D\u7F6E \ No newline at end of file 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 8636015059..0cf4cf60a1 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 @@ -2158,4 +2158,5 @@ FR-Designer_Tab_Template_Two=\u6A21\u677F\u4E8C FR-Designer_Tab_Template_Three=\u6A21\u677F\u4E09 FR-Designer_Tab_Template_Four=\u6A21\u677F\u56DB FR-Designer_Tab_Template_Five=\u6A21\u677F\u4E94 -FR-Designer_Tab_Template_Six=\u6A21\u677F\u516D \ No newline at end of file +FR-Designer_Tab_Template_Six=\u6A21\u677F\u516D +FR-Designer_Tab_Display_Position=\u986F\u793A\u4F4D\u7F6E \ No newline at end of file diff --git a/designer_form/src/com/fr/design/mainframe/FormDesignerUI.java b/designer_form/src/com/fr/design/mainframe/FormDesignerUI.java index dfbcfbb2fe..c74ab81223 100644 --- a/designer_form/src/com/fr/design/mainframe/FormDesignerUI.java +++ b/designer_form/src/com/fr/design/mainframe/FormDesignerUI.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe; import java.awt.AlphaComposite; +import java.awt.Color; import java.awt.Component; import java.awt.Graphics; import java.awt.Graphics2D; @@ -27,6 +28,8 @@ import com.fr.design.designer.beans.models.SelectionModel; import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XLayoutContainer; import com.fr.design.designer.creator.XWFitLayout; +import com.fr.design.designer.creator.cardlayout.XWCardTagLayout; +import com.fr.design.designer.creator.cardlayout.XWCardTitleLayout; import com.fr.design.form.util.XCreatorConstants; import com.fr.design.roleAuthority.ReportAndFSManagePane; import com.fr.design.utils.ComponentUtils; @@ -93,7 +96,7 @@ public class FormDesignerUI extends ComponentUI { if (hotspot_bounds != null) { // 当前区域选择框 - g.setColor(XCreatorConstants.SELECTION_COLOR); + g.setColor(new Color(254, 0, 0)); g.drawRect(hotspot_bounds.x - designer.getArea().getHorizontalValue(), hotspot_bounds.y - designer.getArea().getVerticalValue(), hotspot_bounds.width, hotspot_bounds.height); } @@ -266,7 +269,7 @@ public class FormDesignerUI extends ComponentUI { bounds.y -= designer.getArea().getVerticalValue(); drawResizingThumbs(g, selectionModel.getSelection().getDirections(), bounds.x, bounds.y, bounds.width, bounds.height); - g.setColor(XCreatorConstants.FORM_BORDER_COLOR); + g.setColor(new Color(254, 0, 0)); for (XCreator creator : selectionModel.getSelection().getSelectedCreators()) { Rectangle creatorBounds = ComponentUtils.getRelativeBounds(creator); @@ -360,9 +363,9 @@ public class FormDesignerUI extends ComponentUI { * 画每一个小拖拽框 */ private void drawBox(Graphics g, int x, int y) { - g.setColor(XCreatorConstants.RESIZE_BOX_INNER_COLOR); + g.setColor(new Color(254, 0, 0)); g.fillRect(x, y, XCreatorConstants.RESIZE_BOX_SIZ, XCreatorConstants.RESIZE_BOX_SIZ); - g.setColor(XCreatorConstants.RESIZE_BOX_BORDER_COLOR); + g.setColor(new Color(254, 0, 0)); g.drawRect(x, y, XCreatorConstants.RESIZE_BOX_SIZ, XCreatorConstants.RESIZE_BOX_SIZ); } diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java index 517846a2f2..3e6dcb0ca0 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java @@ -62,10 +62,10 @@ public class WCardTagLayoutDefinePane extends AbstractDataModify textDirectionGroup = new UIButtonGroup(WTabTextDirection.getStringArray()); Component[][] components = new Component[][]{ new Component[]{new UILabel(Inter.getLocText("FR-Designer_Tab_Style_Template")), templateStyleEditor}, - new Component[]{new UILabel("显示位置"), displayPositionGroup}, - new Component[]{new UILabel("背景"), backgroundEditor}, + new Component[]{new UILabel(Inter.getLocText("FR-Designer_Tab_Display_Position")), displayPositionGroup}, + new Component[]{new UILabel(Inter.getLocText("FR-Designer_Background")), backgroundEditor}, new Component[]{fontLabel, frFontPane}, - new Component[]{new UILabel("文本方向"), textDirectionGroup} + new Component[]{new UILabel(Inter.getLocText("FR-Designer_StyleAlignment_Text_Rotation")), textDirectionGroup} }; JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();