[PE] Add icons to button menu and context menu

This commit is contained in:
Julia Radzhabova 2020-08-20 16:55:06 +03:00
parent 50dec94149
commit 19eb8e41d2
4 changed files with 83 additions and 3 deletions

View file

@ -1419,7 +1419,7 @@ define([
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-add-breakpoint',
disabled: this._locked,
hint: this.tipAddGradientPoint,
hint: this.tipAddGradientPoint
});
this.btnAddGradientStep.on('click', _.bind(this.onAddGradientStep, this));
this.lockedControls.push(this.btnAddGradientStep);

View file

@ -2006,6 +2006,7 @@ define([
if (this.mnuColorSchema == null) {
this.mnuColorSchema = new Common.UI.Menu({
cls: 'shifted-left',
restoreHeight: true
});
}

View file

@ -821,6 +821,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@ -991,6 +992,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@ -1018,6 +1020,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@ -1037,6 +1040,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@ -1066,6 +1070,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@ -1118,6 +1123,7 @@ define([
equation : true,
disabled : me._currentParaObjDisabled,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
{
@ -1774,11 +1780,13 @@ define([
var me = this;
var menuViewCopy = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-copy',
caption: me.textCopy,
value: 'copy'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuViewUndo = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-undo',
caption: me.textUndo
}).on('click', function () {
me.api.Undo();
@ -1789,10 +1797,12 @@ define([
});
var menuViewAddComment = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-menu-comments',
caption: me.addCommentText
}).on('click', _.bind(me.addComment, me));
this.viewModeMenu = new Common.UI.Menu({
cls: 'shifted-right',
initMenu: function (value) {
menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
menuViewUndo.setDisabled(!me.api.asc_getCanUndo() && !me._isDisabled);
@ -1817,6 +1827,7 @@ define([
});
var mnuPreview = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-preview',
caption : me.txtPreview
}).on('click', function(item) {
var current = me.api.getCurrentPage();
@ -1835,6 +1846,7 @@ define([
});
var mnuPrintSelection = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-print',
caption : me.txtPrintSelection
}).on('click', function(item){
if (me.api){
@ -1849,6 +1861,7 @@ define([
});
this.viewModeMenuSlide = new Common.UI.Menu({
cls: 'shifted-right',
initMenu: function (value) {
mnuSelectAll.setDisabled(me.slidesCount<2);
mnuPrintSelection.setVisible(me.mode.canPrint && value.fromThumbs===true);
@ -1888,6 +1901,7 @@ define([
});
var mnuChangeSlide = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-changeslide',
caption : me.txtChangeLayout,
menu : new Common.UI.Menu({
menuAlign: 'tl-tr',
@ -1919,6 +1933,7 @@ define([
});
var mnuPreview = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-preview',
caption : me.txtPreview
}).on('click', function(item) {
var current = me.api.getCurrentPage();
@ -1937,6 +1952,7 @@ define([
});
var mnuPrintSelection = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-print',
caption : me.txtPrintSelection
}).on('click', function(item){
if (me.api){
@ -1951,11 +1967,13 @@ define([
});
var menuSlidePaste = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-paste',
caption : me.textPaste,
value : 'paste'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuSlideSettings = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-menu-slide',
caption : me.textSlideSettings,
value : null
}).on('click', function(item){
@ -1976,6 +1994,7 @@ define([
});
me.slideMenu = new Common.UI.Menu({
cls: 'shifted-right',
initMenu: function(value) {
menuSlidePaste.setVisible(value.fromThumbs!==true);
me.slideMenu.items[1].setVisible(value.fromThumbs===true); // New Slide
@ -2182,23 +2201,30 @@ define([
}
return new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
me.menuTableCellTop = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-align-top',
caption : me.textShapeAlignTop,
checkable : true,
checkmark : false,
toggleGroup : 'popuptablecellalign',
value : Asc.c_oAscVertAlignJc.Top
}).on('click', _.bind(onItemClick, me)),
me.menuTableCellCenter = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-align-middle',
caption : me.textShapeAlignMiddle,
checkable : true,
checkmark : false,
toggleGroup : 'popuptablecellalign',
value : Asc.c_oAscVertAlignJc.Center
}).on('click', _.bind(onItemClick, me)),
me.menuTableCellBottom = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-align-bottom',
caption : me.textShapeAlignBottom,
checkable : true,
checkmark : false,
toggleGroup : 'popuptablecellalign',
value : Asc.c_oAscVertAlignJc.Bottom
}).on('click', _.bind(onItemClick, me))
@ -2231,6 +2257,7 @@ define([
me.menuSpellMoreTable = new Common.UI.MenuItem({
caption : me.moreText,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
restoreHeight: true,
items : []
@ -2245,6 +2272,7 @@ define([
].join(''));
me.langTableMenu = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-ic-doclang',
caption : me.langText,
menu : new Common.UI.MenuSimple({
cls: 'lang-menu',
@ -2290,8 +2318,10 @@ define([
});
me.menuSpellCheckTable = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-ic-docspell',
caption : me.spellcheckText,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
me.menuSpellTable,
@ -2314,6 +2344,7 @@ define([
me.menuSpellMorePara = new Common.UI.MenuItem({
caption : me.moreText,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
restoreHeight: true,
items: []
@ -2321,6 +2352,7 @@ define([
});
me.langParaMenu = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-ic-doclang',
caption : me.langText,
menu : new Common.UI.MenuSimple({
cls: 'lang-menu',
@ -2362,6 +2394,7 @@ define([
});
var menuTableAdvanced = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-menu-table',
caption : me.advancedTableText
}).on('click', function(item) {
if (me.api) {
@ -2395,6 +2428,7 @@ define([
});
var menuImageAdvanced = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-menu-image',
caption : me.advancedImageText
}).on('click', function(item) {
if (me.api){
@ -2437,6 +2471,7 @@ define([
});
var menuShapeAdvanced = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-menu-shape',
caption : me.advancedShapeText
}).on('click', function(item) {
if (me.api){
@ -2468,6 +2503,7 @@ define([
});
var menuParagraphAdvanced = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-paragraph',
caption : me.advancedParagraphText
}).on('click', function(item) {
if (me.api){
@ -2527,6 +2563,7 @@ define([
var menuHyperlinkPara = new Common.UI.MenuItem({
caption : me.hyperlinkText,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
menuEditHyperlinkPara,
@ -2557,6 +2594,7 @@ define([
var menuHyperlinkTable = new Common.UI.MenuItem({
caption : me.hyperlinkText,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
menuEditHyperlinkTable,
@ -2596,6 +2634,7 @@ define([
var menuImgShapeArrange = new Common.UI.MenuItem({
caption : me.txtArrange,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
@ -2671,6 +2710,7 @@ define([
}
return new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
@ -2720,6 +2760,7 @@ define([
});
var menuChartEdit = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-menu-chart',
caption : me.editChartText
}).on('click', _.bind(me.editChartClick, me, undefined));
@ -2739,23 +2780,30 @@ define([
}
return new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
me.menuParagraphTop = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-align-top',
caption : me.textShapeAlignTop,
checkable : true,
checkmark : false,
toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVAlign.Top
}).on('click', _.bind(onItemClick, me)),
me.menuParagraphCenter = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-align-middle',
caption : me.textShapeAlignMiddle,
checkable : true,
checkmark : false,
toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVAlign.Center
}).on('click', _.bind(onItemClick, me)),
me.menuParagraphBottom = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-align-bottom',
caption : me.textShapeAlignBottom,
checkable : true,
checkmark : false,
toggleGroup : 'popupparagraphvalign',
value : Asc.c_oAscVAlign.Bottom
}).on('click', _.bind(onItemClick, me))
@ -2777,6 +2825,7 @@ define([
var menuParagraphDirection = new Common.UI.MenuItem({
caption : me.directionText,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items : [
me.menuParagraphDirectH = new Common.UI.MenuItem({
@ -2837,6 +2886,7 @@ define([
var menuImgReplace = new Common.UI.MenuItem({
caption : me.textReplace,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
@ -2878,22 +2928,27 @@ define([
var menuImgShapeRotate = new Common.UI.MenuItem({
caption : me.textRotate,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
iconCls: 'menu__icon btn-rotate-90',
caption: me.textRotate90,
value : 1
}).on('click', _.bind(onImgRotate, me)),
new Common.UI.MenuItem({
iconCls: 'menu__icon btn-rotate-270',
caption: me.textRotate270,
value : 0
}).on('click', _.bind(onImgRotate, me)),
{ caption: '--' },
new Common.UI.MenuItem({
iconCls: 'menu__icon btn-flip-hor',
caption: me.textFlipH,
value : 1
}).on('click', _.bind(onImgFlip, me)),
new Common.UI.MenuItem({
iconCls: 'menu__icon btn-flip-vert',
caption: me.textFlipV,
value : 0
}).on('click', _.bind(onImgFlip, me))
@ -2915,6 +2970,7 @@ define([
me.menuImgCrop = new Common.UI.MenuItem({
caption : me.textCrop,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
@ -2937,11 +2993,13 @@ define([
/** coauthoring begin **/
var menuAddCommentPara = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-menu-comments',
caption : me.addCommentText
}).on('click', _.bind(me.addComment, me));
menuAddCommentPara.hide();
var menuAddCommentTable = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-menu-comments',
caption : me.addCommentText
}).on('click', _.bind(me.addComment, me));
menuAddCommentTable.hide();
@ -2952,6 +3010,7 @@ define([
menuCommentSeparatorImg.hide();
var menuAddCommentImg = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-menu-comments',
caption : me.addCommentText
}).on('click', _.bind(me.addComment, me));
menuAddCommentImg.hide();
@ -2962,11 +3021,13 @@ define([
}).on('click', _.bind(me.addToLayout, me));
var menuParaCopy = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-copy',
caption : me.textCopy,
value : 'copy'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuParaPaste = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-paste',
caption : me.textPaste,
value : 'paste'
}).on('click', _.bind(me.onCutCopyPaste, me));
@ -2977,11 +3038,13 @@ define([
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuImgCopy = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-copy',
caption : me.textCopy,
value : 'copy'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuImgPaste = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-paste',
caption : me.textPaste,
value : 'paste'
}).on('click', _.bind(me.onCutCopyPaste, me));
@ -2992,11 +3055,13 @@ define([
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuTableCopy = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-copy',
caption : me.textCopy,
value : 'copy'
}).on('click', _.bind(me.onCutCopyPaste, me));
var menuTablePaste = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-paste',
caption : me.textPaste,
value : 'paste'
}).on('click', _.bind(me.onCutCopyPaste, me));
@ -3019,6 +3084,7 @@ define([
}).on('click', _.bind(me.addToLayout, me));
me.textMenu = new Common.UI.Menu({
cls: 'shifted-right',
initMenu: function(value){
var isInShape = (value.shapeProps && !_.isNull(value.shapeProps.value));
var isInChart = (value.chartProps && !_.isNull(value.chartProps.value));
@ -3144,6 +3210,7 @@ define([
});
me.tableMenu = new Common.UI.Menu({
cls: 'shifted-right',
initMenu: function(value){
// table properties
if (_.isUndefined(value.tableProps))
@ -3240,6 +3307,7 @@ define([
new Common.UI.MenuItem({
caption : me.selectText,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
@ -3260,6 +3328,7 @@ define([
{
caption : me.insertText,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
style : 'width: 100px',
items : [
@ -3293,6 +3362,7 @@ define([
new Common.UI.MenuItem({
caption : me.deleteText,
menu : new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
items: [
new Common.UI.MenuItem({
@ -3337,6 +3407,7 @@ define([
});
me.pictureMenu = new Common.UI.Menu({
cls: 'shifted-right',
initMenu: function(value){
if (me.api) {
mnuUnGroupImg.setDisabled(!me.api.canUnGroup());
@ -3576,6 +3647,7 @@ define([
if (!menu) {
this.placeholderMenuTable = menu = new Common.UI.Menu({
cls: 'shifted-left',
items: [
{template: _.template('<div id="id-placeholder-menu-tablepicker" class="dimension-picker" style="margin: 5px 10px;"></div>')},
{caption: me.mniCustomTable, value: 'custom'}

View file

@ -324,6 +324,7 @@ define([
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
split: true,
menu: new Common.UI.Menu({
cls: 'shifted-left',
items: [
{template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 220px; margin: 10px;"></div>')},
{template: _.template('<a id="id-toolbar-menu-new-fontcolor" style="padding-left:12px;">' + me.textNewColor + '</a>')}
@ -521,6 +522,7 @@ define([
caption: me.capInsertTable,
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
menu: new Common.UI.Menu({
cls: 'shifted-left',
items: [
{template: _.template('<div id="id-toolbar-menu-tablepicker" class="dimension-picker" style="margin: 5px 10px;"></div>')},
{caption: me.mniCustomTable, value: 'custom'}
@ -636,6 +638,7 @@ define([
iconCls: 'toolbar__icon btn-colorschemas',
lock: [_set.themeLock, _set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
menu: new Common.UI.Menu({
cls: 'shifted-left',
items: [],
restoreHeight: true
})
@ -676,6 +679,7 @@ define([
iconCls: 'toolbar__icon shape-align-left',
lock: [_set.slideDeleted, _set.shapeLock, _set.lostConnect, _set.noSlides, _set.noObjectSelected, _set.disableOnStart],
menu: new Common.UI.Menu({
cls: 'shifted-right',
items: [
{
caption: me.textShapeAlignLeft,
@ -1106,9 +1110,10 @@ define([
this.btnMarkers.setMenu(
new Common.UI.Menu({
cls: 'shifted-left',
style: 'min-width: 139px',
items: [
{template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 16px;"></div>')},
{template: _.template('<div id="id-toolbar-menu-markers" class="menu-markers" style="width: 139px; margin: 0 9px;"></div>')},
this.mnuMarkerSettings = new Common.UI.MenuItem({
caption: this.textListSettings,
value: 'settings'
@ -1119,8 +1124,9 @@ define([
this.btnNumbers.setMenu(
new Common.UI.Menu({
cls: 'shifted-left',
items: [
{template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 16px;"></div>')},
{template: _.template('<div id="id-toolbar-menu-numbering" class="menu-markers" style="width: 185px; margin: 0 9px;"></div>')},
this.mnuNumberSettings = new Common.UI.MenuItem({
caption: this.textListSettings,
value: 'settings'
@ -1296,6 +1302,7 @@ define([
if (mnuColorSchema == null) {
mnuColorSchema = new Common.UI.Menu({
cls: 'shifted-left',
restoreHeight: true
});
}