diff --git a/loleaflet/images/lc_editregion.svg b/loleaflet/images/lc_editregion.svg new file mode 100644 index 000000000..b59684546 --- /dev/null +++ b/loleaflet/images/lc_editregion.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/loleaflet/images/lc_formatbulletsmenu.svg b/loleaflet/images/lc_formatbulletsmenu.svg new file mode 100644 index 000000000..437eaaa5f --- /dev/null +++ b/loleaflet/images/lc_formatbulletsmenu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/loleaflet/images/lc_formatcolumns.svg b/loleaflet/images/lc_formatcolumns.svg new file mode 100644 index 000000000..7ce00a291 --- /dev/null +++ b/loleaflet/images/lc_formatcolumns.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/loleaflet/images/lc_formatmenu.svg b/loleaflet/images/lc_formatmenu.svg new file mode 100644 index 000000000..6a35b5460 --- /dev/null +++ b/loleaflet/images/lc_formatmenu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/loleaflet/images/lc_formattingmarkmenu.svg b/loleaflet/images/lc_formattingmarkmenu.svg new file mode 100644 index 000000000..c12a39889 --- /dev/null +++ b/loleaflet/images/lc_formattingmarkmenu.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/loleaflet/src/control/Control.JSDialogBuilder.js b/loleaflet/src/control/Control.JSDialogBuilder.js index d7f9e8fa8..5a01c08d9 100644 --- a/loleaflet/src/control/Control.JSDialogBuilder.js +++ b/loleaflet/src/control/Control.JSDialogBuilder.js @@ -145,6 +145,63 @@ L.Control.JSDialogBuilder = L.Control.extend({ {text: _UNO('.uno:ChiSquareTestDialog', 'spreadsheet'), uno: '.uno:ChiSquareTestDialog'}, {text: _UNO('.uno:FourierAnalysisDialog', 'spreadsheet'), uno: '.uno:FourierAnalysisDialog'} ]; + this._menus['FormattingMarkMenu'] = [ + {text: _UNO('.uno:InsertNonBreakingSpace', 'text'), uno: 'InsertNonBreakingSpace'}, + {text: _UNO('.uno:InsertHardHyphen', 'text'), uno: 'InsertHardHyphen'}, + {text: _UNO('.uno:InsertSoftHyphen', 'text'), uno: 'InsertSoftHyphen'}, + {text: _UNO('.uno:InsertZWSP', 'text'), uno: 'InsertZWSP'}, + {text: _UNO('.uno:InsertZWNBSP', 'text'), uno: 'InsertZWNBSP'}, + {text: _UNO('.uno:InsertLRM', 'text'), uno: 'InsertLRM'}, + {text: _UNO('.uno:InsertRLM', 'text'), uno: 'InsertRLM'} + ]; + this._menus['FormatMenu'] = [ + {text: _UNO('.uno:Bold', 'text'), uno: 'Bold'}, + {text: _UNO('.uno:Italic', 'text'), uno: 'Italic'}, + {text: _UNO('.uno:Underline', 'text'), uno: 'Underline'}, + {text: _UNO('.uno:UnderlineDouble', 'text'), uno: 'UnderlineDouble'}, + {text: _UNO('.uno:Strikeout', 'text'), uno: 'Strikeout'}, + {text: _UNO('.uno:Overline', 'text'), uno: 'Overline'}, + {type: 'separator'}, + {text: _UNO('.uno:SuperScript', 'text'), uno: 'SuperScript'}, + {text: _UNO('.uno:SubScript', 'text'), uno: 'SubScript'}, + {type: 'separator'}, + {text: _UNO('.uno:Shadowed', 'text'), uno: 'Shadowed'}, + {text: _UNO('.uno:OutlineFont', 'text'), uno: 'OutlineFont'}, + {type: 'separator'}, + {text: _UNO('.uno:Grow', 'text'), uno: 'Grow'}, + {text: _UNO('.uno:Shrink', 'text'), uno: 'Shrink'}, + {type: 'separator'}, + {text: _UNO('.uno:ChangeCaseToUpper', 'text'), uno: 'ChangeCaseToUpper'}, + {text: _UNO('.uno:ChangeCaseToLower', 'text'), uno: 'ChangeCaseToLower'}, + {text: _UNO('.uno:ChangeCaseRotateCase', 'text'), uno: 'ChangeCaseRotateCase'}, + {type: 'separator'}, + {text: _UNO('.uno:ChangeCaseToSentenceCase', 'text'), uno: 'ChangeCaseToSentenceCase'}, + {text: _UNO('.uno:ChangeCaseToTitleCase', 'text'), uno: 'ChangeCaseToTitleCase'}, + {text: _UNO('.uno:ChangeCaseToToggleCase', 'text'), uno: 'ChangeCaseToToggleCase'}, + {type: 'separator'}, + {text: _UNO('.uno:SmallCaps', 'text'), uno: 'SmallCaps'} + ]; + this._menus['FormatBulletsMenu'] = [ + {text: _UNO('.uno:DefaultBullet', 'text'), uno: 'DefaultBullet'}, + {type: 'separator'}, + {text: _UNO('.uno:DecrementLevel', 'text'), uno: 'DecrementLevel'}, + {text: _UNO('.uno:IncrementLevel', 'text'), uno: 'IncrementLevel'}, + {text: _UNO('.uno:DecrementSubLevels', 'text'), uno: 'DecrementSubLevels'}, + {text: _UNO('.uno:IncrementSubLevels', 'text'), uno: 'IncrementSubLevels'}, + {type: 'separator'}, + {text: _UNO('.uno:MoveDown', 'text'), uno: 'MoveDown'}, + {text: _UNO('.uno:MoveUp', 'text'), uno: 'MoveUp'}, + {text: _UNO('.uno:MoveDownSubItems', 'text'), uno: 'MoveDownSubItems'}, + {text: _UNO('.uno:MoveUpSubItems', 'text'), uno: 'MoveUpSubItems'}, + {type: 'separator'}, + {text: _UNO('.uno:InsertNeutralParagraph', 'text'), uno: 'InsertNeutralParagraph'}, + {text: _UNO('.uno:NumberingStart', 'text'), uno: 'NumberingStart'}, + {text: _UNO('.uno:RemoveBullets', 'text'), uno: 'RemoveBullets'}, + {type: 'separator'}, + {text: _UNO('.uno:JumpDownThisLevel', 'text'), uno: 'JumpDownThisLevel'}, + {text: _UNO('.uno:JumpUpThisLevel', 'text'), uno: 'JumpUpThisLevel'}, + {text: _UNO('.uno:ContinueNumbering', 'text'), uno: 'ContinueNumbering'} + ]; this._currentDepth = 0; }, diff --git a/loleaflet/src/control/Control.NotebookbarWriter.js b/loleaflet/src/control/Control.NotebookbarWriter.js index f55a0c430..aabedae4e 100644 --- a/loleaflet/src/control/Control.NotebookbarWriter.js +++ b/loleaflet/src/control/Control.NotebookbarWriter.js @@ -1770,6 +1770,12 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({ getFormatTab: function() { var content = [ + { + 'id': 'FormatMenu:FormatMenu', + 'type': 'menubutton', + 'text': _UNO('.uno:FormatMenu', 'text'), + 'command': '.uno:FormatMenu' + }, { 'type': 'bigtoolitem', 'text': _UNO('.uno:FontDialog'), @@ -1800,6 +1806,22 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({ 'text': _UNO('.uno:TransformDialog'), 'command': '.uno:TransformDialog' }, + { + 'type': 'bigtoolitem', + 'text': _UNO('.uno:FormatColumns', 'text'), + 'command': '.uno:FormatColumns' + }, + { + 'type': 'bigtoolitem', + 'text': _UNO('.uno:EditRegion', 'text'), + 'command': '.uno:EditRegion' + }, + { + 'id': 'FormatBulletsMenu:FormatBulletsMenu', + 'type': 'menubutton', + 'text': _UNO('.uno:FormatBulletsMenu', 'text'), + 'command': '.uno:FormatBulletsMenu' + }, ]; return this.getNotebookbar([this.getTabPage('Format', content)], '-3'); @@ -1996,6 +2018,12 @@ L.Control.NotebookbarWriter = L.Control.Notebookbar.extend({ 'type': 'bigtoolitem', 'text': _UNO('.uno:InsertAnnotation', 'text'), 'command': '.uno:InsertAnnotation' + }, + { + 'id': 'FormattingMarkMenu:FormattingMarkMenu', + 'type': 'menubutton', + 'text': _UNO('.uno:FormattingMarkMenu', 'text'), + 'command': '.uno:FormattingMarkMenu' } ];