loleaflet/src/control/Control.Menubar.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
New commits: commit 056b6dde021ba63c70f21465bb1d31a1335ce973 Author: Tamás Zolnai <tamas.zol...@collabora.com> AuthorDate: Wed Oct 16 19:32:50 2019 +0200 Commit: Tamás Zolnai <tamas.zol...@collabora.com> CommitDate: Wed Oct 16 19:46:00 2019 +0200 mobile-menu: calc: Move alone items upper with one level. Change-Id: Ib96557f7f3c22729115fac7e1ce6d5e5e2b420df diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index a423b5ef3..f6ff65ea0 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -569,9 +569,6 @@ L.Control.Menubar = L.Control.extend({ {type: 'separator'}, {uno: '.uno:SearchDialog'} ]}, - {name: _UNO('.uno:ViewMenu', 'spreadsheet'), id: 'view', type: 'menu', menu: [ - {name: _UNO('.uno:FullScreen', 'spreadsheet'), id: 'fullscreen', type: 'action', mobileapp: false}, - ]}, {name: _UNO('.uno:SheetMenu', 'spreadsheet'), type: 'menu', menu: [ {name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), type: 'menu', menu: [ {uno: '.uno:InsertRowsBefore'}, @@ -605,6 +602,7 @@ L.Control.Menubar = L.Control.extend({ {uno: '.uno:HideDetail'}, {uno: '.uno:ShowDetail'}]} ]}, + {name: _UNO('.uno:FullScreen', 'spreadsheet'), id: 'fullscreen', type: 'action', mobileapp: false}, {name: _('About'), id: 'about', type: 'action'}, ], commit 7fc68b7a87881eeab0c142d8caa52db6e36a5359 Author: Tamás Zolnai <tamas.zol...@collabora.com> AuthorDate: Wed Oct 16 19:22:52 2019 +0200 Commit: Tamás Zolnai <tamas.zol...@collabora.com> CommitDate: Wed Oct 16 19:46:00 2019 +0200 mobile-menu: impress/calc: Move 'Download as' menu upper with one level. Change-Id: Id3f49c05498c8fdf2408056195edc2a02f7f1118 diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 7f550b041..a423b5ef3 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -504,11 +504,12 @@ L.Control.Menubar = L.Control.extend({ {name: _('Share...'), id:'shareas', type: 'action'}, {name: _UNO('.uno:Print', 'presentation'), id: 'print', type: 'action'}, {name: _('See revision history'), id: 'rev-history', type: 'action'}, - {name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id: 'downloadas', type: 'menu', menu: [ - {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'}, - {name: _('ODF presentation (.odp)'), id: 'downloadas-odp', type: 'action'}, - {name: _('PowerPoint 2003 Presentation (.ppt)'), id: 'downloadas-ppt', type: 'action'}, - {name: _('PowerPoint Presentation (.pptx)'), id: 'downloadas-pptx', type: 'action'}]}, + ]}, + {name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id:'downloadas', type: 'menu', menu: [ + {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'}, + {name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'}, + {name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'}, + {name: _('Excel Spreadsheet (.xlsx)'), id: 'downloadas-xlsx', type: 'action'} ]}, {name: _UNO('.uno:EditMenu', 'presentation'), type: 'menu', menu: [ {uno: '.uno:Undo'}, @@ -549,11 +550,12 @@ L.Control.Menubar = L.Control.extend({ {name: _('Share...'), id:'shareas', type: 'action'}, {name: _UNO('.uno:Print', 'spreadsheet'), id: 'print', type: 'action'}, {name: _('See revision history'), id: 'rev-history', type: 'action'}, - {name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id:'downloadas', type: 'menu', menu: [ - {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'}, - {name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'}, - {name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'}, - {name: _('Excel Spreadsheet (.xlsx)'), id: 'downloadas-xlsx', type: 'action'}]}, + ]}, + {name: !window.ThisIsAMobileApp ? _('Download as') : _('Export as'), id:'downloadas', type: 'menu', menu: [ + {name: _('PDF Document (.pdf)'), id: 'downloadas-pdf', type: 'action'}, + {name: _('ODF spreadsheet (.ods)'), id: 'downloadas-ods', type: 'action'}, + {name: _('Excel 2003 Spreadsheet (.xls)'), id: 'downloadas-xls', type: 'action'}, + {name: _('Excel Spreadsheet (.xlsx)'), id: 'downloadas-xlsx', type: 'action'} ]}, {name: _UNO('.uno:EditMenu', 'spreadsheet'), type: 'menu', menu: [ {uno: '.uno:Undo'}, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits