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

[SSE] [PE] [DE] Fix paragraph settings layout

Browse source
This commit is contained in:
Julia Svinareva 2019-08-09 13:07:59 +03:00
parent 106289615b
commit 1b597d7830
9 changed files with 248 additions and 272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
apps/documenteditor/main/app/template/ParagraphSettingsAdvanced.template
View file

@ -10,6 +10,7 @@
<div id="paragraphadv-spin-outline-level"></div> <div id="paragraphadv-spin-outline-level"></div>
</div> </div>
</div> </div>
<div><label class="header" style="padding-bottom: 4px;"><%= scope.strIndent %></label></div>
<div> <div>
<div class="padding-large" style="display: inline-block;"> <div class="padding-large" style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsLeftText %></label> <label class="input-label"><%= scope.strIndentsLeftText %></label>
@ -20,14 +21,16 @@
<div id="paragraphadv-spin-indent-right"></div> <div id="paragraphadv-spin-indent-right"></div>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div class="padding-large" style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsSpecial %></label> <div>
<div id="paragraphadv-spin-special"></div> <label class="input-label"><%= scope.strIndentsSpecial %></label>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div>
<label class="input-label"><%= scope.strIndentsSpecialBy %></label> <div id="paragraphadv-spin-special" style="display: inline-block;"></div>
<div id="paragraphadv-spin-special-by"></div> <div id="paragraphadv-spin-special-by" style="display: inline-block;"></div>
</div>
</div> </div>
</div> </div>
<div><label class="header" style="padding-bottom: 4px;"><%= scope.strSpacing %></label></div>
<div> <div>
<div style="display: inline-block;"> <div style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsSpacingBefore %></label> <label class="input-label"><%= scope.strIndentsSpacingBefore %></label>
@ -38,12 +41,13 @@
<div id="paragraphadv-spin-spacing-after"></div> <div id="paragraphadv-spin-spacing-after"></div>
</div> </div>
<div style="display: inline-block;"> <div style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsLineSpacing %></label> <div>
<div id="paragraphadv-spin-line-rule"></div> <label class="input-label"><%= scope.strIndentsLineSpacing %></label>
</div> </div>
<div style="display: inline-block;"> <div>
<label class="input-label"><%= scope.strIndentLineSpacingAt %></label> <div id="paragraphadv-spin-line-rule" style="display: inline-block;"></div>
<div id="paragraphadv-spin-line-height"></div> <div id="paragraphadv-spin-line-height" style="display: inline-block;"></div>
</div>
</div> </div>
</div> </div>
<div class="text-only" style="padding-top: 8px;"> <div class="text-only" style="padding-top: 8px;">
@ -51,7 +55,7 @@
</div> </div>
<div class="padding-large" style="padding-top: 16px;"> <div class="padding-large" style="padding-top: 16px;">
<div style="border: 1px solid #cbcbcb; width: 350px;"> <div style="border: 1px solid #cbcbcb; width: 350px;">
<div id="paragraphadv-indent-preview" style="height: 94px; position: relative;"></div> <div id="paragraphadv-indent-preview" style="height: 58px; position: relative;"></div>
</div> </div>
</div> </div>
</div> </div>
@ -113,13 +117,13 @@
<div class="padding-small"> <div class="padding-small">
<label class="header"><%= scope.textEffects %></label> <label class="header"><%= scope.textEffects %></label>
</div> </div>
<div style="width: 250px;"> <div>
<div class="padding-large" style="display: inline-block;"> <div class="padding-large" style="display: inline-block;">
<div class="padding-small" id="paragraphadv-checkbox-strike"></div> <div class="padding-small" id="paragraphadv-checkbox-strike"></div>
<div class="padding-small" id="paragraphadv-checkbox-double-strike"></div> <div class="padding-small" id="paragraphadv-checkbox-double-strike"></div>
<div id="paragraphadv-checkbox-superscript"></div> <div id="paragraphadv-checkbox-superscript"></div>
</div> </div>
<div class="padding-large" style="display: inline-block; float: right;"> <div class="padding-large" style="display: inline-block; padding-left: 40px;">
<div class="padding-small" id="paragraphadv-checkbox-subscript"></div> <div class="padding-small" id="paragraphadv-checkbox-subscript"></div>
<div class="padding-small" id="paragraphadv-checkbox-small-caps"></div> <div class="padding-small" id="paragraphadv-checkbox-small-caps"></div>
<div id="paragraphadv-checkbox-all-caps"></div> <div id="paragraphadv-checkbox-all-caps"></div>
@ -144,56 +148,56 @@
</div> </div>
</div> </div>
<div id="id-adv-paragraph-tabs" class="settings-panel"> <div id="id-adv-paragraph-tabs" class="settings-panel">
<div class="inner-content" style="width: 330px;"> <div class="inner-content">
<div class="padding-large"> <div class="padding-large">
<label class="input-label"><%= scope.textDefault %></label> <label class="input-label"><%= scope.textDefault %></label>
<div id="paraadv-spin-default-tab"></div> <div id="paraadv-spin-default-tab"></div>
</div> </div>
<div> <div>
<div class="padding-small" style="margin-right: 9px; display: inline-block;"> <div class="padding-large" style="display: inline-block; margin-right: 9px;">
<label class="input-label"><%= scope.textTabPosition %></label> <label class="input-label"><%= scope.textTabPosition %></label>
<div id="paraadv-spin-tab"></div> <div id="paraadv-spin-tab"></div>
</div> </div>
<div class="padding-small" style="margin-right: 9px; display: inline-block;"> <div class="padding-large" style=" display: inline-block; margin-right: 9px;">
<label class="input-label"><%= scope.textAlign %></label> <label class="input-label"><%= scope.textAlign %></label>
<div id="paraadv-cmb-align"></div> <div id="paraadv-cmb-align"></div>
</div> </div>
<div class="padding-small" style="display: inline-block;"> <div class="padding-large" style="display: inline-block;">
<label class="input-label"><%= scope.textLeader %></label> <label class="input-label"><%= scope.textLeader %></label>
<div id="paraadv-cmb-leader"></div> <div id="paraadv-cmb-leader"></div>
</div> </div>
</div> </div>
<div> <div>
<div colspan=3 class="padding-large"> <div colspan=3 class="padding-large">
<div id="paraadv-list-tabs" style="width:310px; height: 110px;"></div> <div id="paraadv-list-tabs" style="width:348px; height: 110px;"></div>
</div> </div>
</div> </div>
<div> <div>
<button type="button" class="btn btn-text-default" id="paraadv-button-add-tab" style="width:95px;margin-right: 9px; display: inline-block;"><%= scope.textSet %></button> <button type="button" class="btn btn-text-default" id="paraadv-button-add-tab" style="width:108px;margin-right: 9px; display: inline-block;"><%= scope.textSet %></button>
<button type="button" class="btn btn-text-default" id="paraadv-button-remove-tab" style="width:95px;margin-right: 9px; display: inline-block;"><%= scope.textRemove %></button> <button type="button" class="btn btn-text-default" id="paraadv-button-remove-tab" style="width:108px;margin-right: 9px; display: inline-block;"><%= scope.textRemove %></button>
<button type="button" class="btn btn-text-default" id="paraadv-button-remove-all" style="width:95px;display: inline-block;"><%= scope.textRemoveAll %></button> <button type="button" class="btn btn-text-default" id="paraadv-button-remove-all" style="width:108px;display: inline-block;"><%= scope.textRemoveAll %></button>
</div> </div>
</div> </div>
</div> </div>
<div id="id-adv-paragraph-margins" class="settings-panel"> <div id="id-adv-paragraph-margins" class="settings-panel">
<div class="inner-content"> <div class="inner-content">
<div style="width: 230px;"> <div>
<div class="padding-small" style="display: inline-block;"> <div class="padding-small" style="display: inline-block;">
<label class="input-label"><%= scope.textTop %></label> <label class="input-label"><%= scope.textTop %></label>
<div id="paraadv-number-margin-top"></div> <div id="paraadv-number-margin-top"></div>
</div> </div>
<div class="padding-small" style="display: inline-block; float: right;"> <div class="padding-small" style="display: inline-block; padding-left: 15px;">
<label class="input-label"><%= scope.textLeft %></label> <label class="input-label"><%= scope.textLeft %></label>
<div id="paraadv-number-margin-left"></div> <div id="paraadv-number-margin-left"></div>
</div> </div>
</div> </div>
<div style="width: 230px;"> <div>
<div class="padding-small" style="display: inline-block;"> <div class="padding-small" style="display: inline-block;">
<label class="input-label"><%= scope.textBottom %></label> <label class="input-label"><%= scope.textBottom %></label>
<div id="paraadv-number-margin-bottom"></div> <div id="paraadv-number-margin-bottom"></div>
</div> </div>
<div class="padding-small" style="display: inline-block; float: right;"> <div class="padding-small" style="display: inline-block; padding-left: 15px;">
<label class="input-label"><%= scope.textRight %></label> <label class="input-label"><%= scope.textRight %></label>
<div id="paraadv-number-margin-right"></div> <div id="paraadv-number-margin-right"></div>
</div> </div>

