haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Print Area (ranges) commands to notebookbar mode in Calc 

Add new svg icon
Add menuitem to Layout tab with all the missing commands

Note: EditPrintArea was not be added because:
It triggers a dialog that is not async at the moment. When tested with
multiple users within the same server it does not work. If the one user
opens it the other one is not able to open it at the same time.
AddPrintArea was not added since it can also be problematic when multiple
users edit the same document.

Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com>
Change-Id: I276b6ab08b0f541aba9211d2595786a835d873b8
pull/4602/head
Pedro Pinto Silva 2022-04-11 15:14:36 +02:00 committed by pedropintosilva
parent dea9747ea3
commit 8a3d9154f6
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/images/lc_menuprintranges.svg 100644
View File

@ -0,0 +1 @@
<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m3 2v19h8v-5c0-.554.446-1 1-1h1v-3h8v-10z" fill="#fafafa"/><path d="m2 1v21h9v-1h-2-1-5v-3-1-3-1-3-1-3-1-3h5 1 6 1 5v3 1 3 1 2h1v-11z" fill="#3a3a38"/><path d="m15 14v2h5v-2z" fill="#fafafa"/><path d="m14 13v3h1v-2h5v2h1v-3h-1-5zm-1 3c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h1v2h1 5 1v-2h1c.554 0 1-.446 1-1v-4c0-.554-.446-1-1-1v3h-9zm2 6h5v1h-5z" fill="#3a3a38"/><path d="m14 16h7v2h-7z" fill="#1e8bcd"/><path d="m15 22v1h5v-1z" fill="#fafafa" stroke-width=".707107"/><path d="m8 2v3h-5v1h5v3h-5v1h5v3h-5v1h5v3h-5v1h5v3h1v-3h2v-1h-2v-3h4v-1h-4v-3h6v2h1v-2h5v-1h-5v-3h5v-1h-5v-3h-1v3h-6v-3zm1 4h6v3h-6z" fill="#797774"/><path d="m3 2h12v7h-12z" fill="#1e8bcd" opacity=".5"/><path d="m2 1v9h1v-1-3-1-3h5 1 6 1v-1h-1-6-1-5z" fill="#0063b1"/><path d="m8 2v3h-5v1h5v3h-5v1h13v-8h-1v3h-6v-3zm1 4h6v3h-6z" fill="#1e8bcd"/><path d="m13 19v2h9v-2z" fill="#797774" fill-opacity=".959559"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 953 B

4
browser/src/control/Control.JSDialogBuilder.js
View File

@ -149,6 +149,10 @@ L.Control.JSDialogBuilder = L.Control.extend({
{text: _UNO('.uno:ChiSquareTestDialog', 'spreadsheet'), uno: '.uno:ChiSquareTestDialog'},
{text: _UNO('.uno:FourierAnalysisDialog', 'spreadsheet'), uno: '.uno:FourierAnalysisDialog'}
];
this._menus['MenuPrintRanges'] = [
{text: _UNO('.uno:DefinePrintArea', 'spreadsheet'), uno: '.uno:DefinePrintArea'},
{text: _UNO('.uno:DeletePrintArea', 'spreadsheet'), uno: '.uno:DeletePrintArea'}
];
this._menus['MenuRowHeight'] = [
{text: _UNO('.uno:RowHeight', 'spreadsheet'), uno: '.uno:RowHeight'},
{text: _UNO('.uno:SetOptimalRowHeight', 'spreadsheet'), uno: '.uno:SetOptimalRowHeight'},

6
browser/src/control/Control.NotebookbarCalc.js
View File

@ -708,6 +708,12 @@ L.Control.NotebookbarCalc = L.Control.NotebookbarWriter.extend({
'text': _UNO('.uno:PageFormatDialog', 'spreadsheet', true),
'command': '.uno:PageFormatDialog'
},
{
'id': 'Data-PrintRangesMenu:MenuPrintRanges',
'type': 'menubutton',
'text': _UNO('.uno:PrintRangesFormatMenu', 'spreadsheet'),
'enabled': 'true'
},
{
'id': 'Data-RowMenu:MenuRowHeight',
'type': 'menubutton',