loleaflet/src/control/Control.Menubar.js | 47 ++++++++++++++++---------------
1 file changed, 25 insertions(+), 22 deletions(-)
New commits:
commit 13144cbc8f0c543e51ee7e53b5fd7f750390d241
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Wed Dec 6 17:03:55 2017 +0530
Add elipsis to dialogs in menubar
And change 'Spelling & Grammar' to 'Spelling...' to match with latest
desktop UI names.
Change-Id: I51000e93c7dd6e60d31b11b731d9d5427fea271b
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 51aeacf5..c4ef8b41 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -35,7 +35,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Paste'), type: 'unocommand', uno:
'.uno:Paste'},
{name: _('Select all'), type: 'unocommand',
uno: '.uno:SelectAll'},
{type: 'separator'},
- {name: _('Find & Replace'), id:
'.uno:SearchDialog', type: 'dialog'},
+ {name: _('Find & Replace...'), id:
'.uno:SearchDialog', type: 'dialog'},
{type: 'separator'},
{name: _('Track Changes'), type: 'menu', menu: [
{name: _('Record'), type: 'unocommand',
uno: '.uno:TrackChanges'},
@@ -69,7 +69,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Page break'), type: 'unocommand',
uno: '.uno:InsertPageBreak'},
{name: _('Column break'), type: 'unocommand',
uno: '.uno:InsertColumnBreak'},
{type: 'separator'},
- {name: _('Hyperlink'), id:
'.uno:HyperlinkDialog', type: 'dialog'},
+ {name: _('Hyperlink...'), id:
'.uno:HyperlinkDialog', type: 'dialog'},
{name: _('Special character...'), id:
'specialcharacter', type: 'action'},
{name: _('Formatting mark'), type: 'menu',
menu: [
{name: _('Non-breaking space'), type:
'unocommand', uno: '.uno:InsertNonBreakingSpace'},
@@ -184,10 +184,10 @@ L.Control.Menubar = L.Control.extend({
{name: _('Cell'), type: 'unocommand',
uno: '.uno:EntireCell'}]},
{name: _('Merge cells'), type: 'unocommand',
uno: '.uno:MergeCells'},
{type: 'separator'},
- {name: _('Properties'), id: '.uno:TableDialog',
type: 'dialog'}
+ {name: _('Properties...'), id:
'.uno:TableDialog', type: 'dialog'}
]},
{name: _('Tools'), id: 'tools', type: 'menu', menu: [
- {name: _('Spelling and Grammar'), id:
'.uno:SpellingAndGrammarDialog', type: 'dialog'},
+ {name: _('Spelling...'), id:
'.uno:SpellingAndGrammarDialog', type: 'dialog'},
{name: _('Automatic spell checking'), type:
'unocommand', 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'}]},
@@ -195,7 +195,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('None (Do not check
spelling)'), id: 'noneparagraph', type: 'unocommand', 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'), id:
'.uno:WordCountDialog', type: 'dialog'}
+ {name: _('Word Count...'), id:
'.uno:WordCountDialog', type: 'dialog'}
]},
{name: _('Help'), id: 'help', type: 'menu', menu: [
{name: _('Keyboard shortcuts'), id:
'keyboard-shortcuts', type: 'action'},
@@ -226,7 +226,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Paste'), type: 'unocommand', uno:
'.uno:Paste'},
{name: _('Select all'), type: 'unocommand',
uno: '.uno:SelectAll'},
{type: 'separator'},
- {name: _('Find & Replace'), id:
'.uno:SearchDialog', id: 'dialog'}
+ {name: _('Find & Replace...'), id:
'.uno:SearchDialog', id: 'dialog'}
]},
{name: _('View'), id: 'view', type: 'menu', menu: [
{name: _('Full screen'), id: 'fullscreen',
type: 'action'},
@@ -297,7 +297,7 @@ L.Control.Menubar = L.Control.extend({
{name: _('Paste'), type: 'unocommand', uno:
'.uno:Paste'},
{name: _('Select all'), type: 'unocommand',
uno: '.uno:SelectAll'},
{type: 'separator'},
- {name: _('Find & Replace'), id:
'.uno:SearchDialog', type: 'dialog'}
+ {name: _('Find & Replace...'), id:
'.uno:SearchDialog', type: 'dialog'}
]},
{name: _('View'), id: 'view', type: 'menu', menu: [
{name: _('Full screen'), id: 'fullscreen',
type: 'action'}
commit ba7cc8d68b4563b7434ca4e49e5f4ef8be16f2ee
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Tue Dec 5 18:21:25 2017 +0530
lokdialog: Restructure menubar a bit; make it like desktop version
Change-Id: I75032e8ac321b8c8d41825eaaea7897ae7eea6d6
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 8b061151..51aeacf5 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -226,8 +226,6 @@ L.Control.Menubar = L.Control.extend({
{name: _('Paste'), type: 'unocommand', uno:
'.uno:Paste'},
{name: _('Select all'), type: 'unocommand',
uno: '.uno:SelectAll'},
{type: 'separator'},
- {name: _('Edit Style...'), type: 'dialog', id:
'.uno:EditStyle'},
- {type: 'separator'},
{name: _('Find & Replace'), id:
'.uno:SearchDialog', id: 'dialog'}
]},
{name: _('View'), id: 'view', type: 'menu', menu: [
@@ -243,6 +241,9 @@ L.Control.Menubar = L.Control.extend({
{type: 'separator'},
{name: _('Special character...'), id:
'specialcharacter', type: 'action'}]
},
+ {name: _('Format'), type: 'menu', menu: [
+ {name: _('Edit Style...'), id:
'.uno:EditStyle', type: 'dialog'}
+ ]},
{name: _('Tables'), type: 'menu', menu: [
{name: _('Insert'), type: 'menu', menu: [
{name: _('Rows before'), type:
'unocommand', uno: '.uno:InsertRowsBefore'},
@@ -284,8 +285,8 @@ L.Control.Menubar = L.Control.extend({
{name: _('PDF Document (.pdf)'), id:
'downloadas-pdf', type: 'action'},
{name: _('ODF spreadsheet (.ods)'), id:
'downloadas-ods', type: 'action'},
{name: _('Microsoft Excel 2003
(.xls)'), id: 'downloadas-xls', type: 'action'},
- {name: _('Microsoft Excel (.xlsx)'),
id: 'downloadas-xlsx', type: 'action'}]}]
- },
+ {name: _('Microsoft Excel (.xlsx)'),
id: 'downloadas-xlsx', type: 'action'}]}
+ ]},
{name: _('Edit'), type: 'menu', menu: [
{name: _('Undo'), type: 'unocommand', uno:
'.uno:Undo'},
{name: _('Redo'), type: 'unocommand', uno:
'.uno:Redo'},
@@ -296,11 +297,11 @@ L.Control.Menubar = L.Control.extend({
{name: _('Paste'), type: 'unocommand', uno:
'.uno:Paste'},
{name: _('Select all'), type: 'unocommand',
uno: '.uno:SelectAll'},
{type: 'separator'},
- {name: _('Find & Replace'), id:
'.uno:SearchDialog', type: 'dialog'}]
- },
+ {name: _('Find & Replace'), id:
'.uno:SearchDialog', type: 'dialog'}
+ ]},
{name: _('View'), id: 'view', type: 'menu', menu: [
- {name: _('Full screen'), id: 'fullscreen',
type: 'action'}]
- },
+ {name: _('Full screen'), id: 'fullscreen',
type: 'action'}
+ ]},
{name: _('Insert'), type: 'menu', menu: [
{name: _('Image'), id: 'insertgraphic', type:
'action'},
{name: _('Comment...'), id: 'insertcomment',
type: 'action'},
@@ -308,16 +309,18 @@ L.Control.Menubar = L.Control.extend({
{name: _('Row'), type: 'unocommand', uno:
'.uno:InsertRows'},
{name: _('Column'), type: 'unocommand', uno:
'.uno:InsertColumns'},
{type: 'separator'},
- {name: _('Special character...'), id:
'specialcharacter', type: 'action'}]
- },
- {name: _('Cells'), type: 'menu', menu: [
+ {name: _('Special character...'), id:
'specialcharacter', type: 'action'}
+ ]},
+ {name: _('Format'), type: 'menu', menu: [
+ {name: _('Clear direct formatting'), type:
'unocommand', uno: '.uno:ResetAttributes'},
+ {name: _('Cells...'), type: 'dialog', id:
'.uno:FormatCellDialog'}
+ ]},
+ {name: _('Sheet'), type: 'menu', menu: [
{name: _('Insert row'), type: 'unocommand',
uno: '.uno:InsertRows'},
{name: _('Insert column'), type: 'unocommand',
uno: '.uno:InsertColumns'},
{type: 'separator'},
{name: _('Delete row'), type: 'unocommand',
uno: '.uno:DeleteRows'},
- {name: _('Delete column'), type: 'unocommand',
uno: '.uno:DeleteColumns'},
- {type: 'separator'},
- {name: _('Format'), type: 'dialog', id:
'.uno:FormatCellDialog'},
+ {name: _('Delete column'), type: 'unocommand',
uno: '.uno:DeleteColumns'}
]},
{name: _('Data'), type: 'menu', menu: [
{name: _('Group'), type: 'unocommand', uno:
'.uno:Group'},
@@ -326,8 +329,8 @@ L.Control.Menubar = L.Control.extend({
{name: _('Remove Outline'), type: 'unocommand',
uno: '.uno:ClearOutline'},
{type: 'separator'},
{name: _('Show Details'), type: 'unocommand',
uno: '.uno:ShowDetail'},
- {name: _('Hide Details'), type: 'unocommand',
uno: '.uno:HideDetail'}]
- },
+ {name: _('Hide Details'), type: 'unocommand',
uno: '.uno:HideDetail'}
+ ]},
{name: _('Tools'), id: 'tools', type: 'menu', menu: [
{name: _('Automatic spell checking'), type:
'unocommand', uno: '.uno:SpellOnline'},
{name: _('Language'), type: 'menu', menu: [
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
