Merge pull request #1008 in BA/design from ~HUGH/design:release to release

* commit '06fff3dde04dffca511112a63fbe493e13fc9655':
  SLN-280 规范国际化
  SLN-280 二开需求（将原导出打印纸张背景，分开设置），经产品决定做到产品里面

designer/src/com/fr/design/report/ReportBackgroundPane.java

@@ -1,47 +1,57 @@
-package com.fr.design.report;
+package com.fr.design.report;
-
+
-import java.awt.BorderLayout;
+import java.awt.BorderLayout;
-
+
-import com.fr.page.ReportSettingsProvider;
+import javax.swing.JPanel;
-import com.fr.design.gui.icheckbox.UICheckBox;
+
-import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.page.ReportSettingsProvider;
-import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.icheckbox.UICheckBox;
-import com.fr.general.Inter;
+import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.style.background.BackgroundPane;
+import com.fr.design.dialog.BasicPane;
-
+import com.fr.general.Inter;
-public class ReportBackgroundPane extends BasicPane {
+import com.fr.design.style.background.BackgroundPane;
-    private UICheckBox isPrintBackgroundCheckBox;
+
-    private BackgroundPane backgroundPane;
+public class ReportBackgroundPane extends BasicPane {
-
+	private UICheckBox isPrintBackgroundCheckBox;
-    public ReportBackgroundPane() {
+    private UICheckBox isExportBackgroundCheckBox;
-        this.setLayout(FRGUIPaneFactory.createBorderLayout());
+    private BackgroundPane backgroundPane;
-
+
-        backgroundPane = new BackgroundPane();
+    public ReportBackgroundPane() {
-        this.add(backgroundPane, BorderLayout.CENTER);
+        this.setLayout(FRGUIPaneFactory.createBorderLayout());
-
+
-        isPrintBackgroundCheckBox = new UICheckBox(
+        backgroundPane = new BackgroundPane();
-                Inter.getLocText("ReportGUI-Print_Background"));
+        this.add(backgroundPane, BorderLayout.CENTER);
-        this.add(isPrintBackgroundCheckBox, BorderLayout.SOUTH);
+
-    }
+        isPrintBackgroundCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Print_Background"));
-    
+        isExportBackgroundCheckBox = new UICheckBox(Inter.getLocText("FR-Designer_Export_Background"));
-    @Override
+        JPanel sourth = new JPanel();
-    protected String title4PopupWindow() {
+        sourth.add(isExportBackgroundCheckBox);
-    	return Inter.getLocText(new String[]{"paper", "Background"});
+        sourth.add(isPrintBackgroundCheckBox);
-    }
+        this.add(sourth, BorderLayout.SOUTH);
-
+        
-    /**
+        this.add(isPrintBackgroundCheckBox, BorderLayout.SOUTH);
-     * Populate
+    }
-     */
+    
-    public void populate(ReportSettingsProvider reportSettings) {
+    @Override
-        this.backgroundPane.populate(reportSettings.getBackground());
+    protected String title4PopupWindow() {
-        this.isPrintBackgroundCheckBox.setSelected(reportSettings.isPrintBackground());
+    	return Inter.getLocText(new String[]{"paper", "Background"});
-    }
+    }
-
+
-    /**
+    /**
-     * update
+     * Populate
-     */
+     */
-    public void update(ReportSettingsProvider reportSettings) {
+    public void populate(ReportSettingsProvider reportSettings) {
-        reportSettings.setBackground(this.backgroundPane.update());
+        this.backgroundPane.populate(reportSettings.getBackground());
-        reportSettings.setPrintBackground(this.isPrintBackgroundCheckBox.isSelected());
+        this.isPrintBackgroundCheckBox.setSelected(reportSettings.isPrintBackground());
-    }
+        this.isExportBackgroundCheckBox.setSelected(reportSettings.isExportBackground());
+    }
+
+    /**
+     * update
+     */
+    public void update(ReportSettingsProvider reportSettings) {
+        reportSettings.setBackground(this.backgroundPane.update());
+        reportSettings.setPrintBackground(this.isPrintBackgroundCheckBox.isSelected());
+        reportSettings.setExportBackground(this.isExportBackgroundCheckBox.isSelected());
+    }
 }

designer_base/src/com/fr/design/locale/designer.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=Remove_All_Button
 FR-Designer_Component_Interval=Components Interval
 ReportColumns-Columns_vertically=Columns vertically
 ReportGUI-Print_Background=Print Background
+FR-Designer_Print_Background=Print Background
+FR-Designer_Export_Background=Export Background
 Export-CSV=CSV
 M_Edit-Paste=Paste
 FR-Designer-Basic_Restart_Designer=Restart designer

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=Remove all buttons
 FR-Designer_Component_Interval=Component Interval
 ReportColumns-Columns_vertically=Fixed columns per line
 ReportGUI-Print_Background=Print/export background
+FR-Designer_Print_Background=Print Background
+FR-Designer_Export_Background=Export Background
 Export-CSV=CSV
 M_Edit-Paste=Paste
 FR-Designer-Basic_Restart_Designer=Restart designer

designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=\u3059\u3079\u3066\u306E\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u
 FR-Designer_Component_Interval=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u9593\u9694
 ReportColumns-Columns_vertically=\u5217\u306E\u6BB5\u7D44\u307F
 ReportGUI-Print_Background=\u5E33\u7968\u80CC\u666F\u306E\u5370\u5237/\u51FA\u529B
+FR-Designer_Print_Background=\u5E33\u7968\u80CC\u666F\u306E\u5370\u5237
+FR-Designer_Export_Background=\u5E33\u7968\u80CC\u666F\u306E\u51FA\u529B
 Export-CSV=CSV(\u30AB\u30F3\u30DE\u533A\u5207\u308A)
 M_Edit-Paste=\u8CBC\u308A\u4ED8\u3051(P)
 FR-Designer-Basic_Restart_Designer=\u30C7\u30B6\u30A4\u30CA\u30FC\u518D\u8D77\u52D5

designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=\uBAA8\uB4E0\uD0A4\uD074\uB9AC\uC5B4
 FR-Designer_Component_Interval=\uC5B4\uC148\uBE14\uB9AC\uAC04\uACA9
 ReportColumns-Columns_vertically=\uC5F4\uC140\uB098\uB204\uAE30
 ReportGUI-Print_Background=\uC778\uC1C4/\uB0B4\uBCF4\uB0B4\uAE30\uBB38\uC11C\uBC30\uACBD
+FR-Designer_Print_Background=\uC778\uC1C4\uBB38\uC11C\uBC30\uACBD
+FR-Designer_Export_Background=\uB0B4\uBCF4\uB0B4\uAE30\uBB38\uC11C\uBC30\uACBD
 Export-CSV=CSV\uC11C\uC2DD(\uC27C\uD45C\uAD6C\uBD84)
 M_Edit-Paste=\uBD99\uC5EC\uB123\uAE30(P)
 FR-Designer-Basic_Restart_Designer=\uC7AC\uBD80\uD305\uC124\uACC4\uAE30

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=\u6E05\u9664\u6240\u6709\u6309\u94AE
 FR-Designer_Component_Interval=\u7EC4\u4EF6\u95F4\u9694
 ReportColumns-Columns_vertically=\u5217\u5206\u680F
 ReportGUI-Print_Background=\u6253\u5370/\u5BFC\u51FA\u62A5\u8868\u80CC\u666F
+FR-Designer_Print_Background=\u6253\u5370\u62A5\u8868\u80CC\u666F
+FR-Designer_Export_Background=\u5BFC\u51FA\u62A5\u8868\u80CC\u666F
 Export-CSV=CSV\u683C\u5F0F(\u9017\u53F7\u5206\u9694)
 M_Edit-Paste=\u7C98\u8D34(P)
 FR-Designer-Basic_Restart_Designer=\u91CD\u542F\u8BBE\u8BA1\u5668

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -1345,6 +1345,8 @@ Remove_All_Button=\u6E05\u9664\u6240\u6709\u6309\u9215
 FR-Designer_Component_Interval=\u5143\u4EF6\u9593\u9694
 ReportColumns-Columns_vertically=\u6B04\u5206\u6B04
 ReportGUI-Print_Background=\u5217\u5370/\u532F\u51FA\u5831\u8868\u80CC\u666F
+FR-Designer_Print_Background=\u5217\u5370\u5831\u8868\u80CC\u666F
+FR-Designer_Export_Background=\u532F\u51FA\u5831\u8868\u80CC\u666F
 Export-CSV=CSV\u683C\u5F0F(\u9017\u865F\u5206\u9694)
 M_Edit-Paste=\u8CBC\u4E0A(P)
 FR-Designer-Basic_Restart_Designer=\u91CD\u555F\u8A2D\u8A08\u5668