diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js
index 668643fa5..0a424e2e0 100644
--- a/apps/presentationeditor/main/app/controller/Toolbar.js
+++ b/apps/presentationeditor/main/app/controller/Toolbar.js
@@ -55,7 +55,8 @@ define([
'presentationeditor/main/app/view/HeaderFooterDialog',
'presentationeditor/main/app/view/HyperlinkSettingsDialog',
'presentationeditor/main/app/view/SlideSizeSettings',
- 'presentationeditor/main/app/view/SlideshowSettings'
+ 'presentationeditor/main/app/view/SlideshowSettings',
+ 'presentationeditor/main/app/view/ListSettingsDialog'
], function () { 'use strict';
PE.Controllers.Toolbar = Backbone.Controller.extend(_.extend({
@@ -275,6 +276,7 @@ define([
toolbar.btnDecLeftOffset.on('click', _.bind(this.onDecOffset, this));
toolbar.btnIncLeftOffset.on('click', _.bind(this.onIncOffset, this));
toolbar.btnMarkers.on('click', _.bind(this.onMarkers, this));
+ toolbar.mnuListSettings.on('click', _.bind(this.onMarkerSettingsClick, this));
toolbar.btnNumbers.on('click', _.bind(this.onNumbers, this));
toolbar.cmbFontName.on('selected', _.bind(this.onFontNameSelect, this));
toolbar.cmbFontName.on('show:after', _.bind(this.onComboOpen, this, true));
@@ -470,6 +472,7 @@ define([
case 0:
this.toolbar.btnMarkers.toggle(true, true);
this.toolbar.mnuMarkersPicker.selectByIndex(this._state.bullets.subtype, true);
+ this.toolbar.mnuListSettings.setDisabled(this._state.bullets.subtype<0);
break;
case 1:
var idx = 0;
@@ -1092,6 +1095,34 @@ define([
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
},
+ onMarkerSettingsClick: function() {
+ var me = this,
+ props;
+
+ var selectedElements = me.api.getSelectedElements();
+ if (selectedElements && _.isArray(selectedElements)) {
+ for (var i = 0; i< selectedElements.length; i++) {
+ if (Asc.c_oAscTypeSelectElement.Paragraph == selectedElements[i].get_ObjectType()) {
+ props = selectedElements[i].get_ObjectValue();
+ break;
+ }
+ }
+ }
+ if (props) {
+ (new PE.Views.ListSettingsDialog({
+ props: props,
+ handler: function(result, value) {
+ if (result == 'ok') {
+ if (me.api) {
+ me.api.paraApply(value);
+ }
+ }
+ Common.NotificationCenter.trigger('edit:complete', me.toolbar);
+ }
+ })).show();
+ }
+ },
+
onComboBlur: function() {
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
},
@@ -1633,6 +1664,7 @@ define([
this.toolbar.btnNumbers.toggle(false, true);
this.toolbar.mnuMarkersPicker.selectByIndex(0, true);
+ this.toolbar.mnuListSettings.setDisabled(true);
this.toolbar.mnuNumbersPicker.selectByIndex(0, true);
},
diff --git a/apps/presentationeditor/main/app/view/ListSettingsDialog.js b/apps/presentationeditor/main/app/view/ListSettingsDialog.js
new file mode 100644
index 000000000..bf7a3838f
--- /dev/null
+++ b/apps/presentationeditor/main/app/view/ListSettingsDialog.js
@@ -0,0 +1,213 @@
+/*
+ *
+ * (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
+ *
+ */
+
+/**
+ * ListSettingsDialog.js
+ *
+ * Created by Julia Radzhabova on 30.10.2019
+ * Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+ 'common/main/lib/component/Window',
+ 'common/main/lib/component/MetricSpinner',
+ 'common/main/lib/component/ThemeColorPalette',
+ 'common/main/lib/component/ColorButton'
+], function () { 'use strict';
+
+ PE.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({
+ options: {
+ width: 230,
+ height: 156,
+ style: 'min-width: 230px;',
+ cls: 'modal-dlg',
+ split: false,
+ buttons: ['ok', 'cancel']
+ },
+
+ initialize : function(options) {
+ _.extend(this.options, {
+ title: this.txtTitle
+ }, options || {});
+
+ this.template = [
+ '