diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html
index fe4cfdc14..71e53a6d1 100644
--- a/apps/documenteditor/embed/index.html
+++ b/apps/documenteditor/embed/index.html
@@ -115,7 +115,7 @@
-
+
+
+
+
-
+
+
+
diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js
index 07d2debb1..f8baf5891 100644
--- a/apps/documenteditor/embed/js/ApplicationController.js
+++ b/apps/documenteditor/embed/js/ApplicationController.js
@@ -398,6 +398,10 @@ DE.ApplicationController = new(function(){
message = me.errorUserDrop;
break;
+ case Asc.c_oAscError.ID.ConvertationOpenLimitError:
+ message = me.errorFileSizeExceed;
+ break;
+
default:
message = me.errorDefaultMessage.replace('%1', id);
break;
@@ -409,7 +413,7 @@ DE.ApplicationController = new(function(){
Common.Gateway.reportError(id, message);
$('#id-critical-error-title').text(me.criticalErrorTitle);
- $('#id-critical-error-message').text(message);
+ $('#id-critical-error-message').html(message);
$('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
window.location.reload();
});
@@ -418,7 +422,7 @@ DE.ApplicationController = new(function(){
Common.Gateway.reportWarning(id, message);
$('#id-critical-error-title').text(me.notcriticalErrorTitle);
- $('#id-critical-error-message').text(message);
+ $('#id-critical-error-message').html(message);
$('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
$('#id-critical-error-dialog').modal('hide');
});
@@ -553,6 +557,7 @@ DE.ApplicationController = new(function(){
downloadTextText: 'Downloading document...',
waitText: 'Please, wait...',
textLoadingDocument: 'Loading document',
- txtClose: 'Close'
+ txtClose: 'Close',
+ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.'
}
})();
\ No newline at end of file
diff --git a/apps/documenteditor/embed/js/application.js b/apps/documenteditor/embed/js/application.js
index 9045fe155..63d642fb2 100644
--- a/apps/documenteditor/embed/js/application.js
+++ b/apps/documenteditor/embed/js/application.js
@@ -31,7 +31,8 @@
*
*/
+function ($) {
- Common.Locale.apply();
- DE.ApplicationView.create();
- DE.ApplicationController.create();
+ Common.Locale.apply(function() {
+ DE.ApplicationView.create();
+ DE.ApplicationController.create();
+ });
}();
diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json
index 77a8b48f8..91cd7c4b4 100644
--- a/apps/documenteditor/embed/locale/en.json
+++ b/apps/documenteditor/embed/locale/en.json
@@ -12,6 +12,7 @@
"DE.ApplicationController.errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.",
"DE.ApplicationController.errorDefaultMessage": "Error code: %1",
"DE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.",
+ "DE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.",
"DE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
"DE.ApplicationController.notcriticalErrorTitle": "Warning",
"DE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
diff --git a/apps/documenteditor/main/app.js b/apps/documenteditor/main/app.js
index 963a99082..bd53d3271 100644
--- a/apps/documenteditor/main/app.js
+++ b/apps/documenteditor/main/app.js
@@ -169,44 +169,46 @@ require([
]
});
- Common.Locale.apply();
-
- require([
- 'documenteditor/main/app/controller/Viewport',
- 'documenteditor/main/app/controller/DocumentHolder',
- 'documenteditor/main/app/controller/Toolbar',
- 'documenteditor/main/app/controller/Statusbar',
- 'documenteditor/main/app/controller/Links',
- 'documenteditor/main/app/controller/Navigation',
- 'documenteditor/main/app/controller/RightMenu',
- 'documenteditor/main/app/controller/LeftMenu',
- 'documenteditor/main/app/controller/Main',
- 'documenteditor/main/app/view/FileMenuPanels',
- 'documenteditor/main/app/view/ParagraphSettings',
- 'documenteditor/main/app/view/HeaderFooterSettings',
- 'documenteditor/main/app/view/ImageSettings',
- 'documenteditor/main/app/view/TableSettings',
- 'documenteditor/main/app/view/ShapeSettings',
- 'documenteditor/main/app/view/TextArtSettings',
- 'documenteditor/main/app/view/SignatureSettings',
- 'common/main/lib/util/utils',
- 'common/main/lib/util/LocalStorage',
- 'common/main/lib/controller/Fonts',
- 'common/main/lib/controller/History'
- /** coauthoring begin **/
- ,'common/main/lib/controller/Comments'
- ,'common/main/lib/controller/Chat'
- /** coauthoring end **/
- ,'common/main/lib/controller/Plugins'
- ,'documenteditor/main/app/view/ChartSettings'
- ,'common/main/lib/controller/ExternalDiagramEditor'
- ,'common/main/lib/controller/ExternalMergeEditor'
- ,'common/main/lib/controller/ReviewChanges'
- ,'common/main/lib/controller/Protection'
- ,'common/main/lib/controller/Desktop'
- ], function() {
- app.start();
- });
+ Common.Locale.apply(
+ function() {
+ require([
+ 'documenteditor/main/app/controller/Viewport',
+ 'documenteditor/main/app/controller/DocumentHolder',
+ 'documenteditor/main/app/controller/Toolbar',
+ 'documenteditor/main/app/controller/Statusbar',
+ 'documenteditor/main/app/controller/Links',
+ 'documenteditor/main/app/controller/Navigation',
+ 'documenteditor/main/app/controller/RightMenu',
+ 'documenteditor/main/app/controller/LeftMenu',
+ 'documenteditor/main/app/controller/Main',
+ 'documenteditor/main/app/view/FileMenuPanels',
+ 'documenteditor/main/app/view/ParagraphSettings',
+ 'documenteditor/main/app/view/HeaderFooterSettings',
+ 'documenteditor/main/app/view/ImageSettings',
+ 'documenteditor/main/app/view/TableSettings',
+ 'documenteditor/main/app/view/ShapeSettings',
+ 'documenteditor/main/app/view/TextArtSettings',
+ 'documenteditor/main/app/view/SignatureSettings',
+ 'common/main/lib/util/utils',
+ 'common/main/lib/util/LocalStorage',
+ 'common/main/lib/controller/Fonts',
+ 'common/main/lib/controller/History'
+ /** coauthoring begin **/
+ ,'common/main/lib/controller/Comments'
+ ,'common/main/lib/controller/Chat'
+ /** coauthoring end **/
+ ,'common/main/lib/controller/Plugins'
+ ,'documenteditor/main/app/view/ChartSettings'
+ ,'common/main/lib/controller/ExternalDiagramEditor'
+ ,'common/main/lib/controller/ExternalMergeEditor'
+ ,'common/main/lib/controller/ReviewChanges'
+ ,'common/main/lib/controller/Protection'
+ ,'common/main/lib/controller/Desktop'
+ ], function() {
+ app.start();
+ });
+ }
+ );
}, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
reqerr = window.requireTimeourError();
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index 8fe6ae0a7..002792ba4 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -223,9 +223,11 @@ define([
});
$(document.body).on('blur', 'input, textarea', function(e) {
- if (!me.isModalShowed && !me.getApplication().getController('LeftMenu').getView('LeftMenu').getMenu('file').isVisible()) {
+ if (!me.isModalShowed) {
if (/form-control/.test(e.target.className))
me.inFormControl = false;
+ if (me.getApplication().getController('LeftMenu').getView('LeftMenu').getMenu('file').isVisible())
+ return;
if (!e.relatedTarget ||
!/area_id/.test(e.target.id)
&& !(e.target.localName == 'input' && $(e.target).parent().find(e.relatedTarget).length>0) /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */
@@ -687,7 +689,7 @@ define([
var action = {id: id, type: type};
this.stackLongActions.pop(action);
- appHeader.setDocumentCaption(this.api.asc_getDocumentName());
+ appHeader && appHeader.setDocumentCaption(this.api.asc_getDocumentName());
this.updateWindowTitle(true);
action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information});
@@ -887,7 +889,7 @@ define([
value = Common.localStorage.getItem("de-show-tableline");
me.api.put_ShowTableEmptyLine((value!==null) ? eval(value) : true);
- value = Common.localStorage.getBool("de-settings-spellcheck", true);
+ value = Common.localStorage.getBool("de-settings-spellcheck", !(this.appOptions.customization && this.appOptions.customization.spellcheck===false));
Common.Utils.InternalSettings.set("de-settings-spellcheck", value);
me.api.asc_setSpellCheck(value);
@@ -1484,6 +1486,10 @@ define([
config.msg = this.errorEmailClient;
break;
+ case Asc.c_oAscError.ID.ConvertationOpenLimitError:
+ config.msg = this.errorFileSizeExceed;
+ break;
+
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@@ -1596,7 +1602,7 @@ define([
if (this._state.isDocModified !== isModified || force) {
var title = this.defaultTitleText;
- if (!_.isEmpty(appHeader.getDocumentCaption()))
+ if (appHeader && !_.isEmpty(appHeader.getDocumentCaption()))
title = appHeader.getDocumentCaption() + ' - ' + title;
if (isModified) {
@@ -2456,7 +2462,8 @@ define([
errorEmailClient: 'No email client could be found',
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.',
txtHyperlink: 'Hyperlink',
- waitText: 'Please, wait...'
+ waitText: 'Please, wait...',
+ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.'
}
})(), DE.Controllers.Main || {}))
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js
index 32710d50f..cc10f585e 100644
--- a/apps/documenteditor/main/app/controller/Toolbar.js
+++ b/apps/documenteditor/main/app/controller/Toolbar.js
@@ -1963,6 +1963,7 @@ define([
(new DE.Views.WatermarkSettingsDialog({
props: me.api.asc_GetWatermarkProps(),
api: me.api,
+ lang: me.mode.lang,
fontStore: me.fontstore,
handler: function(result, value) {
if (result == 'ok') {
diff --git a/apps/documenteditor/main/app/view/CellsAddDialog.js b/apps/documenteditor/main/app/view/CellsAddDialog.js
new file mode 100644
index 000000000..529cefae5
--- /dev/null
+++ b/apps/documenteditor/main/app/view/CellsAddDialog.js
@@ -0,0 +1,166 @@
+/*
+ *
+ * (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
+ *
+ */
+
+/**
+ * CellsAddDialog.js
+ *
+ * Created by Julia Radzhabova on 06.09.2019
+ * Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+ 'common/main/lib/component/Window',
+ 'common/main/lib/component/ComboBox',
+ 'common/main/lib/component/MetricSpinner',
+ 'common/main/lib/component/RadioBox'
+], function () { 'use strict';
+
+ DE.Views.CellsAddDialog = Common.UI.Window.extend(_.extend({
+ options: {
+ width: 214,
+ header: true,
+ style: 'min-width: 214px;',
+ cls: 'modal-dlg'
+ },
+
+ initialize : function(options) {
+ _.extend(this.options, {
+ title: this.textTitle
+ }, options || {});
+
+ this.template = [
+ '
',
+ '
',
+ '
',
+ '
',
+ ''
+ ].join('');
+
+ this.options.tpl = _.template(this.template)(this.options);
+
+ Common.UI.Window.prototype.initialize.call(this, this.options);
+ },
+
+ render: function() {
+ Common.UI.Window.prototype.render.call(this);
+
+ this.cmbRowCol = new Common.UI.ComboBox({
+ el: $('#table-combo-row-col'),
+ cls: 'input-group-nr',
+ style: 'width: 110px;',
+ menuStyle: 'min-width: 110px;',
+ editable: false,
+ scrollAlwaysVisible: true,
+ data: [
+ { value: 0, displayValue: this.textRow},
+ { value: 1, displayValue: this.textCol}
+ ]
+ });
+ this.cmbRowCol.setValue(0);
+ this.cmbRowCol.on('selected', _.bind(function(combo, record) {
+ var row = record.value == 0;
+ this.spnCount.setMaxValue(row ? 100 : 64);
+ this.spnCount.setValue(this.spnCount.getNumberValue());
+ this.radioBefore.setCaption(row ? this.textUp : this.textLeft);
+ this.radioAfter.setCaption(row ? this.textDown : this.textRight);
+ }, this));
+
+ this.spnCount = new Common.UI.MetricSpinner({
+ el: $('#table-spin-row-col'),
+ step : 1,
+ width : 65,
+ value : 1,
+ defaultUnit : '',
+ maxValue : 100,
+ minValue : 1,
+ allowDecimal: false
+ });
+
+ this.radioBefore = new Common.UI.RadioBox({
+ el: $('#table-radio-before'),
+ labelText: this.textUp,
+ name: 'asc-radio-table-cells-add',
+ checked: true
+ });
+
+ this.radioAfter = new Common.UI.RadioBox({
+ el: $('#table-radio-after'),
+ labelText: this.textDown,
+ name: 'asc-radio-table-cells-add'
+ });
+
+ var $window = this.getChild();
+ $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+ },
+
+ _handleInput: function(state) {
+ if (this.options.handler) {
+ this.options.handler.call(this, state, this.getSettings());
+ }
+
+ this.close();
+ },
+
+ onBtnClick: function(event) {
+ this._handleInput(event.currentTarget.attributes['result'].value);
+ },
+
+ getSettings: function() {
+ var row = this.cmbRowCol.getValue()==0;
+ return {row: row, before: this.radioBefore.getValue(), count: this.spnCount.getNumberValue()};
+ },
+
+ onPrimary: function() {
+ this._handleInput('ok');
+ return false;
+ },
+
+ cancelButtonText: 'Cancel',
+ okButtonText: 'Ok',
+ textTitle: 'Insert Several',
+ textLeft: 'To the left',
+ textRight: 'To the right',
+ textUp: 'Above the cursor',
+ textDown: 'Below the cursor',
+ textRow: 'Rows',
+ textCol: 'Columns'
+
+ }, DE.Views.CellsAddDialog || {}))
+});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/CellsRemoveDialog.js b/apps/documenteditor/main/app/view/CellsRemoveDialog.js
new file mode 100644
index 000000000..cd89ed8c2
--- /dev/null
+++ b/apps/documenteditor/main/app/view/CellsRemoveDialog.js
@@ -0,0 +1,131 @@
+/*
+ *
+ * (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
+ *
+ */
+
+/**
+ * CellsRemoveDialog.js
+ *
+ * Created by Julia Radzhabova on 05.09.2019
+ * Copyright (c) 2019 Ascensio System SIA. All rights reserved.
+ *
+ */
+
+define([
+ 'common/main/lib/component/Window',
+ 'common/main/lib/component/RadioBox'
+], function () { 'use strict';
+
+ DE.Views.CellsRemoveDialog = Common.UI.Window.extend(_.extend({
+ options: {
+ width: 214,
+ header: true,
+ style: 'min-width: 214px;',
+ cls: 'modal-dlg'
+ },
+
+ initialize : function(options) {
+ _.extend(this.options, {
+ title: this.textTitle
+ }, options || {});
+
+ this.template = [
+ '
',
+ '
',
+ '
',
+ '
',
+ ''
+ ].join('');
+
+ this.options.tpl = _.template(this.template)(this.options);
+
+ Common.UI.Window.prototype.initialize.call(this, this.options);
+ },
+
+ render: function() {
+ Common.UI.Window.prototype.render.call(this);
+
+ this.radioLeft = new Common.UI.RadioBox({
+ el: $('#table-radio-cells-left'),
+ labelText: this.textLeft,
+ name: 'asc-radio-table-cells-rem',
+ checked: true
+ });
+
+ this.radioRow = new Common.UI.RadioBox({
+ el: $('#table-radio-cells-row'),
+ labelText: this.textRow,
+ name: 'asc-radio-table-cells-rem'
+ });
+
+ this.radioCol = new Common.UI.RadioBox({
+ el: $('#table-radio-cells-col'),
+ labelText: this.textCol,
+ name: 'asc-radio-table-cells-rem'
+ });
+
+ var $window = this.getChild();
+ $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
+ },
+
+ _handleInput: function(state) {
+ if (this.options.handler) {
+ this.options.handler.call(this, state, this.getSettings());
+ }
+
+ this.close();
+ },
+
+ onBtnClick: function(event) {
+ this._handleInput(event.currentTarget.attributes['result'].value);
+ },
+
+ getSettings: function() {
+ return this.radioRow.getValue() ? 'row' : (this.radioCol.getValue() ? 'col' : 'left') ;
+ },
+
+ onPrimary: function() {
+ this._handleInput('ok');
+ return false;
+ },
+
+ cancelButtonText: 'Cancel',
+ okButtonText: 'Ok',
+ textTitle: 'Delete Cells',
+ textLeft: 'Shift cells left',
+ textRow: 'Delete entire row',
+ textCol: 'Delete entire column'
+
+ }, DE.Views.CellsRemoveDialog || {}))
+});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js
index 5ef89ea0f..6d3301d82 100644
--- a/apps/documenteditor/main/app/view/DocumentHolder.js
+++ b/apps/documenteditor/main/app/view/DocumentHolder.js
@@ -54,7 +54,9 @@ define([
'documenteditor/main/app/view/ParagraphSettingsAdvanced',
'documenteditor/main/app/view/TableSettingsAdvanced',
'documenteditor/main/app/view/ControlSettingsDialog',
- 'documenteditor/main/app/view/NumberingValueDialog'
+ 'documenteditor/main/app/view/NumberingValueDialog',
+ 'documenteditor/main/app/view/CellsRemoveDialog',
+ 'documenteditor/main/app/view/CellsAddDialog'
], function ($, _, Backbone, gateway) { 'use strict';
DE.Views.DocumentHolder = Backbone.View.extend(_.extend({
@@ -1914,6 +1916,41 @@ define([
this.fireEvent('editcomplete', this);
},
+ onCellsRemove: function() {
+ var me = this;
+ (new DE.Views.CellsRemoveDialog({
+ handler: function (result, value) {
+ if (result == 'ok') {
+ if (value == 'row')
+ me.api.remRow();
+ else if (value == 'col')
+ me.api.remColumn();
+ else
+ me.api.asc_RemoveTableCells();
+ }
+ me.fireEvent('editcomplete', me);
+ }
+ })).show();
+ this.fireEvent('editcomplete', this);
+ },
+
+ onCellsAdd: function() {
+ var me = this;
+ (new DE.Views.CellsAddDialog({
+ handler: function (result, settings) {
+ if (result == 'ok') {
+ if (settings.row) {
+ settings.before ? me.api.addRowAbove(settings.count) : me.api.addRowBelow(settings.count);
+ } else {
+ settings.before ? me.api.addColumnLeft(settings.count) : me.api.addColumnRight(settings.count);
+ }
+ }
+ me.fireEvent('editcomplete', me);
+ }
+ })).show();
+ this.fireEvent('editcomplete', this);
+ },
+
createDelayedElementsViewer: function() {
var me = this;
@@ -3131,6 +3168,11 @@ define([
}).on('click', function(item) {
if (me.api)
me.api.addRowBelow();
+ }),
+ new Common.UI.MenuItem({
+ caption: me.textSeveral
+ }).on('click', function(item) {
+ me.onCellsAdd();
})
]
})
@@ -3158,6 +3200,11 @@ define([
}).on('click', function(item) {
if (me.api)
me.api.remTable();
+ }),
+ new Common.UI.MenuItem({
+ caption: me.textCells
+ }).on('click', function(item) {
+ me.onCellsRemove();
})
]
})
@@ -4085,7 +4132,9 @@ define([
textCropFit: 'Fit',
textFollow: 'Follow move',
toDictionaryText: 'Add to Dictionary',
- txtPrintSelection: 'Print Selection'
+ txtPrintSelection: 'Print Selection',
+ textCells: 'Cells',
+ textSeveral: 'Several Rows/Columns'
}, DE.Views.DocumentHolder || {}));
});
\ No newline at end of file
diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js
index a91d17730..8496d4599 100644
--- a/apps/documenteditor/main/app/view/FileMenuPanels.js
+++ b/apps/documenteditor/main/app/view/FileMenuPanels.js
@@ -770,6 +770,11 @@ define([
'',
'
',
'',
+ '
|
',
+ '
',
+ ' | ',
+ ' | ',
+ '
',
''
].join(''));
@@ -778,6 +783,7 @@ define([
this.menu = options.menu;
this.coreProps = null;
this.authors = [];
+ this._locked = false;
},
render: function(node) {
@@ -814,33 +820,18 @@ define([
style : 'width: 200px;',
placeHolder : this.txtAddText,
validateOnBlur: false
- }).on('changed:after', function(input, newValue, oldValue) {
- if (newValue !== oldValue && me.coreProps && me.api) {
- me.coreProps.asc_putTitle(me.inputTitle.getValue());
- me.api.asc_setCoreProps(me.coreProps);
- }
}).on('keydown:before', keyDownBefore);
this.inputSubject = new Common.UI.InputField({
el : $markup.findById('#id-info-subject'),
style : 'width: 200px;',
placeHolder : this.txtAddText,
validateOnBlur: false
- }).on('changed:after', function(input, newValue, oldValue) {
- if (newValue !== oldValue && me.coreProps && me.api) {
- me.coreProps.asc_putSubject(me.inputSubject.getValue());
- me.api.asc_setCoreProps(me.coreProps);
- }
}).on('keydown:before', keyDownBefore);
this.inputComment = new Common.UI.InputField({
el : $markup.findById('#id-info-comment'),
style : 'width: 200px;',
placeHolder : this.txtAddText,
validateOnBlur: false
- }).on('changed:after', function(input, newValue, oldValue) {
- if (newValue !== oldValue && me.coreProps && me.api) {
- me.coreProps.asc_putDescription(me.inputComment.getValue());
- me.api.asc_setCoreProps(me.coreProps);
- }
}).on('keydown:before', keyDownBefore);
// modify info
@@ -861,10 +852,6 @@ define([
idx = me.tblAuthor.find('tr').index(el);
el.remove();
me.authors.splice(idx, 1);
- if (me.coreProps && me.api) {
- me.coreProps.asc_putCreator(me.authors.join(';'));
- me.api.asc_setCoreProps(me.coreProps);
- }
}
});
@@ -873,27 +860,31 @@ define([
style : 'width: 200px;',
validateOnBlur: false,
placeHolder: this.txtAddAuthor
- }).on('changed:after', function(input, newValue, oldValue) {
+ }).on('changed:after', function(input, newValue, oldValue, e) {
if (newValue == oldValue) return;
var val = newValue.trim();
if (!!val && val !== oldValue.trim()) {
+ var isFromApply = e && e.relatedTarget && (e.relatedTarget.id == 'fminfo-btn-apply');
val.split(/\s*[,;]\s*/).forEach(function(item){
var str = item.trim();
if (str) {
- var div = $(Common.Utils.String.format(me.authorTpl, Common.Utils.String.htmlEncode(str)));
- me.trAuthor.before(div);
me.authors.push(item);
+ if (!isFromApply) {
+ var div = $(Common.Utils.String.format(me.authorTpl, Common.Utils.String.htmlEncode(str)));
+ me.trAuthor.before(div);
+ }
}
});
- me.inputAuthor.setValue('');
- if (me.coreProps && me.api) {
- me.coreProps.asc_putCreator(me.authors.join(';'));
- me.api.asc_setCoreProps(me.coreProps);
- }
+ !isFromApply && me.inputAuthor.setValue('');
}
}).on('keydown:before', keyDownBefore);
+ this.btnApply = new Common.UI.Button({
+ el: '#fminfo-btn-apply'
+ });
+ this.btnApply.on('click', _.bind(this.applySettings, this));
+
this.rendered = true;
this.updateInfo(this.doc);
@@ -1002,6 +993,7 @@ define([
value = props.asc_getDescription();
this.inputComment.setValue(value || '');
+ this.inputAuthor.setValue('');
this.tblAuthor.find('tr:not(:last-of-type)').remove();
this.authors = [];
value = props.asc_getCreator();//"123\"\"\"\<\>,456";
@@ -1010,7 +1002,9 @@ define([
me.trAuthor.before(div);
me.authors.push(item);
});
+ this.tblAuthor.find('.close').toggleClass('hidden', !this.mode.isEdit);
}
+ this.SetDisabled();
},
_ShowHideInfoItem: function(el, visible) {
@@ -1049,6 +1043,11 @@ define([
},
setMode: function(mode) {
+ this.mode = mode;
+ this.inputAuthor.setVisible(mode.isEdit);
+ this.btnApply.setVisible(mode.isEdit);
+ this.tblAuthor.find('.close').toggleClass('hidden', !mode.isEdit);
+ this.SetDisabled();
return this;
},
@@ -1096,12 +1095,30 @@ define([
},
onLockCore: function(lock) {
- this.inputTitle.setDisabled(lock);
- this.inputSubject.setDisabled(lock);
- this.inputComment.setDisabled(lock);
- this.inputAuthor.setDisabled(lock);
- this.tblAuthor.find('.close').toggleClass('disabled', lock);
- !lock && this.updateFileInfo();
+ this._locked = lock;
+ this.updateFileInfo();
+ },
+
+ SetDisabled: function() {
+ var disable = !this.mode.isEdit || this._locked;
+ this.inputTitle.setDisabled(disable);
+ this.inputSubject.setDisabled(disable);
+ this.inputComment.setDisabled(disable);
+ this.inputAuthor.setDisabled(disable);
+ this.tblAuthor.find('.close').toggleClass('disabled', this._locked);
+ this.tblAuthor.toggleClass('disabled', disable);
+ this.btnApply.setDisabled(this._locked);
+ },
+
+ applySettings: function() {
+ if (this.coreProps && this.api) {
+ this.coreProps.asc_putTitle(this.inputTitle.getValue());
+ this.coreProps.asc_putSubject(this.inputSubject.getValue());
+ this.coreProps.asc_putDescription(this.inputComment.getValue());
+ this.coreProps.asc_putCreator(this.authors.join(';'));
+ this.api.asc_setCoreProps(this.coreProps);
+ }
+ this.menu.hide();
},
txtPlacement: 'Location',
@@ -1124,7 +1141,8 @@ define([
txtAuthor: 'Author',
txtAddAuthor: 'Add Author',
txtAddText: 'Add Text',
- txtMinutes: 'min'
+ txtMinutes: 'min',
+ okButtonText: 'Apply'
}, DE.Views.FileMenuPanels.DocumentInfo || {}));
DE.Views.FileMenuPanels.DocumentRights = Common.UI.BaseView.extend(_.extend({
diff --git a/apps/documenteditor/main/app/view/StyleTitleDialog.js b/apps/documenteditor/main/app/view/StyleTitleDialog.js
index 238efe689..fff6a3779 100644
--- a/apps/documenteditor/main/app/view/StyleTitleDialog.js
+++ b/apps/documenteditor/main/app/view/StyleTitleDialog.js
@@ -105,7 +105,7 @@ define([
this.cmbNextStyle = new Common.UI.ComboBox({
el : $('#id-dlg-style-next-par'),
style : 'width: 100%;',
- menuStyle : 'width: 100%; max-height: 290px;',
+ menuStyle : 'width: 100%; max-height: 210px;',
editable : false,
cls : 'input-group-nr',
data : this.options.formats,
diff --git a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
index e4174cfc5..c4d7a4ca4 100644
--- a/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
+++ b/apps/documenteditor/main/app/view/WatermarkSettingsDialog.js
@@ -111,11 +111,14 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
this.textControls = [];
this.imageControls = [];
this.fontName = 'Arial';
- this.lang = {value: 'en', displayValue: 'English'};
this.text = '';
this.isAutoColor = false;
this.isImageLoaded = false;
+ var lang = options.lang || 'en',
+ val = Common.util.LanguageInfo.getLocalLanguageCode(lang);
+ this.lang = val ? {value: lang, displayValue: Common.util.LanguageInfo.getLocalLanguageName(val)[1], default: true} : {value: 'en', displayValue: 'English', default: true};
+
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
},
@@ -430,8 +433,11 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
});
if (data.length) {
me.cmbLang.setData(data);
- me.cmbLang.setValue(me.lang.displayValue);
- me.loadWMText(me.lang.value);
+ var res = me.loadWMText(me.lang.value);
+ if (res && me.lang.default)
+ me.cmbLang.setValue(res);
+ else
+ me.cmbLang.setValue(me.lang.displayValue);
me.cmbLang.setDisabled(!me.radioText.getValue());
me.text && me.cmbText.setValue(me.text);
} else
@@ -477,6 +483,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
this.cmbText.setData(data);
this.cmbText.setValue(data[0].value);
}
+ return item ? item.get('displayValue') : null;
},
insertFromUrl: function() {
diff --git a/apps/documenteditor/main/app_dev.js b/apps/documenteditor/main/app_dev.js
index feb54f25a..ea9a07eba 100644
--- a/apps/documenteditor/main/app_dev.js
+++ b/apps/documenteditor/main/app_dev.js
@@ -159,45 +159,47 @@ require([
]
});
- Common.Locale.apply();
-
- require([
- 'documenteditor/main/app/controller/Viewport',
- 'documenteditor/main/app/controller/DocumentHolder',
- 'documenteditor/main/app/controller/Toolbar',
- 'documenteditor/main/app/controller/Links',
- 'documenteditor/main/app/controller/Navigation',
- 'documenteditor/main/app/controller/Statusbar',
- 'documenteditor/main/app/controller/RightMenu',
- 'documenteditor/main/app/controller/LeftMenu',
- 'documenteditor/main/app/controller/Main',
- 'documenteditor/main/app/view/FileMenuPanels',
- 'documenteditor/main/app/view/ParagraphSettings',
- 'documenteditor/main/app/view/HeaderFooterSettings',
- 'documenteditor/main/app/view/ImageSettings',
- 'documenteditor/main/app/view/TableSettings',
- 'documenteditor/main/app/view/ShapeSettings',
- 'documenteditor/main/app/view/TextArtSettings',
- 'documenteditor/main/app/view/SignatureSettings',
- 'common/main/lib/util/utils',
- 'common/main/lib/util/LocalStorage',
- 'common/main/lib/controller/Fonts',
- 'common/main/lib/controller/History'
- /** coauthoring begin **/
- ,'common/main/lib/controller/Comments'
- ,'common/main/lib/controller/Chat'
- /** coauthoring end **/
- ,'common/main/lib/controller/Plugins'
- ,'documenteditor/main/app/view/ChartSettings'
- ,'common/main/lib/controller/ExternalDiagramEditor'
- ,'common/main/lib/controller/ExternalMergeEditor'
- ,'common/main/lib/controller/ReviewChanges'
- ,'common/main/lib/controller/Protection'
- ,'common/main/lib/controller/Desktop'
- ], function() {
- window.compareVersions = true;
- app.start();
- });
+ Common.Locale.apply(
+ function() {
+ require([
+ 'documenteditor/main/app/controller/Viewport',
+ 'documenteditor/main/app/controller/DocumentHolder',
+ 'documenteditor/main/app/controller/Toolbar',
+ 'documenteditor/main/app/controller/Links',
+ 'documenteditor/main/app/controller/Navigation',
+ 'documenteditor/main/app/controller/Statusbar',
+ 'documenteditor/main/app/controller/RightMenu',
+ 'documenteditor/main/app/controller/LeftMenu',
+ 'documenteditor/main/app/controller/Main',
+ 'documenteditor/main/app/view/FileMenuPanels',
+ 'documenteditor/main/app/view/ParagraphSettings',
+ 'documenteditor/main/app/view/HeaderFooterSettings',
+ 'documenteditor/main/app/view/ImageSettings',
+ 'documenteditor/main/app/view/TableSettings',
+ 'documenteditor/main/app/view/ShapeSettings',
+ 'documenteditor/main/app/view/TextArtSettings',
+ 'documenteditor/main/app/view/SignatureSettings',
+ 'common/main/lib/util/utils',
+ 'common/main/lib/util/LocalStorage',
+ 'common/main/lib/controller/Fonts',
+ 'common/main/lib/controller/History'
+ /** coauthoring begin **/
+ ,'common/main/lib/controller/Comments'
+ ,'common/main/lib/controller/Chat'
+ /** coauthoring end **/
+ ,'common/main/lib/controller/Plugins'
+ ,'documenteditor/main/app/view/ChartSettings'
+ ,'common/main/lib/controller/ExternalDiagramEditor'
+ ,'common/main/lib/controller/ExternalMergeEditor'
+ ,'common/main/lib/controller/ReviewChanges'
+ ,'common/main/lib/controller/Protection'
+ ,'common/main/lib/controller/Desktop'
+ ], function() {
+ window.compareVersions = true;
+ app.start();
+ });
+ }
+ );
}, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
reqerr = window.requireTimeourError();
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index fe28eb861..54c1de625 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -665,6 +665,7 @@
"DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+ "DE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.",
"DE.Controllers.Navigation.txtBeginning": "Beginning of document",
"DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
"DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked",
@@ -1021,6 +1022,21 @@
"DE.Views.BookmarksDialog.textSort": "Sort by",
"DE.Views.BookmarksDialog.textTitle": "Bookmarks",
"DE.Views.BookmarksDialog.txtInvalidName": "Bookmark name can only contain letters, digits and underscores, and should begin with the letter",
+ "DE.Views.CellsRemoveDialog.cancelButtonText": "Cancel",
+ "DE.Views.CellsRemoveDialog.okButtonText": "Ok",
+ "DE.Views.CellsRemoveDialog.textTitle": "Delete Cells",
+ "DE.Views.CellsRemoveDialog.textLeft": "Shift cells left",
+ "DE.Views.CellsRemoveDialog.textRow": "Delete entire row",
+ "DE.Views.CellsRemoveDialog.textCol": "Delete entire column",
+ "DE.Views.CellsAddDialog.cancelButtonText": "Cancel",
+ "DE.Views.CellsAddDialog.okButtonText": "Ok",
+ "DE.Views.CellsAddDialog.textTitle": "Insert Several",
+ "DE.Views.CellsAddDialog.textLeft": "To the left",
+ "DE.Views.CellsAddDialog.textRight": "To the right",
+ "DE.Views.CellsAddDialog.textUp": "Above the cursor",
+ "DE.Views.CellsAddDialog.textDown": "Below the cursor",
+ "DE.Views.CellsAddDialog.textRow": "Rows",
+ "DE.Views.CellsAddDialog.textCol": "Columns",
"DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
"DE.Views.ChartSettings.textArea": "Area",
"DE.Views.ChartSettings.textBar": "Bar",
@@ -1278,6 +1294,8 @@
"DE.Views.DocumentHolder.txtUngroup": "Ungroup",
"DE.Views.DocumentHolder.updateStyleText": "Update %1 style",
"DE.Views.DocumentHolder.vertAlignText": "Vertical Alignment",
+ "DE.Views.DocumentHolder.textCells": "Cells",
+ "DE.Views.DocumentHolder.textSeveral": "Several Rows/Columns",
"DE.Views.DropcapSettingsAdvanced.cancelButtonText": "Cancel",
"DE.Views.DropcapSettingsAdvanced.okButtonText": "OK",
"DE.Views.DropcapSettingsAdvanced.strBorders": "Borders & Fill",
@@ -1368,6 +1386,7 @@
"DE.Views.FileMenuPanels.DocumentInfo.txtTitle": "Title",
"DE.Views.FileMenuPanels.DocumentInfo.txtUploaded": "Uploaded",
"DE.Views.FileMenuPanels.DocumentInfo.txtWords": "Words",
+ "DE.Views.FileMenuPanels.DocumentInfo.okButtonText": "Apply",
"DE.Views.FileMenuPanels.DocumentRights.txtBtnAccessRights": "Change access rights",
"DE.Views.FileMenuPanels.DocumentRights.txtRights": "Persons who have rights",
"DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/main/locale/pl.json b/apps/documenteditor/main/locale/pl.json
index a2dc3d868..8166d2763 100644
--- a/apps/documenteditor/main/locale/pl.json
+++ b/apps/documenteditor/main/locale/pl.json
@@ -49,6 +49,9 @@
"Common.Controllers.ReviewChanges.textParaDeleted": "
Usunięty akapit",
"Common.Controllers.ReviewChanges.textParaFormatted": "Sformatowany akapit",
"Common.Controllers.ReviewChanges.textParaInserted": "
Wstawiony akapit",
+ "Common.Controllers.ReviewChanges.textParaMoveFromDown": "
Przesunięto w dół:",
+ "Common.Controllers.ReviewChanges.textParaMoveFromUp": "
Przesunięto w górę:",
+ "Common.Controllers.ReviewChanges.textParaMoveTo": "
Przesunięto:",
"Common.Controllers.ReviewChanges.textPosition": "Pozycja",
"Common.Controllers.ReviewChanges.textRight": "Wyrównaj do prawej",
"Common.Controllers.ReviewChanges.textShape": "Kształt",
@@ -60,6 +63,7 @@
"Common.Controllers.ReviewChanges.textStrikeout": "Skreślenie",
"Common.Controllers.ReviewChanges.textSubScript": "Indeks",
"Common.Controllers.ReviewChanges.textSuperScript": "Indeks górny",
+ "Common.Controllers.ReviewChanges.textTableChanged": "
Ustawienia tabeli zmienione",
"Common.Controllers.ReviewChanges.textTabs": "Zmień zakładki",
"Common.Controllers.ReviewChanges.textUnderline": "Podkreśl",
"Common.Controllers.ReviewChanges.textWidow": "Kontrola okna",
@@ -150,6 +154,7 @@
"Common.Views.Header.tipDownload": "Pobierz plik",
"Common.Views.Header.tipGoEdit": "Edytuj bieżący plik",
"Common.Views.Header.tipPrint": "Drukuj plik",
+ "Common.Views.Header.tipViewSettings": "Wyświetl ustawienia",
"Common.Views.Header.tipViewUsers": "Wyświetl użytkowników i zarządzaj prawami dostępu do dokumentu",
"Common.Views.Header.txtAccessRights": "Zmień prawa dostępu",
"Common.Views.Header.txtRename": "Zmień nazwę",
@@ -186,6 +191,8 @@
"Common.Views.OpenDialog.txtTitleProtected": "Plik chroniony",
"Common.Views.PasswordDialog.cancelButtonText": "Anuluj",
"Common.Views.PasswordDialog.okButtonText": "OK",
+ "Common.Views.PasswordDialog.txtDescription": "Ustaw hasło aby zabezpieczyć ten dokument",
+ "Common.Views.PasswordDialog.txtIncorrectPwd": "Hasła nie są takie same",
"Common.Views.PluginDlg.textLoading": "Ładowanie",
"Common.Views.Plugins.groupCaption": "Wtyczki",
"Common.Views.Plugins.strPlugins": "Wtyczki",
@@ -196,6 +203,7 @@
"Common.Views.Protection.hintPwd": "Zmień lub usuń hasło",
"Common.Views.Protection.txtAddPwd": "Dodaj hasło",
"Common.Views.Protection.txtChangePwd": "Zmień hasło",
+ "Common.Views.Protection.txtDeletePwd": "Usuń hasło",
"Common.Views.Protection.txtEncrypt": "Szyfruj",
"Common.Views.Protection.txtInvisibleSignature": "Dodaj podpis cyfrowy",
"Common.Views.Protection.txtSignatureLine": "Dodaj linię do podpisu",
@@ -222,6 +230,7 @@
"Common.Views.ReviewChanges.txtCoAuthMode": "Tryb współtworzenia",
"Common.Views.ReviewChanges.txtDocLang": "Język",
"Common.Views.ReviewChanges.txtFinal": "Wszystkie zmiany zostały zaakceptowane (podgląd)",
+ "Common.Views.ReviewChanges.txtHistory": "Historia wersji",
"Common.Views.ReviewChanges.txtMarkup": "Wszystkie zmiany (edycja)",
"Common.Views.ReviewChanges.txtNext": "Do następnej zmiany",
"Common.Views.ReviewChanges.txtOriginal": "Wszystkie zmiany odrzucone (podgląd)",
@@ -247,11 +256,14 @@
"Common.Views.ReviewPopover.textCancel": "Anuluj",
"Common.Views.ReviewPopover.textClose": "Zamknij",
"Common.Views.ReviewPopover.textEdit": "OK",
+ "Common.Views.ReviewPopover.textResolve": "Rozwiąż",
"Common.Views.SignDialog.cancelButtonText": "Anuluj",
"Common.Views.SignDialog.okButtonText": "OK",
"Common.Views.SignDialog.textBold": "Pogrubienie",
+ "Common.Views.SignDialog.textCertificate": "Certyfikat",
"Common.Views.SignDialog.textChange": "Zmień",
"Common.Views.SignDialog.textItalic": "Kursywa",
+ "Common.Views.SignDialog.textPurpose": "Cel podpisywania tego dokumentu",
"Common.Views.SignDialog.textTitle": "Podpisz dokument",
"Common.Views.SignSettingsDialog.cancelButtonText": "Anuluj",
"Common.Views.SignSettingsDialog.okButtonText": "OK",
@@ -360,6 +372,8 @@
"DE.Controllers.Main.txtFiguredArrows": "Strzałki",
"DE.Controllers.Main.txtFirstPage": "Pierwsza strona",
"DE.Controllers.Main.txtFooter": "Stopka",
+ "DE.Controllers.Main.txtHeader": "Nagłówek",
+ "DE.Controllers.Main.txtHyperlink": "Link",
"DE.Controllers.Main.txtLines": "Linie",
"DE.Controllers.Main.txtMath": "Matematyczne",
"DE.Controllers.Main.txtNeedSynchronize": "Masz aktualizacje",
@@ -397,6 +411,7 @@
"DE.Controllers.Main.txtShape_star7": "Gwiazda 7-ramienna",
"DE.Controllers.Main.txtShape_star8": "Gwiazda 8-ramienna",
"DE.Controllers.Main.txtStarsRibbons": "Gwiazdy i wstążki",
+ "DE.Controllers.Main.txtStyle_footnote_text": "Przypis",
"DE.Controllers.Main.txtStyle_Heading_1": "Nagłówek 1",
"DE.Controllers.Main.txtStyle_Heading_2": "Nagłówek 2",
"DE.Controllers.Main.txtStyle_Heading_3": "Nagłówek 3",
@@ -812,6 +827,8 @@
"DE.Views.ControlSettingsDialog.textNewColor": "Nowy niestandardowy kolor",
"DE.Views.ControlSettingsDialog.textNone": "Brak",
"DE.Views.ControlSettingsDialog.textShowAs": "Pokaż jako",
+ "DE.Views.ControlSettingsDialog.textTitle": "Ustawienia kontroli treści",
+ "DE.Views.ControlSettingsDialog.txtLockDelete": "Nie można usunąć kontroli treści",
"DE.Views.CustomColumnsDialog.cancelButtonText": "Anuluj",
"DE.Views.CustomColumnsDialog.okButtonText": "OK",
"DE.Views.CustomColumnsDialog.textColumns": "Ilość kolumn",
@@ -827,6 +844,7 @@
"DE.Views.DocumentHolder.alignmentText": "Wyrównanie",
"DE.Views.DocumentHolder.belowText": "Poniżej",
"DE.Views.DocumentHolder.breakBeforeText": "Przerwanie strony przed",
+ "DE.Views.DocumentHolder.bulletsText": "Punktory i numeracja",
"DE.Views.DocumentHolder.cellAlignText": "Wyrównanie pionowe komórki",
"DE.Views.DocumentHolder.cellText": "Komórka",
"DE.Views.DocumentHolder.centerText": "Środek",
@@ -843,9 +861,9 @@
"DE.Views.DocumentHolder.editChartText": "Edytuj dane",
"DE.Views.DocumentHolder.editFooterText": "Edytuj stopkę",
"DE.Views.DocumentHolder.editHeaderText": "Edytuj nagłówek",
- "DE.Views.DocumentHolder.editHyperlinkText": "Edytuj hiperlink",
+ "DE.Views.DocumentHolder.editHyperlinkText": "Edytuj link",
"DE.Views.DocumentHolder.guestText": "Gość",
- "DE.Views.DocumentHolder.hyperlinkText": "Hiperlink",
+ "DE.Views.DocumentHolder.hyperlinkText": "Link",
"DE.Views.DocumentHolder.ignoreAllSpellText": "Ignoruj wszystko",
"DE.Views.DocumentHolder.ignoreSpellText": "Ignoruj",
"DE.Views.DocumentHolder.imageText": "Zaawansowane ustawienia obrazu",
@@ -865,7 +883,7 @@
"DE.Views.DocumentHolder.noSpellVariantsText": "Brak wariantów",
"DE.Views.DocumentHolder.originalSizeText": "Domyślny rozmiar",
"DE.Views.DocumentHolder.paragraphText": "Akapit",
- "DE.Views.DocumentHolder.removeHyperlinkText": "Usuń hiperlink",
+ "DE.Views.DocumentHolder.removeHyperlinkText": "Usuń link",
"DE.Views.DocumentHolder.rightText": "Prawy",
"DE.Views.DocumentHolder.rowText": "Wiersz",
"DE.Views.DocumentHolder.saveStyleText": "Utwórz nowy styl",
@@ -878,6 +896,7 @@
"DE.Views.DocumentHolder.spellcheckText": "Sprawdzanie pisowni",
"DE.Views.DocumentHolder.splitCellsText": "Podziel komórkę...",
"DE.Views.DocumentHolder.splitCellTitleText": "Podziel komórkę",
+ "DE.Views.DocumentHolder.strDelete": "Usuń podpis",
"DE.Views.DocumentHolder.styleText": "Formatowanie jako Styl",
"DE.Views.DocumentHolder.tableText": "Tabela",
"DE.Views.DocumentHolder.textAlign": "Wyrównaj",
@@ -886,16 +905,22 @@
"DE.Views.DocumentHolder.textArrangeBackward": "Przenieś do tyłu",
"DE.Views.DocumentHolder.textArrangeForward": "Przenieś do przodu",
"DE.Views.DocumentHolder.textArrangeFront": "Przejdź na pierwszy plan",
+ "DE.Views.DocumentHolder.textContentControls": "Kontrola treści",
"DE.Views.DocumentHolder.textCopy": "Kopiuj",
"DE.Views.DocumentHolder.textCrop": "Przytnij",
"DE.Views.DocumentHolder.textCropFill": "Wypełnij",
"DE.Views.DocumentHolder.textCut": "Wytnij",
+ "DE.Views.DocumentHolder.textEditControls": "Ustawienia kontroli treści",
"DE.Views.DocumentHolder.textEditWrapBoundary": "Edytuj granicę owinięcia",
"DE.Views.DocumentHolder.textFlipH": "Odwróć w poziomie",
"DE.Views.DocumentHolder.textFlipV": "Odwróć w pionie",
"DE.Views.DocumentHolder.textNextPage": "Następna strona",
"DE.Views.DocumentHolder.textPaste": "Wklej",
"DE.Views.DocumentHolder.textPrevPage": "Poprzednia strona",
+ "DE.Views.DocumentHolder.textRefreshField": "Odśwież pole",
+ "DE.Views.DocumentHolder.textRemove": "Usuń",
+ "DE.Views.DocumentHolder.textRemoveControl": "Usuń kontrolę treści",
+ "DE.Views.DocumentHolder.textSettings": "Ustawienia",
"DE.Views.DocumentHolder.textShapeAlignBottom": "Wyrównaj do dołu",
"DE.Views.DocumentHolder.textShapeAlignCenter": "Wyrównaj do środka",
"DE.Views.DocumentHolder.textShapeAlignLeft": "Wyrównaj do lewej",
@@ -903,9 +928,14 @@
"DE.Views.DocumentHolder.textShapeAlignRight": "Wyrównaj do prawej",
"DE.Views.DocumentHolder.textShapeAlignTop": "Wyrównaj do góry",
"DE.Views.DocumentHolder.textTOC": "Spis treści",
+ "DE.Views.DocumentHolder.textTOCSettings": "Ustawienia tabeli zawartości",
"DE.Views.DocumentHolder.textUndo": "Cofnij",
+ "DE.Views.DocumentHolder.textUpdateAll": "Odśwież całą tabelę",
+ "DE.Views.DocumentHolder.textUpdatePages": "Odśwież wyłącznie numery stron",
+ "DE.Views.DocumentHolder.textUpdateTOC": "Odśwież tabelę zawartości",
"DE.Views.DocumentHolder.textWrap": "Styl zawijania",
"DE.Views.DocumentHolder.tipIsLocked": "Ten element jest obecnie edytowany przez innego użytkownika.",
+ "DE.Views.DocumentHolder.toDictionaryText": "Dodaj do słownika",
"DE.Views.DocumentHolder.txtAddBottom": "Dodaj dolną krawędź",
"DE.Views.DocumentHolder.txtAddFractionBar": "Dadaj pasek ułamka",
"DE.Views.DocumentHolder.txtAddHor": "Dodaj poziomą linie",
@@ -1060,6 +1090,8 @@
"DE.Views.FileMenuPanels.DocumentInfo.txtAppName": "Aplikacja",
"DE.Views.FileMenuPanels.DocumentInfo.txtAuthor": "Autor",
"DE.Views.FileMenuPanels.DocumentInfo.txtBtnAccessRights": "Zmień prawa dostępu",
+ "DE.Views.FileMenuPanels.DocumentInfo.txtComment": "Komentarz",
+ "DE.Views.FileMenuPanels.DocumentInfo.txtCreated": "Utworzono",
"DE.Views.FileMenuPanels.DocumentInfo.txtLoading": "Ładowanie...",
"DE.Views.FileMenuPanels.DocumentInfo.txtPages": "Strony",
"DE.Views.FileMenuPanels.DocumentInfo.txtParagraphs": "Akapity",
@@ -1075,6 +1107,8 @@
"DE.Views.FileMenuPanels.ProtectDoc.notcriticalErrorTitle": "Ostrzeżenie",
"DE.Views.FileMenuPanels.ProtectDoc.txtEdit": "Edytuj dokument",
"DE.Views.FileMenuPanels.ProtectDoc.txtEditWarning": "Rozpoczęcie edycji usunie z pliku wszelkie podpisy - czy na pewno kontynuować?",
+ "DE.Views.FileMenuPanels.ProtectDoc.txtEncrypted": "Ten dokument został zabezpieczony hasłem",
+ "DE.Views.FileMenuPanels.ProtectDoc.txtRequestedSignatures": "Ten dokument musi zostać podpisany.",
"DE.Views.FileMenuPanels.Settings.okButtonText": "Zatwierdź",
"DE.Views.FileMenuPanels.Settings.strAlignGuides": "Włącz prowadnice wyrównania",
"DE.Views.FileMenuPanels.Settings.strAutoRecover": "Włącz auto odzyskiwanie",
@@ -1100,6 +1134,7 @@
"DE.Views.FileMenuPanels.Settings.textAlignGuides": "Porady wyrównania",
"DE.Views.FileMenuPanels.Settings.textAutoRecover": "Automatyczne odzyskiwanie",
"DE.Views.FileMenuPanels.Settings.textAutoSave": "Automatyczny zapis",
+ "DE.Views.FileMenuPanels.Settings.textCompatible": "Kompatybilność",
"DE.Views.FileMenuPanels.Settings.textDisabled": "Wyłączony",
"DE.Views.FileMenuPanels.Settings.textForceSave": "Zapisz na serwer",
"DE.Views.FileMenuPanels.Settings.textMinute": "Każda minuta",
@@ -1136,7 +1171,8 @@
"DE.Views.HyperlinkSettingsDialog.okButtonText": "OK",
"DE.Views.HyperlinkSettingsDialog.textDefault": "Wybrany fragment tekstu",
"DE.Views.HyperlinkSettingsDialog.textDisplay": "Pokaż",
- "DE.Views.HyperlinkSettingsDialog.textTitle": "Ustawienia hiperlinku",
+ "DE.Views.HyperlinkSettingsDialog.textExternal": "Link zewnętrzny",
+ "DE.Views.HyperlinkSettingsDialog.textTitle": "Ustawienia linków",
"DE.Views.HyperlinkSettingsDialog.textTooltip": "Tekst wskazówki na ekranie",
"DE.Views.HyperlinkSettingsDialog.textUrl": "Link do",
"DE.Views.HyperlinkSettingsDialog.txtBeginning": "Początek dokumentu",
@@ -1239,16 +1275,29 @@
"DE.Views.LeftMenu.tipAbout": "O programie",
"DE.Views.LeftMenu.tipChat": "Czat",
"DE.Views.LeftMenu.tipComments": "Komentarze",
+ "DE.Views.LeftMenu.tipNavigation": "Nawigacja",
"DE.Views.LeftMenu.tipPlugins": "Wtyczki",
"DE.Views.LeftMenu.tipSearch": "Szukaj",
"DE.Views.LeftMenu.tipSupport": "Opinie i wsparcie",
"DE.Views.LeftMenu.tipTitles": "Tytuły",
"DE.Views.LeftMenu.txtDeveloper": "TRYB DEWELOPERA",
"DE.Views.Links.capBtnBookmarks": "Zakładka",
+ "DE.Views.Links.capBtnContentsUpdate": "Odśwież",
"DE.Views.Links.capBtnInsContents": "Spis treści",
+ "DE.Views.Links.capBtnInsFootnote": "Przypis",
+ "DE.Views.Links.capBtnInsLink": "Link",
+ "DE.Views.Links.confirmDeleteFootnotes": "Czy chcesz usunąć wszystkie przypisy?",
+ "DE.Views.Links.mniDelFootnote": "Usuń wszystkie przypisy",
"DE.Views.Links.mniInsFootnote": "Wstaw przypis",
+ "DE.Views.Links.mniNoteSettings": "Ustawienia notatek",
+ "DE.Views.Links.textContentsRemove": "Usuń tabelę zawartości",
+ "DE.Views.Links.textContentsSettings": "Ustawienia",
+ "DE.Views.Links.textGotoFootnote": "Idź do przypisów",
+ "DE.Views.Links.textUpdateAll": "Odśwież całą tabelę",
+ "DE.Views.Links.textUpdatePages": "Odśwież wyłącznie numery stron",
"DE.Views.Links.tipBookmarks": "Utwórz zakładkę",
- "DE.Views.Links.tipInsertHyperlink": "Dodaj hiperłącze",
+ "DE.Views.Links.tipContentsUpdate": "Odśwież tabelę zawartości",
+ "DE.Views.Links.tipInsertHyperlink": "Dodaj link",
"DE.Views.Links.tipNotes": "Wstawianie lub edytowanie przypisów",
"DE.Views.MailMergeEmailDlg.cancelButtonText": "Anuluj",
"DE.Views.MailMergeEmailDlg.filePlaceholder": "PDF",
@@ -1299,6 +1348,7 @@
"DE.Views.MailMergeSettings.txtUntitled": "Niezatytułowany",
"DE.Views.MailMergeSettings.warnProcessMailMerge": "Rozpoczęcie scalania nie powiodło się",
"DE.Views.Navigation.txtCollapse": "Zwiń wszystko",
+ "DE.Views.Navigation.txtEmpty": "Ten dokument nie zawiera nagłówków",
"DE.Views.Navigation.txtExpand": "Rozwiń wszystko",
"DE.Views.NoteSettingsDialog.textApply": "Zatwierdź",
"DE.Views.NoteSettingsDialog.textApplyTo": "Zatwierdź zmiany do",
@@ -1360,6 +1410,8 @@
"DE.Views.ParagraphSettingsAdvanced.strIndentsFirstLine": "Pierwszy wiersz",
"DE.Views.ParagraphSettingsAdvanced.strIndentsLeftText": "Lewy",
"DE.Views.ParagraphSettingsAdvanced.strIndentsRightText": "Prawy",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingAfter": "po",
+ "DE.Views.ParagraphSettingsAdvanced.strIndentsSpacingBefore": "Przed",
"DE.Views.ParagraphSettingsAdvanced.strKeepLines": "Trzymaj wiersze razem",
"DE.Views.ParagraphSettingsAdvanced.strKeepNext": "Trzymaj dalej",
"DE.Views.ParagraphSettingsAdvanced.strMargins": "Wewnętrzne pola",
@@ -1368,22 +1420,26 @@
"DE.Views.ParagraphSettingsAdvanced.strParagraphIndents": "Wcięcia i miejsca docelowe",
"DE.Views.ParagraphSettingsAdvanced.strParagraphPosition": "Umieszczenie",
"DE.Views.ParagraphSettingsAdvanced.strSmallCaps": "Małe litery",
+ "DE.Views.ParagraphSettingsAdvanced.strSomeParagraphSpace": "Nie dodawaj odstępu między akapitami tego samego stylu",
"DE.Views.ParagraphSettingsAdvanced.strStrike": "Przekreślony",
"DE.Views.ParagraphSettingsAdvanced.strSubscript": "Indeks",
"DE.Views.ParagraphSettingsAdvanced.strSuperscript": "Indeks górny",
"DE.Views.ParagraphSettingsAdvanced.strTabs": "Karta",
"DE.Views.ParagraphSettingsAdvanced.textAlign": "Wyrównanie",
+ "DE.Views.ParagraphSettingsAdvanced.textAtLeast": "Co najmniej",
"DE.Views.ParagraphSettingsAdvanced.textBackColor": "Kolor tła",
"DE.Views.ParagraphSettingsAdvanced.textBorderColor": "Kolor obramowania",
"DE.Views.ParagraphSettingsAdvanced.textBorderDesc": "Kliknij na diagram lub użyj przycisków, aby wybrać granice i zastosuj do nich wybrany styl",
"DE.Views.ParagraphSettingsAdvanced.textBorderWidth": "Rozmiar obramowania",
"DE.Views.ParagraphSettingsAdvanced.textBottom": "Dół",
+ "DE.Views.ParagraphSettingsAdvanced.textCentered": "Wyśrodkowane",
"DE.Views.ParagraphSettingsAdvanced.textCharacterSpacing": "Rozstaw znaków",
"DE.Views.ParagraphSettingsAdvanced.textDefault": "Domyślna zakładka",
"DE.Views.ParagraphSettingsAdvanced.textEffects": "Efekty",
"DE.Views.ParagraphSettingsAdvanced.textLeft": "Lewy",
"DE.Views.ParagraphSettingsAdvanced.textNewColor": "Nowy niestandardowy kolor",
"DE.Views.ParagraphSettingsAdvanced.textNone": "Brak",
+ "DE.Views.ParagraphSettingsAdvanced.textNoneSpecial": "(brak)",
"DE.Views.ParagraphSettingsAdvanced.textPosition": "Pozycja",
"DE.Views.ParagraphSettingsAdvanced.textRemove": "Usuń",
"DE.Views.ParagraphSettingsAdvanced.textRemoveAll": "Usuń wszystko",
@@ -1404,6 +1460,7 @@
"DE.Views.ParagraphSettingsAdvanced.tipOuter": "Ustaw tylko obramowanie zewnętrzne",
"DE.Views.ParagraphSettingsAdvanced.tipRight": "Ustaw tylko obramowanie prawej krawędzi",
"DE.Views.ParagraphSettingsAdvanced.tipTop": "Ustaw tylko górną krawędź",
+ "DE.Views.ParagraphSettingsAdvanced.txtAutoText": "Automatyczny",
"DE.Views.ParagraphSettingsAdvanced.txtNoBorders": "Bez krawędzi",
"DE.Views.RightMenu.txtChartSettings": "Ustawienia wykresu",
"DE.Views.RightMenu.txtHeaderFooterSettings": "Ustawienia nagłówka i stopki",
@@ -1411,6 +1468,7 @@
"DE.Views.RightMenu.txtMailMergeSettings": "Ustawienia korespondencji seryjnej",
"DE.Views.RightMenu.txtParagraphSettings": "Ustawienia akapitu",
"DE.Views.RightMenu.txtShapeSettings": "Ustawienia kształtu",
+ "DE.Views.RightMenu.txtSignatureSettings": "Ustawienia podpisów",
"DE.Views.RightMenu.txtTableSettings": "Ustawienia tabeli",
"DE.Views.RightMenu.txtTextArtSettings": "Ustawienia tekstu",
"DE.Views.ShapeSettings.strBackground": "Kolor tła",
@@ -1466,8 +1524,10 @@
"DE.Views.ShapeSettings.txtTopAndBottom": "Góra i dół",
"DE.Views.ShapeSettings.txtWood": "Drewno",
"DE.Views.SignatureSettings.notcriticalErrorTitle": "Ostrzeżenie",
+ "DE.Views.SignatureSettings.strDelete": "Usuń podpis",
"DE.Views.SignatureSettings.txtContinueEditing": "Edytuj mimo wszystko",
"DE.Views.SignatureSettings.txtEditWarning": "Rozpoczęcie edycji usunie z pliku wszelkie podpisy - czy na pewno kontynuować?",
+ "DE.Views.SignatureSettings.txtRequestedSignatures": "Ten dokument musi zostać podpisany.",
"DE.Views.Statusbar.goToPageText": "Idź do strony",
"DE.Views.Statusbar.pageIndexText": "Strona {0} z {1}",
"DE.Views.Statusbar.tipFitPage": "Dopasuj do strony",
@@ -1485,6 +1545,7 @@
"DE.Views.TableFormulaDialog.cancelButtonText": "Anuluj",
"DE.Views.TableFormulaDialog.okButtonText": "OK",
"DE.Views.TableFormulaDialog.textInsertFunction": "Wklej funkcję",
+ "DE.Views.TableFormulaDialog.textTitle": "Ustawienia formuł",
"DE.Views.TableOfContentsSettings.cancelButtonText": "Anuluj",
"DE.Views.TableOfContentsSettings.okButtonText": "OK",
"DE.Views.TableOfContentsSettings.strShowPages": "Pokaż numery stron",
@@ -1661,6 +1722,7 @@
"DE.Views.Toolbar.mniEditHeader": "Edytuj nagłówek",
"DE.Views.Toolbar.mniHiddenBorders": "Ukryte obramowanie tabeli",
"DE.Views.Toolbar.mniHiddenChars": "Znaki niedrukowane",
+ "DE.Views.Toolbar.mniHighlightControls": "Ustawienia wyróżniania",
"DE.Views.Toolbar.mniImageFromFile": "Obraz z pliku",
"DE.Views.Toolbar.mniImageFromUrl": "Obraz z URL",
"DE.Views.Toolbar.strMenuNoFill": "Brak wypełnienia",
@@ -1678,6 +1740,7 @@
"DE.Views.Toolbar.textColumnsThree": "Trzy",
"DE.Views.Toolbar.textColumnsTwo": "Dwa",
"DE.Views.Toolbar.textContPage": "Ciągła strona",
+ "DE.Views.Toolbar.textEditWatermark": "Własny znak wodny",
"DE.Views.Toolbar.textEvenPage": "Z parzystej strony",
"DE.Views.Toolbar.textInMargin": "W marginesie",
"DE.Views.Toolbar.textInsColumnBreak": "Wstaw podział kolumny",
@@ -1698,6 +1761,7 @@
"DE.Views.Toolbar.textMarginsWide": "Szeroki",
"DE.Views.Toolbar.textNewColor": "Nowy niestandardowy kolor",
"DE.Views.Toolbar.textNextPage": "Następna strona",
+ "DE.Views.Toolbar.textNoHighlight": "Brak wyróżnienia",
"DE.Views.Toolbar.textNone": "Żaden",
"DE.Views.Toolbar.textOddPage": "Nieparzysta strona",
"DE.Views.Toolbar.textPageMarginsCustom": "Niestandardowe marginesy",
@@ -1705,6 +1769,8 @@
"DE.Views.Toolbar.textPie": "Kołowe",
"DE.Views.Toolbar.textPoint": "XY (Punktowy)",
"DE.Views.Toolbar.textPortrait": "Portret",
+ "DE.Views.Toolbar.textRemoveControl": "Usuń kontrolę treści",
+ "DE.Views.Toolbar.textRemWatermark": "Usuń znak wodny",
"DE.Views.Toolbar.textRight": "Prawo:",
"DE.Views.Toolbar.textStock": "Zbiory",
"DE.Views.Toolbar.textStrikeout": "Skreślenie",
@@ -1783,7 +1849,10 @@
"DE.Views.Toolbar.tipShowHiddenChars": "Znaki niedrukowane",
"DE.Views.Toolbar.tipSynchronize": "Dokument został zmieniony przez innego użytkownika. Kliknij, aby zapisać swoje zmiany i ponownie załadować zmiany.",
"DE.Views.Toolbar.tipUndo": "Cofnij",
+ "DE.Views.Toolbar.tipWatermark": "Edytuj znak wodny",
+ "DE.Views.Toolbar.txtMarginAlign": "Wyrównaj do marginesów",
"DE.Views.Toolbar.txtObjectsAlign": "Wyrównaj zaznaczone obiekty",
+ "DE.Views.Toolbar.txtPageAlign": "Wyrównaj do strony",
"DE.Views.Toolbar.txtScheme1": "Biuro",
"DE.Views.Toolbar.txtScheme10": "Mediana",
"DE.Views.Toolbar.txtScheme11": "Metro",
@@ -1805,5 +1874,9 @@
"DE.Views.Toolbar.txtScheme7": "Kapitał",
"DE.Views.Toolbar.txtScheme8": "Przepływ",
"DE.Views.Toolbar.txtScheme9": "Odlewnia",
- "DE.Views.WatermarkSettingsDialog.textNewColor": "Nowy niestandardowy kolor"
+ "DE.Views.WatermarkSettingsDialog.cancelButtonText": "Anuluj",
+ "DE.Views.WatermarkSettingsDialog.textAuto": "Automatyczny",
+ "DE.Views.WatermarkSettingsDialog.textBold": "Pogrubienie",
+ "DE.Views.WatermarkSettingsDialog.textNewColor": "Nowy niestandardowy kolor",
+ "DE.Views.WatermarkSettingsDialog.textTitle": "Ustawienia znaków wodnych"
}
\ No newline at end of file
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index 57a23f1b8..64291dae6 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -13,7 +13,7 @@
"Common.Controllers.ReviewChanges.textAtLeast": "Минимум",
"Common.Controllers.ReviewChanges.textAuto": "Авто",
"Common.Controllers.ReviewChanges.textBaseline": "Базовая линия",
- "Common.Controllers.ReviewChanges.textBold": "Жирный",
+ "Common.Controllers.ReviewChanges.textBold": "Полужирный",
"Common.Controllers.ReviewChanges.textBreakBefore": "С новой страницы",
"Common.Controllers.ReviewChanges.textCaps": "Все прописные",
"Common.Controllers.ReviewChanges.textCenter": "Выравнивание по центру",
@@ -293,7 +293,7 @@
"Common.Views.SelectFileDlg.textTitle": "Выбрать источник данных",
"Common.Views.SignDialog.cancelButtonText": "Отмена",
"Common.Views.SignDialog.okButtonText": "ОК",
- "Common.Views.SignDialog.textBold": "Жирный",
+ "Common.Views.SignDialog.textBold": "Полужирный",
"Common.Views.SignDialog.textCertificate": "Сертификат",
"Common.Views.SignDialog.textChange": "Изменить",
"Common.Views.SignDialog.textInputName": "Введите имя подписывающего",
@@ -1209,7 +1209,7 @@
"DE.Views.DocumentHolder.txtDeleteBreak": "Удалить принудительный разрыв",
"DE.Views.DocumentHolder.txtDeleteChars": "Удалить вложенные знаки",
"DE.Views.DocumentHolder.txtDeleteCharsAndSeparators": "Удалить вложенные знаки и разделители",
- "DE.Views.DocumentHolder.txtDeleteEq": "Удалить формулу",
+ "DE.Views.DocumentHolder.txtDeleteEq": "Удалить уравнение",
"DE.Views.DocumentHolder.txtDeleteGroupChar": "Удалить символ",
"DE.Views.DocumentHolder.txtDeleteRadical": "Удалить радикал",
"DE.Views.DocumentHolder.txtDistribHor": "Распределить по горизонтали",
@@ -1240,8 +1240,8 @@
"DE.Views.DocumentHolder.txtInsertArgAfter": "Вставить аргумент после",
"DE.Views.DocumentHolder.txtInsertArgBefore": "Вставить аргумент перед",
"DE.Views.DocumentHolder.txtInsertBreak": "Вставить принудительный разрыв",
- "DE.Views.DocumentHolder.txtInsertEqAfter": "Вставить формулу после",
- "DE.Views.DocumentHolder.txtInsertEqBefore": "Вставить формулу перед",
+ "DE.Views.DocumentHolder.txtInsertEqAfter": "Вставить уравнение после",
+ "DE.Views.DocumentHolder.txtInsertEqBefore": "Вставить уравнение перед",
"DE.Views.DocumentHolder.txtKeepTextOnly": "Сохранить только текст",
"DE.Views.DocumentHolder.txtLimitChange": "Изменить положение пределов",
"DE.Views.DocumentHolder.txtLimitOver": "Предел над текстом",
@@ -2084,7 +2084,7 @@
"DE.Views.Toolbar.textArea": "С областями",
"DE.Views.Toolbar.textAutoColor": "Автоматический",
"DE.Views.Toolbar.textBar": "Линейчатая",
- "DE.Views.Toolbar.textBold": "Жирный",
+ "DE.Views.Toolbar.textBold": "Полужирный",
"DE.Views.Toolbar.textBottom": "Нижнее: ",
"DE.Views.Toolbar.textCharts": "Диаграммы",
"DE.Views.Toolbar.textColumn": "Гистограмма",
@@ -2238,7 +2238,7 @@
"DE.Views.WatermarkSettingsDialog.cancelButtonText": "Отмена",
"DE.Views.WatermarkSettingsDialog.okButtonText": "OK",
"DE.Views.WatermarkSettingsDialog.textAuto": "Авто",
- "DE.Views.WatermarkSettingsDialog.textBold": "Жирный",
+ "DE.Views.WatermarkSettingsDialog.textBold": "Полужирный",
"DE.Views.WatermarkSettingsDialog.textColor": "Цвет текста",
"DE.Views.WatermarkSettingsDialog.textDiagonal": "По диагонали",
"DE.Views.WatermarkSettingsDialog.textFont": "Шрифт",
diff --git a/apps/documenteditor/mobile/app-dev.js b/apps/documenteditor/mobile/app-dev.js
index db28adc5d..b5ab49951 100644
--- a/apps/documenteditor/mobile/app-dev.js
+++ b/apps/documenteditor/mobile/app-dev.js
@@ -155,8 +155,6 @@ require([
]
});
- Common.Locale.apply();
-
var device = Framework7.prototype.device;
var loadPlatformCss = function (filename, opt){
var fileref = document.createElement('link');
@@ -198,34 +196,36 @@ require([
//Load platform styles
loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css');
- require([
- 'common/main/lib/util/LocalStorage',
- 'common/main/lib/util/utils',
- 'common/mobile/lib/controller/Plugins',
- 'documenteditor/mobile/app/controller/Editor',
- 'documenteditor/mobile/app/controller/Toolbar',
- 'documenteditor/mobile/app/controller/Search',
- 'documenteditor/mobile/app/controller/Main',
- 'documenteditor/mobile/app/controller/DocumentHolder',
- 'documenteditor/mobile/app/controller/Settings',
- 'documenteditor/mobile/app/controller/edit/EditContainer',
- 'documenteditor/mobile/app/controller/edit/EditText',
- 'documenteditor/mobile/app/controller/edit/EditParagraph',
- 'documenteditor/mobile/app/controller/edit/EditHeader',
- 'documenteditor/mobile/app/controller/edit/EditTable',
- 'documenteditor/mobile/app/controller/edit/EditImage',
- 'documenteditor/mobile/app/controller/edit/EditShape',
- 'documenteditor/mobile/app/controller/edit/EditChart',
- 'documenteditor/mobile/app/controller/edit/EditHyperlink',
- 'documenteditor/mobile/app/controller/add/AddContainer',
- 'documenteditor/mobile/app/controller/add/AddTable',
- 'documenteditor/mobile/app/controller/add/AddShape',
- 'documenteditor/mobile/app/controller/add/AddImage',
- 'documenteditor/mobile/app/controller/add/AddOther',
- 'common/mobile/lib/controller/Collaboration'
- ], function() {
- window.compareVersions = true;
- app.start();
+ Common.Locale.apply(function() {
+ require([
+ 'common/main/lib/util/LocalStorage',
+ 'common/main/lib/util/utils',
+ 'common/mobile/lib/controller/Plugins',
+ 'documenteditor/mobile/app/controller/Editor',
+ 'documenteditor/mobile/app/controller/Toolbar',
+ 'documenteditor/mobile/app/controller/Search',
+ 'documenteditor/mobile/app/controller/Main',
+ 'documenteditor/mobile/app/controller/DocumentHolder',
+ 'documenteditor/mobile/app/controller/Settings',
+ 'documenteditor/mobile/app/controller/edit/EditContainer',
+ 'documenteditor/mobile/app/controller/edit/EditText',
+ 'documenteditor/mobile/app/controller/edit/EditParagraph',
+ 'documenteditor/mobile/app/controller/edit/EditHeader',
+ 'documenteditor/mobile/app/controller/edit/EditTable',
+ 'documenteditor/mobile/app/controller/edit/EditImage',
+ 'documenteditor/mobile/app/controller/edit/EditShape',
+ 'documenteditor/mobile/app/controller/edit/EditChart',
+ 'documenteditor/mobile/app/controller/edit/EditHyperlink',
+ 'documenteditor/mobile/app/controller/add/AddContainer',
+ 'documenteditor/mobile/app/controller/add/AddTable',
+ 'documenteditor/mobile/app/controller/add/AddShape',
+ 'documenteditor/mobile/app/controller/add/AddImage',
+ 'documenteditor/mobile/app/controller/add/AddOther',
+ 'common/mobile/lib/controller/Collaboration'
+ ], function() {
+ window.compareVersions = true;
+ app.start();
+ });
});
}, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
diff --git a/apps/documenteditor/mobile/app.js b/apps/documenteditor/mobile/app.js
index cfd2b1b40..dba0a47b4 100644
--- a/apps/documenteditor/mobile/app.js
+++ b/apps/documenteditor/mobile/app.js
@@ -166,8 +166,6 @@ require([
]
});
- Common.Locale.apply();
-
var device = Framework7.prototype.device;
var loadPlatformCss = function (filename, opt){
var fileref = document.createElement('link');
@@ -209,33 +207,35 @@ require([
//Load platform styles
loadPlatformCss('resources/css/app-' + (device.android ? 'material' : 'ios') + '.css');
- require([
- 'common/main/lib/util/LocalStorage',
- 'common/main/lib/util/utils',
- 'common/mobile/lib/controller/Plugins',
- 'documenteditor/mobile/app/controller/Editor',
- 'documenteditor/mobile/app/controller/Toolbar',
- 'documenteditor/mobile/app/controller/Search',
- 'documenteditor/mobile/app/controller/Main',
- 'documenteditor/mobile/app/controller/DocumentHolder',
- 'documenteditor/mobile/app/controller/Settings',
- 'documenteditor/mobile/app/controller/edit/EditContainer',
- 'documenteditor/mobile/app/controller/edit/EditText',
- 'documenteditor/mobile/app/controller/edit/EditParagraph',
- 'documenteditor/mobile/app/controller/edit/EditHeader',
- 'documenteditor/mobile/app/controller/edit/EditTable',
- 'documenteditor/mobile/app/controller/edit/EditImage',
- 'documenteditor/mobile/app/controller/edit/EditShape',
- 'documenteditor/mobile/app/controller/edit/EditChart',
- 'documenteditor/mobile/app/controller/edit/EditHyperlink',
- 'documenteditor/mobile/app/controller/add/AddContainer',
- 'documenteditor/mobile/app/controller/add/AddTable',
- 'documenteditor/mobile/app/controller/add/AddShape',
- 'documenteditor/mobile/app/controller/add/AddImage',
- 'documenteditor/mobile/app/controller/add/AddOther',
- 'common/mobile/lib/controller/Collaboration'
- ], function() {
- app.start();
+ Common.Locale.apply(function() {
+ require([
+ 'common/main/lib/util/LocalStorage',
+ 'common/main/lib/util/utils',
+ 'common/mobile/lib/controller/Plugins',
+ 'documenteditor/mobile/app/controller/Editor',
+ 'documenteditor/mobile/app/controller/Toolbar',
+ 'documenteditor/mobile/app/controller/Search',
+ 'documenteditor/mobile/app/controller/Main',
+ 'documenteditor/mobile/app/controller/DocumentHolder',
+ 'documenteditor/mobile/app/controller/Settings',
+ 'documenteditor/mobile/app/controller/edit/EditContainer',
+ 'documenteditor/mobile/app/controller/edit/EditText',
+ 'documenteditor/mobile/app/controller/edit/EditParagraph',
+ 'documenteditor/mobile/app/controller/edit/EditHeader',
+ 'documenteditor/mobile/app/controller/edit/EditTable',
+ 'documenteditor/mobile/app/controller/edit/EditImage',
+ 'documenteditor/mobile/app/controller/edit/EditShape',
+ 'documenteditor/mobile/app/controller/edit/EditChart',
+ 'documenteditor/mobile/app/controller/edit/EditHyperlink',
+ 'documenteditor/mobile/app/controller/add/AddContainer',
+ 'documenteditor/mobile/app/controller/add/AddTable',
+ 'documenteditor/mobile/app/controller/add/AddShape',
+ 'documenteditor/mobile/app/controller/add/AddImage',
+ 'documenteditor/mobile/app/controller/add/AddOther',
+ 'common/mobile/lib/controller/Collaboration'
+ ], function() {
+ app.start();
+ });
});
}, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
diff --git a/apps/documenteditor/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js
index b7f2a776a..199a5a109 100644
--- a/apps/documenteditor/mobile/app/controller/Main.js
+++ b/apps/documenteditor/mobile/app/controller/Main.js
@@ -538,7 +538,8 @@ define([
value = Common.localStorage.getItem("de-show-tableline");
me.api.put_ShowTableEmptyLine((value!==null) ? eval(value) : true);
- value = Common.localStorage.getBool("de-mobile-spellcheck", false);
+ value = Common.localStorage.getBool("de-mobile-spellcheck", !(this.appOptions.customization && this.appOptions.customization.spellcheck===false));
+ Common.Utils.InternalSettings.set("de-mobile-spellcheck", value);
me.api.asc_setSpellCheck(value);
me.api.asc_registerCallback('asc_onStartAction', _.bind(me.onLongActionBegin, me));
@@ -607,6 +608,19 @@ define([
me.applyLicense();
$(document).on('contextmenu', _.bind(me.onContextMenu, me));
+
+ if (!me.appOptions.canReview) {
+ var canViewReview = me.appOptions.isEdit || me.api.asc_HaveRevisionsChanges(true);
+ DE.getController('Common.Controllers.Collaboration').setCanViewReview(canViewReview);
+ if (canViewReview) {
+ var viewReviewMode = Common.localStorage.getItem("de-view-review-mode");
+ if (viewReviewMode===null)
+ viewReviewMode = me.appOptions.customization && /^(original|final|markup)$/i.test(me.appOptions.customization.reviewDisplay) ? me.appOptions.customization.reviewDisplay.toLocaleLowerCase() : 'original';
+ viewReviewMode = me.appOptions.isEdit ? 'markup' : viewReviewMode;
+ DE.getController('Common.Controllers.Collaboration').turnDisplayMode(viewReviewMode);
+ }
+ }
+
Common.Gateway.documentReady();
$('.doc-placeholder').remove();
@@ -953,6 +967,10 @@ define([
config.msg = this.errorEditingDownloadas;
break;
+ case Asc.c_oAscError.ID.ConvertationOpenLimitError:
+ config.msg = this.errorFileSizeExceed;
+ break;
+
default:
config.msg = this.errorDefaultMessage.replace('%1', id);
break;
@@ -1437,7 +1455,8 @@ define([
errorEditingDownloadas: 'An error occurred during the work with the document.
Use the \'Download\' option to save the file backup copy to your computer hard drive.',
textPaidFeature: 'Paid feature',
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.',
- waitText: 'Please, wait...'
+ waitText: 'Please, wait...',
+ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.'
}
})(), DE.Controllers.Main || {}))
});
\ No newline at end of file
diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js
index 8269cbea5..ba3138074 100644
--- a/apps/documenteditor/mobile/app/controller/Settings.js
+++ b/apps/documenteditor/mobile/app/controller/Settings.js
@@ -229,7 +229,7 @@ define([
Common.Utils.addScrollIfNeed('.page[data-page=settings-about-view]', '.page[data-page=settings-about-view] .page-content');
} else if ('#settings-advanced-view' == pageId) {
me.initPageAdvancedSettings();
- $('#settings-spellcheck input:checkbox').attr('checked', Common.localStorage.getBool("de-mobile-spellcheck", false));
+ $('#settings-spellcheck input:checkbox').attr('checked', Common.Utils.InternalSettings.get("de-mobile-spellcheck"));
$('#settings-spellcheck input:checkbox').single('change', _.bind(me.onSpellcheck, me));
$('#settings-no-characters input:checkbox').attr('checked', (Common.localStorage.getItem("de-mobile-no-characters") == 'true') ? true : false);
$('#settings-no-characters input:checkbox').single('change', _.bind(me.onNoCharacters, me));
@@ -262,7 +262,7 @@ define([
$('#settings-print').single('click', _.bind(me.onPrint, me));
$('#settings-collaboration').single('click', _.bind(me.clickCollaboration, me));
var _stateDisplayMode = DE.getController('Common.Controllers.Collaboration').getDisplayMode();
- if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") {
+ if(_stateDisplayMode == "final" || _stateDisplayMode == "original") {
$('#settings-document').addClass('disabled');
}
var _userCount = DE.getController('Main').returnUserCount();
@@ -378,7 +378,7 @@ define([
value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric();
$unitMeasurement.val([value]);
var _stateDisplayMode = DE.getController('Common.Controllers.Collaboration').getDisplayMode();
- if(_stateDisplayMode == "Final" || _stateDisplayMode == "Original") {
+ if(_stateDisplayMode == "final" || _stateDisplayMode == "original") {
$('#settings-no-characters').addClass('disabled');
$('#settings-hidden-borders').addClass('disabled');
}
@@ -543,6 +543,7 @@ define([
var $checkbox = $(e.currentTarget),
state = $checkbox.is(':checked');
Common.localStorage.setItem("de-mobile-spellcheck", state ? 1 : 0);
+ Common.Utils.InternalSettings.set("de-mobile-spellcheck", state);
this.api && this.api.asc_setSpellCheck(state);
},
diff --git a/apps/documenteditor/mobile/app/controller/Toolbar.js b/apps/documenteditor/mobile/app/controller/Toolbar.js
index ccd784064..d5ed2de7f 100644
--- a/apps/documenteditor/mobile/app/controller/Toolbar.js
+++ b/apps/documenteditor/mobile/app/controller/Toolbar.js
@@ -153,7 +153,7 @@ define([
},
setDisplayMode: function(displayMode) {
- stateDisplayMode = displayMode == "Final" || displayMode == "Original" ? true : false;
+ stateDisplayMode = displayMode == "final" || displayMode == "original" ? true : false;
var selected = this.api.getSelectedElements();
this.onApiFocusObject(selected);
},
diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json
index a288509a9..96ecafa44 100644
--- a/apps/documenteditor/mobile/locale/en.json
+++ b/apps/documenteditor/mobile/locale/en.json
@@ -247,6 +247,7 @@
"DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.",
"DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
+ "DE.Controllers.Main.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.",
"DE.Controllers.Search.textNoTextFound": "Text not Found",
"DE.Controllers.Search.textReplaceAll": "Replace All",
"DE.Controllers.Settings.notcriticalErrorTitle": "Warning",
diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json
index 8bca5769f..4d3f1bab8 100644
--- a/apps/documenteditor/mobile/locale/ru.json
+++ b/apps/documenteditor/mobile/locale/ru.json
@@ -2,7 +2,7 @@
"Common.Controllers.Collaboration.textAtLeast": "минимум",
"Common.Controllers.Collaboration.textAuto": "авто",
"Common.Controllers.Collaboration.textBaseline": "Базовая линия",
- "Common.Controllers.Collaboration.textBold": "Жирный",
+ "Common.Controllers.Collaboration.textBold": "Полужирный",
"Common.Controllers.Collaboration.textBreakBefore": "С новой страницы",
"Common.Controllers.Collaboration.textCaps": "Все прописные",
"Common.Controllers.Collaboration.textCenter": "Выравнивание по центру",
diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html
index 67d4685f7..32d5afef3 100644
--- a/apps/presentationeditor/embed/index.html
+++ b/apps/presentationeditor/embed/index.html
@@ -162,7 +162,7 @@
-
+
+
+
+
-
+
-
+
+
diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js
index a425b3840..a140f01a6 100644
--- a/apps/presentationeditor/embed/js/ApplicationController.js
+++ b/apps/presentationeditor/embed/js/ApplicationController.js
@@ -498,6 +498,10 @@ PE.ApplicationController = new(function(){
message = me.errorUserDrop;
break;
+ case Asc.c_oAscError.ID.ConvertationOpenLimitError:
+ message = me.errorFileSizeExceed;
+ break;
+
default:
message = me.errorDefaultMessage.replace('%1', id);
break;
@@ -509,7 +513,7 @@ PE.ApplicationController = new(function(){
Common.Gateway.reportError(id, message);
$('#id-critical-error-title').text(me.criticalErrorTitle);
- $('#id-critical-error-message').text(message);
+ $('#id-critical-error-message').html(message);
$('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
window.location.reload();
});
@@ -518,7 +522,7 @@ PE.ApplicationController = new(function(){
Common.Gateway.reportWarning(id, message);
$('#id-critical-error-title').text(me.notcriticalErrorTitle);
- $('#id-critical-error-message').text(message);
+ $('#id-critical-error-message').html(message);
$('#id-critical-error-close').text(me.txtClose).off().on('click', function(){
$('#id-critical-error-dialog').modal('hide');
});
@@ -624,6 +628,7 @@ PE.ApplicationController = new(function(){
downloadTextText: 'Downloading presentation...',
waitText: 'Please, wait...',
textLoadingDocument: 'Loading presentation',
- txtClose: 'Close'
+ txtClose: 'Close',
+ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.'
}
})();
diff --git a/apps/presentationeditor/embed/js/application.js b/apps/presentationeditor/embed/js/application.js
index 73a13c863..bbff1ddfe 100644
--- a/apps/presentationeditor/embed/js/application.js
+++ b/apps/presentationeditor/embed/js/application.js
@@ -31,8 +31,8 @@
*
*/
(function ($) {
- Common.Locale.apply();
- PE.ApplicationView.create();
- PE.ApplicationController.create();
-
+ Common.Locale.apply(function() {
+ PE.ApplicationView.create();
+ PE.ApplicationController.create();
+ });
})(window.jQuery);
diff --git a/apps/presentationeditor/embed/locale/en.json b/apps/presentationeditor/embed/locale/en.json
index c25ad71da..a12071d1d 100644
--- a/apps/presentationeditor/embed/locale/en.json
+++ b/apps/presentationeditor/embed/locale/en.json
@@ -12,6 +12,7 @@
"PE.ApplicationController.errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please contact your Document Server administrator.",
"PE.ApplicationController.errorDefaultMessage": "Error code: %1",
"PE.ApplicationController.errorFilePassProtect": "The file is password protected and cannot be opened.",
+ "PE.ApplicationController.errorFileSizeExceed": "The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.",
"PE.ApplicationController.errorUserDrop": "The file cannot be accessed right now.",
"PE.ApplicationController.notcriticalErrorTitle": "Warning",
"PE.ApplicationController.scriptLoadError": "The connection is too slow, some of the components could not be loaded. Please reload the page.",
diff --git a/apps/presentationeditor/main/app.js b/apps/presentationeditor/main/app.js
index f7b37369f..99ea4dc01 100644
--- a/apps/presentationeditor/main/app.js
+++ b/apps/presentationeditor/main/app.js
@@ -160,39 +160,39 @@ require([
]
});
- Common.Locale.apply();
-
- require([
- 'presentationeditor/main/app/controller/Viewport',
- 'presentationeditor/main/app/controller/DocumentHolder',
- 'presentationeditor/main/app/controller/Toolbar',
- 'presentationeditor/main/app/controller/Statusbar',
- 'presentationeditor/main/app/controller/RightMenu',
- 'presentationeditor/main/app/controller/LeftMenu',
- 'presentationeditor/main/app/controller/Main',
- 'presentationeditor/main/app/view/FileMenuPanels',
- 'presentationeditor/main/app/view/ParagraphSettings',
- 'presentationeditor/main/app/view/ImageSettings',
- 'presentationeditor/main/app/view/ShapeSettings',
- 'presentationeditor/main/app/view/SlideSettings',
- 'presentationeditor/main/app/view/TableSettings',
- 'presentationeditor/main/app/view/TextArtSettings',
- 'presentationeditor/main/app/view/SignatureSettings',
- 'common/main/lib/util/utils',
- 'common/main/lib/util/LocalStorage',
- 'common/main/lib/controller/Fonts'
- /** coauthoring begin **/
- ,'common/main/lib/controller/Comments',
- 'common/main/lib/controller/Chat',
- /** coauthoring end **/
- 'common/main/lib/controller/Plugins',
- 'presentationeditor/main/app/view/ChartSettings',
- 'common/main/lib/controller/ExternalDiagramEditor'
- ,'common/main/lib/controller/ReviewChanges'
- ,'common/main/lib/controller/Protection'
- ,'common/main/lib/controller/Desktop'
- ], function() {
- app.start();
+ Common.Locale.apply(function(){
+ require([
+ 'presentationeditor/main/app/controller/Viewport',
+ 'presentationeditor/main/app/controller/DocumentHolder',
+ 'presentationeditor/main/app/controller/Toolbar',
+ 'presentationeditor/main/app/controller/Statusbar',
+ 'presentationeditor/main/app/controller/RightMenu',
+ 'presentationeditor/main/app/controller/LeftMenu',
+ 'presentationeditor/main/app/controller/Main',
+ 'presentationeditor/main/app/view/FileMenuPanels',
+ 'presentationeditor/main/app/view/ParagraphSettings',
+ 'presentationeditor/main/app/view/ImageSettings',
+ 'presentationeditor/main/app/view/ShapeSettings',
+ 'presentationeditor/main/app/view/SlideSettings',
+ 'presentationeditor/main/app/view/TableSettings',
+ 'presentationeditor/main/app/view/TextArtSettings',
+ 'presentationeditor/main/app/view/SignatureSettings',
+ 'common/main/lib/util/utils',
+ 'common/main/lib/util/LocalStorage',
+ 'common/main/lib/controller/Fonts'
+ /** coauthoring begin **/
+ ,'common/main/lib/controller/Comments',
+ 'common/main/lib/controller/Chat',
+ /** coauthoring end **/
+ 'common/main/lib/controller/Plugins',
+ 'presentationeditor/main/app/view/ChartSettings',
+ 'common/main/lib/controller/ExternalDiagramEditor'
+ ,'common/main/lib/controller/ReviewChanges'
+ ,'common/main/lib/controller/Protection'
+ ,'common/main/lib/controller/Desktop'
+ ], function() {
+ app.start();
+ });
});
}, function(err) {
if (err.requireType == 'timeout' && !reqerr && window.requireTimeourError) {
diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js
index 1b65c7a0f..be73ae8fa 100644
--- a/apps/presentationeditor/main/app/controller/LeftMenu.js
+++ b/apps/presentationeditor/main/app/controller/LeftMenu.js
@@ -421,6 +421,10 @@ define([
this.dlgSearch = (new Common.UI.SearchDialog({
matchcase: true
}));
+ var me = this;
+ Common.NotificationCenter.on('preview:start', function() {
+ me.dlgSearch.hide();
+ });
}
if (show) {
diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js
index c5198682e..62f21f6b3 100644
--- a/apps/presentationeditor/main/app/controller/Main.js
+++ b/apps/presentationeditor/main/app/controller/Main.js
@@ -205,9 +205,11 @@ define([
});
$(document.body).on('blur', 'input, textarea', function(e) {
- if (!me.isModalShowed && !me.getApplication().getController('LeftMenu').getView('LeftMenu').getMenu('file').isVisible()) {
+ if (!me.isModalShowed) {
if (/form-control/.test(e.target.className))
me.inFormControl = false;
+ if (me.getApplication().getController('LeftMenu').getView('LeftMenu').getMenu('file').isVisible())
+ return;
if (!e.relatedTarget ||
!/area_id/.test(e.target.id)
&& !(e.target.localName == 'input' && $(e.target).parent().find(e.relatedTarget).length>0) /* Check if focus in combobox goes from input to it's menu button or menu items, or from comment editing area to Ok/Cancel button */
@@ -474,7 +476,7 @@ define([
var action = {id: id, type: type};
this.stackLongActions.pop(action);
- appHeader.setDocumentCaption(this.api.asc_getDocumentName());
+ appHeader && appHeader.setDocumentCaption(this.api.asc_getDocumentName());
this.updateWindowTitle(true);
action = this.stackLongActions.get({type: Asc.c_oAscAsyncActionType.Information});
@@ -646,7 +648,7 @@ define([
var zf = (value!==null) ? parseInt(value) : (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom) : -1);
(zf == -1) ? this.api.zoomFitToPage() : ((zf == -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100));
- value = Common.localStorage.getBool("pe-settings-spellcheck", true);
+ value = Common.localStorage.getBool("pe-settings-spellcheck", !(this.appOptions.customization && this.appOptions.customization.spellcheck===false));
Common.Utils.InternalSettings.set("pe-settings-spellcheck", value);
me.api.asc_setSpellCheck(value);
@@ -1195,6 +1197,10 @@ define([
config.msg = this.errorEmailClient;
break;
+ case Asc.c_oAscError.ID.ConvertationOpenLimitError:
+ config.msg = this.errorFileSizeExceed;
+ break;
+
default:
config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id);
break;
@@ -1311,7 +1317,7 @@ define([
if (this._state.isDocModified !== isModified || force) {
var title = this.defaultTitleText;
- if (!_.isEmpty(appHeader.getDocumentCaption()))
+ if (appHeader && !_.isEmpty(appHeader.getDocumentCaption()))
title = appHeader.getDocumentCaption() + ' - ' + title;
if (isModified) {
@@ -2179,7 +2185,8 @@ define([
txtShape_polyline2: 'Freeform',
errorEmailClient: 'No email client could be found',
textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.',
- waitText: 'Please, wait...'
+ waitText: 'Please, wait...',
+ errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.'
}
})(), PE.Controllers.Main || {}))
});
diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js
index d0186f790..4d57c925d 100644
--- a/apps/presentationeditor/main/app/view/FileMenuPanels.js
+++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js
@@ -657,12 +657,18 @@ define([
'',
'