[Libreoffice-commits] online.git: loleaflet/src

[Samuel Mehrbrodt (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |    5 +++--
 loleaflet/src/unocommands.js             |    5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 52775325f55d785b42011c34802ff9c5ce620f2c
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Fri Sep 6 16:23:55 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Sep 26 09:48:31 2019 +0200

    tdf#121457 Move "Fullscreen Presentation" to "Slideshow" menu
    
    Change-Id: I610df2fbcafacabb636b52644440e095456374e3
    Reviewed-on: https://gerrit.libreoffice.org/78718
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index bc526ac34..2adbc3afd 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -316,8 +316,9 @@ 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'},
-				{type: 'separator', id: 'fullscreen-presentation-separator'},
+				{name: _UNO('.uno:DeleteSlide', 'presentation'), id: 'deletepage', type: 'action'} ]
+			},
+			{name: _UNO('.uno:SlideShowMenu', 'presentation'), type: 'menu', menu: [
 				{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 72a64ab9a..6db9638dc 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -39,7 +39,7 @@ var unoCommandsArray = {
 	ContinueNumbering:{text:{menu:_('Continue previous numbering'),},},
 	ControlCodes:{text:{menu:_('For~matting Marks'),},},
 	Copy:{global:{menu:_('Cop~y'),},},
-	CopyHyperlinkLocation:{text:{menu:_('Copy Hyperlink Location'),},},
+	CopyHyperlinkLocation:{global:{menu:_('Copy Hyperlink Location'),},},
 	Cut:{global:{menu:_('~Cut'),},},
 	DataBarFormatDialog:{spreadsheet:{menu:_('Data Bar...'),},},
 	DataFilterAutoFilter:{spreadsheet:{menu:_('Auto~Filter'),},},
@@ -169,7 +169,7 @@ var unoCommandsArray = {
 	OutlineBullet:{global:{menu:_('~Bullets and Numbering...'),},},
 	OutlineFont:{global:{menu:_('Outline'),},},
 	Overline:{global:{menu:_('Overline'),},},
-	PageDialog:{global:{menu:_('~Page...'),},text:{menu:_('~Page...'),},},
+	PageDialog:{global:{menu:_('~Page...'),},text:{menu:_('~Page Style...'),},},
 	PageDown:{text:{menu:_('Next Page'),},},
 	PageFormatDialog:{spreadsheet:{menu:_('~Page...'),},},
 	PageSetup:{presentation:{menu:_('Properties...'),},},
@@ -223,6 +223,7 @@ var unoCommandsArray = {
 	Shrink:{global:{menu:_('Decrease Size'),},},
 	Sidebar:{global:{menu:_('Sidebar'),},},
 	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'),},},