From 8a39df10d3929f435c33ae90681f61ba527c2189 Mon Sep 17 00:00:00 2001 From: loy Date: Wed, 7 Sep 2016 14:19:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96web=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=80=A7=E8=83=BD=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=BD=BB=E9=87=8F?= =?UTF-8?q?=E9=87=8D=E6=96=B9=E5=BC=8F=E8=BE=93=E5=87=BA=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/com/fr/design/webattr/PageToolBarPane.java | 8 +++++++- .../com/fr/design/webattr/PageWebSettingPane.java | 14 ++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/designer/src/com/fr/design/webattr/PageToolBarPane.java b/designer/src/com/fr/design/webattr/PageToolBarPane.java index aa7e452b2..105d17353 100644 --- a/designer/src/com/fr/design/webattr/PageToolBarPane.java +++ b/designer/src/com/fr/design/webattr/PageToolBarPane.java @@ -34,6 +34,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane { private UICheckBox isShowAsImageBox; private UICheckBox isAutoScaleBox; private UICheckBox isTDHeavyBox; + private UICheckBox isTDHeavyUseLightBox; private EventPane eventPane; private UILabel showLocationLabel = new UILabel(Inter.getLocText("FR-Designer_Report_Show_Location") + ":"); @@ -59,7 +60,9 @@ public class PageToolBarPane extends AbstractEditToolBarPane { north.add(GUICoreUtils.createFlowPane(isAutoScaleBox, FlowLayout.LEFT)); isTDHeavyBox = new UICheckBox(Inter.getLocText("FR-Designer_IS_TD_HEAVY_EXPORT"), false); north.add(GUICoreUtils.createFlowPane(isTDHeavyBox, FlowLayout.LEFT)); - + isTDHeavyUseLightBox = new UICheckBox(Inter.getLocText("FR-Designer_USE_TD_HEAVY_LIGHT"), false); + north.add(GUICoreUtils.createFlowPane(isTDHeavyUseLightBox, FlowLayout.LEFT)); + editToolBarButton.addActionListener(editBtnListener); isUseToolBarCheckBox.setSelected(true); isUseToolBarCheckBox.addActionListener(new ActionListener() { @@ -93,6 +96,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane { this.centerRadioButton.setEnabled(isEnabled); this.eventPane.setEnabled(isEnabled); this.isTDHeavyBox.setEnabled(isEnabled); + this.isTDHeavyUseLightBox.setEnabled(isEnabled); this.isAutoScaleBox.setEnabled(isEnabled); this.isShowAsImageBox.setEnabled(isEnabled); this.leftRadioButton.setEnabled(isEnabled); @@ -122,6 +126,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane { isShowAsImageBox.setSelected(webPage.isShowAsImage()); isAutoScaleBox.setSelected(webPage.isAutoScaleWhenEmbeddedInIframe()); isTDHeavyBox.setSelected(webPage.isTDHeavy()); + isTDHeavyUseLightBox.setSelected(webPage.isLightTDHeavy()); if (webPage.isUseToolBar()) { this.toolBarManagers = webPage.getToolBarManagers(); this.isUseToolBarCheckBox.setSelected(true); @@ -156,6 +161,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane { webPage.setShowAsImage(isShowAsImageBox.isSelected()); webPage.setAutoScaleWhenEmbeddedInIframe(isAutoScaleBox.isSelected()); webPage.setTDHeavy(isTDHeavyBox.isSelected()); + webPage.setLightTDHeavy(isTDHeavyUseLightBox.isSelected()); return webPage; } diff --git a/designer/src/com/fr/design/webattr/PageWebSettingPane.java b/designer/src/com/fr/design/webattr/PageWebSettingPane.java index 328513085..e38240c36 100644 --- a/designer/src/com/fr/design/webattr/PageWebSettingPane.java +++ b/designer/src/com/fr/design/webattr/PageWebSettingPane.java @@ -29,6 +29,7 @@ public class PageWebSettingPane extends WebSettingPane { private UICheckBox isShowAsImageBox; private UICheckBox isAutoScaleBox; private UICheckBox isTDHeavyBox; + private UICheckBox isTDHeavyUseLightBox; public PageWebSettingPane() { super(); @@ -48,14 +49,15 @@ public class PageWebSettingPane extends WebSettingPane { isShowAsImageBox = new UICheckBox(Inter.getLocText("Is_Paint_Page")); isAutoScaleBox = new UICheckBox(Inter.getLocText("IS_Auto_Scale")); isTDHeavyBox = new UICheckBox(Inter.getLocText("IS_TD_HEAVY_EXPORT"), false); + isTDHeavyUseLightBox = new UICheckBox(Inter.getLocText("USE_TD_HEAVY_LIGHT"), false); double p = TableLayout.PREFERRED; double[] columnSize = { p,p,p}; double[] rowSize = { p, p,p,p }; Component[][] components = new Component[][]{ - new Component[]{new UILabel(Inter.getLocText("Report_Show_Location") + ":", UILabel.RIGHT),buttonpane,null}, - new Component[]{new UILabel(Inter.getLocText("PageSetup-Page") + ":", UILabel.RIGHT),isShowAsImageBox,isAutoScaleBox}, - new Component[]{null,isTDHeavyBox,null} - } ; + new Component[]{new UILabel(Inter.getLocText("Report_Show_Location") + ":", UILabel.RIGHT), buttonpane,null}, + new Component[]{new UILabel(Inter.getLocText("PageSetup-Page") + ":", UILabel.RIGHT), isShowAsImageBox, isAutoScaleBox}, + new Component[]{null, isTDHeavyBox, isTDHeavyUseLightBox} + }; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); } @@ -69,6 +71,7 @@ public class PageWebSettingPane extends WebSettingPane { isShowAsImageBox.setEnabled(isSelected); isAutoScaleBox.setEnabled(isSelected); isTDHeavyBox.setEnabled(isSelected); + isTDHeavyUseLightBox.setEnabled(isSelected); } protected void setDefault(){ super.setDefault(); @@ -76,6 +79,7 @@ public class PageWebSettingPane extends WebSettingPane { isShowAsImageBox.setSelected(false); isAutoScaleBox.setSelected(false); isTDHeavyBox.setSelected(false); + isTDHeavyUseLightBox.setSelected(false); } @Override protected void populateSubWebSettingrBean(WebPage webPage) { @@ -91,6 +95,7 @@ public class PageWebSettingPane extends WebSettingPane { isShowAsImageBox.setSelected(webPage.isShowAsImage()); isAutoScaleBox.setSelected(webPage.isAutoScaleWhenEmbeddedInIframe()); isTDHeavyBox.setSelected(webPage.isTDHeavy()); + isTDHeavyUseLightBox.setSelected(webPage.isLightTDHeavy()); } @Override @@ -100,6 +105,7 @@ public class PageWebSettingPane extends WebSettingPane { webPage.setShowAsImage(isShowAsImageBox.isSelected()); webPage.setAutoScaleWhenEmbeddedInIframe(isAutoScaleBox.isSelected()); webPage.setTDHeavy(isTDHeavyBox.isSelected()); + webPage.setLightTDHeavy(isTDHeavyUseLightBox.isSelected()); return webPage; }