diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index f236e5c277..71a4483ac5 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -282,6 +282,7 @@ define([ split: !this.appConfig.canUseReviewPermissions, iconCls: 'toolbar__icon btn-review-save', lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview, _set.viewMode], + action: 'review-accept', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -294,6 +295,7 @@ define([ split: !this.appConfig.canUseReviewPermissions, iconCls: 'toolbar__icon btn-review-deny', lock: [_set.reviewChangelock, _set.isReviewOnly, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview, _set.viewMode], + action: 'review-reject', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -307,6 +309,7 @@ define([ split: true, iconCls: 'toolbar__icon btn-compare', lock: [_set.hasCoeditingUsers, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], + action: 'compare-document', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -319,6 +322,7 @@ define([ split: true, iconCls: 'toolbar__icon btn-combine', lock: [_set.hasCoeditingUsers, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], + action: 'combine-document', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -331,6 +335,7 @@ define([ lock: [_set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.docLockReview, _set.viewMode], caption: this.txtTurnon, split: !this.appConfig.isReviewOnly, + action: 'track-changes', enableToggle: true, dataHint: '1', dataHintDirection: 'bottom', @@ -413,6 +418,7 @@ define([ } ] }), + action: 'review-display-mode', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -441,6 +447,7 @@ define([ lock: [_set.viewFormMode, _set.lostConnect, _set.docLockView, _set.viewMode], caption: this.txtCoAuthMode, menu: true, + action: 'co-edit-mode', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -486,6 +493,7 @@ define([ split: true, iconCls: 'toolbar__icon btn-rem-comment', lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect, _set.docLockView, _set.docLockForms, _set.viewMode, _set.slideMasterMode], + action: 'comment-remove', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -497,6 +505,7 @@ define([ split: true, iconCls: 'toolbar__icon btn-resolve-all', lock: [_set.previewReviewMode, _set.viewFormMode, _set.hideComments, _set['Objects'], _set.lostConnect, _set.docLockView, _set.docLockForms, _set.viewMode, _set.slideMasterMode], + action: 'comment-resolve', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -520,7 +529,8 @@ define([ {caption: this.mniMMFromUrl, value: 'url'}, {caption: this.mniMMFromStorage, value: 'storage'} ] - }) + }), + action: 'mail-merge' }); this.mnuMailRecepients = this.btnMailRecepients.menu; this.lockedControls.push(this.btnMailRecepients); @@ -843,6 +853,7 @@ define([ toggleGroup: 'menuTurnReviewStb' } ]}), + action: 'track-changes', dataHint: '0', dataHintDirection: 'top', dataHintOffset: '2, -16' diff --git a/apps/documenteditor/main/app/view/Links.js b/apps/documenteditor/main/app/view/Links.js index dc9ee207de..0ea708f71b 100644 --- a/apps/documenteditor/main/app/view/Links.js +++ b/apps/documenteditor/main/app/view/Links.js @@ -168,10 +168,10 @@ define([ this.btnsContents = Common.Utils.injectButtons($host.find('.btn-slot.btn-contents'), '', 'toolbar__icon btn-big-contents', me.capBtnInsContents, [_set.inHeader, _set.richEditLock, _set.plainEditLock, _set.richDelLock, _set.plainDelLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], - true, true, undefined, '1', 'bottom', 'small'); + true, true, undefined, '1', 'bottom', 'small', undefined, 'table-of-contents'); this.btnsNotes = Common.Utils.injectButtons($host.find('.btn-slot.slot-notes'), '', 'toolbar__icon btn-notes', me.capBtnInsFootnote, [_set.paragraphLock, _set.inEquation, _set.inImage, _set.inHeader, _set.controlPlain, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], - true, true, undefined, '1', 'bottom', 'small'); + true, true, undefined, '1', 'bottom', 'small', undefined, 'notes'); this.btnsHyperlink = Common.Utils.injectButtons($host.find('.btn-slot.slot-inshyperlink'), '', 'toolbar__icon btn-big-inserthyperlink', me.capBtnInsLink, [_set.paragraphLock, _set.headerLock, _set.hyperlinkLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], undefined, undefined, undefined, '1', 'bottom', 'small'); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index cc31745741..ef98695f2a 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -525,6 +525,7 @@ define([ id: 'id-toolbar-btn-linespace', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-linespace', + action: 'line-space', lock: [_set.noParagraphSelected, _set.paragraphLock, _set.headerLock, _set.richEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.fixedForm, _set.viewMode], menu: new Common.UI.Menu({ style: 'min-width: 60px;', @@ -648,6 +649,7 @@ define([ lock: [ _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], enableToggle: true, split: true, + action: 'hidden-chars', menu: new Common.UI.Menu({ style: 'min-width: 60px;', items: [ @@ -735,6 +737,7 @@ define([ lock: [_set.headerLock, _set.richEditLock, _set.plainEditLock, _set.inEquation, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.cantAddTable, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], caption: me.capBtnInsTable, + action: 'insert-table', menu: new Common.UI.Menu({ items: [ {template: _.template('
')}, @@ -765,6 +768,7 @@ define([ {caption: this.mniImageFromStorage, value: 'storage'} ] }), + action: 'insert-image', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -779,6 +783,7 @@ define([ lock: [ _set.paragraphLock, _set.headerLock, _set.richEditLock, _set.plainEditLock, _set.controlPlain, _set.richDelLock, _set.plainDelLock, _set.contentLock, _set.chartLock, _set.cantAddChart, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], menu: true, + action: 'insert-chart', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -794,6 +799,7 @@ define([ caption: me.capBtnInsTextbox, enableToggle: true, split: true, + action: 'insert-text', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small', @@ -814,6 +820,7 @@ define([ {template: _.template('')} ] }), + action: 'insert-textart', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -827,6 +834,7 @@ define([ lock: [ _set.previewReviewMode, _set.viewFormMode, _set.inEquation, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], caption: me.capBtnInsHeader, menu: true, + action: 'edit-header', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -888,6 +896,7 @@ define([ caption: me.capBtnInsShape, enableToggle: true, menu: new Common.UI.Menu({cls: 'menu-shapes menu-insert-shape'}), + action: 'insert-shape', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -902,6 +911,7 @@ define([ _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], caption: me.capBtnInsSmartArt, menu: true, + action: 'insert-smartart', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -917,6 +927,7 @@ define([ caption: me.capBtnInsEquation, split: true, menu: new Common.UI.Menu({cls: 'menu-shapes'}), + action: 'insert-equation', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -940,6 +951,7 @@ define([ }) ] }), + action: 'insert-symbol', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -985,6 +997,7 @@ define([ this.mnuDropCapAdvanced = new Common.UI.MenuItem({caption: this.mniEditDropCap}) ] }), + action: 'insert-dropcap', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1069,6 +1082,7 @@ define([ } ] }), + action: 'insert-ccontrols', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1130,6 +1144,7 @@ define([ {caption: this.textColumnsCustom, value: 'advanced'} ] }), + action: 'insert-columns', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1163,6 +1178,7 @@ define([ } ] }), + action: 'page-orient', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1233,6 +1249,7 @@ define([ {caption: this.textPageMarginsCustom, value: 'advanced'} ] }), + action: 'page-margins', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1364,6 +1381,7 @@ define([ {caption: this.textPageSizeCustom, value: 'advanced'} ] }), + action: 'page-size', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1416,6 +1434,7 @@ define([ } ] }), + action: 'line-numbers', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1450,6 +1469,7 @@ define([ } ] }), + action: 'change-hyphenation', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1489,6 +1509,7 @@ define([ items: [], restoreHeight: true }), + action: 'theme-colors', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1501,6 +1522,7 @@ define([ lock: [_set.imageLock, _set.contentLock, _set.inImageInline, _set.noObjectSelected, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], caption: me.capImgAlign, menu: true, + action: 'object-align', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1512,6 +1534,7 @@ define([ lock: [_set.imageLock, _set.contentLock, _set.inImageInline, _set.noObjectSelected, _set.cantGroup, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], caption: me.capImgGroup, menu: true, + action: 'object-group', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1523,6 +1546,7 @@ define([ caption: me.capImgForward, split: true, menu: true, + action: 'object-forward', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1534,6 +1558,7 @@ define([ caption: me.capImgBackward, split: true, menu: true, + action: 'object-backward', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1544,6 +1569,7 @@ define([ lock: [_set.cantWrap, _set.imageLock, _set.contentLock, _set.noObjectSelected, _set.lostConnect, _set.previewReviewMode, _set.viewFormMode, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], caption: me.capImgWrapping, menu: true, + action: 'object-wrap', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1554,6 +1580,7 @@ define([ iconCls: 'toolbar__icon btn-watermark', lock: [_set.headerLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode], caption: me.capBtnWatermark, + action: 'insert-watermark', menu: new Common.UI.Menu({ cls: 'ppm-toolbar', items: [ @@ -2077,7 +2104,7 @@ define([ [Common.enumLock.paragraphLock, Common.enumLock.headerLock, Common.enumLock.richEditLock, Common.enumLock.plainEditLock, Common.enumLock.inEquation, Common.enumLock.richDelLock, Common.enumLock.plainDelLock, Common.enumLock.inHeader, Common.enumLock.inFootnote, Common.enumLock.inControl, Common.enumLock.cantPageBreak, Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.lostConnect, Common.enumLock.disableOnStart, Common.enumLock.docLockView, Common.enumLock.docLockForms, Common.enumLock.docLockComments, Common.enumLock.viewMode], - true, true, undefined, '1', 'bottom', 'small'); + true, true, undefined, '1', 'bottom', 'small', undefined, 'page-break'); Array.prototype.push.apply(this.paragraphControls, this.btnsPageBreak); Array.prototype.push.apply(this.lockControls, this.btnsPageBreak); Common.UI.LayoutManager.addControls(this.btnsPageBreak); diff --git a/apps/pdfeditor/main/app/view/InsTab.js b/apps/pdfeditor/main/app/view/InsTab.js index a55e26b8e7..ee75bb95c0 100644 --- a/apps/pdfeditor/main/app/view/InsTab.js +++ b/apps/pdfeditor/main/app/view/InsTab.js @@ -141,6 +141,7 @@ define([ // {caption: me.mniInsertSSE, value: 'sse'} ] }), + action: 'insert-table', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -167,6 +168,7 @@ define([ lock: [_set.lostConnect, _set.disableOnStart], caption: me.capBtnInsSmartArt, menu: true, + action: 'insert-smartart', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -181,6 +183,7 @@ define([ lock: [_set.paragraphLock, _set.lostConnect, _set.disableOnStart], split: true, menu: new Common.UI.Menu({cls: 'menu-shapes'}), + action: 'insert-equation', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -203,6 +206,7 @@ define([ }) ] }), + action: 'insert-symbol', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -233,6 +237,7 @@ define([ {template: _.template('')} ] }), + action: 'insert-textart', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -275,20 +280,6 @@ define([ }); me.lockedControls.push(me.btnInsSlideNum); */ - me.btnInsertShape = new Common.UI.Button({ - id: 'tlbtn-insertshape', - cls: 'btn-toolbar x-huge icon-top', - iconCls: 'toolbar__icon btn-insertshape', - caption: me.capInsertShape, - lock: [_set.lostConnect, _set.disableOnStart], - menu: true, - enableToggle: true, - dataHint: '1', - dataHintDirection: 'bottom', - dataHintOffset: 'small' - }); - me.lockedControls.push(me.btnInsertShape); - me.cmbInsertShape = new Common.UI.ComboDataViewShape({ cls: 'combo-styles shapes', itemWidth: 20, @@ -333,13 +324,13 @@ define([ if (this.toolbar && this.toolbar.$el) { this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg').add(this.toolbar.$el.find('.slot-insertimg')), 'tlbtn-insertimage-', 'toolbar__icon btn-insertimage', this.capInsertImage, - [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], false, true, undefined, '1', 'bottom', 'small'); + [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], false, true, undefined, '1', 'bottom', 'small', undefined, 'insert-image'); this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext').add(this.toolbar.$el.find('.slot-instext')), 'tlbtn-inserttext-', 'toolbar__icon btn-big-text', this.capInsertText, - [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], true, false, true, '1', 'bottom', 'small'); + [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], true, false, true, '1', 'bottom', 'small', undefined, 'insert-text'); this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape').add(this.toolbar.$el.find('.slot-insertshape')), 'tlbtn-insertshape-', 'toolbar__icon btn-insertshape', this.capInsertShape, - [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], false, true, true, '1', 'bottom', 'small'); + [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], false, true, true, '1', 'bottom', 'small', undefined, 'insert-shape'); this.btnsAddPage = Common.Utils.injectButtons($host.find('.slot-inspage').add(this.toolbar.$el.find('.slot-inspage')), 'tlbtn-insertpage-', 'toolbar__icon btn-blankpage', this.capInsPage, - [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], true, true, false, '1', 'bottom', 'small'); + [Common.enumLock.lostConnect, Common.enumLock.disableOnStart], true, true, false, '1', 'bottom', 'small', undefined, 'insert-page'); } var created = this.btnsInsertImage.concat(this.btnsInsertText, this.btnsInsertShape, this.btnsAddPage); diff --git a/apps/pdfeditor/main/app/view/Toolbar.js b/apps/pdfeditor/main/app/view/Toolbar.js index 0395b77232..1c63ef6dd1 100644 --- a/apps/pdfeditor/main/app/view/Toolbar.js +++ b/apps/pdfeditor/main/app/view/Toolbar.js @@ -337,6 +337,7 @@ define([ id: 'id-toolbar-btn-case', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-change-case', + action: 'change-case', lock: [_set.paragraphLock, _set.lostConnect, _set.noTextSelected, _set.shapeLock, _set.disableOnStart], menu: new Common.UI.Menu({ items: [ @@ -460,6 +461,7 @@ define([ } ] }), + action: 'align-horizontal', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -505,6 +507,7 @@ define([ } ] }), + action: 'align-vertical', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -550,6 +553,7 @@ define([ {caption: '3.0', value: 3.0, checkable: true, toggleGroup: 'linesize'} ] }), + action: 'line-space', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -593,6 +597,7 @@ define([ {caption: this.textColumnsCustom, value: 'advanced'} ] }), + action: 'insert-columns', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -674,6 +679,7 @@ define([ this.mniAlignObjects ] }), + action: 'object-align', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -721,6 +727,7 @@ define([ // }) ] }), + action: 'object-arrange', dataHint: '1', dataHintDirection: 'top', dataHintOffset: '0, -6' @@ -756,6 +763,7 @@ define([ {caption: this.txtRotateLeft, iconCls: 'menu__icon btn-rotate-270', value: -90} ] }), + action: 'rotate-page', }); arr.push(this.btnRotatePage); Common.UI.LayoutManager.addControls(arr); @@ -813,6 +821,7 @@ define([ caption: this.capBtnTextComment, menu: true, split: true, + action: 'insert-text-comment', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js index b6cc452abe..27c2af6a2b 100644 --- a/apps/presentationeditor/main/app/view/Animation.js +++ b/apps/presentationeditor/main/app/view/Animation.js @@ -287,6 +287,7 @@ define([ caption: this.txtAddEffect, iconCls: 'toolbar__icon icon btn-add-animation', menu: true, + action: 'add-animation', lock: [_set.slideDeleted, _set.noSlides, _set.noGraphic, _set.timingLock], dataHint: '1', dataHintDirection: 'bottom', diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 11f94102b1..e86dd2ff60 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -170,6 +170,7 @@ define([ iconCls: 'toolbar__icon btn-changeslide', lock: [_set.menuFileOpen, _set.slideDeleted, _set.slideLock, _set.lostConnect, _set.noSlides, _set.disableOnStart], menu: true, + action: 'change-slide', dataHint: '1', dataHintDirection: 'top', dataHintOffset: '0, -6' @@ -195,6 +196,7 @@ define([ }) ] }), + action: 'preview-slide', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -16' @@ -477,6 +479,7 @@ define([ id: 'id-toolbar-btn-case', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-change-case', + action: 'change-case', lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], menu: new Common.UI.Menu({ items: [ @@ -607,6 +610,7 @@ define([ } ] }), + action: 'align-horizontal', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -651,6 +655,7 @@ define([ } ] }), + action: 'align-vertical', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -695,6 +700,7 @@ define([ me.mnuLineSpaceOptions = new Common.UI.MenuItem({caption: me.textLineSpaceOptions, value: 'options'}) ]) }), + action: 'line-space', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -737,6 +743,7 @@ define([ {caption: this.textColumnsCustom, value: 'advanced'} ] }), + action: 'insert-columns', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -751,6 +758,7 @@ define([ lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart, _set.inSlideMaster], menu: true, split: true, + action: 'insert-placeholder', enableToggle: true, currentType: 1, dataHint: '1', @@ -803,6 +811,7 @@ define([ {caption: me.mniInsertSSE, value: 'sse'} ] }), + action: 'insert-table', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -816,6 +825,7 @@ define([ caption: me.capInsertChart, lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], menu: true, + action: 'insert-chart', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -829,6 +839,7 @@ define([ lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], caption: me.capBtnInsSmartArt, menu: true, + action: 'insert-smartart', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -843,6 +854,7 @@ define([ lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.disableOnStart], split: true, menu: new Common.UI.Menu({cls: 'menu-shapes'}), + action: 'insert-equation', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -865,6 +877,7 @@ define([ }) ] }), + action: 'insert-symbol', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -895,6 +908,7 @@ define([ {template: _.template('')} ] }), + action: 'insert-textart', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -969,6 +983,7 @@ define([ items: [], restoreHeight: true }), + action: 'theme-colors', dataHint: '1', dataHintDirection: 'top', dataHintOffset: '0, -6' @@ -1049,6 +1064,7 @@ define([ me.mniAlignObjects ] }), + action: 'object-align', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -1096,6 +1112,7 @@ define([ }) ] }), + action: 'object-arrange', dataHint: '1', dataHintDirection: 'top', dataHintOffset: '0, -6' @@ -1128,6 +1145,7 @@ define([ } ] }), + action: 'slide-size', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -1373,11 +1391,11 @@ define([ } this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg'), 'tlbtn-insertimage-', 'toolbar__icon btn-insertimage', this.capInsertImage, - [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], false, true, undefined, '1', 'bottom', 'small'); + [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], false, true, undefined, '1', 'bottom', 'small', undefined, 'insert-image'); this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', 'toolbar__icon btn-big-text', this.capInsertText, - [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], true, false, true, '1', 'bottom', 'small'); + [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], true, false, true, '1', 'bottom', 'small', undefined, 'insert-text'); this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape'), 'tlbtn-insertshape-', 'toolbar__icon btn-insertshape', this.capInsertShape, - [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], false, true, true, '1', 'bottom', 'small'); + [Common.enumLock.slideDeleted, Common.enumLock.lostConnect, Common.enumLock.noSlides, Common.enumLock.disableOnStart], false, true, true, '1', 'bottom', 'small', undefined, 'insert-shape'); this.btnsAddSlide = Common.Utils.injectButtons($host.find('.slot-addslide'), 'tlbtn-addslide-', 'toolbar__icon btn-addslide', this.capAddSlide, [Common.enumLock.menuFileOpen, Common.enumLock.lostConnect, Common.enumLock.disableOnStart], true, true, undefined, '1', 'bottom', 'small', undefined, 'add-slide'); diff --git a/apps/presentationeditor/main/app/view/ViewTab.js b/apps/presentationeditor/main/app/view/ViewTab.js index 9633f1ce1a..f1fc95842f 100644 --- a/apps/presentationeditor/main/app/view/ViewTab.js +++ b/apps/presentationeditor/main/app/view/ViewTab.js @@ -335,6 +335,7 @@ define([ pressed: Common.localStorage.getBool("pe-settings-showguides"), split: true, menu: true, + action: 'view-guides', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -351,6 +352,7 @@ define([ pressed: Common.localStorage.getBool("pe-settings-showgrid"), split: true, menu: true, + action: 'view-gridlines', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' diff --git a/apps/spreadsheeteditor/main/app/view/DataTab.js b/apps/spreadsheeteditor/main/app/view/DataTab.js index 8bdfba9ebc..7f1973b3d0 100644 --- a/apps/spreadsheeteditor/main/app/view/DataTab.js +++ b/apps/spreadsheeteditor/main/app/view/DataTab.js @@ -139,6 +139,7 @@ define([ caption: this.capDataFromText, // menu: !this.toolbar.mode.isDesktopApp, menu: true, + action: 'import-data', disabled: true, lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.wbLock, _set.lostConnect, _set.coAuth, _set.wsLock], dataHint: '1', @@ -154,6 +155,7 @@ define([ caption: this.capBtnGroup, split: true, menu: true, + action: 'cell-group', disabled: true, lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth, _set.wsLock, _set.userProtected], dataHint: '1', @@ -169,6 +171,7 @@ define([ caption: this.capBtnUngroup, split: true, menu: true, + action: 'cell-ungroup', disabled: true, lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth, _set.wsLock, _set.userProtected], dataHint: '1', diff --git a/apps/spreadsheeteditor/main/app/view/FormulaTab.js b/apps/spreadsheeteditor/main/app/view/FormulaTab.js index 9deb0ff5ac..79efed4e77 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaTab.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaTab.js @@ -112,6 +112,7 @@ define([ hint: formulaDialog.sCategoryFinancial, menu: true, split: false, + action: 'formula-financial', disabled: true, lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems, _set.userProtected], dataHint: '1', @@ -130,6 +131,7 @@ define([ menu: true, split: false, disabled: true, + action: 'formula-logical', lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems, _set.userProtected], dataHint: '1', dataHintDirection: 'bottom', @@ -146,6 +148,7 @@ define([ hint: formulaDialog.sCategoryTextAndData, menu: true, split: false, + action: 'formula-textdata', disabled: true, lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems, _set.userProtected], dataHint: '1', @@ -163,6 +166,7 @@ define([ hint: formulaDialog.sCategoryDateAndTime, menu: true, split: false, + action: 'formula-datetime', disabled: true, lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems, _set.userProtected], dataHint: '1', @@ -180,6 +184,7 @@ define([ hint: formulaDialog.sCategoryLookupAndReference, menu: true, split: false, + action: 'formula-reference', disabled: true, lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems, _set.userProtected], dataHint: '1', @@ -197,6 +202,7 @@ define([ hint: formulaDialog.sCategoryMathematic, menu: true, split: false, + action: 'formula-math', disabled: true, lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems, _set.userProtected], dataHint: '1', @@ -214,6 +220,7 @@ define([ hint: this.txtRecent, menu: true, split: false, + action: 'formula-recent', disabled: true, lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems, _set.userProtected], dataHint: '1', @@ -230,6 +237,7 @@ define([ caption: this.txtAutosum, hint: [this.txtAutosumTip + Common.Utils.String.platformKey('Alt+='), this.txtFormulaTip + Common.Utils.String.platformKey('Shift+F3')], split: true, + action: 'autosum', disabled: true, lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.userProtected], menu: new Common.UI.Menu({ @@ -277,6 +285,7 @@ define([ hint: this.txtMore, menu: true, split: false, + action: 'formula-more', disabled: true, lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems, _set.userProtected], dataHint: '1', @@ -293,6 +302,7 @@ define([ caption: this.txtCalculation, split: true, menu: true, + action: 'calculate', disabled: true, lock: [_set.editCell, _set.selRangeEdit, _set.lostConnect, _set.coAuth], dataHint: '1', @@ -330,6 +340,7 @@ define([ } ] }), + action: 'named-ranges', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js index ff26ddfb06..c71c42fe81 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js @@ -223,6 +223,7 @@ define([ disabled : true, lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock, _set.wsLock], menu : true, + action: 'pivot-layout', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -236,6 +237,7 @@ define([ disabled : true, lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock, _set.wsLock], menu : true, + action: 'pivot-blank-rows', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -249,6 +251,7 @@ define([ disabled : true, lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock, _set.wsLock], menu : true, + action: 'pivot-subtotals', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -262,6 +265,7 @@ define([ disabled : true, lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock, _set.wsLock], menu : true, + action: 'pivot-grand-totals', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -274,6 +278,7 @@ define([ caption: this.txtRefresh, disabled : true, split : true, + action: 'pivot-refresh', lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock, _set.wsLock], dataHint : '1', dataHintDirection: 'bottom', diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index cde85432a5..7d290ef0ab 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -886,6 +886,7 @@ define([ id: 'id-toolbar-btn-case', cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-change-case', + action: 'change-case', lock: [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect, _set.wsLockFormat, _set.userProtected], menu: new Common.UI.Menu({ items: [ @@ -1022,6 +1023,7 @@ define([ lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set['FormatCells'], _set.userProtected], split : true, menu : true, + action: 'cell-borders', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: '0, -16' @@ -1103,6 +1105,7 @@ define([ } ] }), + action: 'cell-merge', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: '0, -16' @@ -1213,6 +1216,7 @@ define([ {caption: this.textCellAlign, value: 'options'} ]) }), + action: 'text-orientation', dataHint : '1', dataHintDirection: 'top' }); @@ -1230,6 +1234,7 @@ define([ { caption: me.mniImageFromStorage, value: 'storage'} ] }), + action: 'insert-image', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1253,6 +1258,7 @@ define([ lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set.coAuthText, _set['Objects']], caption : me.capInsertChart, menu : true, + action: 'insert-chart', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1276,6 +1282,7 @@ define([ lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.selSlicer, _set.multiselect, _set.lostConnect, _set.coAuth, _set.coAuthText, _set.editPivot, _set.wsLock, _set.userProtected], caption : me.capInsertSpark, menu : true, + action: 'insert-sparkline', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1288,6 +1295,7 @@ define([ lock: [_set.editCell, _set.lostConnect, _set.coAuth, _set['Objects']], caption: me.capBtnInsSmartArt, menu: true, + action: 'insert-smartart', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1301,6 +1309,7 @@ define([ caption : me.capInsertShape, lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set['Objects']], menu : new Common.UI.Menu({cls: 'menu-shapes menu-insert-shape'}), + action: 'insert-shape', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1314,6 +1323,7 @@ define([ lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set['Objects']], enableToggle: true, split : true, + action: 'insert-text', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small', @@ -1332,6 +1342,7 @@ define([ {template: _.template('')} ] }), + action: 'insert-textart', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1345,6 +1356,7 @@ define([ split : true, lock : [_set.editCell, _set.lostConnect, _set.coAuth], menu : new Common.UI.Menu({cls: 'menu-shapes'}), + action: 'insert-equation', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1366,6 +1378,7 @@ define([ }) ] }), + action: 'insert-symbol', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1546,6 +1559,7 @@ define([ } ] }), + action: 'accounting-style', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: '0, -16' @@ -1591,6 +1605,7 @@ define([ } ] }), + action: 'autosum', dataHint: '1', dataHintDirection: 'top', dataHintOffset: '0, -16' @@ -1621,6 +1636,7 @@ define([ } ] }), + action: 'named-ranges', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -1657,6 +1673,7 @@ define([ } ] }), + action: 'number-fill', dataHint: '1', dataHintDirection: 'top', dataHintOffset: '0, -6' @@ -1697,6 +1714,7 @@ define([ } ] }), + action: 'clear-style', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -1739,6 +1757,7 @@ define([ } ] }), + action: 'add-cell', dataHint: '1', dataHintDirection: 'top', dataHintOffset: '0, -6' @@ -1771,6 +1790,7 @@ define([ } ] }), + action: 'delete-cell', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: '0, -6' @@ -1782,6 +1802,7 @@ define([ iconCls : 'toolbar__icon btn-cond-format', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set['FormatCells'], _set.userProtected], menu : true, + action: 'conditional-format', dataHint : '1', dataHintDirection: 'top', dataHintOffset: '0, -6' @@ -1798,6 +1819,7 @@ define([ items: [], restoreHeight: true }), + action: 'theme-colors', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1834,6 +1856,7 @@ define([ } ] }), + action: 'page-orient', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -1888,6 +1911,7 @@ define([ {caption: me.textPageMarginsCustom, value: 'advanced'} ] }), + action: 'page-margins', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -2016,6 +2040,7 @@ define([ } ] }), + action: 'page-size', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -2047,6 +2072,7 @@ define([ } ] }), + action: 'print-area', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -2059,6 +2085,7 @@ define([ caption: me.capBtnPageBreak, lock : [_set.docPropsLock, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.editCell, _set.selRangeEdit, _set.pageBreakLock, _set.lostConnect, _set.coAuth], menu: true, + action: 'page-break', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -2079,6 +2106,7 @@ define([ menu: new Common.UI.Menu({ items: [], cls: 'scale-menu'}), + action: 'page-scale', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -2169,6 +2197,7 @@ define([ caption: me.capImgAlign, lock : [_set.selRange, _set.selRangeEdit, _set.cantGroup, _set.lostConnect, _set.coAuth, _set.coAuthText, _set["Objects"]], menu: true, + action: 'object-align', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -2180,6 +2209,7 @@ define([ caption: me.capImgGroup, lock : [_set.selRange, _set.selRangeEdit, _set.cantGroupUngroup, _set.lostConnect, _set.coAuth, _set.coAuthText, _set["Objects"]], menu: true, + action: 'object-group', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -2191,6 +2221,7 @@ define([ split: true, lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText, _set["Objects"], _set.inSmartartInternal], menu: true, + action: 'object-forward', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -2202,6 +2233,7 @@ define([ lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText, _set["Objects"], _set.inSmartartInternal], split: true, menu: true, + action: 'object-backward', dataHint: '1', dataHintDirection: 'bottom', dataHintOffset: 'small' diff --git a/apps/spreadsheeteditor/main/app/view/ViewTab.js b/apps/spreadsheeteditor/main/app/view/ViewTab.js index 35f1670cc6..c9d60a2b8f 100644 --- a/apps/spreadsheeteditor/main/app/view/ViewTab.js +++ b/apps/spreadsheeteditor/main/app/view/ViewTab.js @@ -194,6 +194,7 @@ define([ caption: me.capBtnSheetView, lock : [_set.lostConnect, _set.coAuth, _set.editCell], menu: true, + action: 'sheet-view', dataHint : '1', dataHintDirection: 'bottom', dataHintOffset: 'small' @@ -231,6 +232,7 @@ define([ iconCls: 'toolbar__icon btn-freeze-panes', caption: this.capBtnFreeze, menu: true, + action: 'freeze-panes', lock: [_set.sheetLock, _set.lostConnect, _set.coAuth, _set.editCell], dataHint: '1', dataHintDirection: 'bottom',