diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index fa9ab10016..4669c5c33d 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -56,7 +56,8 @@ define([ 'spreadsheeteditor/main/app/collection/TableTemplates', 'spreadsheeteditor/main/app/collection/EquationGroups', 'spreadsheeteditor/main/app/collection/ConditionalFormatIcons', - 'spreadsheeteditor/main/app/controller/FormulaDialog' + 'spreadsheeteditor/main/app/controller/FormulaDialog', + 'common/main/lib/component/HintManager' ], function () { 'use strict'; @@ -179,6 +180,7 @@ define([ this.api = this.getApplication().getController('Viewport').getApi(); Common.UI.FocusManager.init(); + Common.UI.HintManager.init(); Common.UI.Themes.init(this.api); var value = Common.localStorage.getBool("sse-settings-cachemode", true); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index dc7b04cb4f..f68ee58fe1 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -3724,7 +3724,7 @@ define([ this.btnsComment = []; if ( config.canCoAuthoring && config.canComments ) { var _set = SSE.enumLock; - this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-menu-comments', this.toolbar.capBtnComment, [_set.lostConnect, _set.commentLock, _set.editCell]); + this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-menu-comments', this.toolbar.capBtnComment, [_set.lostConnect, _set.commentLock, _set.editCell], undefined, undefined, undefined, '1', 'bottom', 'small'); if ( this.btnsComment.length ) { var _comments = SSE.getController('Common.Controllers.Comments').getView(); diff --git a/apps/spreadsheeteditor/main/app/template/Viewport.template b/apps/spreadsheeteditor/main/app/template/Viewport.template index e9dd6ee385..960a1c56e0 100644 --- a/apps/spreadsheeteditor/main/app/template/Viewport.template +++ b/apps/spreadsheeteditor/main/app/template/Viewport.template @@ -1,13 +1,13 @@
- +
-
+
-
+
@@ -15,7 +15,7 @@
-
+
diff --git a/apps/spreadsheeteditor/main/app/view/DataTab.js b/apps/spreadsheeteditor/main/app/view/DataTab.js index 4ed17b13e9..5fcd82eb0c 100644 --- a/apps/spreadsheeteditor/main/app/view/DataTab.js +++ b/apps/spreadsheeteditor/main/app/view/DataTab.js @@ -220,17 +220,17 @@ define([ this.lockedControls.push(this.btnCustomSort); this.btnsSortDown = Common.Utils.injectButtons($host.find('.slot-sortdesc'), '', 'toolbar__icon btn-sort-down', '', - [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.cantModifyFilter, _set.sheetLock, _set.cantSort]); + [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.cantModifyFilter, _set.sheetLock, _set.cantSort], undefined, undefined, undefined, '1', 'top'); this.btnsSortUp = Common.Utils.injectButtons($host.find('.slot-sortasc'), '', 'toolbar__icon btn-sort-up', '', - [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.cantModifyFilter, _set.sheetLock, _set.cantSort]); + [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.cantModifyFilter, _set.sheetLock, _set.cantSort], undefined, undefined, undefined, '1', 'top'); this.btnsSetAutofilter = Common.Utils.injectButtons($host.find('.slot-btn-setfilter'), '', 'toolbar__icon btn-autofilter', '', [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.editPivot, _set.cantModifyFilter, _set.tableHasSlicer], - false, false, true); + false, false, true, '1', 'bottom'); this.btnsClearAutofilter = Common.Utils.injectButtons($host.find('.slot-btn-clear-filter'), '', 'toolbar__icon btn-clear-filter', '', - [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleDelFilter]); + [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.ruleDelFilter], undefined, undefined, undefined, '1', 'bottom'); Array.prototype.push.apply(this.lockedControls, this.btnsSortDown.concat(this.btnsSortUp, this.btnsSetAutofilter,this.btnsClearAutofilter)); diff --git a/apps/spreadsheeteditor/main/app/view/FormulaTab.js b/apps/spreadsheeteditor/main/app/view/FormulaTab.js index 92343ba624..cdfba9a761 100644 --- a/apps/spreadsheeteditor/main/app/view/FormulaTab.js +++ b/apps/spreadsheeteditor/main/app/view/FormulaTab.js @@ -96,7 +96,10 @@ define([ menu: true, split: false, 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] + lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnFinancial); this.formulaControls.push(this.btnFinancial); @@ -110,7 +113,10 @@ define([ menu: true, split: false, 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] + lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnLogical); this.formulaControls.push(this.btnLogical); @@ -124,7 +130,10 @@ define([ menu: true, split: false, 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] + lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnTextData); this.formulaControls.push(this.btnTextData); @@ -138,7 +147,10 @@ define([ menu: true, split: false, 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] + lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnDateTime); this.formulaControls.push(this.btnDateTime); @@ -152,7 +164,10 @@ define([ menu: true, split: false, 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] + lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnReference); this.formulaControls.push(this.btnReference); @@ -166,7 +181,10 @@ define([ menu: true, split: false, 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] + lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnMath); this.formulaControls.push(this.btnMath); @@ -180,7 +198,10 @@ define([ menu: true, split: false, 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] + lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnRecent); this.formulaControls.push(this.btnRecent); @@ -208,7 +229,10 @@ define([ hint: me.txtFormulaTip + Common.Utils.String.platformKey('Shift+F3') } ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnAutosum); this.formulaControls.push(this.btnAutosum); @@ -220,7 +244,10 @@ define([ caption: this.txtFormula, hint: this.txtFormulaTip + Common.Utils.String.platformKey('Shift+F3'), disabled: true, - lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth] + lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnFormula); this.formulaControls.push(this.btnFormula); @@ -234,7 +261,10 @@ define([ menu: true, split: false, 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] + lock: [_set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.noSubitems], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnMore); this.formulaControls.push(this.btnMore); @@ -247,7 +277,10 @@ define([ split: true, menu: true, disabled: true, - lock: [_set.editCell, _set.selRangeEdit, _set.lostConnect, _set.coAuth] + lock: [_set.editCell, _set.selRangeEdit, _set.lostConnect, _set.coAuth], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnCalculate); this.formulaControls.push(this.btnCalculate); @@ -278,7 +311,10 @@ define([ value: 'paste' } ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); this.lockedControls.push(this.btnNamedRange); diff --git a/apps/spreadsheeteditor/main/app/view/PivotTable.js b/apps/spreadsheeteditor/main/app/view/PivotTable.js index 0598af43ea..0bed837e51 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotTable.js +++ b/apps/spreadsheeteditor/main/app/view/PivotTable.js @@ -157,7 +157,7 @@ define([ var _set = SSE.enumLock; this.btnsAddPivot = Common.Utils.injectButtons(this.toolbar.$el.find('.btn-slot.slot-add-pivot'), '', 'toolbar__icon btn-pivot-sum', this.txtPivotTable, - [_set.lostConnect, _set.coAuth, _set.editPivot, _set.selRangeEdit, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.editCell]); + [_set.lostConnect, _set.coAuth, _set.editPivot, _set.selRangeEdit, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.editCell], undefined, undefined, undefined, '1', 'bottom', 'small'); this.chRowHeader = new Common.UI.CheckBox({ labelText: this.textRowHeader, diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 54e6b0f389..684d55f548 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -267,7 +267,9 @@ define([ lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth], itemsTemplate: formatTemplate, editable : false, - data : me.numFormatData + data : me.numFormatData, + dataHint : '1', + dataHintDirection: 'top' }); me.btnEditChart = new Common.UI.Button({ @@ -372,7 +374,9 @@ define([ { value: 48, displayValue: "48" }, { value: 72, displayValue: "72" }, { value: 96, displayValue: "96" } - ] + ], + dataHint: '1', + dataHintDirection: 'top' }); me.cmbFontName = new Common.UI.ComboBoxFonts({ @@ -381,7 +385,9 @@ define([ menuStyle : 'min-width: 325px;', hint : me.tipFontName, lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect], - store : new Common.Collections.Fonts() + store : new Common.Collections.Fonts(), + dataHint: '1', + dataHintDirection: 'top' }); me.btnPrint = new Common.UI.Button({ @@ -404,14 +410,18 @@ define([ id : 'id-toolbar-btn-incfont', cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-incfont', - lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect] + lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect], + dataHint : '1', + dataHintDirection: 'top' }); me.btnDecFontSize = new Common.UI.Button({ id : 'id-toolbar-btn-decfont', cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-decfont', - lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect] + lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect], + dataHint : '1', + dataHintDirection: 'top' }); me.btnBold = new Common.UI.Button({ @@ -419,7 +429,9 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-bold', lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect], - enableToggle: true + enableToggle: true, + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnItalic = new Common.UI.Button({ @@ -427,7 +439,9 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-italic', lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect], - enableToggle: true + enableToggle: true, + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnUnderline = new Common.UI.Button({ @@ -435,7 +449,9 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-underline', lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect], - enableToggle: true + enableToggle: true, + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnStrikeout = new Common.UI.Button({ @@ -443,7 +459,9 @@ define([ cls: 'btn-toolbar', iconCls: 'toolbar__icon btn-strikeout', lock : [_set.selImage, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect], - enableToggle: true + enableToggle: true, + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnSubscript = new Common.UI.Button({ @@ -477,7 +495,10 @@ define([ value : 'sub' } ] - }) + }), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: '0, -16' }); me.mnuTextColorPicker = dummyCmp(); @@ -499,7 +520,10 @@ define([ { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] - }) + }), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: '0, -16' }); me.mnuBackColorPicker = dummyCmp(); @@ -514,7 +538,10 @@ define([ { template: _.template('
') }, { template: _.template('' + me.textNewColor + '') } ] - }) + }), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: '0, -16' }); me.btnBorders = new Common.UI.Button({ @@ -526,7 +553,10 @@ define([ borderswidth: Asc.c_oAscBorderStyles.Thin, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth], split : true, - menu : true + menu : true, + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: '0, -16' }); me.btnAlignLeft = new Common.UI.Button({ @@ -535,7 +565,9 @@ define([ iconCls : 'toolbar__icon btn-align-left', enableToggle: true, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.coAuthText], - toggleGroup : 'alignGroup' + toggleGroup : 'alignGroup', + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnAlignCenter = new Common.UI.Button({ @@ -544,7 +576,9 @@ define([ iconCls : 'toolbar__icon btn-align-center', enableToggle: true, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.coAuthText], - toggleGroup : 'alignGroup' + toggleGroup : 'alignGroup', + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnAlignRight = new Common.UI.Button({ @@ -553,7 +587,9 @@ define([ iconCls : 'toolbar__icon btn-align-right', enableToggle: true, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.coAuthText], - toggleGroup : 'alignGroup' + toggleGroup : 'alignGroup', + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnAlignJust = new Common.UI.Button({ @@ -562,7 +598,9 @@ define([ iconCls : 'toolbar__icon btn-align-just', enableToggle: true, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.coAuthText], - toggleGroup: 'alignGroup' + toggleGroup: 'alignGroup', + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnMerge = new Common.UI.Button({ @@ -596,7 +634,10 @@ define([ value : Asc.c_oAscMergeOptions.None } ] - }) + }), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: '0, -16' }); me.btnAlignTop = new Common.UI.Button({ @@ -605,7 +646,9 @@ define([ iconCls : 'toolbar__icon btn-align-top', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.coAuthText], enableToggle: true, - toggleGroup : 'vAlignGroup' + toggleGroup : 'vAlignGroup', + dataHint : '1', + dataHintDirection: 'top' }); me.btnAlignMiddle = new Common.UI.Button({ @@ -614,7 +657,9 @@ define([ iconCls : 'toolbar__icon btn-align-middle', enableToggle: true, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.coAuthText], - toggleGroup : 'vAlignGroup' + toggleGroup : 'vAlignGroup', + dataHint : '1', + dataHintDirection: 'top' }); me.btnAlignBottom = new Common.UI.Button({ @@ -623,7 +668,9 @@ define([ iconCls : 'toolbar__icon btn-align-bottom', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.coAuthText], enableToggle: true, - toggleGroup : 'vAlignGroup' + toggleGroup : 'vAlignGroup', + dataHint : '1', + dataHintDirection: 'top' }); me.btnWrap = new Common.UI.Button({ @@ -632,7 +679,9 @@ define([ iconCls : 'toolbar__icon btn-wrap', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth], enableToggle: true, - allowDepress: true + allowDepress: true, + dataHint : '1', + dataHintDirection: 'top' }); me.btnTextOrient = new Common.UI.Button({ @@ -691,7 +740,9 @@ define([ value : 'rotatedown' } ] - }) + }), + dataHint : '1', + dataHintDirection: 'top' }); me.btnInsertImage = new Common.UI.Button({ @@ -706,7 +757,10 @@ define([ { caption: me.mniImageFromUrl, value: 'url' }, { caption: me.mniImageFromStorage, value: 'storage'} ] - }) + }), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnInsertHyperlink = new Common.UI.Button({ @@ -714,7 +768,10 @@ define([ cls : 'btn-toolbar x-huge icon-top', iconCls : 'toolbar__icon btn-inserthyperlink', caption : me.capInsertHyperlink, - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.cantHyperlink, _set.selSlicer, _set.multiselect, _set.lostConnect, _set.coAuth, _set.editPivot] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.cantHyperlink, _set.selSlicer, _set.multiselect, _set.lostConnect, _set.coAuth, _set.editPivot], + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnInsertChart = new Common.UI.Button({ @@ -723,7 +780,10 @@ define([ iconCls : 'toolbar__icon btn-insertchart', lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set.coAuthText], caption : me.capInsertChart, - menu : true + menu : true, + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnInsertSparkline = new Common.UI.Button({ @@ -732,7 +792,10 @@ define([ iconCls : 'toolbar__icon btn-sparkline', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.selSlicer, _set.multiselect, _set.lostConnect, _set.coAuth, _set.coAuthText, _set.editPivot], caption : me.capInsertSpark, - menu : true + menu : true, + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnInsertShape = new Common.UI.Button({ @@ -742,7 +805,10 @@ define([ enableToggle: true, caption : me.capInsertShape, lock : [_set.editCell, _set.lostConnect, _set.coAuth], - menu : new Common.UI.Menu({cls: 'menu-shapes'}) + menu : new Common.UI.Menu({cls: 'menu-shapes'}), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnInsertText = new Common.UI.Button({ @@ -751,7 +817,10 @@ define([ iconCls : 'toolbar__icon btn-text', caption : me.capInsertText, lock : [_set.editCell, _set.lostConnect, _set.coAuth], - enableToggle: true + enableToggle: true, + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnInsertTextArt = new Common.UI.Button({ @@ -765,7 +834,10 @@ define([ items: [ {template: _.template('
')} ] - }) + }), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnInsertEquation = new Common.UI.Button({ @@ -775,7 +847,10 @@ define([ caption : me.capInsertEquation, split : true, lock : [_set.editCell, _set.lostConnect, _set.coAuth], - menu : new Common.UI.Menu({cls: 'menu-shapes'}) + menu : new Common.UI.Menu({cls: 'menu-shapes'}), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnInsertSymbol = new Common.UI.Button({ @@ -783,7 +858,10 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-symbol', caption: me.capBtnInsSymbol, - lock: [_set.selImage, _set.selChart, _set.selShape, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect] + lock: [_set.selImage, _set.selChart, _set.selShape, _set.editFormula, _set.selRangeEdit, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnInsertSlicer = new Common.UI.Button({ @@ -791,7 +869,10 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-slicer', caption: me.capBtnInsSlicer, - lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.multiselect, _set.noSlicerSource] + lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.multiselect, _set.noSlicerSource], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnTableTemplate = new Common.UI.Button({ @@ -803,7 +884,10 @@ define([ items: [ { template: _.template('
') } ] - }) + }), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: '0, -6' }); me.btnInsertTable = new Common.UI.Button({ @@ -811,7 +895,10 @@ define([ cls : 'btn-toolbar x-huge icon-top', iconCls : 'toolbar__icon btn-inserttable', caption : me.capInsertTable, - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.multiselect, _set.cantModifyFilter, _set.ruleMerge, _set.editPivot] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth, _set.ruleFilter, _set.multiselect, _set.cantModifyFilter, _set.ruleMerge, _set.editPivot], + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.listStyles = new Common.UI.ComboDataView({ @@ -821,6 +908,9 @@ define([ itemHeight : 38, menuMaxHeight : 226, lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth], + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset : '-16, 0', beforeOpenHandler: function(e) { var cmp = this, menu = cmp.openButton.menu, @@ -871,7 +961,9 @@ define([ lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.selRangeEdit, _set.lostConnect, _set.coAuth], itemsTemplate: formatTemplate, editable : false, - data : me.numFormatData + data : me.numFormatData, + dataHint : '1', + dataHintDirection: 'top' }); me.btnPercentStyle = new Common.UI.Button({ @@ -879,7 +971,9 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-percent-style', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth], - styleName : 'Percent' + styleName : 'Percent', + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnCurrencyStyle = new Common.UI.Button({ @@ -917,21 +1011,28 @@ define([ value : -1 } ] - }) + }), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: '0, -16' }); me.btnDecDecimal = new Common.UI.Button({ id : 'id-toolbar-btn-decdecimal', cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-decdecimal', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth], + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnIncDecimal = new Common.UI.Button({ id : 'id-toolbar-btn-incdecimal', cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-incdecimal', - lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth] + lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth], + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnInsertFormula = new Common.UI.Button({ @@ -955,7 +1056,10 @@ define([ hint: me.txtFormula + Common.Utils.String.platformKey('Shift+F3') } ] - }) + }), + dataHint: '1', + dataHintDirection: 'top', + dataHintOffset: '0, -16' }); me.btnNamedRange = new Common.UI.Button({ @@ -981,7 +1085,10 @@ define([ value: 'paste' } ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: '0, -6' }); me.btnClearStyle = new Common.UI.Button({ @@ -1018,7 +1125,10 @@ define([ value : Asc.c_oAscCleanOptions.Hyperlinks } ] - }) + }), + dataHint: '1', + dataHintDirection: 'top', + dataHintOffset: '0, -6' }); me.btnCopyStyle = new Common.UI.Button({ @@ -1026,7 +1136,9 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-copystyle', lock : [_set.editCell, _set.lostConnect, _set.coAuth, _set.selChart, _set.selSlicer], - enableToggle: true + enableToggle: true, + dataHint : '1', + dataHintDirection: 'bottom' }); me.btnAddCell = new Common.UI.Button({ @@ -1053,7 +1165,10 @@ define([ value : Asc.c_oAscInsertOptions.InsertColumns } ] - }) + }), + dataHint: '1', + dataHintDirection: 'top', + dataHintOffset: '0, -6' }); me.btnDeleteCell = new Common.UI.Button({ @@ -1080,7 +1195,10 @@ define([ value : Asc.c_oAscDeleteOptions.DeleteColumns } ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: '0, -6' }); me.btnCondFormat = new Common.UI.Button({ @@ -1088,7 +1206,10 @@ define([ cls : 'btn-toolbar', iconCls : 'toolbar__icon btn-cond-format', lock : [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth], - menu : true + menu : true, + dataHint : '1', + dataHintDirection: 'top', + dataHintOffset: '0, -6' }); me.btnColorSchemas = new Common.UI.Button({ @@ -1101,7 +1222,10 @@ define([ cls: 'shifted-left', items: [], restoreHeight: true - }) + }), + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); var hidetip = Common.localStorage.getItem("sse-hide-synch"); @@ -1134,7 +1258,10 @@ define([ value: Asc.c_oAscPageOrientation.PageLandscape } ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); var pageMarginsTemplate = _.template('
<%= caption %>
' + @@ -1183,7 +1310,10 @@ define([ {caption: '--'}, {caption: me.textPageMarginsCustom, value: 'advanced'} ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); var pageSizeTemplate = _.template('
<%= caption %>
' + @@ -1305,7 +1435,10 @@ define([ value: [330.2, 482.5] } ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.mnuPageSize = me.btnPageSize.menu; @@ -1333,7 +1466,10 @@ define([ value: Asc.c_oAscChangePrintAreaType.add } ] - }) + }), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.mnuCustomScale = new Common.UI.MenuItem({ @@ -1360,7 +1496,10 @@ define([ lock: [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.selRangeEdit], menu: new Common.UI.Menu({ items: [], - cls: 'scale-menu'}) + cls: 'scale-menu'}), + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); var menuWidthItem = new Common.UI.MenuItem({ caption: me.textWidth, @@ -1420,7 +1559,10 @@ define([ cls: 'btn-toolbar x-huge icon-top', iconCls: 'toolbar__icon btn-print-titles', caption: me.capBtnPrintTitles, - lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.selRangeEdit] + lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.selRangeEdit], + dataHint : '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnImgAlign = new Common.UI.Button({ @@ -1428,7 +1570,10 @@ define([ iconCls: 'toolbar__icon btn-img-align', caption: me.capImgAlign, lock : [_set.selRange, _set.selRangeEdit, _set.cantGroup, _set.lostConnect, _set.coAuth, _set.coAuthText], - menu: true + menu: true, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnImgGroup = new Common.UI.Button({ @@ -1436,7 +1581,10 @@ define([ iconCls: 'toolbar__icon btn-img-group', caption: me.capImgGroup, lock : [_set.selRange, _set.selRangeEdit, _set.cantGroupUngroup, _set.lostConnect, _set.coAuth, _set.coAuthText], - menu: true + menu: true, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnImgForward = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', @@ -1444,7 +1592,10 @@ define([ caption: me.capImgForward, split: true, lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText], - menu: true + menu: true, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); me.btnImgBackward = new Common.UI.Button({ cls: 'btn-toolbar x-huge icon-top', @@ -1452,7 +1603,10 @@ define([ caption: me.capImgBackward, lock : [_set.selRange, _set.selRangeEdit, _set.lostConnect, _set.coAuth, _set.coAuthText], split: true, - menu: true + menu: true, + dataHint: '1', + dataHintDirection: 'bottom', + dataHintOffset: 'small' }); } else { @@ -1692,7 +1846,7 @@ define([ _injectComponent('#slot-btn-scale', this.btnScale); _injectComponent('#slot-btn-condformat', this.btnCondFormat); this.btnsEditHeader = Common.Utils.injectButtons($host.find('.slot-editheader'), 'tlbtn-editheader-', 'toolbar__icon btn-editheader', this.capBtnInsHeader, - [SSE.enumLock.editCell, SSE.enumLock.selRangeEdit, SSE.enumLock.headerLock, SSE.enumLock.lostConnect, SSE.enumLock.coAuth]); + [SSE.enumLock.editCell, SSE.enumLock.selRangeEdit, SSE.enumLock.headerLock, SSE.enumLock.lostConnect, SSE.enumLock.coAuth], undefined, undefined, undefined, '1', 'bottom', 'small'); Array.prototype.push.apply(this.lockControls, this.btnsEditHeader); return $host; diff --git a/apps/spreadsheeteditor/main/resources/less/app.less b/apps/spreadsheeteditor/main/resources/less/app.less index fed2e5b4ce..f5fe55dfc6 100644 --- a/apps/spreadsheeteditor/main/resources/less/app.less +++ b/apps/spreadsheeteditor/main/resources/less/app.less @@ -119,6 +119,7 @@ @import "../../../../common/main/resources/less/language-dialog.less"; @import "../../../../common/main/resources/less/winxp_fix.less"; @import "../../../../common/main/resources/less/symboltable.less"; +@import "../../../../common/main/resources/less/hint-manager.less"; // App // --------------------------------------------------