From 19639c6b429a73d1e305fbca7274c267e393d264 Mon Sep 17 00:00:00 2001 From: plough Date: Wed, 16 May 2018 17:26:52 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-8125=20=E6=B0=B4=E5=8D=B0=20=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E9=85=8D=E7=BD=AE=E7=95=8C=E9=9D=A2=E4=B8=8E?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E9=A2=84=E8=A7=88=3D>=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/menu/KeySetUtils.java | 2 +- .../com/fr/design/report/WatermarkPane.java | 18 +++++++++--------- .../fr/design/report/WatermarkPreviewPane.java | 2 +- .../widget/wrappers/WatermarkWrapper.java | 7 ++++--- .../layout/FRAbsoluteBodyLayoutDefinePane.java | 2 +- .../designer/layout/FRFitLayoutDefinePane.java | 2 +- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/designer-base/src/com/fr/design/menu/KeySetUtils.java b/designer-base/src/com/fr/design/menu/KeySetUtils.java index 1128c1278..949d5334c 100644 --- a/designer-base/src/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/com/fr/design/menu/KeySetUtils.java @@ -607,7 +607,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return "水印"; + return Inter.getLocText("FR-Designer_WaterMark"); } @Override diff --git a/designer-base/src/com/fr/design/report/WatermarkPane.java b/designer-base/src/com/fr/design/report/WatermarkPane.java index 2774dd861..b88b5040b 100644 --- a/designer-base/src/com/fr/design/report/WatermarkPane.java +++ b/designer-base/src/com/fr/design/report/WatermarkPane.java @@ -42,8 +42,6 @@ public class WatermarkPane extends BasicPane { // 文字颜色 private NewColorSelectPane colorPane; - private UIScrollPane titlePane; - public WatermarkPane() { initComponents(); } @@ -75,6 +73,7 @@ public class WatermarkPane extends BasicPane { populateFourmula(watermark.getText()); populateFontSize(watermark.getFontSize()); populateColor(watermark.getColor()); + paintPreviewPane(); } public Watermark update() { @@ -101,21 +100,22 @@ public class WatermarkPane extends BasicPane { colorPane = new NewColorSelectPane(); JPanel colorLabelPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - colorLabelPane.add(new UILabel("文字颜色"), BorderLayout.NORTH); + colorLabelPane.add(new UILabel(Inter.getLocText("FR-Designer_Text_Color")), BorderLayout.NORTH); double p = TableLayout.PREFERRED; double[] rowSize = {p,p,p}; double[] columnSize = { p, MAX_WIDTH}; JPanel rightContentPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{ - {new UILabel("文字"), formulaPane}, - {new UILabel("字号"), fontSizeTypePane}, + {new UILabel(Inter.getLocText("FR-Designer_Watermark_Text")), formulaPane}, + {new UILabel(Inter.getLocText("FR-Designer_Font_Size")), fontSizeTypePane}, {colorLabelPane, colorPane}, }, rowSize, columnSize, 10); rightContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); - titlePane =new UIScrollPane(rightContentPane); - titlePane.setBorder(GUICoreUtils.createTitledBorder("配置",null)); - return titlePane; + + UIScrollPane configPane = new UIScrollPane(rightContentPane); + configPane.setBorder(GUICoreUtils.createTitledBorder(Inter.getLocText("FR-Designer_Config"),null)); + return configPane; } protected void populateFontSize(int fontSize){ @@ -165,6 +165,6 @@ public class WatermarkPane extends BasicPane { @Override protected String title4PopupWindow() { - return "水印"; + return Inter.getLocText("FR-Designer_WaterMark"); } } \ No newline at end of file diff --git a/designer-base/src/com/fr/design/report/WatermarkPreviewPane.java b/designer-base/src/com/fr/design/report/WatermarkPreviewPane.java index 35ecbf350..48b8f0168 100644 --- a/designer-base/src/com/fr/design/report/WatermarkPreviewPane.java +++ b/designer-base/src/com/fr/design/report/WatermarkPreviewPane.java @@ -42,7 +42,7 @@ public class WatermarkPreviewPane extends JPanel { } private void updateGap(FontMetrics fontMetrics) { - horizontalGap = fontMetrics.stringWidth("帆"); + horizontalGap = fontMetrics.stringWidth("帆"); // 任意一个中文字符 verticalGap = horizontalGap * 2; } diff --git a/designer-form/src/com/fr/design/mainframe/widget/wrappers/WatermarkWrapper.java b/designer-form/src/com/fr/design/mainframe/widget/wrappers/WatermarkWrapper.java index 24c899ffe..1ad370c9b 100644 --- a/designer-form/src/com/fr/design/mainframe/widget/wrappers/WatermarkWrapper.java +++ b/designer-form/src/com/fr/design/mainframe/widget/wrappers/WatermarkWrapper.java @@ -1,5 +1,6 @@ package com.fr.design.mainframe.widget.wrappers; +import com.fr.base.Watermark; import com.fr.design.Exception.ValidationException; import com.fr.design.designer.properties.Decoder; import com.fr.design.designer.properties.Encoder; @@ -10,16 +11,16 @@ import com.fr.design.designer.properties.Encoder; public class WatermarkWrapper implements Encoder, Decoder { @Override public Object decode(String txt) { - return null; + return new Watermark(); } @Override public void validate(String txt) throws ValidationException { - + // do nothing } @Override public String encode(Object v) { - return "watermark"; + return ((Watermark)v).getText(); } } diff --git a/designer-form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java b/designer-form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java index 84023c0e7..29159f27f 100644 --- a/designer-form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java +++ b/designer-form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java @@ -57,7 +57,7 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane { JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane( new Component[][]{ new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), borderStyleEditor}, - new Component[]{new UILabel("水印"), watermarkEditor} + new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), watermarkEditor} }, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); diff --git a/designer-form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer-form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java index 0905cdc2e..717a4103d 100644 --- a/designer-form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java +++ b/designer-form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java @@ -75,7 +75,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify { JPanel jp2 = TableLayoutHelper.createGapTableLayoutPane( new Component[][]{ new Component[]{new UILabel(Inter.getLocText("FR-Designer-Widget_Style")), stylePane}, - new Component[]{new UILabel("水印"), watermarkEditor} + new Component[]{new UILabel(Inter.getLocText("FR-Designer_WaterMark")), watermarkEditor} }, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W3, IntervalConstants.INTERVAL_L1); jp2.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); jPanel.add(paddingBound, BorderLayout.CENTER);