loleaflet/src/control/Control.Menubar.js | 5 ++---
loleaflet/src/unocommands.js | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit c5f7a503f6cdf2a19ad136099d07b8ebe43c8e30
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Wed Feb 19 13:24:25 2020 +0100
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu Feb 20 15:03:00 2020 +0100
Revert "tdf#121457 Move "Fullscreen Presentation" to "Slideshow" menu"
This reverts commit 52775325f55d785b42011c34802ff9c5ce620f2c.
Slide Show menu had a single item, and Slide menu only had a few.
Revert in favor of saving on menu width for now.
Change-Id: I81f0f96849e3eeaf571611d059325d72b85ec334
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/89040
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index d91723c3a..8f2d230ad 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -326,9 +326,8 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:SlideMenu', 'presentation'), type:
'menu', menu: [
{name: _UNO('.uno:InsertSlide',
'presentation'), id: 'insertpage', type: 'action'},
{name: _UNO('.uno:DuplicateSlide',
'presentation'), id: 'duplicatepage', type: 'action'},
- {name: _UNO('.uno:DeleteSlide',
'presentation'), id: 'deletepage', type: 'action'} ]
- },
- {name: _UNO('.uno:SlideShowMenu', 'presentation'),
type: 'menu', menu: [
+ {name: _UNO('.uno:DeleteSlide',
'presentation'), id: 'deletepage', type: 'action'},
+ {type: 'separator', id:
'fullscreen-presentation-separator'},
{name: _('Fullscreen presentation'), id:
'fullscreen-presentation', type: 'action'}]
},
{name: _UNO('.uno:ToolsMenu', 'presentation'), id:
'tools', type: 'menu', menu: [
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index 82a07e0a9..6c214d64a 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -287,7 +287,6 @@ var unoCommandsArray = {
SlideChangeWindow:{presentation:{menu:_('Slide Transition'),},},
SlideMasterPage:{presentation:{menu:_('~Master Slide'),},},
SlideMenu:{presentation:{menu:_('S~lide'),},},
- SlideShowMenu:{presentation:{menu:_('~Slide Show'),},},
SmallCaps:{global:{menu:_('Small capitals'),},},
SortAscending:{spreadsheet:{menu:_('Sort Ascending'),},},
SortDescending:{spreadsheet:{menu:_('Sort Descending'),},},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
