From 4e4f6f94bc4772fa0884a82b60aebc6aea213851 Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Tue, 13 Sep 2022 19:05:22 +0300 Subject: [PATCH] [DE] Add icons to smart arts --- apps/common/main/lib/util/define.js | 16 ++++++++-------- apps/documenteditor/main/app/view/Toolbar.js | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/common/main/lib/util/define.js b/apps/common/main/lib/util/define.js index 844df4e9e..71f589839 100644 --- a/apps/common/main/lib/util/define.js +++ b/apps/common/main/lib/util/define.js @@ -1501,14 +1501,14 @@ define(function(){ 'use strict'; getSmartArtGroupData: function(headername) { return [ - {id: 'menu-smart-art-group-list', caption: this.textList}, - {id: 'menu-smart-art-group-process', caption: this.textProcess}, - {id: 'menu-smart-art-group-cycle', caption: this.textCycle}, - {id: 'menu-smart-art-group-hierarchy', caption: this.textHierarchy}, - {id: 'menu-smart-art-group-relationship', caption: this.textRelationship}, - {id: 'menu-smart-art-group-matrix', caption: this.textMatrix}, - {id: 'menu-smart-art-group-pyramid', caption: this.textPyramid}, - {id: 'menu-smart-art-group-picture', caption: this.textPicture}, + {id: 'menu-smart-art-group-list', caption: this.textList, icon: 'smart-list'}, + {id: 'menu-smart-art-group-process', caption: this.textProcess, icon: 'smart-process'}, + {id: 'menu-smart-art-group-cycle', caption: this.textCycle, icon: 'smart-cycle'}, + {id: 'menu-smart-art-group-hierarchy', caption: this.textHierarchy, icon: 'smart-hierarchy'}, + {id: 'menu-smart-art-group-relationship', caption: this.textRelationship, icon: 'smart-relationship'}, + {id: 'menu-smart-art-group-matrix', caption: this.textMatrix, icon: 'smart-matrix'}, + {id: 'menu-smart-art-group-pyramid', caption: this.textPyramid, icon: 'smart-pyramid'}, + {id: 'menu-smart-art-group-picture', caption: this.textPicture, icon: 'btn-menu-image'}, ]; }, diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 3505ed369..e4fd6af3d 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -783,7 +783,7 @@ define([ this.btnInsertSmartArt = new Common.UI.Button({ id: 'tlbtn-insertsmartart', cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon', + iconCls: 'toolbar__icon smart-art', lock: [_set.paragraphLock, _set.headerLock, _set.inEquation, _set.controlPlain, _set.contentLock, _set.inFootnote, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart], caption: me.capBtnInsSmartArt, @@ -2225,6 +2225,7 @@ define([ me.btnInsertSmartArt.menu.addItem({ caption: item.caption, value: item.id, + iconCls: 'menu__icon ' + item.icon, menu: new Common.UI.Menu({ items: [ {template: _.template('')}