diff --git a/apps/presentationeditor/main/app/view/FileMenu.js b/apps/presentationeditor/main/app/view/FileMenu.js index 723a0748e7..7884ecabc3 100644 --- a/apps/presentationeditor/main/app/view/FileMenu.js +++ b/apps/presentationeditor/main/app/view/FileMenu.js @@ -577,6 +577,7 @@ define([ this.mode.canPrint = this.mode.canDownload = false; } else { this.mode = mode; + this.mode.canPreviewPrint = true; } if (!delay) { diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index 2a07305a5f..2055c2f93e 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -48,6 +48,13 @@ define([ this.adjPrintParams = new Asc.asc_CAdjustPrint(); this.adjPrintParams.asc_setPrintType(value); + this._state = { + firstPrintPage: 0, + isPrinterInfoLoad: false, + currentPrinter: null, + printersList: [] + }; + this._changedProps = null; this._originalPageSettings = null; @@ -99,15 +106,16 @@ define([ this.printSettings.printScroller && this.printSettings.printScroller.update(); } }, this)); + this.printSettings.btnPrintSystemDialog.on('click', _.bind(this.querySavePrintSettings, this, 'print', true)); this.printSettings.btnsSave.forEach(function (btn) { - btn.on('click', _.bind(me.querySavePrintSettings, me, 'save')); + btn.on('click', _.bind(me.querySavePrintSettings, me, 'save', false)); }); this.printSettings.btnsPrint.forEach(function (btn) { - btn.on('click', _.bind(me.querySavePrintSettings, me, 'print')); + btn.on('click', _.bind(me.querySavePrintSettings, me, 'print', false)); }); if (this.mode.isDesktopApp) { this.printSettings.btnsPrintPDF.forEach(function (btn) { - btn.on('click', _.bind(me.querySavePrintSettings, me, 'print-pdf')); + btn.on('click', _.bind(me.querySavePrintSettings, me, 'print-pdf', false)); }); } this.printSettings.btnPrevPage.on('click', _.bind(this.onChangePreviewPage, this, false)); @@ -124,6 +132,10 @@ define([ this.fillComponents(this.printSettings); this.registerControlEvents(this.printSettings); + if(this._state.isPrinterInfoLoad) { + this.printSettings.updateCmbPrinter(this._state.currentPrinter, this._state.printersList); + } + Common.NotificationCenter.on('window:resize', _.bind(function () { if (this._isPreviewVisible) { this.notUpdateSheetSettings = true; @@ -214,9 +226,9 @@ define([ item = null; for (var i=0; i<%= scope.txtPrint %>', '', '', + '', + '', '', '', '', @@ -2762,6 +2764,7 @@ define([], function () { '', '
', '', + '', //'', '
', '
', @@ -2811,6 +2814,22 @@ define([], function () { Common.UI.BaseView.prototype.initialize.call(this,arguments); this.menu = options.menu; + + this._defaultPaperSizeList = [ + {value:'215.9|279.4', displayValue:['US Letter', '21,59', '27,94', 'cm'], caption: 'US Letter', size: [215.9, 279.4]}, + {value:'215.9|355.6', displayValue:['US Legal', '21,59', '35,56', 'cm'], caption: 'US Legal', size: [215.9, 355.6]}, + {value:'210|297', displayValue:['A4', '21', '29,7', 'cm'], caption: 'A4', size: [210, 297]}, + {value:'148|210', displayValue:['A5', '14,8', '21', 'cm'], caption: 'A5', size: [148, 210]}, + {value:'176|250', displayValue:['B5', '17,6', '25', 'cm'], caption: 'B5', size: [176, 250]}, + {value:'104.8|241.3', displayValue:['Envelope #10', '10,48', '24,13', 'cm'], caption: 'Envelope #10', size: [104.8, 241.3]}, + {value:'110|220', displayValue:['Envelope DL', '11', '22', 'cm'], caption: 'Envelope DL', size: [110, 220]}, + {value:'279.4|431.8', displayValue:['Tabloid', '27,94', '43,18', 'cm'], caption: 'Tabloid', size: [279.4, 431.8]}, + {value:'297|420', displayValue:['A3', '29,7', '42', 'cm'], caption: 'A3', size: [297, 420]}, + {value:'296.9|457.2', displayValue:['Tabloid Oversize', '29,69', '45,72', 'cm'], caption: 'Tabloid Oversize', size: [296.9, 457.2]}, + {value:'196.8|273', displayValue:['ROC 16K', '19,68', '27,3', 'cm'], caption: 'ROC 16K', size: [196.8, 273]}, + {value:'120|235', displayValue:['Envelope Choukei 3', '12', '23,5', 'cm'], caption: 'Envelope Choukei 3', size: [120, 235]}, + {value:'305|487', displayValue:['Super B/A3', '30,5', '48,7', 'cm'], caption: 'Super B/A3', size: [305, 487]} + ]; this._initSettings = true; this.extendedPrintTitles = Common.localStorage.getBool('sse-print-titles-extended', true); @@ -2821,6 +2840,29 @@ define([], function () { var $markup = $(this.template({scope: this, isRTL: Common.UI.isRTL()})); + this.cmbPrinter = new Common.UI.ComboBox({ + el: $markup.findById('#print-combo-printer'), + menuStyle: 'min-width: 248px;max-height: 280px;', + editable: false, + takeFocusOnClose: true, + cls: 'input-group-nr', + placeHolder: this.txtPrinterNotSelected, + itemsTemplate: _.template([ + '<% if (items.length > 0) { %>', + '<% _.each(items, function(item) { %>', + '
  • class="checked" <% } %> ><%= scope.getDisplayValue(item) %>
    • ', + '<% }); %>', + '<% } else { %>', + '
  • ' + this.txtPrintersNotFound + '
    • ', + '<% } %>' + ].join('')), + data: [], + dataHint: '2', + dataHintDirection: 'bottom', + dataHintOffset: 'big' + }); + this.cmbPrinter.on('selected', _.bind(this.onPrinterSelected, this)); + this.cmbRange = new Common.UI.ComboBox({ el: $markup.findById('#print-combo-range'), menuStyle: 'min-width: 248px;max-height: 280px;', @@ -2899,11 +2941,7 @@ define([], function () { editable: false, takeFocusOnClose: true, cls : 'input-group-nr', - data : [ - { value: 'one', displayValue: this.txtOneSide, descValue: this.txtOneSideDesc }, - { value: 'both-long', displayValue: this.txtBothSides, descValue: this.txtBothSidesLongDesc }, - { value: 'both-short', displayValue: this.txtBothSides, descValue: this.txtBothSidesShortDesc } - ], + data : [], itemsTemplate: _.template([ '<% _.each(items, function(item) { %>', '
  • ', @@ -2967,21 +3005,7 @@ define([], function () { takeFocusOnClose: true, template: paperSizeTemplate, itemsTemplate: paperSizeItemsTemplate, - data: [ - {value:'215.9|279.4', displayValue:['US Letter', '21,59', '27,94', 'cm'], caption: 'US Letter'}, - {value:'215.9|355.6', displayValue:['US Legal', '21,59', '35,56', 'cm'], caption: 'US Legal'}, - {value:'210|297', displayValue:['A4', '21', '29,7', 'cm'], caption: 'A4'}, - {value:'148|210', displayValue:['A5', '14,8', '21', 'cm'], caption: 'A5'}, - {value:'176|250', displayValue:['B5', '17,6', '25', 'cm'], caption: 'B5'}, - {value:'104.8|241.3', displayValue:['Envelope #10', '10,48', '24,13', 'cm'], caption: 'Envelope #10'}, - {value:'110|220', displayValue:['Envelope DL', '11', '22', 'cm'], caption: 'Envelope DL'}, - {value:'279.4|431.8', displayValue:['Tabloid', '27,94', '43,18', 'cm'], caption: 'Tabloid'}, - {value:'297|420', displayValue:['A3', '29,7', '42', 'cm'], caption: 'A3'}, - {value:'296.9|457.2', displayValue:['Tabloid Oversize', '29,69', '45,72', 'cm'], caption: 'Tabloid Oversize'}, - {value:'196.8|273', displayValue:['ROC 16K', '19,68', '27,3', 'cm'], caption: 'ROC 16K'}, - {value:'120|235', displayValue:['Envelope Choukei 3', '12', '23,5', 'cm'], caption: 'Envelope Choukei 3'}, - {value:'305|487', displayValue:['Super B/A3', '30,5', '48,7', 'cm'], caption: 'Super B/A3'} - ], + data: [], dataHint: '2', dataHintDirection: 'bottom', dataHintOffset: 'big', @@ -3162,6 +3186,9 @@ define([], function () { this.pnlTable = $(this.pnlSettings.find('table')[0]); this.trApply = $markup.find('.fms-btn-apply'); + + this.btnPrintSystemDialog = $markup.findById('#print-btn-system-dialog'); + this.btnsSave = []; this.btnsPrint = []; if (this.mode.isDesktopApp) { @@ -3189,7 +3216,8 @@ define([], function () { el: $markup.findById('#print-btn-save-'+i) })); this.btnsPrint.push(new Common.UI.Button({ - el: $markup.findById('#print-btn-print-'+i) + el: $markup.findById('#print-btn-print-'+i), + disabled: true })); } @@ -3289,10 +3317,110 @@ define([], function () { this.updateMetricUnit(); this._initSettings = false; } + this.updateSettings(); this.updateScroller(); this.fireEvent('show', this); }, + updateSettings: function() { + var selectedPrinter = this.cmbPrinter.getSelectedRecord(); + this.setCmbSidesOptions(selectedPrinter ? selectedPrinter.isDuplexSupported : true); + this.setCmbPaperSizeOptions(selectedPrinter ? selectedPrinter.paperSupported : null); + }, + + updateCmbPrinter: function(currentPrinter, printers) { + var cmbPrinterOptions = []; + + printers = printers || []; + + //If the current printer is not in the list of printers, add it + if(currentPrinter && !_.some(printers, function(printer) { return printer.name == currentPrinter })) { + printers.push({ + name: currentPrinter, + duplex_supported: true, + paperSupported: this._defaultPaperSizeList + }); + } + + cmbPrinterOptions = printers.map(function(printer) { + return { + value: printer.name, + displayValue: printer.name, + paperSupported: printer.paper_supported, + isDuplexSupported: printer.duplex_supported + } + }); + + this.cmbPrinter.setData(cmbPrinterOptions); + this.cmbPrinter.setValue(currentPrinter); + this.cmbPrinter.trigger('selected', this, this.cmbPrinter.getSelectedRecord()); + }, + + setCmbSidesOptions: function(isDuplexSupported) { + var cmbValue = this.cmbSides.getValue(); + var list = [{ value: 'one', displayValue: this.txtOneSide, descValue: this.txtOneSideDesc }]; + if(isDuplexSupported) { + list.push( + { value: 'both-long', displayValue: this.txtBothSides, descValue: this.txtBothSidesLongDesc }, + { value: 'both-short', displayValue: this.txtBothSides, descValue: this.txtBothSidesShortDesc } + ); + } else if(cmbValue != 'one') { + cmbValue = 'one'; + } + this.cmbSides.setData(list); + this.cmbSides.setValue(cmbValue); + }, + + setCmbPaperSizeOptions(paperSizeList) { + var resultList = []; + + if(paperSizeList && paperSizeList.length > 0) { + resultList = paperSizeList.map(function(item, index) { + return { + value: index, + displayValue: [item.name, item.width / 10, item.height / 10, 'cm'], + caption: item.name, + size: [item.width, item.height] + } + }); + } else { + resultList = [].concat(this._defaultPaperSizeList); + } + + var prevSelectedOption = this.cmbPaperSize.store.findWhere({ + value: this.cmbPaperSize.getValue() + }); + var newSelectedOption = null; + + function findOptionBySize(list, width, height) { + return _.find(list, function(option) { + return Math.round(option.size[0]) === width && Math.round(option.size[1]) === height; + }); + } + + // If a previously selected option exists, search for a matching one in resultList + if (prevSelectedOption) { + newSelectedOption = findOptionBySize( + resultList, + Math.round(prevSelectedOption.get('size')[0]), + Math.round(prevSelectedOption.get('size')[1]) + ); + } + + // If no matching option is found, look for the default size 210x297 (A4) + if (!newSelectedOption) { + newSelectedOption = findOptionBySize(resultList, 210, 297); + } + if (!newSelectedOption && resultList[0]) { + newSelectedOption = resultList[0]; + } + + this.cmbPaperSize.setData(resultList); + this.updatePaperSizeMetricUnit(); + this.cmbPaperSize.setValue(newSelectedOption ? newSelectedOption.value : null); + this.cmbPaperSize.trigger('selected', this, this.cmbPaperSize.getSelectedRecord()); + }, + updateScroller: function() { if (this.scroller) { Common.UI.Menu.Manager.hideAll(); @@ -3324,13 +3452,27 @@ define([], function () { }, + onPrinterSelected: function(combo, record) { + this.setCmbSidesOptions(record ? record.isDuplexSupported : true); + this.setCmbPaperSizeOptions(record ? record.paperSupported : null); + this.btnsPrint.forEach(function(btn) { + btn.setDisabled(!record); + }); + }, + updateMetricUnit: function() { + this.updatePaperSizeMetricUnit(); + this.cmbPaperMargins.onResetItems(); + }, + + updatePaperSizeMetricUnit: function() { + if (!this.cmbPaperSize) return; var store = this.cmbPaperSize.store; for (var i=0; i