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

[PE] build icons sprite from source images

Browse source
This commit is contained in:
Maxim Kadushkin 2019-11-21 19:10:02 +03:00
parent 8a7aa454ac
commit 1926f2fee9
32 changed files with 174 additions and 248 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -272,9 +272,9 @@ define([
'data-stopPropagation="true"', 'data-stopPropagation="true"',
'<% } %>', '>', '<% } %>', '>',
'<label class="title">' + me.header.textZoom + '</label>', '<label class="title">' + me.header.textZoom + '</label>',
'<button id="hdr-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar"><i class="icon btn-zoomin">&nbsp;</i></button>', '<button id="hdr-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>',
'<label class="zoom"><%= options.value %>%</label>', '<label class="zoom"><%= options.value %>%</label>',
'<button id="hdr-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><i class="icon btn-zoomout">&nbsp;</i></button>', '<button id="hdr-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>',
'</div>' '</div>'
].join('')), ].join('')),
stopPropagation: true, stopPropagation: true,

12
apps/presentationeditor/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 img-toolbarmenu btn-menu-search">&nbsp;</i></button> <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-thumbs" class="btn btn-category" content-target=""><i class="icon img-toolbarmenu btn-menu-thumbs">&nbsp;</i></button> <button id="left-btn-thumbs" class="btn btn-category" content-target=""><i class="icon toolbar__icon btn-menu-thumbs">&nbsp;</i></button>
<!-- /** coauthoring begin **/ --> <!-- /** coauthoring begin **/ -->
<button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments"><i class="icon img-toolbarmenu btn-menu-comments">&nbsp;</i></button> <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-chat" class="btn btn-category" content-target="left-panel-chat"><i class="icon img-toolbarmenu btn-menu-chat">&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>
<!-- /** coauthoring end **/ --> <!-- /** coauthoring end **/ -->
<button id="left-btn-plugins" class="btn btn-category" content-target=""><i class="icon img-toolbarmenu btn-menu-plugin">&nbsp;</i></button> <button id="left-btn-plugins" class="btn btn-category" content-target=""><i class="icon img-toolbarmenu btn-menu-plugin">&nbsp;</i></button>
<button id="left-btn-support" class="btn btn-category" content-target=""><i class="icon img-toolbarmenu btn-menu-support">&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-about" class="btn btn-category" content-target=""><i class="icon img-toolbarmenu btn-menu-about">&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>
</div> </div>
<div class="left-panel" style=""> <div class="left-panel" style="">
<!-- /** coauthoring begin **/ --> <!-- /** coauthoring begin **/ -->

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 class="ct-btn-category arrow-left" />
<button id="id-right-menu-slide" class="btn btn-category arrow-left" content-target="id-slide-settings"><i class="icon img-toolbarmenu btn-menu-slide">&nbsp;</i></button> <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-shape" class="btn btn-category arrow-left" content-target="id-shape-settings"><i class="icon img-toolbarmenu btn-menu-shape">&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-image" class="btn btn-category arrow-left" content-target="id-image-settings"><i class="icon img-toolbarmenu btn-menu-image">&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-text" class="btn btn-category arrow-left" content-target="id-paragraph-settings"><i class="icon img-toolbarmenu btn-menu-text">&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-menu-paragraph">&nbsp;</i></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings"><i class="icon img-toolbarmenu btn-menu-table">&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-chart" class="btn btn-category arrow-left" content-target="id-chart-settings"><i class="icon img-toolbarmenu btn-menu-chart">&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-textart" class="btn btn-category arrow-left" content-target="id-textart-settings"><i class="icon img-toolbarmenu btn-menu-textart">&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-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings"><i class="icon img-toolbarmenu btn-menu-signature">&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>
</div> </div>
</div> </div>

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

@ -36,14 +36,14 @@
<span id="btn-doc-lang" class="el-edit"></span> <span id="btn-doc-lang" class="el-edit"></span>
<span id="btn-doc-spell" class="el-edit"></span> <span id="btn-doc-spell" class="el-edit"></span>
<div class="separator short el-edit"></div> <div class="separator short el-edit"></div>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar"><i class="icon"></i></button> <button id="btn-zoom-topage" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-ic-zoomtoslide"></i></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar"><i class="icon"></i></button> <button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-ic-zoomtowidth"></i></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar"><i class="icon"></i></button> <button id="btn-zoom-down" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown"></i></button>
<div class="cnt-zoom"> <div class="cnt-zoom">
<div class="dropdown-toggle" data-toggle="dropdown"> <div class="dropdown-toggle" data-toggle="dropdown">
<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>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><i class="icon"></i></button> <button id="btn-zoom-up" type="button" class="btn small btn-toolbar" style="margin-right:40px;"><i class="icon toolbar__icon btn-zoomup"></i></button>
</div> </div>
</div> </div>

