[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/src loleaflet/unocommands.js

2018-02-16 Thread Henry Castro 
 loleaflet/src/control/Control.Menubar.js |9 +
 loleaflet/unocommands.js |8 
 2 files changed, 17 insertions(+)

New commits:
commit 785fb7e34a16e7d60f13256b306fd74598fea06b
Author: Henry Castro 
Date:   Fri Feb 16 10:23:01 2018 -0400

loleaflet: add "Insert Fields" menu

Field
Page Number
Page Count
Date
Time
Title
Author
Subject

Change-Id: I4360372312abab04c34411bdca317b59c93141c4
Reviewed-on: https://gerrit.libreoffice.org/49866
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 349b7b5f..f2ba32ef 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -64,6 +64,15 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:InsertGraphic', 'text'), id: 
'insertgraphic', type: 'action'},
{name: _UNO('.uno:InsertAnnotation', 'text'), 
id: 'insertcomment', type: 'action'},
{type: 'separator'},
+   {name: _UNO('.uno:InsertField', 'text'), type: 
'menu', menu: [
+   {uno: '.uno:InsertPageNumberField'},
+   {uno: '.uno:InsertPageCountField'},
+   {uno: '.uno:InsertDateField'},
+   {uno: '.uno:InsertTimeField'},
+   {uno: '.uno:InsertTitleField'},
+   {uno: '.uno:InsertAuthorField'},
+   {uno: '.uno:InsertTopicField'}
+   ]},
{name: _UNO('.uno:InsertHeaderFooterMenu', 
'text'), type: 'menu', menu: [
{name: _UNO('.uno:InsertPageHeader', 
'text'), type: 'menu', menu: [
{name: _('All'), disabled: 
true, id: 'insertheader', tag: '_ALL_', uno: '.uno:InsertPageHeader?'}]},
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
index b11631ce..d537e01c 100644
--- a/loleaflet/unocommands.js
+++ b/loleaflet/unocommands.js
@@ -84,12 +84,15 @@ var unoCommandsArray = {
IncrementLevel:{text:{menu:_('Promote One Level'),},},
IncrementSubLevels:{text:{menu:_('Promote One Level With 
Subpoints'),},},
InsertAnnotation:{global:{context:_('Insert 
Comment'),menu:_('Comme~nt'),},presentation:{menu:_('Comme~nt'),},spreadsheet:{context:_('Insert
 Co~mment'),menu:_('Comm~ent'),},},
+   
InsertAuthorField:{presentation:{menu:_('~Author'),},text:{menu:_('~Author'),},},
InsertBreakMenu:{spreadsheet:{menu:_('Insert Page ~Break'),},},
InsertColumnBreak:{spreadsheet:{menu:_('~Column 
Break'),},text:{menu:_('Insert Column Break'),},},
InsertColumnsAfter:{presentation:{menu:_('Insert Column 
Right'),},spreadsheet:{context:_('Insert Columns ~Right'),menu:_('Columns 
~Right'),},text:{menu:_('Columns R~ight'),},},
InsertColumnsBefore:{presentation:{menu:_('Insert Column 
Left'),},spreadsheet:{context:_('Insert Columns ~Left'),menu:_('Columns 
~Left'),},text:{menu:_('Columns ~Left'),},},
InsertColumnsMenu:{spreadsheet:{menu:_('Insert Co~lumns'),},},
+   InsertDateField:{text:{menu:_('~Date'),},},
InsertEndnote:{text:{menu:_('~Endnote'),},},
+   InsertField:{text:{menu:_('~Fields'),},},
InsertFootnote:{text:{menu:_('~Footnote'),},},
InsertGraphic:{global:{context:_('Insert 
Image'),menu:_('~Image...'),},},
InsertHardHyphen:{global:{menu:_('Non-br~eaking hyphen'),},},
@@ -101,6 +104,8 @@ var unoCommandsArray = {
InsertNonBreakingSpace:{global:{menu:_('~Non-breaking space'),},},
InsertPageFooter:{text:{menu:_('Foote~r'),},},
InsertPageHeader:{text:{menu:_('He~ader'),},},
+   InsertPageCountField:{text:{menu:_('Page ~Count'),},},
+   InsertPageNumberField:{global:{menu:_('~Page 
Numbers...'),},text:{menu:_('~Page Number'),},},
InsertPagebreak:{text:{menu:_('~Page Break'),},},
InsertRLM:{global:{menu:_('~Right-to-left mark'),},},
InsertRowBreak:{spreadsheet:{menu:_('~Row Break'),},},
@@ -110,6 +115,9 @@ var unoCommandsArray = {
InsertSlide:{presentation:{menu:_('New Slid~e'),},},
InsertSoftHyphen:{global:{menu:_('S~oft hyphen'),},},
InsertSymbol:{global:{context:_('Insert Special 
Character'),menu:_('S~pecial Character...'),},},
+   InsertTimeField:{global:{menu:_('Time 
Field'),},text:{menu:_('~Time'),},},
+   InsertTitleField:{text:{menu:_('T~itle'),},},
+   InsertTopicField:{text:{menu:_('~Subject'),},},

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/src loleaflet/unocommands.js

2018-01-24 Thread Michael Meeks 
 loleaflet/src/control/Control.Menubar.js |1 +
 loleaflet/unocommands.js |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 01474347ec897b43213703a1dd826432f988b2ac
Author: Michael Meeks 
Date:   Mon Jan 22 16:40:15 2018 +

Add the Thesaurus dialog.

Change-Id: I976ffd46e95dfa675150ee66650f211b2c9f5cdc
Reviewed-on: https://gerrit.libreoffice.org/48537
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 1a458b1b..095ed06c 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -184,6 +184,7 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:ToolsMenu', 'text'), id: 'tools', 
type: 'menu', menu: [
{uno: '.uno:SpellingAndGrammarDialog'},
{uno: '.uno:SpellOnline'},
+   {uno: '.uno:ThesaurusDialog'},
{name: _UNO('.uno:LanguageMenu'), type: 'menu', 
menu: [
{name: 
_UNO('.uno:SetLanguageSelectionMenu', 'text'), type: 'menu', menu: [
{name: _('None (Do not check 
spelling)'), id: 'noneselection', uno: 
'.uno:LanguageStatus?Language:string=Current_LANGUAGE_NONE'}]},
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
index 14ec0ce6..32221b0f 100644
--- a/loleaflet/unocommands.js
+++ b/loleaflet/unocommands.js
@@ -209,6 +209,7 @@ var unoCommandsArray = {
TableSelectMenu:{text:{menu:_('~Select'),},},
TaskPaneInsertPage:{presentation:{menu:_('Insert Slide'),},},
TextAlign:{global:{menu:_('Alig~n'),},},
+   
ThesaurusDialog:{global:{menu:_('~Thesaurus...'),},text:{menu:_('~Thesaurus...'),},},
ToggleMergeCells:{spreadsheet:{menu:_('M~erge and Center Cells'),},},
ToolsMenu:{global:{menu:_('~Tools'),},},
TrackChanges:{text:{menu:_('~Record'),},},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/src loleaflet/unocommands.js

2018-01-15 Thread Andras Timar 
 loleaflet/src/control/Control.Menubar.js |   42 ++-
 loleaflet/unocommands.js |1 
 2 files changed, 5 insertions(+), 38 deletions(-)

New commits:
commit d61ce94ebf0d1ed78f1f71423f6ba7d33290b983
Author: Andras Timar 
Date:   Tue Jan 9 10:17:02 2018 +0100

Format - Page... dialog instead of custom Page menus

Change-Id: I7b91505a7f875fa67d4e5214bd697451c4b3c5e2
Reviewed-on: https://gerrit.libreoffice.org/47634
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index 353672fd..68d6fb9c 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -157,18 +157,10 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:FontDialog'},
{uno: '.uno:ParagraphDialog'},
{uno: '.uno:OutlineBullet'},
+   {uno: '.uno:PageDialog'},
{type: 'separator'},
-   {uno: '.uno:ResetAttributes'},
-   {name: _('Page'), type: 'menu', menu: [
-   {name: 'A4, ' + _('Portrait'), type: 
'action', id: 'a4portrait'},
-   {name: 'A4, ' + _('Landscape'), type: 
'action', id: 'a4landscape'},
-   {name: 'A5, ' + _('Portrait'), type: 
'action', id: 'a5portrait'},
-   {name: 'A5, ' + _('Landscape'), type: 
'action', id: 'a5landscape'},
-   {name: 'Letter, ' + _('Portrait'), 
type: 'action', id: 'letterportrait'},
-   {name: 'Letter, ' + _('Landscape'), 
type: 'action', id: 'letterlandscape'},
-   {name: 'Legal, ' + _('Portrait'), type: 
'action', id: 'legalportrait'},
-   {name: 'Legal, ' + _('Landscape'), 
type: 'action', id: 'legallandscape'}]}]
-   },
+   {uno: '.uno:ResetAttributes'}
+   ]},
{name: _UNO('.uno:TableMenu', 'text'), type: 'menu', 
menu: [
{name: _UNO('.uno:TableInsertMenu', 'text'), 
type: 'menu', menu: [
{uno: '.uno:InsertRowsBefore'},
@@ -658,35 +650,9 @@ L.Control.Menubar = L.Control.extend({
map.fire('postMessage', {msgId: 'close', args: 
{EverModified: map._everModified, Deprecated: true}});
map.fire('postMessage', {msgId: 'UI_Close', args: 
{EverModified: map._everModified}});
map.remove();
-   }
-   else if (id === 'repair') {
+   } else if (id === 'repair') {
map._socket.sendMessage('commandvalues 
command=.uno:DocumentRepair');
-   } else if (id === 'a4portrait') {
-   map.sendUnoCommand('.uno:AttributePageSize 
{"AttributePageSize.Width":{"type":"long", "value": 
"21000"},"AttributePageSize.Height":{"type":"long", "value": "29700"}}');
-   map.sendUnoCommand('.uno:AttributePage 
{"AttributePage.Landscape":{"type":"boolean", "value": "false"}}');
-   } else if (id === 'a4landscape') {
-   map.sendUnoCommand('.uno:AttributePageSize 
{"AttributePageSize.Height":{"type":"long", "value": 
"21000"},"AttributePageSize.Width":{"type":"long", "value": "29700"}}');
-   map.sendUnoCommand('.uno:AttributePage 
{"AttributePage.Landscape":{"type":"boolean", "value": "true"}}');
-   } else if (id === 'a5portrait') {
-   map.sendUnoCommand('.uno:AttributePageSize 
{"AttributePageSize.Width":{"type":"long", "value": 
"14800"},"AttributePageSize.Height":{"type":"long", "value": "21000"}}');
-   map.sendUnoCommand('.uno:AttributePage 
{"AttributePage.Landscape":{"type":"boolean", "value": "false"}}');
-   } else if (id === 'a5landscape') {
-   map.sendUnoCommand('.uno:AttributePageSize 
{"AttributePageSize.Height":{"type":"long", "value": 
"14800"},"AttributePageSize.Width":{"type":"long", "value": "21000"}}');
-   map.sendUnoCommand('.uno:AttributePage 
{"AttributePage.Landscape":{"type":"boolean", "value": "true"}}');
-   } else if (id === 'letterportrait') {
-   map.sendUnoCommand('.uno:AttributePageSize 
{"AttributePageSize.Width":{"type":"long", "value": 
"21950"},"AttributePageSize.Height":{"type":"long", "value": "27940"}}');
-   map.sendUnoCommand('.uno:AttributePage

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/src loleaflet/unocommands.js

2018-01-12 Thread Henry Castro 
 loleaflet/src/control/Control.Menubar.js |   27 +--
 loleaflet/unocommands.js |3 +++
 2 files changed, 28 insertions(+), 2 deletions(-)

New commits:
commit 703861538ff2bddb157a4836c995154390df31aa
Author: Henry Castro 
Date:   Fri Jan 12 21:45:45 2018 +0100

loleaflet: add Header/Footer menu

Change-Id: Iabbb3e2a8eadadae2446b572f0e411491af9db4f
Reviewed-on: https://gerrit.libreoffice.org/47829
Reviewed-by: Henry Castro 
Tested-by: Henry Castro 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index c863eeec..ba9b9b30 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -63,6 +63,9 @@ L.Control.Menubar = L.Control.extend({
{name: _UNO('.uno:InsertGraphic', 'text'), id: 
'insertgraphic', type: 'action'},
{name: _UNO('.uno:InsertAnnotation', 'text'), 
id: 'insertcomment', type: 'action'},
{type: 'separator'},
+   {name: _UNO('.uno:InsertHeaderFooterMenu', 
'text'), type: 'menu', menu: [
+   {uno: '.uno:InsertPageHeader'},
+   {uno: '.uno:InsertPageFooter'}]},
{uno: '.uno:InsertFootnote'},
{uno: '.uno:InsertEndnote'},
{type: 'separator'},
@@ -683,6 +686,27 @@ L.Control.Menubar = L.Control.extend({
}
},
 
+   _sendCommand: function (item) {
+   var unoCommand = $(item).data('uno');
+   if (unoCommand == '.uno:InsertPageHeader' || unoCommand == 
'.uno:InsertPageFooter') {
+   if (map['stateChangeHandler'].getItemValue(unoCommand) 
=== 'true') {
+   vex.dialog.confirm({
+   message: (unoCommand.endsWith('Header') 
? _('Are you sure you want to delete the header?') :
+   _('Are you sure you want to 
delete the footer?')),
+   callback: function(value) {
+   if (value) {
+   
map.sendUnoCommand(unoCommand + '?On:bool=false');
+   }
+   }
+   });
+   } else {
+   map.sendUnoCommand(unoCommand + 
'?On:bool=true');
+   }
+   } else {
+   map.sendUnoCommand(unoCommand);
+   }
+   },
+
_onDeleteSlide: function(e) {
if (e) {
map.deletePage();
@@ -693,8 +717,7 @@ L.Control.Menubar = L.Control.extend({
var self = e.data.self;
var type = $(item).data('type');
if (type === 'unocommand') {
-   var unoCommand = $(item).data('uno');
-   map.sendUnoCommand(unoCommand);
+   self._sendCommand(item);
} else if (type === 'action') {
self._executeAction(item);
}
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
index fade3dc0..706c7c6a 100644
--- a/loleaflet/unocommands.js
+++ b/loleaflet/unocommands.js
@@ -89,11 +89,14 @@ var unoCommandsArray = {
InsertFootnote:{text:{menu:_('~Footnote'),},},
InsertGraphic:{global:{context:_('Insert 
Image'),menu:_('~Image...'),},},
InsertHardHyphen:{global:{menu:_('Non-br~eaking hyphen'),},},
+   InsertHeaderFooterMenu:{text:{menu:_('He~ader and Footer'),},},
InsertIndexesEntry:{text:{menu:_('~Index Entry...'),},},
InsertLRM:{global:{menu:_('~Left-to-right mark'),},},
InsertMenu:{global:{menu:_('~Insert'),},},
InsertNeutralParagraph:{text:{menu:_('Insert Unnumbered Entry'),},},
InsertNonBreakingSpace:{global:{menu:_('~Non-breaking space'),},},
+   InsertPageFooter:{text:{menu:_('Foote~r'),},},
+   InsertPageHeader:{text:{menu:_('He~ader'),},},
InsertPagebreak:{text:{menu:_('~Page Break'),},},
InsertRLM:{global:{menu:_('~Right-to-left mark'),},},
InsertRows:{presentation:{menu:_('Insert 
Row'),},spreadsheet:{menu:_('Rows ~Above'),},text:{menu:_('Insert Row'),},},
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3-0' - loleaflet/src loleaflet/unocommands.js

2017-12-08 Thread Jan Holesovsky 
 loleaflet/src/control/Control.Menubar.js |   23 ++-
 loleaflet/unocommands.js |   10 ++
 2 files changed, 28 insertions(+), 5 deletions(-)

New commits:
commit 2a42bf08c0add7fdd37893269cd51a10ca9a646a
Author: Jan Holesovsky 
Date:   Fri Dec 8 10:01:18 2017 +0100

calc: Add AutoFilter and various other sorting and filtering to the menu.

Change-Id: I20a481d258e35f5119ed65a68f9816c13e0451eb
Reviewed-on: https://gerrit.libreoffice.org/46074
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/src/control/Control.Menubar.js 
b/loleaflet/src/control/Control.Menubar.js
index afb6422a..84e8f830 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -323,13 +323,26 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:DeleteColumns'}
]},
{name: _UNO('.uno:DataMenu'), type: 'menu', menu: [
-   {uno: '.uno:Group'},
-   {uno: '.uno:Ungroup'},
+   {uno: '.uno:DataSort'},
+   {uno: '.uno:SortAscending'},
+   {uno: '.uno:SortDescending'},
{type: 'separator'},
-   {uno: '.uno:ClearOutline'},
+   {uno: '.uno:DataFilterAutoFilter'},
+   {name: _UNO('.uno:FilterMenu'), type: 'menu', 
menu: [
+   {uno: '.uno:DataFilterStandardFilter'},
+   {uno: '.uno:DataFilterSpecialFilter'},
+   {type: 'separator'},
+   {uno: '.uno:DataFilterRemoveFilter'},
+   {uno: 
'.uno:DataFilterHideAutoFilter'}]},
{type: 'separator'},
-   {uno: '.uno:ShowDetail'},
-   {uno: '.uno:HideDetail'}
+   {name: _UNO('.uno:GroupOutlineMenu'), type: 
'menu', menu: [
+   {uno: '.uno:Group'},
+   {uno: '.uno:Ungroup'},
+   {type: 'separator'},
+   {uno: '.uno:ClearOutline'},
+   {type: 'separator'},
+   {uno: '.uno:HideDetail'},
+   {uno: '.uno:ShowDetail'}]}
]},
{name: _UNO('.uno:ToolsMenu'), id: 'tools', type: 
'menu', menu: [
{uno: '.uno:SpellOnline'},
diff --git a/loleaflet/unocommands.js b/loleaflet/unocommands.js
index 712069cf..4a1557b5 100644
--- a/loleaflet/unocommands.js
+++ b/loleaflet/unocommands.js
@@ -28,7 +28,13 @@ var unoCommandsArray = {
 Copy: _('~Copy'),
 CopyHyperlinkLocation: _('Copy Link Location'),
 Cut: _('~Cut'),
+DataFilterAutoFilter: _('Auto~Filter'),
+DataFilterHideAutoFilter: _('~Hide AutoFilter'),
+DataFilterRemoveFilter: _('~Reset Filter'),
+DataFilterSpecialFilter: _('~Advanced Filter...'),
+DataFilterStandardFilter: _('~Standard Filter...'),
 DataMenu: _('~Data'),
+DataSort: _('~Sort...'),
 DecrementIndent: _('Decrease'),
 DecrementLevel: _('Demote One Level'),
 DecrementSubLevels: _('Demote One Level With Subpoints'),
@@ -47,6 +53,7 @@ var unoCommandsArray = {
 EntireCell: _('Select Cell'),
 EntireColumn: _('Select Column'),
 EntireRow: _('Select Rows'),
+FilterMenu: _('More ~Filters'),
 FontDialog: _('Character...'),
 FormatBulletsMenu: _('Lis~ts'),
 FormatCellDialog: _('Format ~Cells...'),
@@ -56,6 +63,7 @@ var unoCommandsArray = {
 FormattingMarkMenu: _('Formatting Mark'),
 FullScreen: _('F~ull Screen'),
 Group: _('~Group...'),
+GroupOutlineMenu: _('~Group and Outline'),
 Grow: _('Increase'),
 HelpMenu: _('~Help'),
 HideDetail: _('~Hide Details'),
@@ -144,6 +152,8 @@ var unoCommandsArray = {
 Shrink: _('Decrease'),
 SlideMenu: _('S~lide'),
 SmallCaps: _('Small capitals'),
+SortAscending: _('Sort Ascending'),
+SortDescending: _('Sort Descending'),
 SpacePara1: _('Line Spacing: 1'),
 SpacePara15: _('Line Spacing: 1.5'),
 SpacePara2: _('Line Spacing: 2'),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits