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

[Michael Meeks (via logerrit)]

 loleaflet/src/control/Control.Menubar.js |   17 +++++++++++++++++
 loleaflet/src/unocommands.js             |   13 +++++++++++++
 2 files changed, 30 insertions(+)

New commits:
commit 8dd7bcffd6996308dcd5fa97f89a2d1a07523e74
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Jan 7 17:19:21 2020 +0000
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jan 7 19:33:41 2020 +0100

    mobile: add insert fields for calc & impress.
    
    Also add option to enable/disable on-line spell-checking to the menus too.
    
    Change-Id: I1ba2a68c7d410041b6710f598a7c7fc60511ffee
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86371
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 55dd7b409..a29412c51 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -496,6 +496,7 @@ L.Control.Menubar = L.Control.extend({
 			]},
 			{name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 'menu', menu: [
 				{uno: '.uno:ControlCodes'},
+				{uno: '.uno:SpellOnline'},
 				{name: _UNO('.uno:ShowResolvedAnnotations', 'text'), id: 'showresolved', type: 'action'},
 			]
 			},
@@ -542,6 +543,7 @@ L.Control.Menubar = L.Control.extend({
 				{name: _UNO('.uno:DeleteSlide', 'presentation'), id: 'deletepage', type: 'action'}]
 			},
 			{name: _UNO('.uno:FullScreen', 'presentation'), id: 'fullscreen', type: 'action', mobileapp: false},
+			{uno: '.uno:SpellOnline'},
 			{name: _('Fullscreen presentation'), id: 'fullscreen-presentation', type: 'action'},
 			{name: _('About'), id: 'about', type: 'action'},
 		],
@@ -603,6 +605,7 @@ L.Control.Menubar = L.Control.extend({
 					{uno: '.uno:HideDetail'},
 					{uno: '.uno:ShowDetail'}]}
 			]},
+			{uno: '.uno:SpellOnline'},
 			{name: _UNO('.uno:FullScreen', 'spreadsheet'), id: 'fullscreen', type: 'action', mobileapp: false},
 			{name: _('About'), id: 'about', type: 'action'},
 		],
@@ -657,6 +660,9 @@ L.Control.Menubar = L.Control.extend({
 					{type: 'separator'},
 					{name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
 					{name: _UNO('.uno:ShapesMenu'), id: 'insertshape', type: 'action'},
+					{uno: '.uno:InsertCurrentDate'},
+					{uno: '.uno:InsertCurrentTime'},
+					// other fields need EditEngine context & can't be disabled in the menu.
 				]
 			},
 			presentation : {
@@ -667,6 +673,17 @@ L.Control.Menubar = L.Control.extend({
 					{name: _UNO('.uno:TableMenu'), id: 'inserttable', type: 'action'},
 					{name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
 					{name: _UNO('.uno:ShapesMenu'), id: 'insertshape', type: 'action'},
+					{name: _UNO('.uno:InsertField', 'text'), type: 'menu', menu: [
+						{uno: '.uno:InsertDateFieldFix'},
+						{uno: '.uno:InsertDateFieldVar'},
+						{uno: '.uno:InsertTimeFieldFix'},
+						{uno: '.uno:InsertTimeFieldVar'},
+						{type: 'separator'},
+						{uno: '.uno:InsertSlideField'},
+						{uno: '.uno:InsertSlideTitleField'},
+						{uno: '.uno:InsertSlidesField'},
+						{uno: '.uno:InsertFileField'},
+					]},
 				]
 			}
 		},
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index a66de830f..37ca25205 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -144,10 +144,18 @@ var unoCommandsArray = {
 	InsertColumnsAfter:{presentation:{menu:_('Insert Column After'),},spreadsheet:{context:_('Insert Columns ~After'),menu:_('Columns ~After'),},text:{menu:_('Columns ~After'),},},
 	InsertColumnsBefore:{presentation:{menu:_('Insert Column Before'),},spreadsheet:{context:_('Insert Columns ~Before'),menu:_('Columns ~Before'),},text:{menu:_('Columns ~Before'),},},
 	InsertColumnsMenu:{spreadsheet:{menu:_('Insert Co~lumns'),},},
+	InsertCurrentDate:{spreadsheet:{menu:_('~Date'),},},
+	InsertCurrentTime:{spreadsheet:{menu:_('~Time'),},},
 	InsertDataLabel:{global:{menu:_('Insert Single Data Label'),},},
 	InsertDateField:{text:{menu:_('~Date'),},},
+	InsertDateFieldFix:{presentation:{menu:_('~Date (fixed)'),},},
+	InsertDateFieldVar:{presentation:{menu:_('Dat~e (variable)'),},},
 	InsertEndnote:{text:{menu:_('~Endnote'),},},
 	InsertField:{text:{menu:_('~More Fields...'),},},
+	InsertFieldDateVariable:{spreadsheet:{menu:_('Date'),},},
+	InsertFieldDocTitle:{spreadsheet:{menu:_('Document Title'),},},
+	InsertFieldSheet:{spreadsheet:{menu:_('Sheet Name'),},},
+	InsertFileField:{presentation:{menu:_('~File Name'),},},
 	InsertFootnote:{text:{menu:_('~Footnote'),},},
 	InsertGraphic:{global:{context:_('Insert Image...'),menu:_('~Image...'),},},
 	InsertHardHyphen:{global:{menu:_('Non-br~eaking hyphen'),},},
@@ -175,9 +183,14 @@ var unoCommandsArray = {
 	InsertRowsMenu:{spreadsheet:{menu:_('Insert ~Rows'),},},
 	InsertSection:{text:{menu:_('Se~ction...'),},},
 	InsertSlide:{presentation:{menu:_('~New Slide'),},},
+	InsertSlideField:{presentation:{menu:_('~Slide Number'),},},
+	InsertSlideTitleField:{presentation:{menu:_('Slide Tit~le'),},},
+	InsertSlidesField:{presentation:{menu:_('Slide ~Count'),},},
 	InsertSoftHyphen:{global:{menu:_('S~oft hyphen'),},},
 	InsertSymbol:{global:{context:_('Insert Special Character'),menu:_('S~pecial Character...'),},},
 	InsertTimeField:{global:{menu:_('Time Field'),},text:{menu:_('~Time'),},},
+	InsertTimeFieldFix:{presentation:{menu:_('~Time (fixed)'),},},
+	InsertTimeFieldVar:{presentation:{menu:_('T~ime (variable)'),},},
 	InsertTitleField:{text:{menu:_('T~itle'),},},
 	InsertTitles:{global:{menu:_('Insert Titles...'),},},
 	InsertTopicField:{text:{menu:_('~Subject'),},},