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

[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 <kendy at collabora.com>
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 <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

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'),