Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Hint Manager: add hints into toolbar and right menu

Browse source
This commit is contained in:
JuliaSvinareva 2021-06-08 17:26:10 +03:00
parent f120ccf6be
commit 9ec0a305b3
12 changed files with 352 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/spreadsheeteditor/main/app/template/LeftMenu.template
View file

@ -1,14 +1,14 @@
<div id="view-left-menu" class="tool-menu left"> <div id="view-left-menu" class="tool-menu left">
<div class="tool-menu-btns"> <div class="tool-menu-btns">
<button id="left-btn-search" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button> <button id="left-btn-search" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
<!-- /** coauthoring begin **/ --> <!-- /** coauthoring begin **/ -->
<button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button> <button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
<button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button> <button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
<!-- /** coauthoring end **/ --> <!-- /** coauthoring end **/ -->
<button id="left-btn-plugins" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-plugin">&nbsp;</i></button> <button id="left-btn-plugins" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-plugin">&nbsp;</i></button>
<button id="left-btn-spellcheck" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-ic-docspell">&nbsp;</i></button> <button id="left-btn-spellcheck" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-ic-docspell">&nbsp;</i></button>
<button id="left-btn-support" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button> <button id="left-btn-support" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button>
<button id="left-btn-about" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button> <button id="left-btn-about" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
</div> </div>
<div class="left-panel" style=""> <div class="left-panel" style="">
<!-- /** coauthoring begin **/ --> <!-- /** coauthoring begin **/ -->

20
apps/spreadsheeteditor/main/app/template/RightMenu.template
View file

@ -23,15 +23,15 @@
</div> </div>
<div class="tool-menu-btns"> <div class="tool-menu-btns">
<div class="ct-btn-category arrow-left"></div> <div class="ct-btn-category arrow-left"></div>
<button id="id-right-menu-cell" class="btn btn-category arrow-left" content-target="id-cell-settings"><i class="icon toolbar__icon btn-menu-cell">&nbsp;</i></button> <button id="id-right-menu-cell" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-cell-settings"><i class="icon toolbar__icon btn-menu-cell">&nbsp;</i></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button> <button id="id-right-menu-table" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-table-settings"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button>
<button id="id-right-menu-shape" class="btn btn-category arrow-left" content-target="id-shape-settings"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button> <button id="id-right-menu-shape" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-shape-settings"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button>
<button id="id-right-menu-image" class="btn btn-category arrow-left" content-target="id-image-settings"><i class="icon toolbar__icon btn-menu-image">&nbsp;</i></button> <button id="id-right-menu-image" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-image-settings"><i class="icon toolbar__icon btn-menu-image">&nbsp;</i></button>
<button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button> <button id="id-right-menu-chart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>
<button id="id-right-menu-text" class="btn btn-category arrow-left" content-target="id-paragraph-settings"><i class="icon toolbar__icon btn-paragraph">&nbsp;</i></button> <button id="id-right-menu-text" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-paragraph-settings"><i class="icon toolbar__icon btn-paragraph">&nbsp;</i></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button> <button id="id-right-menu-textart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
<button id="id-right-menu-pivot" class="btn btn-category arrow-left" content-target="id-pivot-settings"><i class="icon toolbar__icon btn-pivot-sum">&nbsp;</i></button> <button id="id-right-menu-pivot" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-pivot-settings"><i class="icon toolbar__icon btn-pivot-sum">&nbsp;</i></button>
<button id="id-right-menu-slicer" class="btn btn-category arrow-left" content-target="id-slicer-settings"><i class="icon toolbar__icon btn-slicer">&nbsp;</i></button> <button id="id-right-menu-slicer" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-slicer-settings"><i class="icon toolbar__icon btn-slicer">&nbsp;</i></button>
<button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button> <button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
</div> </div>
</div> </div>

2
apps/spreadsheeteditor/main/app/template/ShapeSettings.template
View file

@ -202,7 +202,7 @@
</tr> </tr>
<tr class="shape-only"> <tr class="shape-only">
<td align="center"> <td align="center">
<label class="link" id="shape-advanced-link"><%= scope.textAdvanced %></label> <label class="link" id="shape-advanced-link" data-hint="1" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.textAdvanced %></label>
</td> </td>
</tr> </tr>
<tr class="finish-cell"></tr> <tr class="finish-cell"></tr>

8
apps/spreadsheeteditor/main/app/template/StatusBar.template
View file

@ -2,18 +2,18 @@
<div class="statusbar"> <div class="statusbar">
<div id="status-tabs-scroll" class="status-group"> <div id="status-tabs-scroll" class="status-group">
<button id="status-btn-tabfirst" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-firstitem">&nbsp;</i></button> <button id="status-btn-tabfirst" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-firstitem">&nbsp;</i></button>
<button id="status-btn-tabback" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-previtem">&nbsp;</i></button> <button id="status-btn-tabback" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-previtem">&nbsp;</i></button>
<button id="status-btn-tabnext" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-nextitem">&nbsp;</i></button> <button id="status-btn-tabnext" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-nextitem">&nbsp;</i></button>
<button id="status-btn-tablast" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-lastitem">&nbsp;</i></button> <button id="status-btn-tablast" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-lastitem">&nbsp;</i></button>
</div> </div>
<div id="status-addtabs-box" class="status-group"> <div id="status-addtabs-box" class="status-group">
<button id="status-btn-addtab" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button> <button id="status-btn-addtab" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
</div> </div>
<div id="status-zoom-box" class="status-group"> <div id="status-zoom-box" class="status-group">
<div class="separator short"></div> <div class="separator short"></div>
<button id="status-btn-zoomdown" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button> <button id="status-btn-zoomdown" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>
<div class="cnt-zoom"> <div class="cnt-zoom">
<div class="dropdown-toggle" data-toggle="dropdown"> <div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top">
<label id="status-label-zoom" class="status-label">Zoom 100%</label> <label id="status-label-zoom" class="status-label">Zoom 100%</label>
</div> </div>
</div> </div>

4
apps/spreadsheeteditor/main/app/template/TableSettings.template
View file

