[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/src
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jan 16 15:43:53 UTC 2019
loleaflet/src/control/Control.Menubar.js | 26 ++++++++++++++++++--------
loleaflet/src/unocommands.js | 8 ++++++++
2 files changed, 26 insertions(+), 8 deletions(-)
New commits:
commit cc3c1097d8d291795cd430d8af3adc7b1c62a192
Author: Mert Tumer <mert.tumer at collabora.com>
AuthorDate: Wed Jan 16 14:42:31 2019 +0300
Commit: Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Jan 16 16:43:34 2019 +0100
Added some items on Menubar
On Writer:
Insert->Section on
Insert->Table of Contents and Index->Biblography Entry
On Calc:
Format->Page
Insert->Headers/Footers
Format->Conditional Formatting->Manage
Tools->Goal Seek
On Impress:
Insert->Header and Footer
Format->Bullets and Numbering
Signed-off-by: Mert Tumer <mert.tumer at collabora.com>
Change-Id: I55da2e6c4da5ac187357adc1b823da26afff424d
Signed-off-by: Mert Tumer <mert.tumer at collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/66466
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index c6531158a..53f19b561 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -71,6 +71,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:InsertAnnotation', 'text'), id: 'insertcomment', type: 'action'},
{uno: '.uno:InsertObjectChart'},
{type: 'separator'},
+ {uno: '.uno:InsertSection'},
{name: _UNO('.uno:InsertField', 'text'), type: 'menu', menu: [
{uno: '.uno:InsertPageNumberField'},
{uno: '.uno:InsertPageCountField'},
@@ -102,9 +103,10 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:InsertZWNBSP'},
{uno: '.uno:InsertLRM'},
{uno: '.uno:InsertRLM'}]},
- {uno: '.uno:InsertIndexesEntry'}
- ]
- },
+ {name: _UNO('.uno:IndexesMenu', 'text'), type: 'menu', menu: [
+ {uno: '.uno:InsertIndexesEntry'},
+ {uno: '.uno:InsertAuthoritiesEntry'}]},
+ ]},
{name: _UNO('.uno:FormatMenu', 'text'), type: 'menu', menu: [
{name: _UNO('.uno:FormatTextMenu', 'text'), type: 'menu', menu: [
{uno: '.uno:Bold'},
@@ -268,12 +270,16 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
{uno: '.uno:HyperlinkDialog'},
{type: 'separator'},
- {uno: '.uno:InsertSymbol'}]
+ {uno: '.uno:InsertSymbol'},
+ {type: 'separator'},
+ {uno: '.uno:HeaderAndFooter'}]
},
{name: _UNO('.uno:FormatMenu', 'presentation'), type: 'menu', menu: [
{uno: '.uno:TransformDialog'},
{uno: '.uno:FormatLine'},
- {uno: '.uno:FormatArea'}]
+ {uno: '.uno:FormatArea'},
+ {type: 'separator'},
+ {uno: '.uno:OutlineBullet'}]
},
{name: _UNO('.uno:TableMenu', 'text'/*HACK should be 'presentation', but not in xcu*/), type: 'menu', menu: [
{name: _UNO('.uno:TableInsertMenu', 'text'/*HACK should be 'presentation', but not in xcu*/), type: 'menu', menu: [
@@ -342,11 +348,14 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:InsertAnnotation', 'spreadsheet'), id: 'insertcomment', type: 'action'},
{type: 'separator'},
{uno: '.uno:HyperlinkDialog'},
- {uno: '.uno:InsertSymbol'}
+ {uno: '.uno:InsertSymbol'},
+ {uno: '.uno:EditHeaderAndFooter'}
]},
{name: _UNO('.uno:FormatMenu', 'spreadsheet'), type: 'menu', menu: [
{uno: '.uno:ResetAttributes'},
- {uno: '.uno:FormatCellDialog'}
+ {uno: '.uno:FormatCellDialog'},
+ {uno: '.uno:PageFormatDialog'},
+ {uno: '.uno:ConditionalFormatManagerDialog'}
]},
{name: _UNO('.uno:SheetMenu', 'spreadsheet'), type: 'menu', menu: [
{name: _UNO('.uno:InsertRowsMenu', 'spreadsheet'), type: 'menu', menu: [
@@ -391,7 +400,8 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:ToolsMenu', 'spreadsheet'), id: 'tools', type: 'menu', menu: [
{uno: '.uno:SpellOnline'},
{name: _UNO('.uno:LanguageMenu'), type: 'menu', menu: [
- {name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
+ {name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]},
+ {uno: '.uno:GoalSeekDialog'}
]},
{name: _UNO('.uno:HelpMenu', 'spreadsheet'), id: 'help', type: 'menu', menu: [
{name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index 67b55a895..9f25c9ef5 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -31,6 +31,7 @@ var unoCommandsArray = {
CommonAlignTop:{global:{menu:_('Top'),},},
CommonAlignVerticalCenter:{global:{menu:_('Center'),},},
ConditionalFormatMenu:{spreadsheet:{menu:_('C~onditional Formatting'),},},
+ ConditionalFormatManagerDialog:{spreadsheet:{menu:_('Manage...'),},},
ContinueNumbering:{text:{menu:_('Continue previous numbering'),},},
ControlCodes:{text:{menu:_('For~matting Marks'),},},
Copy:{global:{menu:_('~Copy'),},},
@@ -62,6 +63,7 @@ var unoCommandsArray = {
DuplicateSlide:{presentation:{menu:_('Duplicate ~Slide'),},},
EditMenu:{global:{menu:_('~Edit'),},},
EditStyle:{global:{menu:_('~Edit Style...'),},presentation:{menu:_('E~dit Style...'),},},
+ EditHeaderAndFooter:{spreadsheet:{menu:_('~Headers and Footers...'),},},
EntireCell:{text:{menu:_('C~ell'),},},
EntireColumn:{presentation:{menu:_('~Columns'),},text:{menu:_('~Column'),},},
EntireRow:{presentation:{menu:_('~Rows'),},text:{menu:_('~Row'),},},
@@ -82,17 +84,21 @@ var unoCommandsArray = {
Group:{global:{menu:_('~Group...'),},},
GroupOutlineMenu:{spreadsheet:{menu:_('~Group and Outline'),},},
Grow:{global:{menu:_('Increase Size'),},},
+ GoalSeekDialog:{spreadsheet:{menu:_('Goal Seek...'),},},
+ HeaderAndFooter:{presentation:{menu:_('~Header and Footer...'),},},
HelpMenu:{global:{menu:_('~Help'),},},
Hide:{spreadsheet:{menu:_('~Hide Sheet'),},},
HideColumn:{spreadsheet:{context:_('H~ide Columns'),menu:_('~Hide'),},},
HideDetail:{global:{menu:_('~Hide Details'),},},
HideRow:{spreadsheet:{context:_('H~ide Rows'),menu:_('H~ide'),},},
HyperlinkDialog:{global:{context:_('Insert Hyperlink'),menu:_('~Hyperlink...'),},},
+ IndexesMenu:{text:{menu:_('~Table of Contents and Index'),},},
IncrementIndent:{global:{context:_('Increase Indent'),menu:_('Increase Indent'),},},
IncrementLevel:{text:{menu:_('Promote One Level'),},},
IncrementSubLevels:{text:{menu:_('Promote One Level With Subpoints'),},},
InsertAnnotation:{global:{context:_('Insert Comment'),menu:_('Comme~nt'),},presentation:{menu:_('Comme~nt'),},spreadsheet:{context:_('Insert Co~mment'),menu:_('Comm~ent'),},},
InsertAuthorField:{presentation:{menu:_('~Author'),},text:{menu:_('~Author'),},},
+ InsertAuthoritiesEntry:{text:{menu:_('~Biblography Entry...'),},},
InsertBreakMenu:{spreadsheet:{menu:_('Insert Page ~Break'),},},
InsertColumnBreak:{spreadsheet:{menu:_('~Column Break'),},text:{menu:_('Insert Column Break'),},},
InsertColumnsAfter:{presentation:{menu:_('Insert Column Right'),},spreadsheet:{context:_('Insert Columns ~Right'),menu:_('Columns ~Right'),},text:{menu:_('Columns R~ight'),},},
@@ -121,6 +127,7 @@ var unoCommandsArray = {
InsertRowsAfter:{presentation:{menu:_('Insert Row Below'),},spreadsheet:{context:_('Insert Rows ~Below'),menu:_('Rows ~Below'),},text:{menu:_('Rows ~Below'),},},
InsertRowsBefore:{presentation:{menu:_('Insert Row Above'),},spreadsheet:{context:_('Insert Rows ~Above'),menu:_('Rows ~Above'),},text:{menu:_('Rows ~Above'),},},
InsertRowsMenu:{spreadsheet:{menu:_('Insert ~Rows'),},},
+ InsertSection:{text:{menu:_('~Section...'),},},
InsertSlide:{presentation:{menu:_('~New Slide'),},},
InsertSoftHyphen:{global:{menu:_('S~oft hyphen'),},},
InsertSymbol:{global:{context:_('Insert Special Character'),menu:_('S~pecial Character...'),},},
@@ -155,6 +162,7 @@ var unoCommandsArray = {
OutlineFont:{global:{menu:_('Outline'),},},
Overline:{global:{menu:_('Overline'),},},
PageDialog:{global:{menu:_('~Page...'),},text:{menu:_('~Page...'),},},
+ PageFormatDialog:{spreadsheet:{menu:_('~Page...'),},},
PageDown:{text:{menu:_('Next Page'),},},
PageUp:{text:{menu:_('Previous Page'),},},
ParaLeftToRight:{global:{menu:_('Left-To-Right'),},},
More information about the Libreoffice-commits
mailing list