fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #328 in BA/design from ~LOY/design_fr:dev to dev 

* commit 'a0ff9628684cb141eb247333e273e37fb5c6ec72':
  将“轻量重输出”写成插件，去掉原来的菜单项
master
superman 8 years ago
parent
ffdd5eaee0 a0ff962868
commit
cf8dfe497b
2 changed files with 1 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      designer/src/com/fr/design/webattr/PageToolBarPane.java
  2. 8
      designer/src/com/fr/design/webattr/PageWebSettingPane.java

6
designer/src/com/fr/design/webattr/PageToolBarPane.java
Unescape View File

@ -34,7 +34,6 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
private UICheckBox isShowAsImageBox; private UICheckBox isShowAsImageBox;
private UICheckBox isAutoScaleBox; private UICheckBox isAutoScaleBox;
private UICheckBox isTDHeavyBox; private UICheckBox isTDHeavyBox;
private UICheckBox isTDHeavyUseLightBox;
private EventPane eventPane; private EventPane eventPane;
private UILabel showLocationLabel = new UILabel(Inter.getLocText("FR-Designer_Report_Show_Location") + ":"); private UILabel showLocationLabel = new UILabel(Inter.getLocText("FR-Designer_Report_Show_Location") + ":");
@ -60,8 +59,6 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
north.add(GUICoreUtils.createFlowPane(isAutoScaleBox, FlowLayout.LEFT)); north.add(GUICoreUtils.createFlowPane(isAutoScaleBox, FlowLayout.LEFT));
isTDHeavyBox = new UICheckBox(Inter.getLocText("FR-Designer_IS_TD_HEAVY_EXPORT"), false); isTDHeavyBox = new UICheckBox(Inter.getLocText("FR-Designer_IS_TD_HEAVY_EXPORT"), false);
north.add(GUICoreUtils.createFlowPane(isTDHeavyBox, FlowLayout.LEFT)); 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); editToolBarButton.addActionListener(editBtnListener);
isUseToolBarCheckBox.setSelected(true); isUseToolBarCheckBox.setSelected(true);
@ -96,7 +93,6 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
this.centerRadioButton.setEnabled(isEnabled); this.centerRadioButton.setEnabled(isEnabled);
this.eventPane.setEnabled(isEnabled); this.eventPane.setEnabled(isEnabled);
this.isTDHeavyBox.setEnabled(isEnabled); this.isTDHeavyBox.setEnabled(isEnabled);
this.isTDHeavyUseLightBox.setEnabled(isEnabled);
this.isAutoScaleBox.setEnabled(isEnabled); this.isAutoScaleBox.setEnabled(isEnabled);
this.isShowAsImageBox.setEnabled(isEnabled); this.isShowAsImageBox.setEnabled(isEnabled);
this.leftRadioButton.setEnabled(isEnabled); this.leftRadioButton.setEnabled(isEnabled);
@ -126,7 +122,6 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
isShowAsImageBox.setSelected(webPage.isShowAsImage()); isShowAsImageBox.setSelected(webPage.isShowAsImage());
isAutoScaleBox.setSelected(webPage.isAutoScaleWhenEmbeddedInIframe()); isAutoScaleBox.setSelected(webPage.isAutoScaleWhenEmbeddedInIframe());
isTDHeavyBox.setSelected(webPage.isTDHeavy()); isTDHeavyBox.setSelected(webPage.isTDHeavy());
isTDHeavyUseLightBox.setSelected(webPage.isLightTDHeavy());
if (webPage.isUseToolBar()) { if (webPage.isUseToolBar()) {
this.toolBarManagers = webPage.getToolBarManagers(); this.toolBarManagers = webPage.getToolBarManagers();
this.isUseToolBarCheckBox.setSelected(true); this.isUseToolBarCheckBox.setSelected(true);
@ -161,7 +156,6 @@ public class PageToolBarPane extends AbstractEditToolBarPane {
webPage.setShowAsImage(isShowAsImageBox.isSelected()); webPage.setShowAsImage(isShowAsImageBox.isSelected());
webPage.setAutoScaleWhenEmbeddedInIframe(isAutoScaleBox.isSelected()); webPage.setAutoScaleWhenEmbeddedInIframe(isAutoScaleBox.isSelected());
webPage.setTDHeavy(isTDHeavyBox.isSelected()); webPage.setTDHeavy(isTDHeavyBox.isSelected());
webPage.setLightTDHeavy(isTDHeavyUseLightBox.isSelected());
return webPage; return webPage;
} }

8
designer/src/com/fr/design/webattr/PageWebSettingPane.java
Unescape View File

@ -29,7 +29,6 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
private UICheckBox isShowAsImageBox; private UICheckBox isShowAsImageBox;
private UICheckBox isAutoScaleBox; private UICheckBox isAutoScaleBox;
private UICheckBox isTDHeavyBox; private UICheckBox isTDHeavyBox;
private UICheckBox isTDHeavyUseLightBox;
public PageWebSettingPane() { public PageWebSettingPane() {
super(); super();
@ -49,14 +48,13 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
isShowAsImageBox = new UICheckBox(Inter.getLocText("Is_Paint_Page")); isShowAsImageBox = new UICheckBox(Inter.getLocText("Is_Paint_Page"));
isAutoScaleBox = new UICheckBox(Inter.getLocText("IS_Auto_Scale")); isAutoScaleBox = new UICheckBox(Inter.getLocText("IS_Auto_Scale"));
isTDHeavyBox = new UICheckBox(Inter.getLocText("IS_TD_HEAVY_EXPORT"), false); 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 p = TableLayout.PREFERRED;
double[] columnSize = { p,p,p}; double[] columnSize = { p,p,p};
double[] rowSize = { p, p,p,p }; double[] rowSize = { p, p,p,p };
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(Inter.getLocText("Report_Show_Location") + ":", UILabel.RIGHT), buttonpane,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[]{new UILabel(Inter.getLocText("PageSetup-Page") + ":", UILabel.RIGHT), isShowAsImageBox, isAutoScaleBox},
new Component[]{null, isTDHeavyBox, isTDHeavyUseLightBox} new Component[]{null, isTDHeavyBox, null}
}; };
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
@ -71,7 +69,6 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
isShowAsImageBox.setEnabled(isSelected); isShowAsImageBox.setEnabled(isSelected);
isAutoScaleBox.setEnabled(isSelected); isAutoScaleBox.setEnabled(isSelected);
isTDHeavyBox.setEnabled(isSelected); isTDHeavyBox.setEnabled(isSelected);
isTDHeavyUseLightBox.setEnabled(isSelected);
} }
protected void setDefault(){ protected void setDefault(){
super.setDefault(); super.setDefault();
@ -79,7 +76,6 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
isShowAsImageBox.setSelected(false); isShowAsImageBox.setSelected(false);
isAutoScaleBox.setSelected(false); isAutoScaleBox.setSelected(false);
isTDHeavyBox.setSelected(false); isTDHeavyBox.setSelected(false);
isTDHeavyUseLightBox.setSelected(false);
} }
@Override @Override
protected void populateSubWebSettingrBean(WebPage webPage) { protected void populateSubWebSettingrBean(WebPage webPage) {
@ -95,7 +91,6 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
isShowAsImageBox.setSelected(webPage.isShowAsImage()); isShowAsImageBox.setSelected(webPage.isShowAsImage());
isAutoScaleBox.setSelected(webPage.isAutoScaleWhenEmbeddedInIframe()); isAutoScaleBox.setSelected(webPage.isAutoScaleWhenEmbeddedInIframe());
isTDHeavyBox.setSelected(webPage.isTDHeavy()); isTDHeavyBox.setSelected(webPage.isTDHeavy());
isTDHeavyUseLightBox.setSelected(webPage.isLightTDHeavy());
} }
@Override @Override
@ -105,7 +100,6 @@ public class PageWebSettingPane extends WebSettingPane<WebPage> {
webPage.setShowAsImage(isShowAsImageBox.isSelected()); webPage.setShowAsImage(isShowAsImageBox.isSelected());
webPage.setAutoScaleWhenEmbeddedInIframe(isAutoScaleBox.isSelected()); webPage.setAutoScaleWhenEmbeddedInIframe(isAutoScaleBox.isSelected());
webPage.setTDHeavy(isTDHeavyBox.isSelected()); webPage.setTDHeavy(isTDHeavyBox.isSelected());
webPage.setLightTDHeavy(isTDHeavyUseLightBox.isSelected());
return webPage; return webPage;
} }

Write Preview
Loading…
Cancel
Save