Compare commits

...

2 commits

Author SHA1 Message Date
Julia Svinareva 123b18a520 [DE] Line Numbers 2019-09-19 10:20:21 +03:00
Julia Svinareva 822fbb0bbb [DE] Line Numbers 2019-09-18 16:12:39 +03:00
6 changed files with 314 additions and 3 deletions

View file

@ -56,7 +56,8 @@ define([
'documenteditor/main/app/controller/PageLayout',
'documenteditor/main/app/view/CustomColumnsDialog',
'documenteditor/main/app/view/ControlSettingsDialog',
'documenteditor/main/app/view/WatermarkSettingsDialog'
'documenteditor/main/app/view/WatermarkSettingsDialog',
'documenteditor/main/app/view/LineNumbersDialog'
], function () {
'use strict';
@ -324,6 +325,7 @@ define([
toolbar.btnInsertEquation.on('click', _.bind(this.onInsertEquationClick, this));
toolbar.mnuNoControlsColor.on('click', _.bind(this.onNoControlsColor, 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('setmailmergerecipients', _.bind(this.setMailMergeRecipients, this));
$('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this));
@ -1582,6 +1584,33 @@ define([
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
},
onLineNumbersSelect: function(menu, item) {
switch (item.value) {
case 0:
break;
case 1:
break;
case 2:
break;
case 3:
break;
case 4:
break;
case 5:
var win,
me = this;
win = new DE.Views.LineNumbersDialog({
handler: function(dlg, result) {
if (result == 'ok') {
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
}
}
});
win.show();
break;
}
},
onColorSchemaClick: function(menu, item) {
if (this.api) {
this.api.ChangeColorScheme(item.value);

View file

@ -79,6 +79,11 @@
<div id="paragraphadv-checkbox-keep-next"></div>
</td>
</tr>
<tr>
<td class="padding-small">
<div id="paragraphadv-checkbox-suppress-line-numbers"></div>
</td>
</tr>
</table>
</div>
</div>

View file

@ -125,6 +125,7 @@
<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 btn-pagebreak"></span>
<span class="btn-slot text x-huge" id="slot-btn-line-numbers"></span>
</div>
<div class="separator long"></div>
<div class="group">

View file

@ -0,0 +1,211 @@
/*
*
* (c) Copyright Ascensio System SIA 2010-2019
*
* This program is a free software product. You can redistribute it and/or
* modify it under the terms of the GNU Affero General Public License (AGPL)
* version 3 as published by the Free Software Foundation. In accordance with
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
* that Ascensio System SIA expressly excludes the warranty of non-infringement
* of any third-party rights.
*
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
*
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
* street, Riga, Latvia, EU, LV-1050.
*
* The interactive user interfaces in modified source and object code versions
* of the Program must display Appropriate Legal Notices, as required under
* Section 5 of the GNU AGPL version 3.
*
* Pursuant to Section 7(b) of the License you must retain the original Product
* logo when distributing the program. Pursuant to Section 7(e) we decline to
* grant you any rights under trademark law for use of our trademarks.
*
* All the Product's GUI elements, including illustrations and icon sets, as
* well as technical writing content are licensed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
*
*/
/**
* LineNumbersDialog.js
*
* Created by Julia Svinareva on 18/09/19
* Copyright (c) 2018 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,
header: true,
style: 'min-width: 290px;',
cls: 'modal-dlg'
},
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: 5px;"></div>',
'</div>',
'<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;">' + this.okButtonText + '</button>',
'<button class="btn normal dlg-btn" result="cancel">' + this.cancelButtonText + '</button>',
'</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
});
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
});
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
});
this.rbRestartEachPage = new Common.UI.RadioBox({
el: $('#line-numbers-restart-each-page'),
labelText: this.textRestartEachPage,
name: 'asc-radio-line-numbers'
});
this.rbRestartEachSection = new Common.UI.RadioBox({
el: $('#line-numbers-restart-each-section'),
labelText: this.textRestartEachSection,
name: 'asc-radio-line-numbers'
});
this.rbContinuous = new Common.UI.RadioBox({
el: $('#line-numbers-continuous'),
labelText: this.textContinuous,
name: 'asc-radio-line-numbers'
});
this.getChild().find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
this.updateMetricUnit();
},
afterRender: function() {
this._setDefaults();
},
_setDefaults: function() {
},
_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() {
return this;
},
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 Settings',
cancelButtonText: 'Cancel',
okButtonText: 'Ok',
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'
}, DE.Views.LineNumbersDialog || {}))
});

View file

@ -346,6 +346,11 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
}
}, this));
this.chLineNumbers = new Common.UI.CheckBox({
el: $('#paragraphadv-checkbox-suppress-line-numbers'),
labelText: this.strSuppressLineNumbers
});
// Borders
this.cmbBorderSize = new Common.UI.ComboBorderSize({
@ -1506,7 +1511,8 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
textLevel: 'Level',
strIndentsOutlinelevel: 'Outline level',
strIndent: 'Indents',
strSpacing: 'Spacing'
strSpacing: 'Spacing',
strSuppressLineNumbers: 'Suppress line numbers'
}, DE.Views.ParagraphSettingsAdvanced || {}));
});

View file

@ -941,6 +941,56 @@ define([
});
this.toolbarControls.push(this.btnPageSize);
this.btnLineNumbers = new Common.UI.Button({
id: 'tlbtn-line-numbers',
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-columns',
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,
toggleGroup: 'menuLineNumbers',
value: 4
},
{caption: '--'},
{
caption: this.textCustomLineNumbers,
value: 5,
checkable: true,
toggleGroup: 'menuLineNumbers'
}
]
})
});
this.btnClearStyle = new Common.UI.Button({
id: 'id-toolbar-btn-clearstyle',
cls: 'btn-toolbar',
@ -1310,6 +1360,7 @@ define([
_injectComponent('#slot-btn-dropcap', this.btnDropCap);
_injectComponent('#slot-btn-controls', this.btnContentControls);
_injectComponent('#slot-btn-columns', this.btnColumns);
_injectComponent('#slot-btn-line-numbers', this.btnLineNumbers);
_injectComponent('#slot-btn-editheader', this.btnEditHeader);
_injectComponent('#slot-btn-blankpage', this.btnBlankPage);
_injectComponent('#slot-btn-insshape', this.btnInsertShape);
@ -1590,6 +1641,7 @@ define([
this.btnPageOrient.updateHint(this.tipPageOrient);
this.btnPageSize.updateHint(this.tipPageSize);
this.btnPageMargins.updateHint(this.tipPageMargins);
this.btnLineNumbers.updateHint(this.tipLineNumbers);
this.btnClearStyle.updateHint(this.tipClearStyle);
this.btnCopyStyle.updateHint(this.tipCopyStyle + Common.Utils.String.platformKey('Ctrl+Shift+C'));
this.btnColorSchemas.updateHint(this.tipColorSchemas);
@ -2419,7 +2471,14 @@ define([
capBtnWatermark: 'Watermark',
textEditWatermark: 'Custom Watermark',
textRemWatermark: 'Remove Watermark',
tipWatermark: 'Edit watermark'
tipWatermark: 'Edit watermark',
capBtnLineNumbers: 'Line Numbers',
textContinuous: 'Continuous',
textRestartEachPage: 'Restart Each Page',
textRestartEachSection: 'Restart Each Section',
textSuppressForCurrentParagraph: 'Suppress for Current Paragraph',
textCustomLineNumbers: 'Custom Line Numbers',
tipLineNumbers: 'Line Numbers'
}
})(), DE.Views.Toolbar || {}));
});