loleaflet/src/control/Control.Menubar.js |  358 ++++++++++++++++---------------
 1 file changed, 191 insertions(+), 167 deletions(-)

New commits:
commit b35ac4cbbf0cf27d6a03437710a6921a46648b36
Author: Andras Timar <andras.ti...@collabora.com>
Date:   Mon Nov 14 14:20:03 2016 +0100

    loleaflet: Control.Menubar.js indentation fixes

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 4720ed4..e854d5b 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -7,29 +7,33 @@ L.Control.Menubar = L.Control.extend({
        // TODO: Some mechanism to stop the need to copy duplicate menus (eg. 
Help)
        options: {
                text:  [
-                       {name: _('File'), type: 'menu', menu: [{name: 
_('Save'), id: 'save', type: 'unocommand', uno: '.uno:Save'},
-                                                                               
                   {name: _('Print'), id: 'print', type: 'action'},
-                                                                               
                   {name: _('See revision history'), id: 'rev-history', type: 
'action'},
-                                                              {name: 
_('Download as'), id: 'downloadas', type: 'menu', menu: [{name: _('PDF Document 
(.pdf)'), id: 'downloadas-pdf', type: 'action'},
-                                                                               
                   {name: _('ODF text document (.odt)'), id: 'downloadas-odt', 
type: 'action'},
-                                                                               
                   {name: _('Microsoft Word 2003 (.doc)'), id: 
'downloadas-doc', type: 'action'},
-                                                                               
                   {name: _('Microsoft Word (.docx)'), id: 'downloadas-docx', 
type: 'action'}]}]
+                       {name: _('File'), type: 'menu', menu: [
+                               {name: _('Save'), id: 'save', type: 
'unocommand', uno: '.uno:Save'},
+                               {name: _('Print'), id: 'print', type: 'action'},
+                               {name: _('See revision history'), id: 
'rev-history', type: 'action'},
+                               {name: _('Download as'), id: 'downloadas', 
type: 'menu', menu: [
+                                       {name: _('PDF Document (.pdf)'), id: 
'downloadas-pdf', type: 'action'},
+                                       {name: _('ODF text document (.odt)'), 
id: 'downloadas-odt', type: 'action'},
+                                       {name: _('Microsoft Word 2003 (.doc)'), 
id: 'downloadas-doc', type: 'action'},
+                                       {name: _('Microsoft Word (.docx)'), id: 
'downloadas-docx', type: 'action'}]}]
                        },
-                       {name: _('Edit'), type: 'menu', menu: [{name: 
_('Repair'), id: 'repair',  type: 'action'},
-                                                                               
                {name: _('Undo'), type: 'unocommand', uno: '.uno:Undo'},
-                                                                               
                {name: _('Redo'), type: 'unocommand', uno: '.uno:Redo'},
-                                                                               
                {type: 'separator'},
-                                                                               
                {name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
-                                                                               
                {name: _('Copy'), type: 'unocommand', uno: '.uno:Copy'},
-                                                                               
                {name: _('Paste'), type: 'unocommand', uno: '.uno:Paste'},
-                                                                               
                {type: 'separator'},
-                                                                               
                {name: _('Select all'), type: 'unocommand', uno: 
'.uno:SelectAll'}]
+                       {name: _('Edit'), type: 'menu', menu: [
+                               {name: _('Repair'), id: 'repair',  type: 
'action'},
+                               {name: _('Undo'), type: 'unocommand', uno: 
'.uno:Undo'},
+                               {name: _('Redo'), type: 'unocommand', uno: 
'.uno:Redo'},
+                               {type: 'separator'},
+                               {name: _('Cut'), type: 'unocommand', uno: 
'.uno:Cut'},
+                               {name: _('Copy'), type: 'unocommand', uno: 
'.uno:Copy'},
+                               {name: _('Paste'), type: 'unocommand', uno: 
'.uno:Paste'},
+                               {type: 'separator'},
+                               {name: _('Select all'), type: 'unocommand', 
uno: '.uno:SelectAll'}]
                        },
-                       {name: _('View'), type: 'menu', menu: [{name: _('Full 
screen'), id: 'fullscreen', type: 'action'},
-                                                                               
                {type: 'separator'},
-                                                                               
                {name: _('Zoom in'), id: 'zoomin', type: 'action'},
-                                                                               
                {name: _('Zoom out'), id: 'zoomout', type: 'action'},
-                                                                               
                {name: _('Reset zoom'), id: 'zoomreset', type: 'action'}]
+                       {name: _('View'), type: 'menu', menu: [
+                               {name: _('Full screen'), id: 'fullscreen', 
type: 'action'},
+                               {type: 'separator'},
+                               {name: _('Zoom in'), id: 'zoomin', type: 
'action'},
+                               {name: _('Zoom out'), id: 'zoomout', type: 
'action'},
+                               {name: _('Reset zoom'), id: 'zoomreset', type: 
'action'}]
                        },
                        {name: _('Insert'), type: 'menu', menu: [
                                {name: _('Image'), id: 'insertgraphic', type: 
'action'},
@@ -43,180 +47,199 @@ L.Control.Menubar = L.Control.extend({
                                {type: 'separator'},
                                {name: _('Special character...'), id: 
'specialcharacter', type: 'action'},
                                {name: _('Formatting mark'), type: 'menu', 
menu: [
-                                               {name: _('Non-breaking space'), 
type: 'unocommand', uno: '.uno:InsertNonBreakingSpace'},
-                                               {name: _('Non-breaking 
hyphen'), type: 'unocommand', uno: '.uno:InsertHardHyphen'},
-                                               {name: _('Soft hyphen'), type: 
'unocommand', uno: '.uno:InsertSoftHyphen'},
-                                               {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: _('Non-breaking space'), type: 
'unocommand', uno: '.uno:InsertNonBreakingSpace'},
+                                       {name: _('Non-breaking hyphen'), type: 
'unocommand', uno: '.uno:InsertHardHyphen'},
+                                       {name: _('Soft hyphen'), type: 
'unocommand', uno: '.uno:InsertSoftHyphen'},
+                                       {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: _('Format'), type: 'menu', menu: [
                                {name: _('Text'), type: 'menu', menu: [
-                                               {name: _('Bold'), type: 
'unocommand', uno: '.uno:Bold'},
-                                               {name: _('Italic'), type: 
'unocommand', uno: '.uno:Italic'},
-                                               {name: _('Underline'), type: 
'unocommand', uno: '.uno:Underline'},
-                                               {name: _('Double underline'), 
type: 'unocommand', uno: '.uno:UnderlineDouble'},
-                                               {name: _('Strikethrough'), 
type: 'unocommand', uno: '.uno:Strikeout'},
-                                               {name: _('Overline'), type: 
'unocommand', uno: '.uno:Overline'},
-                                               {type: 'separator'},
-                                               {name: _('Superscript'), type: 
'unocommand', uno: '.uno:SuperScript'},
-                                               {name: _('Subscript'), type: 
'unocommand', uno: '.uno:SubScript'},
-                                               {name: _('ꜱᴍᴀʟʟ 
ᴄᴀᴘꜱ'), type: 'unocommand', uno: '.uno:SmallCaps'},
-                                               {type: 'separator'},
-                                               {name: _('Shadow'), type: 
'unocommand', uno: '.uno:Shadowed'},
-                                               {name: _('Outline'), type: 
'unocommand', uno: '.uno:OutlineFont'},
-                                               {type: 'separator'},
-                                               {name: _('Increase size'), 
type: 'unocommand', uno: '.uno:Grow'},
-                                               {name: _('Decrease size'), 
type: 'unocommand', uno: '.uno:Shrink'},
-                                               {type: 'separator'},
-                                               {name: _('UPPERCASE'), type: 
'unocommand', uno: '.uno:ChangeCaseToUpper'},
-                                               {name: _('lowercase'), type: 
'unocommand', uno: '.uno:ChangeCaseToLower'},
-                                               {name: _('Cycle case'), type: 
'unocommand', uno: '.uno:ChangeCaseRotateCase'},
-                                               {type: 'separator'},
-                                               {name: _('Sentence case'), 
type: 'unocommand', uno: '.uno:ChangeCaseToSentenceCase'},
-                                               {name: _('Capitalize Every 
Word'), type: 'unocommand', uno: '.uno:ChangeCaseToTitleCase'},
-                                               {name: _('tOGGLE cASE'), type: 
'unocommand', uno: '.uno:ChangeCaseToToggleCase'}]},
+                                       {name: _('Bold'), type: 'unocommand', 
uno: '.uno:Bold'},
+                                       {name: _('Italic'), type: 'unocommand', 
uno: '.uno:Italic'},
+                                       {name: _('Underline'), type: 
'unocommand', uno: '.uno:Underline'},
+                                       {name: _('Double underline'), type: 
'unocommand', uno: '.uno:UnderlineDouble'},
+                                       {name: _('Strikethrough'), type: 
'unocommand', uno: '.uno:Strikeout'},
+                                       {name: _('Overline'), type: 
'unocommand', uno: '.uno:Overline'},
+                                       {type: 'separator'},
+                                       {name: _('Superscript'), type: 
'unocommand', uno: '.uno:SuperScript'},
+                                       {name: _('Subscript'), type: 
'unocommand', uno: '.uno:SubScript'},
+                                       {name: _('ꜱᴍᴀʟʟ ᴄᴀᴘꜱ'), 
type: 'unocommand', uno: '.uno:SmallCaps'},
+                                       {type: 'separator'},
+                                       {name: _('Shadow'), type: 'unocommand', 
uno: '.uno:Shadowed'},
+                                       {name: _('Outline'), type: 
'unocommand', uno: '.uno:OutlineFont'},
+                                       {type: 'separator'},
+                                       {name: _('Increase size'), type: 
'unocommand', uno: '.uno:Grow'},
+                                       {name: _('Decrease size'), type: 
'unocommand', uno: '.uno:Shrink'},
+                                       {type: 'separator'},
+                                       {name: _('UPPERCASE'), type: 
'unocommand', uno: '.uno:ChangeCaseToUpper'},
+                                       {name: _('lowercase'), type: 
'unocommand', uno: '.uno:ChangeCaseToLower'},
+                                       {name: _('Cycle case'), type: 
'unocommand', uno: '.uno:ChangeCaseRotateCase'},
+                                       {type: 'separator'},
+                                       {name: _('Sentence case'), type: 
'unocommand', uno: '.uno:ChangeCaseToSentenceCase'},
+                                       {name: _('Capitalize Every Word'), 
type: 'unocommand', uno: '.uno:ChangeCaseToTitleCase'},
+                                       {name: _('tOGGLE cASE'), type: 
'unocommand', uno: '.uno:ChangeCaseToToggleCase'}]},
                                {name: _('Text orientation'), type: 'menu', 
menu: [
-                                               {name: _('Set paragraph 
left-to-right'), type: 'unocommand', uno: '.uno:ParaLeftToRight'},
-                                               {name: _('Set paragraph 
right-to-left'), type: 'unocommand', uno: '.uno:ParaRightToLeft'}]},
+                                       {name: _('Set paragraph 
left-to-right'), type: 'unocommand', uno: '.uno:ParaLeftToRight'},
+                                       {name: _('Set paragraph 
right-to-left'), type: 'unocommand', uno: '.uno:ParaRightToLeft'}]},
                                {name: _('Spacing'), type: 'menu', menu: [
-                                               {name: _('Line spacing: 1'), 
type: 'unocommand', uno: '.uno:SpacePara1'},
-                                               {name: _('Line spacing: 1.5'), 
type: 'unocommand', uno: '.uno:SpacePara15'},
-                                               {name: _('Line spacing: 2'), 
type: 'unocommand', uno: '.uno:SpacePara2'},
-                                               {type: 'separator'},
-                                               {name: _('Increase paragraph 
spacing'), type: 'unocommand', uno: '.uno:ParaspaceIncrease'},
-                                               {name: _('Decrease paragraph 
spacing'), type: 'unocommand', uno: '.uno:ParaspaceDecrease'},
-                                               {type: 'separator'},
-                                               {name: _('Increase indent'), 
type: 'unocommand', uno: '.uno:IncrementIndent'},
-                                               {name: _('Decrease indent'), 
type: 'unocommand', uno: '.uno:DecrementIndent'}]},
+                                       {name: _('Line spacing: 1'), type: 
'unocommand', uno: '.uno:SpacePara1'},
+                                       {name: _('Line spacing: 1.5'), type: 
'unocommand', uno: '.uno:SpacePara15'},
+                                       {name: _('Line spacing: 2'), type: 
'unocommand', uno: '.uno:SpacePara2'},
+                                       {type: 'separator'},
+                                       {name: _('Increase paragraph spacing'), 
type: 'unocommand', uno: '.uno:ParaspaceIncrease'},
+                                       {name: _('Decrease paragraph spacing'), 
type: 'unocommand', uno: '.uno:ParaspaceDecrease'},
+                                       {type: 'separator'},
+                                       {name: _('Increase indent'), type: 
'unocommand', uno: '.uno:IncrementIndent'},
+                                       {name: _('Decrease indent'), type: 
'unocommand', uno: '.uno:DecrementIndent'}]},
                                {name: _('Align'), type: 'menu', menu: [
-                                               {name: _('Left'), type: 
'unocommand', uno: '.uno:CommonAlignLeft'},
-                                               {name: _('Centered'), type: 
'unocommand', uno: '.uno:CommonAlignHorizontalCenter'},
-                                               {name: _('Right'), type: 
'unocommand', uno: '.uno:CommonAlignRight'},
-                                               {name: _('Justified'), type: 
'unocommand', uno: '.uno:CommonAlignJustified'},
-                                               {type: 'separator'},
-                                               {name: _('Top'), type: 
'unocommand', uno: '.uno:CommonAlignTop'},
-                                               {name: _('Center'), type: 
'unocommand', uno: '.uno:CommonAlignVerticalcenter'},
-                                               {name: _('Bottom'), type: 
'unocommand', uno: '.uno:CommonAlignBottom'}]},
+                                       {name: _('Left'), type: 'unocommand', 
uno: '.uno:CommonAlignLeft'},
+                                       {name: _('Centered'), type: 
'unocommand', uno: '.uno:CommonAlignHorizontalCenter'},
+                                       {name: _('Right'), type: 'unocommand', 
uno: '.uno:CommonAlignRight'},
+                                       {name: _('Justified'), type: 
'unocommand', uno: '.uno:CommonAlignJustified'},
+                                       {type: 'separator'},
+                                       {name: _('Top'), type: 'unocommand', 
uno: '.uno:CommonAlignTop'},
+                                       {name: _('Center'), type: 'unocommand', 
uno: '.uno:CommonAlignVerticalcenter'},
+                                       {name: _('Bottom'), type: 'unocommand', 
uno: '.uno:CommonAlignBottom'}]},
                                {name: _('Lists'), type: 'menu', menu: [
-                                               {name: _('Bullets on/off'), 
type: 'unocommand', uno: '.uno:DefaultBullet'},
-                                               {name: _('Numbering on/off'), 
type: 'unocommand', uno: '.uno:DefaultNumbering'},
-                                               {type: 'separator'},
-                                               {name: _('Demote one level'), 
type: 'unocommand', uno: '.uno:DecrementLevel'},
-                                               {name: _('Promote one level'), 
type: 'unocommand', uno: '.uno:IncrementLevel'},
-                                               {name: _('Demote one level with 
subpoints'), type: 'unocommand', uno: '.uno:DecrementSublevels'},
-                                               {name: _('Promote one level 
with subpoints'), type: 'unocommand', uno: '.uno:IncrementSubLevels'},
-                                               {type: 'separator'},
-                                               {name: _('Move down'), type: 
'unocommand', uno: '.uno:MoveDown'},
-                                               {name: _('Move up'), type: 
'unocommand', uno: '.uno:MoveUp'},
-                                               {name: _('Move down with 
subpoints'), type: 'unocommand', uno: '.uno:MoveDownSubItems'},
-                                               {name: _('Move up with 
subpoints'), type: 'unocommand', uno: '.uno:MoveUpSubItems'},
-                                               {type: 'separator'},
-                                               {name: _('Insert unnumbered 
entry'), type: 'unocommand', uno: '.uno:InsertNeutralParagraph'},
-                                               {name: _('Restart numbering'), 
type: 'unocommand', uno: '.uno:NumberingStart'},
-                                               {type: 'separator'},
-                                               {name: _('To next paragraph in 
level'), type: 'unocommand', uno: '.uno:JumpDownThisLevel'},
-                                               {name: _('To previous paragraph 
in level'), type: 'unocommand', uno: '.uno:JumpUpThisLevel'},
-                                               {name: _('Continue previous 
numbering'), type: 'unocommand', uno: '.uno:ContinueNumbering'}]},
+                                       {name: _('Bullets on/off'), type: 
'unocommand', uno: '.uno:DefaultBullet'},
+                                       {name: _('Numbering on/off'), type: 
'unocommand', uno: '.uno:DefaultNumbering'},
+                                       {type: 'separator'},
+                                       {name: _('Demote one level'), type: 
'unocommand', uno: '.uno:DecrementLevel'},
+                                       {name: _('Promote one level'), type: 
'unocommand', uno: '.uno:IncrementLevel'},
+                                       {name: _('Demote one level with 
subpoints'), type: 'unocommand', uno: '.uno:DecrementSublevels'},
+                                       {name: _('Promote one level with 
subpoints'), type: 'unocommand', uno: '.uno:IncrementSubLevels'},
+                                       {type: 'separator'},
+                                       {name: _('Move down'), type: 
'unocommand', uno: '.uno:MoveDown'},
+                                       {name: _('Move up'), type: 
'unocommand', uno: '.uno:MoveUp'},
+                                       {name: _('Move down with subpoints'), 
type: 'unocommand', uno: '.uno:MoveDownSubItems'},
+                                       {name: _('Move up with subpoints'), 
type: 'unocommand', uno: '.uno:MoveUpSubItems'},
+                                       {type: 'separator'},
+                                       {name: _('Insert unnumbered entry'), 
type: 'unocommand', uno: '.uno:InsertNeutralParagraph'},
+                                       {name: _('Restart numbering'), type: 
'unocommand', uno: '.uno:NumberingStart'},
+                                       {type: 'separator'},
+                                       {name: _('To next paragraph in level'), 
type: 'unocommand', uno: '.uno:JumpDownThisLevel'},
+                                       {name: _('To previous paragraph in 
level'), type: 'unocommand', uno: '.uno:JumpUpThisLevel'},
+                                       {name: _('Continue previous 
numbering'), type: 'unocommand', uno: '.uno:ContinueNumbering'}]},
                                {name: _('Clear direct formatting'), type: 
'unocommand', uno: '.uno:ResetAttributes'},
                                {name: _('Page'), type: 'menu', menu: [
-                                               {name: 'A4, ' + _('Portrait'), 
type: 'action', id: 'a4portrait'},
-                                               {name: 'A4, ' + _('Landscape'), 
type: 'action', id: 'a4landscape'},
-                                               {name: 'A5, ' + _('Portrait'), 
type: 'action', id: 'a5portrait'},
-                                               {name: 'A5, ' + _('Landscape'), 
type: 'action', id: 'a5landscape'},
-                                               {name: 'Letter, ' + 
_('Portrait'), type: 'action', id: 'letterportrait'},
-                                               {name: 'Letter, ' + 
_('Landscape'), type: 'action', id: 'letterlandscape'},
-                                               {name: 'Legal, ' + 
_('Portrait'), type: 'action', id: 'legalportrait'},
-                                               {name: 'Legal, ' + 
_('Landscape'), type: 'action', id: 'legallandscape'}]}
-                       ]},
-                       {name: _('Tables'), type: 'menu', menu: [{name: 
_('Insert'), type: 'menu', menu: [{name: _('Rows before'), type: 'unocommand', 
uno: '.uno:InsertRowsBefore'},
-                                                                               
                                                                                
                {name: _('Rows after'), type: 'unocommand', uno: 
'.uno:InsertRowsAfter'},
-                                                                               
                                                                                
                {type: 'separator'},
-                                                                               
                                                                                
                {name: _('Columns left'), type: 'unocommand', uno: 
'.uno:InsertColumnsBefore'},
-                                                                               
                                                                                
                {name: _('Columns right'), type: 'unocommand', uno: 
'.uno:InsertColumnsAfter'}]},
-                                                                               
                  {name: _('Delete'), type: 'menu', menu: [{name: _('Rows'), 
type: 'unocommand', uno: '.uno:DeleteRows'},
-                                                                               
                                                                                
                {name: _('Columns'), type: 'unocommand', uno: 
'.uno:DeleteColumns'},
-                                                                               
                                                                                
                {name: _('Table'), type: 'unocommand', uno: 
'.uno:DeleteTable'}]},
-                                                                               
                  {name: _('Select'), type: 'menu', menu: [{name: _('Table'), 
type: 'unocommand', uno: '.uno:SelectTable'},
-                                                                               
                                                                                
                {name: _('Row'), type: 'unocommand', uno: '.uno:EntireRow'},
-                                                                               
                                                                                
                {name: _('Column'), type: 'unocommand', uno: 
'.uno:EntireColumn'},
-                                                                               
                                                                                
                {name: _('Cell'), type: 'unocommand', uno: '.uno:EntireCell'}]},
-                                                                               
                  {name: _('Merge cells'), type: 'unocommand', uno: 
'.uno:MergeCells'}]
+                                       {name: 'A4, ' + _('Portrait'), type: 
'action', id: 'a4portrait'},
+                                       {name: 'A4, ' + _('Landscape'), type: 
'action', id: 'a4landscape'},
+                                       {name: 'A5, ' + _('Portrait'), type: 
'action', id: 'a5portrait'},
+                                       {name: 'A5, ' + _('Landscape'), type: 
'action', id: 'a5landscape'},
+                                       {name: 'Letter, ' + _('Portrait'), 
type: 'action', id: 'letterportrait'},
+                                       {name: 'Letter, ' + _('Landscape'), 
type: 'action', id: 'letterlandscape'},
+                                       {name: 'Legal, ' + _('Portrait'), type: 
'action', id: 'legalportrait'},
+                                       {name: 'Legal, ' + _('Landscape'), 
type: 'action', id: 'legallandscape'}]}]
                        },
-                       {name: _('Help'), type: 'menu', menu: [{name: 
_('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
-                                                              {name: 
_('About'), id: 'about', type: 'action'}]
+                       {name: _('Tables'), type: 'menu', menu: [
+                               {name: _('Insert'), type: 'menu', menu: [
+                                       {name: _('Rows before'), type: 
'unocommand', uno: '.uno:InsertRowsBefore'},
+                                       {name: _('Rows after'), type: 
'unocommand', uno: '.uno:InsertRowsAfter'},
+                                       {type: 'separator'},
+                                       {name: _('Columns left'), type: 
'unocommand', uno: '.uno:InsertColumnsBefore'},
+                                       {name: _('Columns right'), type: 
'unocommand', uno: '.uno:InsertColumnsAfter'}]},
+                               {name: _('Delete'), type: 'menu', menu: [
+                                       {name: _('Rows'), type: 'unocommand', 
uno: '.uno:DeleteRows'},
+                                       {name: _('Columns'), type: 
'unocommand', uno: '.uno:DeleteColumns'},
+                                       {name: _('Table'), type: 'unocommand', 
uno: '.uno:DeleteTable'}]},
+                               {name: _('Select'), type: 'menu', menu: [
+                                       {name: _('Table'), type: 'unocommand', 
uno: '.uno:SelectTable'},
+                                       {name: _('Row'), type: 'unocommand', 
uno: '.uno:EntireRow'},
+                                       {name: _('Column'), type: 'unocommand', 
uno: '.uno:EntireColumn'},
+                                       {name: _('Cell'), type: 'unocommand', 
uno: '.uno:EntireCell'}]},
+                                       {name: _('Merge cells'), type: 
'unocommand', uno: '.uno:MergeCells'}]
+                       },
+                       {name: _('Help'), type: 'menu', menu: [
+                               {name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action'},
+                               {name: _('About'), id: 'about', type: 'action'}]
                        }
                ],
 
                presentation: [
-                       {name: _('File'), type: 'menu', menu: [{name: 
_('Save'), id: 'save', type: 'unocommand', uno: '.uno:Save'},
-                                                                               
                   {name: _('Print'), id: 'print', type: 'action'},
-                                                                               
                   {name: _('See revision history'), id: 'rev-history', type: 
'action'},
-                                                              {name: 
_('Download 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: _('Microsoft Powerpoint 2003 (.ppt)'), id: 
'downloadas-ppt', type: 'action'},
-                                                                               
                        {name: _('Microsoft Powerpoint (.pptx)'), id: 
'downloadas-pptx', type: 'action'}]}]
+                       {name: _('File'), type: 'menu', menu: [
+                               {name: _('Save'), id: 'save', type: 
'unocommand', uno: '.uno:Save'},
+                               {name: _('Print'), id: 'print', type: 'action'},
+                               {name: _('See revision history'), id: 
'rev-history', type: 'action'},
+                               {name: _('Download 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: _('Microsoft Powerpoint 2003 
(.ppt)'), id: 'downloadas-ppt', type: 'action'},
+                                       {name: _('Microsoft Powerpoint 
(.pptx)'), id: 'downloadas-pptx', type: 'action'}]}]
                        },
-                       {name: _('Edit'), type: 'menu', menu: [{name: 
_('Undo'), type: 'unocommand', uno: '.uno:Undo'},
-                                                                               
                {name: _('Redo'), type: 'unocommand', uno: '.uno:Redo'},
-                                                                               
                {type: 'separator'},
-                                                                               
                {name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
-                                                                               
                {name: _('Copy'), type: 'unocommand', uno: '.uno:Copy'},
-                                                                               
                {name: _('Paste'), type: 'unocommand', uno: '.uno:Paste'},
-                                                                               
                {type: 'separator'},
-                                                                               
                {name: _('Select all'), type: 'unocommand', uno: 
'.uno:SelectAll'}]
+                       {name: _('Edit'), type: 'menu', menu: [
+                               {name: _('Undo'), type: 'unocommand', uno: 
'.uno:Undo'},
+                               {name: _('Redo'), type: 'unocommand', uno: 
'.uno:Redo'},
+                               {type: 'separator'},
+                               {name: _('Cut'), type: 'unocommand', uno: 
'.uno:Cut'},
+                               {name: _('Copy'), type: 'unocommand', uno: 
'.uno:Copy'},
+                               {name: _('Paste'), type: 'unocommand', uno: 
'.uno:Paste'},
+                               {type: 'separator'},
+                               {name: _('Select all'), type: 'unocommand', 
uno: '.uno:SelectAll'}]
                        },
-                       {name: _('View'), type: 'menu', menu: [{name: _('Full 
screen'), id: 'fullscreen', type: 'action'},
-                                                                               
                {type: 'separator'},
-                                                                               
                {name: _('Zoom in'), id: 'zoomin', type: 'action'},
-                                                                               
                {name: _('Zoom out'), id: 'zoomout', type: 'action'},
-                                                                               
                {name: _('Reset zoom'), id: 'zoomreset', type: 'action'}]
+                       {name: _('View'), type: 'menu', menu: [
+                               {name: _('Full screen'), id: 'fullscreen', 
type: 'action'},
+                               {type: 'separator'},
+                               {name: _('Zoom in'), id: 'zoomin', type: 
'action'},
+                               {name: _('Zoom out'), id: 'zoomout', type: 
'action'},
+                               {name: _('Reset zoom'), id: 'zoomreset', type: 
'action'}]
                        },
                        {name: _('Insert'), type: 'menu', menu: [
                                {name: _('Image'), id: 'insertgraphic', type: 
'action'},
                                {type: 'separator'},
                                {name: _('Special character...'), id: 
'specialcharacter', type: 'action'}]
                        },
-                       {name: _('Tables'), type: 'menu', menu: [{name: 
_('Insert'), type: 'menu', menu: [{name: _('Rows before'), type: 'unocommand', 
uno: '.uno:InsertRowsBefore'},
-                                                                               
                                                                                
                {name: _('Rows after'), type: 'unocommand', uno: 
'.uno:InsertRowsAfter'},
-                                                                               
                                                                                
                {type: 'separator'},
-                                                                               
                                                                                
                {name: _('Columns left'), type: 'unocommand', uno: 
'.uno:InsertColumnsBefore'},
-                                                                               
                                                                                
                {name: _('Columns right'), type: 'unocommand', uno: 
'.uno:InsertColumnsAfter'}]},
-                                                                               
                  {name: _('Delete'), type: 'menu', menu: [{name: _('Rows'), 
type: 'unocommand', uno: '.uno:DeleteRows'},
-                                                                               
                                                                                
                {name: _('Columns'), type: 'unocommand', uno: 
'.uno:DeleteColumns'}]},
-                                                                               
                  {name: _('Merge cells'), type: 'unocommand', uno: 
'.uno:MergeCells'}]
+                       {name: _('Tables'), type: 'menu', menu: [
+                               {name: _('Insert'), type: 'menu', menu: [
+                                       {name: _('Rows before'), type: 
'unocommand', uno: '.uno:InsertRowsBefore'},
+                                       {name: _('Rows after'), type: 
'unocommand', uno: '.uno:InsertRowsAfter'},
+                                       {type: 'separator'},
+                                       {name: _('Columns left'), type: 
'unocommand', uno: '.uno:InsertColumnsBefore'},
+                                       {name: _('Columns right'), type: 
'unocommand', uno: '.uno:InsertColumnsAfter'}]},
+                               {name: _('Delete'), type: 'menu', menu: [
+                                       {name: _('Rows'), type: 'unocommand', 
uno: '.uno:DeleteRows'},
+                                       {name: _('Columns'), type: 
'unocommand', uno: '.uno:DeleteColumns'}]},
+                               {name: _('Merge cells'), type: 'unocommand', 
uno: '.uno:MergeCells'}]
                        },
-                       {name: _('Slide'), type: 'menu', menu: [{name: _('New 
slide'), id: 'insertpage', type: 'action'},
-                                                                               
                 {name: _('Duplicate slide'), id: 'duplicatepage', type: 
'action'},
-                                                                               
                 {name: _('Delete slide'), id: 'deletepage', type: 'action'},
-                                                                               
                 {type: 'separator'},
-                                                                               
                 {name: _('Fullscreen presentation'), id: 
'fullscreen-presentation', type: 'action'}]
+                       {name: _('Slide'), type: 'menu', menu: [
+                               {name: _('New slide'), id: 'insertpage', type: 
'action'},
+                               {name: _('Duplicate slide'), id: 
'duplicatepage', type: 'action'},
+                               {name: _('Delete slide'), id: 'deletepage', 
type: 'action'},
+                               {type: 'separator'},
+                               {name: _('Fullscreen presentation'), id: 
'fullscreen-presentation', type: 'action'}]
                        },
-                       {name: _('Help'), type: 'menu', menu: [{name: 
_('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
-                                                              {name: 
_('About'), id: 'about', type: 'action'}]
+                       {name: _('Help'), type: 'menu', menu: [
+                               {name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action'},
+                               {name: _('About'), id: 'about', type: 'action'}]
                        }
                ],
 
                spreadsheet: [
-                       {name: _('File'), type: 'menu', menu: [{name: 
_('Save'), id: 'save', type: 'unocommand', uno: '.uno:Save'},
-                                                                               
                   {name: _('Print'), id: 'print', type: 'action'},
-                                                                               
                   {name: _('See revision history'), id: 'rev-history', type: 
'action'},
-                                                              {name: 
_('Download 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: _('Microsoft Excel 2003 (.xls)'), id: 
'downloadas-xls', type: 'action'},
-                                                                               
                                                                                
                   {name: _('Microsoft Excel (.xlsx)'), id: 'downloadas-xlsx', 
type: 'action'}]}]
+                       {name: _('File'), type: 'menu', menu: [
+                               {name: _('Save'), id: 'save', type: 
'unocommand', uno: '.uno:Save'},
+                               {name: _('Print'), id: 'print', type: 'action'},
+                               {name: _('See revision history'), id: 
'rev-history', type: 'action'},
+                               {name: _('Download 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: _('Microsoft Excel 2003 
(.xls)'), id: 'downloadas-xls', type: 'action'},
+                                       {name: _('Microsoft Excel (.xlsx)'), 
id: 'downloadas-xlsx', type: 'action'}]}]
+                       },
+                       {name: _('Edit'), type: 'menu', menu: [
+                               {name: _('Undo'), type: 'unocommand', uno: 
'.uno:Undo'},
+                               {name: _('Redo'), type: 'unocommand', uno: 
'.uno:Redo'},
+                               {type: 'separator'},
+                               {name: _('Cut'), type: 'unocommand', uno: 
'.uno:Cut'},
+                               {name: _('Copy'), type: 'unocommand', uno: 
'.uno:Copy'},
+                               {name: _('Paste'), type: 'unocommand', uno: 
'.uno:Paste'},
+                               {type: 'separator'},
+                               {name: _('Select all'), type: 'unocommand', 
uno: '.uno:SelectAll'}]
                        },
-                       {name: _('Edit'), type: 'menu', menu: [{name: 
_('Undo'), type: 'unocommand', uno: '.uno:Undo'},
-                                                                               
                {name: _('Redo'), type: 'unocommand', uno: '.uno:Redo'},
-                                                                               
                {type: 'separator'},
-                                                                               
                {name: _('Cut'), type: 'unocommand', uno: '.uno:Cut'},
-                                                                               
                {name: _('Copy'), type: 'unocommand', uno: '.uno:Copy'},
-                                                                               
                {name: _('Paste'), type: 'unocommand', uno: '.uno:Paste'},
-                                                                               
                {type: 'separator'},
-                                                                               
                {name: _('Select all'), type: 'unocommand', uno: 
'.uno:SelectAll'}]
+                       {name: _('View'), type: 'menu', menu: [
+                               {name: _('Full screen'), id: 'fullscreen', 
type: 'action'}]
                        },
-                       {name: _('View'), type: 'menu', menu: [{name: _('Full 
screen'), id: 'fullscreen', type: 'action'}]},
                        {name: _('Insert'), type: 'menu', menu: [
                                {name: _('Image'), id: 'insertgraphic', type: 
'action'},
                                {name: _('Comment'), type: 'unocommand', uno: 
'.uno:InsertAnnotation'},
@@ -233,8 +256,9 @@ L.Control.Menubar = L.Control.extend({
                                {name: _('Delete row'), type: 'unocommand', 
uno: '.uno:DeleteRows'},
                                {name: _('Delete column'), type: 'unocommand', 
uno: '.uno:DeleteColumns'}]
                        },
-                       {name: _('Help'), type: 'menu', menu: [{name: 
_('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
-                                                              {name: 
_('About'), id: 'about', type: 'action'}]
+                       {name: _('Help'), type: 'menu', menu: [
+                               {name: _('Keyboard shortcuts'), id: 
'keyboard-shortcuts', type: 'action'},
+                               {name: _('About'), id: 'about', type: 'action'}]
                        }
                ],
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to