From 492671642cb84d1663fa4f081b2ee42c18ead41e Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Thu, 14 Feb 2019 17:50:36 +0300
Subject: [PATCH] [SSE] Distribute objects

---
 .../main/app/controller/Toolbar.js            | 19 ++++++++++++++++---
 .../main/app/view/DocumentHolder.js           |  4 +++-
 .../main/app/view/Toolbar.js                  | 11 +++++++++++
 apps/spreadsheeteditor/main/locale/en.json    |  2 ++
 .../main/resources/less/toolbar.less          |  2 ++
 5 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
index 6173101a81..e88e1a2482 100644
--- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js
@@ -1951,6 +1951,10 @@ define([
             toolbar.btnImgGroup.menu.items[1].setDisabled(!canungroup);
             toolbar.lockToolbar(SSE.enumLock.cantGroup, !cangroup, { array: [toolbar.btnImgAlign]});
 
+            var objcount = this.api.asc_getSelectedDrawingObjectsCount();
+            toolbar.btnImgAlign.menu.items[7].setDisabled(objcount<3);
+            toolbar.btnImgAlign.menu.items[8].setDisabled(objcount<3);
+
             if (editOptionsDisabled) return;
 
             /* read font params */
@@ -3270,10 +3274,19 @@ define([
         },
 
         onImgAlignSelect: function(menu, item) {
-            if (this.api)
-                this.api.asc_setSelectedDrawingObjectAlign(item.value);
+            if (this.api) {
+                if (item.value>-1 && item.value < 6) {
+                    this.api.asc_setSelectedDrawingObjectAlign(item.value);
+                    Common.component.Analytics.trackEvent('ToolBar', 'Objects Align');
+                } else if (item.value == 6) {
+                    this.api.asc_DistributeSelectedDrawingObjectHor();
+                    Common.component.Analytics.trackEvent('ToolBar', 'Distribute');
+                } else if (item.value == 7){
+                    this.api.asc_DistributeSelectedDrawingObjectVer();
+                    Common.component.Analytics.trackEvent('ToolBar', 'Distribute');
+                }
+            }
             Common.NotificationCenter.trigger('edit:complete', this.toolbar);
-            Common.component.Analytics.trackEvent('ToolBar', 'Objects Align');
         },
 
         onPrintAreaClick: function(menu, item) {
diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js
index 5c9a3d5a5b..0c27ec0c86 100644
--- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js
+++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js
@@ -958,7 +958,9 @@ define([
         textShapeAlignCenter    : 'Align Center',
         textShapeAlignTop       : 'Align Top',
         textShapeAlignBottom    : 'Align Bottom',
-        textShapeAlignMiddle    : 'Align Middle'
+        textShapeAlignMiddle    : 'Align Middle',
+        txtDistribHor: 'Distribute Horizontally',
+        txtDistribVert: 'Distribute Vertically'
 
     }, SSE.Views.DocumentHolder || {}));
 });
\ No newline at end of file
diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js
index 790306f502..bfc6833270 100644
--- a/apps/spreadsheeteditor/main/app/view/Toolbar.js
+++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js
@@ -2202,6 +2202,17 @@ define([
                     caption : _holder_view.textShapeAlignBottom,
                     iconCls : 'mnu-img-align-bottom',
                     value   : 2
+                },
+                {caption: '--'},
+                {
+                    caption: _holder_view.txtDistribHor,
+                    iconCls: 'mnu-distrib-hor',
+                    value: 6
+                },
+                {
+                    caption: _holder_view.txtDistribHor,
+                    iconCls: 'mnu-distrib-vert',
+                    value: 7
                 }]
             }));
 
diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json
index b4d6f5fce8..984b927ae0 100644
--- a/apps/spreadsheeteditor/main/locale/en.json
+++ b/apps/spreadsheeteditor/main/locale/en.json
@@ -366,6 +366,8 @@
   "SSE.Controllers.DocumentHolder.txtUnderbar": "Bar under text",
   "SSE.Controllers.DocumentHolder.txtUndoExpansion": "Undo table autoexpansion",
   "SSE.Controllers.DocumentHolder.txtWidth": "Width",
+  "SSE.Controllers.DocumentHolder.txtDistribHor": "Distribute Horizontally",
+  "SSE.Controllers.DocumentHolder.txtDistribVert": "Distribute Vertically",
   "SSE.Controllers.LeftMenu.newDocumentTitle": "Unnamed spreadsheet",
   "SSE.Controllers.LeftMenu.textByColumns": "By columns",
   "SSE.Controllers.LeftMenu.textByRows": "By rows",
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index 5de0a404f4..d715975401 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -213,6 +213,8 @@
 .menu-btn-icon(mnu-img-align-bottom,          45, @menu-icon-size);
 .menu-btn-icon(mnu-img-align-middle,          44, @menu-icon-size);
 .menu-btn-icon(mnu-img-align-top,             43, @menu-icon-size);
+.menu-btn-icon(mnu-distrib-hor,               46, @menu-icon-size);
+.menu-btn-icon(mnu-distrib-vert,              47, @menu-icon-size);
 
 .username-tip {
     background-color: #ee3525;