diff --git a/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template index 383731222..2b7149a8c 100644 --- a/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template @@ -94,6 +94,24 @@ +
+
+ + + + + + + +
+ +
+
+ +
+
+
+
diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js index 23b932e68..5eefb5b7b 100644 --- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js @@ -63,6 +63,7 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem {panelId: 'id-adv-shape-width', panelCaption: this.textSize}, {panelId: 'id-adv-shape-shape', panelCaption: this.textWeightArrows}, {panelId: 'id-adv-shape-margins', panelCaption: this.strMargins}, + {panelId: 'id-adv-shape-columns', panelCaption: this.strColumns}, {panelId: 'id-adv-shape-alttext', panelCaption: this.textAlt} ], contentTemplate: _.template(contentTemplate)({ @@ -411,6 +412,37 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem this.mnuEndSizePicker.on('item:click', _.bind(this.onSelectEndSize, this)); this._selectStyleItem(this.btnEndSize, null); + // Columns + + this.spnColumns = new Common.UI.MetricSpinner({ + el: $('#shape-columns-number'), + step: 1, + width: 100, + defaultUnit : "", + value: '1', + maxValue: 16, + minValue: 1 + }); + this.spnColumns.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (this._changedProps) + this._changedProps.asc_putColumnNumber(field.getNumberValue()); + }, this)); + + this.spnSpacing = new Common.UI.MetricSpinner({ + el: $('#shape-columns-spacing'), + step: .1, + width: 100, + defaultUnit : "cm", + value: '0 cm', + maxValue: 40.64, + minValue: 0 + }); + this.spnSpacing.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (this._changedProps) + this._changedProps.asc_putColumnSpace(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); + }, this)); + this.spinners.push(this.spnSpacing); + // Alt Text this.inputAltTitle = new Common.UI.InputField({ @@ -468,6 +500,12 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem } this.btnsCategory[2].setDisabled(null === margins); // Margins + value = props.asc_getColumnNumber(); + this.spnColumns.setValue((null !== value && undefined !== value) ? value : '', true); + + value = props.asc_getColumnSpace(); + this.spnSpacing.setValue((null !== value && undefined !== value) ? Common.Utils.Metric.fnRecalcFromMM(value) : '', true); + value = props.asc_getTitle(); this.inputAltTitle.setValue(value ? value : ''); @@ -681,7 +719,10 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem textAlt: 'Alternative Text', textAltTitle: 'Title', textAltDescription: 'Description', - textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.' + textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.', + strColumns: 'Columns', + textSpacing: 'Spacing between columns', + textColNumber: 'Number of columns' }, PE.Views.ShapeSettingsAdvanced || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index b9bc05fd6..bca3184f3 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1005,6 +1005,9 @@ "PE.Views.ShapeSettingsAdvanced.textWeightArrows": "Weights & Arrows", "PE.Views.ShapeSettingsAdvanced.textWidth": "Width", "PE.Views.ShapeSettingsAdvanced.txtNone": "None", + "PE.Views.ShapeSettingsAdvanced.strColumns": "Columns", + "PE.Views.ShapeSettingsAdvanced.textSpacing": "Spacing between columns", + "PE.Views.ShapeSettingsAdvanced.textColNumber": "Number of columns", "PE.Views.SlideSettings.strBackground": "Background color", "PE.Views.SlideSettings.strColor": "Color", "PE.Views.SlideSettings.strDelay": "Delay", diff --git a/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template index aecab244e..2ae9bfa02 100644 --- a/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template +++ b/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template @@ -94,6 +94,24 @@
+
+
+ + + + + + + +
+ +
+
+ +
+
+
+
diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js index 6fefebc73..808d21b2e 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js @@ -63,6 +63,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp {panelId: 'id-adv-shape-width', panelCaption: this.textSize}, {panelId: 'id-adv-shape-shape', panelCaption: this.textWeightArrows}, {panelId: 'id-adv-shape-margins', panelCaption: this.strMargins}, + {panelId: 'id-adv-shape-columns', panelCaption: this.strColumns}, {panelId: 'id-adv-shape-alttext', panelCaption: this.textAlt} ], contentTemplate: _.template(contentTemplate)({ @@ -435,6 +436,45 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp obj.getChild('.footer .primary').focus(); }); + // Columns + + this.spnColumns = new Common.UI.MetricSpinner({ + el: $('#shape-columns-number'), + step: 1, + width: 100, + defaultUnit : "", + value: '1', + maxValue: 16, + minValue: 1 + }); + this.spnColumns.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (this._changedProps) { + if (this._changedProps.asc_getShapeProperties()===null || this._changedProps.asc_getShapeProperties()===undefined) + this._changedProps.asc_putShapeProperties(new Asc.asc_CShapeProperty()); + + this._changedProps.asc_getShapeProperties().asc_putColumnNumber(field.getNumberValue()); + } + }, this)); + + this.spnSpacing = new Common.UI.MetricSpinner({ + el: $('#shape-columns-spacing'), + step: .1, + width: 100, + defaultUnit : "cm", + value: '0 cm', + maxValue: 40.64, + minValue: 0 + }); + this.spnSpacing.on('change', _.bind(function(field, newValue, oldValue, eOpts){ + if (this._changedProps) { + if (this._changedProps.asc_getShapeProperties()===null || this._changedProps.asc_getShapeProperties()===undefined) + this._changedProps.asc_putShapeProperties(new Asc.asc_CShapeProperty()); + + this._changedProps.asc_getShapeProperties().asc_putColumnSpace(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); + } + }, this)); + this.spinners.push(this.spnSpacing); + // Alt Text this.inputAltTitle = new Common.UI.InputField({ @@ -494,6 +534,12 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp } this.btnsCategory[2].setDisabled(null === margins); // Margins + value = shapeprops.asc_getColumnNumber(); + this.spnColumns.setValue((null !== value && undefined !== value) ? value : '', true); + + value = shapeprops.asc_getColumnSpace(); + this.spnSpacing.setValue((null !== value && undefined !== value) ? Common.Utils.Metric.fnRecalcFromMM(value) : '', true); + value = props.asc_getTitle(); this.inputAltTitle.setValue(value ? value : ''); @@ -717,8 +763,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp textAlt: 'Alternative Text', textAltTitle: 'Title', textAltDescription: 'Description', - textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.' - + textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.', + strColumns: 'Columns', + textSpacing: 'Spacing between columns', + textColNumber: 'Number of columns' }, SSE.Views.ShapeSettingsAdvanced || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index ff6688b7f..63630a908 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -1411,6 +1411,9 @@ "SSE.Views.ShapeSettingsAdvanced.textTop": "Top", "SSE.Views.ShapeSettingsAdvanced.textWeightArrows": "Weights & Arrows", "SSE.Views.ShapeSettingsAdvanced.textWidth": "Width", + "SSE.Views.ShapeSettingsAdvanced.strColumns": "Columns", + "SSE.Views.ShapeSettingsAdvanced.textSpacing": "Spacing between columns", + "SSE.Views.ShapeSettingsAdvanced.textColNumber": "Number of columns", "SSE.Views.Statusbar.CopyDialog.itemCopyToEnd": "(Copy to end)", "SSE.Views.Statusbar.CopyDialog.itemMoveToEnd": "(Move to end)", "SSE.Views.Statusbar.CopyDialog.textCopyBefore": "Copy before sheet",