Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[PE] Start presenter mode from toolbar menu.

Browse source
This commit is contained in:
Julia Radzhabova 2017-08-11 10:26:21 +03:00
parent 7e78981a8a
commit 3f5b9ce24c
5 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/presentationeditor/main/app/controller/Main.js
View file

@ -141,7 +141,8 @@ define([
'Slide number': this.txtSlideNumber, 'Slide number': this.txtSlideNumber,
'Slide subtitle': this.txtSlideSubtitle, 'Slide subtitle': this.txtSlideSubtitle,
'Table': this.txtSldLtTTbl, 'Table': this.txtSldLtTTbl,
'Slide title': this.txtSlideTitle 'Slide title': this.txtSlideTitle,
'Loading': this.txtLoading
} }
}); });
@ -1940,7 +1941,8 @@ define([
txtSlideTitle: 'Slide title', txtSlideTitle: 'Slide title',
textChangesSaved: 'All changes saved', textChangesSaved: 'All changes saved',
saveTitleText: 'Saving Document', saveTitleText: 'Saving Document',
saveTextText: 'Saving document...' saveTextText: 'Saving document...',
txtLoading: 'Loading...'
} }
})(), PE.Controllers.Main || {})) })(), PE.Controllers.Main || {}))
}); });

7
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -825,8 +825,8 @@ define([
} }
}, },
onPreview: function(slidenum) { onPreview: function(slidenum, presenter) {
Common.NotificationCenter.trigger('preview:start', _.isNumber(slidenum) ? slidenum : 0); Common.NotificationCenter.trigger('preview:start', _.isNumber(slidenum) ? slidenum : 0, presenter);
}, },
onPreviewBtnClick: function(btn, e) { onPreviewBtnClick: function(btn, e) {
@ -842,6 +842,9 @@ define([
this.onPreview(this.api.getCurrentPage()); this.onPreview(this.api.getCurrentPage());
break; break;
case 2: case 2:
this.onPreview(0, true);
break;
case 3:
var win, var win,
me = this, me = this,
selectedElements = me.api.getSelectedElements(), selectedElements = me.api.getSelectedElements(),

5
apps/presentationeditor/main/app/controller/Viewport.js
View file

@ -154,12 +154,12 @@ define([
Common.NotificationCenter.trigger('window:resize'); Common.NotificationCenter.trigger('window:resize');
}, },
onPreviewStart: function(slidenum) { onPreviewStart: function(slidenum, presenter) {
this.previewPanel = this.previewPanel || PE.getController('Viewport').getView('DocumentPreview'); this.previewPanel = this.previewPanel || PE.getController('Viewport').getView('DocumentPreview');
var me = this, var me = this,
isResized = false; isResized = false;
var reporterObject = PE.getController('Main').document; var reporterObject = (presenter) ? PE.getController('Main').document : null;
if (this.previewPanel && !this.previewPanel.isVisible() && this.api) { if (this.previewPanel && !this.previewPanel.isVisible() && this.api) {
this.previewPanel.show(); this.previewPanel.show();
@ -199,6 +199,5 @@ define([
} }
} }
} }
}); });
}); });

6
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -196,10 +196,11 @@ define([
items : [ items : [
{caption: this.textShowBegin, value: 0}, {caption: this.textShowBegin, value: 0},
{caption: this.textShowCurrent, value: 1}, {caption: this.textShowCurrent, value: 1},
{caption: this.textShowPresenterView, value: 2},
{caption: '--'}, {caption: '--'},
me.mnuShowSettings = new Common.UI.MenuItem({ me.mnuShowSettings = new Common.UI.MenuItem({
caption: this.textShowSettings, caption: this.textShowSettings,
value: 2, value: 3,
lock: [_set.lostConnect] lock: [_set.lostConnect]
}) })
] ]
@ -1832,7 +1833,8 @@ define([
textTabFile: 'File', textTabFile: 'File',
textTabHome: 'Home', textTabHome: 'Home',
textTabInsert: 'Insert', textTabInsert: 'Insert',
textSurface: 'Surface' textSurface: 'Surface',
textShowPresenterView: 'Show in Presenter Mode'
} }
}()), PE.Views.Toolbar || {})); }()), PE.Views.Toolbar || {}));
}); });

2
apps/presentationeditor/main/locale/en.json
View file

@ -214,6 +214,7 @@
"PE.Controllers.Main.txtHeader": "Header", "PE.Controllers.Main.txtHeader": "Header",
"PE.Controllers.Main.txtImage": "Image", "PE.Controllers.Main.txtImage": "Image",
"PE.Controllers.Main.txtLines": "Lines", "PE.Controllers.Main.txtLines": "Lines",
"PE.Controllers.Main.txtLoading": "Loading...",
"PE.Controllers.Main.txtMath": "Math", "PE.Controllers.Main.txtMath": "Math",
"PE.Controllers.Main.txtMedia": "Media", "PE.Controllers.Main.txtMedia": "Media",
"PE.Controllers.Main.txtNeedSynchronize": "You have updates", "PE.Controllers.Main.txtNeedSynchronize": "You have updates",
@ -1297,6 +1298,7 @@
"PE.Views.Toolbar.textShapeAlignTop": "Align Top", "PE.Views.Toolbar.textShapeAlignTop": "Align Top",
"PE.Views.Toolbar.textShowBegin": "Show from Beginning", "PE.Views.Toolbar.textShowBegin": "Show from Beginning",
"PE.Views.Toolbar.textShowCurrent": "Show from Current slide", "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.textShowSettings": "Show Settings",
"PE.Views.Toolbar.textStock": "Stock", "PE.Views.Toolbar.textStock": "Stock",
"PE.Views.Toolbar.textStrikeout": "Strikeout", "PE.Views.Toolbar.textStrikeout": "Strikeout",