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

[Pranav Kant]

 loleaflet/src/control/Control.Menubar.js |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

New commits:
commit 8c0e94c57a14af748a376056b634828d8fc87193
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Oct 31 04:01:32 2017 +0530

    lokdialog: Rename dialogs and distribute to appropriate places
    
    Change-Id: I1d92830dd77bbe77765aa44fb9044726b45f21a6

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 5cdfc69f..24054af5 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -41,9 +41,11 @@ L.Control.Menubar = L.Control.extend({
 					{name: _('Record'), type: 'unocommand', uno: '.uno:TrackChanges'},
 					{name: _('Show'), type: 'unocommand', uno: '.uno:ShowTrackedChanges'},
 					{type: 'separator'},
+					{name: _('Manage Changes...'), id: '.uno:AcceptTrackedChanges', type: 'dialog'},
 					{name: _('Previous'), type: 'unocommand', uno: '.uno:PreviousTrackedChange'},
 					{name: _('Next'), type: 'unocommand', uno: '.uno:NextTrackedChange'}
-				]}
+				]},
+				{name: _('ImageMap'), id: '.uno:ImageMapDialog', type: 'dialog'}
 			]},
 			{name: _('View'), id: 'view', type: 'menu', menu: [
 				{name: _('Full screen'), id: 'fullscreen', type: 'action'},
@@ -65,6 +67,7 @@ L.Control.Menubar = L.Control.extend({
 				{name: _('Page break'), type: 'unocommand', uno: '.uno:InsertPageBreak'},
 				{name: _('Column break'), type: 'unocommand', uno: '.uno:InsertColumnBreak'},
 				{type: 'separator'},
+				{name: _('Hyperlink'), id: '.uno:HyperlinkDialog', type: 'dialog'},
 				{name: _('Special character...'), id: 'specialcharacter', type: 'action'},
 				{name: _('Formatting mark'), type: 'menu', menu: [
 					{name: _('Non-breaking space'), type: 'unocommand', uno: '.uno:InsertNonBreakingSpace'},
@@ -73,7 +76,11 @@ L.Control.Menubar = L.Control.extend({
 					{name: _('No-width optional break'), type: 'unocommand', uno: '.uno:InsertZWSP'},
 					{name: _('No-width no break'), type: 'unocommand', uno: '.uno:InsertZWNBSP'},
 					{name: _('Left-to-right mark'), type: 'unocommand', uno: '.uno:InsertLRM'},
-					{name: _('Right-to-left mark'), type: 'unocommand', uno: '.uno:InsertRLM'}]}]
+					{name: _('Right-to-left mark'), type: 'unocommand', uno: '.uno:InsertRLM'}]},
+				{name: _('Field...'), id: '.uno:InsertField', type: 'dialog'},
+				{name: _('Index Entry...'), id: '.uno:InsertIndexesEntry', type: 'dialog'},
+				{name: _('Bibliography Entry...'), id: '.uno:InsertAuthoritiesEntry', type: 'dialog'}
+			]
 			},
 			{name: _('Format'), type: 'menu', menu: [
 				{name: _('Text'), type: 'menu', menu: [
@@ -173,6 +180,7 @@ L.Control.Menubar = L.Control.extend({
 					{name: _('Merge cells'), type: 'unocommand', uno: '.uno:MergeCells'}]
 			},
 			{name: _('Tools'), id: 'tools', type: 'menu', menu: [
+				{name: _('Spelling and Grammar'), id: '.uno:SpellingAndGrammarDialog', type: 'dialog'},
 				{name: _('Automatic spell checking'), type: 'unocommand', uno: '.uno:SpellOnline'},
 				{name: _('Language for selection'), type: 'menu', menu: [
 					{name: _('None (Do not check spelling)'), id: 'noneselection', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE'}]},
@@ -180,14 +188,7 @@ L.Control.Menubar = L.Control.extend({
 					{name: _('None (Do not check spelling)'), id: 'noneparagraph', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE'}]},
 				{name: _('Language for entire document'), type: 'menu', menu: [
 					{name: _('None (Do not check spelling)'), id: 'nonelanguage', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]},
-				{name: _('Search Dialog'), id: '.uno:SearchDialog', type: 'dialog'},
-				{name: _('Accept/Reject changes'), id: '.uno:AcceptTrackedChanges', type: 'dialog'},
-				{name: _('Insert Field'), id: '.uno:InsertField', type: 'dialog'},
-				{name: _('Image Map Dialog'), id: '.uno:ImageMapDialog', type: 'dialog'},
-				{name: _('Hyperlink Dialog'), id: '.uno:HyperlinkDialog', type: 'dialog'},
-				{name: _('Spelling and Grammar'), id: '.uno:SpellingAndGrammarDialog', type: 'dialog'},
-				{name: _('Insert Indexes Entry'), id: '.uno:InsertIndexesEntry', type: 'dialog'},
-				{name: _('Insert Authority Entry'), id: '.uno:InsertAuthoritiesEntry', type: 'dialog'},
+				{name: _('Find & replace Dialog'), id: '.uno:SearchDialog', type: 'dialog'},
 				{name: _('Word count'), id: '.uno:WordCountDialog', type: 'dialog'}
 			]},
 			{name: _('Help'), id: 'help', type: 'menu', menu: [