REPORT-8125 水印 设计器配置界面与实时预览=>完善国际化

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

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");
     }
 }

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;
     }
 

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();
     }
 }

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));

designer-form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java

@@ -75,7 +75,7 @@ public class FRFitLayoutDefinePane extends AbstractDataModify<WFitLayout> {
         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);