loleaflet/src/control/Control.Menubar.js | 9 ++++++++- loleaflet/src/unocommands.js | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-)
New commits: commit e7d3e5e37fbfe1bd2e0873e385d56be21143ec2b Author: Henry Castro <hcas...@collabora.com> AuthorDate: Fri Apr 19 09:32:42 2019 -0400 Commit: Henry Castro <hcas...@collabora.com> CommitDate: Wed Apr 24 10:02:06 2019 -0400 loleaflet: enable Conditional Formatting dialog This reverts commit b3532ebb828035dc9db8c027472bd050494fce3c. Change-Id: Iac31520b1444832059c99e0bfb52eb99d1fd91ca diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js index 9a005f3f4..40b24c542 100644 --- a/loleaflet/src/control/Control.Menubar.js +++ b/loleaflet/src/control/Control.Menubar.js @@ -363,7 +363,14 @@ L.Control.Menubar = L.Control.extend({ {uno: '.uno:ResetAttributes'}, {uno: '.uno:FormatCellDialog'}, {uno: '.uno:PageFormatDialog'}, - {uno: '.uno:ConditionalFormatManagerDialog'} + {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 a9bccdba5..cb6c0c1d9 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,6 +31,8 @@ var unoCommandsArray = { CommonAlignRight:{global:{menu:_('Right'),},}, CommonAlignTop:{global:{menu:_('Top'),},}, CommonAlignVerticalCenter:{global:{menu:_('Center'),},}, + CondDateFormatDialog:{spreadsheet:{menu:_('Date...'),},}, + ConditionalFormatDialog:{spreadsheet:{menu:_('Condition...'),},}, ConditionalFormatManagerDialog:{spreadsheet:{menu:_('Manage...'),},}, ConditionalFormatMenu:{spreadsheet:{menu:_('C~onditional'),},}, ContinueNumbering:{text:{menu:_('Continue previous numbering'),},}, @@ -37,6 +40,7 @@ var unoCommandsArray = { Copy:{global:{menu:_('Cop~y'),},}, 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 +96,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'),},}, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits