pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-27 07:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DE] Add print using the system dialog

Browse Source
This commit is contained in:
Alexey Koshelev
2025-03-24 11:16:03 +03:00
parent f7d43e50c2
commit c4ae376f8c
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/documenteditor/main/app/controller/Print.js
View File

@ -78,7 +78,8 @@ define([
onAfterRender: function(view) {
var me = this;
this.printSettings.menu.on('menu:hide', _.bind(this.onHidePrintMenu, this));
this.printSettings.btnPrint.on('click', _.bind(this.onBtnPrint, this, true));
this.printSettings.btnPrintSystemDialog.on('click', _.bind(this.onBtnPrint, this, true, true));
this.printSettings.btnPrint.on('click', _.bind(this.onBtnPrint, this, true, false));
this.printSettings.btnPrintPdf.on('click', _.bind(this.onBtnPrint, this, false));
this.printSettings.btnPrevPage.on('click', _.bind(this.onChangePreviewPage, this, false));
this.printSettings.btnNextPage.on('click', _.bind(this.onChangePreviewPage, this, true));
@ -528,7 +529,7 @@ define([
this.printSettings.btnNextPage.setDisabled(curPage > pageCount - 2);
},
onBtnPrint: function(print) {
onBtnPrint: function(print, useSystemDialog) {
this._isPrint = print;
if (this.printSettings.cmbRange.getValue()===-1 && this.printSettings.inputPages.checkValidate() !== true) {
this.printSettings.inputPages.focus();
@ -543,6 +544,7 @@ define([
var size = this.api.asc_getPageSize(this._state.firstPrintPage);
var printerOption = this.printSettings.cmbPrinter.getSelectedRecord();
this.adjPrintParams.asc_setNativeOptions({
usesystemdialog: useSystemDialog,
printer: printerOption ? printerOption.value : null,
pages: this.printSettings.cmbRange.getValue()===-1 ? this.printSettings.inputPages.getValue() : this.printSettings.cmbRange.getValue(),
paperSize: {

19
apps/documenteditor/main/app/view/FileMenuPanels.js
View File

@ -2700,6 +2700,11 @@ define([], function () {
'<tr><td class="padding-large"><div id="print-combo-orient" style="width: 150px;"></div></td></tr>',
'<tr><td><label class="font-weight-bold"><%= scope.txtMargins %></label></td></tr>',
'<tr><td class="padding-large"><div id="print-combo-margins" style="width: 248px;"></div></td></tr>',
'<tr><td class="padding-large">',
'<button id="print-btn-system-dialog" class="btn" data-hint="2" data-hint-direction="bottom" data-hint-offset="big">',
'<span><%= scope.txtPrintUsingSystemDialog %></span>',
'</button>',
'</td></tr>',
'<tr class="fms-btn-apply"><td>',
'<div class="footer justify">',
'<button id="print-btn-print" class="btn normal dlg-btn primary margin-right-8" result="print" style="width: 96px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.txtPrint %></button>',
@ -2970,8 +2975,12 @@ define([], function () {
this.pnlTable = $(this.pnlSettings.find('table')[0]);
this.trApply = $markup.find('.fms-btn-apply');
this.btnPrintSystemDialog = new Common.UI.Button({
el: $markup.findById('#print-btn-system-dialog')
});
this.btnPrint = new Common.UI.Button({
el: $markup.findById('#print-btn-print')
el: $markup.findById('#print-btn-print'),
disabled: true
});
this.btnPrintPdf = new Common.UI.Button({
el: $markup.findById('#print-btn-print-pdf')
@ -3114,7 +3123,7 @@ define([], function () {
}
});
} else {
resultList = this._defaultPaperSizeList;
resultList = [].concat(this._defaultPaperSizeList);
}
resultList.push({ value: -1, displayValue: this.txtCustom, caption: this.txtCustom, size: []});
@ -3170,8 +3179,9 @@ define([], function () {
},
onPrinterSelected: function(combo, record) {
this.setCmbSidesOptions(record.isDuplexSupported);
this.setCmbPaperSizeOptions(record.paperSupported);
this.setCmbSidesOptions(record ? record.isDuplexSupported : true);
this.setCmbPaperSizeOptions(record ? record.paperSupported : null);
this.btnPrint.setDisabled(!record);
},
updateMetricUnit: function() {
@ -3224,6 +3234,7 @@ define([], function () {
txtPrinter: 'Printer',
txtPrinterNotSelected: 'Printer not selected',
txtPrintersNotFound: 'Printers not found',
txtPrintUsingSystemDialog: 'Print using the system dialog',
txtPrintRange: 'Print range',
txtCurrentPage: 'Current page',
txtAllPages: 'All pages',