62
apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -96,7 +96,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this._originalProps = new Asc.asc_CParagraphProperty(this.options.paragraphProps); this._originalProps = new Asc.asc_CParagraphProperty(this.options.paragraphProps);
this.isChart = this.options.isChart; this.isChart = this.options.isChart;
this.CurLineRuleIdx = this._originalProps.asc_getSpacing().get_LineRule(); this.CurLineRuleIdx = this._originalProps.get_Spacing().get_LineRule();
this._arrLineRule = [ this._arrLineRule = [
{displayValue: this.textAtLeast,defaultValue: 5, value: c_paragraphLinerule.LINERULE_LEAST, minValue: 0.03, step: 0.01, defaultUnit: 'cm'}, {displayValue: this.textAtLeast,defaultValue: 5, value: c_paragraphLinerule.LINERULE_LEAST, minValue: 0.03, step: 0.01, defaultUnit: 'cm'},
@ -213,7 +213,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numSpacingBefore.on('change', _.bind(function (field, newValue, oldValue, eOpts) { this.numSpacingBefore.on('change', _.bind(function (field, newValue, oldValue, eOpts) {
if (this.Spacing === null) { if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.asc_getSpacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.Before = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); this.Spacing.Before = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
}, this)); }, this));
@ -233,7 +233,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numSpacingAfter.on('change', _.bind(function (field, newValue, oldValue, eOpts) { this.numSpacingAfter.on('change', _.bind(function (field, newValue, oldValue, eOpts) {
if (this.Spacing === null) { if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.asc_getSpacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.After = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); this.Spacing.After = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
}, this)); }, this));
@ -527,7 +527,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numTab = new Common.UI.MetricSpinner({ this.numTab = new Common.UI.MetricSpinner({
el: $('#paraadv-spin-tab'), el: $('#paraadv-spin-tab'),
step: .1, step: .1,
width: 95, width: 108,
defaultUnit : "cm", defaultUnit : "cm",
value: '1.25 cm', value: '1.25 cm',
maxValue: 55.87, maxValue: 55.87,
@ -538,7 +538,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numDefaultTab = new Common.UI.MetricSpinner({ this.numDefaultTab = new Common.UI.MetricSpinner({
el: $('#paraadv-spin-default-tab'), el: $('#paraadv-spin-default-tab'),
step: .1, step: .1,
width: 95, width: 108,
defaultUnit : "cm", defaultUnit : "cm",
value: '1.25 cm', value: '1.25 cm',
maxValue: 55.87, maxValue: 55.87,
@ -558,9 +558,9 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
template: _.template(['<div class="listview inner" style=""></div>'].join('')), template: _.template(['<div class="listview inner" style=""></div>'].join('')),
itemTemplate: _.template([ itemTemplate: _.template([
'<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;">', '<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;">',
'<div style="width:98px;padding-right: 5px;display: inline-block;"><%= value %></div>', '<div style="width:117px;display: inline-block;"><%= value %></div>',
'<div style="width:98px;padding-right: 5px;display: inline-block;padding-left: 7px;"><%= displayTabAlign %></div>', '<div style="width:121px;display: inline-block;"><%= displayTabAlign %></div>',
'<div style="width:98px;display: inline-block;padding-left: 16px;"><%= displayTabLeader %></div>', '<div style="width:96px;display: inline-block;"><%= displayTabLeader %></div>',
'</div>' '</div>'
].join('')) ].join(''))
}); });
@ -579,8 +579,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.cmbAlign = new Common.UI.ComboBox({ this.cmbAlign = new Common.UI.ComboBox({
el : $('#paraadv-cmb-align'), el : $('#paraadv-cmb-align'),
style : 'width: 95px;', style : 'width: 108px;',
menuStyle : 'min-width: 95px;', menuStyle : 'min-width: 108px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : this._arrTabAlign data : this._arrTabAlign
@ -589,8 +589,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.cmbLeader = new Common.UI.ComboBox({ this.cmbLeader = new Common.UI.ComboBox({
el : $('#paraadv-cmb-leader'), el : $('#paraadv-cmb-leader'),
style : 'width: 95px;', style : 'width: 108px;',
menuStyle : 'min-width: 95px;', menuStyle : 'min-width: 108px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : this._arrTabLeader data : this._arrTabLeader
@ -780,27 +780,27 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
this.numIndentsLeft.setValue(this.LeftIndent!==null ? Common.Utils.Metric.fnRecalcFromMM(this.LeftIndent) : '', true); this.numIndentsLeft.setValue(this.LeftIndent!==null ? Common.Utils.Metric.fnRecalcFromMM(this.LeftIndent) : '', true);
this.numIndentsRight.setValue((props.get_Ind() !== null && props.get_Ind().get_Right() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Right()) : '', true); this.numIndentsRight.setValue((props.get_Ind() !== null && props.get_Ind().get_Right() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Right()) : '', true);
this.numSpacingBefore.setValue((props.asc_getSpacing() !== null && props.asc_getSpacing().asc_getBefore() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getSpacing().asc_getBefore()) : '', true); this.numSpacingBefore.setValue((props.get_Spacing() !== null && props.get_Spacing().get_Before() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Before()) : '', true);
this.numSpacingAfter.setValue((props.asc_getSpacing() !== null && props.asc_getSpacing().asc_getAfter() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getSpacing().asc_getAfter()) : '', true); this.numSpacingAfter.setValue((props.get_Spacing() !== null && props.get_Spacing().get_After() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_After()) : '', true);
var linerule = props.asc_getSpacing().asc_getLineRule(); var linerule = props.get_Spacing().get_LineRule();
this.cmbLineRule.setValue((linerule !== null) ? linerule : '', true); this.cmbLineRule.setValue((linerule !== null) ? linerule : '', true);
if(props.asc_getSpacing() !== null && props.asc_getSpacing().asc_getLine() !== null) { if(props.get_Spacing() !== null && props.get_Spacing().get_Line() !== null) {
this.numLineHeight.setValue((linerule==c_paragraphLinerule.LINERULE_AUTO) ? props.asc_getSpacing().asc_getLine() : Common.Utils.Metric.fnRecalcFromMM(props.asc_getSpacing().asc_getLine()), true); this.numLineHeight.setValue((linerule==c_paragraphLinerule.LINERULE_AUTO) ? props.get_Spacing().get_Line() : Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Line()), true);
} else { } else {
this.numLineHeight.setValue('', true); this.numLineHeight.setValue('', true);
} }
this.chAddInterval.setValue((props.asc_getContextualSpacing() !== null && props.asc_getContextualSpacing() !== undefined) ? props.asc_getContextualSpacing() : 'indeterminate', true); this.chAddInterval.setValue((props.get_ContextualSpacing() !== null && props.get_ContextualSpacing() !== undefined) ? props.get_ContextualSpacing() : 'indeterminate', true);
if(this.CurSpecial === undefined) { if(this.CurSpecial === undefined) {
this.CurSpecial = (props.asc_getInd().get_FirstLine() === 0) ? c_paragraphSpecial.NONE_SPECIAL : ((props.asc_getInd().get_FirstLine() > 0) ? c_paragraphSpecial.FIRST_LINE : c_paragraphSpecial.HANGING); this.CurSpecial = (props.get_Ind().get_FirstLine() === 0) ? c_paragraphSpecial.NONE_SPECIAL : ((props.get_Ind().get_FirstLine() > 0) ? c_paragraphSpecial.FIRST_LINE : c_paragraphSpecial.HANGING);
} }
this.cmbSpecial.setValue(this.CurSpecial); this.cmbSpecial.setValue(this.CurSpecial);
this.numSpecialBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true); this.numSpecialBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true);
this.cmbTextAlignment.setValue((props.asc_getJc() !== undefined && props.asc_getJc() !== null) ? props.asc_getJc() : c_paragraphTextAlignment.LEFT, true); this.cmbTextAlignment.setValue((props.get_Jc() !== undefined && props.get_Jc() !== null) ? props.get_Jc() : c_paragraphTextAlignment.LEFT, true);
this.chKeepLines.setValue((props.get_KeepLines() !== null && props.get_KeepLines() !== undefined) ? props.get_KeepLines() : 'indeterminate', true); this.chKeepLines.setValue((props.get_KeepLines() !== null && props.get_KeepLines() !== undefined) ? props.get_KeepLines() : 'indeterminate', true);
this.chBreakBefore.setValue((props.get_PageBreakBefore() !== null && props.get_PageBreakBefore() !== undefined) ? props.get_PageBreakBefore() : 'indeterminate', true); this.chBreakBefore.setValue((props.get_PageBreakBefore() !== null && props.get_PageBreakBefore() !== undefined) ? props.get_PageBreakBefore() : 'indeterminate', true);
@ -887,8 +887,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
tabPos: pos, tabPos: pos,
value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.getCurrentMetricName(), value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.getCurrentMetricName(),
tabAlign: tab.get_Value(), tabAlign: tab.get_Value(),
tabLeader: tab.asc_getLeader(), tabLeader: tab.get_Leader(),
displayTabLeader: this._arrKeyTabLeader[tab.asc_getLeader()], displayTabLeader: this._arrKeyTabLeader[tab.get_Leader()],
displayTabAlign: this._arrKeyTabAlign[tab.get_Value()] displayTabAlign: this._arrKeyTabAlign[tab.get_Value()]
}); });
arr.push(rec); arr.push(rec);
@ -1365,7 +1365,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
onLineRuleSelect: function(combo, record) { onLineRuleSelect: function(combo, record) {
if (this.Spacing === null) { if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.asc_getSpacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.LineRule = record.value; this.Spacing.LineRule = record.value;
if ( this.CurLineRuleIdx !== this.Spacing.LineRule ) { if ( this.CurLineRuleIdx !== this.Spacing.LineRule ) {
@ -1389,7 +1389,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
return; return;
if (this.Spacing === null) { if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.asc_getSpacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.Line = (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); this.Spacing.Line = (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
}, },
@ -1438,8 +1438,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textTitle: 'Paragraph - Advanced Settings', textTitle: 'Paragraph - Advanced Settings',
strIndentsFirstLine: 'First line', strIndentsFirstLine: 'First line',
strIndentsLeftText: 'Indent Left', strIndentsLeftText: 'Left',
strIndentsRightText: 'Indent Right', strIndentsRightText: 'Right',
strParagraphIndents: 'Indents & Spacing', strParagraphIndents: 'Indents & Spacing',
strParagraphPosition: 'Placement', strParagraphPosition: 'Placement',
strParagraphFont: 'Font', strParagraphFont: 'Font',
@ -1493,9 +1493,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textLeader: 'Leader', textLeader: 'Leader',
textNone: 'None', textNone: 'None',
strParagraphLine: 'Line & Page Breaks', strParagraphLine: 'Line & Page Breaks',
strIndentsSpacingBefore: 'Spacing Before', strIndentsSpacingBefore: 'Before',
strIndentsSpacingAfter: 'Spacing After', strIndentsSpacingAfter: 'After',
strIndentLineSpacingAt: 'At',
strIndentsLineSpacing: 'Line Spacing', strIndentsLineSpacing: 'Line Spacing',
txtAutoText: 'Auto', txtAutoText: 'Auto',
textAuto: 'Multiple', textAuto: 'Multiple',
@ -1506,13 +1505,14 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textNoneSpecial: '(none)', textNoneSpecial: '(none)',
textFirstLine: 'First line', textFirstLine: 'First line',
textHanging: 'Hanging', textHanging: 'Hanging',
strIndentsSpecialBy: 'By',
textCentered: 'Centered', textCentered: 'Centered',
textJustified: 'Justified', textJustified: 'Justified',
textBodyText: 'BodyText', textBodyText: 'BodyText',
textLevel: 'Level ', textLevel: 'Level ',
strIndentsTextAlignment: 'Text Alignment', strIndentsTextAlignment: 'Text Alignment',
strIndentsOutlinelevel: 'Outline level' strIndentsOutlinelevel: 'Outline level',
strIndent: 'Indents',
strSpacing: 'Spacing'
}, DE.Views.ParagraphSettingsAdvanced || {})); }, DE.Views.ParagraphSettingsAdvanced || {}));
}); });

12
apps/documenteditor/main/locale/en.json
View file

@ -1707,8 +1707,8 @@
"DE.Views.ParagraphSettingsAdvanced.strBorders": "Borders & Fill", "DE.Views.ParagraphSettingsAdvanced.strBorders": "Borders & Fill",
"DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Page break before", "DE.Views.ParagraphSettingsAdvanced.strBreakBefore": "Page break before",
"DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough", "DE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Indent Left", "DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Left",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Indent Right", "DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Right",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Keep lines together", "DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Keep lines together",
"DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Keep with next", "DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Keep with next",
"DE.Views.ParagraphSettingsAdvanced.strMargins": "Paddings", "DE.Views.ParagraphSettingsAdvanced.strMargins": "Paddings",
@ -1756,9 +1756,8 @@
"DE.Views.ParagraphSettingsAdvanced.tipTop": "Set top border only", "DE.Views.ParagraphSettingsAdvanced.tipTop": "Set top border only",
"DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "No borders", "DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "No borders",
"DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Line & Page Breaks", "DE.Views.ParagraphSettingsAdvanced.strParagraphLine": "Line & Page Breaks",
"DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Spacing Before", "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Before",
"DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Spacing After", "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "After",
"DE.Views.ParagraphSettingsAdvanced.strIndentLineSpacingAt": "At",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing", "DE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing",
"DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto", "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
"DE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple", "DE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple",
@ -1769,13 +1768,14 @@
"DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)", "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)",
"DE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line", "DE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line",
"DE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging", "DE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging",
"DE.Views.ParagraphSettingsAdvanced.strIndentsSpecialBy": "By",
"DE.Views.ParagraphSettingsAdvanced.textCentered": "Centered", "DE.Views.ParagraphSettingsAdvanced.textCentered": "Centered",
"DE.Views.ParagraphSettingsAdvanced.textJustified": "Justified", "DE.Views.ParagraphSettingsAdvanced.textJustified": "Justified",
"DE.Views.ParagraphSettingsAdvanced.textBodyText": "BodyText", "DE.Views.ParagraphSettingsAdvanced.textBodyText": "BodyText",
"DE.Views.ParagraphSettingsAdvanced.textLevel": "Level ", "DE.Views.ParagraphSettingsAdvanced.textLevel": "Level ",
"DE.Views.ParagraphSettingsAdvanced.strIndentsTextAlignment": "Text Alignment", "DE.Views.ParagraphSettingsAdvanced.strIndentsTextAlignment": "Text Alignment",
"DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Outline level", "DE.Views.ParagraphSettingsAdvanced.strIndentsOutlinelevel": "Outline level",
"DE.Views.ParagraphSettingsAdvanced.strIndent": "Indents",
"DE.Views.ParagraphSettingsAdvanced.strSpacing": "Spacing",
"DE.Views.RightMenu.txtChartSettings": "Chart settings", "DE.Views.RightMenu.txtChartSettings": "Chart settings",
"DE.Views.RightMenu.txtHeaderFooterSettings": "Header and footer settings", "DE.Views.RightMenu.txtHeaderFooterSettings": "Header and footer settings",
"DE.Views.RightMenu.txtImageSettings": "Image settings", "DE.Views.RightMenu.txtImageSettings": "Image settings",

137
apps/presentationeditor/main/app/template/ParagraphSettingsAdvanced.template
View file

@ -6,6 +6,7 @@
<div id="paragraphadv-spin-text-alignment"></div> <div id="paragraphadv-spin-text-alignment"></div>
</div> </div>
</div> </div>
<div style="padding-bottom: 4px;"><label class="header"><%= scope.strIndent %></label></div>
<div> <div>
<div class="padding-large" style="display: inline-block;"> <div class="padding-large" style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsLeftText %></label> <label class="input-label"><%= scope.strIndentsLeftText %></label>
@ -16,114 +17,98 @@
<div id="paragraphadv-spin-indent-right"></div> <div id="paragraphadv-spin-indent-right"></div>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div class="padding-large" style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsSpecial %></label> <div>
<div id="paragraphadv-spin-special"></div> <label class="input-label"><%= scope.strIndentsSpecial %></label>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div>
<label class="input-label"><%= scope.strIndentsSpecialBy %></label> <div id="paragraphadv-spin-special" style="display: inline-block;"></div>
<div id="paragraphadv-spin-special-by"></div> <div id="paragraphadv-spin-special-by" style="display: inline-block;"></div>
</div>
</div> </div>
</div> </div>
<div style="padding-bottom: 4px;"><label class="header"><%= scope.strSpacing %></label></div>
<div> <div>
<div class="padding-large" style="display: inline-block;"> <div style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsSpacingBefore %></label> <label class="input-label"><%= scope.strIndentsSpacingBefore %></label>
<div id="paragraphadv-spin-spacing-before"></div> <div id="paragraphadv-spin-spacing-before"></div>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsSpacingAfter %></label> <label class="input-label"><%= scope.strIndentsSpacingAfter %></label>
<div id="paragraphadv-spin-spacing-after"></div> <div id="paragraphadv-spin-spacing-after"></div>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsLineSpacing %></label> <div>
<div id="paragraphadv-spin-line-rule"></div> <label class="input-label"><%= scope.strIndentsLineSpacing %></label>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div>
<label class="input-label"><%= scope.strIndentLineSpacingAt %></label> <div id="paragraphadv-spin-line-rule" style="display: inline-block;"></div>
<div id="paragraphadv-spin-line-height"></div> <div id="paragraphadv-spin-line-height" style="display: inline-block;"></div>
</div>
</div> </div>
</div> </div>
<div class="padding-large"> <div class="padding-large" style="padding-top: 16px;">
<div style="border: 1px solid #cbcbcb; width: 350px;"> <div style="border: 1px solid #cbcbcb; width: 350px;">
<div id="paragraphadv-indent-preview" style="height: 94px; position: relative;"></div> <div id="paragraphadv-indent-preview" style="height: 80px; position: relative;"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div id="id-adv-paragraph-font" class="settings-panel"> <div id="id-adv-paragraph-font" class="settings-panel">
<div class="inner-content"> <div class="inner-content" style="width: 100%;">
<table cols="2" style="width: 300px;"> <div class="padding-small">
<tr> <label class="header"><%= scope.textEffects %></label>
<td colspan=2 class="padding-small"> </div>
<label class="header"><%= scope.textEffects %></label> <div>
</td> <div class="padding-large" style="display: inline-block;">
</tr> <div class="padding-small" id="paragraphadv-checkbox-strike"></div>
<tr> <div class="padding-small" id="paragraphadv-checkbox-double-strike"></div>
<td class="padding-small"> <div id="paragraphadv-checkbox-superscript"></div>
<div id="paragraphadv-checkbox-strike"></div> </div>
</td> <div class="padding-large" style="display: inline-block; padding-left: 40px;">
<td class="padding-small"> <div class="padding-small" id="paragraphadv-checkbox-subscript"></div>
<div id="paragraphadv-checkbox-subscript"></div> <div class="padding-small" id="paragraphadv-checkbox-small-caps"></div>
</td> <div id="paragraphadv-checkbox-all-caps"></div>
</tr> </div>
<tr> </div>
<td class="padding-small"> <div class="padding-small">
<div id="paragraphadv-checkbox-double-strike"></div> <label class="header"><%= scope.textCharacterSpacing %></label>
</td> </div>
<td class="padding-small"> <div class="padding-large">
<div id="paragraphadv-checkbox-small-caps"></div> <div style="display: inline-block;">
</td> <div id="paragraphadv-spin-spacing"></div>
</tr> </div>
<tr> </div>
<td class="padding-large"> <div style="border: 1px solid #cbcbcb;">
<div id="paragraphadv-checkbox-superscript"></div> <div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div>
</td> </div>
<td class="padding-large">
<div id="paragraphadv-checkbox-all-caps"></div>
</td>
</tr>
<tr>
<td colspan=2 class="padding-small">
<label class="header"><%= scope.textCharacterSpacing %></label>
</td>
</tr>
<tr>
<td colspan=2 class="padding-large" width="50%">
<div id="paragraphadv-spin-spacing"></div>
</td>
</tr>
<tr>
<td colspan=2>
<div style="border: 1px solid #cbcbcb;">
<div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative;margin: 0 auto;"></div>
</div>
</td>
</tr>
</table>
</div> </div>
</div> </div>
<div id="id-adv-paragraph-tabs" class="settings-panel"> <div id="id-adv-paragraph-tabs" class="settings-panel">
<div class="inner-content" style="width: 290px;"> <div class="inner-content">
<div class="padding-large"> <div class="padding-large">
<label class="input-label"><%= scope.textDefault %></label> <label class="input-label"><%= scope.textDefault %></label>
<div id="paraadv-spin-default-tab"></div> <div id="paraadv-spin-default-tab"></div>
</div> </div>
<div> <div>
<div class="padding-small" style="display: inline-block; margin-right: 10px;"> <div class="padding-large" style="display: inline-block; margin-right: 9px;">
<label class="input-label"><%= scope.textTabPosition %></label> <label class="input-label"><%= scope.textTabPosition %></label>
<div id="paraadv-spin-tab"></div> <div id="paraadv-spin-tab"></div>
</div> </div>
<div class="padding-small" style="display: inline-block;"> <div class="padding-large" style=" display: inline-block; margin-right: 9px;">
<label class="input-label"><%= scope.textAlign %></label> <label class="input-label"><%= scope.textAlign %></label>
<div id="paraadv-cmb-align"></div> <div id="paraadv-cmb-align"></div>
</div> </div>
</div>
<div class="padding-large">
<div id="paraadv-list-tabs" style="width:270px; height: 94px;"></div>
</div> </div>
<div> <div>
<button type="button" class="btn btn-text-default" id="paraadv-button-add-tab" style="width:85px;margin-right: 4px;"><%= scope.textSet %></button> <div colspan=3 class="padding-large">
<button type="button" class="btn btn-text-default" id="paraadv-button-remove-tab" style="width:85px;margin-right: 4px;"><%= scope.textRemove %></button> <div id="paraadv-list-tabs" style="width:348px; height: 110px;"></div>
<button type="button" class="btn btn-text-default" id="paraadv-button-remove-all" style="width:85px;"><%= scope.textRemoveAll %></button> </div>
</div>
<div>
<button type="button" class="btn btn-text-default" id="paraadv-button-add-tab" style="width:108px;margin-right: 9px; display: inline-block;"><%= scope.textSet %></button>
<button type="button" class="btn btn-text-default" id="paraadv-button-remove-tab" style="width:108px;margin-right: 9px; display: inline-block;"><%= scope.textRemove %></button>
<button type="button" class="btn btn-text-default" id="paraadv-button-remove-all" style="width:108px;display: inline-block;"><%= scope.textRemoveAll %></button>
</div> </div>
</div> </div>
</div> </div>

48
apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -86,7 +86,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
{displayValue: this.textExact, defaultValue: 5, value: c_paragraphLinerule.LINERULE_EXACT, minValue: 0.03, step: 0.01, defaultUnit: 'cm'} {displayValue: this.textExact, defaultValue: 5, value: c_paragraphLinerule.LINERULE_EXACT, minValue: 0.03, step: 0.01, defaultUnit: 'cm'}
]; ];
var curLineRule = this._originalProps.asc_getSpacing().get_LineRule(), var curLineRule = this._originalProps.get_Spacing().get_LineRule(),
curItem = _.findWhere(this._arrLineRule, {value: curLineRule}); curItem = _.findWhere(this._arrLineRule, {value: curLineRule});
this.CurLineRuleIdx = this._arrLineRule.indexOf(curItem); this.CurLineRuleIdx = this._arrLineRule.indexOf(curItem);
@ -208,7 +208,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
this.numSpacingBefore.on('change', _.bind(function (field, newValue, oldValue, eOpts) { this.numSpacingBefore.on('change', _.bind(function (field, newValue, oldValue, eOpts) {
if (this.Spacing === null) { if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.asc_getSpacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.Before = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); this.Spacing.Before = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
}, this)); }, this));
@ -228,7 +228,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
this.numSpacingAfter.on('change', _.bind(function (field, newValue, oldValue, eOpts) { this.numSpacingAfter.on('change', _.bind(function (field, newValue, oldValue, eOpts) {
if (this.Spacing === null) { if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.asc_getSpacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.After = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); this.Spacing.After = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
}, this)); }, this));
@ -321,7 +321,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
this.numTab = new Common.UI.MetricSpinner({ this.numTab = new Common.UI.MetricSpinner({
el: $('#paraadv-spin-tab'), el: $('#paraadv-spin-tab'),
step: .1, step: .1,
width: 128, width: 108,
defaultUnit : "cm", defaultUnit : "cm",
value: '1.25 cm', value: '1.25 cm',
maxValue: 55.87, maxValue: 55.87,
@ -332,7 +332,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
this.numDefaultTab = new Common.UI.MetricSpinner({ this.numDefaultTab = new Common.UI.MetricSpinner({
el: $('#paraadv-spin-default-tab'), el: $('#paraadv-spin-default-tab'),
step: .1, step: .1,
width: 128, width: 108,
defaultUnit : "cm", defaultUnit : "cm",
value: '1.25 cm', value: '1.25 cm',
maxValue: 55.87, maxValue: 55.87,
@ -352,7 +352,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
template: _.template(['<div class="listview inner" style=""></div>'].join('')), template: _.template(['<div class="listview inner" style=""></div>'].join('')),
itemTemplate: _.template([ itemTemplate: _.template([
'<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;">', '<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;">',
'<div style="width: 138px;display: inline-block;"><%= value %></div>', '<div style="width: 117px;display: inline-block;"><%= value %></div>',
'<div style="display: inline-block;"><%= displayTabAlign %></div>', '<div style="display: inline-block;"><%= displayTabAlign %></div>',
'</div>' '</div>'
].join('')) ].join(''))
@ -372,8 +372,8 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
this.cmbAlign = new Common.UI.ComboBox({ this.cmbAlign = new Common.UI.ComboBox({
el : $('#paraadv-cmb-align'), el : $('#paraadv-cmb-align'),
style : 'width: 128px;', style : 'width: 108px;',
menuStyle : 'min-width: 128px;', menuStyle : 'min-width: 108px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : this._arrTabAlign data : this._arrTabAlign
@ -426,22 +426,22 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
this.numIndentsLeft.setValue((props.get_Ind() !== null && props.get_Ind().get_Left() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Left()) : '', true); this.numIndentsLeft.setValue((props.get_Ind() !== null && props.get_Ind().get_Left() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Left()) : '', true);
this.numIndentsRight.setValue((props.get_Ind() !== null && props.get_Ind().get_Right() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Right()) : '', true); this.numIndentsRight.setValue((props.get_Ind() !== null && props.get_Ind().get_Right() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Ind().get_Right()) : '', true);
this.cmbTextAlignment.setValue((props.asc_getJc() !== undefined && props.asc_getJc() !== null) ? props.asc_getJc() : c_paragraphTextAlignment.CENTERED, true); this.cmbTextAlignment.setValue((props.get_Jc() !== undefined && props.get_Jc() !== null) ? props.get_Jc() : c_paragraphTextAlignment.CENTERED, true);
if(this.CurSpecial === undefined) { if(this.CurSpecial === undefined) {
this.CurSpecial = (props.asc_getInd().get_FirstLine() === 0) ? c_paragraphSpecial.NONE_SPECIAL : ((props.asc_getInd().get_FirstLine() > 0) ? c_paragraphSpecial.FIRST_LINE : c_paragraphSpecial.HANGING); this.CurSpecial = (props.get_Ind().get_FirstLine() === 0) ? c_paragraphSpecial.NONE_SPECIAL : ((props.get_Ind().get_FirstLine() > 0) ? c_paragraphSpecial.FIRST_LINE : c_paragraphSpecial.HANGING);
} }
this.cmbSpecial.setValue(this.CurSpecial); this.cmbSpecial.setValue(this.CurSpecial);
this.numSpecialBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true); this.numSpecialBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true);
this.numSpacingBefore.setValue((props.asc_getSpacing() !== null && props.asc_getSpacing().asc_getBefore() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getSpacing().asc_getBefore()) : '', true); this.numSpacingBefore.setValue((props.get_Spacing() !== null && props.get_Spacing().get_Before() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Before()) : '', true);
this.numSpacingAfter.setValue((props.asc_getSpacing() !== null && props.asc_getSpacing().asc_getAfter() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getSpacing().asc_getAfter()) : '', true); this.numSpacingAfter.setValue((props.get_Spacing() !== null && props.get_Spacing().get_After() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_After()) : '', true);
var linerule = props.asc_getSpacing().asc_getLineRule(); var linerule = props.get_Spacing().get_LineRule();
this.cmbLineRule.setValue((linerule !== null) ? linerule : '', true); this.cmbLineRule.setValue((linerule !== null) ? linerule : '', true);
if(props.asc_getSpacing() !== null && props.asc_getSpacing().asc_getLine() !== null) { if(props.get_Spacing() !== null && props.get_Spacing().get_Line() !== null) {
this.numLineHeight.setValue((linerule==c_paragraphLinerule.LINERULE_AUTO) ? props.asc_getSpacing().asc_getLine() : Common.Utils.Metric.fnRecalcFromMM(props.asc_getSpacing().asc_getLine()), true); this.numLineHeight.setValue((linerule==c_paragraphLinerule.LINERULE_AUTO) ? props.get_Spacing().get_Line() : Common.Utils.Metric.fnRecalcFromMM(props.get_Spacing().get_Line()), true);
} else { } else {
this.numLineHeight.setValue('', true); this.numLineHeight.setValue('', true);
} }
@ -743,7 +743,7 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
onLineRuleSelect: function(combo, record) { onLineRuleSelect: function(combo, record) {
if (this.Spacing === null) { if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.asc_getSpacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.LineRule = record.value; this.Spacing.LineRule = record.value;
var selectItem = _.findWhere(this._arrLineRule, {value: record.value}), var selectItem = _.findWhere(this._arrLineRule, {value: record.value}),
@ -766,15 +766,15 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
return; return;
if (this.Spacing === null) { if (this.Spacing === null) {
var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty(); var properties = (this._originalProps) ? this._originalProps : new Asc.asc_CParagraphProperty();
this.Spacing = properties.asc_getSpacing(); this.Spacing = properties.get_Spacing();
} }
this.Spacing.Line = (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); this.Spacing.Line = (this.cmbLineRule.getValue()==c_paragraphLinerule.LINERULE_AUTO) ? field.getNumberValue() : Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
}, },
textTitle: 'Paragraph - Advanced Settings', textTitle: 'Paragraph - Advanced Settings',
strIndentsFirstLine: 'First line', strIndentsFirstLine: 'First line',
strIndentsLeftText: 'Indent Left', strIndentsLeftText: 'Left',
strIndentsRightText: 'Indent Right', strIndentsRightText: 'Right',
strParagraphIndents: 'Indents & Spacing', strParagraphIndents: 'Indents & Spacing',
strParagraphFont: 'Font', strParagraphFont: 'Font',
cancelButtonText: 'Cancel', cancelButtonText: 'Cancel',
@ -807,13 +807,13 @@ define([ 'text!presentationeditor/main/app/template/ParagraphSettingsAdvanced
textNoneSpecial: '(none)', textNoneSpecial: '(none)',
textFirstLine: 'First line', textFirstLine: 'First line',
textHanging: 'Hanging', textHanging: 'Hanging',
strIndentsSpecialBy: 'By', strIndentsSpacingBefore: 'Before',
strIndentsSpacingBefore: 'Spacing Before', strIndentsSpacingAfter: 'After',
strIndentsSpacingAfter: 'Spacing After',
strIndentLineSpacingAt: 'At',
strIndentsLineSpacing: 'Line Spacing', strIndentsLineSpacing: 'Line Spacing',
txtAutoText: 'Auto', txtAutoText: 'Auto',
textAuto: 'Multiple', textAuto: 'Multiple',
textExact: 'Exactly' textExact: 'Exactly',
strIndent: 'Indents',
strSpacing: 'Spacing'
}, PE.Views.ParagraphSettingsAdvanced || {})); }, PE.Views.ParagraphSettingsAdvanced || {}));
}); });

12
apps/presentationeditor/main/locale/en.json
View file

@ -1324,8 +1324,8 @@
"PE.Views.ParagraphSettingsAdvanced.strAllCaps": "All caps", "PE.Views.ParagraphSettingsAdvanced.strAllCaps": "All caps",
"PE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough", "PE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough",
"PE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "First Line", "PE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "First Line",
"PE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Indent Left", "PE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Left",
"PE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Indent Right", "PE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Right",
"PE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Font", "PE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Font",
"PE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indents & Spacing", "PE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indents & Spacing",
"PE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Small caps", "PE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Small caps",
@ -1354,14 +1354,14 @@
"PE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)", "PE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(none)",
"PE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line", "PE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line",
"PE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging", "PE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging",
"PE.Views.ParagraphSettingsAdvanced.strIndentsSpecialBy": "By", "PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Before",
"PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Spacing Before", "PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "After",
"PE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Spacing After",
"PE.Views.ParagraphSettingsAdvanced.strIndentLineSpacingAt": "At",
"PE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing", "PE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing",
"PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto", "PE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
"PE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple", "PE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple",
"PE.Views.ParagraphSettingsAdvanced.textExact": "Exactly", "PE.Views.ParagraphSettingsAdvanced.textExact": "Exactly",
"PE.Views.ParagraphSettingsAdvanced.strIndent": "Indents",
"PE.Views.ParagraphSettingsAdvanced.strSpacing": "Spacing",
"PE.Views.RightMenu.txtChartSettings": "Chart settings", "PE.Views.RightMenu.txtChartSettings": "Chart settings",
"PE.Views.RightMenu.txtImageSettings": "Image settings", "PE.Views.RightMenu.txtImageSettings": "Image settings",
"PE.Views.RightMenu.txtParagraphSettings": "Text settings", "PE.Views.RightMenu.txtParagraphSettings": "Text settings",

133
apps/spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.template
View file

@ -6,6 +6,7 @@
<div id="paragraphadv-spin-text-alignment"></div> <div id="paragraphadv-spin-text-alignment"></div>
</div> </div>
</div> </div>
<div style="padding-bottom: 4px;"><label class="header"><%= scope.strIndent %></label></div>
<div> <div>
<div class="padding-large" style="display: inline-block;"> <div class="padding-large" style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsLeftText %></label> <label class="input-label"><%= scope.strIndentsLeftText %></label>
@ -16,114 +17,98 @@
<div id="paragraphadv-spin-indent-right"></div> <div id="paragraphadv-spin-indent-right"></div>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div class="padding-large" style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsSpecial %></label> <div>
<div id="paragraphadv-spin-special"></div> <label class="input-label"><%= scope.strIndentsSpecial %></label>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div>
<label class="input-label"><%= scope.strIndentsSpecialBy %></label> <div id="paragraphadv-spin-special" style="display: inline-block;"></div>
<div id="paragraphadv-spin-special-by"></div> <div id="paragraphadv-spin-special-by" style="display: inline-block;"></div>
</div>
</div> </div>
</div> </div>
<div style="padding-bottom: 4px;"><label class="header"><%= scope.strSpacing %></label></div>
<div> <div>
<div class="padding-large" style="display: inline-block;"> <div style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsSpacingBefore %></label> <label class="input-label"><%= scope.strIndentsSpacingBefore %></label>
<div id="paragraphadv-spin-spacing-before"></div> <div id="paragraphadv-spin-spacing-before"></div>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsSpacingAfter %></label> <label class="input-label"><%= scope.strIndentsSpacingAfter %></label>
<div id="paragraphadv-spin-spacing-after"></div> <div id="paragraphadv-spin-spacing-after"></div>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div style="display: inline-block;">
<label class="input-label"><%= scope.strIndentsLineSpacing %></label> <div>
<div id="paragraphadv-spin-line-rule"></div> <label class="input-label"><%= scope.strIndentsLineSpacing %></label>
</div> </div>
<div class="padding-large" style="display: inline-block;"> <div>
<label class="input-label"><%= scope.strIndentLineSpacingAt %></label> <div id="paragraphadv-spin-line-rule" style="display: inline-block;"></div>
<div id="paragraphadv-spin-line-height"></div> <div id="paragraphadv-spin-line-height" style="display: inline-block;"></div>
</div>
</div> </div>
</div> </div>
<div class="padding-large"> <div class="padding-large" style="padding-top: 16px;">
<div style="border: 1px solid #cbcbcb; width: 350px;"> <div style="border: 1px solid #cbcbcb; width: 350px;">
<div id="paragraphadv-indent-preview" style="height: 94px; position: relative;"></div> <div id="paragraphadv-indent-preview" style="height: 80px; position: relative;"></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div id="id-adv-paragraph-font" class="settings-panel"> <div id="id-adv-paragraph-font" class="settings-panel">
<div class="inner-content"> <div class="inner-content" style="width: 100%;">
<table cols="2" style="width: 300px;"> <div class="padding-small">
<tr> <label class="header"><%= scope.textEffects %></label>
<td colspan=2 class="padding-small"> </div>
<label class="header"><%= scope.textEffects %></label> <div>
</td> <div class="padding-large" style="display: inline-block;">
</tr> <div class="padding-small" id="paragraphadv-checkbox-strike"></div>
<tr> <div class="padding-small" id="paragraphadv-checkbox-double-strike"></div>
<td class="padding-small"> <div id="paragraphadv-checkbox-superscript"></div>
<div id="paragraphadv-checkbox-strike"></div> </div>
</td> <div class="padding-large" style="display: inline-block; padding-left: 40px;">
<td class="padding-small"> <div class="padding-small" id="paragraphadv-checkbox-subscript"></div>
<div id="paragraphadv-checkbox-subscript"></div> <div class="padding-small" id="paragraphadv-checkbox-small-caps"></div>
</td> <div id="paragraphadv-checkbox-all-caps"></div>
</tr> </div>
<tr> </div>
<td class="padding-small"> <div class="padding-small">
<div id="paragraphadv-checkbox-double-strike"></div> <label class="header"><%= scope.textCharacterSpacing %></label>
</td> </div>
<td class="padding-small"> <div class="padding-large">
<div id="paragraphadv-checkbox-small-caps"></div> <div style="display: inline-block;">
</td> <div id="paragraphadv-spin-spacing"></div>
</tr> </div>
<tr> </div>
<td class="padding-large"> <div style="border: 1px solid #cbcbcb;">
<div id="paragraphadv-checkbox-superscript"></div> <div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative; margin: 0 auto;"></div>
</td> </div>
<td class="padding-large">
<div id="paragraphadv-checkbox-all-caps"></div>
</td>
</tr>
<tr>
<td colspan=2 class="padding-small">
<label class="header"><%= scope.textCharacterSpacing %></label>
</td>
</tr>
<tr>
<td colspan=2 class="padding-large" width="50%">
<div id="paragraphadv-spin-spacing"></div>
</td>
</tr>
<tr>
<td colspan=2>
<div style="border: 1px solid #cbcbcb;">
<div id="paragraphadv-font-img" style="width: 300px; height: 80px; position: relative;"></div>
</div>
</td>
</tr>
</table>
</div> </div>
</div> </div>
<div id="id-adv-paragraph-tabs" class="settings-panel"> <div id="id-adv-paragraph-tabs" class="settings-panel">
<div class="inner-content" style="width: 290px;"> <div class="inner-content">
<div class="padding-large"> <div class="padding-large">
<label class="input-label"><%= scope.textDefault %></label> <label class="input-label"><%= scope.textDefault %></label>
<div id="paraadv-spin-default-tab"></div> <div id="paraadv-spin-default-tab"></div>
</div> </div>
<div> <div>
<div class="padding-small" style="display: inline-block; margin-right: 10px;"> <div class="padding-large" style="display: inline-block; margin-right: 9px;">
<label class="input-label"><%= scope.textTabPosition %></label> <label class="input-label"><%= scope.textTabPosition %></label>
<div id="paraadv-spin-tab"></div> <div id="paraadv-spin-tab"></div>
</div> </div>
<div class="padding-small" style="display: inline-block;"> <div class="padding-large" style=" display: inline-block; margin-right: 9px;">
<label class="input-label"><%= scope.textAlign %></label> <label class="input-label"><%= scope.textAlign %></label>
<div id="paraadv-cmb-align"></div> <div id="paraadv-cmb-align"></div>
</div> </div>
</div> </div>
<div class="padding-large"> <div>
<div id="paraadv-list-tabs" style="width:270px; height: 94px;"></div> <div colspan=3 class="padding-large">
<div id="paraadv-list-tabs" style="width:348px; height: 110px;"></div>
</div>
</div> </div>
<div> <div>
<button type="button" class="btn btn-text-default" id="paraadv-button-add-tab" style="width:85px;margin-right: 4px;"><%= scope.textSet %></button> <button type="button" class="btn btn-text-default" id="paraadv-button-add-tab" style="width:108px;margin-right: 9px; display: inline-block;"><%= scope.textSet %></button>
<button type="button" class="btn btn-text-default" id="paraadv-button-remove-tab" style="width:85px;margin-right: 4px;"><%= scope.textRemove %></button> <button type="button" class="btn btn-text-default" id="paraadv-button-remove-tab" style="width:108px;margin-right: 9px; display: inline-block;"><%= scope.textRemove %></button>
<button type="button" class="btn btn-text-default" id="paraadv-button-remove-all" style="width:85px;"><%= scope.textRemoveAll %></button> <button type="button" class="btn btn-text-default" id="paraadv-button-remove-all" style="width:108px;display: inline-block;"><%= scope.textRemoveAll %></button>
</div> </div>
</div> </div>
</div> </div>

47
apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -86,7 +86,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
{displayValue: this.textExact, defaultValue: 5, value: c_paragraphLinerule.LINERULE_EXACT, minValue: 0.03, step: 0.01, defaultUnit: 'cm'} {displayValue: this.textExact, defaultValue: 5, value: c_paragraphLinerule.LINERULE_EXACT, minValue: 0.03, step: 0.01, defaultUnit: 'cm'}
]; ];
var curLineRule = this._originalProps.asc_getSpacing().get_LineRule(), var curLineRule = this._originalProps.asc_getSpacing().asc_getLineRule(),
curItem = _.findWhere(this._arrLineRule, {value: curLineRule}); curItem = _.findWhere(this._arrLineRule, {value: curLineRule});
this.CurLineRuleIdx = this._arrLineRule.indexOf(curItem); this.CurLineRuleIdx = this._arrLineRule.indexOf(curItem);
@ -144,9 +144,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
this.numIndentsLeft.on('change', _.bind(function(field, newValue, oldValue, eOpts){ this.numIndentsLeft.on('change', _.bind(function(field, newValue, oldValue, eOpts){
var numval = field.getNumberValue(); var numval = field.getNumberValue();
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) if (this._changedProps.asc_getInd()===null || this._changedProps.asc_getInd()===undefined)
this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.put_Ind(new Asc.asc_CParagraphInd());
this._changedProps.get_Ind().put_Left(Common.Utils.Metric.fnRecalcToMM(numval)); this._changedProps.asc_getInd().put_Left(Common.Utils.Metric.fnRecalcToMM(numval));
} }
}, this)); }, this));
this.spinners.push(this.numIndentsLeft); this.spinners.push(this.numIndentsLeft);
@ -163,9 +163,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
}); });
this.numIndentsRight.on('change', _.bind(function(field, newValue, oldValue, eOpts){ this.numIndentsRight.on('change', _.bind(function(field, newValue, oldValue, eOpts){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) if (this._changedProps.asc_getInd()===null || this._changedProps.asc_getInd()===undefined)
this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.put_Ind(new Asc.asc_CParagraphInd());
this._changedProps.get_Ind().put_Right(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); this._changedProps.asc_getInd().put_Right(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()));
} }
}, this)); }, this));
this.spinners.push(this.numIndentsRight); this.spinners.push(this.numIndentsRight);
@ -321,7 +321,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
this.numTab = new Common.UI.MetricSpinner({ this.numTab = new Common.UI.MetricSpinner({
el: $('#paraadv-spin-tab'), el: $('#paraadv-spin-tab'),
step: .1, step: .1,
width: 128, width: 108,
defaultUnit : "cm", defaultUnit : "cm",
value: '1.25 cm', value: '1.25 cm',
maxValue: 55.87, maxValue: 55.87,
@ -332,7 +332,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
this.numDefaultTab = new Common.UI.MetricSpinner({ this.numDefaultTab = new Common.UI.MetricSpinner({
el: $('#paraadv-spin-default-tab'), el: $('#paraadv-spin-default-tab'),
step: .1, step: .1,
width: 128, width: 108,
defaultUnit : "cm", defaultUnit : "cm",
value: '1.25 cm', value: '1.25 cm',
maxValue: 55.87, maxValue: 55.87,
@ -352,7 +352,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
template: _.template(['<div class="listview inner" style=""></div>'].join('')), template: _.template(['<div class="listview inner" style=""></div>'].join('')),
itemTemplate: _.template([ itemTemplate: _.template([
'<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;">', '<div id="<%= id %>" class="list-item" style="width: 100%;display:inline-block;">',
'<div style="width: 138px;display: inline-block;"><%= value %></div>', '<div style="width: 117px;display: inline-block;"><%= value %></div>',
'<div style="display: inline-block;"><%= displayTabAlign %></div>', '<div style="display: inline-block;"><%= displayTabAlign %></div>',
'</div>' '</div>'
].join('')) ].join(''))
@ -372,8 +372,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
this.cmbAlign = new Common.UI.ComboBox({ this.cmbAlign = new Common.UI.ComboBox({
el : $('#paraadv-cmb-align'), el : $('#paraadv-cmb-align'),
style : 'width: 128px;', style : 'width: 108px;',
menuStyle : 'min-width: 128px;', menuStyle : 'min-width: 108px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : this._arrTabAlign data : this._arrTabAlign
@ -425,7 +425,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
_setDefaults: function(props) { _setDefaults: function(props) {
if (props ){ if (props ){
this._originalProps = new Asc.asc_CParagraphProperty(props); this._originalProps = new Asc.asc_CParagraphProperty(props);
this.FirstLine = (props.get_Ind() !== null) ? props.get_Ind().get_FirstLine() : null; this.FirstLine = (props.asc_getInd() !== null) ? props.asc_getInd().asc_getFirstLine() : null;
this.numIndentsLeft.setValue((props.asc_getInd() !== null && props.asc_getInd().asc_getLeft() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getInd().asc_getLeft()) : '', true); this.numIndentsLeft.setValue((props.asc_getInd() !== null && props.asc_getInd().asc_getLeft() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getInd().asc_getLeft()) : '', true);
this.numIndentsRight.setValue((props.asc_getInd() !== null && props.asc_getInd().asc_getRight() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getInd().asc_getRight()) : '', true); this.numIndentsRight.setValue((props.asc_getInd() !== null && props.asc_getInd().asc_getRight() !== null) ? Common.Utils.Metric.fnRecalcFromMM(props.asc_getInd().asc_getRight()) : '', true);
@ -433,7 +433,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
this.cmbTextAlignment.setValue((props.asc_getJc() !== undefined && props.asc_getJc() !== null) ? props.asc_getJc() : c_paragraphTextAlignment.CENTERED, true); this.cmbTextAlignment.setValue((props.asc_getJc() !== undefined && props.asc_getJc() !== null) ? props.asc_getJc() : c_paragraphTextAlignment.CENTERED, true);
if(this.CurSpecial === undefined) { if(this.CurSpecial === undefined) {
this.CurSpecial = (props.asc_getInd().get_FirstLine() === 0) ? c_paragraphSpecial.NONE_SPECIAL : ((props.asc_getInd().get_FirstLine() > 0) ? c_paragraphSpecial.FIRST_LINE : c_paragraphSpecial.HANGING); this.CurSpecial = (props.asc_getInd().asc_getFirstLine() === 0) ? c_paragraphSpecial.NONE_SPECIAL : ((props.asc_getInd().asc_getFirstLine() > 0) ? c_paragraphSpecial.FIRST_LINE : c_paragraphSpecial.HANGING);
} }
this.cmbSpecial.setValue(this.CurSpecial); this.cmbSpecial.setValue(this.CurSpecial);
this.numSpecialBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true); this.numSpecialBy.setValue(this.FirstLine!== null ? Math.abs(Common.Utils.Metric.fnRecalcFromMM(this.FirstLine)) : '', true);
@ -478,7 +478,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
tabPos: pos, tabPos: pos,
value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.getCurrentMetricName(), value: parseFloat(pos.toFixed(3)) + ' ' + Common.Utils.Metric.getCurrentMetricName(),
tabAlign: tab.asc_getValue(), tabAlign: tab.asc_getValue(),
displayTabAlign: this._arrKeyTabAlign[tab.get_Value()] displayTabAlign: this._arrKeyTabAlign[tab.asc_getValue()]
}); });
arr.push(rec); arr.push(rec);
} }
@ -711,7 +711,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
this.numSpecialBy.setValue(0, true); this.numSpecialBy.setValue(0, true);
} }
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) if (this._changedProps.asc_getInd()===null || this._changedProps.asc_getInd()===undefined)
this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.put_Ind(new Asc.asc_CParagraphInd());
var value = Common.Utils.Metric.fnRecalcToMM(this.numSpecialBy.getNumberValue()); var value = Common.Utils.Metric.fnRecalcToMM(this.numSpecialBy.getNumberValue());
if (value === 0) { if (value === 0) {
@ -721,13 +721,13 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
if (this.CurSpecial === c_paragraphSpecial.HANGING) { if (this.CurSpecial === c_paragraphSpecial.HANGING) {
value = -value; value = -value;
} }
this._changedProps.get_Ind().put_FirstLine(value); this._changedProps.asc_getInd().put_FirstLine(value);
} }
}, },
onFirstLineChange: function(field, newValue, oldValue, eOpts){ onFirstLineChange: function(field, newValue, oldValue, eOpts){
if (this._changedProps) { if (this._changedProps) {
if (this._changedProps.get_Ind()===null || this._changedProps.get_Ind()===undefined) if (this._changedProps.asc_getInd()===null || this._changedProps.asc_getInd()===undefined)
this._changedProps.put_Ind(new Asc.asc_CParagraphInd()); this._changedProps.put_Ind(new Asc.asc_CParagraphInd());
var value = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); var value = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue());
if (this.CurSpecial === c_paragraphSpecial.HANGING) { if (this.CurSpecial === c_paragraphSpecial.HANGING) {
@ -739,7 +739,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
this.CurSpecial = c_paragraphSpecial.NONE_SPECIAL; this.CurSpecial = c_paragraphSpecial.NONE_SPECIAL;
this.cmbSpecial.setValue(c_paragraphSpecial.NONE_SPECIAL); this.cmbSpecial.setValue(c_paragraphSpecial.NONE_SPECIAL);
} }
this._changedProps.get_Ind().put_FirstLine(value); this._changedProps.asc_getInd().put_FirstLine(value);
} }
}, },
@ -776,8 +776,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
textTitle: 'Paragraph - Advanced Settings', textTitle: 'Paragraph - Advanced Settings',
strIndentsFirstLine: 'First line', strIndentsFirstLine: 'First line',
strIndentsLeftText: 'Indent Left', strIndentsLeftText: 'Left',
strIndentsRightText: 'Indent Right', strIndentsRightText: 'Right',
strParagraphIndents: 'Indents & Spacing', strParagraphIndents: 'Indents & Spacing',
strParagraphFont: 'Font', strParagraphFont: 'Font',
cancelButtonText: 'Cancel', cancelButtonText: 'Cancel',
@ -811,12 +811,13 @@ define([ 'text!spreadsheeteditor/main/app/template/ParagraphSettingsAdvanced.
textFirstLine: 'First line', textFirstLine: 'First line',
textHanging: 'Hanging', textHanging: 'Hanging',
strIndentsSpecialBy: 'By', strIndentsSpecialBy: 'By',
strIndentsSpacingBefore: 'Spacing Before', strIndentsSpacingBefore: 'Before',
strIndentsSpacingAfter: 'Spacing After', strIndentsSpacingAfter: 'After',
strIndentLineSpacingAt: 'At',
strIndentsLineSpacing: 'Line Spacing', strIndentsLineSpacing: 'Line Spacing',
txtAutoText: 'Auto', txtAutoText: 'Auto',
textAuto: 'Multiple', textAuto: 'Multiple',
textExact: 'Exactly' textExact: 'Exactly',
strIndent: 'Indents',
strSpacing: 'Spacing'
}, SSE.Views.ParagraphSettingsAdvanced || {})); }, SSE.Views.ParagraphSettingsAdvanced || {}));
}); });

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

