diff options
| author | Henry Castro <hcastro@collabora.com> | 2019-04-19 09:32:42 -0400 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-05-03 16:57:40 +0200 |
| commit | 889ae4652cfdb7289592fe10bac129f423ef02f8 (patch) | |
| tree | 962603bc2c0e35b84809219e4199ed5079c215af | |
| parent | 9f8890fa62d17fb53bfa6ea876812166e0e9a39b (diff) | |
loleaflet: enable Conditional Formatting dialog
This reverts commit b3532ebb828035dc9db8c027472bd050494fce3c.
Change-Id: Iac31520b1444832059c99e0bfb52eb99d1fd91ca
Reviewed-on: https://gerrit.libreoffice.org/71243
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | loleaflet/src/control/Control.Menubar.js | 10 | ||||
| -rw-r--r-- | loleaflet/src/unocommands.js | 8 |
2 files changed, 16 insertions, 2 deletions
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 6a94d673e..f58b457ed 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -362,7 +362,15 @@ L.Control.Menubar = L.Control.extend({ {name: _UNO('.uno:FormatMenu', 'spreadsheet'), type: 'menu', menu: [ {uno: '.uno:ResetAttributes'}, {uno: '.uno:FormatCellDialog'}, - {uno: '.uno:PageFormatDialog'} + {uno: '.uno:PageFormatDialog'}, + {name: _UNO('.uno:ConditionalFormatMenu', 'spreadsheet'), type: 'menu', menu: [ + {uno: '.uno:ConditionalFormatDialog'}, + {uno: '.uno:ColorScaleFormatDialog'}, + {uno: '.uno:DataBarFormatDialog'}, + {uno: '.uno:IconSetFormatDialog'}, + {uno: '.uno:CondDateFormatDialog'}, + {type: 'separator'}, + {uno: '.uno:ConditionalFormatManagerDialog'}]}, ]}, {name: _UNO('.uno:SheetMenu', 'spreadsheet'), type: 'menu', menu: [ {name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), type: 'menu', menu: [ diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js index 9b543456d..225ce5d79 100644 --- a/loleaflet/src/unocommands.js +++ b/loleaflet/src/unocommands.js @@ -23,6 +23,7 @@ var unoCommandsArray = { ChangeCaseToUpper:{global:{menu:_('~UPPERCASE'),},}, ChangesMenu:{global:{menu:_('Track Chan~ges'),},}, ClearOutline:{global:{menu:_('~Remove Outline'),},}, + ColorScaleFormatDialog:{spreadsheet:{menu:_('Color Scale...'),},}, CommonAlignBottom:{global:{menu:_('Bottom'),},}, CommonAlignHorizontalCenter:{global:{menu:_('Centered'),},}, CommonAlignJustified:{global:{menu:_('Justified'),},}, @@ -30,12 +31,16 @@ var unoCommandsArray = { CommonAlignRight:{global:{menu:_('Right'),},}, CommonAlignTop:{global:{menu:_('Top'),},}, CommonAlignVerticalCenter:{global:{menu:_('Center'),},}, - ConditionalFormatMenu:{spreadsheet:{menu:_('C~onditional Formatting'),},}, + CondDateFormatDialog:{spreadsheet:{menu:_('Date...'),},}, + ConditionalFormatDialog:{spreadsheet:{menu:_('Condition...'),},}, + ConditionalFormatManagerDialog:{spreadsheet:{menu:_('Manage...'),},}, + ConditionalFormatMenu:{spreadsheet:{menu:_('C~onditional'),},}, ContinueNumbering:{text:{menu:_('Continue previous numbering'),},}, ControlCodes:{text:{menu:_('For~matting Marks'),},}, Copy:{global:{menu:_('~Copy'),},}, CopyHyperlinkLocation:{text:{menu:_('Copy Hyperlink Location'),},}, Cut:{global:{menu:_('~Cut'),},}, + DataBarFormatDialog:{spreadsheet:{menu:_('Data Bar...'),},}, DataFilterAutoFilter:{spreadsheet:{menu:_('Auto~Filter'),},}, DataFilterHideAutoFilter:{spreadsheet:{menu:_('~Hide AutoFilter'),},}, DataFilterRemoveFilter:{spreadsheet:{menu:_('~Reset Filter'),},}, @@ -92,6 +97,7 @@ var unoCommandsArray = { HideDetail:{global:{menu:_('~Hide Details'),},}, HideRow:{spreadsheet:{context:_('H~ide Rows'),menu:_('H~ide'),},}, HyperlinkDialog:{global:{context:_('Insert Hyperlink'),menu:_('~Hyperlink...'),},}, + IconSetFormatDialog:{spreadsheet:{menu:_('Icon Set...'),},}, IncrementIndent:{global:{context:_('Increase Indent'),menu:_('Increase Indent'),},}, IncrementLevel:{text:{menu:_('Promote One Level'),},}, IncrementSubLevels:{text:{menu:_('Promote One Level With Subpoints'),},}, |