From 69f542f5553256363dec8de2adbec8a6cf100700 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 19 Mar 2019 17:33:09 +0300 Subject: [PATCH] [SSE] Add print option "Ignore print area" --- .../main/app/controller/Print.js | 3 +++ .../main/app/template/PrintSettings.template | 6 +++-- .../main/app/view/PrintSettings.js | 24 +++++++++++++++---- apps/spreadsheeteditor/main/locale/en.json | 1 + apps/spreadsheeteditor/main/locale/ru.json | 1 + 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index e6ecccd058..af6b5ca052 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -163,6 +163,7 @@ define([ fillPrintOptions: function(props) { this.printSettingsDlg.setRange(props.asc_getPrintType()); + this.printSettingsDlg.setIgnorePrintArea(!!props.asc_getIgnorePrintArea()); this.onChangeRange(); }, @@ -175,6 +176,7 @@ define([ this.comboSheetsChange(this.printSettingsDlg, this.printSettingsDlg.cmbSheet, item.toJSON()); } this.printSettingsDlg.cmbSheet.setDisabled(printtype !== Asc.c_oAscPrintType.EntireWorkbook); + this.printSettingsDlg.chIgnorePrintArea.setDisabled(printtype == Asc.c_oAscPrintType.Selection); }, getPageOptions: function(panel) { @@ -261,6 +263,7 @@ define([ var printtype = this.printSettingsDlg.getRange(); this.adjPrintParams.asc_setPrintType(printtype); this.adjPrintParams.asc_setPageOptionsMap(this._changedProps); + this.adjPrintParams.asc_setIgnorePrintArea(this.printSettingsDlg.getIgnorePrintArea()); Common.localStorage.setItem("sse-print-settings-range", printtype); if ( this.printSettingsDlg.type=='print' ) diff --git a/apps/spreadsheeteditor/main/app/template/PrintSettings.template b/apps/spreadsheeteditor/main/app/template/PrintSettings.template index 003224ded8..fb527a994e 100644 --- a/apps/spreadsheeteditor/main/app/template/PrintSettings.template +++ b/apps/spreadsheeteditor/main/app/template/PrintSettings.template @@ -1,7 +1,9 @@
-
-
+
+
+
+
diff --git a/apps/spreadsheeteditor/main/app/view/PrintSettings.js b/apps/spreadsheeteditor/main/app/view/PrintSettings.js index 3aab523d4b..59cabc3c65 100644 --- a/apps/spreadsheeteditor/main/app/view/PrintSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PrintSettings.js @@ -51,7 +51,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', options: { alias: 'PrintSettings', contentWidth: 280, - height: 471 + height: 475 }, initialize : function(options) { @@ -61,7 +61,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', template: [ '
', '
', - '
' + ((this.type == 'print') ? this.textPrintRange : this.textRange)+ '
', + '
' + ((this.type == 'print') ? this.textPrintRange : this.textRange)+ '
', '
' + this.textSettings + '
', '
' + this.textPageSize + '
', '
' + this.textPageOrientation + '
', @@ -100,6 +100,11 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', }); this.cmbRange.on('selected', _.bind(this.comboRangeChange, this)); + this.chIgnorePrintArea = new Common.UI.CheckBox({ + el: $('#printadv-dlg-chb-ignore'), + labelText: this.textIgnore + }); + this.cmbSheet = new Common.UI.ComboBox({ el : $('#printadv-dlg-combo-sheets'), style : 'width: 242px;', @@ -234,6 +239,14 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', return this.cmbRange.getValue(); }, + setIgnorePrintArea: function(value) { + this.chIgnorePrintArea.setValue(value); + }, + + getIgnorePrintArea: function() { + return (this.chIgnorePrintArea.getValue()=='checked'); + }, + comboRangeChange: function(combo, record) { this.fireEvent('changerange', this); }, @@ -263,13 +276,13 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', if (!this.extended) { this.extended = true; this.panelDetails.css({'display': 'none'}); - this.setHeight(303); + this.setHeight(314); btn.setCaption(this.textShowDetails); Common.localStorage.setItem("sse-hide-print-settings", 1); } else { this.extended = false; this.panelDetails.css({'display': 'block'}); - this.setHeight(471); + this.setHeight(475); btn.setCaption(this.textHideDetails); Common.localStorage.setItem("sse-hide-print-settings", 0); } @@ -308,7 +321,8 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', textShowHeadings: 'Show Rows and Columns Headings', strShow: 'Show', btnDownload: 'Save & Download', - textRange: 'Range' + textRange: 'Range', + textIgnore: 'Ignore Print Area' }, SSE.Views.PrintSettings || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 60595f9d51..b57f4836b9 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1818,6 +1818,7 @@ "SSE.Views.PrintSettings.textShowHeadings": "Show Rows and Columns Headings", "SSE.Views.PrintSettings.textTitle": "Print Settings", "SSE.Views.PrintSettings.textTitlePDF": "PDF Settings", + "SSE.Views.PrintSettings.textIgnore": "Ignore Print Area", "SSE.Views.RightMenu.txtCellSettings": "Cell settings", "SSE.Views.RightMenu.txtChartSettings": "Chart settings", "SSE.Views.RightMenu.txtImageSettings": "Image settings", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 19f0e75bc1..3085dec967 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -1818,6 +1818,7 @@ "SSE.Views.PrintSettings.textShowHeadings": "Показать заголовки строк и столбцов", "SSE.Views.PrintSettings.textTitle": "Параметры печати", "SSE.Views.PrintSettings.textTitlePDF": "Параметры PDF", + "SSE.Views.PrintSettings.textIgnore": "Игнорировать область печати", "SSE.Views.RightMenu.txtCellSettings": "Параметры ячейки", "SSE.Views.RightMenu.txtChartSettings": "Параметры диаграммы", "SSE.Views.RightMenu.txtImageSettings": "Параметры изображения",