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

[Szymon KÅ‚os (via logerrit)]

 loleaflet/src/control/Control.NotebookbarBuilder.js |   65 +++-----------------
 1 file changed, 10 insertions(+), 55 deletions(-)

New commits:
commit 66582a39342a98c3ed0065da6676a28087a5fe0e
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Aug 4 08:55:11 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Tue Aug 4 09:29:58 2020 +0200

    notebookbar: remove unsupported items from hamburger menu
    
    Change-Id: I64cd0f66483f6756ad822441c498197ae603a561
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/100039
    Tested-by: Jenkins
    Tested-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.NotebookbarBuilder.js b/loleaflet/src/control/Control.NotebookbarBuilder.js
index f78570ea4..cd9fae8f1 100644
--- a/loleaflet/src/control/Control.NotebookbarBuilder.js
+++ b/loleaflet/src/control/Control.NotebookbarBuilder.js
@@ -587,46 +587,23 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
 			],
 			spreadsheet: [
 				{name: _('Menu'), type: 'menu', menu: [
-					{name: _UNO('.uno:FullScreen', 'text'), id: 'fullscreen', type: 'action'},
-					{name: _('Show Ruler'), id: 'showruler', type: 'action'},
+					{name: _UNO('.uno:FullScreen', 'spreadsheet'), id: 'fullscreen', type: 'action'},
 					{type: 'separator'},
-					{name: _UNO('.uno:ChangesMenu', 'text'), id: 'changesmenu', type: 'menu', menu: [
-						{uno: '.uno:TrackChanges'},
-						{uno: '.uno:ShowTrackedChanges'},
-						{type: 'separator'},
-						{uno: '.uno:AcceptTrackedChanges'},
-						{uno: '.uno:AcceptAllTrackedChanges'},
-						{uno: '.uno:RejectAllTrackedChanges'},
-						{uno: '.uno:PreviousTrackedChange'},
-						{uno: '.uno:NextTrackedChange'}
-					]},
 					{uno: '.uno:SearchDialog'},
 					{type: 'separator'},
 					{name: _('Repair'), id: 'repair',  type: 'action'},
-					{name: _UNO('.uno:ToolsMenu', 'text'), id: 'tools', type: 'menu', menu: [
-						{uno: '.uno:SpellingAndGrammarDialog'},
+					{name: _UNO('.uno:ToolsMenu', 'spreadsheet'), id: 'tools', type: 'menu', menu: [
+						{uno: '.uno:SpellDialog'},
 						{uno: '.uno:SpellOnline'},
-						{uno: '.uno:ThesaurusDialog'},
 						{name: _UNO('.uno:LanguageMenu'), type: 'menu', menu: [
-							{name: _UNO('.uno:SetLanguageSelectionMenu', 'text'), type: 'menu', menu: [
-								{name: _('None (Do not check spelling)'), id: 'noneselection', uno: '.uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE'}]},
-							{name: _UNO('.uno:SetLanguageParagraphMenu', 'text'), type: 'menu', menu: [
-								{name: _('None (Do not check spelling)'), id: 'noneparagraph', uno: '.uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE'}]},
-							{name: _UNO('.uno:SetLanguageAllTextMenu', 'text'), type: 'menu', menu: [
-								{name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
-						]},
-						{uno: '.uno:WordCountDialog'},
-						{uno: '.uno:LineNumberingDialog'},
-						{type: 'separator'},
-						{name: _UNO('.uno:AutoFormatMenu', 'text'), type: 'menu', menu: [
-							{uno: '.uno:OnlineAutoFormat'}]}
+							{name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]},
+						{uno: '.uno:GoalSeekDialog'}
 					]}
 				]}
 			],
 			presentation: [
 				{name: _('Menu'), type: 'menu', menu: [
-					{name: _UNO('.uno:FullScreen', 'text'), id: 'fullscreen', type: 'action'},
-					{name: _('Show Ruler'), id: 'showruler', type: 'action'},
+					{name: _UNO('.uno:FullScreen', 'presentation'), id: 'fullscreen', type: 'action'},
 					{type: 'separator'},
 					{uno: '.uno:SlideMasterPage'},
 					{type: 'separator'},
@@ -635,37 +612,15 @@ L.Control.NotebookbarBuilder = L.Control.JSDialogBuilder.extend({
 					{uno: '.uno:CustomAnimation'},
 					{uno: '.uno:MasterSlidesPanel'},
 					{type: 'separator'},
-					{name: _UNO('.uno:ChangesMenu', 'text'), id: 'changesmenu', type: 'menu', menu: [
-						{uno: '.uno:TrackChanges'},
-						{uno: '.uno:ShowTrackedChanges'},
-						{type: 'separator'},
-						{uno: '.uno:AcceptTrackedChanges'},
-						{uno: '.uno:AcceptAllTrackedChanges'},
-						{uno: '.uno:RejectAllTrackedChanges'},
-						{uno: '.uno:PreviousTrackedChange'},
-						{uno: '.uno:NextTrackedChange'}
-					]},
 					{uno: '.uno:SearchDialog'},
 					{type: 'separator'},
 					{name: _('Repair'), id: 'repair',  type: 'action'},
-					{name: _UNO('.uno:ToolsMenu', 'text'), id: 'tools', type: 'menu', menu: [
-						{uno: '.uno:SpellingAndGrammarDialog'},
+					{name: _UNO('.uno:ToolsMenu', 'presentation'), id: 'tools', type: 'menu', menu: [
+						{uno: '.uno:SpellDialog'},
 						{uno: '.uno:SpellOnline'},
-						{uno: '.uno:ThesaurusDialog'},
 						{name: _UNO('.uno:LanguageMenu'), type: 'menu', menu: [
-							{name: _UNO('.uno:SetLanguageSelectionMenu', 'text'), type: 'menu', menu: [
-								{name: _('None (Do not check spelling)'), id: 'noneselection', uno: '.uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE'}]},
-							{name: _UNO('.uno:SetLanguageParagraphMenu', 'text'), type: 'menu', menu: [
-								{name: _('None (Do not check spelling)'), id: 'noneparagraph', uno: '.uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE'}]},
-							{name: _UNO('.uno:SetLanguageAllTextMenu', 'text'), type: 'menu', menu: [
-								{name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
-						]},
-						{uno: '.uno:WordCountDialog'},
-						{uno: '.uno:LineNumberingDialog'},
-						{type: 'separator'},
-						{name: _UNO('.uno:AutoFormatMenu', 'text'), type: 'menu', menu: [
-							{uno: '.uno:OnlineAutoFormat'}]}
-					]}
+							{name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
+					]},
 				]}
 			]
 		};