[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/control/Control.Menubar.js |    9 ++++++++-
 loleaflet/src/unocommands.js             |   10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit efac83746f6cbe32892f26ec4506fff9e3f16779
Author:     merttumer <mert.tumer at collabora.com>
AuthorDate: Tue Jan 29 16:53:49 2019 +0300
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Jan 29 14:57:59 2019 +0100

    Added and updated Conditional Formatting Menu
    
    Change-Id: Icd1d471d22ade3f01705ce6f56d142bfb2f24c2e
    Signed-off-by: merttumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/67079
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 33e0dadbd..c1ea59916 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -364,7 +364,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 2f3710351..dac0e5a32 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,13 +31,16 @@ 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 Formatting'),},},
 	ContinueNumbering:{text:{menu:_('Continue previous numbering'),},},
 	ControlCodes:{text:{menu:_('For~matting Marks'),},},
-	Copy:{global:{menu:_('~Copy'),},},
+	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'),},},
@@ -114,6 +119,7 @@ var unoCommandsArray = {
 	InsertIndexesEntry:{text:{menu:_('~Index Entry...'),},},
 	InsertLRM:{global:{menu:_('~Left-to-right mark'),},},
 	InsertMenu:{global:{menu:_('~Insert'),},},
+	InsertMultiIndex:{text:{menu:_('Table of Contents, ~Index or Bibliography...'),},},
 	InsertNeutralParagraph:{text:{menu:_('Insert Unnumbered Entry'),},},
 	InsertNonBreakingSpace:{global:{menu:_('~Non-breaking space'),},},
 	InsertObjectChart:{global:{context:_('Insert Chart'),menu:_('~Chart...'),},},
@@ -241,7 +247,7 @@ var unoCommandsArray = {
 	TransformDialog:{global:{menu:_('Position and Si~ze...'),},},
 	Underline:{global:{menu:_('Underline'),},},
 	UnderlineDouble:{presentation:{menu:_('Double Underline '),},spreadsheet:{menu:_('Underline: Double'),},text:{menu:_('Double Underline '),},},
-	Undo:{global:{menu:_('Undo'),},},
+	Undo:{global:{menu:_('~Undo'),},},
 	Ungroup:{global:{menu:_('~Ungroup...'),},},
 	UpSearch:{global:{menu:_('Find Previous'),},},
 	UpdateCurIndex:{text:{context:_('Update index'),menu:_('Current ~Index'),},},