diff --git a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js index 10561a4178..af9c6ebacf 100644 --- a/apps/spreadsheeteditor/main/app/controller/LeftMenu.js +++ b/apps/spreadsheeteditor/main/app/controller/LeftMenu.js @@ -266,7 +266,9 @@ define([ case 'back': break; case 'save': this.api.asc_Save(); break; case 'save-desktop': this.api.asc_DownloadAs(); break; - case 'export-pdf': this.clickSaveAsFormat(menu, Asc.c_oAscFileType.PDF); break; + case 'export-pdf': + Common.NotificationCenter.trigger('export:to', this.leftMenu, Asc.c_oAscFileType.PDF); + break; case 'print': Common.NotificationCenter.trigger('print', this.leftMenu); break; case 'exit': Common.NotificationCenter.trigger('goback'); break; case 'edit': diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index 056963f15e..ef6a0c2874 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -75,6 +75,7 @@ define([ }); Common.NotificationCenter.on('print', _.bind(this.openPrintSettings, this, 'print')); Common.NotificationCenter.on('download:settings', _.bind(this.openPrintSettings, this, 'download')); + Common.NotificationCenter.on('export:to', _.bind(this.openPrintSettings, this, 'export')); }, onLaunch: function() { diff --git a/apps/spreadsheeteditor/main/app/view/FileMenu.js b/apps/spreadsheeteditor/main/app/view/FileMenu.js index 4e08976606..748da583b1 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenu.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenu.js @@ -631,6 +631,6 @@ define([ btnHistoryCaption : 'Versions History', btnExitCaption : 'Exit', btnFileOpenCaption : 'Open...', - btnExportToPDFCaption : 'Export to PDF' + btnExportToPDFCaption : 'Export to PDF' }, SSE.Views.FileMenu || {})); }); diff --git a/apps/spreadsheeteditor/main/app/view/PrintSettings.js b/apps/spreadsheeteditor/main/app/view/PrintSettings.js index 0b24debbe9..56db3fd087 100644 --- a/apps/spreadsheeteditor/main/app/view/PrintSettings.js +++ b/apps/spreadsheeteditor/main/app/view/PrintSettings.js @@ -56,6 +56,8 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', initialize : function(options) { this.type = options.type || 'print'; + var txtBtn = (this.type == 'print') ? this.btnPrint : + (this.type == 'export') ? this.btnExport : this.btnDownload; _.extend(this.options, { title: (this.type == 'print') ? this.textTitle : this.textTitlePDF, template: [ @@ -76,7 +78,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', '
' ].join('') }, options); @@ -422,7 +424,8 @@ define([ 'text!spreadsheeteditor/main/app/template/PrintSettings.template', textMarginsNormal: 'Normal', textMarginsNarrow: 'Narrow', textMarginsWide: 'Wide', - txtMarginsLast: 'Last Custom' + txtMarginsLast: 'Last Custom', + btnExport: 'Save & Export' }, 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 94d7e8fbe8..dbfe4c49a2 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -3196,6 +3196,7 @@ "SSE.Views.PivotTable.txtTable_PivotStyleMedium": "Pivot Table Style Medium", "SSE.Views.PrintSettings.btnDownload": "Save & Download", "SSE.Views.PrintSettings.btnPrint": "Save & Print", + "SSE.Views.PrintSettings.btnExport": "Save & Export", "SSE.Views.PrintSettings.strBottom": "Bottom", "SSE.Views.PrintSettings.strLandscape": "Landscape", "SSE.Views.PrintSettings.strLeft": "Left",