[PE SSE] Added "show as picture" item in context menu ( Bug 59446 )

This commit is contained in:
Alexei Koshelev 2022-11-23 21:42:15 +03:00
parent 20b0c57fc9
commit d8c4b9be3d
8 changed files with 40 additions and 22 deletions

View file

@ -427,6 +427,7 @@ define([
view.menuParaTOCSettings.on('click', _.bind(me.onParaTOCSettings, me)); view.menuParaTOCSettings.on('click', _.bind(me.onParaTOCSettings, me));
view.menuTableEquation.menu.on('item:click', _.bind(me.convertEquation, me)); view.menuTableEquation.menu.on('item:click', _.bind(me.convertEquation, me));
view.menuParagraphEquation.menu.on('item:click', _.bind(me.convertEquation, me)); view.menuParagraphEquation.menu.on('item:click', _.bind(me.convertEquation, me));
view.menuSaveAsPicture.on('click', _.bind(me.saveAsPicture, me));
me.onChangeProtectDocument(); me.onChangeProtectDocument();
}, },
@ -2488,6 +2489,12 @@ define([
} }
}, },
saveAsPicture: function() {
if(this.api) {
this.api.asc_SaveDrawingAsPicture();
}
},
onChangeProtectDocument: function(props) { onChangeProtectDocument: function(props) {
if (!props) { if (!props) {
var docprotect = this.getApplication().getController('DocProtection'); var docprotect = this.getApplication().getController('DocProtection');

View file

@ -271,6 +271,12 @@ define([
}); });
var menuInsertCaptionSeparator = new Common.UI.MenuItem({ caption: '--' }); var menuInsertCaptionSeparator = new Common.UI.MenuItem({ caption: '--' });
me.menuSaveAsPicture = new Common.UI.MenuItem({
caption : me.textSaveAsPicture
});
var menuSaveAsPictureSeparator = new Common.UI.MenuItem({ caption: '--'});
me.menuEquationInsertCaption = new Common.UI.MenuItem({ me.menuEquationInsertCaption = new Common.UI.MenuItem({
caption : me.txtInsertCaption caption : me.txtInsertCaption
}); });
@ -455,10 +461,6 @@ define([
caption : me.editChartText caption : me.editChartText
}); });
var menuChartEditSeparator = new Common.UI.MenuItem({
caption : '--'
});
me.menuOriginalSize = new Common.UI.MenuItem({ me.menuOriginalSize = new Common.UI.MenuItem({
caption : me.originalSizeText caption : me.originalSizeText
}); });
@ -591,10 +593,6 @@ define([
caption: me.textEditPoints caption: me.textEditPoints
}); });
var menuImgEditPointsSeparator = new Common.UI.MenuItem({
caption : '--'
});
this.pictureMenu = new Common.UI.Menu({ this.pictureMenu = new Common.UI.Menu({
cls: 'shifted-right', cls: 'shifted-right',
restoreHeightAndTop: true, restoreHeightAndTop: true,
@ -703,8 +701,6 @@ define([
if (me.menuChartEdit.isVisible()) if (me.menuChartEdit.isVisible())
me.menuChartEdit.setDisabled(islocked || value.imgProps.value.get_SeveralCharts()); me.menuChartEdit.setDisabled(islocked || value.imgProps.value.get_SeveralCharts());
menuChartEditSeparator.setVisible(me.menuChartEdit.isVisible());
me.menuOriginalSize.setDisabled(islocked || value.imgProps.value.get_ImageUrl()===null || value.imgProps.value.get_ImageUrl()===undefined); me.menuOriginalSize.setDisabled(islocked || value.imgProps.value.get_ImageUrl()===null || value.imgProps.value.get_ImageUrl()===undefined);
me.menuImageAdvanced.setDisabled(islocked); me.menuImageAdvanced.setDisabled(islocked);
me.menuImageAlign.setDisabled( islocked || (wrapping == Asc.c_oAscWrapStyle2.Inline) ); me.menuImageAlign.setDisabled( islocked || (wrapping == Asc.c_oAscWrapStyle2.Inline) );
@ -755,7 +751,6 @@ define([
var canEditPoints = me.api && me.api.asc_canEditGeometry(); var canEditPoints = me.api && me.api.asc_canEditGeometry();
me.menuImgEditPoints.setVisible(canEditPoints); me.menuImgEditPoints.setVisible(canEditPoints);
menuImgEditPointsSeparator.setVisible(canEditPoints);
canEditPoints && me.menuImgEditPoints.setDisabled(islocked); canEditPoints && me.menuImgEditPoints.setDisabled(islocked);
}, },
items: [ items: [
@ -773,8 +768,6 @@ define([
me.menuImgRemoveControl, me.menuImgRemoveControl,
me.menuImgControlSettings, me.menuImgControlSettings,
menuImgControlSeparator, menuImgControlSeparator,
me.menuImgEditPoints,
menuImgEditPointsSeparator,
me.menuImageArrange, me.menuImageArrange,
me.menuImageAlign, me.menuImageAlign,
me.menuImageWrap, me.menuImageWrap,
@ -782,11 +775,13 @@ define([
{ caption: '--' }, { caption: '--' },
me.menuInsertCaption, me.menuInsertCaption,
menuInsertCaptionSeparator, menuInsertCaptionSeparator,
me.menuSaveAsPicture,
menuSaveAsPictureSeparator,
me.menuImgCrop, me.menuImgCrop,
me.menuOriginalSize, me.menuOriginalSize,
me.menuImgReplace, me.menuImgReplace,
me.menuChartEdit, me.menuChartEdit,
menuChartEditSeparator, me.menuImgEditPoints,
me.menuImageAdvanced me.menuImageAdvanced
] ]
}).on('hide:after', function(menu, e, isFromInputControl) { }).on('hide:after', function(menu, e, isFromInputControl) {
@ -3149,6 +3144,7 @@ define([
textCells: 'Cells', textCells: 'Cells',
textSeveral: 'Several Rows/Columns', textSeveral: 'Several Rows/Columns',
txtInsertCaption: 'Insert Caption', txtInsertCaption: 'Insert Caption',
textSaveAsPicture: 'Save as picture',
txtEmpty: '(Empty)', txtEmpty: '(Empty)',
textFromStorage: 'From Storage', textFromStorage: 'From Storage',
advancedDropCapText: 'Drop Cap Settings', advancedDropCapText: 'Drop Cap Settings',

View file

@ -1821,6 +1821,7 @@
"DE.Views.DocumentHolder.txtInsertArgBefore": "Insert argument before", "DE.Views.DocumentHolder.txtInsertArgBefore": "Insert argument before",
"DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break", "DE.Views.DocumentHolder.txtInsertBreak": "Insert manual break",
"DE.Views.DocumentHolder.txtInsertCaption": "Insert caption", "DE.Views.DocumentHolder.txtInsertCaption": "Insert caption",
"DE.Views.DocumentHolder.textSaveAsPicture": "Save as picture",
"DE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after", "DE.Views.DocumentHolder.txtInsertEqAfter": "Insert equation after",
"DE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before", "DE.Views.DocumentHolder.txtInsertEqBefore": "Insert equation before",
"DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only", "DE.Views.DocumentHolder.txtKeepTextOnly": "Keep text only",

View file

@ -1821,6 +1821,7 @@
"DE.Views.DocumentHolder.txtInsertArgBefore": "Вставить аргумент перед", "DE.Views.DocumentHolder.txtInsertArgBefore": "Вставить аргумент перед",
"DE.Views.DocumentHolder.txtInsertBreak": "Вставить принудительный разрыв", "DE.Views.DocumentHolder.txtInsertBreak": "Вставить принудительный разрыв",
"DE.Views.DocumentHolder.txtInsertCaption": "Вставить название", "DE.Views.DocumentHolder.txtInsertCaption": "Вставить название",
"DE.Views.DocumentHolder.textSaveAsPicture": "Сохранить как рисунок",
"DE.Views.DocumentHolder.txtInsertEqAfter": "Вставить уравнение после", "DE.Views.DocumentHolder.txtInsertEqAfter": "Вставить уравнение после",
"DE.Views.DocumentHolder.txtInsertEqBefore": "Вставить уравнение перед", "DE.Views.DocumentHolder.txtInsertEqBefore": "Вставить уравнение перед",
"DE.Views.DocumentHolder.txtKeepTextOnly": "Сохранить только текст", "DE.Views.DocumentHolder.txtKeepTextOnly": "Сохранить только текст",

View file

@ -264,7 +264,9 @@ define([
view.menuImgMacro.on('click', _.bind(me.onImgMacro, me)); view.menuImgMacro.on('click', _.bind(me.onImgMacro, me));
view.menuImgEditPoints.on('click', _.bind(me.onImgEditPoints, me)); view.menuImgEditPoints.on('click', _.bind(me.onImgEditPoints, me));
view.pmiGetRangeList.on('click', _.bind(me.onGetLink, me)); view.pmiGetRangeList.on('click', _.bind(me.onGetLink, me));
view.menuParagraphEquation.menu.on('item:click', _.bind(me.convertEquation, me)); view.menuParagraphEquation.menu.on('item:click', _.bind(me.convertEquation, me));
view.menuSaveAsPicture.on('click', _.bind(me.saveAsPicture, me));
if (!me.permissions.isEditMailMerge && !me.permissions.isEditDiagram && !me.permissions.isEditOle) { if (!me.permissions.isEditMailMerge && !me.permissions.isEditDiagram && !me.permissions.isEditOle) {
var oleEditor = me.getApplication().getController('Common.Controllers.ExternalOleEditor').getView('Common.Views.ExternalOleEditor'); var oleEditor = me.getApplication().getController('Common.Controllers.ExternalOleEditor').getView('Common.Views.ExternalOleEditor');
@ -2140,7 +2142,6 @@ define([
var canEditPoints = this.api && this.api.asc_canEditGeometry(); var canEditPoints = this.api && this.api.asc_canEditGeometry();
documentHolder.menuImgEditPoints.setVisible(canEditPoints); documentHolder.menuImgEditPoints.setVisible(canEditPoints);
documentHolder.menuImgEditPointsSeparator.setVisible(canEditPoints);
canEditPoints && documentHolder.menuImgEditPoints.setDisabled(isObjLocked); canEditPoints && documentHolder.menuImgEditPoints.setDisabled(isObjLocked);
if (showMenu) this.showPopupMenu(documentHolder.imgMenu, {}, event); if (showMenu) this.showPopupMenu(documentHolder.imgMenu, {}, event);
@ -4411,6 +4412,12 @@ define([
} }
}, },
saveAsPicture: function() {
if(this.api) {
this.api.asc_SaveDrawingAsPicture();
}
},
getUserName: function(id){ getUserName: function(id){
var usersStore = SSE.getCollection('Common.Collections.Users'); var usersStore = SSE.getCollection('Common.Collections.Users');
if (usersStore){ if (usersStore){

View file

@ -851,12 +851,14 @@ define([
caption: me.textMacro caption: me.textMacro
}); });
me.menuImgEditPoints = new Common.UI.MenuItem({ me.menuSaveAsPicture = new Common.UI.MenuItem({
caption: me.textEditPoints caption : me.textSaveAsPicture
}); });
me.menuImgEditPointsSeparator = new Common.UI.MenuItem({ var menuSaveAsPictureSeparator = new Common.UI.MenuItem({ caption: '--'});
caption : '--'
me.menuImgEditPoints = new Common.UI.MenuItem({
caption: me.textEditPoints
}); });
this.imgMenu = new Common.UI.Menu({ this.imgMenu = new Common.UI.Menu({
@ -870,17 +872,18 @@ define([
me.menuSignatureEditSign, me.menuSignatureEditSign,
me.menuSignatureEditSetup, me.menuSignatureEditSetup,
me.menuEditSignSeparator, me.menuEditSignSeparator,
me.menuImgEditPoints,
me.menuImgEditPointsSeparator,
me.menuImageArrange, me.menuImageArrange,
me.menuImageAlign, me.menuImageAlign,
me.menuImgRotate, me.menuImgRotate,
me.menuImgMacro, me.menuImgMacro,
menuSaveAsPictureSeparator,
me.menuSaveAsPicture,
me.mnuShapeSeparator, me.mnuShapeSeparator,
me.menuImgCrop, me.menuImgCrop,
me.mnuChartData, me.mnuChartData,
me.mnuChartType, me.mnuChartType,
me.mnuChartEdit, me.mnuChartEdit,
me.menuImgEditPoints,
me.mnuShapeAdvanced, me.mnuShapeAdvanced,
me.menuImgOriginalSize, me.menuImgOriginalSize,
me.menuImgReplace, me.menuImgReplace,
@ -1366,6 +1369,7 @@ define([
textBullets: 'Bullets', textBullets: 'Bullets',
textNumbering: 'Numbering', textNumbering: 'Numbering',
textMacro: 'Assign Macro', textMacro: 'Assign Macro',
textSaveAsPicture: 'Save as picture',
textEditPoints: 'Edit Points', textEditPoints: 'Edit Points',
tipNumCapitalLetters: 'A. B. C.', tipNumCapitalLetters: 'A. B. C.',
tipNumLettersParentheses: 'a) b) c)', tipNumLettersParentheses: 'a) b) c)',

View file

@ -2178,6 +2178,7 @@
"SSE.Views.DocumentHolder.textFromUrl": "From URL", "SSE.Views.DocumentHolder.textFromUrl": "From URL",
"SSE.Views.DocumentHolder.textListSettings": "List Settings", "SSE.Views.DocumentHolder.textListSettings": "List Settings",
"SSE.Views.DocumentHolder.textMacro": "Assign Macro", "SSE.Views.DocumentHolder.textMacro": "Assign Macro",
"SSE.Views.DocumentHolder.textSaveAsPicture": "Save as picture",
"SSE.Views.DocumentHolder.textMax": "Max", "SSE.Views.DocumentHolder.textMax": "Max",
"SSE.Views.DocumentHolder.textMin": "Min", "SSE.Views.DocumentHolder.textMin": "Min",
"SSE.Views.DocumentHolder.textMore": "More functions", "SSE.Views.DocumentHolder.textMore": "More functions",

View file

@ -2178,6 +2178,7 @@
"SSE.Views.DocumentHolder.textFromUrl": "По URL", "SSE.Views.DocumentHolder.textFromUrl": "По URL",
"SSE.Views.DocumentHolder.textListSettings": "Параметры списка", "SSE.Views.DocumentHolder.textListSettings": "Параметры списка",
"SSE.Views.DocumentHolder.textMacro": "Назначить макрос", "SSE.Views.DocumentHolder.textMacro": "Назначить макрос",
"SSE.Views.DocumentHolder.textSaveAsPicture": "Сохранить как рисунок",
"SSE.Views.DocumentHolder.textMax": "Макс", "SSE.Views.DocumentHolder.textMax": "Макс",
"SSE.Views.DocumentHolder.textMin": "Мин", "SSE.Views.DocumentHolder.textMin": "Мин",
"SSE.Views.DocumentHolder.textMore": "Другие функции", "SSE.Views.DocumentHolder.textMore": "Другие функции",