Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Presenter Console #10107

Merged
merged 21 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a440f01
browser: slideshow: simplify notify blocked popup
hcvcastro Sep 24, 2024
3b2bf42
browser: slideshow: simplify 'onSlideShowInfo'
hcvcastro Sep 24, 2024
5262c22
browser: slideshow: add 'PresenterConsole' class
hcvcastro Sep 24, 2024
bac3464
browser: slideshow: add click, keydown event to presenter console
hcvcastro Sep 30, 2024
9ea97ca
browser: slideshow: move presenter console to bottom right corner
hcvcastro Oct 1, 2024
d81f805
browser: slideshow: handle close presentation windows
hcvcastro Oct 2, 2024
d9d64c8
browser: slideshow: generate presenter console basic html
hcvcastro Oct 4, 2024
67c293d
browser: slideshow: add notes to presenter console
hcvcastro Oct 7, 2024
961a622
browser: slideshow: add timer to presenter console
hcvcastro Oct 8, 2024
6336944
browser: slideshow: compute canvas size
hcvcastro Oct 14, 2024
7bb41f1
browser: slideshow: add draw image to render the canvas
hcvcastro Oct 14, 2024
0582011
browser: slideshow: fire 'slidecached' if rendered slide
hcvcastro Oct 14, 2024
7d8995a
browser: slideshow: replace event listener to 'transitionstart'
hcvcastro Oct 15, 2024
4d26324
browser: slideshow: check proxy window presenter console
hcvcastro Oct 15, 2024
738e8d3
browser: slideshow: use preview for next presentation
hcvcastro Oct 16, 2024
fb8b705
browser: slideshow: fix aspect ratio of the previews
hcvcastro Oct 17, 2024
f3c43fd
browser: slideshow: fix window resize previews
hcvcastro Oct 17, 2024
b885507
browser: slideshow: remove event listeners on close
hcvcastro Oct 17, 2024
9a2710f
browser: slideshow: clear interval
hcvcastro Oct 17, 2024
f3d5131
presenter console: update current slide on animations and transitions
mcecchetti Oct 17, 2024
02688c8
browser: slideshow: fix prettier warnings
hcvcastro Oct 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions browser/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ COOL_JS_LST =\
src/slideshow/RenderContext.ts \
src/slideshow/SlideRenderer.ts \
src/slideshow/SlideShowPresenter.ts \
src/slideshow/PresenterConsole.js \
src/slideshow/SimpleTextureRenderer.ts \
src/slideshow/StaticTextRenderer.ts \
src/slideshow/PauseTimer.ts \
Expand Down
42 changes: 42 additions & 0 deletions browser/images/lc_presenterconsole.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions browser/src/control/Control.NotebookbarImpress.js
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,14 @@ L.Control.NotebookbarImpress = L.Control.NotebookbarWriter.extend({
'command': 'presentinwindow',
'accessibility': { focusBack: true, combination: 'PW', de: null }
} : {},
!window.ThisIsAMobileApp ?
{
'id': 'view-presentation-in-console',
'type': 'bigcustomtoolitem',
'text': _('Presenter Console'),
'command': 'presenterconsole',
'accessibility': { focusBack: true, combination: 'PW', de: null }
}: {},
{
'id': 'fullscreen',
'type': 'bigtoolitem',
Expand Down
1 change: 1 addition & 0 deletions browser/src/control/Control.UIManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ L.Control.UIManager = L.Control.extend({
$('#presentation-controls-wrapper').show();
this.initializeRuler();
this.map.slideShowPresenter = new SlideShow.SlideShowPresenter(this.map);
this.map.presenterConsole = new SlideShow.PresenterConsole(this.map);
}

if (docType === 'text') {
Expand Down
5 changes: 5 additions & 0 deletions browser/src/docdispatcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,11 @@ class Dispatcher {
else app.map.fire('presentinwindow');
};

this.actionsMap['presenterconsole'] = () => {
if (app.map._debug.debugOn || app.isExperimentalMode())
app.map.fire('newpresentinconsole');
};

this.actionsMap['fullscreen-drawing'] = () => {
L.toggleFullScreen();
};
Expand Down
4 changes: 1 addition & 3 deletions browser/src/layer/tile/CanvasTileLayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -1652,9 +1652,7 @@ L.CanvasTileLayer = L.Layer.extend({
this._map.fire('adminuser');
} else if (textMsg.startsWith('presentationinfo:')) {
var content = JSON.parse(textMsg.substring('presentationinfo:'.length + 1));
if (this._map.slideShowPresenter) {
this._map.slideShowPresenter.onSlideShowInfo(content);
}
this._map.fire('presentationinfo', content);
} else if (textMsg.startsWith('slidelayer:')) {
const content = JSON.parse(textMsg.substring('slidelayer:'.length + 1));
this._map.fire('slidelayer', {
Expand Down
Loading
Loading