@ -64,7 +64,7 @@
<tr> <tr>
<td class="padding-large" colspan=2> <td class="padding-large" colspan=2>
<label class="header" style="margin-top: 3px;"><%= scope.textResize %></label> <label class="header" style="margin-top: 3px;"><%= scope.textResize %></label>
<button type="button" class="btn btn-text-default" id="table-btn-select-data" style="display: inline-block; float:right; min-width: 100px;width: auto;"><%= scope.textSelectData %></button> <button type="button" class="btn btn-text-default" id="table-btn-select-data" style="display: inline-block; float:right; min-width: 100px;width: auto;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textSelectData %></button>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -112,7 +112,7 @@
</tr> </tr>
<tr> <tr>
<td align="center" colspan=2> <td align="center" colspan=2>
<label class="link" id="table-advanced-link"><%= scope.textAdvanced %></label> <label class="link" id="table-advanced-link" data-hint="1" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.textAdvanced %></label>
</td> </td>
</tr> </tr>
<tr class="finish-cell"></tr> <tr class="finish-cell"></tr>

117
apps/spreadsheeteditor/main/app/view/CellSettings.js
View file

@ -186,7 +186,10 @@ define([
menuStyle: 'min-width: 100%;', menuStyle: 'min-width: 100%;',
editable: false, editable: false,
data: this._arrFillSrc, data: this._arrFillSrc,
disabled: this._locked disabled: this._locked,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_NOFILL); this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_NOFILL);
this.fillControls.push(this.cmbFillSrc); this.fillControls.push(this.cmbFillSrc);
@ -201,7 +204,10 @@ define([
allowDecimal: true, allowDecimal: true,
maxValue: 359.9, maxValue: 359.9,
minValue: 0, minValue: 0,
disabled: this._locked disabled: this._locked,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.numGradientAngle); this.lockedControls.push(this.numGradientAngle);
this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this)); this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this));
@ -243,7 +249,10 @@ define([
items: [ items: [
{ template: _.template('<div id="id-cell-menu-direction" style="width: 175px; margin: 0 5px;"></div>') } { template: _.template('<div id="id-cell-menu-direction" style="width: 175px; margin: 0 5px;"></div>') }
] ]
}) }),
dataHint : '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.btnDirection.on('render:after', function(btn) { this.btnDirection.on('render:after', function(btn) {
me.mnuDirectionPicker = new Common.UI.DataView({ me.mnuDirectionPicker = new Common.UI.DataView({
@ -313,7 +322,10 @@ define([
itemHeight: 28, itemHeight: 28,
menuMaxHeight: 300, menuMaxHeight: 300,
enableKeyEvents: true, enableKeyEvents: true,
cls: 'combo-pattern' cls: 'combo-pattern',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbPattern.menuPicker.itemTemplate = this.cmbPattern.fieldPicker.itemTemplate = _.template([ this.cmbPattern.menuPicker.itemTemplate = this.cmbPattern.fieldPicker.itemTemplate = _.template([
'<div class="style" id="<%= id %>">', '<div class="style" id="<%= id %>">',
@ -366,18 +378,18 @@ define([
} }
var _arrBorderPosition = [ var _arrBorderPosition = [
[Asc.c_oAscBorderOptions.Left, 'toolbar__icon btn-border-left', 'cell-button-border-left', this.tipLeft], [Asc.c_oAscBorderOptions.Left, 'toolbar__icon btn-border-left', 'cell-button-border-left', this.tipLeft, 'bottom'],
[Asc.c_oAscBorderOptions.InnerV,'toolbar__icon btn-border-insidevert', 'cell-button-border-inner-vert',this.tipInnerVert], [Asc.c_oAscBorderOptions.InnerV,'toolbar__icon btn-border-insidevert', 'cell-button-border-inner-vert',this.tipInnerVert, 'bottom'],
[Asc.c_oAscBorderOptions.Right, 'toolbar__icon btn-border-right', 'cell-button-border-right', this.tipRight], [Asc.c_oAscBorderOptions.Right, 'toolbar__icon btn-border-right', 'cell-button-border-right', this.tipRight, 'bottom'],
[Asc.c_oAscBorderOptions.Top, 'toolbar__icon btn-border-top', 'cell-button-border-top', this.tipTop], [Asc.c_oAscBorderOptions.Top, 'toolbar__icon btn-border-top', 'cell-button-border-top', this.tipTop, 'bottom'],
[Asc.c_oAscBorderOptions.InnerH,'toolbar__icon btn-border-insidehor', 'cell-button-border-inner-hor', this.tipInnerHor], [Asc.c_oAscBorderOptions.InnerH,'toolbar__icon btn-border-insidehor', 'cell-button-border-inner-hor', this.tipInnerHor, 'bottom'],
[Asc.c_oAscBorderOptions.Bottom,'toolbar__icon btn-border-bottom', 'cell-button-border-bottom', this.tipBottom], [Asc.c_oAscBorderOptions.Bottom,'toolbar__icon btn-border-bottom', 'cell-button-border-bottom', this.tipBottom, 'bottom'],
[Asc.c_oAscBorderOptions.DiagU, 'toolbar__icon btn-border-diagup', 'cell-button-border-diagu', this.tipDiagU], [Asc.c_oAscBorderOptions.DiagU, 'toolbar__icon btn-border-diagup', 'cell-button-border-diagu', this.tipDiagU, 'top'],
[Asc.c_oAscBorderOptions.DiagD, 'toolbar__icon btn-border-diagdown', 'cell-button-border-diagd', this.tipDiagD], [Asc.c_oAscBorderOptions.DiagD, 'toolbar__icon btn-border-diagdown', 'cell-button-border-diagd', this.tipDiagD, 'top'],
['inner', 'toolbar__icon btn-border-inside', 'cell-button-border-inner', this.tipInner], ['inner', 'toolbar__icon btn-border-inside', 'cell-button-border-inner', this.tipInner, 'top'],
['outer', 'toolbar__icon btn-border-out', 'cell-button-border-outer', this.tipOuter], ['outer', 'toolbar__icon btn-border-out', 'cell-button-border-outer', this.tipOuter, 'top'],
['all', 'toolbar__icon btn-border-all', 'cell-button-border-all', this.tipAll], ['all', 'toolbar__icon btn-border-all', 'cell-button-border-all', this.tipAll, 'top'],
['none', 'toolbar__icon btn-border-no', 'cell-button-border-none', this.tipNone] ['none', 'toolbar__icon btn-border-no', 'cell-button-border-none', this.tipNone, 'top']
]; ];
_.each(_arrBorderPosition, function(item, index, list){ _.each(_arrBorderPosition, function(item, index, list){
@ -387,7 +399,10 @@ define([
iconCls: item[1], iconCls: item[1],
borderId:item[0], borderId:item[0],
hint: item[3], hint: item[3],
disabled: this._locked disabled: this._locked,
dataHint: '1',
dataHintDirection: item[4],
dataHintOffset: 'small'
}); });
_btn.on('click', _.bind(this.onBtnBordersClick, this)); _btn.on('click', _.bind(this.onBtnBordersClick, this));
this.lockedControls.push(_btn); this.lockedControls.push(_btn);
@ -411,7 +426,10 @@ define([
{ value: Asc.c_oAscBorderStyles.MediumDashDot, offsety: 160}, { value: Asc.c_oAscBorderStyles.MediumDashDot, offsety: 160},
{ value: Asc.c_oAscBorderStyles.MediumDashDotDot, offsety: 180}, { value: Asc.c_oAscBorderStyles.MediumDashDotDot, offsety: 180},
{ value: Asc.c_oAscBorderStyles.Thick, offsety: 200} { value: Asc.c_oAscBorderStyles.Thick, offsety: 200}
] ],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}).on('selected', _.bind(this.onBorderTypeSelect, this)); }).on('selected', _.bind(this.onBorderTypeSelect, this));
this.BorderType = Asc.c_oAscBorderStyles.Thin; this.BorderType = Asc.c_oAscBorderStyles.Thin;
this.cmbBorderType.setValue(this.BorderType); this.cmbBorderType.setValue(this.BorderType);
@ -422,7 +440,10 @@ define([
disabled: this._locked, disabled: this._locked,
menu : true, menu : true,
color: 'auto', color: 'auto',
auto: true auto: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'medium'
}); });
this.lockedControls.push(this.btnBorderColor); this.lockedControls.push(this.btnBorderColor);
@ -431,7 +452,10 @@ define([
disabled: this._locked, disabled: this._locked,
menu : true, menu : true,
transparent : true, transparent : true,
color: 'transparent' color: 'transparent',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'medium'
}); });
this.lockedControls.push(this.btnBackColor); this.lockedControls.push(this.btnBackColor);
@ -444,7 +468,10 @@ define([
allowDecimal: false, allowDecimal: false,
maxValue: 250, maxValue: 250,
minValue: 0, minValue: 0,
disabled: this._locked disabled: this._locked,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.spnIndent); this.lockedControls.push(this.spnIndent);
this.spnIndent.on('change', _.bind(this.onIndentChange, this)); this.spnIndent.on('change', _.bind(this.onIndentChange, this));
@ -459,7 +486,10 @@ define([
allowDecimal: false, allowDecimal: false,
maxValue: 90, maxValue: 90,
minValue: -90, minValue: -90,
disabled: this._locked disabled: this._locked,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.spnAngle); this.lockedControls.push(this.spnAngle);
this.spnAngle.on('change', _.bind(this.onAngleChange, this)); this.spnAngle.on('change', _.bind(this.onAngleChange, this));
@ -474,7 +504,10 @@ define([
allowDecimal: false, allowDecimal: false,
maxValue: 100, maxValue: 100,
minValue: 0, minValue: 0,
disabled: this._locked disabled: this._locked,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.spnGradPosition); this.lockedControls.push(this.spnGradPosition);
this.spnGradPosition.on('change', _.bind(this.onPositionChange, this)); this.spnGradPosition.on('change', _.bind(this.onPositionChange, this));
@ -485,7 +518,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-add-breakpoint', iconCls: 'toolbar__icon btn-add-breakpoint',
disabled: this._locked, disabled: this._locked,
hint: this.tipAddGradientPoint hint: this.tipAddGradientPoint,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
this.btnAddGradientStep.on('click', _.bind(this.onAddGradientStep, this)); this.btnAddGradientStep.on('click', _.bind(this.onAddGradientStep, this));
this.lockedControls.push(this.btnAddGradientStep); this.lockedControls.push(this.btnAddGradientStep);
@ -495,7 +530,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-remove-breakpoint', iconCls: 'toolbar__icon btn-remove-breakpoint',
disabled: this._locked, disabled: this._locked,
hint: this.tipRemoveGradientPoint hint: this.tipRemoveGradientPoint,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
this.btnRemoveGradientStep.on('click', _.bind(this.onRemoveGradientStep, this)); this.btnRemoveGradientStep.on('click', _.bind(this.onRemoveGradientStep, this));
this.lockedControls.push(this.btnRemoveGradientStep); this.lockedControls.push(this.btnRemoveGradientStep);
@ -503,7 +540,10 @@ define([
this.chWrap = new Common.UI.CheckBox({ this.chWrap = new Common.UI.CheckBox({
el: $('#cell-checkbox-wrap'), el: $('#cell-checkbox-wrap'),
labelText: this.strWrap, labelText: this.strWrap,
disabled: this._locked disabled: this._locked,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chWrap); this.lockedControls.push(this.chWrap);
this.chWrap.on('change', this.onWrapChange.bind(this)); this.chWrap.on('change', this.onWrapChange.bind(this));
@ -511,7 +551,10 @@ define([
this.chShrink = new Common.UI.CheckBox({ this.chShrink = new Common.UI.CheckBox({
el: $('#cell-checkbox-shrink'), el: $('#cell-checkbox-shrink'),
labelText: this.strShrink, labelText: this.strShrink,
disabled: this._locked disabled: this._locked,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chShrink); this.lockedControls.push(this.chShrink);
this.chShrink.on('change', this.onShrinkChange.bind(this)); this.chShrink.on('change', this.onShrinkChange.bind(this));
@ -523,7 +566,10 @@ define([
caption : this.textCondFormat, caption : this.textCondFormat,
style : 'width: 100%;text-align: left;', style : 'width: 100%;text-align: left;',
menu: true, menu: true,
disabled: this._locked disabled: this._locked,
dataHint : '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.btnCondFormat); this.lockedControls.push(this.btnCondFormat);
}, },
@ -1036,7 +1082,10 @@ define([
this.btnGradColor = new Common.UI.ColorButton({ this.btnGradColor = new Common.UI.ColorButton({
parentEl: $('#cell-gradient-color-btn'), parentEl: $('#cell-gradient-color-btn'),
color: '000000' color: '000000',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.fillControls.push(this.btnGradColor); this.fillControls.push(this.btnGradColor);
this.colorsGrad = this.btnGradColor.getPicker(); this.colorsGrad = this.btnGradColor.getPicker();
@ -1044,7 +1093,10 @@ define([
this.btnFGColor = new Common.UI.ColorButton({ this.btnFGColor = new Common.UI.ColorButton({
parentEl: $('#cell-foreground-color-btn'), parentEl: $('#cell-foreground-color-btn'),
color: '000000' color: '000000',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'medium'
}); });
this.fillControls.push(this.btnFGColor); this.fillControls.push(this.btnFGColor);
this.colorsFG = this.btnFGColor.getPicker(); this.colorsFG = this.btnFGColor.getPicker();
@ -1052,7 +1104,10 @@ define([
this.btnBGColor = new Common.UI.ColorButton({ this.btnBGColor = new Common.UI.ColorButton({
parentEl: $('#cell-background-color-btn'), parentEl: $('#cell-background-color-btn'),
color: 'ffffff' color: 'ffffff',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'medium'
}); });
this.fillControls.push(this.btnBGColor); this.fillControls.push(this.btnBGColor);
this.colorsBG = this.btnBGColor.getPicker(); this.colorsBG = this.btnBGColor.getPicker();

35
apps/spreadsheeteditor/main/app/view/DataTab.js
View file

@ -130,7 +130,10 @@ define([
caption: this.capDataFromText, caption: this.capDataFromText,
menu: !this.toolbar.mode.isDesktopApp, menu: !this.toolbar.mode.isDesktopApp,
disabled: true, disabled: true,
lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth] lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnDataFromText); this.lockedControls.push(this.btnDataFromText);
@ -142,7 +145,10 @@ define([
split: true, split: true,
menu: true, menu: true,
disabled: true, disabled: true,
lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth] lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnGroup); this.lockedControls.push(this.btnGroup);
@ -154,7 +160,10 @@ define([
split: true, split: true,
menu: true, menu: true,
disabled: true, disabled: true,
lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth] lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.sheetLock, _set.lostConnect, _set.coAuth],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnUngroup); this.lockedControls.push(this.btnUngroup);
@ -165,7 +174,10 @@ define([
caption: this.capBtnTextToCol, caption: this.capBtnTextToCol,
split: false, split: false,
disabled: true, disabled: true,
lock: [_set.multiselect, _set.multiselectCols, _set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth] lock: [_set.multiselect, _set.multiselectCols, _set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selSlicer, _set.lostConnect, _set.coAuth],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnTextToColumns); this.lockedControls.push(this.btnTextToColumns);
@ -195,7 +207,10 @@ define([
iconCls: 'toolbar__icon btn-remove-duplicates', iconCls: 'toolbar__icon btn-remove-duplicates',
caption: this.capBtnTextRemDuplicates, caption: this.capBtnTextRemDuplicates,
disabled: true, disabled: true,
lock: [_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.sheetLock] lock: [_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.sheetLock],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnRemoveDuplicates); this.lockedControls.push(this.btnRemoveDuplicates);
@ -205,7 +220,10 @@ define([
iconCls: 'toolbar__icon btn-data-validation', iconCls: 'toolbar__icon btn-data-validation',
caption: this.capBtnTextDataValidation, caption: this.capBtnTextDataValidation,
disabled: true, disabled: true,
lock: [_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.sheetLock] lock: [_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.sheetLock],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnDataValidation); this.lockedControls.push(this.btnDataValidation);
@ -215,7 +233,10 @@ define([
iconCls: 'toolbar__icon btn-custom-sort', iconCls: 'toolbar__icon btn-custom-sort',
caption: this.capBtnTextCustomSort, caption: this.capBtnTextCustomSort,
disabled: true, disabled: true,
lock: [_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.sheetLock] lock: [_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.sheetLock],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnCustomSort); this.lockedControls.push(this.btnCustomSort);

57
apps/spreadsheeteditor/main/app/view/PivotTable.js
View file

@ -161,25 +161,37 @@ define([
this.chRowHeader = new Common.UI.CheckBox({ this.chRowHeader = new Common.UI.CheckBox({
labelText: this.textRowHeader, labelText: this.textRowHeader,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock] lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chRowHeader); this.lockedControls.push(this.chRowHeader);
this.chColHeader = new Common.UI.CheckBox({ this.chColHeader = new Common.UI.CheckBox({
labelText: this.textColHeader, labelText: this.textColHeader,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock] lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chColHeader); this.lockedControls.push(this.chColHeader);
this.chRowBanded = new Common.UI.CheckBox({ this.chRowBanded = new Common.UI.CheckBox({
labelText: this.textRowBanded, labelText: this.textRowBanded,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock] lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chRowBanded); this.lockedControls.push(this.chRowBanded);
this.chColBanded = new Common.UI.CheckBox({ this.chColBanded = new Common.UI.CheckBox({
labelText: this.textColBanded, labelText: this.textColBanded,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock] lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chColBanded); this.lockedControls.push(this.chColBanded);
@ -189,7 +201,10 @@ define([
caption : this.capLayout, caption : this.capLayout,
disabled : true, disabled : true,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
menu : true menu : true,
dataHint : '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnPivotLayout); this.lockedControls.push(this.btnPivotLayout);
@ -199,7 +214,10 @@ define([
caption : this.capBlankRows, caption : this.capBlankRows,
disabled : true, disabled : true,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
menu : true menu : true,
dataHint : '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnPivotBlankRows); this.lockedControls.push(this.btnPivotBlankRows);
@ -209,7 +227,10 @@ define([
caption : this.capSubtotals, caption : this.capSubtotals,
disabled : true, disabled : true,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
menu : true menu : true,
dataHint : '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnPivotSubtotals); this.lockedControls.push(this.btnPivotSubtotals);
@ -219,7 +240,10 @@ define([
caption : this.capGrandTotals, caption : this.capGrandTotals,
disabled : true, disabled : true,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock], lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
menu : true menu : true,
dataHint : '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnPivotGrandTotals); this.lockedControls.push(this.btnPivotGrandTotals);
@ -228,7 +252,10 @@ define([
iconCls: 'toolbar__icon btn-update', iconCls: 'toolbar__icon btn-update',
caption: this.txtRefresh, caption: this.txtRefresh,
disabled : true, disabled : true,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock] lock : [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit, _set.pivotLock],
dataHint : '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnRefreshPivot); this.lockedControls.push(this.btnRefreshPivot);
@ -236,7 +263,10 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-select-pivot', iconCls: 'toolbar__icon btn-select-pivot',
caption: this.txtSelect, caption: this.txtSelect,
lock: [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit] lock: [_set.lostConnect, _set.coAuth, _set.noPivot, _set.selRangeEdit],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnSelectPivot); this.lockedControls.push(this.btnSelectPivot);
@ -254,7 +284,10 @@ define([
var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - menu.cmpEl.outerWidth() - 1; var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - menu.cmpEl.outerWidth() - 1;
menu.setOffset(Math.min(offset, 0)); menu.setOffset(Math.min(offset, 0));
} }
} },
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '-16, 0'
}); });
this.lockedControls.push(this.pivotStyles); this.lockedControls.push(this.pivotStyles);
@ -326,7 +359,7 @@ define([
var _set = SSE.enumLock; var _set = SSE.enumLock;
this.btnsAddPivot = this.btnsAddPivot.concat(Common.Utils.injectButtons(this.$el.find('.btn-slot.slot-add-pivot'), '', 'toolbar__icon btn-pivot-sum', this.txtCreate, this.btnsAddPivot = this.btnsAddPivot.concat(Common.Utils.injectButtons(this.$el.find('.btn-slot.slot-add-pivot'), '', 'toolbar__icon btn-pivot-sum', this.txtCreate,
[_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.render(this.$el.find('#slot-chk-header-row')); this.chRowHeader.render(this.$el.find('#slot-chk-header-row'));
this.chColHeader.render(this.$el.find('#slot-chk-header-column')); this.chColHeader.render(this.$el.find('#slot-chk-header-column'));

116
apps/spreadsheeteditor/main/app/view/ShapeSettings.js
View file

@ -1146,7 +1146,10 @@ define([
style: 'width: 100%;', style: 'width: 100%;',
menuStyle: 'min-width: 100%;', menuStyle: 'min-width: 100%;',
editable: false, editable: false,
data: this._arrFillSrc data: this._arrFillSrc,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbFillSrc.setValue(this._arrFillSrc[0].value); this.cmbFillSrc.setValue(this._arrFillSrc[0].value);
this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this)); this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this));
@ -1157,7 +1160,10 @@ define([
itemHeight: 28, itemHeight: 28,
menuMaxHeight: 300, menuMaxHeight: 300,
enableKeyEvents: true, enableKeyEvents: true,
cls: 'combo-pattern' cls: 'combo-pattern',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbPattern.menuPicker.itemTemplate = this.cmbPattern.fieldPicker.itemTemplate = _.template([ this.cmbPattern.menuPicker.itemTemplate = this.cmbPattern.fieldPicker.itemTemplate = _.template([
'<div class="style" id="<%= id %>">', '<div class="style" id="<%= id %>">',
@ -1190,7 +1196,10 @@ define([
{caption: this.textFromUrl, value: 1}, {caption: this.textFromUrl, value: 1},
{caption: this.textFromStorage, value: 2} {caption: this.textFromStorage, value: 2}
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.fillControls.push(this.btnSelectImage); this.fillControls.push(this.btnSelectImage);
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this)); this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
@ -1206,7 +1215,10 @@ define([
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 90px;', menuStyle: 'min-width: 90px;',
editable: false, editable: false,
data: this._arrFillType data: this._arrFillType,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbFillType.setValue(this._arrFillType[0].value); this.cmbFillType.setValue(this._arrFillType[0].value);
this.cmbFillType.on('selected', _.bind(this.onFillTypeSelect, this)); this.cmbFillType.on('selected', _.bind(this.onFillTypeSelect, this));
@ -1219,7 +1231,10 @@ define([
value: '100 %', value: '100 %',
defaultUnit : "%", defaultUnit : "%",
maxValue: 100, maxValue: 100,
minValue: 0 minValue: 0,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this)); this.numTransparency.on('change', _.bind(this.onNumTransparencyChange, this));
this.numTransparency.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);}); this.numTransparency.on('inputleave', function(){ Common.NotificationCenter.trigger('edit:complete', me);});
@ -1249,7 +1264,10 @@ define([
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 90px;', menuStyle: 'min-width: 90px;',
editable: false, editable: false,
data: this._arrGradType data: this._arrGradType,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbGradType.setValue(this._arrGradType[0].value); this.cmbGradType.setValue(this._arrGradType[0].value);
this.cmbGradType.on('selected', _.bind(this.onGradTypeSelect, this)); this.cmbGradType.on('selected', _.bind(this.onGradTypeSelect, this));
@ -1279,7 +1297,10 @@ define([
items: [ items: [
{ template: _.template('<div id="id-shape-menu-direction" style="width: 175px; margin: 0 5px;"></div>') } { template: _.template('<div id="id-shape-menu-direction" style="width: 175px; margin: 0 5px;"></div>') }
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.btnDirection.on('render:after', function(btn) { this.btnDirection.on('render:after', function(btn) {
me.mnuDirectionPicker = new Common.UI.DataView({ me.mnuDirectionPicker = new Common.UI.DataView({
@ -1354,7 +1375,10 @@ define([
allowDecimal: false, allowDecimal: false,
maxValue: 100, maxValue: 100,
minValue: 0, minValue: 0,
disabled: this._locked disabled: this._locked,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.fillControls.push(this.spnGradPosition); this.fillControls.push(this.spnGradPosition);
this.spnGradPosition.on('change', _.bind(this.onPositionChange, this)); this.spnGradPosition.on('change', _.bind(this.onPositionChange, this));
@ -1365,7 +1389,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-add-breakpoint', iconCls: 'toolbar__icon btn-add-breakpoint',
disabled: this._locked, disabled: this._locked,
hint: this.tipAddGradientPoint hint: this.tipAddGradientPoint,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
this.btnAddGradientStep.on('click', _.bind(this.onAddGradientStep, this)); this.btnAddGradientStep.on('click', _.bind(this.onAddGradientStep, this));
this.fillControls.push(this.btnAddGradientStep); this.fillControls.push(this.btnAddGradientStep);
@ -1375,7 +1401,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-remove-breakpoint', iconCls: 'toolbar__icon btn-remove-breakpoint',
disabled: this._locked, disabled: this._locked,
hint: this.tipRemoveGradientPoint hint: this.tipRemoveGradientPoint,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
this.btnRemoveGradientStep.on('click', _.bind(this.onRemoveGradientStep, this)); this.btnRemoveGradientStep.on('click', _.bind(this.onRemoveGradientStep, this));
this.fillControls.push(this.btnRemoveGradientStep); this.fillControls.push(this.btnRemoveGradientStep);
@ -1389,7 +1417,10 @@ define([
allowDecimal: true, allowDecimal: true,
maxValue: 359.9, maxValue: 359.9,
minValue: 0, minValue: 0,
disabled: this._locked disabled: this._locked,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.fillControls.push(this.numGradientAngle); this.fillControls.push(this.numGradientAngle);
this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this)); this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this));
@ -1398,7 +1429,10 @@ define([
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({ this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({
el: $('#shape-combo-border-size'), el: $('#shape-combo-border-size'),
style: "width: 93px;", style: "width: 93px;",
txtNoBorders: this.txtNoBorders txtNoBorders: this.txtNoBorders,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}) })
.on('selected', _.bind(this.onBorderSizeSelect, this)) .on('selected', _.bind(this.onBorderSizeSelect, this))
.on('changed:before', _.bind(this.onBorderSizeChanged, this, true)) .on('changed:before', _.bind(this.onBorderSizeChanged, this, true))
@ -1411,7 +1445,10 @@ define([
this.cmbBorderType = new Common.UI.ComboBorderType({ this.cmbBorderType = new Common.UI.ComboBorderType({
el: $('#shape-combo-border-type'), el: $('#shape-combo-border-type'),
style: "width: 93px;", style: "width: 93px;",
menuStyle: 'min-width: 93px;' menuStyle: 'min-width: 93px;',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}).on('selected', _.bind(this.onBorderTypeSelect, this)) }).on('selected', _.bind(this.onBorderTypeSelect, this))
.on('combo:blur', _.bind(this.onComboBlur, this, false)); .on('combo:blur', _.bind(this.onComboBlur, this, false));
this.BorderType = Asc.c_oDashType.solid; this.BorderType = Asc.c_oDashType.solid;
@ -1426,7 +1463,10 @@ define([
menuAlign: 'tr-br', menuAlign: 'tr-br',
cls: 'menu-shapes', cls: 'menu-shapes',
items: [] items: []
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.btnChangeShape); this.lockedControls.push(this.btnChangeShape);
@ -1435,7 +1475,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-rotate-270', iconCls: 'toolbar__icon btn-rotate-270',
value: 0, value: 0,
hint: this.textHint270 hint: this.textHint270,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
this.btnRotate270.on('click', _.bind(this.onBtnRotateClick, this)); this.btnRotate270.on('click', _.bind(this.onBtnRotateClick, this));
this.lockedControls.push(this.btnRotate270); this.lockedControls.push(this.btnRotate270);
@ -1445,7 +1487,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-rotate-90', iconCls: 'toolbar__icon btn-rotate-90',
value: 1, value: 1,
hint: this.textHint90 hint: this.textHint90,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
this.btnRotate90.on('click', _.bind(this.onBtnRotateClick, this)); this.btnRotate90.on('click', _.bind(this.onBtnRotateClick, this));
this.lockedControls.push(this.btnRotate90); this.lockedControls.push(this.btnRotate90);
@ -1455,7 +1499,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-flip-vert', iconCls: 'toolbar__icon btn-flip-vert',
value: 0, value: 0,
hint: this.textHintFlipV hint: this.textHintFlipV,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
this.btnFlipV.on('click', _.bind(this.onBtnFlipClick, this)); this.btnFlipV.on('click', _.bind(this.onBtnFlipClick, this));
this.lockedControls.push(this.btnFlipV); this.lockedControls.push(this.btnFlipV);
@ -1465,14 +1511,19 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-flip-hor', iconCls: 'toolbar__icon btn-flip-hor',
value: 1, value: 1,
hint: this.textHintFlipH hint: this.textHintFlipH,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this)); this.btnFlipH.on('click', _.bind(this.onBtnFlipClick, this));
this.lockedControls.push(this.btnFlipH); this.lockedControls.push(this.btnFlipH);
this.chShadow = new Common.UI.CheckBox({ this.chShadow = new Common.UI.CheckBox({
el: $('#shape-checkbox-shadow'), el: $('#shape-checkbox-shadow'),
labelText: this.strShadow labelText: this.strShadow,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.chShadow.on('change', _.bind(this.onCheckShadow, this)); this.chShadow.on('change', _.bind(this.onCheckShadow, this));
this.lockedControls.push(this.chShadow); this.lockedControls.push(this.chShadow);
@ -1542,7 +1593,7 @@ define([
el: $('#shape-combo-fill-texture'), el: $('#shape-combo-fill-texture'),
template: _.template([ template: _.template([
'<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" tabindex="0" data-toggle="dropdown">', '<div class="input-group combobox combo-dataview-menu input-group-nr dropdown-toggle" tabindex="0" data-toggle="dropdown">',
'<div class="form-control text" style="width: 90px;">' + this.textSelectTexture + '</div>', '<div class="form-control text" style="width: 90px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big">' + this.textSelectTexture + '</div>',
'<div style="display: table-cell;"></div>', '<div style="display: table-cell;"></div>',
'<button type="button" class="btn btn-default">', '<button type="button" class="btn btn-default">',
'<span class="caret" />', '<span class="caret" />',
@ -1686,7 +1737,10 @@ define([
this.btnBackColor = new Common.UI.ColorButton({ this.btnBackColor = new Common.UI.ColorButton({
parentEl: $('#shape-back-color-btn'), parentEl: $('#shape-back-color-btn'),
transparent: true, transparent: true,
color: 'transparent' color: 'transparent',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'medium'
}); });
this.fillControls.push(this.btnBackColor); this.fillControls.push(this.btnBackColor);
this.colorsBack = this.btnBackColor.getPicker(); this.colorsBack = this.btnBackColor.getPicker();
@ -1694,7 +1748,10 @@ define([
this.btnBorderColor = new Common.UI.ColorButton({ this.btnBorderColor = new Common.UI.ColorButton({
parentEl: $('#shape-border-color-btn'), parentEl: $('#shape-border-color-btn'),
color: '000000' color: '000000',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.btnBorderColor); this.lockedControls.push(this.btnBorderColor);
this.colorsBorder = this.btnBorderColor.getPicker(); this.colorsBorder = this.btnBorderColor.getPicker();
@ -1702,7 +1759,10 @@ define([
this.btnFGColor = new Common.UI.ColorButton({ this.btnFGColor = new Common.UI.ColorButton({
parentEl: $('#shape-foreground-color-btn'), parentEl: $('#shape-foreground-color-btn'),
color: '000000' color: '000000',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.fillControls.push(this.btnFGColor); this.fillControls.push(this.btnFGColor);
this.colorsFG = this.btnFGColor.getPicker(); this.colorsFG = this.btnFGColor.getPicker();
@ -1710,7 +1770,10 @@ define([
this.btnBGColor = new Common.UI.ColorButton({ this.btnBGColor = new Common.UI.ColorButton({
parentEl: $('#shape-background-color-btn'), parentEl: $('#shape-background-color-btn'),
color: 'ffffff' color: 'ffffff',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.fillControls.push(this.btnBGColor); this.fillControls.push(this.btnBGColor);
this.colorsBG = this.btnBGColor.getPicker(); this.colorsBG = this.btnBGColor.getPicker();
@ -1718,7 +1781,10 @@ define([
this.btnGradColor = new Common.UI.ColorButton({ this.btnGradColor = new Common.UI.ColorButton({
parentEl: $('#shape-gradient-color-btn'), parentEl: $('#shape-gradient-color-btn'),
color: '000000' color: '000000',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.fillControls.push(this.btnGradColor); this.fillControls.push(this.btnGradColor);
this.colorsGrad = this.btnGradColor.getPicker(); this.colorsGrad = this.btnGradColor.getPicker();

65
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file

@ -192,43 +192,64 @@ define([
var me = this; var me = this;
this.chHeader = new Common.UI.CheckBox({ this.chHeader = new Common.UI.CheckBox({
el: $('#table-checkbox-header'), el: $('#table-checkbox-header'),
labelText: this.textHeader labelText: this.textHeader,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chHeader); this.lockedControls.push(this.chHeader);
this.chTotal = new Common.UI.CheckBox({ this.chTotal = new Common.UI.CheckBox({
el: $('#table-checkbox-total'), el: $('#table-checkbox-total'),
labelText: this.textTotal labelText: this.textTotal,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chTotal); this.lockedControls.push(this.chTotal);
this.chBanded = new Common.UI.CheckBox({ this.chBanded = new Common.UI.CheckBox({
el: $('#table-checkbox-banded'), el: $('#table-checkbox-banded'),
labelText: this.textBanded labelText: this.textBanded,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chBanded); this.lockedControls.push(this.chBanded);
this.chFirst = new Common.UI.CheckBox({ this.chFirst = new Common.UI.CheckBox({
el: $('#table-checkbox-first'), el: $('#table-checkbox-first'),
labelText: this.textFirst labelText: this.textFirst,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chFirst); this.lockedControls.push(this.chFirst);
this.chLast = new Common.UI.CheckBox({ this.chLast = new Common.UI.CheckBox({
el: $('#table-checkbox-last'), el: $('#table-checkbox-last'),
labelText: this.textLast labelText: this.textLast,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chLast); this.lockedControls.push(this.chLast);
this.chColBanded = new Common.UI.CheckBox({ this.chColBanded = new Common.UI.CheckBox({
el: $('#table-checkbox-col-banded'), el: $('#table-checkbox-col-banded'),
labelText: this.textBanded labelText: this.textBanded,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chColBanded); this.lockedControls.push(this.chColBanded);
this.chFilter = new Common.UI.CheckBox({ this.chFilter = new Common.UI.CheckBox({
el: $('#table-checkbox-filter'), el: $('#table-checkbox-filter'),
labelText: this.textFilter labelText: this.textFilter,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chFilter); this.lockedControls.push(this.chFilter);
@ -276,7 +297,10 @@ define([
{ caption: this.deleteColumnText, value: Asc.c_oAscDeleteOptions.DeleteColumns, idx: 9 }, { caption: this.deleteColumnText, value: Asc.c_oAscDeleteOptions.DeleteColumns, idx: 9 },
{ caption: this.deleteTableText, value: Asc.c_oAscDeleteOptions.DeleteTable, idx: 10 } { caption: this.deleteTableText, value: Asc.c_oAscDeleteOptions.DeleteTable, idx: 10 }
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'medium'
}); });
this.btnEdit.menu.on('show:after', _.bind( function(menu){ this.btnEdit.menu.on('show:after', _.bind( function(menu){
if (this.api) { if (this.api) {
@ -298,7 +322,10 @@ define([
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-convert-to-range', iconCls : 'toolbar__icon btn-convert-to-range',
caption : this.textConvertRange, caption : this.textConvertRange,
style : 'width: 100%;text-align: left;' style : 'width: 100%;text-align: left;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.btnConvertRange.on('click', _.bind(function(btn){ this.btnConvertRange.on('click', _.bind(function(btn){
@ -312,7 +339,10 @@ define([
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-remove-duplicates', iconCls : 'toolbar__icon btn-remove-duplicates',
caption : this.textRemDuplicates, caption : this.textRemDuplicates,
style : 'width: 100%;text-align: left;' style : 'width: 100%;text-align: left;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.btnRemDuplicates.on('click', _.bind(function(btn){ this.btnRemDuplicates.on('click', _.bind(function(btn){
Common.NotificationCenter.trigger('data:remduplicates', this); Common.NotificationCenter.trigger('data:remduplicates', this);
@ -324,7 +354,10 @@ define([
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-slicer', iconCls : 'toolbar__icon btn-slicer',
caption : this.textSlicer, caption : this.textSlicer,
style : 'width: 100%;text-align: left;' style : 'width: 100%;text-align: left;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.btnSlicer.on('click', _.bind(this.onInsertSlicerClick, this)); this.btnSlicer.on('click', _.bind(this.onInsertSlicerClick, this));
this.lockedControls.push(this.btnSlicer); this.lockedControls.push(this.btnSlicer);
@ -334,7 +367,10 @@ define([
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-pivot-sum', iconCls : 'toolbar__icon btn-pivot-sum',
caption : this.textPivot, caption : this.textPivot,
style : 'width: 100%;text-align: left;' style : 'width: 100%;text-align: left;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.btnPivot.on('click', _.bind(this.onInsertPivotClick, this)); this.btnPivot.on('click', _.bind(this.onInsertPivotClick, this));
this.lockedControls.push(this.btnPivot); this.lockedControls.push(this.btnPivot);
@ -478,7 +514,10 @@ define([
items: [ items: [
{ template: _.template('<div id="id-table-menu-template" class="menu-table-template" style="margin: 5px 5px 5px 10px;"></div>') } { template: _.template('<div id="id-table-menu-template" class="menu-table-template" style="margin: 5px 5px 5px 10px;"></div>') }
] ]
}) }),
dataHint : '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.btnTableTemplate.on('render:after', function(btn) { this.btnTableTemplate.on('render:after', function(btn) {
self.mnuTableTemplatePicker = new Common.UI.DataView({ self.mnuTableTemplatePicker = new Common.UI.DataView({

8
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -179,14 +179,18 @@ define([
me.btnCopy = new Common.UI.Button({ me.btnCopy = new Common.UI.Button({
id : 'id-toolbar-btn-copy', id : 'id-toolbar-btn-copy',
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-copy' iconCls : 'toolbar__icon btn-copy',
dataHint: '1',
dataHintDirection: 'top'
}); });
me.btnPaste = new Common.UI.Button({ me.btnPaste = new Common.UI.Button({
id : 'id-toolbar-btn-paste', id : 'id-toolbar-btn-paste',
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-paste', iconCls : 'toolbar__icon btn-paste',
lock : [/*_set.editCell,*/ _set.coAuth, _set.lostConnect] lock : [/*_set.editCell,*/ _set.coAuth, _set.lostConnect],
dataHint: '1',
dataHintDirection: 'bottom'
}); });
me.btnUndo = new Common.UI.Button({ me.btnUndo = new Common.UI.Button({

25
apps/spreadsheeteditor/main/app/view/ViewTab.js
View file

@ -127,7 +127,10 @@ define([
caption: this.capBtnFreeze, caption: this.capBtnFreeze,
split: false, split: false,
enableToggle: true, enableToggle: true,
lock: [_set.sheetLock, _set.lostConnect, _set.coAuth] lock: [_set.sheetLock, _set.lostConnect, _set.coAuth],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.btnFreezePanes); this.lockedControls.push(this.btnFreezePanes);
@ -146,7 +149,10 @@ define([
{ displayValue: "150%", value: 150 }, { displayValue: "150%", value: 150 },
{ displayValue: "175%", value: 175 }, { displayValue: "175%", value: 175 },
{ displayValue: "200%", value: 200 } { displayValue: "200%", value: 200 }
] ],
dataHint : '1',
dataHintDirection: 'top',
dataHintOffset: 'small'
}); });
this.cmbZoom.setValue(100); this.cmbZoom.setValue(100);
@ -154,21 +160,30 @@ define([
el: $host.findById('#slot-chk-formula'), el: $host.findById('#slot-chk-formula'),
labelText: this.textFormula, labelText: this.textFormula,
value: !Common.localStorage.getBool('sse-hidden-formula'), value: !Common.localStorage.getBool('sse-hidden-formula'),
lock : [_set.lostConnect, _set.coAuth] lock : [_set.lostConnect, _set.coAuth],
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chFormula); this.lockedControls.push(this.chFormula);
this.chHeadings = new Common.UI.CheckBox({ this.chHeadings = new Common.UI.CheckBox({
el: $host.findById('#slot-chk-heading'), el: $host.findById('#slot-chk-heading'),
labelText: this.textHeadings, labelText: this.textHeadings,
lock : [_set.sheetLock, _set.lostConnect, _set.coAuth] lock : [_set.sheetLock, _set.lostConnect, _set.coAuth],
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chHeadings); this.lockedControls.push(this.chHeadings);
this.chGridlines = new Common.UI.CheckBox({ this.chGridlines = new Common.UI.CheckBox({
el: $host.findById('#slot-chk-gridlines'), el: $host.findById('#slot-chk-gridlines'),
labelText: this.textGridlines, labelText: this.textGridlines,
lock : [_set.sheetLock, _set.lostConnect, _set.coAuth] lock : [_set.sheetLock, _set.lostConnect, _set.coAuth],
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.lockedControls.push(this.chGridlines); this.lockedControls.push(this.chGridlines);