[Libreoffice-commits] online.git: loleaflet/src loleaflet/unocommands.js

[Pranav Kant]

 loleaflet/src/control/Control.ContextMenu.js |    2 +-
 loleaflet/src/control/Control.Menubar.js     |    6 +++++-
 loleaflet/unocommands.js                     |    3 +++
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit a788e58a7acf064caeb37bf67f057300ce3674a2
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Dec 14 20:48:03 2017 +0530

    lokdialog: Dialogs related to object and shapes in presentation
    
    Change-Id: If9a2e3d8bdbeab00397d2970f472602201991445
    Reviewed-on: https://gerrit.libreoffice.org/46463
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>
    (cherry picked from commit ff0c7fb6445003c562179ca5b13f207ad21e68e5)
    Reviewed-on: https://gerrit.libreoffice.org/47311
    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.ContextMenu.js b/loleaflet/src/control/Control.ContextMenu.js
index e9006719..f49e924e 100644
--- a/loleaflet/src/control/Control.ContextMenu.js
+++ b/loleaflet/src/control/Control.ContextMenu.js
@@ -39,7 +39,7 @@ L.Control.ContextMenu = L.Control.extend({
 
 			spreadsheet: ['MergeCells', 'SplitCell', 'RecalcPivotTable', 'FormatCellDialog'],
 
-			presentation: ['EditStyle'],
+			presentation: ['TransformDialog', 'FormatLine', 'FormatArea'],
 			drawing: []
 		}
 		// UNOCOMMANDS_EXTRACT_END <- don't remove this line, it's used by unocommands.py
diff --git a/loleaflet/src/control/Control.Menubar.js b/loleaflet/src/control/Control.Menubar.js
index 2b76e698..b6c03cdf 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -247,7 +247,11 @@ L.Control.Menubar = L.Control.extend({
 				{uno: '.uno:InsertSymbol'}]
 			},
 			{name: _UNO('.uno:FormatMenu', 'presentation'), type: 'menu', menu: [
-				{uno: '.uno:EditStyle'}
+				{name: _UNO('.uno:FormatObjectMenu', 'presentation'), type: 'menu', menu: [
+					{uno: '.uno:TransformDialog'},
+					{uno: '.uno:FormatLine'},
+					{uno: '.uno:FormatArea'}
+				]},
 			]},
 			{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: [
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
index 15dba49b..beaafaf5 100644
--- a/loleaflet/unocommands.js
+++ b/loleaflet/unocommands.js
@@ -62,7 +62,9 @@ var unoCommandsArray = {
 	FormatArea:{global:{menu:_('A~rea...'),},},
 	FormatBulletsMenu:{global:{menu:_('Lis~ts'),},},
 	FormatCellDialog:{spreadsheet:{context:_('~Format Cells...'),menu:_('Ce~lls...'),},},
+	FormatLine:{global:{menu:_('L~ine...'),},},
 	FormatMenu:{global:{menu:_('F~ormat'),},},
+	FormatObjectMenu:{global:{menu:_('~Object and Shape'),},text:{menu:_('Text Box and Shap~e'),},},
 	FormatSpacingMenu:{global:{menu:_('~Spacing'),},},
 	FormatTextMenu:{global:{menu:_('Te~xt'),},},
 	FormattingMarkMenu:{global:{menu:_('Formatting Mark'),},},
@@ -203,6 +205,7 @@ var unoCommandsArray = {
 	ToggleMergeCells:{spreadsheet:{menu:_('M~erge and Center Cells'),},},
 	ToolsMenu:{global:{menu:_('~Tools'),},},
 	TrackChanges:{text:{menu:_('~Record'),},},
+	TransformDialog:{global:{menu:_('Position and Si~ze...'),},},
 	Underline:{global:{menu:_('Underline'),},},
 	UnderlineDouble:{presentation:{menu:_('Double Underline '),},spreadsheet:{menu:_('Underline: Double'),},text:{menu:_('Double Underline '),},},
 	Undo:{global:{menu:_('Undo'),},},