loleaflet/src/control/Control.Menubar.js | 35 ++++++++++++++++++-------------
1 file changed, 21 insertions(+), 14 deletions(-)
New commits:
commit 696343bd65fbba8365dadfa20a0c8856b31a200c
Author: Pranav Kant <pran...@collabora.co.uk>
Date: Mon Dec 4 18:53:40 2017 +0530
lokdialog: Add FormatCellDialog, EditStyle dialog commands to menubar
And restructure menuitems in Calc and Impress. Make them like they are
in the desktop version.
Change-Id: Id52a2946904f0031168dcffcd0ab445f1a07a5bb
(cherry picked from commit 245cb007af729260af8d4f5d33eb0a8f3bccbd13)
(cherry picked from commit 7780608e568da161ef2d4a57364ba8930b1d5494)
Reviewed-on: https://gerrit.libreoffice.org/45805
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index db3a68c2..51aeacf5 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -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', type: 'dialog'}
+ {name: _('Find & Replace'), id:
'.uno:SearchDialog', id: 'dialog'}
]},
{name: _('View'), id: 'view', type: 'menu', menu: [
{name: _('Full screen'), id: 'fullscreen',
type: 'action'},
@@ -241,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'},
@@ -282,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'},
@@ -294,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'},
@@ -306,15 +309,19 @@ 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'}]
- },
+ {name: _('Delete column'), type: 'unocommand',
uno: '.uno:DeleteColumns'}
+ ]},
{name: _('Data'), type: 'menu', menu: [
{name: _('Group'), type: 'unocommand', uno:
'.uno:Group'},
{name: _('Ungroup'), type: 'unocommand', uno:
'.uno:Ungroup'},
@@ -322,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
