Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Add overflow settings for shape

Browse source
This commit is contained in:
Julia Radzhabova 2020-02-26 14:24:58 +03:00
parent 54335503c4
commit a4aac1aa0e
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template
View file

@ -103,10 +103,15 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-large"> <td class="padding-small">
<div id="shape-checkbox-autofit"></div> <div id="shape-checkbox-autofit"></div>
</td> </td>
</tr> </tr>
<tr>
<td class="padding-large">
<div id="shape-checkbox-overflow"></div>
</td>
</tr>
</table> </table>
<div class="separator horizontal padding-large"></div> <div class="separator horizontal padding-large"></div>
<table cols="2" style="width: 100%;"> <table cols="2" style="width: 100%;">

16
apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -261,6 +261,18 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
} }
}, this)); }, this));
this.chOverflow = new Common.UI.CheckBox({
el: $('#shape-checkbox-overflow'),
labelText: this.textOverflow
});
this.chOverflow.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_putVertOverflowType(field.getValue()=='checked' ? AscFormat.nOTOwerflow : AscFormat.nOTClip);
}
}, this));
// Rotation // Rotation
this.spnAngle = new Common.UI.MetricSpinner({ this.spnAngle = new Common.UI.MetricSpinner({
el: $('#shape-advanced-spin-angle'), el: $('#shape-advanced-spin-angle'),
@ -601,6 +613,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
this.btnsCategory[3].setDisabled(null === margins); // Margins this.btnsCategory[3].setDisabled(null === margins); // Margins
this.chAutofit.setValue(shapeprops.asc_getTextFitType()==AscFormat.text_fit_Auto); this.chAutofit.setValue(shapeprops.asc_getTextFitType()==AscFormat.text_fit_Auto);
this.chOverflow.setValue(shapeprops.asc_getVertOverflowType()==AscFormat.nOTOwerflow);
var shapetype = shapeprops.asc_getType(); var shapetype = shapeprops.asc_getType();
this.btnsCategory[4].setDisabled(shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3' this.btnsCategory[4].setDisabled(shapetype=='line' || shapetype=='bentConnector2' || shapetype=='bentConnector3'
@ -880,7 +893,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
textTwoCell: 'Move and size with cells', textTwoCell: 'Move and size with cells',
textTextBox: 'Text Box', textTextBox: 'Text Box',
textAutofit: 'AutoFit', textAutofit: 'AutoFit',
textResizeFit: 'Resize shape to fit text' textResizeFit: 'Resize shape to fit text',
textOverflow: 'Allow text to overflow shape'
}, SSE.Views.ShapeSettingsAdvanced || {})); }, SSE.Views.ShapeSettingsAdvanced || {}));
}); });

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -2075,6 +2075,7 @@
"SSE.Views.ShapeSettingsAdvanced.textTextBox": "Text Box", "SSE.Views.ShapeSettingsAdvanced.textTextBox": "Text Box",
"SSE.Views.ShapeSettingsAdvanced.textAutofit": "AutoFit", "SSE.Views.ShapeSettingsAdvanced.textAutofit": "AutoFit",
"SSE.Views.ShapeSettingsAdvanced.textResizeFit": "Resize shape to fit text", "SSE.Views.ShapeSettingsAdvanced.textResizeFit": "Resize shape to fit text",
"SSE.Views.ShapeSettingsAdvanced.textOverflow": "Allow text to overflow shape",
"SSE.Views.SignatureSettings.notcriticalErrorTitle": "Warning", "SSE.Views.SignatureSettings.notcriticalErrorTitle": "Warning",
"SSE.Views.SignatureSettings.strDelete": "Remove Signature", "SSE.Views.SignatureSettings.strDelete": "Remove Signature",
"SSE.Views.SignatureSettings.strDetails": "Signature Details", "SSE.Views.SignatureSettings.strDetails": "Signature Details",