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

[PE] Hint Manager: add hints in toolbar, right menu

Browse source
This commit is contained in:
JuliaSvinareva 2021-06-16 16:43:51 +03:00
parent 9b5f0107e3
commit eca0abff3b
20 changed files with 561 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/presentationeditor/main/app/controller/Main.js
View file

@ -53,7 +53,8 @@ define([
'common/main/lib/util/LocalStorage', 'common/main/lib/util/LocalStorage',
'presentationeditor/main/app/collection/ShapeGroups', 'presentationeditor/main/app/collection/ShapeGroups',
'presentationeditor/main/app/collection/SlideLayouts', 'presentationeditor/main/app/collection/SlideLayouts',
'presentationeditor/main/app/collection/EquationGroups' 'presentationeditor/main/app/collection/EquationGroups',
'common/main/lib/component/HintManager'
], function () { 'use strict'; ], function () { 'use strict';
PE.Controllers.Main = Backbone.Controller.extend(_.extend((function() { PE.Controllers.Main = Backbone.Controller.extend(_.extend((function() {
@ -159,6 +160,7 @@ define([
this.api = this.getApplication().getController('Viewport').getApi(); this.api = this.getApplication().getController('Viewport').getApi();
Common.UI.FocusManager.init(); Common.UI.FocusManager.init();
Common.UI.HintManager.init();
Common.UI.Themes.init(this.api); Common.UI.Themes.init(this.api);
if (this.api){ if (this.api){

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -2449,7 +2449,7 @@ define([
this.btnsComment = []; this.btnsComment = [];
if ( config.canCoAuthoring && config.canComments ) { if ( config.canCoAuthoring && config.canComments ) {
var _set = PE.enumLock; var _set = PE.enumLock;
this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-menu-comments', me.toolbar.capBtnComment, [_set.lostConnect, _set.noSlides]); this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-menu-comments', me.toolbar.capBtnComment, [_set.lostConnect, _set.noSlides], undefined, undefined, undefined, '1', 'bottom', 'small');
if ( this.btnsComment.length ) { if ( this.btnsComment.length ) {
var _comments = PE.getController('Common.Controllers.Comments').getView(); var _comments = PE.getController('Common.Controllers.Comments').getView();

4
apps/presentationeditor/main/app/template/ChartSettings.template
View file

@ -46,7 +46,7 @@
</tr> </tr>
<tr> <tr>
<td class="padding-small"> <td class="padding-small">
<button type="button" class="btn btn-text-default auto" id="chart-button-edit-data" style="min-width:115px;"><%= scope.textEditData %></button> <button type="button" class="btn btn-text-default auto" id="chart-button-edit-data" style="min-width:115px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textEditData %></button>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -56,7 +56,7 @@
</tr> </tr>
<tr> <tr>
<td align="center"> <td align="center">
<label class="link" id="chart-advanced-link"><%= scope.textAdvanced %></label> <label class="link" id="chart-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>

6
apps/presentationeditor/main/app/template/ImageSettings.template
View file

@ -14,12 +14,12 @@
</tr> </tr>
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small" colspan=2>
<button type="button" class="btn btn-text-default" id="image-button-original-size" style="min-width:100px;width: auto;"><%= scope.textOriginalSize %></button> <button type="button" class="btn btn-text-default" id="image-button-original-size" style="min-width:100px;width: auto;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textOriginalSize %></button>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small" colspan=2>
<button type="button" class="btn btn-text-default" id="image-button-fit-slide" style="min-width:100px;width: auto;"><%= scope.textFitSlide %></button> <button type="button" class="btn btn-text-default" id="image-button-fit-slide" style="min-width:100px;width: auto;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textFitSlide %></button>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -75,7 +75,7 @@
</tr> </tr>
<tr> <tr>
<td align="center" colspan=2> <td align="center" colspan=2>
<label class="link" id="image-advanced-link"><%= scope.textAdvanced %></label> <label class="link" id="image-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>

2
apps/presentationeditor/main/app/template/ParagraphSettings.template
View file

@ -34,7 +34,7 @@
</tr> </tr>
<tr> <tr>
<td align="center" colspan=2> <td align="center" colspan=2>
<label class="link" id="paragraph-advanced-link"><%= scope.textAdvanced %></label> <label class="link" id="paragraph-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>

16
apps/presentationeditor/main/app/template/RightMenu.template
View file

@ -19,13 +19,13 @@
</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-slide" class="btn btn-category arrow-left" content-target="id-slide-settings"><i class="icon toolbar__icon btn-menu-slide">&nbsp;</i></button> <button id="id-right-menu-slide" class="btn btn-category arrow-left" content-target="id-slide-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-slide">&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" content-target="id-shape-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><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" content-target="id-image-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-image">&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" content-target="id-paragraph-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-paragraph">&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" content-target="id-table-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-table">&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" content-target="id-chart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chart">&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" content-target="id-textart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-textart">&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" content-target="id-signature-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
</div> </div>
</div> </div>

2
apps/presentationeditor/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>

4
apps/presentationeditor/main/app/template/SlideSettings.template
View file

@ -142,7 +142,7 @@
</tr> </tr>
<tr> <tr>
<td class="padding-large"> <td class="padding-large">
<button type="button" class="btn btn-text-default" id="slide-button-preview" style="width:100%;"><%= scope.textPreview %></button> <button type="button" class="btn btn-text-default" id="slide-button-preview" style="width:100%;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textPreview %></button>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -160,7 +160,7 @@
</tr> </tr>
<tr> <tr>
<td class="padding-small"> <td class="padding-small">
<button type="button" class="btn btn-text-default" id="slide-button-apply-all" style="width:100%;"><%= scope.textApplyAll %></button> <button type="button" class="btn btn-text-default" id="slide-button-apply-all" style="width:100%;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textApplyAll %></button>
</td> </td>
</tr> </tr>
<tr> <tr>

6
apps/presentationeditor/main/app/template/TableSettings.template
View file

@ -124,12 +124,12 @@
</tr> </tr>
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small" colspan=2>
<button type="button" class="btn btn-text-default" id="table-btn-distrub-rows" style="width:100%;"><%= scope.textDistributeRows %></button> <button type="button" class="btn btn-text-default" id="table-btn-distrub-rows" style="width:100%;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textDistributeRows %></button>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small" colspan=2> <td class="padding-small" colspan=2>
<button type="button" class="btn btn-text-default" id="table-btn-distrub-cols" style="width:100%;"><%= scope.textDistributeCols %></button> <button type="button" class="btn btn-text-default" id="table-btn-distrub-cols" style="width:100%;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textDistributeCols %></button>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -139,7 +139,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>

4
apps/presentationeditor/main/app/template/TextArtSettings.template
View file

@ -33,10 +33,10 @@
<table cols="2" style="width: 100%;"> <table cols="2" style="width: 100%;">
<tr> <tr>
<td class="padding-small" width="50%"> <td class="padding-small" width="50%">
<button type="button" class="btn btn-text-default" id="textart-button-from-file" style="width:90px;"><%= scope.textFromFile %></button> <button type="button" class="btn btn-text-default" id="textart-button-from-file" style="width:90px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textFromFile %></button>
</td> </td>
<td class="padding-small" width="50%"> <td class="padding-small" width="50%">
<button type="button" class="btn btn-text-default" id="textart-button-from-url" style="width:90px;float:right;"><%= scope.textFromUrl %></button> <button type="button" class="btn btn-text-default" id="textart-button-from-url" style="width:90px;float:right;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textFromUrl %></button>
</td> </td>
</tr> </tr>
<tr> <tr>

8
apps/presentationeditor/main/app/template/Viewport.template
View file

@ -1,17 +1,17 @@
<div class="layout-region"> <div class="layout-region">
<div id="pe-preview" style="position:absolute; left: 0; top: 0; display:none; width:100%; height:100%;"></div> <div id="pe-preview" style="position:absolute; left: 0; top: 0; display:none; width:100%; height:100%;"></div>
<section class="layout-ct"> <section class="layout-ct">
<div id="file-menu-panel" class="toolbar-fullview-panel" style="display:none;"></div> <div id="file-menu-panel" class="toolbar-fullview-panel hint-section" style="display:none;"></div>
</section> </section>
<div id="viewport-vbox-layout" class="layout-ct vbox"> <div id="viewport-vbox-layout" class="layout-ct vbox">
<section id="app-title" class="layout-item"></section> <section id="app-title" class="layout-item"></section>
<div id="toolbar" class="layout-item"></div> <div id="toolbar" class="layout-item hint-section"></div>
<div class="layout-item middle"> <div class="layout-item middle">
<div id="viewport-hbox-layout" class="layout-ct hbox"> <div id="viewport-hbox-layout" class="layout-ct hbox">
<div id="left-menu" class="layout-item" style="width: 40px;"></div> <div id="left-menu" class="layout-item hint-section" style="width: 40px;"></div>
<div id="about-menu-panel" class="left-menu-full-ct" style="display:none;"></div> <div id="about-menu-panel" class="left-menu-full-ct" style="display:none;"></div>
<div id="editor-container" class="layout-item"><div id="editor_sdk"></div></div> <div id="editor-container" class="layout-item"><div id="editor_sdk"></div></div>
<div id="right-menu" class="layout-item"></div> <div id="right-menu" class="layout-item hint-section"></div>
<div id="left-panel-history" class="layout-item"></div> <div id="left-panel-history" class="layout-item"></div>
</div> </div>
</div> </div>

20
apps/presentationeditor/main/app/view/ChartSettings.js
View file

@ -214,7 +214,10 @@ define([
items: [ items: [
{ template: _.template('<div id="id-chart-menu-type" class="menu-insertchart"></div>') } { template: _.template('<div id="id-chart-menu-type" class="menu-insertchart"></div>') }
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.btnChartType.on('render:after', function(btn) { this.btnChartType.on('render:after', function(btn) {
me.mnuChartTypePicker = new Common.UI.DataView({ me.mnuChartTypePicker = new Common.UI.DataView({
@ -243,7 +246,10 @@ define([
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
minValue: 0 minValue: 0,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.spinners.push(this.spnWidth); this.spinners.push(this.spnWidth);
this.lockedControls.push(this.spnWidth); this.lockedControls.push(this.spnWidth);
@ -255,7 +261,10 @@ define([
defaultUnit : "cm", defaultUnit : "cm",
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
minValue: 0 minValue: 0,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.spinners.push(this.spnHeight); this.spinners.push(this.spnHeight);
this.lockedControls.push(this.spnHeight); this.lockedControls.push(this.spnHeight);
@ -373,7 +382,10 @@ define([
itemHeight: 50, itemHeight: 50,
menuMaxHeight: 270, menuMaxHeight: 270,
enableKeyEvents: true, enableKeyEvents: true,
cls: 'combo-chart-style' cls: 'combo-chart-style',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbChartStyle.render($('#chart-combo-style')); this.cmbChartStyle.render($('#chart-combo-style'));
this.cmbChartStyle.openButton.menu.cmpEl.css({ this.cmbChartStyle.openButton.menu.cmpEl.css({

30
apps/presentationeditor/main/app/view/ImageSettings.js
View file

@ -132,7 +132,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.lockedControls.push(this.btnSelectImage); this.lockedControls.push(this.btnSelectImage);
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this)); this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
@ -187,7 +190,10 @@ define([
caption: this.textCropFit, caption: this.textCropFit,
value: 2 value: 2
}] }]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.btnCrop.on('click', _.bind(this.onCrop, this)); this.btnCrop.on('click', _.bind(this.onCrop, this));
this.btnCrop.menu.on('item:click', _.bind(this.onCropMenu, this)); this.btnCrop.menu.on('item:click', _.bind(this.onCropMenu, this));
@ -198,7 +204,10 @@ 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',
dataHintOffset: 'small'
}); });
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);
@ -208,7 +217,10 @@ 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',
dataHintOffset: 'small'
}); });
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);
@ -218,7 +230,10 @@ 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',
dataHintOffset: 'small'
}); });
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);
@ -228,7 +243,10 @@ 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',
dataHintOffset: 'small'
}); });
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);

20
apps/presentationeditor/main/app/view/ParagraphSettings.js
View file

@ -270,7 +270,10 @@ define([
cls: 'input-group-nr', cls: 'input-group-nr',
menuStyle: 'min-width: 85px;', menuStyle: 'min-width: 85px;',
editable: false, editable: false,
data: this._arrLineRule data: this._arrLineRule,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbLineRule.setValue(c_paragraphLinerule.LINERULE_AUTO); this.cmbLineRule.setValue(c_paragraphLinerule.LINERULE_AUTO);
this.lockedControls.push(this.cmbLineRule); this.lockedControls.push(this.cmbLineRule);
@ -282,7 +285,10 @@ define([
value: '1.5', value: '1.5',
defaultUnit : "", defaultUnit : "",
maxValue: 132, maxValue: 132,
minValue: 0.5 minValue: 0.5,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.numLineHeight); this.lockedControls.push(this.numLineHeight);
@ -295,7 +301,10 @@ define([
maxValue: 55.88, maxValue: 55.88,
minValue: 0, minValue: 0,
allowAuto : true, allowAuto : true,
autoText : this.txtAutoText autoText : this.txtAutoText,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.spinners.push(this.numSpacingBefore); this.spinners.push(this.numSpacingBefore);
this.lockedControls.push(this.numSpacingBefore); this.lockedControls.push(this.numSpacingBefore);
@ -309,7 +318,10 @@ define([
maxValue: 55.88, maxValue: 55.88,
minValue: 0, minValue: 0,
allowAuto : true, allowAuto : true,
autoText : this.txtAutoText autoText : this.txtAutoText,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.spinners.push(this.numSpacingAfter); this.spinners.push(this.numSpacingAfter);
this.lockedControls.push(this.numSpacingAfter); this.lockedControls.push(this.numSpacingAfter);

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

@ -1120,7 +1120,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));
@ -1131,7 +1134,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 %>">',
@ -1164,7 +1170,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));
@ -1180,7 +1189,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));
@ -1193,7 +1205,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(){ me.fireEvent('editcomplete', me);}); this.numTransparency.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
@ -1223,7 +1238,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));
@ -1253,7 +1271,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({
@ -1328,7 +1349,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));
@ -1339,7 +1363,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);
@ -1349,7 +1375,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);
@ -1363,7 +1391,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));
@ -1372,7 +1403,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))
@ -1385,7 +1419,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;
@ -1400,7 +1437,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);
@ -1409,7 +1449,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);
@ -1419,7 +1461,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);
@ -1429,7 +1473,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);
@ -1439,14 +1485,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);
@ -1516,7 +1567,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>', '<span class="caret"></span>',
@ -1639,7 +1690,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: 'big'
}); });
this.fillControls.push(this.btnBackColor); this.fillControls.push(this.btnBackColor);
this.colorsBack = this.btnBackColor.getPicker(); this.colorsBack = this.btnBackColor.getPicker();
@ -1647,7 +1701,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();
@ -1655,7 +1712,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();
@ -1663,7 +1723,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();
@ -1671,7 +1734,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();