@ -1805,8 +1805,8 @@
"SSE.Views.ParagraphSettingsAdvanced.strAllCaps": "All caps", "SSE.Views.ParagraphSettingsAdvanced.strAllCaps": "All caps",
"SSE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough", "SSE.Views.ParagraphSettingsAdvanced.strDoubleStrike": "Double strikethrough",
"SSE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "First Line", "SSE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "First Line",
"SSE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Indent Left", "SSE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Left",
"SSE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Indent Right", "SSE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Right",
"SSE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Font", "SSE.Views.ParagraphSettingsAdvanced.strParagraphFont": "Font",
"SSE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indents & Spacing", "SSE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Indents & Spacing",
"SSE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Small caps", "SSE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Small caps",
@ -1836,13 +1836,14 @@
"SSE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line", "SSE.Views.ParagraphSettingsAdvanced.textFirstLine": "First line",
"SSE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging", "SSE.Views.ParagraphSettingsAdvanced.textHanging": "Hanging",
"SSE.Views.ParagraphSettingsAdvanced.strIndentsSpecialBy": "By", "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpecialBy": "By",
"SSE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Spacing Before", "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Before",
"SSE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "Spacing After", "SSE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "After",
"SSE.Views.ParagraphSettingsAdvanced.strIndentLineSpacingAt": "At",
"SSE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing", "SSE.Views.ParagraphSettingsAdvanced.strIndentsLineSpacing": "Line Spacing",
"SSE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto", "SSE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
"SSE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple", "SSE.Views.ParagraphSettingsAdvanced.textAuto": "Multiple",
"SSE.Views.ParagraphSettingsAdvanced.textExact": "Exactly", "SSE.Views.ParagraphSettingsAdvanced.textExact": "Exactly",
"SSE.Views.ParagraphSettingsAdvanced.strIndent": "Indents",
"SSE.Views.ParagraphSettingsAdvanced.strSpacing": "Spacing",
"SSE.Views.PivotSettings.notcriticalErrorTitle": "Warning", "SSE.Views.PivotSettings.notcriticalErrorTitle": "Warning",
"SSE.Views.PivotSettings.textAdvanced": "Show advanced settings", "SSE.Views.PivotSettings.textAdvanced": "Show advanced settings",
"SSE.Views.PivotSettings.textCancel": "Cancel", "SSE.Views.PivotSettings.textCancel": "Cancel",