Clac: add commands to calc menubar format section

Signed-off-by: andreas kainz <kainz.a@gmail.com> Change-Id: If5db19949601e325aa1ebb54256dd9c5ef2137f6
CollaboraOnline · Nov 6, 2020 · e6b31fe · e6b31fe
1 parent 1cf11ba
commit e6b31fe
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 7 deletions.
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
@@ -431,6 +431,7 @@ L.Control.Menubar = L.Control.extend({
 				{name: _UNO('.uno:InsertGraphic', 'spreadsheet'), id: 'insertgraphicremote', type: 'action'},
 				{name: _UNO('.uno:InsertAnnotation', 'spreadsheet'), id: 'insertcomment', type: 'action'},
 				{uno: '.uno:InsertObjectChart'},
+				{uno: '.uno:FunctionDialog'},
 				{type: 'separator'},
 				{name: _UNO('.uno:HyperlinkDialog'), id: 'inserthyperlink', type: 'action'},
 				{uno: '.uno:InsertSymbol'},
@@ -442,14 +443,51 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:EditHeaderAndFooter'} /*todo: add to Control.Notebookbar.Calc.js (as Insert tab)*/
 			]},
 			{name: _UNO('.uno:FormatMenu', 'spreadsheet'), id: 'format', type: 'menu', menu: [
-				{uno: '.uno:ResetAttributes'},
-				{uno: '.uno:FormatCellDialog'},
-				{uno: '.uno:PageFormatDialog'},
-				{type: 'separator'},
-				{uno: '.uno:TransformDialog'},
-				{uno: '.uno:FormatLine'},
-				{uno: '.uno:FormatArea'},
+				{name: _UNO('.uno:FormatTextMenu', 'spreadsheet'), type: 'menu', menu: [
+					{uno: '.uno:Bold'},
+					{uno: '.uno:Italic'},
+					{uno: '.uno:Underline'},
+					{uno: '.uno:UnderlineDouble'},
+					{uno: '.uno:Strikeout'},
+					{uno: '.uno:Overline'},
+					{type: 'separator'},
+					{uno: '.uno:SuperScript'},
+					{uno: '.uno:SubScript'},
+					{type: 'separator'},
+					{uno: '.uno:Shadowed'},
+					{uno: '.uno:OutlineFont'},
+					{type: 'separator'},
+					{uno: '.uno:WrapText'},
+					{type: 'separator'},
+					{uno: '.uno:ChangeCaseToUpper'},
+					{uno: '.uno:ChangeCaseToLower'},
+					{uno: '.uno:ChangeCaseRotateCase'},
+					{type: 'separator'},
+					{uno: '.uno:ChangeCaseToSentenceCase'},
+					{uno: '.uno:ChangeCaseToTitleCase'},
+					{uno: '.uno:ChangeCaseToToggleCase'}]},
+				{name: _UNO('.uno:TextAlign', 'spreadsheet'), type: 'menu', menu: [
+					{uno: '.uno:CommonAlignLeft'},
+					{uno: '.uno:CommonAlignHorizontalCenter'},
+					{uno: '.uno:CommonAlignRight'},
+					{uno: '.uno:CommonAlignJustified'},
+					{type: 'separator'},
+					{uno: '.uno:CommonAlignTop'},
+					{uno: '.uno:CommonAlignVerticalCenter'},
+					{uno: '.uno:CommonAlignBottom'}]},
+				{name: _UNO('.uno:NumberFormatMenu', 'spreadsheet'), type: 'menu', menu: [
+					{uno: '.uno:NumberFormatStandard'},
+					{uno: '.uno:NumberFormatDecimal'},
+					{uno: '.uno:NumberFormatPercent'},
+					{uno: '.uno:NumberFormatCurrency'},
+					{uno: '.uno:NumberFormatDate'},
+					{uno: '.uno:NumberFormatTime'},
+					{uno: '.uno:NumberFormatScientific'},
+					{type: 'separator'},
+					{uno: '.uno:NumberFormatThousands'}]},
 				{type: 'separator'},
+				{uno: '.uno:FormatPaintbrush'},
+				{uno: '.uno:ResetAttributes'},
 				{name: _UNO('.uno:ConditionalFormatMenu', 'spreadsheet'), type: 'menu', menu: [
 					{uno: '.uno:ConditionalFormatDialog'},
 					{uno: '.uno:ColorScaleFormatDialog'},
@@ -458,6 +496,15 @@ L.Control.Menubar = L.Control.extend({
 					{uno: '.uno:CondDateFormatDialog'},
 					{type: 'separator'},
 					{uno: '.uno:ConditionalFormatManagerDialog'}]},
+				{type: 'separator'},
+				{uno: '.uno:FormatCellDialog'},
+				{uno: '.uno:FontDialog'},
+				{uno: '.uno:ParagraphDialog'},
+				{uno: '.uno:PageFormatDialog'},
+				{type: 'separator'},
+				{uno: '.uno:TransformDialog'},
+				{uno: '.uno:FormatLine'},
+				{uno: '.uno:FormatArea'}
 			]},
 			{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
@@ -229,6 +229,14 @@ var unoCommandsArray = {
 	MoveUp:{text:{menu:_('Move Up'),},},
 	MoveUpSubItems:{text:{menu:_('Move Up with Subpoints'),},},
 	NextTrackedChange:{text:{menu:_('Next'),},},
+	FunctionDialog:{spreadsheet:{menu:_('~Function...'),},},
+	NumberFormatMenu:{spreadsheet:{menu:_('Number Format'),},},
+	NumberFormatStandard:{spreadsheet:{menu:_('General'),},},
+	NumberFormatDecimal:{spreadsheet:{menu:_('Number'),},},
+	NumberFormatDate:{spreadsheet:{menu:_('Date'),},},
+	NumberFormatTime:{spreadsheet:{menu:_('Time'),},},
+	NumberFormatScientific:{spreadsheet:{menu:_('Scientific'),},},
+	NumberFormatThousands:{spreadsheet:{menu:_('Thousands Separator'),},},
 	NumberFormatCurrency:{spreadsheet:{context:_('Format as Currency'),menu:_('Currency'),},text:{menu:_('Number Format: Currency'),},},
 	NumberFormatDecDecimals:{spreadsheet:{menu:_('Delete Decimal Place'),},},
 	NumberFormatIncDecimals:{spreadsheet:{menu:_('Add Decimal Place'),},},