diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index ea360d666..66792829a 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -141,7 +141,8 @@ define([ 'Slide number': this.txtSlideNumber, 'Slide subtitle': this.txtSlideSubtitle, 'Table': this.txtSldLtTTbl, - 'Slide title': this.txtSlideTitle + 'Slide title': this.txtSlideTitle, + 'Loading': this.txtLoading } }); @@ -1940,7 +1941,8 @@ define([ txtSlideTitle: 'Slide title', textChangesSaved: 'All changes saved', saveTitleText: 'Saving Document', - saveTextText: 'Saving document...' + saveTextText: 'Saving document...', + txtLoading: 'Loading...' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index c865a98ae..6f42f5adc 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -825,8 +825,8 @@ define([ } }, - onPreview: function(slidenum) { - Common.NotificationCenter.trigger('preview:start', _.isNumber(slidenum) ? slidenum : 0); + onPreview: function(slidenum, presenter) { + Common.NotificationCenter.trigger('preview:start', _.isNumber(slidenum) ? slidenum : 0, presenter); }, onPreviewBtnClick: function(btn, e) { @@ -842,6 +842,9 @@ define([ this.onPreview(this.api.getCurrentPage()); break; case 2: + this.onPreview(0, true); + break; + case 3: var win, me = this, selectedElements = me.api.getSelectedElements(), diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js index a435f2588..a4e6b98b2 100644 --- a/apps/presentationeditor/main/app/controller/Viewport.js +++ b/apps/presentationeditor/main/app/controller/Viewport.js @@ -154,12 +154,12 @@ define([ Common.NotificationCenter.trigger('window:resize'); }, - onPreviewStart: function(slidenum) { + onPreviewStart: function(slidenum, presenter) { this.previewPanel = this.previewPanel || PE.getController('Viewport').getView('DocumentPreview'); var me = this, isResized = false; - var reporterObject = PE.getController('Main').document; + var reporterObject = (presenter) ? PE.getController('Main').document : null; if (this.previewPanel && !this.previewPanel.isVisible() && this.api) { this.previewPanel.show(); @@ -199,6 +199,5 @@ define([ } } } - }); }); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 34048d3e3..2845dabc3 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -196,10 +196,11 @@ define([ items : [ {caption: this.textShowBegin, value: 0}, {caption: this.textShowCurrent, value: 1}, + {caption: this.textShowPresenterView, value: 2}, {caption: '--'}, me.mnuShowSettings = new Common.UI.MenuItem({ caption: this.textShowSettings, - value: 2, + value: 3, lock: [_set.lostConnect] }) ] @@ -1832,7 +1833,8 @@ define([ textTabFile: 'File', textTabHome: 'Home', textTabInsert: 'Insert', - textSurface: 'Surface' + textSurface: 'Surface', + textShowPresenterView: 'Show in Presenter Mode' } }()), PE.Views.Toolbar || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 67e3c93ca..cbb3b489d 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -214,6 +214,7 @@ "PE.Controllers.Main.txtHeader": "Header", "PE.Controllers.Main.txtImage": "Image", "PE.Controllers.Main.txtLines": "Lines", + "PE.Controllers.Main.txtLoading": "Loading...", "PE.Controllers.Main.txtMath": "Math", "PE.Controllers.Main.txtMedia": "Media", "PE.Controllers.Main.txtNeedSynchronize": "You have updates", @@ -1297,6 +1298,7 @@ "PE.Views.Toolbar.textShapeAlignTop": "Align Top", "PE.Views.Toolbar.textShowBegin": "Show from Beginning", "PE.Views.Toolbar.textShowCurrent": "Show from Current slide", + "PE.Views.Toolbar.textShowPresenterView": "Show in Presenter Mode", "PE.Views.Toolbar.textShowSettings": "Show Settings", "PE.Views.Toolbar.textStock": "Stock", "PE.Views.Toolbar.textStrikeout": "Strikeout",