115
apps/presentationeditor/main/app/view/SlideSettings.js
View file

@ -130,7 +130,10 @@ define([
menuStyle: 'min-width: 100%;', menuStyle: 'min-width: 100%;',
editable: false, editable: false,
data: this._arrFillSrc, data: this._arrFillSrc,
disabled: true disabled: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_SOLID); this.cmbFillSrc.setValue(Asc.c_oAscFill.FILL_TYPE_SOLID);
this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this)); this.cmbFillSrc.on('selected', _.bind(this.onFillSrcSelect, this));
@ -140,7 +143,10 @@ define([
disabled: true, disabled: true,
transparent: true, transparent: true,
menu: true, menu: true,
color: 'ffffff' color: 'ffffff',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.FillItems.push(this.btnBackColor); this.FillItems.push(this.btnBackColor);
@ -152,7 +158,10 @@ define([
defaultUnit : "%", defaultUnit : "%",
maxValue: 100, maxValue: 100,
minValue: 0, minValue: 0,
disabled: true disabled: true,
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(){ me.fireEvent('editcomplete', me);}); this.numTransparency.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
@ -198,7 +207,10 @@ define([
menuStyle: 'min-width: 100%;', menuStyle: 'min-width: 100%;',
editable: false, editable: false,
data: this._arrEffectName, data: this._arrEffectName,
disabled: true disabled: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbEffectName.setValue(''); this.cmbEffectName.setValue('');
this.cmbEffectName.on('selected', _.bind(this.onEffectNameSelect, this)); this.cmbEffectName.on('selected', _.bind(this.onEffectNameSelect, this));
@ -233,7 +245,10 @@ define([
menuStyle: 'min-width: 100%;', menuStyle: 'min-width: 100%;',
editable: false, editable: false,
data: this._arrEffectType, data: this._arrEffectType,
disabled: true disabled: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbEffectType.setValue(''); this.cmbEffectType.setValue('');
this.cmbEffectType.on('selected', _.bind(this.onEffectTypeSelect, this)); this.cmbEffectType.on('selected', _.bind(this.onEffectTypeSelect, this));
@ -246,7 +261,10 @@ define([
defaultUnit : this.textSec, defaultUnit : this.textSec,
maxValue: 300, maxValue: 300,
minValue: 0, minValue: 0,
disabled: true disabled: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.numDuration.on('change', _.bind(this.onDurationChange, this)); this.numDuration.on('change', _.bind(this.onDurationChange, this));
this.numDuration.on('inputleave', function(){ me.fireEvent('editcomplete', me);}); this.numDuration.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
@ -259,7 +277,10 @@ define([
defaultUnit : this.textSec, defaultUnit : this.textSec,
maxValue: 300, maxValue: 300,
minValue: 0, minValue: 0,
disabled: true disabled: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.numDelay.on('change', _.bind(this.onDelayChange, this)); this.numDelay.on('change', _.bind(this.onDelayChange, this));
this.numDelay.on('inputleave', function(){ me.fireEvent('editcomplete', me);}); this.numDelay.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
@ -267,14 +288,20 @@ define([
this.chStartOnClick = new Common.UI.CheckBox({ this.chStartOnClick = new Common.UI.CheckBox({
el: $('#slide-checkbox-start-click'), el: $('#slide-checkbox-start-click'),
labelText: this.strStartOnClick, labelText: this.strStartOnClick,
disabled: true disabled: true,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.chStartOnClick.on('change', _.bind(this.onStartOnClickChange, this)); this.chStartOnClick.on('change', _.bind(this.onStartOnClickChange, this));
this.chDelay = new Common.UI.CheckBox({ this.chDelay = new Common.UI.CheckBox({
el: $('#slide-checkbox-delay'), el: $('#slide-checkbox-delay'),
labelText: this.strDelay, labelText: this.strDelay,
disabled: true disabled: true,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.chDelay.on('change', _.bind(this.onCheckDelayChange, this)); this.chDelay.on('change', _.bind(this.onCheckDelayChange, this));
@ -299,14 +326,20 @@ define([
this.chSlideNum = new Common.UI.CheckBox({ this.chSlideNum = new Common.UI.CheckBox({
el: $('#slide-checkbox-slidenum'), el: $('#slide-checkbox-slidenum'),
labelText: this.strSlideNum, labelText: this.strSlideNum,
disabled: true disabled: true,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.chSlideNum.on('change', _.bind(this.onHeaderChange, this, 'slidenum')); this.chSlideNum.on('change', _.bind(this.onHeaderChange, this, 'slidenum'));
this.chDateTime = new Common.UI.CheckBox({ this.chDateTime = new Common.UI.CheckBox({
el: $('#slide-checkbox-datetime'), el: $('#slide-checkbox-datetime'),
labelText: this.strDateTime, labelText: this.strDateTime,
disabled: true disabled: true,
dataHint: '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
}); });
this.chDateTime.on('change', _.bind(this.onHeaderChange, this, 'datetime')); this.chDateTime.on('change', _.bind(this.onHeaderChange, this, 'datetime'));
}, },
@ -780,7 +813,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 %>">',
@ -810,7 +846,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.FillItems.push(this.btnSelectImage); this.FillItems.push(this.btnSelectImage);
this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this)); this.btnSelectImage.menu.on('item:click', _.bind(this.onImageSelect, this));
@ -826,7 +865,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));
@ -842,7 +884,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));
@ -872,7 +917,10 @@ define([
items: [ items: [
{ template: _.template('<div id="id-slide-menu-direction" style="width: 175px; margin: 0 5px;"></div>') } { template: _.template('<div id="id-slide-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({
@ -947,7 +995,10 @@ define([
allowDecimal: false, allowDecimal: false,
maxValue: 100, maxValue: 100,
minValue: 0, minValue: 0,
disabled: this._locked.background disabled: this._locked.background,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.FillItems.push(this.spnGradPosition); this.FillItems.push(this.spnGradPosition);
this.spnGradPosition.on('change', _.bind(this.onPositionChange, this)); this.spnGradPosition.on('change', _.bind(this.onPositionChange, this));
@ -958,7 +1009,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-add-breakpoint', iconCls: 'toolbar__icon btn-add-breakpoint',
disabled: this._locked.background, disabled: this._locked.background,
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.FillItems.push(this.btnAddGradientStep); this.FillItems.push(this.btnAddGradientStep);
@ -968,7 +1021,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-remove-breakpoint', iconCls: 'toolbar__icon btn-remove-breakpoint',
disabled: this._locked.background, disabled: this._locked.background,
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.FillItems.push(this.btnRemoveGradientStep); this.FillItems.push(this.btnRemoveGradientStep);
@ -982,7 +1037,10 @@ define([
allowDecimal: true, allowDecimal: true,
maxValue: 359.9, maxValue: 359.9,
minValue: 0, minValue: 0,
disabled: this._locked.background disabled: this._locked.background,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.FillItems.push(this.numGradientAngle); this.FillItems.push(this.numGradientAngle);
this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this)); this.numGradientAngle.on('change', _.bind(this.onGradientAngleChange, this));
@ -1049,7 +1107,7 @@ define([
el: $('#slide-combo-fill-texture'), el: $('#slide-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>', '<span class="caret"></span>',
@ -1234,7 +1292,10 @@ define([
this.btnFGColor = new Common.UI.ColorButton({ this.btnFGColor = new Common.UI.ColorButton({
parentEl: $('#slide-foreground-color-btn'), parentEl: $('#slide-foreground-color-btn'),
color: '000000' color: '000000',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.FillItems.push(this.btnFGColor); this.FillItems.push(this.btnFGColor);
this.colorsFG = this.btnFGColor.getPicker(); this.colorsFG = this.btnFGColor.getPicker();
@ -1242,7 +1303,10 @@ define([
this.btnBGColor = new Common.UI.ColorButton({ this.btnBGColor = new Common.UI.ColorButton({
parentEl: $('#slide-background-color-btn'), parentEl: $('#slide-background-color-btn'),
color: 'ffffff' color: 'ffffff',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.FillItems.push(this.btnBGColor); this.FillItems.push(this.btnBGColor);
this.colorsBG = this.btnBGColor.getPicker(); this.colorsBG = this.btnBGColor.getPicker();
@ -1250,7 +1314,10 @@ define([
this.btnGradColor = new Common.UI.ColorButton({ this.btnGradColor = new Common.UI.ColorButton({
parentEl: $('#slide-gradient-color-btn'), parentEl: $('#slide-gradient-color-btn'),
color: '000000' color: '000000',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.FillItems.push(this.btnGradColor); this.FillItems.push(this.btnGradColor);
this.colorsGrad = this.btnGradColor.getPicker(); this.colorsGrad = this.btnGradColor.getPicker();

90
apps/presentationeditor/main/app/view/TableSettings.js
View file

@ -229,37 +229,55 @@ define([
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);
@ -271,16 +289,16 @@ define([
this.chColBanded.on('change', _.bind(this.onCheckTemplateChange, this, 5)); this.chColBanded.on('change', _.bind(this.onCheckTemplateChange, this, 5));
var _arrBorderPosition = [ var _arrBorderPosition = [
['l', 'toolbar__icon btn-border-left', 'table-button-border-left', this.tipLeft], ['l', 'toolbar__icon btn-border-left', 'table-button-border-left', this.tipLeft, 'bottom'],
['c', 'toolbar__icon btn-border-insidevert', 'table-button-border-inner-vert', this.tipInnerVert], ['c', 'toolbar__icon btn-border-insidevert', 'table-button-border-inner-vert', this.tipInnerVert, 'bottom'],
['r', 'toolbar__icon btn-border-right', 'table-button-border-right', this.tipRight], ['r', 'toolbar__icon btn-border-right', 'table-button-border-right', this.tipRight, 'bottom'],
['t', 'toolbar__icon btn-border-top', 'table-button-border-top', this.tipTop], ['t', 'toolbar__icon btn-border-top', 'table-button-border-top', this.tipTop, 'bottom'],
['m', 'toolbar__icon btn-border-insidehor', 'table-button-border-inner-hor', this.tipInnerHor], ['m', 'toolbar__icon btn-border-insidehor', 'table-button-border-inner-hor', this.tipInnerHor, 'bottom'],
['b', 'toolbar__icon btn-border-bottom', 'table-button-border-bottom', this.tipBottom], ['b', 'toolbar__icon btn-border-bottom', 'table-button-border-bottom', this.tipBottom, 'bottom'],
['cm', 'toolbar__icon btn-border-inside', 'table-button-border-inner', this.tipInner], ['cm', 'toolbar__icon btn-border-inside', 'table-button-border-inner', this.tipInner, 'top'],
['lrtb', 'toolbar__icon btn-border-out', 'table-button-border-outer', this.tipOuter], ['lrtb', 'toolbar__icon btn-border-out', 'table-button-border-outer', this.tipOuter, 'top'],
['lrtbcm', 'toolbar__icon btn-border-all', 'table-button-border-all', this.tipAll], ['lrtbcm', 'toolbar__icon btn-border-all', 'table-button-border-all', this.tipAll, 'top'],
['', 'toolbar__icon btn-border-no', 'table-button-border-none', this.tipNone] ['', 'toolbar__icon btn-border-no', 'table-button-border-none', this.tipNone, 'top']
]; ];
this._btnsBorderPosition = []; this._btnsBorderPosition = [];
@ -290,7 +308,10 @@ define([
cls: 'btn-toolbar borders--small', cls: 'btn-toolbar borders--small',
iconCls: item[1], iconCls: item[1],
strId :item[0], strId :item[0],
hint: item[3] hint: item[3],
dataHint: '1',
dataHintDirection: item[4],
dataHintOffset: 'small'
}); });
_btn.on('click', _.bind(this.onBtnBordersClick, this)); _btn.on('click', _.bind(this.onBtnBordersClick, this));
this._btnsBorderPosition.push( _btn ); this._btnsBorderPosition.push( _btn );
@ -299,7 +320,10 @@ define([
this.cmbBorderSize = new Common.UI.ComboBorderSize({ this.cmbBorderSize = new Common.UI.ComboBorderSize({
el: $('#table-combo-border-size'), el: $('#table-combo-border-size'),
style: "width: 93px;" style: "width: 93px;",
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.BorderSize = this.cmbBorderSize.store.at(2).get('value'); this.BorderSize = this.cmbBorderSize.store.at(2).get('value');
this.cmbBorderSize.setValue(this.BorderSize); this.cmbBorderSize.setValue(this.BorderSize);
@ -330,7 +354,10 @@ define([
{ caption: this.mergeCellsText, value: 11 }, { caption: this.mergeCellsText, value: 11 },
{ caption: this.splitCellsText, value: 12 } { caption: this.splitCellsText, value: 12 }
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.mnuMerge = this.btnEdit.menu.items[this.btnEdit.menu.items.length-2]; this.mnuMerge = this.btnEdit.menu.items[this.btnEdit.menu.items.length-2];
this.mnuSplit = this.btnEdit.menu.items[this.btnEdit.menu.items.length-1]; this.mnuSplit = this.btnEdit.menu.items[this.btnEdit.menu.items.length-1];
@ -351,7 +378,10 @@ define([
defaultUnit : "cm", defaultUnit : "cm",
value: '1 cm', value: '1 cm',
maxValue: 55.88, maxValue: 55.88,
minValue: 0 minValue: 0,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.numHeight.on('change', _.bind(function(field, newValue, oldValue, eOpts){ this.numHeight.on('change', _.bind(function(field, newValue, oldValue, eOpts){
var _props = new Asc.CTableProp(); var _props = new Asc.CTableProp();
@ -369,7 +399,10 @@ define([
defaultUnit : "cm", defaultUnit : "cm",
value: '1 cm', value: '1 cm',
maxValue: 55.88, maxValue: 55.88,
minValue: 0 minValue: 0,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.numWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){ this.numWidth.on('change', _.bind(function(field, newValue, oldValue, eOpts){
var _props = new Asc.CTableProp(); var _props = new Asc.CTableProp();
@ -612,14 +645,20 @@ define([
this.btnBorderColor = new Common.UI.ColorButton({ this.btnBorderColor = new Common.UI.ColorButton({
parentEl: $('#table-border-color-btn'), parentEl: $('#table-border-color-btn'),
color: 'auto', color: 'auto',
auto: true auto: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.btnBorderColor); this.lockedControls.push(this.btnBorderColor);
this.borderColor = this.btnBorderColor.getPicker(); this.borderColor = this.btnBorderColor.getPicker();
this.btnBackColor = new Common.UI.ColorButton({ this.btnBackColor = new Common.UI.ColorButton({
parentEl: $('#table-back-color-btn'), parentEl: $('#table-back-color-btn'),
transparent: true transparent: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.btnBackColor); this.lockedControls.push(this.btnBackColor);
this.colorsBack = this.btnBackColor.getPicker(); this.colorsBack = this.btnBackColor.getPicker();
@ -643,7 +682,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({

95
apps/presentationeditor/main/app/view/TextArtSettings.js
View file

@ -1082,7 +1082,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));
@ -1093,7 +1096,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 %>">',
@ -1140,7 +1146,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));
@ -1153,7 +1162,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(){ me.fireEvent('editcomplete', me);}); this.numTransparency.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
@ -1183,7 +1195,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));
@ -1213,7 +1228,10 @@ define([
items: [ items: [
{ template: _.template('<div id="id-textart-menu-direction" style="width: 175px; margin: 0 5px;"></div>') } { template: _.template('<div id="id-textart-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({
@ -1288,7 +1306,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));
@ -1299,7 +1320,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);
@ -1309,7 +1332,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);
@ -1323,7 +1348,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));
@ -1332,7 +1360,10 @@ define([
this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({ this.cmbBorderSize = new Common.UI.ComboBorderSizeEditable({
el: $('#textart-combo-border-size'), el: $('#textart-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))
@ -1345,7 +1376,10 @@ define([
this.cmbBorderType = new Common.UI.ComboBorderType({ this.cmbBorderType = new Common.UI.ComboBorderType({
el: $('#textart-combo-border-type'), el: $('#textart-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;
@ -1357,7 +1391,10 @@ define([
itemHeight: 50, itemHeight: 50,
menuMaxHeight: 300, menuMaxHeight: 300,
enableKeyEvents: true, enableKeyEvents: true,
cls: 'combo-textart' cls: 'combo-textart',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbTransform.render($('#textart-combo-transform')); this.cmbTransform.render($('#textart-combo-transform'));
this.cmbTransform.openButton.menu.cmpEl.css({ this.cmbTransform.openButton.menu.cmpEl.css({
@ -1433,7 +1470,7 @@ define([
el: $('#textart-combo-fill-texture'), el: $('#textart-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>', '<span class="caret"></span>',
@ -1495,7 +1532,10 @@ define([
menuMaxHeight: 300, menuMaxHeight: 300,
enableKeyEvents: true, enableKeyEvents: true,
showLast: false, showLast: false,
cls: 'combo-textart' cls: 'combo-textart',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.cmbTextArt.render($('#textart-combo-template')); this.cmbTextArt.render($('#textart-combo-template'));
this.cmbTextArt.openButton.menu.cmpEl.css({ this.cmbTextArt.openButton.menu.cmpEl.css({
@ -1576,7 +1616,10 @@ define([
this.btnBackColor = new Common.UI.ColorButton({ this.btnBackColor = new Common.UI.ColorButton({
parentEl: $('#textart-back-color-btn'), parentEl: $('#textart-back-color-btn'),
transparent: true, transparent: true,
color: 'transparent' color: 'transparent',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.btnBackColor); this.lockedControls.push(this.btnBackColor);
this.colorsBack = this.btnBackColor.getPicker(); this.colorsBack = this.btnBackColor.getPicker();
@ -1584,7 +1627,10 @@ define([
this.btnFGColor = new Common.UI.ColorButton({ this.btnFGColor = new Common.UI.ColorButton({
parentEl: $('#textart-foreground-color-btn'), parentEl: $('#textart-foreground-color-btn'),
color: '000000' color: '000000',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.btnFGColor); this.lockedControls.push(this.btnFGColor);
this.colorsFG = this.btnFGColor.getPicker(); this.colorsFG = this.btnFGColor.getPicker();
@ -1592,7 +1638,10 @@ define([
this.btnBGColor = new Common.UI.ColorButton({ this.btnBGColor = new Common.UI.ColorButton({
parentEl: $('#textart-background-color-btn'), parentEl: $('#textart-background-color-btn'),
color: 'ffffff' color: 'ffffff',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.btnBGColor); this.lockedControls.push(this.btnBGColor);
this.colorsBG = this.btnBGColor.getPicker(); this.colorsBG = this.btnBGColor.getPicker();
@ -1600,7 +1649,10 @@ define([
this.btnGradColor = new Common.UI.ColorButton({ this.btnGradColor = new Common.UI.ColorButton({
parentEl: $('#textart-gradient-color-btn'), parentEl: $('#textart-gradient-color-btn'),
color: '000000' color: '000000',
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
}); });
this.lockedControls.push(this.btnGradColor); this.lockedControls.push(this.btnGradColor);
this.colorsGrad = this.btnGradColor.getPicker(); this.colorsGrad = this.btnGradColor.getPicker();
@ -1608,7 +1660,10 @@ define([
this.btnBorderColor = new Common.UI.ColorButton({ this.btnBorderColor = new Common.UI.ColorButton({
parentEl: $('#textart-border-color-btn'), parentEl: $('#textart-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();

195
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -147,7 +147,10 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-changeslide', iconCls: 'toolbar__icon btn-changeslide',
lock: [_set.menuFileOpen, _set.slideDeleted, _set.slideLock, _set.lostConnect, _set.noSlides, _set.disableOnStart], lock: [_set.menuFileOpen, _set.slideDeleted, _set.slideLock, _set.lostConnect, _set.noSlides, _set.disableOnStart],
menu: true menu: true,
dataHint: '1',
dataHintDirection: 'top',
dataHintOffset: '0, -6'
}); });
me.slideOnlyControls.push(me.btnChangeSlide); me.slideOnlyControls.push(me.btnChangeSlide);
@ -169,7 +172,10 @@ define([
lock: [_set.lostConnect] lock: [_set.lostConnect]
}) })
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '0, -16'
}); });
me.slideOnlyControls.push(me.btnPreview); me.slideOnlyControls.push(me.btnPreview);
@ -213,7 +219,9 @@ define([
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',
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart] lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
dataHint: '1',
dataHintDirection: 'top'
}); });
me.slideOnlyControls.push(me.btnCopy); me.slideOnlyControls.push(me.btnCopy);
@ -221,7 +229,9 @@ define([
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.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides] lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides],
dataHint: '1',
dataHintDirection: 'bottom'
}); });
me.paragraphControls.push(me.btnPaste); me.paragraphControls.push(me.btnPaste);
@ -231,7 +241,9 @@ define([
menuStyle: 'min-width: 325px;', menuStyle: 'min-width: 325px;',
hint: me.tipFontName, hint: me.tipFontName,
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
store: new Common.Collections.Fonts() store: new Common.Collections.Fonts(),
dataHint: '1',
dataHintDirection: 'top'
}); });
me.paragraphControls.push(me.cmbFontName); me.paragraphControls.push(me.cmbFontName);
@ -258,7 +270,9 @@ define([
{value: 48, displayValue: "48"}, {value: 48, displayValue: "48"},
{value: 72, displayValue: "72"}, {value: 72, displayValue: "72"},
{value: 96, displayValue: "96"} {value: 96, displayValue: "96"}
] ],
dataHint: '1',
dataHintDirection: 'top'
}); });
me.paragraphControls.push(me.cmbFontSize); me.paragraphControls.push(me.cmbFontSize);
@ -266,7 +280,9 @@ define([
id: 'id-toolbar-btn-incfont', id: 'id-toolbar-btn-incfont',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-incfont', iconCls: 'toolbar__icon btn-incfont',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock] lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
dataHint: '1',
dataHintDirection: 'top'
}); });
me.paragraphControls.push(me.btnIncFontSize); me.paragraphControls.push(me.btnIncFontSize);
@ -274,7 +290,9 @@ define([
id: 'id-toolbar-btn-decfont', id: 'id-toolbar-btn-decfont',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-decfont', iconCls: 'toolbar__icon btn-decfont',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock] lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
dataHint: '1',
dataHintDirection: 'top'
}); });
me.paragraphControls.push(me.btnDecFontSize); me.paragraphControls.push(me.btnDecFontSize);
@ -283,7 +301,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-bold', iconCls: 'toolbar__icon btn-bold',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
enableToggle: true enableToggle: true,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
me.paragraphControls.push(me.btnBold); me.paragraphControls.push(me.btnBold);
@ -292,7 +312,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-italic', iconCls: 'toolbar__icon btn-italic',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
enableToggle: true enableToggle: true,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
me.paragraphControls.push(me.btnItalic); me.paragraphControls.push(me.btnItalic);
@ -301,7 +323,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-underline', iconCls: 'toolbar__icon btn-underline',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
enableToggle: true enableToggle: true,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
me.paragraphControls.push(me.btnUnderline); me.paragraphControls.push(me.btnUnderline);
@ -310,7 +334,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-strikeout', iconCls: 'toolbar__icon btn-strikeout',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock],
enableToggle: true enableToggle: true,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
me.paragraphControls.push(me.btnStrikeout); me.paragraphControls.push(me.btnStrikeout);
@ -320,7 +346,9 @@ define([
iconCls: 'toolbar__icon btn-superscript', iconCls: 'toolbar__icon btn-superscript',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock, _set.inEquation], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock, _set.inEquation],
enableToggle: true, enableToggle: true,
toggleGroup: 'superscriptGroup' toggleGroup: 'superscriptGroup',
dataHint: '1',
dataHintDirection: 'bottom'
}); });
me.paragraphControls.push(me.btnSuperscript); me.paragraphControls.push(me.btnSuperscript);
@ -330,7 +358,9 @@ define([
iconCls: 'toolbar__icon btn-subscript', iconCls: 'toolbar__icon btn-subscript',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock, _set.inEquation], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.shapeLock, _set.inEquation],
enableToggle: true, enableToggle: true,
toggleGroup: 'superscriptGroup' toggleGroup: 'superscriptGroup',
dataHint: '1',
dataHintDirection: 'bottom'
}); });
me.paragraphControls.push(me.btnSubscript); me.paragraphControls.push(me.btnSubscript);
@ -352,7 +382,10 @@ define([
checkable: true checkable: true
}) })
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '0, -16'
}); });
me.paragraphControls.push(me.btnHighlightColor); me.paragraphControls.push(me.btnHighlightColor);
@ -368,7 +401,10 @@ define([
{template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 216px; margin: 10px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 216px; margin: 10px;"></div>')},
{template: _.template('<a id="id-toolbar-menu-new-fontcolor" style="padding-left:12px;">' + me.textNewColor + '</a>')} {template: _.template('<a id="id-toolbar-menu-new-fontcolor" style="padding-left:12px;">' + me.textNewColor + '</a>')}
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '0, -16'
}); });
me.paragraphControls.push(me.btnFontColor); me.paragraphControls.push(me.btnFontColor);
@ -385,7 +421,10 @@ define([
{caption: me.mniCapitalizeWords, value: Asc.c_oAscChangeTextCaseType.CapitalizeWords}, {caption: me.mniCapitalizeWords, value: Asc.c_oAscChangeTextCaseType.CapitalizeWords},
{caption: me.mniToggleCase, value: Asc.c_oAscChangeTextCaseType.ToggleCase} {caption: me.mniToggleCase, value: Asc.c_oAscChangeTextCaseType.ToggleCase}
] ]
}) }),
dataHint: '1',
dataHintDirection: 'top',
dataHintOffset: '0, -6'
}); });
me.paragraphControls.push(me.btnChangeCase); me.paragraphControls.push(me.btnChangeCase);
me.mnuChangeCase = me.btnChangeCase.menu; me.mnuChangeCase = me.btnChangeCase.menu;
@ -394,7 +433,9 @@ define([
id: 'id-toolbar-btn-clearstyle', id: 'id-toolbar-btn-clearstyle',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-clearstyle', iconCls: 'toolbar__icon btn-clearstyle',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected] lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
dataHint: '1',
dataHintDirection: 'top'
}); });
me.paragraphControls.push(me.btnClearStyle); me.paragraphControls.push(me.btnClearStyle);
@ -403,7 +444,9 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-copystyle', iconCls: 'toolbar__icon btn-copystyle',
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.noParagraphSelected, _set.disableOnStart], lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.noParagraphSelected, _set.disableOnStart],
enableToggle: true enableToggle: true,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
me.slideOnlyControls.push(me.btnCopyStyle); me.slideOnlyControls.push(me.btnCopyStyle);
@ -415,7 +458,10 @@ define([
enableToggle: true, enableToggle: true,
toggleGroup: 'markersGroup', toggleGroup: 'markersGroup',
split: true, split: true,
menu: true menu: true,
dataHint: '1',
dataHintDirection: 'top',
dataHintOffset: '0, -16'
}); });
me.paragraphControls.push(me.btnMarkers); me.paragraphControls.push(me.btnMarkers);
@ -427,7 +473,10 @@ define([
enableToggle: true, enableToggle: true,
toggleGroup: 'markersGroup', toggleGroup: 'markersGroup',
split: true, split: true,
menu: true menu: true,
dataHint: '1',
dataHintDirection: 'top',
dataHintOffset: '0, -16'
}); });
me.paragraphControls.push(me.btnNumbers); me.paragraphControls.push(me.btnNumbers);
@ -492,7 +541,10 @@ define([
value: 3 value: 3
} }
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '0, -6'
}); });
me.paragraphControls.push(me.btnHorizontalAlign); me.paragraphControls.push(me.btnHorizontalAlign);
@ -533,7 +585,10 @@ define([
value: Asc.c_oAscVAlign.Bottom value: Asc.c_oAscVAlign.Bottom
} }
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '0, -6'
}); });
me.paragraphControls.push(me.btnVerticalAlign); me.paragraphControls.push(me.btnVerticalAlign);
@ -541,7 +596,9 @@ define([
id: 'id-toolbar-btn-decoffset', id: 'id-toolbar-btn-decoffset',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-decoffset', iconCls: 'toolbar__icon btn-decoffset',
lock: [_set.decIndentLock, _set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected] lock: [_set.decIndentLock, _set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
dataHint: '1',
dataHintDirection: 'top'
}); });
me.paragraphControls.push(me.btnDecLeftOffset); me.paragraphControls.push(me.btnDecLeftOffset);
@ -549,7 +606,9 @@ define([
id: 'id-toolbar-btn-incoffset', id: 'id-toolbar-btn-incoffset',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-incoffset', iconCls: 'toolbar__icon btn-incoffset',
lock: [_set.incIndentLock, _set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected] lock: [_set.incIndentLock, _set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
dataHint: '1',
dataHintDirection: 'top'
}); });
me.paragraphControls.push(me.btnIncLeftOffset); me.paragraphControls.push(me.btnIncLeftOffset);
@ -568,7 +627,10 @@ define([
{caption: '2.5', value: 2.5, checkable: true, toggleGroup: 'linesize'}, {caption: '2.5', value: 2.5, checkable: true, toggleGroup: 'linesize'},
{caption: '3.0', value: 3.0, checkable: true, toggleGroup: 'linesize'} {caption: '3.0', value: 3.0, checkable: true, toggleGroup: 'linesize'}
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '0, -6'
}); });
me.paragraphControls.push(me.btnLineSpace); me.paragraphControls.push(me.btnLineSpace);
@ -607,7 +669,10 @@ define([
{caption: '--'}, {caption: '--'},
{caption: this.textColumnsCustom, value: 'advanced'} {caption: this.textColumnsCustom, value: 'advanced'}
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '0, -6'
}); });
me.paragraphControls.push(me.btnColumns); me.paragraphControls.push(me.btnColumns);
@ -623,7 +688,10 @@ define([
{template: _.template('<div id="id-toolbar-menu-tablepicker" class="dimension-picker" style="margin: 5px 10px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-tablepicker" class="dimension-picker" style="margin: 5px 10px;"></div>')},
{caption: me.mniCustomTable, value: 'custom'} {caption: me.mniCustomTable, value: 'custom'}
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
me.slideOnlyControls.push(me.btnInsertTable); me.slideOnlyControls.push(me.btnInsertTable);
@ -633,7 +701,10 @@ define([
iconCls: 'toolbar__icon btn-insertchart', iconCls: 'toolbar__icon btn-insertchart',
caption: me.capInsertChart, caption: me.capInsertChart,
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
menu: true menu: true,
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
me.slideOnlyControls.push(me.btnInsertChart); me.slideOnlyControls.push(me.btnInsertChart);
@ -644,7 +715,10 @@ define([
caption: me.capInsertEquation, caption: me.capInsertEquation,
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
split: true, split: true,
menu: new Common.UI.Menu({cls: 'menu-shapes'}) menu: new Common.UI.Menu({cls: 'menu-shapes'}),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
me.slideOnlyControls.push(this.btnInsertEquation); me.slideOnlyControls.push(this.btnInsertEquation);
@ -653,7 +727,10 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-symbol', iconCls: 'toolbar__icon btn-symbol',
caption: me.capBtnInsSymbol, caption: me.capBtnInsSymbol,
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected] lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
me.paragraphControls.push(me.btnInsertSymbol); me.paragraphControls.push(me.btnInsertSymbol);
@ -662,7 +739,10 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-inserthyperlink', iconCls: 'toolbar__icon btn-inserthyperlink',
caption: me.capInsertHyperlink, caption: me.capInsertHyperlink,
lock: [_set.hyperlinkLock, _set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected] lock: [_set.hyperlinkLock, _set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
me.paragraphControls.push(me.btnInsertHyperlink); me.paragraphControls.push(me.btnInsertHyperlink);
@ -677,7 +757,10 @@ define([
items: [ items: [
{template: _.template('<div id="view-insert-art" style="width: 239px; margin-left: 5px;"></div>')} {template: _.template('<div id="view-insert-art" style="width: 239px; margin-left: 5px;"></div>')}
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
me.slideOnlyControls.push(me.btnInsertTextArt); me.slideOnlyControls.push(me.btnInsertTextArt);
@ -686,7 +769,10 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-editheader', iconCls: 'toolbar__icon btn-editheader',
caption: me.capBtnInsHeader, caption: me.capBtnInsHeader,
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart] lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
me.slideOnlyControls.push(me.btnEditHeader); me.slideOnlyControls.push(me.btnEditHeader);
@ -695,7 +781,10 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-datetime', iconCls: 'toolbar__icon btn-datetime',
caption: me.capBtnDateTime, caption: me.capBtnDateTime,
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.paragraphLock, _set.disableOnStart] lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.paragraphLock, _set.disableOnStart],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
me.slideOnlyControls.push(me.btnInsDateTime); me.slideOnlyControls.push(me.btnInsDateTime);
@ -704,7 +793,10 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-pagenum', iconCls: 'toolbar__icon btn-pagenum',
caption: me.capBtnSlideNum, caption: me.capBtnSlideNum,
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.paragraphLock, _set.disableOnStart] lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.paragraphLock, _set.disableOnStart],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: 'small'
}); });
me.slideOnlyControls.push(me.btnInsSlideNum); me.slideOnlyControls.push(me.btnInsSlideNum);
@ -737,7 +829,10 @@ define([
cls: 'shifted-left', cls: 'shifted-left',
items: [], items: [],
restoreHeight: true restoreHeight: true
}) }),
dataHint: '1',
dataHintDirection: 'top',
dataHintOffset: '0, -6'
}); });
me.slideOnlyControls.push(me.btnColorSchemas); me.slideOnlyControls.push(me.btnColorSchemas);
@ -814,7 +909,10 @@ define([
me.mniAlignToSlide, me.mniAlignToSlide,
me.mniAlignObjects me.mniAlignObjects
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '0, -6'
}); });
me.shapeControls.push(me.btnShapeAlign); me.shapeControls.push(me.btnShapeAlign);
me.slideOnlyControls.push(me.btnShapeAlign); me.slideOnlyControls.push(me.btnShapeAlign);
@ -858,7 +956,10 @@ define([
value: 6 value: 6
}) })
] ]
}) }),
dataHint: '1',
dataHintDirection: 'top',
dataHintOffset: '0, -6'
}); });
me.slideOnlyControls.push(me.btnShapeArrange); me.slideOnlyControls.push(me.btnShapeArrange);
@ -887,7 +988,10 @@ define([
value: 'advanced' value: 'advanced'
} }
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '0, -6'
}); });
me.slideOnlyControls.push(me.btnSlideSize); me.slideOnlyControls.push(me.btnSlideSize);
@ -897,6 +1001,9 @@ define([
enableKeyEvents: true, enableKeyEvents: true,
itemHeight: 40, itemHeight: 40,
lock: [_set.themeLock, _set.lostConnect, _set.noSlides], lock: [_set.themeLock, _set.lostConnect, _set.noSlides],
dataHint: '1',
dataHintDirection: 'bottom',
dataHintOffset: '-16, 0',
beforeOpenHandler: function (e) { beforeOpenHandler: function (e) {
var cmp = this, var cmp = this,
menu = cmp.openButton.menu, menu = cmp.openButton.menu,
@ -1094,13 +1201,13 @@ define([
} }
this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg'), 'tlbtn-insertimage-', 'toolbar__icon btn-insertimage', this.capInsertImage, this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg'), 'tlbtn-insertimage-', 'toolbar__icon btn-insertimage', this.capInsertImage,
[PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, true); [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, true, undefined, '1', 'bottom', 'small');
this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', 'toolbar__icon btn-text', this.capInsertText, this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', 'toolbar__icon btn-text', this.capInsertText,
[PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, false, true); [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, false, true, '1', 'bottom', 'small');
this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape'), 'tlbtn-insertshape-', 'toolbar__icon btn-insertshape', this.capInsertShape, this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape'), 'tlbtn-insertshape-', 'toolbar__icon btn-insertshape', this.capInsertShape,
[PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, true, true); [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, true, true, '1', 'bottom', 'small');
this.btnsAddSlide = Common.Utils.injectButtons($host.find('.slot-addslide'), 'tlbtn-addslide-', 'toolbar__icon btn-addslide', this.capAddSlide, this.btnsAddSlide = Common.Utils.injectButtons($host.find('.slot-addslide'), 'tlbtn-addslide-', 'toolbar__icon btn-addslide', this.capAddSlide,
[PE.enumLock.menuFileOpen, PE.enumLock.lostConnect, PE.enumLock.disableOnStart], true, true); [PE.enumLock.menuFileOpen, PE.enumLock.lostConnect, PE.enumLock.disableOnStart], true, true, undefined, '1', 'bottom', 'small');
var created = this.btnsInsertImage.concat(this.btnsInsertText, this.btnsInsertShape, this.btnsAddSlide); var created = this.btnsInsertImage.concat(this.btnsInsertText, this.btnsInsertShape, this.btnsAddSlide);
this.lockToolbar(PE.enumLock.disableOnStart, true, {array: created}); this.lockToolbar(PE.enumLock.disableOnStart, true, {array: created});

1
apps/presentationeditor/main/resources/less/app.less
View file

@ -119,6 +119,7 @@
@import "../../../../common/main/resources/less/winxp_fix.less"; @import "../../../../common/main/resources/less/winxp_fix.less";
@import "../../../../common/main/resources/less/symboltable.less"; @import "../../../../common/main/resources/less/symboltable.less";
@import "../../../../common/main/resources/less/history.less"; @import "../../../../common/main/resources/less/history.less";
@import "../../../../common/main/resources/less/hint-manager.less";
// App // App
// -------------------------------------------------- // --------------------------------------------------