9
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -2703,24 +2703,27 @@ define([
items : [ items : [
me.menuParagraphDirectH = new Common.UI.MenuItem({ me.menuParagraphDirectH = new Common.UI.MenuItem({
caption : me.directHText, caption : me.directHText,
iconCls : 'mnu-direct-horiz', iconCls : 'menu__icon text-orient-hor',
checkable : true, checkable : true,
checkmark : false,
checked : false, checked : false,
toggleGroup : 'popupparagraphdirect', toggleGroup : 'popupparagraphdirect',
direction : Asc.c_oAscVertDrawingText.normal direction : Asc.c_oAscVertDrawingText.normal
}).on('click', _.bind(paragraphDirection, me)), }).on('click', _.bind(paragraphDirection, me)),
me.menuParagraphDirect90 = new Common.UI.MenuItem({ me.menuParagraphDirect90 = new Common.UI.MenuItem({
caption : me.direct90Text, caption : me.direct90Text,
iconCls : 'mnu-direct-rdown', iconCls : 'menu__icon text-orient-rdown',
checkable : true, checkable : true,
checkmark : false,
checked : false, checked : false,
toggleGroup : 'popupparagraphdirect', toggleGroup : 'popupparagraphdirect',
direction : Asc.c_oAscVertDrawingText.vert direction : Asc.c_oAscVertDrawingText.vert
}).on('click', _.bind(paragraphDirection, me)), }).on('click', _.bind(paragraphDirection, me)),
me.menuParagraphDirect270 = new Common.UI.MenuItem({ me.menuParagraphDirect270 = new Common.UI.MenuItem({
caption : me.direct270Text, caption : me.direct270Text,
iconCls : 'mnu-direct-rup', iconCls : 'menu__icon text-orient-rup',
checkable : true, checkable : true,
checkmark : false,
checked : false, checked : false,
toggleGroup : 'popupparagraphdirect', toggleGroup : 'popupparagraphdirect',
direction : Asc.c_oAscVertDrawingText.vert270 direction : Asc.c_oAscVertDrawingText.vert270

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

@ -178,7 +178,7 @@ define([
this.btnRotate270 = new Common.UI.Button({ this.btnRotate270 = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'rotate-270', iconCls: 'toolbar__icon btn-rotate-270',
value: 0, value: 0,
hint: this.textHint270 hint: this.textHint270
}); });
@ -188,7 +188,7 @@ define([
this.btnRotate90 = new Common.UI.Button({ this.btnRotate90 = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'rotate-90', iconCls: 'toolbar__icon btn-rotate-90',
value: 1, value: 1,
hint: this.textHint90 hint: this.textHint90
}); });
@ -198,7 +198,7 @@ define([
this.btnFlipV = new Common.UI.Button({ this.btnFlipV = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'flip-vert', iconCls: 'toolbar__icon btn-flip-vert',
value: 0, value: 0,
hint: this.textHintFlipV hint: this.textHintFlipV
}); });
@ -208,7 +208,7 @@ define([
this.btnFlipH = new Common.UI.Button({ this.btnFlipH = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'flip-hor', iconCls: 'toolbar__icon btn-flip-hor',
value: 1, value: 1,
hint: this.textHintFlipH hint: this.textHintFlipH
}); });

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

@ -1308,7 +1308,7 @@ define([
this.btnRotate270 = new Common.UI.Button({ this.btnRotate270 = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'rotate-270', iconCls: 'toolbar__icon btn-rotate-270',
value: 0, value: 0,
hint: this.textHint270 hint: this.textHint270
}); });
@ -1318,7 +1318,7 @@ define([
this.btnRotate90 = new Common.UI.Button({ this.btnRotate90 = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'rotate-90', iconCls: 'toolbar__icon btn-rotate-90',
value: 1, value: 1,
hint: this.textHint90 hint: this.textHint90
}); });
@ -1328,7 +1328,7 @@ define([
this.btnFlipV = new Common.UI.Button({ this.btnFlipV = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'flip-vert', iconCls: 'toolbar__icon btn-flip-vert',
value: 0, value: 0,
hint: this.textHintFlipV hint: this.textHintFlipV
}); });
@ -1338,7 +1338,7 @@ define([
this.btnFlipH = new Common.UI.Button({ this.btnFlipH = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'flip-hor', iconCls: 'toolbar__icon btn-flip-hor',
value: 1, value: 1,
hint: this.textHintFlipH hint: this.textHintFlipH
}); });

2
apps/presentationeditor/main/app/view/Statusbar.js
View file

@ -231,7 +231,7 @@ define([
this.btnPreview = new Common.UI.Button({ this.btnPreview = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-preview', iconCls: 'toolbar__icon btn-preview',
hint: this.tipPreview, hint: this.tipPreview,
hintAnchor: 'top', hintAnchor: 'top',
split: true, split: true,

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

@ -280,22 +280,22 @@ define([
this.chColBanded.on('change', _.bind(this.onCheckTemplateChange, this, 5)); this.chColBanded.on('change', _.bind(this.onCheckTemplateChange, this, 5));
var _arrBorderPosition = [ var _arrBorderPosition = [
['l', 'btn-borders-small btn-position-left', 'table-button-border-left', this.tipLeft], ['l', 'toolbar__icon btn-border-left', 'table-button-border-left', this.tipLeft],
['c','btn-borders-small btn-position-inner-vert', 'table-button-border-inner-vert', this.tipInnerVert], ['c', 'toolbar__icon btn-border-insidevert', 'table-button-border-inner-vert', this.tipInnerVert],
['r','btn-borders-small btn-position-right', 'table-button-border-right', this.tipRight], ['r', 'toolbar__icon btn-border-right', 'table-button-border-right', this.tipRight],
['t','btn-borders-small btn-position-top', 'table-button-border-top', this.tipTop], ['t', 'toolbar__icon btn-border-top', 'table-button-border-top', this.tipTop],
['m','btn-borders-small btn-position-inner-hor', 'table-button-border-inner-hor', this.tipInnerHor], ['m', 'toolbar__icon btn-border-insidehor', 'table-button-border-inner-hor', this.tipInnerHor],
['b', 'btn-borders-small btn-position-bottom', 'table-button-border-bottom', this.tipBottom], ['b', 'toolbar__icon btn-border-bottom', 'table-button-border-bottom', this.tipBottom],
['cm', 'btn-borders-small btn-position-inner', 'table-button-border-inner', this.tipInner], ['cm', 'toolbar__icon btn-border-inside', 'table-button-border-inner', this.tipInner],
['lrtb', 'btn-borders-small btn-position-outer', 'table-button-border-outer', this.tipOuter], ['lrtb', 'toolbar__icon btn-border-out', 'table-button-border-outer', this.tipOuter],
['lrtbcm', 'btn-borders-small btn-position-all', 'table-button-border-all', this.tipAll], ['lrtbcm', 'toolbar__icon btn-border-all', 'table-button-border-all', this.tipAll],
['', 'btn-borders-small btn-position-none', 'table-button-border-none', this.tipNone] ['', 'toolbar__icon btn-border-no', 'table-button-border-none', this.tipNone]
]; ];
this._btnsBorderPosition = []; this._btnsBorderPosition = [];
_.each(_arrBorderPosition, function(item, index, list){ _.each(_arrBorderPosition, function(item, index, list){
var _btn = new Common.UI.Button({ var _btn = new Common.UI.Button({
cls: 'btn-toolbar', cls: 'btn-toolbar borders--small',
iconCls: item[1], iconCls: item[1],
strId :item[0], strId :item[0],
hint: item[3] hint: item[3]

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

@ -144,7 +144,7 @@ define([
me.btnChangeSlide = new Common.UI.Button({ me.btnChangeSlide = new Common.UI.Button({
id: 'id-toolbar-button-change-slide', id: 'id-toolbar-button-change-slide',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: '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
}); });
@ -153,7 +153,7 @@ define([
me.btnPreview = new Common.UI.Button({ me.btnPreview = new Common.UI.Button({
id: 'id-toolbar-button-preview', id: 'id-toolbar-button-preview',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-preview', iconCls: 'toolbar__icon btn-preview',
lock: [_set.menuFileOpen, _set.slideDeleted, _set.noSlides, _set.disableOnStart], lock: [_set.menuFileOpen, _set.slideDeleted, _set.noSlides, _set.disableOnStart],
split: true, split: true,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
@ -175,7 +175,7 @@ define([
me.btnPrint = new Common.UI.Button({ me.btnPrint = new Common.UI.Button({
id: 'id-toolbar-btn-print', id: 'id-toolbar-btn-print',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-print no-mask', iconCls: 'toolbar__icon btn-print no-mask',
lock: [_set.slideDeleted, _set.noSlides, _set.cantPrint, _set.disableOnStart], lock: [_set.slideDeleted, _set.noSlides, _set.cantPrint, _set.disableOnStart],
signals: ['disabled'] signals: ['disabled']
}); });
@ -184,7 +184,7 @@ define([
me.btnSave = new Common.UI.Button({ me.btnSave = new Common.UI.Button({
id: 'id-toolbar-btn-save', id: 'id-toolbar-btn-save',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'no-mask ' + me.btnSaveCls, iconCls: 'toolbar__icon no-mask ' + me.btnSaveCls,
lock: [_set.lostConnect], lock: [_set.lostConnect],
signals: ['disabled'] signals: ['disabled']
}); });
@ -193,7 +193,7 @@ define([
me.btnUndo = new Common.UI.Button({ me.btnUndo = new Common.UI.Button({
id: 'id-toolbar-btn-undo', id: 'id-toolbar-btn-undo',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-undo', iconCls: 'toolbar__icon btn-undo',
lock: [_set.undoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart], lock: [_set.undoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart],
signals: ['disabled'] signals: ['disabled']
}); });
@ -202,7 +202,7 @@ define([
me.btnRedo = new Common.UI.Button({ me.btnRedo = new Common.UI.Button({
id: 'id-toolbar-btn-redo', id: 'id-toolbar-btn-redo',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-redo', iconCls: 'toolbar__icon btn-redo',
lock: [_set.redoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart], lock: [_set.redoLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart],
signals: ['disabled'] signals: ['disabled']
}); });
@ -211,7 +211,7 @@ 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: '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]
}); });
me.slideOnlyControls.push(me.btnCopy); me.slideOnlyControls.push(me.btnCopy);
@ -219,7 +219,7 @@ define([
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: '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]
}); });
me.paragraphControls.push(me.btnPaste); me.paragraphControls.push(me.btnPaste);
@ -264,7 +264,7 @@ define([
me.btnBold = new Common.UI.Button({ me.btnBold = new Common.UI.Button({
id: 'id-toolbar-btn-bold', id: 'id-toolbar-btn-bold',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: '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
}); });
@ -273,7 +273,7 @@ define([
me.btnItalic = new Common.UI.Button({ me.btnItalic = new Common.UI.Button({
id: 'id-toolbar-btn-italic', id: 'id-toolbar-btn-italic',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: '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
}); });
@ -282,7 +282,7 @@ define([
me.btnUnderline = new Common.UI.Button({ me.btnUnderline = new Common.UI.Button({
id: 'id-toolbar-btn-underline', id: 'id-toolbar-btn-underline',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: '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
}); });
@ -291,7 +291,7 @@ define([
me.btnStrikeout = new Common.UI.Button({ me.btnStrikeout = new Common.UI.Button({
id: 'id-toolbar-btn-strikeout', id: 'id-toolbar-btn-strikeout',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: '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
}); });
@ -300,7 +300,7 @@ define([
me.btnSuperscript = new Common.UI.Button({ me.btnSuperscript = new Common.UI.Button({
id: 'id-toolbar-btn-superscript', id: 'id-toolbar-btn-superscript',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: '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'
@ -310,7 +310,7 @@ define([
me.btnSubscript = new Common.UI.Button({ me.btnSubscript = new Common.UI.Button({
id: 'id-toolbar-btn-subscript', id: 'id-toolbar-btn-subscript',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: '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'
@ -320,7 +320,7 @@ define([
me.btnFontColor = new Common.UI.Button({ me.btnFontColor = new Common.UI.Button({
id: 'id-toolbar-btn-fontcolor', id: 'id-toolbar-btn-fontcolor',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-fontcolor', iconCls: 'toolbar__icon btn-fontcolor',
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],
split: true, split: true,
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
@ -335,7 +335,7 @@ define([
me.btnClearStyle = new Common.UI.Button({ me.btnClearStyle = new Common.UI.Button({
id: 'id-toolbar-btn-clearstyle', id: 'id-toolbar-btn-clearstyle',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: '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]
}); });
me.paragraphControls.push(me.btnClearStyle); me.paragraphControls.push(me.btnClearStyle);
@ -343,7 +343,7 @@ define([
me.btnCopyStyle = new Common.UI.Button({ me.btnCopyStyle = new Common.UI.Button({
id: 'id-toolbar-btn-copystyle', id: 'id-toolbar-btn-copystyle',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: '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
}); });
@ -352,7 +352,7 @@ define([
me.btnMarkers = new Common.UI.Button({ me.btnMarkers = new Common.UI.Button({
id: 'id-toolbar-btn-markers', id: 'id-toolbar-btn-markers',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-setmarkers', iconCls: 'toolbar__icon btn-setmarkers',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
enableToggle: true, enableToggle: true,
toggleGroup: 'markersGroup', toggleGroup: 'markersGroup',
@ -364,7 +364,7 @@ define([
me.btnNumbers = new Common.UI.Button({ me.btnNumbers = new Common.UI.Button({
id: 'id-toolbar-btn-numbering', id: 'id-toolbar-btn-numbering',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-numbering', iconCls: 'toolbar__icon btn-numbering',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
enableToggle: true, enableToggle: true,
toggleGroup: 'markersGroup', toggleGroup: 'markersGroup',
@ -391,41 +391,45 @@ define([
me.btnHorizontalAlign = new Common.UI.Button({ me.btnHorizontalAlign = new Common.UI.Button({
id: 'id-toolbar-btn-halign', id: 'id-toolbar-btn-halign',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-align-left', iconCls: 'toolbar__icon btn-align-left',
icls: 'btn-align-left', icls: 'btn-align-left',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{ {
caption: me.textAlignLeft + Common.Utils.String.platformKey('Ctrl+L'), caption: me.textAlignLeft + Common.Utils.String.platformKey('Ctrl+L'),
iconCls: 'mnu-align-left', iconCls: 'menu__icon btn-align-left',
icls: 'btn-align-left', icls: 'btn-align-left',
checkable: true, checkable: true,
checkmark: false,
toggleGroup: 'halignGroup', toggleGroup: 'halignGroup',
checked: true, checked: true,
value: 1 value: 1
}, },
{ {
caption: me.textAlignCenter + Common.Utils.String.platformKey('Ctrl+E'), caption: me.textAlignCenter + Common.Utils.String.platformKey('Ctrl+E'),
iconCls: 'mnu-align-center', iconCls: 'menu__icon btn-align-center',
icls: 'btn-align-center', icls: 'btn-align-center',
checkable: true, checkable: true,
checkmark: false,
toggleGroup: 'halignGroup', toggleGroup: 'halignGroup',
value: 2 value: 2
}, },
{ {
caption: me.textAlignRight + Common.Utils.String.platformKey('Ctrl+R'), caption: me.textAlignRight + Common.Utils.String.platformKey('Ctrl+R'),
iconCls: 'mnu-align-right', iconCls: 'menu__icon btn-align-right',
icls: 'btn-align-right', icls: 'btn-align-right',
checkable: true, checkable: true,
checkmark: false,
toggleGroup: 'halignGroup', toggleGroup: 'halignGroup',
value: 0 value: 0
}, },
{ {
caption: me.textAlignJust + Common.Utils.String.platformKey('Ctrl+J'), caption: me.textAlignJust + Common.Utils.String.platformKey('Ctrl+J'),
iconCls: 'mnu-align-just', iconCls: 'menu__icon btn-align-just',
icls: 'btn-align-just', icls: 'btn-align-just',
checkable: true, checkable: true,
checkmark: false,
toggleGroup: 'halignGroup', toggleGroup: 'halignGroup',
value: 3 value: 3
} }
@ -438,32 +442,35 @@ define([
id: 'id-toolbar-btn-valign', id: 'id-toolbar-btn-valign',
cls: 'btn-toolbar', cls: 'btn-toolbar',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.noObjectSelected], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected, _set.noObjectSelected],
iconCls: 'btn-align-middle', iconCls: 'toolbar__icon btn-align-middle',
icls: 'btn-align-middle', icls: 'btn-align-middle',
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{ {
caption: me.textAlignTop, caption: me.textAlignTop,
iconCls: 'mnu-align-top', iconCls: 'menu__icon btn-align-top',
icls: 'btn-align-top', icls: 'btn-align-top',
checkable: true, checkable: true,
checkmark: false,
toggleGroup: 'valignGroup', toggleGroup: 'valignGroup',
value: Asc.c_oAscVAlign.Top value: Asc.c_oAscVAlign.Top
}, },
{ {
caption: me.textAlignMiddle, caption: me.textAlignMiddle,
iconCls: 'mnu-align-middle', iconCls: 'menu__icon btn-align-middle',
icls: 'btn-align-middle', icls: 'btn-align-middle',
checkable: true, checkable: true,
checkmark: false,
toggleGroup: 'valignGroup', toggleGroup: 'valignGroup',
value: Asc.c_oAscVAlign.Center, value: Asc.c_oAscVAlign.Center,
checked: true checked: true
}, },
{ {
caption: me.textAlignBottom, caption: me.textAlignBottom,
iconCls: 'mnu-align-bottom', iconCls: 'menu__icon btn-align-bottom',
icls: 'btn-align-bottom', icls: 'btn-align-bottom',
checkable: true, checkable: true,
checkmark: false,
toggleGroup: 'valignGroup', toggleGroup: 'valignGroup',
value: Asc.c_oAscVAlign.Bottom value: Asc.c_oAscVAlign.Bottom
} }
@ -475,7 +482,7 @@ define([
me.btnDecLeftOffset = new Common.UI.Button({ me.btnDecLeftOffset = new Common.UI.Button({
id: 'id-toolbar-btn-decoffset', id: 'id-toolbar-btn-decoffset',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: '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]
}); });
me.paragraphControls.push(me.btnDecLeftOffset); me.paragraphControls.push(me.btnDecLeftOffset);
@ -483,7 +490,7 @@ define([
me.btnIncLeftOffset = new Common.UI.Button({ me.btnIncLeftOffset = new Common.UI.Button({
id: 'id-toolbar-btn-incoffset', id: 'id-toolbar-btn-incoffset',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: '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]
}); });
me.paragraphControls.push(me.btnIncLeftOffset); me.paragraphControls.push(me.btnIncLeftOffset);
@ -491,7 +498,7 @@ define([
me.btnLineSpace = new Common.UI.Button({ me.btnLineSpace = new Common.UI.Button({
id: 'id-toolbar-btn-linespace', id: 'id-toolbar-btn-linespace',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-linespace', iconCls: 'toolbar__icon btn-linespace',
lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected], lock: [_set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noTextSelected],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
style: 'min-width: 60px;', style: 'min-width: 60px;',
@ -510,7 +517,7 @@ define([
me.btnInsertTable = new Common.UI.Button({ me.btnInsertTable = new Common.UI.Button({
id: 'tlbtn-inserttable', id: 'tlbtn-inserttable',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-inserttable', iconCls: 'toolbar__icon btn-inserttable',
caption: me.capInsertTable, caption: me.capInsertTable,
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
@ -525,7 +532,7 @@ define([
me.btnInsertChart = new Common.UI.Button({ me.btnInsertChart = new Common.UI.Button({
id: 'tlbtn-insertchart', id: 'tlbtn-insertchart',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: '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
@ -535,7 +542,7 @@ define([
me.btnInsertEquation = new Common.UI.Button({ me.btnInsertEquation = new Common.UI.Button({
id: 'tlbtn-insertequation', id: 'tlbtn-insertequation',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-insertequation', iconCls: 'toolbar__icon btn-insertequation',
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,
@ -546,7 +553,7 @@ define([
me.btnInsertHyperlink = new Common.UI.Button({ me.btnInsertHyperlink = new Common.UI.Button({
id: 'tlbtn-insertlink', id: 'tlbtn-insertlink',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: '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]
}); });
@ -555,7 +562,7 @@ define([
me.btnInsertTextArt = new Common.UI.Button({ me.btnInsertTextArt = new Common.UI.Button({
id: 'tlbtn-inserttextart', id: 'tlbtn-inserttextart',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-textart', iconCls: 'toolbar__icon btn-textart',
caption: me.capInsertTextArt, caption: me.capInsertTextArt,
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
@ -570,7 +577,7 @@ define([
me.btnEditHeader = new Common.UI.Button({ me.btnEditHeader = new Common.UI.Button({
id: 'id-toolbar-btn-editheader', id: 'id-toolbar-btn-editheader',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: '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]
}); });
@ -579,7 +586,7 @@ define([
me.btnInsDateTime = new Common.UI.Button({ me.btnInsDateTime = new Common.UI.Button({
id: 'id-toolbar-btn-datetime', id: 'id-toolbar-btn-datetime',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: '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]
}); });
@ -588,7 +595,7 @@ define([
me.btnInsSlideNum = new Common.UI.Button({ me.btnInsSlideNum = new Common.UI.Button({
id: 'id-toolbar-btn-slidenum', id: 'id-toolbar-btn-slidenum',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: '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]
}); });
@ -597,7 +604,7 @@ define([
me.btnColorSchemas = new Common.UI.Button({ me.btnColorSchemas = new Common.UI.Button({
id: 'id-toolbar-btn-colorschemas', id: 'id-toolbar-btn-colorschemas',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-colorschemas', iconCls: 'toolbar__icon btn-colorschemas',
lock: [_set.themeLock, _set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart], lock: [_set.themeLock, _set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [], items: [],
@ -625,50 +632,50 @@ define([
me.mniDistribHor = new Common.UI.MenuItem({ me.mniDistribHor = new Common.UI.MenuItem({
caption: me.txtDistribHor, caption: me.txtDistribHor,
iconCls: 'mnu-distrib-hor', iconCls: 'menu__icon shape-distribute-hor',
value: 6 value: 6
}); });
me.mniDistribVert = new Common.UI.MenuItem({ me.mniDistribVert = new Common.UI.MenuItem({
caption: me.txtDistribVert, caption: me.txtDistribVert,
iconCls: 'mnu-distrib-vert', iconCls: 'menu__icon shape-distribute-vert',
value: 7 value: 7
}); });
me.btnShapeAlign = new Common.UI.Button({ me.btnShapeAlign = new Common.UI.Button({
id: 'id-toolbar-btn-shape-align', id: 'id-toolbar-btn-shape-align',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-align-shape', iconCls: 'toolbar__icon btn-shape-alignleft',
lock: [_set.slideDeleted, _set.shapeLock, _set.lostConnect, _set.noSlides, _set.noObjectSelected, _set.disableOnStart], lock: [_set.slideDeleted, _set.shapeLock, _set.lostConnect, _set.noSlides, _set.noObjectSelected, _set.disableOnStart],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{ {
caption: me.textShapeAlignLeft, caption: me.textShapeAlignLeft,
iconCls: 'mnu-shape-align-left', iconCls: 'menu__icon shape-align-left',
value: Asc.c_oAscAlignShapeType.ALIGN_LEFT value: Asc.c_oAscAlignShapeType.ALIGN_LEFT
}, },
{ {
caption: me.textShapeAlignCenter, caption: me.textShapeAlignCenter,
iconCls: 'mnu-shape-align-center', iconCls: 'menu__icon shape-align-center',
value: Asc.c_oAscAlignShapeType.ALIGN_CENTER value: Asc.c_oAscAlignShapeType.ALIGN_CENTER
}, },
{ {
caption: me.textShapeAlignRight, caption: me.textShapeAlignRight,
iconCls: 'mnu-shape-align-right', iconCls: 'menu__icon shape-align-right',
value: Asc.c_oAscAlignShapeType.ALIGN_RIGHT value: Asc.c_oAscAlignShapeType.ALIGN_RIGHT
}, },
{ {
caption: me.textShapeAlignTop, caption: me.textShapeAlignTop,
iconCls: 'mnu-shape-align-top', iconCls: 'menu__icon shape-align-top',
value: Asc.c_oAscAlignShapeType.ALIGN_TOP value: Asc.c_oAscAlignShapeType.ALIGN_TOP
}, },
{ {
caption: me.textShapeAlignMiddle, caption: me.textShapeAlignMiddle,
iconCls: 'mnu-shape-align-middle', iconCls: 'menu__icon shape-align-middle',
value: Asc.c_oAscAlignShapeType.ALIGN_MIDDLE value: Asc.c_oAscAlignShapeType.ALIGN_MIDDLE
}, },
{ {
caption: me.textShapeAlignBottom, caption: me.textShapeAlignBottom,
iconCls: 'mnu-shape-align-bottom', iconCls: 'menu__icon shape-align-bottom',
value: Asc.c_oAscAlignShapeType.ALIGN_BOTTOM value: Asc.c_oAscAlignShapeType.ALIGN_BOTTOM
}, },
{caption: '--'}, {caption: '--'},
@ -686,39 +693,39 @@ define([
me.btnShapeArrange = new Common.UI.Button({ me.btnShapeArrange = new Common.UI.Button({
id: 'id-toolbar-btn-shape-arrange', id: 'id-toolbar-btn-shape-arrange',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-arrange-shape', iconCls: 'toolbar__icon arrange-front',
lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.noObjectSelected, _set.disableOnStart], lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.noObjectSelected, _set.disableOnStart],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{ {
caption: me.textArrangeFront, caption: me.textArrangeFront,
iconCls: 'mnu-arrange-front', iconCls: 'menu__icon arrange-front',
value: 1 value: 1
}, },
{ {
caption: me.textArrangeBack, caption: me.textArrangeBack,
iconCls: 'mnu-arrange-back', iconCls: 'menu__icon arrange-back',
value: 2 value: 2
}, },
{ {
caption: me.textArrangeForward, caption: me.textArrangeForward,
iconCls: 'mnu-arrange-forward', iconCls: 'menu__icon arrange-forward',
value: 3 value: 3
}, },
{ {
caption: me.textArrangeBackward, caption: me.textArrangeBackward,
iconCls: 'mnu-arrange-backward', iconCls: 'menu__icon arrange-backward',
value: 4 value: 4
}, },
{caption: '--'}, {caption: '--'},
me.mnuGroupShapes = new Common.UI.MenuItem({ me.mnuGroupShapes = new Common.UI.MenuItem({
caption: me.txtGroup, caption: me.txtGroup,
iconCls: 'mnu-group', iconCls: 'menu__icon shape-group',
value: 5 value: 5
}), }),
me.mnuUnGroupShapes = new Common.UI.MenuItem({ me.mnuUnGroupShapes = new Common.UI.MenuItem({
caption: me.txtUngroup, caption: me.txtUngroup,
iconCls: 'mnu-ungroup', iconCls: 'menu__icon shape-ungroup',
value: 6 value: 6
}) })
] ]
@ -729,7 +736,7 @@ define([
me.btnSlideSize = new Common.UI.Button({ me.btnSlideSize = new Common.UI.Button({
id: 'id-toolbar-btn-slide-size', id: 'id-toolbar-btn-slide-size',
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'btn-slidesize', iconCls: 'toolbar__icon btn-slidesize',
lock: [_set.docPropsLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart], lock: [_set.docPropsLock, _set.slideDeleted, _set.lostConnect, _set.disableOnStart],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
@ -944,13 +951,13 @@ define([
_injectComponent('#slot-btn-datetime', this.btnInsDateTime); _injectComponent('#slot-btn-datetime', this.btnInsDateTime);
_injectComponent('#slot-btn-slidenum', this.btnInsSlideNum); _injectComponent('#slot-btn-slidenum', this.btnInsSlideNum);
this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg'), 'tlbtn-insertimage-', '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);
this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', '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);
this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape'), 'tlbtn-insertshape-', '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);
this.btnsAddSlide = Common.Utils.injectButtons($host.find('.slot-addslide'), 'tlbtn-addslide-', '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);
var created = this.btnsInsertImage.concat(this.btnsInsertText, this.btnsInsertShape, this.btnsAddSlide); var created = this.btnsInsertImage.concat(this.btnsInsertText, this.btnsInsertShape, this.btnsAddSlide);

BIN
apps/presentationeditor/main/resources/img/popupmenu-btns.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8 KiB

BIN
apps/presentationeditor/main/resources/img/popupmenu-btns@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 19 KiB

BIN
apps/presentationeditor/main/resources/img/toolbar-menu.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 26 KiB

BIN
apps/presentationeditor/main/resources/img/toolbar-menu@2x.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 67 KiB

31
apps/presentationeditor/main/resources/img/toolbar/1x/.css.handlebars Normal file
View file

@ -0,0 +1,31 @@
{{#spritesheet}}
.btn {
&.active, &:active {
&:not(:disabled):not(.disabled) {
.toolbar__icon {
@btn-active-icon-offset: -20px;
background-position-x: @btn-active-icon-offset;
--bgX: @btn-active-icon-offset;
}
}
}
}
.menu__icon {
.no-checkmark.checked & {
@btn-active-icon-offset: -20px;
background-position-x: @btn-active-icon-offset;
--bgX: @btn-active-icon-offset;
}
}
.toolbar__icon, .menu__icon {
background-image: url(resources/{{{escaped_image}}});
}
{{/spritesheet}}
{{#sprites}}
{{#parselang name}}.{{name}}{{/parselang}} {
background-position: {{px.offset_x}} {{px.offset_y}};
--bgX: {{px.offset_x}};
background-position: var(--bgX) {{px.offset_y}};
}
{{/sprites}}

26
apps/presentationeditor/main/resources/img/toolbar/1x/big/.css.handlebars Normal file
View file

@ -0,0 +1,26 @@
{{#spritesheet}}
.btn {
&.x-huge {
&.active, &:active {
&:not(:disabled):not(.disabled) {
.toolbar__icon {
@btn-active-icon-offset: -28px;
background-position-x: @btn-active-icon-offset;
--bgX: @btn-active-icon-offset;
}
}
}
}
}
.x-huge .toolbar__icon {
background-image: url(resources/{{{escaped_image}}});
}
{{/spritesheet}}
{{#sprites}}
{{#parselang name}}.x-huge .{{name}}{{/parselang}} {
background-position: {{px.offset_x}} {{px.offset_y}};
--bgX: {{px.offset_x}};
background-position: var(--bgX) {{px.offset_y}};
}
{{/sprites}}

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-addslide.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 144 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-datetime.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 398 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/big/btn-pagenum.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 248 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/btn-arrange-shape.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 174 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/btn-changeslide.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 143 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/btn-ic-zoomtoslide.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 240 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/btn-menu-slide.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 145 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/btn-menu-thumbs.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 137 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/btn-preview.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 174 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/btn-shape-alignleft.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 145 B

BIN
apps/presentationeditor/main/resources/img/toolbar/1x/btn-slidesize.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 137 B

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

@ -126,6 +126,9 @@
@import "advanced-settings.less"; @import "advanced-settings.less";
@import "document-preview.less"; @import "document-preview.less";
@import "sprites/iconssmall@1x";
@import "sprites/iconsbig@1x";
.font-size-small { .font-size-small {
.fontsize(@font-size-small); .fontsize(@font-size-small);
} }

12
apps/presentationeditor/main/resources/less/leftmenu.less
View file

@ -11,18 +11,6 @@
} }
} }
button.notify .btn-menu-chat {background-position: -0*@toolbar-icon-size -54*@toolbar-icon-size;}
button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -70*@toolbar-icon-size;}
.button-normal-icon(btn-menu-file, 49, @toolbar-icon-size);
.button-normal-icon(btn-menu-search, 50, @toolbar-icon-size);
.button-normal-icon(btn-menu-thumbs, 51, @toolbar-icon-size);
.button-normal-icon(btn-menu-comments, 52, @toolbar-icon-size);
.button-normal-icon(btn-menu-chat, 53, @toolbar-icon-size);
.button-normal-icon(btn-menu-about, 55, @toolbar-icon-size);
.button-normal-icon(btn-menu-support, 68, @toolbar-icon-size);
.button-normal-icon(btn-menu-plugin, 73, @toolbar-icon-size);
#left-menu { #left-menu {
&+.layout-resizer { &+.layout-resizer {
border-left: 0 none; border-left: 0 none;

43
apps/presentationeditor/main/resources/less/rightmenu.less
View file

@ -5,30 +5,6 @@
border-left: 1px solid @gray-dark; border-left: 1px solid @gray-dark;
background-color: @gray-light; background-color: @gray-light;
right: 0; right: 0;
/*menuText*/
.button-normal-icon(btn-menu-text, 40, @toolbar-icon-size);
/*menuImage*/
.button-normal-icon(btn-menu-image, 43, @toolbar-icon-size);
/*menuTable*/
.button-normal-icon(btn-menu-table, 42, @toolbar-icon-size);
/*menuChart*/
.button-normal-icon(btn-menu-chart, 44, @toolbar-icon-size);
/*menuSlide*/
.button-normal-icon(btn-menu-slide, 56, @toolbar-icon-size);
/*menuShape*/
.button-normal-icon(btn-menu-shape, 39, @toolbar-icon-size);
/*menuTextArt*/
.button-normal-icon(btn-menu-textart, 57, @toolbar-icon-size);
/**menuSignature*/
.button-normal-icon(btn-menu-signature, 77, @toolbar-icon-size);
} }
} }
@ -108,25 +84,6 @@
background-size: cover; background-size: cover;
} }
.btn-toolbar:not(.x-huge) .icon:not(svg).btn-borders-small {
.background-ximage-v2('right-panels/SmallBorders.png', 84px);
}
.button-normal-icon(btn-position-all, 0, 21px);
.button-normal-icon(btn-position-inner, 1, 21px);
.button-normal-icon(btn-position-bottom, 2, 21px);
.button-normal-icon(btn-position-inner-hor, 3, 21px);
.button-normal-icon(btn-position-top, 4, 21px);
.button-normal-icon(btn-position-none, 5, 21px);
.button-normal-icon(btn-position-outer, 6, 21px);
.button-normal-icon(btn-position-left, 7, 21px);
.button-normal-icon(btn-position-inner-vert, 8, 21px);
.button-normal-icon(btn-position-right, 9, 21px);
.button-otherstates-icon2(btn-category, @toolbar-icon-size);
.button-otherstates-icon(btn-borders-small, 21px);
.btn-edit-table, .btn-edit-table,
.btn-change-shape { .btn-change-shape {
.background-ximage('@{common-image-path}/right-panels/rowscols_icon.png', '@{common-image-path}/right-panels/rowscols_icon@2x.png', 84px); .background-ximage('@{common-image-path}/right-panels/rowscols_icon.png', '@{common-image-path}/right-panels/rowscols_icon@2x.png', 84px);

12
apps/presentationeditor/main/resources/less/statusbar.less
View file

@ -39,24 +39,14 @@
} }
#btn-zoom-topage { #btn-zoom-topage {
.btn-tpl(-1160px);
margin-right: 9px; margin-right: 9px;
margin-left: 6px; margin-left: 6px;
} }
#btn-zoom-towidth { #btn-zoom-towidth {
.btn-tpl(-1180px);
margin-right: 9px; margin-right: 9px;
} }
#btn-zoom-down {
.btn-tpl(-1200px);
}
#btn-zoom-up {
.btn-tpl(-1220px);
}
#btn-doc-lang { #btn-doc-lang {
margin-right: 9px; margin-right: 9px;
} }
@ -197,5 +187,3 @@
} }
} }
} }
.button-normal-icon(spellcheck-lang, 76, @toolbar-icon-size);

77
apps/presentationeditor/main/resources/less/toolbar.less
View file

@ -238,83 +238,6 @@
background-position: -150px -300px; background-position: -150px -300px;
} }
@toolbar-icon-size: 20px;
.button-normal-icon(btn-changeslide, 7, @toolbar-icon-size);
.button-normal-icon(btn-preview, 8, @toolbar-icon-size);
.button-normal-icon(btn-print, 9, @toolbar-icon-size);
.button-normal-icon(btn-save, 10, @toolbar-icon-size);
.button-normal-icon(btn-synch, 11, @toolbar-icon-size);
.button-normal-icon(btn-copy, 12, @toolbar-icon-size);
.button-normal-icon(btn-decfont, 12, @toolbar-icon-size);
.button-normal-icon(btn-paste, 13, @toolbar-icon-size);
.button-normal-icon(btn-bold, 14, @toolbar-icon-size);
.button-normal-icon(btn-italic, 15, @toolbar-icon-size);
.button-normal-icon(btn-underline, 16, @toolbar-icon-size);
.button-normal-icon(btn-strikeout, 17, @toolbar-icon-size);
.button-normal-icon(btn-fontcolor, 18, @toolbar-icon-size);
.button-normal-icon(btn-superscript, 19, @toolbar-icon-size);
.button-normal-icon(btn-subscript, 20, @toolbar-icon-size);
.button-normal-icon(btn-undo, 21, @toolbar-icon-size);
.button-normal-icon(btn-redo, 22, @toolbar-icon-size);
.button-normal-icon(btn-clearstyle, 23, @toolbar-icon-size);
.button-normal-icon(btn-copystyle, 24, @toolbar-icon-size);
.button-normal-icon(btn-setmarkers, 25, @toolbar-icon-size);
.button-normal-icon(btn-numbering, 26, @toolbar-icon-size);
.button-normal-icon(btn-align-center, 27, @toolbar-icon-size);
.button-normal-icon(btn-align-just, 28, @toolbar-icon-size);
.button-normal-icon(btn-align-left, 29, @toolbar-icon-size);
.button-normal-icon(btn-align-right, 30, @toolbar-icon-size);
.button-normal-icon(btn-align-top, 31, @toolbar-icon-size);
.button-normal-icon(btn-align-middle, 32, @toolbar-icon-size);
.button-normal-icon(btn-align-bottom, 33, @toolbar-icon-size);
.button-normal-icon(btn-decoffset, 34, @toolbar-icon-size);
.button-normal-icon(btn-incoffset, 35, @toolbar-icon-size);
.button-normal-icon(btn-linespace, 36, @toolbar-icon-size);
.button-normal-icon(btn-arrange-shape, 37, @toolbar-icon-size);
.button-normal-icon(btn-align-shape, 38, @toolbar-icon-size);
.button-normal-icon(btn-colorschemas, 45, @toolbar-icon-size);
.button-normal-icon(btn-slidesize, 46, @toolbar-icon-size);
.button-normal-icon(btn-hidebars, 47, @toolbar-icon-size);
.button-normal-icon(btn-settings, 48, @toolbar-icon-size);
.button-normal-icon(btn-zoomin, 61, @toolbar-icon-size);
.button-normal-icon(btn-zoomout, 60, @toolbar-icon-size);
.button-normal-icon(btn-save-coauth, 69, @toolbar-icon-size);
.button-normal-icon(rotate-90, 79, @toolbar-icon-size);
.button-normal-icon(rotate-270, 80, @toolbar-icon-size);
.button-normal-icon(flip-hor, 81, @toolbar-icon-size);
.button-normal-icon(flip-vert, 82, @toolbar-icon-size);
.button-normal-icon(btn-ic-doclang, 75, @toolbar-icon-size);
.button-normal-icon(btn-ic-docspell, 76, @toolbar-icon-size);
@menu-icon-size: 22px;
.menu-btn-icon(mnu-align-center, 0, @menu-icon-size);
.menu-btn-icon(mnu-align-just, 1, @menu-icon-size);
.menu-btn-icon(mnu-align-right, 2, @menu-icon-size);
.menu-btn-icon(mnu-align-left, 3, @menu-icon-size);
.menu-btn-icon(mnu-align-middle, 4, @menu-icon-size);
.menu-btn-icon(mnu-align-bottom, 5, @menu-icon-size);
.menu-btn-icon(mnu-align-top, 6, @menu-icon-size);
.menu-btn-icon(mnu-arrange-front, 7, @menu-icon-size);
.menu-btn-icon(mnu-arrange-back, 8, @menu-icon-size);
.menu-btn-icon(mnu-arrange-forward, 9, @menu-icon-size);
.menu-btn-icon(mnu-arrange-backward, 10, @menu-icon-size);
.menu-btn-icon(mnu-group, 11, @menu-icon-size);
.menu-btn-icon(mnu-ungroup, 12, @menu-icon-size);
.menu-btn-icon(mnu-shape-align-left, 13, @menu-icon-size);
.menu-btn-icon(mnu-shape-align-center, 14, @menu-icon-size);
.menu-btn-icon(mnu-shape-align-right, 15, @menu-icon-size);
.menu-btn-icon(mnu-shape-align-top, 16, @menu-icon-size);
.menu-btn-icon(mnu-shape-align-middle, 17, @menu-icon-size);
.menu-btn-icon(mnu-shape-align-bottom, 18, @menu-icon-size);
.menu-btn-icon(mnu-distrib-hor, 19, @menu-icon-size);
.menu-btn-icon(mnu-distrib-vert, 20, @menu-icon-size);
.menu-btn-icon(mnu-direct-horiz, 21, @menu-icon-size);
.menu-btn-icon(mnu-direct-rup, 22, @menu-icon-size);
.menu-btn-icon(mnu-direct-rdown, 23, @menu-icon-size);
.username-tip { .username-tip {
background-color: #ee3525; background-color: #ee3525;
border: none; border: none;