diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 3a88fc40a..a35619110 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -58,7 +58,8 @@ define([ 'spreadsheeteditor/main/app/view/PageMarginsDialog', 'spreadsheeteditor/main/app/view/HeaderFooterDialog', 'spreadsheeteditor/main/app/view/PrintTitlesDialog', - 'spreadsheeteditor/main/app/view/ScaleDialog' + 'spreadsheeteditor/main/app/view/ScaleDialog', + 'spreadsheeteditor/main/app/view/CellsAddDialog' ], function () { 'use strict'; SSE.Controllers.Toolbar = Backbone.Controller.extend(_.extend({ @@ -1535,6 +1536,46 @@ define([ } } + return false; + }, + 'command+shift+=,ctrl+shift+=': function(e) { + if (me.editMode && !me.toolbar.btnAddCell.isDisabled()) { + var items = me.toolbar.btnAddCell.menu.items, + arr = []; + for (var i=0; i<4; i++) + arr.push({caption: items[i].caption, value: items[i].value, disabled: items[i].isDisabled()}); + (new SSE.Views.CellsAddDialog({ + title: me.txtInsertCells, + items: arr, + handler: function (dlg, result) { + if (result=='ok') { + me.api.asc_insertCells(dlg.getSettings()); + } + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + })).show(); + } + + return false; + }, + 'command+shift+-,ctrl+shift+-': function(e) { + if (me.editMode && !me.toolbar.btnDeleteCell.isDisabled()) { + var items = me.toolbar.btnDeleteCell.menu.items, + arr = []; + for (var i=0; i<4; i++) + arr.push({caption: items[i].caption, value: items[i].value, disabled: items[i].isDisabled()}); + (new SSE.Views.CellsAddDialog({ + title: me.txtDeleteCells, + items: arr, + handler: function (dlg, result) { + if (result=='ok') { + me.api.asc_deleteCells(dlg.getSettings()); + } + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + })).show(); + } + return false; } } @@ -3851,7 +3892,9 @@ define([ txtTable_TableStyleMedium: 'Table Style Medium', txtTable_TableStyleDark: 'Table Style Dark', txtTable_TableStyleLight: 'Table Style Light', - textInsert: 'Insert' + textInsert: 'Insert', + txtInsertCells: 'Insert Cells', + txtDeleteCells: 'Delete Cells' }, SSE.Controllers.Toolbar || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/CellsAddDialog.js b/apps/spreadsheeteditor/main/app/view/CellsAddDialog.js new file mode 100644 index 000000000..68fe56f4d --- /dev/null +++ b/apps/spreadsheeteditor/main/app/view/CellsAddDialog.js @@ -0,0 +1,125 @@ +/* + * + * (c) Copyright Ascensio System SIA 2010-2020 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ +/** + * CellsAddDialog.js + * + * Created by Julia Radzhabova on 08.05.2020 + * Copyright (c) 2020 Ascensio System SIA. All rights reserved. + * + */ +define([ + 'common/main/lib/component/Window', + 'common/main/lib/component/RadioBox' +], function () { 'use strict'; + + SSE.Views.CellsAddDialog = Common.UI.Window.extend(_.extend({ + options: { + width: 214, + height: 195, + header: true, + style: 'min-width: 214px;', + cls: 'modal-dlg', + buttons: ['ok', 'cancel'] + }, + + initialize : function(options) { + _.extend(this.options, options || {}); + + this.template = [ + '
', + '
', + '
', + '
', + '
', + '
' + ].join(''); + + this.options.tpl = _.template(this.template)(this.options); + + Common.UI.Window.prototype.initialize.call(this, this.options); + }, + + render: function() { + Common.UI.Window.prototype.render.call(this); + + var me = this, + items = this.options.items, + checked = true; + if (items) { + for (var i=0; i<4; i++) { + var radio = new Common.UI.RadioBox({ + el: $('#cell-ins-radio-' + (i+1)), + labelText: items[i].caption, + name: 'asc-radio-cell-ins', + value: items[i].value, + disabled: items[i].disabled, + checked: checked && !items[i].disabled + }).on('change', function(field, newValue, eOpts) { + if (newValue) { + me.currentCell = field.options.value; + } + }); + if (checked && !items[i].disabled) { + checked = false; + me.currentCell = items[i].value; + } + } + } + + var $window = this.getChild(); + $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); + }, + + _handleInput: function(state) { + if (this.options.handler) { + this.options.handler.call(this, this, state); + } + + this.close(); + }, + + onBtnClick: function(event) { + this._handleInput(event.currentTarget.attributes['result'].value); + }, + + getSettings: function() { + return this.currentCell; + }, + + onPrimary: function() { + this._handleInput('ok'); + return false; + } + + }, SSE.Views.CellsAddDialog || {})) +}); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/view/GroupDialog.js b/apps/spreadsheeteditor/main/app/view/GroupDialog.js index 65e66f9bd..a17971403 100644 --- a/apps/spreadsheeteditor/main/app/view/GroupDialog.js +++ b/apps/spreadsheeteditor/main/app/view/GroupDialog.js @@ -39,7 +39,7 @@ */ define([ 'common/main/lib/component/Window', - 'common/main/lib/component/ComboBox' + 'common/main/lib/component/RadioBox' ], function () { 'use strict'; SSE.Views.GroupDialog = Common.UI.Window.extend(_.extend({ diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index eb87e730a..b05babf08 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1178,6 +1178,8 @@ "SSE.Controllers.Toolbar.txtTable_TableStyleMedium": "Table Style Medium", "SSE.Controllers.Toolbar.warnLongOperation": "The operation you are about to perform might take rather much time to complete.
Are you sure you want to continue?", "SSE.Controllers.Toolbar.warnMergeLostData": "Only the data from the upper-left cell will remain in the merged cell.
Are you sure you want to continue?", + "SSE.Controllers.Toolbar.txtInsertCells": "Insert Cells", + "SSE.Controllers.Toolbar.txtDeleteCells": "Delete Cells", "SSE.Controllers.Viewport.textFreezePanes": "Freeze Panes", "SSE.Controllers.Viewport.textHideFBar": "Hide Formula Bar", "SSE.Controllers.Viewport.textHideGridlines": "Hide Gridlines",