Merge pull request #516 from ONLYOFFICE/feature/de-line-numbers-new
Feature/de line numbers new [DE] Fix Bug 37107
This commit is contained in:
commit
db7d0d1e36
|
@ -60,7 +60,8 @@ define([
|
||||||
'documenteditor/main/app/view/WatermarkSettingsDialog',
|
'documenteditor/main/app/view/WatermarkSettingsDialog',
|
||||||
'documenteditor/main/app/view/CompareSettingsDialog',
|
'documenteditor/main/app/view/CompareSettingsDialog',
|
||||||
'documenteditor/main/app/view/ListSettingsDialog',
|
'documenteditor/main/app/view/ListSettingsDialog',
|
||||||
'documenteditor/main/app/view/DateTimeDialog'
|
'documenteditor/main/app/view/DateTimeDialog',
|
||||||
|
'documenteditor/main/app/view/LineNumbersDialog'
|
||||||
], function () {
|
], function () {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
@ -101,7 +102,8 @@ define([
|
||||||
pgmargins: undefined,
|
pgmargins: undefined,
|
||||||
fontsize: undefined,
|
fontsize: undefined,
|
||||||
in_equation: false,
|
in_equation: false,
|
||||||
in_chart: false
|
in_chart: false,
|
||||||
|
linenum_apply: Asc.c_oAscSectionApplyType.All
|
||||||
};
|
};
|
||||||
this.flg = {};
|
this.flg = {};
|
||||||
this.diagramEditor = null;
|
this.diagramEditor = null;
|
||||||
|
@ -334,6 +336,7 @@ define([
|
||||||
toolbar.btnInsertSymbol.on('click', _.bind(this.onInsertSymbolClick, this));
|
toolbar.btnInsertSymbol.on('click', _.bind(this.onInsertSymbolClick, this));
|
||||||
toolbar.mnuNoControlsColor.on('click', _.bind(this.onNoControlsColor, this));
|
toolbar.mnuNoControlsColor.on('click', _.bind(this.onNoControlsColor, this));
|
||||||
toolbar.mnuControlsColorPicker.on('select', _.bind(this.onSelectControlsColor, this));
|
toolbar.mnuControlsColorPicker.on('select', _.bind(this.onSelectControlsColor, this));
|
||||||
|
toolbar.btnLineNumbers.menu.on('item:click', _.bind(this.onLineNumbersSelect, this));
|
||||||
Common.Gateway.on('insertimage', _.bind(this.insertImage, this));
|
Common.Gateway.on('insertimage', _.bind(this.insertImage, this));
|
||||||
Common.Gateway.on('setmailmergerecipients', _.bind(this.setMailMergeRecipients, this));
|
Common.Gateway.on('setmailmergerecipients', _.bind(this.setMailMergeRecipients, this));
|
||||||
$('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this));
|
$('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this));
|
||||||
|
@ -385,6 +388,7 @@ define([
|
||||||
this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onApiMathTypes, this));
|
this.api.asc_registerCallback('asc_onMathTypes', _.bind(this.onApiMathTypes, this));
|
||||||
this.api.asc_registerCallback('asc_onColumnsProps', _.bind(this.onColumnsProps, this));
|
this.api.asc_registerCallback('asc_onColumnsProps', _.bind(this.onColumnsProps, this));
|
||||||
this.api.asc_registerCallback('asc_onSectionProps', _.bind(this.onSectionProps, this));
|
this.api.asc_registerCallback('asc_onSectionProps', _.bind(this.onSectionProps, this));
|
||||||
|
this.api.asc_registerCallback('asc_onLineNumbersProps', _.bind(this.onLineNumbersProps, this));
|
||||||
this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
|
this.api.asc_registerCallback('asc_onContextMenu', _.bind(this.onContextMenu, this));
|
||||||
this.api.asc_registerCallback('asc_onShowParaMarks', _.bind(this.onShowParaMarks, this));
|
this.api.asc_registerCallback('asc_onShowParaMarks', _.bind(this.onShowParaMarks, this));
|
||||||
this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this));
|
this.api.asc_registerCallback('asc_onChangeSdtGlobalSettings', _.bind(this.onChangeSdtGlobalSettings, this));
|
||||||
|
@ -1674,6 +1678,63 @@ define([
|
||||||
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
|
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onLineNumbersSelect: function(menu, item) {
|
||||||
|
if (_.isUndefined(item.value))
|
||||||
|
return;
|
||||||
|
|
||||||
|
switch (item.value) {
|
||||||
|
case 0:
|
||||||
|
this.api.asc_SetLineNumbersProps(this._state.linenum_apply, null);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
case 2:
|
||||||
|
case 3:
|
||||||
|
this._state.linenum = undefined;
|
||||||
|
if (this.api && item.checked) {
|
||||||
|
var props = new Asc.CSectionLnNumType();
|
||||||
|
props.put_Restart(item.value==1 ? Asc.c_oAscLineNumberRestartType.Continuous : (item.value==2 ? Asc.c_oAscLineNumberRestartType.NewPage : Asc.c_oAscLineNumberRestartType.NewSection));
|
||||||
|
this.api.asc_SetLineNumbersProps(this._state.linenum_apply, props);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 4:
|
||||||
|
this.api && this.api.asc_SetParagraphSuppressLineNumbers(item.checked);
|
||||||
|
break;
|
||||||
|
case 5:
|
||||||
|
var win,
|
||||||
|
me = this;
|
||||||
|
win = new DE.Views.LineNumbersDialog({
|
||||||
|
applyTo: me._state.linenum_apply,
|
||||||
|
handler: function(dlg, result) {
|
||||||
|
if (result == 'ok') {
|
||||||
|
var settings = dlg.getSettings();
|
||||||
|
me.api.asc_SetLineNumbersProps(settings.type, settings.props);
|
||||||
|
me._state.linenum_apply = settings.type;
|
||||||
|
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
win.show();
|
||||||
|
win.setSettings(me.api.asc_GetLineNumbersProps());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
|
||||||
|
},
|
||||||
|
|
||||||
|
onLineNumbersProps: function(props) {
|
||||||
|
var index = 0;
|
||||||
|
if (props) {
|
||||||
|
switch (props.get_Restart()) {
|
||||||
|
case Asc.c_oAscLineNumberRestartType.Continuous: index = 1; break;
|
||||||
|
case Asc.c_oAscLineNumberRestartType.NewPage: index = 2; break;
|
||||||
|
case Asc.c_oAscLineNumberRestartType.NewSection: index = 3; break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (this._state.linenum === index)
|
||||||
|
return;
|
||||||
|
this.toolbar.btnLineNumbers.menu.items[index].setChecked(true);
|
||||||
|
this._state.linenum = index;
|
||||||
|
},
|
||||||
|
|
||||||
onColorSchemaClick: function(menu, item) {
|
onColorSchemaClick: function(menu, item) {
|
||||||
if (this.api) {
|
if (this.api) {
|
||||||
this.api.asc_ChangeColorSchemeByIdx(item.value);
|
this.api.asc_ChangeColorSchemeByIdx(item.value);
|
||||||
|
|
|
@ -79,6 +79,11 @@
|
||||||
<div id="paragraphadv-checkbox-keep-next"></div>
|
<div id="paragraphadv-checkbox-keep-next"></div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="padding-small" colspan="2">
|
||||||
|
<div id="paragraphadv-checkbox-suppress-line-numbers"></div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -130,6 +130,7 @@
|
||||||
<span class="btn-slot text x-huge" id="slot-btn-pagesize"></span>
|
<span class="btn-slot text x-huge" id="slot-btn-pagesize"></span>
|
||||||
<span class="btn-slot text x-huge" id="slot-btn-columns"></span>
|
<span class="btn-slot text x-huge" id="slot-btn-columns"></span>
|
||||||
<span class="btn-slot text x-huge btn-pagebreak"></span>
|
<span class="btn-slot text x-huge btn-pagebreak"></span>
|
||||||
|
<span class="btn-slot text x-huge" id="slot-btn-line-numbers"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="separator long"></div>
|
<div class="separator long"></div>
|
||||||
<div class="group">
|
<div class="group">
|
||||||
|
|
258
apps/documenteditor/main/app/view/LineNumbersDialog.js
Normal file
258
apps/documenteditor/main/app/view/LineNumbersDialog.js
Normal file
|
@ -0,0 +1,258 @@
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* (c) Copyright Ascensio System SIA 2010-2020
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
/**
|
||||||
|
* LineNumbersDialog.js
|
||||||
|
*
|
||||||
|
* Created by Julia Svinareva on 18/09/19
|
||||||
|
* Copyright (c) 2020 Ascensio System SIA. All rights reserved.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
define([
|
||||||
|
'common/main/lib/component/Window',
|
||||||
|
'common/main/lib/component/CheckBox',
|
||||||
|
'common/main/lib/component/MetricSpinner'
|
||||||
|
], function () { 'use strict';
|
||||||
|
|
||||||
|
DE.Views.LineNumbersDialog = Common.UI.Window.extend(_.extend({
|
||||||
|
options: {
|
||||||
|
width: 290,
|
||||||
|
height: 308,
|
||||||
|
header: true,
|
||||||
|
style: 'min-width: 290px;',
|
||||||
|
cls: 'modal-dlg',
|
||||||
|
buttons: ['ok', 'cancel']
|
||||||
|
},
|
||||||
|
|
||||||
|
initialize : function(options) {
|
||||||
|
_.extend(this.options, {
|
||||||
|
title: this.textTitle
|
||||||
|
}, options || {});
|
||||||
|
|
||||||
|
this.template = [
|
||||||
|
'<div class="box" style="">',
|
||||||
|
'<div id="line-numbers-add-line-numbering" style="margin-bottom: 15px;"></div>',
|
||||||
|
'<div style="margin-bottom: 15px;">',
|
||||||
|
'<div style="display: inline-block; margin-right: 9px;"><label>' + this.textStartAt + '</label><div id="line-numbers-start-at"></div></div>',
|
||||||
|
'<div style="display: inline-block; margin-right: 9px;"><label>' + this.textFromText + '</label><div id="line-numbers-from-text"></div></div>',
|
||||||
|
'<div style="display: inline-block;"><label>' + this.textCountBy + '</label><div id="line-numbers-count-by"></div></div>',
|
||||||
|
'</div>',
|
||||||
|
'<div style="margin-bottom: 8px;"><label>' + this.textNumbering + '</label></div>',
|
||||||
|
'<div id="line-numbers-restart-each-page" style="margin-bottom: 8px;"></div>',
|
||||||
|
'<div id="line-numbers-restart-each-section" style="margin-bottom: 8px;"></div>',
|
||||||
|
'<div id="line-numbers-continuous" style="margin-bottom: 15px;"></div>',
|
||||||
|
'<div style="margin-bottom: 5px;">',
|
||||||
|
'<label style="margin-top: 4px;">' + this.textApplyTo + '</label><div id="line-numbers-combo-apply" class="input-group-nr" style="display: inline-block; width:125px;float:right;"></div>',
|
||||||
|
'</div>',
|
||||||
|
'</div>'
|
||||||
|
].join('');
|
||||||
|
|
||||||
|
this.options.tpl = _.template(this.template)(this.options);
|
||||||
|
|
||||||
|
this.spinners = [];
|
||||||
|
this._noApply = false;
|
||||||
|
|
||||||
|
Common.UI.Window.prototype.initialize.call(this, this.options);
|
||||||
|
},
|
||||||
|
|
||||||
|
render: function() {
|
||||||
|
Common.UI.Window.prototype.render.call(this);
|
||||||
|
|
||||||
|
this.chAddLineNumbering = new Common.UI.CheckBox({
|
||||||
|
el: $('#line-numbers-add-line-numbering'),
|
||||||
|
labelText: this.textAddLineNumbering
|
||||||
|
}).on('change', _.bind(function(field, newValue, oldValue, eOpts){
|
||||||
|
var checked = field.getValue()!=='checked';
|
||||||
|
this.spnStartAt.setDisabled(checked);
|
||||||
|
this.spnFromText.setDisabled(checked);
|
||||||
|
this.spnCountBy.setDisabled(checked);
|
||||||
|
this.rbRestartEachPage.setDisabled(checked);
|
||||||
|
this.rbRestartEachSection.setDisabled(checked);
|
||||||
|
this.rbContinuous.setDisabled(checked);
|
||||||
|
}, this));
|
||||||
|
|
||||||
|
this.spnStartAt = new Common.UI.MetricSpinner({
|
||||||
|
el: $('#line-numbers-start-at'),
|
||||||
|
step: 1,
|
||||||
|
width: 80,
|
||||||
|
defaultUnit : '',
|
||||||
|
value: 1,
|
||||||
|
maxValue: 32767,
|
||||||
|
minValue: 1,
|
||||||
|
disabled: true
|
||||||
|
});
|
||||||
|
|
||||||
|
this.spnFromText = new Common.UI.MetricSpinner({
|
||||||
|
el: $('#line-numbers-from-text'),
|
||||||
|
step: 0.1,
|
||||||
|
width: 80,
|
||||||
|
defaultUnit : 'cm',
|
||||||
|
value: 'Auto',
|
||||||
|
maxValue: 55.87,
|
||||||
|
minValue: 0.1,
|
||||||
|
allowAuto: true,
|
||||||
|
disabled: true
|
||||||
|
});
|
||||||
|
this.spinners.push(this.spnFromText);
|
||||||
|
|
||||||
|
this.spnCountBy = new Common.UI.MetricSpinner({
|
||||||
|
el: $('#line-numbers-count-by'),
|
||||||
|
step: 1,
|
||||||
|
width: 80,
|
||||||
|
defaultUnit : '',
|
||||||
|
value: 1,
|
||||||
|
maxValue: 100,
|
||||||
|
minValue: 1,
|
||||||
|
disabled: true
|
||||||
|
});
|
||||||
|
|
||||||
|
this.rbRestartEachPage = new Common.UI.RadioBox({
|
||||||
|
el: $('#line-numbers-restart-each-page'),
|
||||||
|
labelText: this.textRestartEachPage,
|
||||||
|
name: 'asc-radio-line-numbers',
|
||||||
|
disabled: true,
|
||||||
|
checked: true
|
||||||
|
});
|
||||||
|
|
||||||
|
this.rbRestartEachSection = new Common.UI.RadioBox({
|
||||||
|
el: $('#line-numbers-restart-each-section'),
|
||||||
|
labelText: this.textRestartEachSection,
|
||||||
|
name: 'asc-radio-line-numbers',
|
||||||
|
disabled: true
|
||||||
|
});
|
||||||
|
|
||||||
|
this.rbContinuous = new Common.UI.RadioBox({
|
||||||
|
el: $('#line-numbers-continuous'),
|
||||||
|
labelText: this.textContinuous,
|
||||||
|
name: 'asc-radio-line-numbers',
|
||||||
|
disabled: true
|
||||||
|
});
|
||||||
|
|
||||||
|
this.cmbApply = new Common.UI.ComboBox({
|
||||||
|
el: $('#line-numbers-combo-apply'),
|
||||||
|
cls: 'input-group-nr',
|
||||||
|
menuStyle: 'min-width: 125px;',
|
||||||
|
editable: false,
|
||||||
|
data: [
|
||||||
|
{ displayValue: this.textSection, value: Asc.c_oAscSectionApplyType.Current },
|
||||||
|
{ displayValue: this.textForward, value: Asc.c_oAscSectionApplyType.ToEnd },
|
||||||
|
{ displayValue: this.textDocument, value: Asc.c_oAscSectionApplyType.All }
|
||||||
|
]
|
||||||
|
});
|
||||||
|
this.cmbApply.setValue(this.options.applyTo);
|
||||||
|
|
||||||
|
this.getChild().find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
|
||||||
|
|
||||||
|
this.updateMetricUnit();
|
||||||
|
},
|
||||||
|
|
||||||
|
afterRender: function() {
|
||||||
|
},
|
||||||
|
|
||||||
|
setSettings: function (props) {
|
||||||
|
if (props) {
|
||||||
|
var type = props.get_Restart();
|
||||||
|
this.chAddLineNumbering.setValue(true);
|
||||||
|
switch (type) {
|
||||||
|
case Asc.c_oAscLineNumberRestartType.Continuous: this.rbContinuous.setValue(true, true); break;
|
||||||
|
case Asc.c_oAscLineNumberRestartType.NewPage: this.rbRestartEachPage.setValue(true, true); break;
|
||||||
|
case Asc.c_oAscLineNumberRestartType.NewSection: this.rbRestartEachSection.setValue(true, true); break;
|
||||||
|
}
|
||||||
|
this.spnStartAt.setValue(props.get_Start()!==null && props.get_Start()!==undefined ? props.get_Start() : '', true);
|
||||||
|
this.spnFromText.setValue(props.get_Distance()!==null && props.get_Distance()!==undefined ? Common.Utils.Metric.fnRecalcFromMM(props.get_Distance() * 25.4 / 20 / 72.0) : -1, true);
|
||||||
|
this.spnCountBy.setValue(props.get_CountBy()!==null && props.get_CountBy()!==undefined ? props.get_CountBy() : '', true);
|
||||||
|
} else
|
||||||
|
this.chAddLineNumbering.setValue(false);
|
||||||
|
},
|
||||||
|
|
||||||
|
_handleInput: function(state) {
|
||||||
|
if (this.options.handler) {
|
||||||
|
this.options.handler.call(this, this, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.close();
|
||||||
|
},
|
||||||
|
|
||||||
|
onBtnClick: function(event) {
|
||||||
|
this._handleInput(event.currentTarget.attributes['result'].value);
|
||||||
|
},
|
||||||
|
|
||||||
|
onPrimary: function() {
|
||||||
|
this._handleInput('ok');
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
|
||||||
|
getSettings: function() {
|
||||||
|
var props;
|
||||||
|
if (this.chAddLineNumbering.getValue()==='checked') {
|
||||||
|
props = new Asc.CSectionLnNumType();
|
||||||
|
if (this.rbContinuous.getValue())
|
||||||
|
props.put_Restart(Asc.c_oAscLineNumberRestartType.Continuous);
|
||||||
|
else if (this.rbRestartEachPage.getValue())
|
||||||
|
props.put_Restart(Asc.c_oAscLineNumberRestartType.NewPage);
|
||||||
|
else if (this.rbRestartEachSection.getValue())
|
||||||
|
props.put_Restart(Asc.c_oAscLineNumberRestartType.NewSection);
|
||||||
|
props.put_Start(this.spnStartAt.getValue()!=='' ? this.spnStartAt.getNumberValue() : undefined);
|
||||||
|
var value = this.spnFromText.getNumberValue();
|
||||||
|
props.put_Distance(value<0 ? null : parseInt(Common.Utils.Metric.fnRecalcToMM(value) * 72 * 20 / 25.4));
|
||||||
|
props.put_CountBy(this.spnCountBy.getValue()!=='' ? this.spnCountBy.getNumberValue() : undefined);
|
||||||
|
}
|
||||||
|
return {props: props, type: this.cmbApply.getValue()};
|
||||||
|
},
|
||||||
|
|
||||||
|
updateMetricUnit: function() {
|
||||||
|
if (this.spinners) {
|
||||||
|
for (var i=0; i<this.spinners.length; i++) {
|
||||||
|
var spinner = this.spinners[i];
|
||||||
|
spinner.setDefaultUnit(Common.Utils.Metric.getCurrentMetricName());
|
||||||
|
spinner.setStep(Common.Utils.Metric.getCurrentMetric()==Common.Utils.Metric.c_MetricUnits.pt ? 1 : 0.1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
},
|
||||||
|
|
||||||
|
textTitle: 'Line Numbers',
|
||||||
|
textAddLineNumbering: 'Add line numbering',
|
||||||
|
textStartAt: 'Start at',
|
||||||
|
textFromText: 'From text',
|
||||||
|
textCountBy: 'Count by',
|
||||||
|
textNumbering: 'Numbering',
|
||||||
|
textRestartEachPage: 'Restart Each Page',
|
||||||
|
textRestartEachSection: 'Restart Each Section',
|
||||||
|
textContinuous: 'Continuous',
|
||||||
|
textApplyTo: 'Apply changes to',
|
||||||
|
textDocument: 'Whole document',
|
||||||
|
textSection: 'Current section',
|
||||||
|
textForward: 'This point forward'
|
||||||
|
}, DE.Views.LineNumbersDialog || {}))
|
||||||
|
});
|
|
@ -346,6 +346,16 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
|
||||||
}
|
}
|
||||||
}, this));
|
}, this));
|
||||||
|
|
||||||
|
this.chLineNumbers = new Common.UI.CheckBox({
|
||||||
|
el: $('#paragraphadv-checkbox-suppress-line-numbers'),
|
||||||
|
labelText: this.strSuppressLineNumbers
|
||||||
|
});
|
||||||
|
this.chLineNumbers.on('change', _.bind(function(field, newValue, oldValue, eOpts){
|
||||||
|
if (this._changedProps) {
|
||||||
|
this._changedProps.put_SuppressLineNumbers(field.getValue()=='checked');
|
||||||
|
}
|
||||||
|
}, this));
|
||||||
|
|
||||||
// Borders
|
// Borders
|
||||||
|
|
||||||
this.cmbBorderSize = new Common.UI.ComboBorderSize({
|
this.cmbBorderSize = new Common.UI.ComboBorderSize({
|
||||||
|
@ -774,6 +784,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
|
||||||
this.chKeepNext.setValue((props.get_KeepNext() !== null && props.get_KeepNext() !== undefined) ? props.get_KeepNext() : 'indeterminate', true);
|
this.chKeepNext.setValue((props.get_KeepNext() !== null && props.get_KeepNext() !== undefined) ? props.get_KeepNext() : 'indeterminate', true);
|
||||||
this.chOrphan.setValue((props.get_WidowControl() !== null && props.get_WidowControl() !== undefined) ? props.get_WidowControl() : 'indeterminate', true);
|
this.chOrphan.setValue((props.get_WidowControl() !== null && props.get_WidowControl() !== undefined) ? props.get_WidowControl() : 'indeterminate', true);
|
||||||
|
|
||||||
|
this.chLineNumbers.setValue((props.get_SuppressLineNumbers() !== null && props.get_SuppressLineNumbers() !== undefined) ? props.get_SuppressLineNumbers() : 'indeterminate', true);
|
||||||
|
|
||||||
this.Borders = new Asc.asc_CParagraphBorders(props.get_Borders());
|
this.Borders = new Asc.asc_CParagraphBorders(props.get_Borders());
|
||||||
|
|
||||||
// Margins
|
// Margins
|
||||||
|
@ -1471,7 +1483,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
|
||||||
textLevel: 'Level',
|
textLevel: 'Level',
|
||||||
strIndentsOutlinelevel: 'Outline level',
|
strIndentsOutlinelevel: 'Outline level',
|
||||||
strIndent: 'Indents',
|
strIndent: 'Indents',
|
||||||
strSpacing: 'Spacing'
|
strSpacing: 'Spacing',
|
||||||
|
strSuppressLineNumbers: 'Suppress line numbers'
|
||||||
|
|
||||||
}, DE.Views.ParagraphSettingsAdvanced || {}));
|
}, DE.Views.ParagraphSettingsAdvanced || {}));
|
||||||
});
|
});
|
|
@ -974,6 +974,54 @@ define([
|
||||||
});
|
});
|
||||||
this.toolbarControls.push(this.btnPageSize);
|
this.toolbarControls.push(this.btnPageSize);
|
||||||
|
|
||||||
|
this.btnLineNumbers = new Common.UI.Button({
|
||||||
|
id: 'tlbtn-line-numbers',
|
||||||
|
cls: 'btn-toolbar x-huge icon-top',
|
||||||
|
iconCls: 'toolbar__icon btn-line-numbering',
|
||||||
|
caption: me.capBtnLineNumbers,
|
||||||
|
menu: new Common.UI.Menu({
|
||||||
|
cls: 'ppm-toolbar',
|
||||||
|
items: [
|
||||||
|
{
|
||||||
|
caption: this.textNone,
|
||||||
|
checkable: true,
|
||||||
|
toggleGroup: 'menuLineNumbers',
|
||||||
|
value: 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
caption: this.textContinuous,
|
||||||
|
checkable: true,
|
||||||
|
toggleGroup: 'menuLineNumbers',
|
||||||
|
value: 1
|
||||||
|
},
|
||||||
|
{
|
||||||
|
caption: this.textRestartEachPage,
|
||||||
|
checkable: true,
|
||||||
|
toggleGroup: 'menuLineNumbers',
|
||||||
|
value: 2
|
||||||
|
},
|
||||||
|
{
|
||||||
|
caption: this.textRestartEachSection,
|
||||||
|
checkable: true,
|
||||||
|
toggleGroup: 'menuLineNumbers',
|
||||||
|
value: 3
|
||||||
|
},
|
||||||
|
{
|
||||||
|
caption: this.textSuppressForCurrentParagraph,
|
||||||
|
checkable: true,
|
||||||
|
allowDepress: true,
|
||||||
|
value: 4
|
||||||
|
},
|
||||||
|
{caption: '--'},
|
||||||
|
{
|
||||||
|
caption: this.textCustomLineNumbers,
|
||||||
|
value: 5
|
||||||
|
}
|
||||||
|
]
|
||||||
|
})
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
this.btnClearStyle = new Common.UI.Button({
|
this.btnClearStyle = new Common.UI.Button({
|
||||||
id: 'id-toolbar-btn-clearstyle',
|
id: 'id-toolbar-btn-clearstyle',
|
||||||
cls: 'btn-toolbar',
|
cls: 'btn-toolbar',
|
||||||
|
@ -1344,6 +1392,7 @@ define([
|
||||||
_injectComponent('#slot-btn-dropcap', this.btnDropCap);
|
_injectComponent('#slot-btn-dropcap', this.btnDropCap);
|
||||||
_injectComponent('#slot-btn-controls', this.btnContentControls);
|
_injectComponent('#slot-btn-controls', this.btnContentControls);
|
||||||
_injectComponent('#slot-btn-columns', this.btnColumns);
|
_injectComponent('#slot-btn-columns', this.btnColumns);
|
||||||
|
_injectComponent('#slot-btn-line-numbers', this.btnLineNumbers);
|
||||||
_injectComponent('#slot-btn-editheader', this.btnEditHeader);
|
_injectComponent('#slot-btn-editheader', this.btnEditHeader);
|
||||||
_injectComponent('#slot-btn-datetime', this.btnInsDateTime);
|
_injectComponent('#slot-btn-datetime', this.btnInsDateTime);
|
||||||
_injectComponent('#slot-btn-blankpage', this.btnBlankPage);
|
_injectComponent('#slot-btn-blankpage', this.btnBlankPage);
|
||||||
|
@ -1638,6 +1687,7 @@ define([
|
||||||
this.btnPageOrient.updateHint(this.tipPageOrient);
|
this.btnPageOrient.updateHint(this.tipPageOrient);
|
||||||
this.btnPageSize.updateHint(this.tipPageSize);
|
this.btnPageSize.updateHint(this.tipPageSize);
|
||||||
this.btnPageMargins.updateHint(this.tipPageMargins);
|
this.btnPageMargins.updateHint(this.tipPageMargins);
|
||||||
|
this.btnLineNumbers.updateHint(this.tipLineNumbers);
|
||||||
this.btnClearStyle.updateHint(this.tipClearStyle);
|
this.btnClearStyle.updateHint(this.tipClearStyle);
|
||||||
this.btnCopyStyle.updateHint(this.tipCopyStyle + Common.Utils.String.platformKey('Ctrl+Shift+C'));
|
this.btnCopyStyle.updateHint(this.tipCopyStyle + Common.Utils.String.platformKey('Ctrl+Shift+C'));
|
||||||
this.btnColorSchemas.updateHint(this.tipColorSchemas);
|
this.btnColorSchemas.updateHint(this.tipColorSchemas);
|
||||||
|
@ -2362,7 +2412,14 @@ define([
|
||||||
textNewComboboxControl: 'New combo box',
|
textNewComboboxControl: 'New combo box',
|
||||||
textNewCheckboxControl: 'New check box',
|
textNewCheckboxControl: 'New check box',
|
||||||
textNewRadioboxControl: 'New radio box',
|
textNewRadioboxControl: 'New radio box',
|
||||||
textNewDropdownControl: 'New drop-down list'
|
textNewDropdownControl: 'New drop-down list',
|
||||||
|
capBtnLineNumbers: 'Line Numbers',
|
||||||
|
textContinuous: 'Continuous',
|
||||||
|
textRestartEachPage: 'Restart Each Page',
|
||||||
|
textRestartEachSection: 'Restart Each Section',
|
||||||
|
textSuppressForCurrentParagraph: 'Suppress for Current Paragraph',
|
||||||
|
textCustomLineNumbers: 'Line Numbering Options',
|
||||||
|
tipLineNumbers: 'Show line numbers'
|
||||||
}
|
}
|
||||||
})(), DE.Views.Toolbar || {}));
|
})(), DE.Views.Toolbar || {}));
|
||||||
});
|
});
|
||||||
|
|
|
@ -1795,6 +1795,19 @@
|
||||||
"DE.Views.LeftMenu.tipTitles": "Titles",
|
"DE.Views.LeftMenu.tipTitles": "Titles",
|
||||||
"DE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
|
"DE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE",
|
||||||
"DE.Views.LeftMenu.txtTrial": "TRIAL MODE",
|
"DE.Views.LeftMenu.txtTrial": "TRIAL MODE",
|
||||||
|
"DE.Views.LineNumbersDialog.textTitle": "Line Numbers",
|
||||||
|
"DE.Views.LineNumbersDialog.textAddLineNumbering": "Add line numbering",
|
||||||
|
"DE.Views.LineNumbersDialog.textStartAt": "Start at",
|
||||||
|
"DE.Views.LineNumbersDialog.textFromText": "From text",
|
||||||
|
"DE.Views.LineNumbersDialog.textCountBy": "Count by",
|
||||||
|
"DE.Views.LineNumbersDialog.textNumbering": "Numbering",
|
||||||
|
"DE.Views.LineNumbersDialog.textRestartEachPage": "Restart Each Page",
|
||||||
|
"DE.Views.LineNumbersDialog.textRestartEachSection": "Restart Each Section",
|
||||||
|
"DE.Views.LineNumbersDialog.textContinuous": "Continuous",
|
||||||
|
"DE.Views.LineNumbersDialog.textApplyTo": "Apply changes to",
|
||||||
|
"DE.Views.LineNumbersDialog.textDocument": "Whole document",
|
||||||
|
"DE.Views.LineNumbersDialog.textSection": "Current section",
|
||||||
|
"DE.Views.LineNumbersDialog.textForward": "This point forward",
|
||||||
"DE.Views.Links.capBtnBookmarks": "Bookmark",
|
"DE.Views.Links.capBtnBookmarks": "Bookmark",
|
||||||
"DE.Views.Links.capBtnCaption": "Caption",
|
"DE.Views.Links.capBtnCaption": "Caption",
|
||||||
"DE.Views.Links.capBtnContentsUpdate": "Refresh",
|
"DE.Views.Links.capBtnContentsUpdate": "Refresh",
|
||||||
|
@ -2030,6 +2043,7 @@
|
||||||
"DE.Views.ParagraphSettingsAdvanced.tipTop": "Set top border only",
|
"DE.Views.ParagraphSettingsAdvanced.tipTop": "Set top border only",
|
||||||
"DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
|
"DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Auto",
|
||||||
"DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "No borders",
|
"DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "No borders",
|
||||||
|
"DE.Views.ParagraphSettingsAdvanced.strSuppressLineNumbers": "Suppress line numbers",
|
||||||
"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",
|
||||||
|
@ -2498,6 +2512,13 @@
|
||||||
"DE.Views.Toolbar.txtScheme7": "Equity",
|
"DE.Views.Toolbar.txtScheme7": "Equity",
|
||||||
"DE.Views.Toolbar.txtScheme8": "Flow",
|
"DE.Views.Toolbar.txtScheme8": "Flow",
|
||||||
"DE.Views.Toolbar.txtScheme9": "Foundry",
|
"DE.Views.Toolbar.txtScheme9": "Foundry",
|
||||||
|
"DE.Views.Toolbar.capBtnLineNumbers": "Line Numbers",
|
||||||
|
"DE.Views.Toolbar.textContinuous": "Continuous",
|
||||||
|
"DE.Views.Toolbar.textRestartEachPage": "Restart Each Page",
|
||||||
|
"DE.Views.Toolbar.textRestartEachSection": "Restart Each Section",
|
||||||
|
"DE.Views.Toolbar.textSuppressForCurrentParagraph": "Suppress for Current Paragraph",
|
||||||
|
"DE.Views.Toolbar.textCustomLineNumbers": "Line Numbering Options",
|
||||||
|
"DE.Views.Toolbar.tipLineNumbers": "Show line numbers",
|
||||||
"DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
|
"DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
|
||||||
"DE.Views.WatermarkSettingsDialog.textBold": "Bold",
|
"DE.Views.WatermarkSettingsDialog.textBold": "Bold",
|
||||||
"DE.Views.WatermarkSettingsDialog.textColor": "Text color",
|
"DE.Views.WatermarkSettingsDialog.textColor": "Text color",
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 311 B |
Binary file not shown.
After Width: | Height: | Size: 343 B |
Binary file not shown.
After Width: | Height: | Size: 343 B |
Binary file not shown.
After Width: | Height: | Size: 238 B |
Binary file not shown.
After Width: | Height: | Size: 375 B |
Loading…
Reference in a new issue