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

Merge pull request #1597 in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0 

* commit 'd0e9ebe0c8d8e9c50db50402f5aacb81a85fe162':
  REPORT-29536【打印设置-本地打印自定义纸张大小的custom比其他选项多出首行空格
feature/big-screen
vito 5 years ago
parent
5937a81b13 d0e9ebe0c8
commit
85e7599800
1 changed files with 7 additions and 7 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. 14
      designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java

14
designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java
Unescape View File

@ -103,14 +103,14 @@ public abstract class AbstractNativePrintSettingPane extends JPanel {
showDialogCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Show_Print_Setting_Window_When_Printing")); showDialogCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Show_Print_Setting_Window_When_Printing"));
showDialogCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20)); showDialogCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20));
UILabel showDialogCheckTip = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tip_Use_Default_Settings")); UILabel showDialogCheckTip = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tip_Use_Default_Settings"));
JPanel showDialogCheckPane = GUICoreUtils.createFlowPane(new Component[] { JPanel showDialogCheckPane = GUICoreUtils.createFlowPane(new Component[]{
showDialogCheck, showDialogCheckTip}, FlowLayout.LEFT); showDialogCheck, showDialogCheckTip}, FlowLayout.LEFT);
// 打印需要指定 sheet // 打印需要指定 sheet
needSelectSheetCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Need_Select_Sheet_When_Printing")); needSelectSheetCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Need_Select_Sheet_When_Printing"));
needSelectSheetCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20)); needSelectSheetCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 20));
UILabel needSelectSheetCheckTip = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tip_Invalid_In_Page_View")); UILabel needSelectSheetCheckTip = GUICoreUtils.createTipLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tip_Invalid_In_Page_View"));
JPanel needSelectSheetCheckPane = GUICoreUtils.createFlowPane(new Component[] { JPanel needSelectSheetCheckPane = GUICoreUtils.createFlowPane(new Component[]{
needSelectSheetCheck, needSelectSheetCheckTip}, FlowLayout.LEFT); needSelectSheetCheck, needSelectSheetCheckTip}, FlowLayout.LEFT);
return createHeaderPane(tipDownload, showDialogCheckPane, needSelectSheetCheckPane); return createHeaderPane(tipDownload, showDialogCheckPane, needSelectSheetCheckPane);
@ -263,7 +263,7 @@ public abstract class AbstractNativePrintSettingPane extends JPanel {
' ' + ' ' +
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_mm") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_mm") +
']'; ']';
this.setText(sbuf); this.setText(" " + sbuf);
break; break;
} }
} }
@ -461,8 +461,8 @@ public abstract class AbstractNativePrintSettingPane extends JPanel {
extraUpdate(nativePrintAttr); extraUpdate(nativePrintAttr);
nativePrintAttr.setShowDialog(showDialogCheck.isSelected()); nativePrintAttr.setShowDialog(showDialogCheck.isSelected());
nativePrintAttr.setNeedSelectSheet(needSelectSheetCheck.isSelected()); nativePrintAttr.setNeedSelectSheet(needSelectSheetCheck.isSelected());
nativePrintAttr.setPrinterName((String)printerComboBox.getSelectedItem()); nativePrintAttr.setPrinterName((String) printerComboBox.getSelectedItem());
nativePrintAttr.setCopy((int)copySpinner.getValue()); nativePrintAttr.setCopy((int) copySpinner.getValue());
// 页码 // 页码
if (allPageRadioButton.isSelected()) { if (allPageRadioButton.isSelected()) {
@ -472,7 +472,7 @@ public abstract class AbstractNativePrintSettingPane extends JPanel {
} else if (customPageRadioButton.isSelected()) { } else if (customPageRadioButton.isSelected()) {
nativePrintAttr.setPageType(NativePrintAttr.PageType.SPECIFIED_PAGES); nativePrintAttr.setPageType(NativePrintAttr.PageType.SPECIFIED_PAGES);
nativePrintAttr.setArea(specifiedAreaField.getText()); nativePrintAttr.setArea(specifiedAreaField.getText());
} else if (doublePrintComboBox.getSelectedIndex() == ODD_INDEX){ } else if (doublePrintComboBox.getSelectedIndex() == ODD_INDEX) {
nativePrintAttr.setPageType(NativePrintAttr.PageType.ODD_PAGES); nativePrintAttr.setPageType(NativePrintAttr.PageType.ODD_PAGES);
} else { } else {
nativePrintAttr.setPageType(NativePrintAttr.PageType.EVEN_PAGES); nativePrintAttr.setPageType(NativePrintAttr.PageType.EVEN_PAGES);
@ -494,7 +494,7 @@ public abstract class AbstractNativePrintSettingPane extends JPanel {
nativePrintAttr.setInheritPageMarginSetting(inheritPageMarginSettingCheck.isSelected()); nativePrintAttr.setInheritPageMarginSetting(inheritPageMarginSettingCheck.isSelected());
nativePrintAttr.setMargin(pageMarginSettingPane.updateBean()); nativePrintAttr.setMargin(pageMarginSettingPane.updateBean());
nativePrintAttr.setFitPaperSize(fitPaperSizeCheck.isSelected()); nativePrintAttr.setFitPaperSize(fitPaperSizeCheck.isSelected());
nativePrintAttr.setScalePercent((int)scalePercentField.getValue()); nativePrintAttr.setScalePercent((int) scalePercentField.getValue());
} }
protected void extraUpdate(NativePrintAttr nativePrintAttr) { protected void extraUpdate(NativePrintAttr nativePrintAttr) {

Write Preview
Loading…
Cancel
Save