[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/src loleaflet/unocommands.js scripts/unocommands.py
Jan Holesovsky
kendy at collabora.com
Fri Dec 8 09:32:36 UTC 2017
loleaflet/src/control/Control.Menubar.js | 297 +++++++++++++++----------------
loleaflet/unocommands.js | 8
scripts/unocommands.py | 12 -
3 files changed, 165 insertions(+), 152 deletions(-)
New commits:
commit d38664c023f374dc66361d00be89c08a0e5bbc20
Author: Jan Holesovsky <kendy at collabora.com>
Date: Thu Dec 7 09:59:25 2017 +0100
l10n: "type: 'unocommand'" is implicit when there is "uno:" in the item.
Change-Id: I2fe50e4860848920f551cc6a3fda5ebe5f49b3f2
Reviewed-on: https://gerrit.libreoffice.org/46011
Reviewed-by: Andras Timar <andras.timar at collabora.com>
Tested-by: Andras Timar <andras.timar at collabora.com>
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 07e69bdc..4a536a77 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -26,28 +26,28 @@ L.Control.Menubar = L.Control.extend({
{name: _('Microsoft Word (.docx)'), id: 'downloadas-docx', type: 'action'}]}]
},
{name: _('Edit'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:Undo'},
- {type: 'unocommand', uno: '.uno:Redo'},
+ {uno: '.uno:Undo'},
+ {uno: '.uno:Redo'},
{name: _('Repair'), id: 'repair', type: 'action'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:Cut'},
- {type: 'unocommand', uno: '.uno:Copy'},
- {type: 'unocommand', uno: '.uno:Paste'},
- {type: 'unocommand', uno: '.uno:SelectAll'},
+ {uno: '.uno:Cut'},
+ {uno: '.uno:Copy'},
+ {uno: '.uno:Paste'},
+ {uno: '.uno:SelectAll'},
{type: 'separator'},
- {name: _('Find & Replace...'), uno: '.uno:SearchDialog', type: 'unocommand'},
+ {uno: '.uno:SearchDialog'},
{type: 'separator'},
{name: _('Track Changes'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:TrackChanges'},
- {type: 'unocommand', uno: '.uno:ShowTrackedChanges'},
+ {uno: '.uno:TrackChanges'},
+ {uno: '.uno:ShowTrackedChanges'},
{type: 'separator'},
- {name: _('Manage Changes...'), uno: '.uno:AcceptTrackedChanges', type: 'unocommand'},
- {type: 'unocommand', uno: '.uno:AcceptAllTrackedChanges'},
- {type: 'unocommand', uno: '.uno:RejectAllTrackedChanges'},
- {type: 'unocommand', uno: '.uno:PreviousTrackedChange'},
- {type: 'unocommand', uno: '.uno:NextTrackedChange'}
+ {uno: '.uno:AcceptTrackedChanges'},
+ {uno: '.uno:AcceptAllTrackedChanges'},
+ {uno: '.uno:RejectAllTrackedChanges'},
+ {uno: '.uno:PreviousTrackedChange'},
+ {uno: '.uno:NextTrackedChange'}
]},
- {name: _('Edit Style...'), uno: '.uno:EditStyle', type: 'unocommand'},
+ {uno: '.uno:EditStyle'},
]},
{name: _('View'), id: 'view', type: 'menu', menu: [
{name: _('Full screen'), id: 'fullscreen', type: 'action'},
@@ -56,106 +56,106 @@ L.Control.Menubar = L.Control.extend({
{name: _('Zoom out'), id: 'zoomout', type: 'action'},
{name: _('Reset zoom'), id: 'zoomreset', type: 'action'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:ControlCodes'},
+ {uno: '.uno:ControlCodes'},
]
},
{name: _('Insert'), type: 'menu', menu: [
{name: _('Image'), id: 'insertgraphic', type: 'action'},
{name: _('Comment...'), id: 'insertcomment', type: 'action'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:InsertFootnote'},
- {type: 'unocommand', uno: '.uno:InsertEndnote'},
+ {uno: '.uno:InsertFootnote'},
+ {uno: '.uno:InsertEndnote'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:InsertPageBreak'},
- {type: 'unocommand', uno: '.uno:InsertColumnBreak'},
+ {uno: '.uno:InsertPageBreak'},
+ {uno: '.uno:InsertColumnBreak'},
{type: 'separator'},
- {name: _('Hyperlink...'), uno: '.uno:HyperlinkDialog', type: 'unocommand'},
+ {uno: '.uno:HyperlinkDialog'},
{name: _('Special character...'), id: 'specialcharacter', type: 'action'},
{name: _('Formatting mark'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:InsertNonBreakingSpace'},
- {type: 'unocommand', uno: '.uno:InsertHardHyphen'},
- {type: 'unocommand', uno: '.uno:InsertSoftHyphen'},
- {type: 'unocommand', uno: '.uno:InsertZWSP'},
- {type: 'unocommand', uno: '.uno:InsertZWNBSP'},
- {type: 'unocommand', uno: '.uno:InsertLRM'},
- {type: 'unocommand', uno: '.uno:InsertRLM'}]},
- {name: _('Index Entry...'), uno: '.uno:InsertIndexesEntry', type: 'unocommand'}
+ {uno: '.uno:InsertNonBreakingSpace'},
+ {uno: '.uno:InsertHardHyphen'},
+ {uno: '.uno:InsertSoftHyphen'},
+ {uno: '.uno:InsertZWSP'},
+ {uno: '.uno:InsertZWNBSP'},
+ {uno: '.uno:InsertLRM'},
+ {uno: '.uno:InsertRLM'}]},
+ {uno: '.uno:InsertIndexesEntry'}
]
},
{name: _('Format'), type: 'menu', menu: [
{name: _('Text'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:Bold'},
- {type: 'unocommand', uno: '.uno:Italic'},
- {type: 'unocommand', uno: '.uno:Underline'},
- {type: 'unocommand', uno: '.uno:UnderlineDouble'},
- {type: 'unocommand', uno: '.uno:Strikeout'},
- {type: 'unocommand', uno: '.uno:Overline'},
+ {uno: '.uno:Bold'},
+ {uno: '.uno:Italic'},
+ {uno: '.uno:Underline'},
+ {uno: '.uno:UnderlineDouble'},
+ {uno: '.uno:Strikeout'},
+ {uno: '.uno:Overline'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:SuperScript'},
- {type: 'unocommand', uno: '.uno:SubScript'},
- {type: 'unocommand', uno: '.uno:SmallCaps'},
+ {uno: '.uno:SuperScript'},
+ {uno: '.uno:SubScript'},
+ {uno: '.uno:SmallCaps'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:Shadowed'},
- {type: 'unocommand', uno: '.uno:OutlineFont'},
+ {uno: '.uno:Shadowed'},
+ {uno: '.uno:OutlineFont'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:Grow'},
- {type: 'unocommand', uno: '.uno:Shrink'},
+ {uno: '.uno:Grow'},
+ {uno: '.uno:Shrink'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:ChangeCaseToUpper'},
- {type: 'unocommand', uno: '.uno:ChangeCaseToLower'},
- {type: 'unocommand', uno: '.uno:ChangeCaseRotateCase'},
+ {uno: '.uno:ChangeCaseToUpper'},
+ {uno: '.uno:ChangeCaseToLower'},
+ {uno: '.uno:ChangeCaseRotateCase'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:ChangeCaseToSentenceCase'},
- {type: 'unocommand', uno: '.uno:ChangeCaseToTitleCase'},
- {type: 'unocommand', uno: '.uno:ChangeCaseToToggleCase'}]},
+ {uno: '.uno:ChangeCaseToSentenceCase'},
+ {uno: '.uno:ChangeCaseToTitleCase'},
+ {uno: '.uno:ChangeCaseToToggleCase'}]},
{name: _('Text orientation'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:ParaLeftToRight'},
- {type: 'unocommand', uno: '.uno:ParaRightToLeft'}]},
+ {uno: '.uno:ParaLeftToRight'},
+ {uno: '.uno:ParaRightToLeft'}]},
{name: _('Spacing'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:SpacePara1'},
- {type: 'unocommand', uno: '.uno:SpacePara15'},
- {type: 'unocommand', uno: '.uno:SpacePara2'},
+ {uno: '.uno:SpacePara1'},
+ {uno: '.uno:SpacePara15'},
+ {uno: '.uno:SpacePara2'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:ParaspaceIncrease'},
- {type: 'unocommand', uno: '.uno:ParaspaceDecrease'},
+ {uno: '.uno:ParaspaceIncrease'},
+ {uno: '.uno:ParaspaceDecrease'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:IncrementIndent'},
- {type: 'unocommand', uno: '.uno:DecrementIndent'}]},
+ {uno: '.uno:IncrementIndent'},
+ {uno: '.uno:DecrementIndent'}]},
{name: _('Align'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:CommonAlignLeft'},
- {type: 'unocommand', uno: '.uno:CommonAlignHorizontalCenter'},
- {type: 'unocommand', uno: '.uno:CommonAlignRight'},
- {type: 'unocommand', uno: '.uno:CommonAlignJustified'},
+ {uno: '.uno:CommonAlignLeft'},
+ {uno: '.uno:CommonAlignHorizontalCenter'},
+ {uno: '.uno:CommonAlignRight'},
+ {uno: '.uno:CommonAlignJustified'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:CommonAlignTop'},
- {type: 'unocommand', uno: '.uno:CommonAlignVerticalcenter'},
- {type: 'unocommand', uno: '.uno:CommonAlignBottom'}]},
+ {uno: '.uno:CommonAlignTop'},
+ {uno: '.uno:CommonAlignVerticalcenter'},
+ {uno: '.uno:CommonAlignBottom'}]},
{name: _('Lists'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:DefaultBullet'},
- {type: 'unocommand', uno: '.uno:DefaultNumbering'},
+ {uno: '.uno:DefaultBullet'},
+ {uno: '.uno:DefaultNumbering'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:DecrementLevel'},
- {type: 'unocommand', uno: '.uno:IncrementLevel'},
- {type: 'unocommand', uno: '.uno:DecrementSublevels'},
- {type: 'unocommand', uno: '.uno:IncrementSubLevels'},
+ {uno: '.uno:DecrementLevel'},
+ {uno: '.uno:IncrementLevel'},
+ {uno: '.uno:DecrementSublevels'},
+ {uno: '.uno:IncrementSubLevels'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:MoveDown'},
- {type: 'unocommand', uno: '.uno:MoveUp'},
- {type: 'unocommand', uno: '.uno:MoveDownSubItems'},
- {type: 'unocommand', uno: '.uno:MoveUpSubItems'},
+ {uno: '.uno:MoveDown'},
+ {uno: '.uno:MoveUp'},
+ {uno: '.uno:MoveDownSubItems'},
+ {uno: '.uno:MoveUpSubItems'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:InsertNeutralParagraph'},
- {type: 'unocommand', uno: '.uno:NumberingStart'},
+ {uno: '.uno:InsertNeutralParagraph'},
+ {uno: '.uno:NumberingStart'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:JumpDownThisLevel'},
- {type: 'unocommand', uno: '.uno:JumpUpThisLevel'},
- {type: 'unocommand', uno: '.uno:ContinueNumbering'}]},
+ {uno: '.uno:JumpDownThisLevel'},
+ {uno: '.uno:JumpUpThisLevel'},
+ {uno: '.uno:ContinueNumbering'}]},
{type: 'separator'},
- {name: _('Character...'), uno: '.uno:FontDialog', type: 'unocommand'},
- {name: _('Paragraph...'), uno: '.uno:ParagraphDialog', type: 'unocommand'},
- {name: _('Bullets and Numbering...'), uno: '.uno:OutlineBullet', type: 'unocommand'},
+ {uno: '.uno:FontDialog'},
+ {uno: '.uno:ParagraphDialog'},
+ {uno: '.uno:OutlineBullet'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:ResetAttributes'},
+ {uno: '.uno:ResetAttributes'},
{name: _('Page'), type: 'menu', menu: [
{name: 'A4, ' + _('Portrait'), type: 'action', id: 'a4portrait'},
{name: 'A4, ' + _('Landscape'), type: 'action', id: 'a4landscape'},
@@ -168,34 +168,34 @@ L.Control.Menubar = L.Control.extend({
},
{name: _('Tables'), type: 'menu', menu: [
{name: _('Insert'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:InsertRowsBefore'},
- {type: 'unocommand', uno: '.uno:InsertRowsAfter'},
+ {uno: '.uno:InsertRowsBefore'},
+ {uno: '.uno:InsertRowsAfter'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:InsertColumnsBefore'},
- {type: 'unocommand', uno: '.uno:InsertColumnsAfter'}]},
+ {uno: '.uno:InsertColumnsBefore'},
+ {uno: '.uno:InsertColumnsAfter'}]},
{name: _('Delete'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:DeleteRows'},
- {type: 'unocommand', uno: '.uno:DeleteColumns'},
- {type: 'unocommand', uno: '.uno:DeleteTable'}]},
+ {uno: '.uno:DeleteRows'},
+ {uno: '.uno:DeleteColumns'},
+ {uno: '.uno:DeleteTable'}]},
{name: _('Select'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:SelectTable'},
- {type: 'unocommand', uno: '.uno:EntireRow'},
- {type: 'unocommand', uno: '.uno:EntireColumn'},
- {type: 'unocommand', uno: '.uno:EntireCell'}]},
- {type: 'unocommand', uno: '.uno:MergeCells'},
+ {uno: '.uno:SelectTable'},
+ {uno: '.uno:EntireRow'},
+ {uno: '.uno:EntireColumn'},
+ {uno: '.uno:EntireCell'}]},
+ {uno: '.uno:MergeCells'},
{type: 'separator'},
- {name: _('Properties...'), uno: '.uno:TableDialog', type: 'unocommand'}
+ {uno: '.uno:TableDialog'}
]},
{name: _('Tools'), id: 'tools', type: 'menu', menu: [
- {name: _('Spelling...'), uno: '.uno:SpellingAndGrammarDialog', type: 'unocommand'},
- {type: 'unocommand', uno: '.uno:SpellOnline'},
+ {uno: '.uno:SpellingAndGrammarDialog'},
+ {uno: '.uno:SpellOnline'},
{name: _('Language for selection'), type: 'menu', menu: [
- {name: _('None (Do not check spelling)'), id: 'noneselection', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE'}]},
+ {name: _('None (Do not check spelling)'), id: 'noneselection', uno: '.uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE'}]},
{name: _('Language for paragraph'), type: 'menu', menu: [
- {name: _('None (Do not check spelling)'), id: 'noneparagraph', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE'}]},
+ {name: _('None (Do not check spelling)'), id: 'noneparagraph', uno: '.uno:LanguageStatus?Language:string=Paragraph_LANGUAGE_NONE'}]},
{name: _('Language for entire document'), type: 'menu', menu: [
- {name: _('None (Do not check spelling)'), id: 'nonelanguage', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]},
- {name: _('Word Count...'), uno: '.uno:WordCountDialog', type: 'unocommand'}
+ {name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]},
+ {uno: '.uno:WordCountDialog'}
]},
{name: _('Help'), id: 'help', type: 'menu', menu: [
{name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
@@ -217,16 +217,16 @@ L.Control.Menubar = L.Control.extend({
{name: _('Microsoft Powerpoint (.pptx)'), id: 'downloadas-pptx', type: 'action'}]}]
},
{name: _('Edit'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:Undo'},
- {type: 'unocommand', uno: '.uno:Redo'},
+ {uno: '.uno:Undo'},
+ {uno: '.uno:Redo'},
{name: _('Repair'), id: 'repair', type: 'action'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:Cut'},
- {type: 'unocommand', uno: '.uno:Copy'},
- {type: 'unocommand', uno: '.uno:Paste'},
- {type: 'unocommand', uno: '.uno:SelectAll'},
+ {uno: '.uno:Cut'},
+ {uno: '.uno:Copy'},
+ {uno: '.uno:Paste'},
+ {uno: '.uno:SelectAll'},
{type: 'separator'},
- {name: _('Find & Replace...'), uno: '.uno:SearchDialog', type: 'unocommand'}
+ {uno: '.uno:SearchDialog'}
]},
{name: _('View'), id: 'view', type: 'menu', menu: [
{name: _('Full screen'), id: 'fullscreen', type: 'action'},
@@ -242,19 +242,19 @@ L.Control.Menubar = L.Control.extend({
{name: _('Special character...'), id: 'specialcharacter', type: 'action'}]
},
{name: _('Format'), type: 'menu', menu: [
- {name: _('Edit Style...'), uno: '.uno:EditStyle', type: 'unocommand'}
+ {uno: '.uno:EditStyle'}
]},
{name: _('Tables'), type: 'menu', menu: [
{name: _('Insert'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:InsertRowsBefore'},
- {type: 'unocommand', uno: '.uno:InsertRowsAfter'},
+ {uno: '.uno:InsertRowsBefore'},
+ {uno: '.uno:InsertRowsAfter'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:InsertColumnsBefore'},
- {type: 'unocommand', uno: '.uno:InsertColumnsAfter'}]},
+ {uno: '.uno:InsertColumnsBefore'},
+ {uno: '.uno:InsertColumnsAfter'}]},
{name: _('Delete'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:DeleteRows'},
- {type: 'unocommand', uno: '.uno:DeleteColumns'}]},
- {type: 'unocommand', uno: '.uno:MergeCells'}]
+ {uno: '.uno:DeleteRows'},
+ {uno: '.uno:DeleteColumns'}]},
+ {uno: '.uno:MergeCells'}]
},
{name: _('Slide'), type: 'menu', menu: [
{name: _('New slide'), id: 'insertpage', type: 'action'},
@@ -264,9 +264,9 @@ L.Control.Menubar = L.Control.extend({
{name: _('Fullscreen presentation'), id: 'fullscreen-presentation', type: 'action'}]
},
{name: _('Tools'), id: 'tools', type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:SpellOnline'},
+ {uno: '.uno:SpellOnline'},
{name: _('Language'), type: 'menu', menu: [
- {name: _('None (Do not check spelling)'), id: 'nonelanguage', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
+ {name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
]},
{name: _('Help'), id: 'help', type: 'menu', menu: [
{name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
@@ -288,16 +288,16 @@ L.Control.Menubar = L.Control.extend({
{name: _('Microsoft Excel (.xlsx)'), id: 'downloadas-xlsx', type: 'action'}]}
]},
{name: _('Edit'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:Undo'},
- {type: 'unocommand', uno: '.uno:Redo'},
+ {uno: '.uno:Undo'},
+ {uno: '.uno:Redo'},
{name: _('Repair'), id: 'repair', type: 'action'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:Cut'},
- {type: 'unocommand', uno: '.uno:Copy'},
- {type: 'unocommand', uno: '.uno:Paste'},
- {type: 'unocommand', uno: '.uno:SelectAll'},
+ {uno: '.uno:Cut'},
+ {uno: '.uno:Copy'},
+ {uno: '.uno:Paste'},
+ {uno: '.uno:SelectAll'},
{type: 'separator'},
- {name: _('Find & Replace...'), uno: '.uno:SearchDialog', type: 'unocommand'}
+ {uno: '.uno:SearchDialog'}
]},
{name: _('View'), id: 'view', type: 'menu', menu: [
{name: _('Full screen'), id: 'fullscreen', type: 'action'}
@@ -306,35 +306,35 @@ L.Control.Menubar = L.Control.extend({
{name: _('Image'), id: 'insertgraphic', type: 'action'},
{name: _('Comment...'), id: 'insertcomment', type: 'action'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:InsertRows'},
- {type: 'unocommand', uno: '.uno:InsertColumns'},
+ {uno: '.uno:InsertRows'},
+ {uno: '.uno:InsertColumns'},
{type: 'separator'},
{name: _('Special character...'), id: 'specialcharacter', type: 'action'}
]},
{name: _('Format'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:ResetAttributes'},
- {name: _('Cells...'), type: 'unocommand', uno: '.uno:FormatCellDialog'}
+ {uno: '.uno:ResetAttributes'},
+ {uno: '.uno:FormatCellDialog'}
]},
{name: _('Sheet'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:InsertRows'},
- {type: 'unocommand', uno: '.uno:InsertColumns'},
+ {uno: '.uno:InsertRows'},
+ {uno: '.uno:InsertColumns'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:DeleteRows'},
- {type: 'unocommand', uno: '.uno:DeleteColumns'}
+ {uno: '.uno:DeleteRows'},
+ {uno: '.uno:DeleteColumns'}
]},
{name: _('Data'), type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:Group'},
- {type: 'unocommand', uno: '.uno:Ungroup'},
+ {uno: '.uno:Group'},
+ {uno: '.uno:Ungroup'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:ClearOutline'},
+ {uno: '.uno:ClearOutline'},
{type: 'separator'},
- {type: 'unocommand', uno: '.uno:ShowDetail'},
- {type: 'unocommand', uno: '.uno:HideDetail'}
+ {uno: '.uno:ShowDetail'},
+ {uno: '.uno:HideDetail'}
]},
{name: _('Tools'), id: 'tools', type: 'menu', menu: [
- {type: 'unocommand', uno: '.uno:SpellOnline'},
+ {uno: '.uno:SpellOnline'},
{name: _('Language'), type: 'menu', menu: [
- {name: _('None (Do not check spelling)'), id: 'nonelanguage', type: 'unocommand', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
+ {name: _('None (Do not check spelling)'), id: 'nonelanguage', uno: '.uno:LanguageStatus?Language:string=Default_LANGUAGE_NONE'}]}
]},
{name: _('Help'), id: 'help', type: 'menu', menu: [
{name: _('Keyboard shortcuts'), id: 'keyboard-shortcuts', type: 'action'},
@@ -506,11 +506,6 @@ L.Control.Menubar = L.Control.extend({
if (map._permission === 'edit') {
if (type === 'unocommand') { // enable all depending on stored commandStates
var unoCommand = $(aItem).data('uno');
- if ($(aItem).data('name') === undefined) {
- var text = _UNO(unoCommand);
- $(aItem).data('name', text);
- aItem.innerHTML = text;
- }
var itemState = map['stateChangeHandler'].getItemValue(unoCommand);
if (itemState === 'disabled') {
$(aItem).addClass('disabled');
@@ -752,7 +747,13 @@ L.Control.Menubar = L.Control.extend({
}
}
var aItem = L.DomUtil.create('a', menu[i].disabled ? 'disabled' : '', liItem);
- aItem.innerHTML = menu[i].name;
+ if (menu[i].name !== undefined) {
+ aItem.innerHTML = menu[i].name;
+ } else if (menu[i].uno !== undefined) {
+ aItem.innerHTML = _UNO(menu[i].uno);
+ } else {
+ aItem.innerHTML = '';
+ }
if (menu[i].type === 'menu') {
var ulItem = L.DomUtil.create('ul', '', liItem);
@@ -763,7 +764,7 @@ L.Control.Menubar = L.Control.extend({
for (var j in subitemList) {
ulItem.appendChild(subitemList[j]);
}
- } else if (menu[i].type === 'unocommand') {
+ } else if (menu[i].type === 'unocommand' || menu[i].uno !== undefined) {
$(aItem).data('type', 'unocommand');
$(aItem).data('uno', menu[i].uno);
} else if (menu[i].type === 'separator') {
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
index eb81e92a..2b74092a 100644
--- a/loleaflet/unocommands.js
+++ b/loleaflet/unocommands.js
@@ -149,6 +149,12 @@ var unoCommandsArray = {
global._UNO = function(string) {
var text = unoCommandsArray[string.substr(5)];
- text = text.replace('~', '');
+ if (text !== undefined) {
+ text = text.replace('~', '');
+ } else {
+ // we should avoid this, but when it happens, present at least
+ // somehow reasonable text
+ text = string.substr(5);
+ }
return text;
}
diff --git a/scripts/unocommands.py b/scripts/unocommands.py
index 4f88ceb4..6e1b0246 100755
--- a/scripts/unocommands.py
+++ b/scripts/unocommands.py
@@ -35,7 +35,7 @@ def commandsFromLine(line):
return commands
-# Extract uno commands name from lines like " type: 'unocommand', uno: '.uno:Command3',"
+# Extract uno commands name from lines like " {uno: '.uno:Command3',"
def commandFromMenuLine(line):
commands = []
@@ -67,7 +67,7 @@ def extractCommands(path):
# extract from the menu specifications
f = open(path + '/loleaflet/src/control/Control.Menubar.js', 'r')
for line in f:
- if line.find("'unocommand'") >= 0:
+ if line.find("uno:") >= 0:
commands += commandFromMenuLine(line)
# may the list unique
@@ -124,7 +124,13 @@ var unoCommandsArray = {'''
global._UNO = function(string) {
var text = unoCommandsArray[string.substr(5)];
- text = text.replace('~', '');
+ if (text !== undefined) {
+ text = text.replace('~', '');
+ } else {
+ // we should avoid this, but when it happens, present at least
+ // somehow reasonable text
+ text = string.substr(5);
+ }
return text;
}'''
More information about the Libreoffice-commits
mailing list