[Libreoffice-commits] online.git: Branch 'feature/jsdialogs' - 5 commits - loleaflet/src

Szymon KÅ‚os (via logerrit) logerrit at kemper.freedesktop.org
Wed May 6 08:21:34 UTC 2020


 loleaflet/src/control/Control.Menubar.js |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 2b03a907c77ae9e8baea532d8b4a183b4cd88525
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed May 6 10:20:37 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed May 6 10:20:37 2020 +0200

    Add spell check dialog in mobile menu
    
    Change-Id: I926025cdda2658865dcdb417ea4f030b325ff685

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 3e71a3973..93a5163c4 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -505,6 +505,7 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:SelectAll'}
 			]},
 			{name: _('Search'), id: 'searchdialog', uno: '.uno:SearchDialog'},
+			{uno: '.uno:SpellingAndGrammarDialog'},
 			{uno: '.uno:WordCountDialog'},
 			{name: _UNO('.uno:ChangesMenu', 'text'), id: 'changesmenu', type: 'menu', menu: [
 				{uno: '.uno:TrackChanges'},
commit 949335c79162273d76a39fc6d5f1a360d47ecc5e
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed May 6 10:18:30 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed May 6 10:18:30 2020 +0200

    Add data validation dialog in menu
    
    Change-Id: I8887eac359f87fa2fe59b29f10a5fe9804bf33b9

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index c2ed5e485..3e71a3973 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -620,6 +620,8 @@ L.Control.Menubar = L.Control.extend({
 					{uno: '.uno:DeleteColumnbreak'}]}
 			]},
 			{name: _UNO('.uno:DataMenu', 'spreadsheet'), id: 'datamenu', type: 'menu', menu: [
+				{uno: '.uno:Validation'},
+				{type: 'separator'},
 				{uno: '.uno:DataSort'},
 				{uno: '.uno:SortAscending'},
 				{uno: '.uno:SortDescending'},
commit f51ef277271f80d4f8f50ffc8371cfc7fa87f661
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed May 6 10:15:23 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed May 6 10:15:23 2020 +0200

    Add watermark dialog in menu
    
    Change-Id: I76054a101c8d45f46761bbc7b70d4939a48acd30

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index ca78d334c..c2ed5e485 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -517,7 +517,8 @@ L.Control.Menubar = L.Control.extend({
 			]},
 			{name: _('Page Setup'), id: 'pagesetup', type: 'menu', menu: [
 				{name: _('Portrait'), id: 'setportrait', uno: '.uno:ToggleOrientation'},
-				{name: _('Landscape'), id: 'setlandscape', uno: '.uno:ToggleOrientation'}
+				{name: _('Landscape'), id: 'setlandscape', uno: '.uno:ToggleOrientation'},
+				{uno: '.uno:Watermark'}
 			]},
 			{name: _UNO('.uno:ViewMenu', 'text'), id: 'view', type: 'menu', menu: [
 				{uno: '.uno:ControlCodes'},
commit 22b050d8ac59ee06eab92ad945ff784cc1224dc3
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed May 6 10:13:40 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed May 6 10:13:40 2020 +0200

    Add word count dialog in menu
    
    Change-Id: I1417ac3b261bbd9ce7411c5f4bb37e3093ee88bf

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 1575928d0..ca78d334c 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -505,6 +505,7 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:SelectAll'}
 			]},
 			{name: _('Search'), id: 'searchdialog', uno: '.uno:SearchDialog'},
+			{uno: '.uno:WordCountDialog'},
 			{name: _UNO('.uno:ChangesMenu', 'text'), id: 'changesmenu', type: 'menu', menu: [
 				{uno: '.uno:TrackChanges'},
 				{uno: '.uno:ShowTrackedChanges'},
commit 22e339e851bf62dbab11165c2aaecbc865188e8a
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Wed May 6 10:12:52 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Wed May 6 10:12:52 2020 +0200

    Add find & replace dialog in menu
    
    Change-Id: I4cf7f773e46d39fac521f607df4db6922a3c70bf

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 9649055af..1575928d0 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -504,7 +504,7 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:Paste'},
 				{uno: '.uno:SelectAll'}
 			]},
-			{name: _('Search'), id: 'searchdialog', type: 'action'},
+			{name: _('Search'), id: 'searchdialog', uno: '.uno:SearchDialog'},
 			{name: _UNO('.uno:ChangesMenu', 'text'), id: 'changesmenu', type: 'menu', menu: [
 				{uno: '.uno:TrackChanges'},
 				{uno: '.uno:ShowTrackedChanges'},
@@ -552,7 +552,7 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:Paste'},
 				{uno: '.uno:SelectAll'}
 			]},
-			{name: _('Search'), id: 'searchdialog', type: 'action'},
+			{name: _('Search'), id: 'searchdialog', uno: '.uno:SearchDialog'},
 			{name: _UNO('.uno:TableMenu', 'text'/*HACK should be 'presentation', but not in xcu*/), id: 'tablemenu', type: 'menu', menu: [
 				{uno: '.uno:InsertRowsBefore'},
 				{uno: '.uno:InsertRowsAfter'},
@@ -599,7 +599,7 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:Paste'},
 				{uno: '.uno:SelectAll'}
 			]},
-			{name: _('Search'), id: 'searchdialog', type: 'action'},
+			{name: _('Search'), id: 'searchdialog', uno: '.uno:SearchDialog'},
 			{name: _UNO('.uno:SheetMenu', 'spreadsheet'), id: 'sheetmenu', type: 'menu', menu: [
 				{name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), id: 'insertrowsmenu', type: 'menu', menu: [
 					{uno: '.uno:InsertRowsBefore'},
@@ -1221,11 +1221,6 @@ L.Control.Menubar = L.Control.extend({
 			}
 		} else if (id === 'repair') {
 			this._map._socket.sendMessage('commandvalues command=.uno:DocumentRepair');
-		} else if (id === 'searchdialog') {
-			$('#toolbar-down').hide();
-			$('#toolbar-search').show();
-			$('#mobile-edit-button').hide();
-			L.DomUtil.get('search-input').focus();
 		} else if (id === 'inserttextbox') {
 			this._map.sendUnoCommand('.uno:Text?CreateDirectly:bool=true');
 		} else if (id === 'insertslidefield') {


More information about the Libreoffice-commits mailing list