[DE][PE] Send paper size preset
This commit is contained in:
parent
6f59e5771b
commit
8eb8226da2
|
@ -151,6 +151,25 @@ define([
|
||||||
return this;
|
return this;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
findPagePreset: function(w, h) {
|
||||||
|
var width = (w<h) ? w : h,
|
||||||
|
height = (w<h) ? h : w;
|
||||||
|
var panel = this.printSettings;
|
||||||
|
var store = panel.cmbPaperSize.store,
|
||||||
|
item = null;
|
||||||
|
for (var i=0; i<store.length-1; i++) {
|
||||||
|
var rec = store.at(i),
|
||||||
|
size = rec.get('size'),
|
||||||
|
pagewidth = size[0],
|
||||||
|
pageheight = size[1];
|
||||||
|
if (Math.abs(pagewidth - width) < 0.1 && Math.abs(pageheight - height) < 0.1) {
|
||||||
|
item = rec;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return item ? item.get('caption') : undefined;
|
||||||
|
},
|
||||||
|
|
||||||
onApiPageSize: function(w, h) {
|
onApiPageSize: function(w, h) {
|
||||||
this._state.pgsize = [w, h];
|
this._state.pgsize = [w, h];
|
||||||
if (this.printSettings.isVisible()) {
|
if (this.printSettings.isVisible()) {
|
||||||
|
@ -494,7 +513,11 @@ define([
|
||||||
var size = this.api.asc_getPageSize(this._state.firstPrintPage);
|
var size = this.api.asc_getPageSize(this._state.firstPrintPage);
|
||||||
this.adjPrintParams.asc_setNativeOptions({
|
this.adjPrintParams.asc_setNativeOptions({
|
||||||
pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
|
pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
|
||||||
paperSize: size ? [size['W'], size['H']] : size,
|
paperSize: {
|
||||||
|
w: size ? size['W'] : undefined,
|
||||||
|
h: size ? size['H'] : undefined,
|
||||||
|
preset: size ? this.findPagePreset(size['W'], size['H']) : undefined
|
||||||
|
},
|
||||||
paperOrientation: size ? (size['H'] > size['W'] ? 'portrait' : 'landscape') : null
|
paperOrientation: size ? (size['H'] > size['W'] ? 'portrait' : 'landscape') : null
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -296,7 +296,11 @@ define([
|
||||||
var rec = this.printSettings.cmbPaperSize.getSelectedRecord();
|
var rec = this.printSettings.cmbPaperSize.getSelectedRecord();
|
||||||
this.adjPrintParams.asc_setNativeOptions({
|
this.adjPrintParams.asc_setNativeOptions({
|
||||||
pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
|
pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
|
||||||
paperSize: rec ? rec.size : null
|
paperSize: {
|
||||||
|
w: rec ? rec.size[0] : undefined,
|
||||||
|
h: rec ? rec.size[1] : undefined,
|
||||||
|
preset: rec ? rec.caption : undefined
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
this._isPrint = print;
|
this._isPrint = print;
|
||||||
|
|
Loading…
Reference in a new issue