From f7009ddf8ca5fb45527e50651e2afe395c5a2d32 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Wed, 21 Aug 2019 13:55:40 +0300 Subject: [PATCH] [SSE] Add Scale into Toolbar --- .../main/app/controller/Toolbar.js | 17 +++- .../main/app/template/Toolbar.template | 1 + .../main/app/view/ScaleDialog.js | 82 +++++++++++++++++++ .../main/app/view/Toolbar.js | 16 +++- 4 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 apps/spreadsheeteditor/main/app/view/ScaleDialog.js diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 3ca475bb1..a255a7406 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -55,7 +55,8 @@ define([ 'spreadsheeteditor/main/app/view/NameManagerDlg', 'spreadsheeteditor/main/app/view/FormatSettingsDialog', 'spreadsheeteditor/main/app/view/PageMarginsDialog', - 'spreadsheeteditor/main/app/view/HeaderFooterDialog' + 'spreadsheeteditor/main/app/view/HeaderFooterDialog', + 'spreadsheeteditor/main/app/view/ScaleDialog' ], function () { 'use strict'; SSE.Controllers.Toolbar = Backbone.Controller.extend(_.extend({ @@ -366,6 +367,7 @@ define([ toolbar.btnImgForward.on('click', this.onImgArrangeSelect.bind(this, 'forward')); toolbar.btnImgBackward.on('click', this.onImgArrangeSelect.bind(this, 'backward')); toolbar.btnEditHeader.on('click', _.bind(this.onEditHeaderClick, this)); + toolbar.btnScale.on('click', _.bind(this.onScaleClick, this)); Common.Gateway.on('insertimage', _.bind(this.insertImage, this)); this.onSetupCopyStyleButton(); @@ -3357,6 +3359,19 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.toolbar); }, + onScaleClick: function(btn) { + var me = this; + var win = new SSE.Views.ScaleDialog({ + api: me.api, + handler: function(dlg, result) { + Common.NotificationCenter.trigger('edit:complete'); + } + }); + win.show(); + + Common.NotificationCenter.trigger('edit:complete', this.toolbar); + }, + textEmptyImgUrl : 'You need to specify image URL.', warnMergeLostData : 'Operation can destroy data in the selected cells.
Continue?', textWarning : 'Warning', diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template index fae46d2d5..38de9c105 100644 --- a/apps/spreadsheeteditor/main/app/template/Toolbar.template +++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template @@ -147,6 +147,7 @@ +
diff --git a/apps/spreadsheeteditor/main/app/view/ScaleDialog.js b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js new file mode 100644 index 000000000..0cffffb45 --- /dev/null +++ b/apps/spreadsheeteditor/main/app/view/ScaleDialog.js @@ -0,0 +1,82 @@ +/* + * + * (c) Copyright Ascensio System SIA 2010-2019 + * + * 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 + * +*/ +/** + * ScaleDialog.js + * + * Created by Julia Svinareva on 21/08/19 + * Copyright (c) 2019 Ascensio System SIA. All rights reserved. + * + */ + +define([ + 'common/main/lib/component/Window', + 'common/main/lib/component/ComboBox' +], function () { 'use strict'; + + SSE.Views.ScaleDialog = Common.UI.Window.extend(_.extend({ + options: { + width: 214, + header: true, + style: 'min-width: 214px;', + cls: 'modal-dlg' + }, + + initialize : function(options) { + _.extend(this.options, { + title: this.textTitle + }, 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); + + + }, + + cancelButtonText: 'Cancel', + okButtonText: 'Ok' + }, SSE.Views.ScaleDialog || {})) +}); \ 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 9b7168ecf..55ac41c63 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1345,6 +1345,14 @@ define([ lock : [_set.editCell, _set.selRangeEdit, _set.headerLock, _set.lostConnect, _set.coAuth] }); + me.btnScale = new Common.UI.Button({ + id: 'tlbtn-scale', + cls: 'btn-toolbar x-huge icon-top', + iconCls: 'btn-editheader', + caption: me.capBtnScale, + lock: [_set.editCell, _set.selRangeEdit, _set.headerLock, _set.lostConnect, _set.coAuth] + }); + me.btnImgAlign = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', iconCls: 'btn-img-align', @@ -1400,7 +1408,7 @@ define([ me.btnInsertChart, me.btnColorSchemas, me.btnCopy, me.btnPaste, me.listStyles, me.btnPrint, /*me.btnSave,*/ me.btnClearStyle, me.btnCopyStyle, - me.btnPageMargins, me.btnPageSize, me.btnPageOrient, me.btnPrintArea, me.btnImgAlign, me.btnImgBackward, me.btnImgForward, me.btnImgGroup, me.btnEditHeader + me.btnPageMargins, me.btnPageSize, me.btnPageOrient, me.btnPrintArea, me.btnImgAlign, me.btnImgBackward, me.btnImgForward, me.btnImgGroup, me.btnEditHeader, me.btnScale ]; _.each(me.lockControls.concat([me.btnSave]), function(cmp) { @@ -1561,6 +1569,7 @@ define([ _injectComponent('#slot-img-movefrwd', this.btnImgForward); _injectComponent('#slot-img-movebkwd', this.btnImgBackward); _injectComponent('#slot-btn-editheader', this.btnEditHeader); + _injectComponent('#slot-btn-scale', this.btnScale); // replacePlacholder('#id-toolbar-short-placeholder-btn-halign', this.btnHorizontalAlign); // replacePlacholder('#id-toolbar-short-placeholder-btn-valign', this.btnVerticalAlign); @@ -1634,6 +1643,7 @@ define([ _updateHint(this.btnPageMargins, this.tipPageMargins); _updateHint(this.btnPrintArea, this.tipPrintArea); _updateHint(this.btnEditHeader, this.tipEditHeader); + _updateHint(this.btnScale, this.tipScale); // set menus if (this.btnBorders && this.btnBorders.rendered) { @@ -2356,6 +2366,8 @@ define([ textTabData: 'Data', capInsertTable: 'Table', tipInsertTable: 'Insert table', - textTabFormula: 'Formula' + textTabFormula: 'Formula', + capBtnScale: 'Scale', + tipScale: 'Scale' }, SSE.Views.Toolbar || {})); }); \ No newline at end of file