pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-23 22:53:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts with release/v9.1.0chore: resolve conflicts with

Browse Source
This commit is contained in:
nikita_bartoshuk
2025-08-18 14:35:09 +03:00
parent 9d35ec65fd
commit 422ff55769
12 changed files with 1849 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/pdfeditor/main/app.js
View File

@ -151,7 +151,7 @@ require([
'Common.Controllers.Comments',
'Common.Controllers.Draw',
'Common.Controllers.Plugins',
// 'Common.Controllers.ExternalDiagramEditor',
'Common.Controllers.ExternalDiagramEditor',
// 'Common.Controllers.ExternalOleEditor',
'Common.Controllers.Protection'
]
@ -187,7 +187,7 @@ require([
'common/main/lib/controller/Chat',
/** coauthoring end **/
'common/main/lib/controller/Plugins',
// 'common/main/lib/controller/ExternalDiagramEditor',
'common/main/lib/controller/ExternalDiagramEditor',
// 'common/main/lib/controller/ExternalOleEditor',
'common/main/lib/controller/Draw',
'common/main/lib/controller/Protection'

91
apps/pdfeditor/main/app/controller/DocumentHolderExt.js
View File

@ -174,7 +174,7 @@ define([], function () {
view.menuEditHyperlinkTable.on('click', _.bind(me.editHyperlink, me));
view.menuRemoveHyperlinkPara.on('click', _.bind(me.removeHyperlink, me));
view.menuRemoveHyperlinkTable.on('click', _.bind(me.removeHyperlink, me));
// view.menuChartEdit.on('click', _.bind(me.editChartClick, me, undefined));
view.menuChartEdit.on('click', _.bind(me.editChartClick, me, undefined));
view.menuImgSaveAsPicture.on('click', _.bind(me.saveAsPicture, me));
view.menuTableSaveAsPicture.on('click', _.bind(me.saveAsPicture, me));
view.menuAddCommentPara.on('click', _.bind(me.addComment, me));
@ -197,7 +197,7 @@ define([], function () {
view.menuImgEditPoints.on('click', _.bind(me.onImgEditPoints, me));
view.menuShapeAdvanced.on('click', _.bind(me.onShapeAdvanced, me));
view.menuParagraphAdvanced.on('click', _.bind(me.onParagraphAdvanced, me));
// view.menuChartAdvanced.on('click', _.bind(me.onChartAdvanced, me));
view.menuChartAdvanced.on('click', _.bind(me.onChartAdvanced, me));
view.mnuGroupImg.on('click', _.bind(me.onGroupImg, me));
view.mnuUnGroupImg.on('click', _.bind(me.onUnGroupImg, me));
view.mnuArrangeFront.on('click', _.bind(me.onArrangeFront, me));
@ -229,12 +229,14 @@ define([], function () {
dh.applyEditorMode = function() {
if (this.mode && this.mode.isPDFEdit && this._state.initEditorEvents && Common.Controllers.LaunchController.isScriptLoaded()) {
this.initExternalEditors();
this.documentHolder.createDelayedElementsPDFEditor();
this._state.initEditorEvents = false;
this.api.asc_registerCallback('asc_onShowMathTrack', _.bind(this.onShowMathTrack, this));
this.api.asc_registerCallback('asc_onHideMathTrack', _.bind(this.onHideMathTrack, this));
this.api.asc_registerCallback('asc_onDialogAddHyperlink', _.bind(this.onDialogAddHyperlink, this));
this.api.asc_registerCallback('asc_ChangeCropState', _.bind(this.onChangeCropState, this));
this.api.asc_registerCallback('asc_doubleClickOnChart', _.bind(this.onDoubleClickOnChart, this));
}
if (this.mode)
this.mode.isPDFEdit ? this.onHideTextBar() : this.onHideMathTrack();
@ -2193,6 +2195,39 @@ define([], function () {
}
};
dh.onChartAdvanced = function(item, e){
var me = this;
if (me.api) {
var selectedElements = me.api.getSelectedElements();
if (selectedElements && selectedElements.length > 0){
var elType, elValue;
for (var i = selectedElements.length - 1; i >= 0; i--) {
elType = selectedElements[i].get_ObjectType();
elValue = selectedElements[i].get_ObjectValue();
if (Asc.c_oAscTypeSelectElement.Chart == elType) {
(new PE.Views.ChartSettingsAdvanced(
{
chartProps: elValue,
slideSize: PE.getController('Toolbar').currentPageSize,
handler: function(result, value) {
if (result == 'ok') {
if (me.api) {
me.api.ChartApply(value.chartProps);
}
}
me.editComplete();
Common.component.Analytics.trackEvent('DocumentHolder', 'Chart Settings Advanced');
}
})).show();
break;
}
}
}
}
};
dh.onParagraphAdvanced = function(item) {
var me = this;
if (me.api){
@ -2554,5 +2589,57 @@ define([], function () {
!Common.Utils.InternalSettings.get('pdfe-settings-annot-bar') && this.onHideAnnotBar();
};
dh.initExternalEditors = function() {
var me = this,
decontroller = this.getApplication().getController('Common.Controllers.ExternalDiagramEditor');
decontroller.setApi(this.api).loadConfig({config:this.mode, customization: this.mode.customization});
var diagramEditor = decontroller.getView('Common.Views.ExternalDiagramEditor');
if (diagramEditor) {
diagramEditor.on('internalmessage', _.bind(function(cmp, message) {
var command = message.data.command;
var data = message.data.data;
if (this.api) {
(diagramEditor.isEditMode())
? this.api.asc_editChartDrawingObject(data)
: this.api.asc_addChartDrawingObject(data);
}
}, this));
diagramEditor.on('hide', _.bind(function(cmp, message) {
if (this.api) {
this.api.asc_onCloseChartFrame();
this.api.asc_enableKeyEvents(true);
}
setTimeout(function(){
me.editComplete();
}, 10);
}, this));
}
};
dh.onDoubleClickOnChart = function(chart) {
if (!Common.Controllers.LaunchController.isScriptLoaded()) return;
if (this.mode && this.mode.isEdit && this.mode.isPDFEdit && !this._isDisabled) {
var diagramEditor = this.getApplication().getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor');
if (diagramEditor && chart) {
diagramEditor.setEditMode(true);
diagramEditor.show();
diagramEditor.setChartData(new Asc.asc_CChartBinary(chart));
}
}
};
dh.editChartClick = function(){
if (!Common.Controllers.LaunchController.isScriptLoaded()) return;
var diagramEditor = this.getApplication().getController('Common.Controllers.ExternalDiagramEditor').getView('Common.Views.ExternalDiagramEditor');
if (diagramEditor) {
diagramEditor.setEditMode(true);
diagramEditor.show();
var chart = this.api.asc_getChartObject();
if (chart) {
diagramEditor.setChartData(new Asc.asc_CChartBinary(chart));
}
}
};
}
});

16
apps/pdfeditor/main/app/controller/InsTab.js
View File

@ -662,7 +662,7 @@ define([
this.api.asc_createSmartArt(value);
}
},
/*
onSelectChart: function(type) {
var me = this,
chart = false;
@ -692,16 +692,18 @@ define([
if (this.diagramEditor && me.api) {
this.diagramEditor.setEditMode(false);
this.diagramEditor.show();
console.log(type)
chart = me.api.asc_getChartObject(type);
if (chart) {
this.diagramEditor.setChartData(new Asc.asc_CChartBinary(chart));
}
// me.api.asc_addChartDrawingObject(type);
// me.api.asc_editChartInFrameEditor();
me.view.fireEvent('insertchart', me.view);
}
}
},
*/
onTextLanguage: function(langId) {
this._state.lang = langId;
},
@ -950,10 +952,10 @@ define([
}
}
// if (in_chart !== this._state.in_chart) {
// this.view.btnInsertChart.updateHint(in_chart ? this.view.tipChangeChart : this.view.tipInsertChart);
// this._state.in_chart = in_chart;
// }
if (in_chart !== this._state.in_chart) {
this.view.btnInsertChart.updateHint(in_chart ? this.view.tipChangeChart : this.view.tipInsertChart);
this._state.in_chart = in_chart;
}
if (this._state.prcontrolsdisable !== paragraph_locked) {
if (this._state.activated) this._state.prcontrolsdisable = paragraph_locked;

5
apps/pdfeditor/main/app/template/RightMenu.template
View File

@ -5,8 +5,7 @@
<div id="id-table-settings" class="settings-panel"></div>
<div id="id-image-settings" class="settings-panel"></div>
<div id="id-shape-settings" class="settings-panel"></div>
<!-- <div id="id-chart-settings" class="settings-panel">-->
<!-- </div>-->
<div id="id-chart-settings" class="settings-panel"></div>
<div id="id-textart-settings" class="settings-panel"></div>
<!-- <div id="id-signature-settings" class="settings-panel">-->
<!-- </div>-->
@ -19,7 +18,7 @@
<button id="id-right-menu-image" class="btn btn-category arrow-left" content-target="id-image-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-image">&nbsp;</i></button>
<button id="id-right-menu-text" class="btn btn-category arrow-left" content-target="id-paragraph-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-paragraph">&nbsp;</i></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button>
<!-- <button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>-->
<button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
<!-- <button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>-->
<button id="id-right-menu-form" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-form-settings"><i class="icon toolbar__icon btn-field">&nbsp;</i></button>

2
apps/pdfeditor/main/app/view/ChartSettings.js
View File

@ -43,7 +43,7 @@ define([
'backbone',
'common/main/lib/component/Button',
'common/main/lib/component/ComboDataView',
// 'pdfeditor/main/app/view/ChartSettingsAdvanced'
'pdfeditor/main/app/view/ChartSettingsAdvanced'
], function (menuTemplate, $, _, Backbone) {
'use strict';

1518
apps/pdfeditor/main/app/view/ChartSettingsAdvanced.js Normal file
View File

File diff suppressed because it is too large Load Diff

35
apps/pdfeditor/main/app/view/DocumentHolderExt.js
View File

@ -816,7 +816,7 @@ define([], function () {
me.mnuArrangeForward.setDisabled(inSmartartInternal);
me.mnuArrangeBackward.setDisabled(inSmartartInternal);
me.menuImgShapeRotate.setVisible(_.isUndefined(value.chartProps) && (pluginGuid===null || pluginGuid===undefined));
me.menuImgShapeRotate.setVisible((_.isUndefined(value.chartProps) && !(value.shapeProps && value.shapeProps.isChart)) && (pluginGuid===null || pluginGuid===undefined));
if (me.menuImgShapeRotate.isVisible()) {
me.menuImgShapeRotate.setDisabled(disabled || (value.shapeProps && value.shapeProps.value.get_FromSmartArt()));
me.menuImgShapeRotate.menu.items[3].setDisabled(inSmartartInternal);
@ -846,15 +846,15 @@ define([], function () {
canEditPoints && me.menuImgEditPoints.setDisabled(disabled);
me.menuImageAdvanced.setVisible(isimage);
me.menuShapeAdvanced.setVisible(_.isUndefined(value.imgProps) && _.isUndefined(value.chartProps));
// me.menuChartEdit.setVisible(_.isUndefined(value.imgProps) && !_.isUndefined(value.chartProps) && (_.isUndefined(value.shapeProps) || value.shapeProps.isChart));
// me.menuChartAdvanced.setVisible(_.isUndefined(value.imgProps) && !_.isUndefined(value.chartProps) && (_.isUndefined(value.shapeProps) || value.shapeProps.isChart));
menuImgShapeSeparator.setVisible(me.menuImageAdvanced.isVisible() || me.menuShapeAdvanced.isVisible() /*|| me.menuChartEdit.isVisible() || me.menuChartAdvanced.isVisible()*/);
me.menuShapeAdvanced.setVisible(_.isUndefined(value.imgProps) && (_.isUndefined(value.chartProps) && !(value.shapeProps && value.shapeProps.isChart)));
me.menuChartEdit.setVisible(_.isUndefined(value.imgProps) && !_.isUndefined(value.chartProps) && (_.isUndefined(value.shapeProps) || value.shapeProps.isChart));
me.menuChartAdvanced.setVisible(_.isUndefined(value.imgProps) && !_.isUndefined(value.chartProps) && (_.isUndefined(value.shapeProps) || value.shapeProps.isChart));
menuImgShapeSeparator.setVisible(me.menuImageAdvanced.isVisible() || me.menuShapeAdvanced.isVisible() || me.menuChartEdit.isVisible() || me.menuChartAdvanced.isVisible());
menuAdvancedSettingsSeparator.setVisible(
me.menuImgCrop.isVisible() || me.menuImgOriginalSize.isVisible() ||
me.menuImgReplace.isVisible() || me.menuImageAdvanced.isVisible() ||
me.menuImgEditPoints.isVisible() || me.menuShapeAdvanced.isVisible() /*||
me.menuChartEdit.isVisible() || me.menuChartAdvanced.isVisible()*/
me.menuImgEditPoints.isVisible() || me.menuShapeAdvanced.isVisible() ||
me.menuChartEdit.isVisible() || me.menuChartAdvanced.isVisible()
);
menuAdvancedSettingsSeparator.isVisible() && (lastSeparator = menuAdvancedSettingsSeparator);
@ -877,9 +877,9 @@ define([], function () {
}
me.menuImageAdvanced.setDisabled(disabled);
me.menuShapeAdvanced.setDisabled(disabled);
// me.menuChartAdvanced.setDisabled(disabled);
// if (me.menuChartEdit.isVisible())
// me.menuChartEdit.setDisabled(disabled);
me.menuChartAdvanced.setDisabled(disabled);
if (me.menuChartEdit.isVisible())
me.menuChartEdit.setDisabled(disabled);
var cancopy = me.api && me.api.can_CopyCut();
me.menuImgCopy.setDisabled(!cancopy);
@ -906,8 +906,8 @@ define([], function () {
me.menuImageAdvanced,
me.menuImgEditPoints,
me.menuShapeAdvanced,
// me.menuChartEdit,
// me.menuChartAdvanced,
me.menuChartEdit,
me.menuChartAdvanced,
menuAdvancedSettingsSeparator, //Separator
/** coauthoring begin **/
me.menuAddCommentImg
@ -929,6 +929,11 @@ define([], function () {
caption : me.advancedParagraphText
});
me.menuChartAdvanced = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-menu-chart',
caption : me.advancedChartText
});
var menuCommentParaSeparator = new Common.UI.MenuItem({
caption : '--'
});
@ -959,6 +964,10 @@ define([], function () {
})
});
me.menuChartEdit = new Common.UI.MenuItem({
caption : me.editChartText
});
me.menuParagraphVAlign = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-align-top',
caption : me.vertAlignText,
@ -1071,7 +1080,7 @@ define([], function () {
scrollToCheckedItem: false,
initMenu: function(value){
var isInShape = (value.shapeProps && !_.isNull(value.shapeProps.value));
var isInChart = (value.chartProps && !_.isNull(value.chartProps.value));
var isInChart = (value.chartProps && !_.isNull(value.chartProps.value)) || value.shapeProps && value.shapeProps.isChart;
var disabled = (value.paraProps!==undefined && value.paraProps.locked) ||
(isInShape && value.shapeProps.locked);
var isEquation= (value.mathProps && value.mathProps.value);

17
apps/pdfeditor/main/app/view/InsTab.js
View File

@ -60,8 +60,8 @@ define([
'<span class="btn-slot text x-huge slot-instext"></span>' +
'<span class="btn-slot text x-huge" id="slot-btn-instextart"></span>' +
'<span class="btn-slot text x-huge slot-insertimg"></span>' +
// '<span class="btn-slot text x-huge" id="slot-btn-insertchart"></span>' +
'<span class="btn-slot text x-huge" id="slot-btn-inssmartart"></span>' +
'<span class="btn-slot text x-huge" id="slot-btn-insertchart"></span>' +
'</div>' +
'<div class="separator long invisible"></div>' +
'<div class="group small" id="slot-combo-insertshape"></div>' +
@ -147,7 +147,7 @@ define([
dataHintOffset: 'small'
});
me.lockedControls.push(me.btnInsertTable);
/*
me.btnInsertChart = new Common.UI.Button({
id: 'tlbtn-insertchart',
cls: 'btn-toolbar x-huge icon-top',
@ -160,7 +160,7 @@ define([
dataHintOffset: 'small'
});
me.lockedControls.push(me.btnInsertChart);
*/
this.btnInsertSmartArt = new Common.UI.Button({
id: 'tlbtn-insertsmartart',
cls: 'btn-toolbar x-huge icon-top',
@ -315,7 +315,7 @@ define([
_injectComponent('#slot-btn-inssymbol', this.btnInsertSymbol);
_injectComponent('#slot-btn-insertlink', this.btnInsertHyperlink);
_injectComponent('#slot-btn-inserttable', this.btnInsertTable);
// _injectComponent('#slot-btn-insertchart', this.btnInsertChart);
_injectComponent('#slot-btn-insertchart', this.btnInsertChart);
_injectComponent('#slot-btn-instextart', this.btnInsertTextArt);
// _injectComponent('#slot-btn-editheader', this.btnEditHeader);
// _injectComponent('#slot-btn-datetime', this.btnInsDateTime);
@ -424,8 +424,8 @@ define([
});
this.btnInsertTable.updateHint(this.tipInsertTable);
// this.btnInsertChart.updateHint(this.tipInsertChart);
this.btnInsertSmartArt.updateHint(this.tipInsertSmartArt);
this.btnInsertChart.updateHint(this.tipInsertChart);
this.btnInsertEquation.updateHint(this.tipInsertEquation);
this.btnInsertSymbol.updateHint(this.tipInsertSymbol);
this.btnInsertHyperlink.updateHint(this.tipInsertHyperlink + Common.Utils.String.platformKey('Ctrl+K'));
@ -433,7 +433,6 @@ define([
// this.btnEditHeader.updateHint(this.tipEditHeaderFooter);
// this.btnInsDateTime.updateHint(this.tipDateTime);
// this.btnInsSlideNum.updateHint(this.tipPageNum);
/*
this.btnInsertChart.setMenu( new Common.UI.Menu({
style: 'width: 364px;padding-top: 12px;',
items: [
@ -454,13 +453,15 @@ define([
});
picker.on('item:click', function (picker, item, record, e) {
if (record)
me.fireEvent('insert:chart', [record.get('type')]);
{me.fireEvent('insert:chart', [record.get('type')])
console.log('chart')
};
});
menu.off('show:before', onShowBefore);
menu.setInnerMenu([{menu: picker, index: 0}]);
};
this.btnInsertChart.menu.on('show:before', onShowBefore);
*/
this.btnInsertSmartArt.setMenu(new Common.UI.Menu({
cls: 'shifted-right',
items: []

26
apps/pdfeditor/main/app/view/RightMenu.js
View File

@ -101,15 +101,15 @@ define([
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
// this.btnChart = new Common.UI.Button({
// hint: this.txtChartSettings,
// asctype: Common.Utils.documentSettingsType.Chart,
// enableToggle: true,
// disabled: true,
// iconCls: 'btn-menu-chart',
// toggleGroup: 'tabpanelbtnsGroup',
// allowMouseEventsOnDisabled: true
// });
this.btnChart = new Common.UI.Button({
hint: this.txtChartSettings,
asctype: Common.Utils.documentSettingsType.Chart,
enableToggle: true,
disabled: true,
iconCls: 'btn-menu-chart',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
this.btnShape = new Common.UI.Button({
hint: this.txtShapeSettings,
asctype: Common.Utils.documentSettingsType.Shape,
@ -135,7 +135,7 @@ define([
this._settings[Common.Utils.documentSettingsType.Table] = {panel: "id-table-settings", btn: this.btnTable};
this._settings[Common.Utils.documentSettingsType.Image] = {panel: "id-image-settings", btn: this.btnImage};
this._settings[Common.Utils.documentSettingsType.Shape] = {panel: "id-shape-settings", btn: this.btnShape};
// this._settings[Common.Utils.documentSettingsType.Chart] = {panel: "id-chart-settings", btn: this.btnChart};
this._settings[Common.Utils.documentSettingsType.Chart] = {panel: "id-chart-settings", btn: this.btnChart};
this._settings[Common.Utils.documentSettingsType.TextArt] = {panel: "id-textart-settings", btn: this.btnTextArt};
return this;
@ -171,14 +171,14 @@ define([
this.btnText.setElement($('#id-right-menu-text'), false); this.btnText.render();
this.btnTable.setElement($('#id-right-menu-table'), false); this.btnTable.render();
this.btnImage.setElement($('#id-right-menu-image'), false); this.btnImage.render();
// this.btnChart.setElement($('#id-right-menu-chart'), false); this.btnChart.render();
this.btnChart.setElement($('#id-right-menu-chart'), false); this.btnChart.render();
this.btnShape.setElement($('#id-right-menu-shape'), false); this.btnShape.render();
this.btnTextArt.setElement($('#id-right-menu-textart'), false); this.btnTextArt.render();
this.btnText.on('click', _.bind(this.onBtnMenuClick, this));
this.btnTable.on('click', _.bind(this.onBtnMenuClick, this));
this.btnImage.on('click', _.bind(this.onBtnMenuClick, this));
// this.btnChart.on('click', _.bind(this.onBtnMenuClick, this));
this.btnChart.on('click', _.bind(this.onBtnMenuClick, this));
this.btnShape.on('click', _.bind(this.onBtnMenuClick, this));
this.btnTextArt.on('click', _.bind(this.onBtnMenuClick, this));
@ -338,7 +338,7 @@ define([
},
setButtons: function () {
var allButtons = [this.btnShape, this.btnImage, this.btnText, this.btnTable, this.btnTextArt/*, this.btnChart, this.btnSignature*/, this.btnForm];
var allButtons = [this.btnShape, this.btnImage, this.btnText, this.btnTable, this.btnTextArt, this.btnChart/*, this.btnSignature*/, this.btnForm];
Common.UI.SideMenu.prototype.setButtons.apply(this, [allButtons]);
},

9
apps/pdfeditor/main/app_dev.js
View File

@ -141,7 +141,7 @@ require([
,'Common.Controllers.Comments'
,'Common.Controllers.Draw'
,'Common.Controllers.Plugins'
// ,'Common.Controllers.ExternalDiagramEditor'
,'Common.Controllers.ExternalDiagramEditor'
// ,'Common.Controllers.ExternalOleEditor'
,'Common.Controllers.Protection'
]
@ -176,7 +176,7 @@ require([
'common/main/lib/controller/Comments'
,'common/main/lib/controller/Chat'
,'common/main/lib/controller/Plugins'
// ,'common/main/lib/controller/ExternalDiagramEditor'
,'common/main/lib/controller/ExternalDiagramEditor'
// ,'common/main/lib/controller/ExternalOleEditor'
,'common/main/lib/controller/Draw'
,'common/main/lib/controller/Protection'
@ -195,6 +195,8 @@ require([
'common/main/lib/view/InsertTableDialog',
'common/main/lib/view/SearchDialog',
'common/main/lib/view/RenameDialog',
'common/main/lib/view/ExternalEditor',
'common/main/lib/view/ExternalDiagramEditor',
'common/main/lib/view/PluginDlg',
'common/main/lib/view/PluginPanel',
'common/main/lib/view/ShapeShadowDialog',
@ -215,7 +217,8 @@ require([
'pdfeditor/main/app/view/HyperlinkSettingsDialog',
'pdfeditor/main/app/view/ShapeSettingsAdvanced',
'pdfeditor/main/app/view/TableSettingsAdvanced',
'pdfeditor/main/app/view/FormatSettingsDialog'
'pdfeditor/main/app/view/FormatSettingsDialog',
'pdfeditor/main/app/view/ChartSettingsAdvanced'
];
window.compareVersions = true;

5
apps/pdfeditor/main/app_pack.js
View File

@ -12,6 +12,8 @@ require([
'common/main/lib/view/InsertTableDialog',
'common/main/lib/view/SearchDialog',
'common/main/lib/view/RenameDialog',
'common/main/lib/view/ExternalEditor',
'common/main/lib/view/ExternalDiagramEditor',
'common/main/lib/view/PluginDlg',
'common/main/lib/view/PluginPanel',
'common/main/lib/view/ShapeShadowDialog',
@ -32,7 +34,8 @@ require([
'pdfeditor/main/app/view/HyperlinkSettingsDialog',
'pdfeditor/main/app/view/ShapeSettingsAdvanced',
'pdfeditor/main/app/view/TableSettingsAdvanced',
'pdfeditor/main/app/view/FormatSettingsDialog'
'pdfeditor/main/app/view/FormatSettingsDialog',
'pdfeditor/main/app/view/ChartSettingsAdvanced'
], function () {
Common.NotificationCenter.trigger('app-pack:loaded');
});

174
apps/pdfeditor/main/locale/en.json
View File

@ -169,6 +169,51 @@
"Common.define.smartArt.textVerticalPictureAccentList": "Vertical picture accent list",
"Common.define.smartArt.textVerticalPictureList": "Vertical picture list",
"Common.define.smartArt.textVerticalProcess": "Vertical process",
"Common.define.chartData.textArea": "Area",
"Common.define.chartData.textAreaStacked": "Stacked area",
"Common.define.chartData.textAreaStackedPer": "100% Stacked area",
"Common.define.chartData.textBar": "Bar",
"Common.define.chartData.textBarNormal": "Clustered column",
"Common.define.chartData.textBarNormal3d": "3-D Clustered column",
"Common.define.chartData.textBarNormal3dPerspective": "3-D column",
"Common.define.chartData.textBarStacked": "Stacked column",
"Common.define.chartData.textBarStacked3d": "3-D Stacked column",
"Common.define.chartData.textBarStackedPer": "100% Stacked column",
"Common.define.chartData.textBarStackedPer3d": "3-D 100% Stacked column",
"Common.define.chartData.textCharts": "Charts",
"Common.define.chartData.textColumn": "Column",
"Common.define.chartData.textCombo": "Combo",
"Common.define.chartData.textComboAreaBar": "Stacked area - clustered column",
"Common.define.chartData.textComboBarLine": "Clustered column - line",
"Common.define.chartData.textComboBarLineSecondary": "Clustered column - line on secondary axis",
"Common.define.chartData.textComboCustom": "Custom combination",
"Common.define.chartData.textDoughnut": "Doughnut",
"Common.define.chartData.textHBarNormal": "Clustered bar",
"Common.define.chartData.textHBarNormal3d": "3-D Clustered bar",
"Common.define.chartData.textHBarStacked": "Stacked bar",
"Common.define.chartData.textHBarStacked3d": "3-D Stacked bar",
"Common.define.chartData.textHBarStackedPer": "100% Stacked bar",
"Common.define.chartData.textHBarStackedPer3d": "3-D 100% Stacked bar",
"Common.define.chartData.textLine": "Line",
"Common.define.chartData.textLine3d": "3-D line",
"Common.define.chartData.textLineMarker": "Line with markers",
"Common.define.chartData.textLineStacked": "Stacked line",
"Common.define.chartData.textLineStackedMarker": "Stacked line with markers",
"Common.define.chartData.textLineStackedPer": "100% Stacked line",
"Common.define.chartData.textLineStackedPerMarker": "100% Stacked line with markers",
"Common.define.chartData.textPie": "Pie",
"Common.define.chartData.textPie3d": "3-D pie",
"Common.define.chartData.textPoint": "XY (Scatter)",
"Common.define.chartData.textRadar": "Radar",
"Common.define.chartData.textRadarFilled": "Filled radar",
"Common.define.chartData.textRadarMarker": "Radar with markers",
"Common.define.chartData.textScatter": "Scatter",
"Common.define.chartData.textScatterLine": "Scatter with straight lines",
"Common.define.chartData.textScatterLineMarker": "Scatter with straight lines and markers",
"Common.define.chartData.textScatterSmooth": "Scatter with smooth lines",
"Common.define.chartData.textScatterSmoothMarker": "Scatter with smooth lines and markers",
"Common.define.chartData.textStock": "Stock",
"Common.define.chartData.textSurface": "Surface",
"Common.Translation.textMoreButton": "More",
"Common.Translation.tipFileLocked": "Document is locked for editing. You can make changes and save it as local copy later.",
"Common.Translation.tipFileReadOnly": "The file is read-only. To keep your changes, save the file with a new name or in a different location.",
@ -374,6 +419,9 @@
"Common.Views.Draw.txtPen": "Pen",
"Common.Views.Draw.txtSelect": "Select",
"Common.Views.Draw.txtSize": "Size",
"Common.Views.ExternalDiagramEditor.textTitle": "Chart editor",
"Common.Views.ExternalEditor.textClose": "Close",
"Common.Views.ExternalEditor.textSave": "Save & Exit",
"Common.Views.Header.ariaQuickAccessToolbar": "Quick access toolbar",
"Common.Views.Header.labelCoUsersDescr": "Users who are editing the file:",
"Common.Views.Header.textAddFavorite": "Mark as favorite",
@ -1192,6 +1240,10 @@
"PDFE.Controllers.Main.warnNoLicense": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only.<br>Contact %1 sales team for personal upgrade terms.",
"PDFE.Controllers.Main.warnNoLicenseUsers": "You've reached the user limit for %1 editors. Contact %1 sales team for personal upgrade terms.",
"PDFE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.",
"PDFE.Controllers.Main.txtSeries": "Series",
"PDFE.Controllers.Main.txtDiagramTitle": "Chart title",
"PDFE.Controllers.Main.txtXAxis": "X Axis",
"PDFE.Controllers.Main.txtYAxis": "Y Axis",
"PDFE.Controllers.Navigation.txtBeginning": "Beginning of document",
"PDFE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document",
"PDFE.Controllers.Print.textMarginsLast": "Last custom",
@ -1837,6 +1889,7 @@
"PDFE.Views.InsTab.tipDateTime": "Insert current date and time",
"PDFE.Views.InsTab.tipEditHeaderFooter": "Edit header or footer",
"PDFE.Views.InsTab.tipInsertChart": "Insert chart",
"PDFE.Views.InsTab.tipChangeChart": "Change chart type",
"PDFE.Views.InsTab.tipInsertEquation": "Insert equation",
"PDFE.Views.InsTab.tipInsertHorizontalText": "Insert horizontal text box",
"PDFE.Views.InsTab.tipInsertHyperlink": "Add hyperlink",
@ -2250,6 +2303,127 @@
"PDFE.Views.TextArtSettings.txtWood": "Wood",
"PDFE.Views.Toolbar.capBtnArrowComment": "Arrow",
"PDFE.Views.Toolbar.capBtnCircleComment": "Circle",
"PDFE.Views.ChartSettings.text3dDepth": "Depth (% of base)",
"PDFE.Views.ChartSettings.text3dHeight": "Height (% of base)",
"PDFE.Views.ChartSettings.text3dRotation": "3D Rotation",
"PDFE.Views.ChartSettings.textAdvanced": "Show advanced settings",
"PDFE.Views.ChartSettings.textAutoscale": "Autoscale",
"PDFE.Views.ChartSettings.textChartType": "Change chart type",
"PDFE.Views.ChartSettings.textData": "Data",
"PDFE.Views.ChartSettings.textDefault": "Default rotation",
"PDFE.Views.ChartSettings.textDown": "Down",
"PDFE.Views.ChartSettings.textEditData": "Edit data",
"PDFE.Views.ChartSettings.textEditLinks": "Edit Links",
"PDFE.Views.ChartSettings.textHeight": "Height",
"PDFE.Views.ChartSettings.textKeepRatio": "Constant proportions",
"PDFE.Views.ChartSettings.textLeft": "Left",
"PDFE.Views.ChartSettings.textLinkedData": "Linked Data",
"PDFE.Views.ChartSettings.textNarrow": "Narrow field of view",
"PDFE.Views.ChartSettings.textPerspective": "Perspective",
"PDFE.Views.ChartSettings.textRight": "Right",
"PDFE.Views.ChartSettings.textRightAngle": "Right angle axes",
"PDFE.Views.ChartSettings.textSelectData": "Select Data",
"PDFE.Views.ChartSettings.textSize": "Size",
"PDFE.Views.ChartSettings.textStyle": "Style",
"PDFE.Views.ChartSettings.textUp": "Up",
"PDFE.Views.ChartSettings.textUpdateData": "Update Data",
"PDFE.Views.ChartSettings.textWiden": "Widen field of view",
"PDFE.Views.ChartSettings.textWidth": "Width",
"PDFE.Views.ChartSettings.textX": "X rotation",
"PDFE.Views.ChartSettings.textY": "Y rotation",
"PDFE.Views.ChartSettingsAdvanced.textAlt": "Alternative text",
"PDFE.Views.ChartSettingsAdvanced.textAltDescription": "Description",
"PDFE.Views.ChartSettingsAdvanced.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, shape, chart, or table.",
"PDFE.Views.ChartSettingsAdvanced.textAltTitle": "Title",
"PDFE.Views.ChartSettingsAdvanced.textAuto": "Auto",
"PDFE.Views.ChartSettingsAdvanced.textAxisCrosses": "Axis Crosses",
"PDFE.Views.ChartSettingsAdvanced.textAxisPos": "Axis Position",
"PDFE.Views.ChartSettingsAdvanced.textAxisTitle": "Title",
"PDFE.Views.ChartSettingsAdvanced.textBase": "Base",
"PDFE.Views.ChartSettingsAdvanced.textBetweenTickMarks": "Between Tick Marks",
"PDFE.Views.ChartSettingsAdvanced.textBillions": "Billions",
"PDFE.Views.ChartSettingsAdvanced.textCategoryName": "Category Name",
"PDFE.Views.ChartSettingsAdvanced.textCenter": "Center",
"PDFE.Views.ChartSettingsAdvanced.textChartName": "Chart name",
"PDFE.Views.ChartSettingsAdvanced.textChartTitle": "Chart Title",
"PDFE.Views.ChartSettingsAdvanced.textCross": "Cross",
"PDFE.Views.ChartSettingsAdvanced.textCustom": "Custom",
"PDFE.Views.ChartSettingsAdvanced.textDataLabels": "Data Labels",
"PDFE.Views.ChartSettingsAdvanced.textFit": "Fit Width",
"PDFE.Views.ChartSettingsAdvanced.textFixed": "Fixed",
"PDFE.Views.ChartSettingsAdvanced.textFormat": "Label format",
"PDFE.Views.ChartSettingsAdvanced.textFrom": "From",
"PDFE.Views.ChartSettingsAdvanced.textGeneral": "General",
"PDFE.Views.ChartSettingsAdvanced.textGridLines": "Gridlines",
"PDFE.Views.ChartSettingsAdvanced.textHeight": "Height",
"PDFE.Views.ChartSettingsAdvanced.textHideAxis": "Hide axis",
"PDFE.Views.ChartSettingsAdvanced.textHigh": "High",
"PDFE.Views.ChartSettingsAdvanced.textHorAxis": "Horizontal Axis",
"PDFE.Views.ChartSettingsAdvanced.textHorAxisSec": "Secondary Horizontal Axis",
"PDFE.Views.ChartSettingsAdvanced.textHorizontal": "Horizontal",
"PDFE.Views.ChartSettingsAdvanced.textHundredMil": "100 000 000",
"PDFE.Views.ChartSettingsAdvanced.textHundreds": "Hundreds",
"PDFE.Views.ChartSettingsAdvanced.textHundredThousands": "100 000",
"PDFE.Views.ChartSettingsAdvanced.textIn": "In",
"PDFE.Views.ChartSettingsAdvanced.textInnerBottom": "Inner Bottom",
"PDFE.Views.ChartSettingsAdvanced.textInnerTop": "Inner Top",
"PDFE.Views.ChartSettingsAdvanced.textKeepRatio": "Constant proportions",
"PDFE.Views.ChartSettingsAdvanced.textLabelDist": "Axis Label Distance",
"PDFE.Views.ChartSettingsAdvanced.textLabelInterval": "Interval between Labels",
"PDFE.Views.ChartSettingsAdvanced.textLabelOptions": "Label Options",
"PDFE.Views.ChartSettingsAdvanced.textLabelPos": "Label Position",
"PDFE.Views.ChartSettingsAdvanced.textLayout": "Layout",
"PDFE.Views.ChartSettingsAdvanced.textLeftOverlay": "Left Overlay",
"PDFE.Views.ChartSettingsAdvanced.textLegendBottom": "Bottom",
"PDFE.Views.ChartSettingsAdvanced.textLegendLeft": "Left",
"PDFE.Views.ChartSettingsAdvanced.textLegendPos": "Legend",
"PDFE.Views.ChartSettingsAdvanced.textLegendRight": "Right",
"PDFE.Views.ChartSettingsAdvanced.textLegendTop": "Top",
"PDFE.Views.ChartSettingsAdvanced.textLines": "Lines",
"PDFE.Views.ChartSettingsAdvanced.textLogScale": "Logarithmic Scale",
"PDFE.Views.ChartSettingsAdvanced.textLow": "Low",
"PDFE.Views.ChartSettingsAdvanced.textMajor": "Major",
"PDFE.Views.ChartSettingsAdvanced.textMajorMinor": "Major and Minor",
"PDFE.Views.ChartSettingsAdvanced.textMajorType": "Major Type",
"PDFE.Views.ChartSettingsAdvanced.textManual": "Manual",
"PDFE.Views.ChartSettingsAdvanced.textMarkers": "Markers",
"PDFE.Views.ChartSettingsAdvanced.textMarksInterval": "Interval between Marks",
"PDFE.Views.ChartSettingsAdvanced.textMaxValue": "Maximum Value",
"PDFE.Views.ChartSettingsAdvanced.textMillions": "Millions",
"PDFE.Views.ChartSettingsAdvanced.textMinor": "Minor",
"PDFE.Views.ChartSettingsAdvanced.textMinorType": "Minor Type",
"PDFE.Views.ChartSettingsAdvanced.textMinValue": "Minimum Value",
"PDFE.Views.ChartSettingsAdvanced.textNextToAxis": "Next to axis",
"PDFE.Views.ChartSettingsAdvanced.textNone": "None",
"PDFE.Views.ChartSettingsAdvanced.textNoOverlay": "No Overlay",
"PDFE.Views.ChartSettingsAdvanced.textOnTickMarks": "On Tick Marks",
"PDFE.Views.ChartSettingsAdvanced.textOut": "Out",
"PDFE.Views.ChartSettingsAdvanced.textOuterTop": "Outer Top",
"PDFE.Views.ChartSettingsAdvanced.textOverlay": "Overlay",
"PDFE.Views.ChartSettingsAdvanced.textPlacement": "Placement",
"PDFE.Views.ChartSettingsAdvanced.textPosition": "Position",
"PDFE.Views.ChartSettingsAdvanced.textReverse": "Values in reverse order",
"PDFE.Views.ChartSettingsAdvanced.textRightOverlay": "Right Overlay",
"PDFE.Views.ChartSettingsAdvanced.textRotated": "Rotated",
"PDFE.Views.ChartSettingsAdvanced.textSeparator": "Data Labels Separator",
"PDFE.Views.ChartSettingsAdvanced.textSeriesName": "Series Name",
"PDFE.Views.ChartSettingsAdvanced.textSize": "Size",
"PDFE.Views.ChartSettingsAdvanced.textSmooth": "Smooth",
"PDFE.Views.ChartSettingsAdvanced.textStraight": "Straight",
"PDFE.Views.ChartSettingsAdvanced.textTenMillions": "10 000 000",
"PDFE.Views.ChartSettingsAdvanced.textTenThousands": "10 000",
"PDFE.Views.ChartSettingsAdvanced.textThousands": "Thousands",
"PDFE.Views.ChartSettingsAdvanced.textTickOptions": "Tick Options",
"PDFE.Views.ChartSettingsAdvanced.textTitle": "Chart - Advanced settings",
"PDFE.Views.ChartSettingsAdvanced.textTopLeftCorner": "Top left corner",
"PDFE.Views.ChartSettingsAdvanced.textTrillions": "Trillions",
"PDFE.Views.ChartSettingsAdvanced.textUnits": "Display Units",
"PDFE.Views.ChartSettingsAdvanced.textValue": "Value",
"PDFE.Views.ChartSettingsAdvanced.textVertAxis": "Vertical Axis",
"PDFE.Views.ChartSettingsAdvanced.textVertAxisSec": "Secondary Vertical Axis",
"PDFE.Views.ChartSettingsAdvanced.textVertical": "Vertical",
"PDFE.Views.ChartSettingsAdvanced.textWidth": "Width",
"PDFE.Views.ChartSettingsDlg.textLeftOverlay": "Left overlay",
"PDFE.Views.Toolbar.capBtnComment": "Comment",
"PDFE.Views.Toolbar.capBtnDelPage": "Delete Page",
"PDFE.Views.Toolbar.capBtnDownloadForm": "Download As PDF",