diff --git a/apps/presentationeditor/main/app/controller/DocumentHolder.js b/apps/presentationeditor/main/app/controller/DocumentHolder.js index 575555f5e..4e25af86b 100644 --- a/apps/presentationeditor/main/app/controller/DocumentHolder.js +++ b/apps/presentationeditor/main/app/controller/DocumentHolder.js @@ -443,6 +443,8 @@ define([ if (event.get_Type() == Asc.c_oAscContextMenuTypes.Thumbnails) { showPoint[0] -= 3; showPoint[1] -= 3; + } else { + value && (value.guideId = event.get_Guide()); } if (!menu.rendered) { @@ -2118,7 +2120,9 @@ define([ }, onGuidesClick: function(menu, item) { - if (item.value === 'add-vert' || item.value === 'add-hor') + if (item.value == 'del-guide' && item.options.guideId) + this.api.asc_deleteGuide(item.options.guideId); + else if (item.value === 'add-vert' || item.value === 'add-hor') this.documentHolder.fireEvent('guides:add', [item.value]); else if (item.value === 'clear') this.documentHolder.fireEvent('guides:clear'); diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index e78622466..f7ee85aed 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -968,6 +968,7 @@ define([ { caption: '--'}, { caption: me.textAddVGuides, value: 'add-vert' }, { caption: me.textAddHGuides, value: 'add-hor' }, + { caption: me.textDeleteGuide, value: 'del-guide' }, { caption: '--'}, { caption: me.textSmartGuides, value: 'smart', checkable: true }, { caption: me.textClearGuides, value: 'clear' } @@ -1038,9 +1039,11 @@ define([ me.mnuPreview.setVisible(value.fromThumbs===true); if (!value.fromThumbs) { - me.mnuGuides.menu.items[6].setDisabled(!me.api.asc_canClearGuides()); me.mnuGuides.menu.items[0].setChecked(me.api.asc_getShowGuides(), true); - me.mnuGuides.menu.items[5].setChecked(me.api.asc_getShowSmartGuides(), true); + me.mnuGuides.menu.items[4].setVisible(!!value.guideId); + me.mnuGuides.menu.items[4].options.guideId = value.guideId; + me.mnuGuides.menu.items[6].setChecked(me.api.asc_getShowSmartGuides(), true); + me.mnuGuides.menu.items[7].setDisabled(!me.api.asc_canClearGuides()); me.mnuGridlines.menu.items[0].setChecked(me.api.asc_getShowGridlines(), true); me.mnuGridlines.menu.items[1].setChecked(me.api.asc_getSnapToGrid(), true); @@ -2540,7 +2543,8 @@ define([ textCustom: 'Custom', textManyGrids: '{0} grids per cm', textFewGrids: '{0} grids per cm', - textRulers: 'Rulers' + textRulers: 'Rulers', + textDeleteGuide: 'Delete Guide' }, PE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index d3cd0b013..46b88757e 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -1616,8 +1616,8 @@ "PE.Views.DocumentHolder.textGuides": "Guides", "PE.Views.DocumentHolder.tipGuides": "Show guides", "PE.Views.DocumentHolder.textShowGuides": "Show Guides", - "PE.Views.DocumentHolder.textAddVGuides": "Add vertical guide", - "PE.Views.DocumentHolder.textAddHGuides": "Add horizontal guide", + "PE.Views.DocumentHolder.textAddVGuides": "Add Vertical Guide", + "PE.Views.DocumentHolder.textAddHGuides": "Add Horizontal Guide", "PE.Views.DocumentHolder.textSmartGuides": "Smart Guides", "PE.Views.DocumentHolder.textClearGuides": "Clear Guides", "PE.Views.DocumentHolder.textGridlines": "Gridlines", @@ -1628,6 +1628,7 @@ "PE.Views.DocumentHolder.textManyGrids": "{0} grids per cm", "PE.Views.DocumentHolder.textFewGrids": "{0} grids per cm", "PE.Views.DocumentHolder.textRulers": "Rulers", + "PE.Views.DocumentHolder.textDeleteGuide": "Delete Guide", "PE.Views.DocumentPreview.goToSlideText": "Go to Slide", "PE.Views.DocumentPreview.slideIndexText": "Slide {0} of {1}", "PE.Views.DocumentPreview.txtClose": "Close slideshow",