diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 5e9a39dd7..b70004915 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -55,7 +55,8 @@ define([ 'documenteditor/main/app/view/PageMarginsDialog', 'documenteditor/main/app/view/PageSizeDialog', 'documenteditor/main/app/view/NoteSettingsDialog', - 'documenteditor/main/app/controller/PageLayout' + 'documenteditor/main/app/controller/PageLayout', + 'documenteditor/main/app/view/CustomColumnsDialog' ], function () { 'use strict'; @@ -1641,23 +1642,40 @@ define([ return; this._state.columns = undefined; - if (this.api && item.checked) { - var props = new Asc.CDocumentColumnsProps(), - cols = item.value, - def_space = 12.5; - props.put_EqualWidth(cols<3); - if (cols<3) { - props.put_Num(cols+1); - props.put_Space(def_space); - } else { - var total = this.api.asc_GetColumnsProps().get_TotalWidth(), - left = (total - def_space*2)/3, - right = total - def_space - left; - props.put_ColByValue(0, (cols == 3) ? left : right, def_space); - props.put_ColByValue(1, (cols == 3) ? right : left, 0); + if (this.api) { + if (item.value == 'advanced') { + var win, props = this.api.asc_GetSectionProps(), + me = this; + win = new DE.Views.CustomColumnsDialog({ + handler: function(dlg, result) { + if (result == 'ok') { + props = dlg.getSettings(); + me.api.asc_SetColumnsProps(props); + Common.NotificationCenter.trigger('edit:complete', me.toolbar); + } + } + }); + win.show(); + win.setSettings(me.api.asc_GetColumnsProps()); + } else if (item.checked) { + var props = new Asc.CDocumentColumnsProps(), + cols = item.value, + def_space = 12.5; + props.put_EqualWidth(cols<3); + + if (cols<3) { + props.put_Num(cols+1); + props.put_Space(def_space); + } else { + var total = this.api.asc_GetColumnsProps().get_TotalWidth(), + left = (total - def_space*2)/3, + right = total - def_space - left; + props.put_ColByValue(0, (cols == 3) ? left : right, def_space); + props.put_ColByValue(1, (cols == 3) ? right : left, 0); + } + this.api.asc_SetColumnsProps(props); } - this.api.asc_SetColumnsProps(props); } Common.NotificationCenter.trigger('edit:complete', this.toolbar); diff --git a/apps/documenteditor/main/app/view/CustomColumnsDialog.js b/apps/documenteditor/main/app/view/CustomColumnsDialog.js new file mode 100644 index 000000000..5a9778663 --- /dev/null +++ b/apps/documenteditor/main/app/view/CustomColumnsDialog.js @@ -0,0 +1,178 @@ +/* + * + * (c) Copyright Ascensio System Limited 2010-2017 + * + * 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 Lubanas st. 125a-25, Riga, Latvia, + * EU, LV-1021. + * + * 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 + * +*/ +/** + * CustomColumnsDialog.js + * + * Created by Julia Radzhabova on 6/23/17 + * Copyright (c) 2017 Ascensio System SIA. All rights reserved. + * + */ + +define([ + 'common/main/lib/component/Window', + 'common/main/lib/component/MetricSpinner', + 'common/main/lib/component/CheckBox' +], function () { 'use strict'; + + DE.Views.CustomColumnsDialog = Common.UI.Window.extend(_.extend({ + options: { + width: 300, + header: true, + style: 'min-width: 216px;', + cls: 'modal-dlg' + }, + + initialize : function(options) { + _.extend(this.options, { + title: this.textTitle + }, options || {}); + + this.template = [ + '